Merge pull request #725 from annando/notices-ij

Removed notice in ijpost and cleaned code

ijpost/ijpost.php

@@ -15,27 +15,29 @@ use Friendica\Core\PConfig;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 
-function ijpost_install() {
+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() {
+
+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)
-function ijpost_jot_nets(&$a,&$b) {
+{
-    if(! local_user())
+	if (!local_user()) {
 		return;
+	}
 
 	$ij_post = PConfig::get(local_user(), 'ijpost', 'post');
 	if (intval($ij_post) == 1) {
@@ -46,11 +48,11 @@ function ijpost_jot_nets(&$a,&$b) {
 	}
 }
 
-
+function ijpost_settings(&$a, &$s)
-function ijpost_settings(&$a,&$s) {
+{
-
+	if (!local_user()) {
-    if(! local_user())
 		return;
+	}
 
 	/* Add our stylesheet to the page so we can make our settings look nice */
 
@@ -69,7 +71,6 @@ function ijpost_settings(&$a,&$s) {
 	$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 .= '<span id="settings_ijpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_ijpost_expanded\'); openClose(\'settings_ijpost_inflated\');">';
 	$s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. L10n::t("InsaneJournal Export").'</h3>';
@@ -100,66 +101,67 @@ function ijpost_settings(&$a,&$s) {
 	$s .= '</div><div class="clear"></div>';
 
 	/* provide a submit button */
-
 	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ijpost-submit" name="ijpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
-
 }
 
-
+function ijpost_settings_post(&$a, &$b)
-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_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)
+	if (!$ij_enable) {
 		return;
+	}
 
-    if(strlen($b['postopts']))
+	if (strlen($b['postopts'])) {
 		$b['postopts'] .= ',';
+	}
+
 	$b['postopts'] .= 'ijpost';
 }
 
-
+function ijpost_send(&$a, &$b)
-
+{
-
+	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
-function ijpost_send(&$a,&$b) {
-
-    if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
 		return;
+	}
 
-    if(! strstr($b['postopts'],'ijpost'))
+	if (!strstr($b['postopts'], 'ijpost')) {
 		return;
+	}
 
-    if($b['parent'] != $b['id'])
+	if ($b['parent'] != $b['id']) {
 		return;
+	}
 
 	// insanejournal post in the LJ user's timezone.
 	// Hopefully the person's Friendica account
@@ -170,8 +172,10 @@ 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']))
+
+	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');
@@ -222,8 +226,7 @@ EOT;
 		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);
-
 	}
 }