From bfd6e25b2440690f24e4cc87ae2d3cc9d4135c62 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 30 Aug 2018 19:53:12 +0000 Subject: [PATCH] Removed notice in ijpost and cleaned code --- ijpost/ijpost.php | 225 +++++++++++++++++++++++----------------------- 1 file changed, 114 insertions(+), 111 deletions(-) diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php index 8d529085..b003742f 100644 --- a/ijpost/ijpost.php +++ b/ijpost/ijpost.php @@ -15,151 +15,153 @@ use Friendica\Core\PConfig; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; -function ijpost_install() { - Addon::registerHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local'); - Addon::registerHook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send'); - Addon::registerHook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets'); - Addon::registerHook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings'); - Addon::registerHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post'); - -} -function ijpost_uninstall() { - Addon::unregisterHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local'); - Addon::unregisterHook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send'); - Addon::unregisterHook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets'); - Addon::unregisterHook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings'); - Addon::unregisterHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post'); - +function ijpost_install() +{ + Addon::registerHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local'); + Addon::registerHook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send'); + Addon::registerHook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets'); + Addon::registerHook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings'); + Addon::registerHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post'); } - -function ijpost_jot_nets(&$a,&$b) { - if(! local_user()) - return; - - $ij_post = PConfig::get(local_user(),'ijpost','post'); - if(intval($ij_post) == 1) { - $ij_defpost = PConfig::get(local_user(),'ijpost','post_by_default'); - $selected = ((intval($ij_defpost) == 1) ? ' checked="checked" ' : ''); - $b .= '
' - . L10n::t('Post to Insanejournal') . '
'; - } +function ijpost_uninstall() +{ + Addon::unregisterHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local'); + Addon::unregisterHook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send'); + Addon::unregisterHook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets'); + Addon::unregisterHook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings'); + Addon::unregisterHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post'); } +function ijpost_jot_nets(&$a, &$b) +{ + if (!local_user()) { + return; + } -function ijpost_settings(&$a,&$s) { + $ij_post = PConfig::get(local_user(), 'ijpost', 'post'); + if (intval($ij_post) == 1) { + $ij_defpost = PConfig::get(local_user(), 'ijpost', 'post_by_default'); + $selected = ((intval($ij_defpost) == 1) ? ' checked="checked" ' : ''); + $b .= '
' + . L10n::t('Post to Insanejournal') . '
'; + } +} - if(! local_user()) - return; +function ijpost_settings(&$a, &$s) +{ + if (!local_user()) { + 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 */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; - /* Get the current state of our config variables */ + /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(),'ijpost','post'); + $enabled = PConfig::get(local_user(), 'ijpost', 'post'); - $checked = (($enabled) ? ' checked="checked" ' : ''); + $checked = (($enabled) ? ' checked="checked" ' : ''); - $def_enabled = PConfig::get(local_user(),'ijpost','post_by_default'); + $def_enabled = PConfig::get(local_user(), 'ijpost', 'post_by_default'); - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); + $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); $ij_username = PConfig::get(local_user(), 'ijpost', 'ij_username'); $ij_password = PConfig::get(local_user(), 'ijpost', 'ij_password'); + /* Add some HTML to the existing form */ + $s .= ''; + $s .= '

'. L10n::t("InsaneJournal Export").'

'; + $s .= '
'; + $s .= ''; } - -function ijpost_settings_post(&$a,&$b) { - - if(x($_POST,'ijpost-submit')) { - - PConfig::set(local_user(),'ijpost','post',intval($_POST['ijpost'])); - PConfig::set(local_user(),'ijpost','post_by_default',intval($_POST['ij_bydefault'])); - PConfig::set(local_user(),'ijpost','ij_username',trim($_POST['ij_username'])); - PConfig::set(local_user(),'ijpost','ij_password',trim($_POST['ij_password'])); - +function ijpost_settings_post(&$a, &$b) +{ + if (x($_POST, 'ijpost-submit')) { + PConfig::set(local_user(), 'ijpost', 'post', intval($_POST['ijpost'])); + PConfig::set(local_user(), 'ijpost', 'post_by_default', intval($_POST['ij_bydefault'])); + PConfig::set(local_user(), 'ijpost', 'ij_username', trim($_POST['ij_username'])); + PConfig::set(local_user(), 'ijpost', 'ij_password', trim($_POST['ij_password'])); } - } -function ijpost_post_local(&$a,&$b) { - +function ijpost_post_local(&$a, &$b) +{ // This can probably be changed to allow editing by pointing to a different API endpoint - if($b['edit']) + if ($b['edit']) { return; + } - if((! local_user()) || (local_user() != $b['uid'])) + if (!local_user() || (local_user() != $b['uid'])) { return; + } - if($b['private'] || $b['parent']) + if ($b['private'] || $b['parent']) { return; + } - $ij_post = intval(PConfig::get(local_user(),'ijpost','post')); + $ij_post = intval(PConfig::get(local_user(), 'ijpost', 'post')); - $ij_enable = (($ij_post && x($_REQUEST,'ijpost_enable')) ? intval($_REQUEST['ijpost_enable']) : 0); + $ij_enable = (($ij_post && x($_REQUEST, 'ijpost_enable')) ? intval($_REQUEST['ijpost_enable']) : 0); - if($_REQUEST['api_source'] && intval(PConfig::get(local_user(),'ijpost','post_by_default'))) + if ($b['api_source'] && intval(PConfig::get(local_user(), 'ijpost', 'post_by_default'))) { $ij_enable = 1; + } - if(! $ij_enable) - return; + if (!$ij_enable) { + return; + } - if(strlen($b['postopts'])) - $b['postopts'] .= ','; - $b['postopts'] .= 'ijpost'; + if (strlen($b['postopts'])) { + $b['postopts'] .= ','; + } + + $b['postopts'] .= 'ijpost'; } +function ijpost_send(&$a, &$b) +{ + if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) { + return; + } + if (!strstr($b['postopts'], 'ijpost')) { + return; + } - -function ijpost_send(&$a,&$b) { - - if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) - return; - - if(! strstr($b['postopts'],'ijpost')) - return; - - if($b['parent'] != $b['id']) - return; + if ($b['parent'] != $b['id']) { + return; + } // insanejournal post in the LJ user's timezone. // Hopefully the person's Friendica account @@ -170,14 +172,16 @@ function ijpost_send(&$a,&$b) { $x = q("select timezone from user where uid = %d limit 1", intval($b['uid']) ); - if($x && strlen($x[0]['timezone'])) - $tz = $x[0]['timezone']; - $ij_username = PConfig::get($b['uid'],'ijpost','ij_username'); - $ij_password = PConfig::get($b['uid'],'ijpost','ij_password'); + if ($x && strlen($x[0]['timezone'])) { + $tz = $x[0]['timezone']; + } + + $ij_username = PConfig::get($b['uid'], 'ijpost', 'ij_username'); + $ij_password = PConfig::get($b['uid'], 'ijpost', 'ij_password'); $ij_blog = 'http://www.insanejournal.com/interface/xmlrpc'; - if($ij_username && $ij_password && $ij_blog) { + if ($ij_username && $ij_password && $ij_blog) { $title = $b['title']; $post = BBCode::convert($b['body']); $post = xmlify($post); @@ -219,17 +223,16 @@ EOT; logger('ijpost: data: ' . $xml, LOGGER_DATA); - if($ij_blog !== 'test') { + if ($ij_blog !== 'test') { $x = Network::post($ij_blog, $xml, ["Content-Type: text/xml"]); } - logger('posted to insanejournal: ' . ($x) ? $x : '', LOGGER_DEBUG); - + logger('posted to insanejournal: ' . $x ? $x : '', LOGGER_DEBUG); } } function ijpost_get_tags($post) { - preg_match_all("/\]([^\[#]+)\[/",$post,$matches); - $tags = implode(', ',$matches[1]); + preg_match_all("/\]([^\[#]+)\[/", $post, $matches); + $tags = implode(', ', $matches[1]); return $tags; }