Merge pull request #474 from annando/reformat

Just some reformatting
This commit is contained in:
Tobias Diekershoff 2017-12-11 10:03:12 +01:00 committed by GitHub
commit dcd1a5ad79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -15,8 +15,8 @@ function blogger_install() {
register_hook('jot_networks', 'addon/blogger/blogger.php', 'blogger_jot_nets'); register_hook('jot_networks', 'addon/blogger/blogger.php', 'blogger_jot_nets');
register_hook('connector_settings', 'addon/blogger/blogger.php', 'blogger_settings'); register_hook('connector_settings', 'addon/blogger/blogger.php', 'blogger_settings');
register_hook('connector_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post'); register_hook('connector_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
} }
function blogger_uninstall() { function blogger_uninstall() {
unregister_hook('post_local', 'addon/blogger/blogger.php', 'blogger_post_local'); unregister_hook('post_local', 'addon/blogger/blogger.php', 'blogger_post_local');
unregister_hook('notifier_normal', 'addon/blogger/blogger.php', 'blogger_send'); unregister_hook('notifier_normal', 'addon/blogger/blogger.php', 'blogger_send');
@ -28,16 +28,16 @@ function blogger_uninstall() {
unregister_hook('post_local_end', 'addon/blogger/blogger.php', 'blogger_send'); unregister_hook('post_local_end', 'addon/blogger/blogger.php', 'blogger_send');
unregister_hook('plugin_settings', 'addon/blogger/blogger.php', 'blogger_settings'); unregister_hook('plugin_settings', 'addon/blogger/blogger.php', 'blogger_settings');
unregister_hook('plugin_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post'); unregister_hook('plugin_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
} }
function blogger_jot_nets(&$a,&$b) { function blogger_jot_nets(&$a,&$b) {
if(! local_user()) if (!local_user()) {
return; return;
}
$bl_post = PConfig::get(local_user(),'blogger','post'); $bl_post = PConfig::get(local_user(),'blogger','post');
if(intval($bl_post) == 1) { if (intval($bl_post) == 1) {
$bl_defpost = PConfig::get(local_user(),'blogger','post_by_default'); $bl_defpost = PConfig::get(local_user(),'blogger','post_by_default');
$selected = ((intval($bl_defpost) == 1) ? ' checked="checked" ' : ''); $selected = ((intval($bl_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '<div class="profile-jot-net"><input type="checkbox" name="blogger_enable" ' . $selected . ' value="1" /> ' $b .= '<div class="profile-jot-net"><input type="checkbox" name="blogger_enable" ' . $selected . ' value="1" /> '
@ -48,8 +48,9 @@ function blogger_jot_nets(&$a,&$b) {
function blogger_settings(&$a,&$s) { function blogger_settings(&$a,&$s) {
if(! local_user()) if (! local_user()) {
return; return;
}
/* Add our stylesheet to the page so we can make our settings look nice */ /* Add our stylesheet to the page so we can make our settings look nice */
@ -69,9 +70,7 @@ function blogger_settings(&$a,&$s) {
$bl_password = PConfig::get(local_user(), 'blogger', 'bl_password'); $bl_password = PConfig::get(local_user(), 'blogger', 'bl_password');
$bl_blog = PConfig::get(local_user(), 'blogger', 'bl_blog'); $bl_blog = PConfig::get(local_user(), 'blogger', 'bl_blog');
/* Add some HTML to the existing form */ /* Add some HTML to the existing form */
$s .= '<span id="settings_blogger_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">'; $s .= '<span id="settings_blogger_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
$s .= '<img class="connector'.$css.'" src="images/blogger.png" /><h3 class="connector">'. t('Blogger Export').'</h3>'; $s .= '<img class="connector'.$css.'" src="images/blogger.png" /><h3 class="connector">'. t('Blogger Export').'</h3>';
$s .= '</span>'; $s .= '</span>';
@ -106,51 +105,51 @@ function blogger_settings(&$a,&$s) {
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
/* provide a submit button */ /* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="blogger-submit" name="blogger-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>'; $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="blogger-submit" name="blogger-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
} }
function blogger_settings_post(&$a,&$b) { function blogger_settings_post(&$a,&$b) {
if (x($_POST,'blogger-submit')) {
if(x($_POST,'blogger-submit')) {
PConfig::set(local_user(),'blogger','post',intval($_POST['blogger'])); PConfig::set(local_user(),'blogger','post',intval($_POST['blogger']));
PConfig::set(local_user(),'blogger','post_by_default',intval($_POST['bl_bydefault'])); PConfig::set(local_user(),'blogger','post_by_default',intval($_POST['bl_bydefault']));
PConfig::set(local_user(),'blogger','bl_username',trim($_POST['bl_username'])); PConfig::set(local_user(),'blogger','bl_username',trim($_POST['bl_username']));
PConfig::set(local_user(),'blogger','bl_password',trim($_POST['bl_password'])); PConfig::set(local_user(),'blogger','bl_password',trim($_POST['bl_password']));
PConfig::set(local_user(),'blogger','bl_blog',trim($_POST['bl_blog'])); PConfig::set(local_user(),'blogger','bl_blog',trim($_POST['bl_blog']));
} }
} }
function blogger_post_local(&$a,&$b) { function blogger_post_local(&$a,&$b) {
// This can probably be changed to allow editing by pointing to a different API endpoint // This can probably be changed to allow editing by pointing to a different API endpoint
if($b['edit']) if ($b['edit']) {
return; return;
}
if((! local_user()) || (local_user() != $b['uid'])) if (!local_user() || (local_user() != $b['uid'])) {
return; return;
}
if($b['private'] || $b['parent']) if ($b['private'] || $b['parent']) {
return; return;
}
$bl_post = intval(PConfig::get(local_user(),'blogger','post')); $bl_post = intval(PConfig::get(local_user(),'blogger','post'));
$bl_enable = (($bl_post && x($_REQUEST,'blogger_enable')) ? intval($_REQUEST['blogger_enable']) : 0); $bl_enable = (($bl_post && x($_REQUEST,'blogger_enable')) ? intval($_REQUEST['blogger_enable']) : 0);
if($b['api_source'] && intval(PConfig::get(local_user(),'blogger','post_by_default'))) if ($b['api_source'] && intval(PConfig::get(local_user(),'blogger','post_by_default'))) {
$bl_enable = 1; $bl_enable = 1;
}
if(! $bl_enable) if (!$bl_enable) {
return; return;
}
if(strlen($b['postopts'])) if (strlen($b['postopts'])) {
$b['postopts'] .= ','; $b['postopts'] .= ',';
}
$b['postopts'] .= 'blogger'; $b['postopts'] .= 'blogger';
} }
@ -158,22 +157,23 @@ function blogger_post_local(&$a,&$b) {
function blogger_send(&$a,&$b) { function blogger_send(&$a,&$b) {
if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
return; return;
}
if(! strstr($b['postopts'],'blogger')) if (! strstr($b['postopts'],'blogger')) {
return; return;
}
if($b['parent'] != $b['id']) if ($b['parent'] != $b['id']) {
return; return;
}
$bl_username = xmlify(PConfig::get($b['uid'],'blogger','bl_username')); $bl_username = xmlify(PConfig::get($b['uid'],'blogger','bl_username'));
$bl_password = xmlify(PConfig::get($b['uid'],'blogger','bl_password')); $bl_password = xmlify(PConfig::get($b['uid'],'blogger','bl_password'));
$bl_blog = PConfig::get($b['uid'],'blogger','bl_blog'); $bl_blog = PConfig::get($b['uid'],'blogger','bl_blog');
if($bl_username && $bl_password && $bl_blog) { if ($bl_username && $bl_password && $bl_blog) {
require_once('include/bbcode.php'); require_once('include/bbcode.php');
@ -199,10 +199,10 @@ EOT;
logger('blogger: data: ' . $xml, LOGGER_DATA); logger('blogger: data: ' . $xml, LOGGER_DATA);
if($bl_blog !== 'test') if ($bl_blog !== 'test') {
$x = post_url($bl_blog,$xml); $x = post_url($bl_blog,$xml);
logger('posted to blogger: ' . (($x) ? $x : ''), LOGGER_DEBUG); }
logger('posted to blogger: ' . (($x) ? $x : ''), LOGGER_DEBUG);
} }
} }