From 5f3d5847162774ff9d93847ae5ee3f6102a49117 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Fri, 4 Apr 2014 11:02:36 +0200
Subject: [PATCH] Code beautification and some more logging data - no changes
 in the functionality.

---
 mod/like.php     | 13 ++++-----
 mod/pubsub.php   |  8 +++---
 mod/settings.php | 75 ++++++++++++++++++++++++------------------------
 3 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/mod/like.php b/mod/like.php
index ed6b1e7d08..a2f51b074e 100755
--- a/mod/like.php
+++ b/mod/like.php
@@ -109,14 +109,13 @@ function like_content(&$a) {
 	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
 
 
-	$r = q("SELECT * FROM `item` WHERE `verb` = '%s' AND `deleted` = 0
-		AND `contact-id` = %d AND ( `parent` = '%s' OR `parent-uri` = '%s' OR `thr-parent` = '%s') LIMIT 1",
-		dbesc($activity),
-		intval($contact['id']),
-		dbesc($item_id),
-		dbesc($item_id),
-		dbesc($item['uri'])
+	$r = q("SELECT `id`, `guid` FROM `item` WHERE `verb` = '%s' AND `deleted` = 0
+		AND `contact-id` = %d AND `uid` = %d
+		AND (`parent` = '%s' OR `parent-uri` = '%s' OR `thr-parent` = '%s') LIMIT 1",
+		dbesc($activity), intval($contact['id']), intval($owner_uid),
+		dbesc($item_id), dbesc($item_id), dbesc($item['uri'])
 	);
+
 	if(count($r)) {
 		$like_item = $r[0];
 
diff --git a/mod/pubsub.php b/mod/pubsub.php
index 3d8bfca48e..82458f46ac 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -1,7 +1,7 @@
 <?php
 
 function hub_return($valid,$body) {
-	
+
 	if($valid) {
 		header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK');
 		echo $body;
@@ -18,7 +18,7 @@ function hub_return($valid,$body) {
 // when receiving an XML feed, always return OK
 
 function hub_post_return() {
-	
+
 	header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK');
 	killme();
 
@@ -69,7 +69,7 @@ function pubsub_init(&$a) {
 
 		if(! link_compare($hub_topic,$r[0]['poll'])) {
 			logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']);
-			// should abort but let's humour them. 			
+			// should abort but let's humour them.
 		}
 
 		$contact = $r[0];
@@ -130,7 +130,7 @@ function pubsub_post(&$a) {
 	);
 
 	if(! count($r)) {
-		logger('pubsub: no contact record - ignored');
+		logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml);
 		hub_post_return();
 	}
 
diff --git a/mod/settings.php b/mod/settings.php
index 3fd65dde88..c85a3b33d9 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -588,11 +588,11 @@ function settings_content(&$a) {
 		notice( t('Permission denied.') . EOL );
 		return;
 	}
-	
 
-		
+
+
 	if(($a->argc > 1) && ($a->argv[1] === 'oauth')) {
-		
+
 		if(($a->argc > 2) && ($a->argv[2] === 'add')) {
 			$tpl = get_markup_template("settings_oauth_edit.tpl");
 			$o .= replace_macros($tpl, array(
@@ -608,18 +608,18 @@ function settings_content(&$a) {
 			));
 			return $o;
 		}
-		
+
 		if(($a->argc > 3) && ($a->argv[2] === 'edit')) {
 			$r = q("SELECT * FROM clients WHERE client_id='%s' AND uid=%d",
 					dbesc($a->argv[3]),
 					local_user());
-			
+
 			if (!count($r)){
 				notice(t("You can't edit this application."));
 				return;
 			}
 			$app = $r[0];
-			
+
 			$tpl = get_markup_template("settings_oauth_edit.tpl");
 			$o .= replace_macros($tpl, array(
 				'$form_security_token' => get_form_security_token("settings_oauth"),
@@ -634,18 +634,18 @@ function settings_content(&$a) {
 			));
 			return $o;
 		}
-		
+
 		if(($a->argc > 3) && ($a->argv[2] === 'delete')) {
 			check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't');
-		
+
 			$r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d",
 					dbesc($a->argv[3]),
 					local_user());
 			goaway($a->get_baseurl(true)."/settings/oauth/");
-			return;			
+			return;
 		}
-		
-		
+
+
 		$r = q("SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my 
 				FROM clients
 				LEFT JOIN tokens ON clients.client_id=tokens.client_id
@@ -754,11 +754,11 @@ function settings_content(&$a) {
 		else {
 			$mail_disabled_message = (($mail_disabled) ? t('Email access is disabled on this site.') : '');
 		}
-	
+
 
 		$o .= replace_macros($tpl, array(
 			'$form_security_token' => get_form_security_token("settings_connectors"),
-			
+
 			'$title'	=> t('Connector Settings'),
 
 			'$diasp_enabled' => $diasp_enabled,
@@ -801,14 +801,14 @@ function settings_content(&$a) {
 		$allowed_themes_raw = explode(',',$allowed_themes_str);
 		$allowed_themes = array();
 		if(count($allowed_themes_raw))
-			foreach($allowed_themes_raw as $x) 
+			foreach($allowed_themes_raw as $x)
 				if(strlen(trim($x)) && is_dir("view/theme/$x"))
 					$allowed_themes[] = trim($x);
 
-		
+
 		$themes = array();
 		$mobile_themes = array("---" => t('No special theme for mobile devices'));
-		$files = glob('view/theme/*');
+		$files = glob('view/theme/*'); /* */
 		if($allowed_themes) {
 			foreach($allowed_themes as $th) {
 				$f = $th;
@@ -905,13 +905,13 @@ function settings_content(&$a) {
 
 	$expire_items = get_pconfig(local_user(), 'expire','items');
 	$expire_items = (($expire_items===false)? '1' : $expire_items); // default if not set: 1
-	
+
 	$expire_notes = get_pconfig(local_user(), 'expire','notes');
 	$expire_notes = (($expire_notes===false)? '1' : $expire_notes); // default if not set: 1
 
 	$expire_starred = get_pconfig(local_user(), 'expire','starred');
 	$expire_starred = (($expire_starred===false)? '1' : $expire_starred); // default if not set: 1
-	
+
 	$expire_photos = get_pconfig(local_user(), 'expire','photos');
 	$expire_photos = (($expire_photos===false)? '0' : $expire_photos); // default if not set: 0
 
@@ -931,7 +931,8 @@ function settings_content(&$a) {
 	$post_profilechange = get_pconfig(local_user(), 'system','post_profilechange');
 	$post_profilechange = (($post_profilechange===false)? '0': $post_profilechange); // default if not set: 0
 
-	
+	// nowarn_insecure
+
 	if(! strlen($a->user['timezone']))
 		$timezone = date_default_timezone_get();
 
@@ -939,24 +940,24 @@ function settings_content(&$a) {
 
 	$pageset_tpl = get_markup_template('pagetypes.tpl');
 	$pagetype = replace_macros($pageset_tpl, array(
-		'$page_normal' 	=> array('page-flags', t('Normal Account Page'), PAGE_NORMAL, 
-									t('This account is a normal personal profile'), 
+		'$page_normal' 	=> array('page-flags', t('Normal Account Page'), PAGE_NORMAL,
+									t('This account is a normal personal profile'),
 									($a->user['page-flags'] == PAGE_NORMAL)),
-								
-		'$page_soapbox' 	=> array('page-flags', t('Soapbox Page'), PAGE_SOAPBOX, 
+
+		'$page_soapbox' 	=> array('page-flags', t('Soapbox Page'), PAGE_SOAPBOX,
 									t('Automatically approve all connection/friend requests as read-only fans'), 
 									($a->user['page-flags'] == PAGE_SOAPBOX)),
-									
-		'$page_community'	=> array('page-flags', t('Community Forum/Celebrity Account'), PAGE_COMMUNITY, 
+
+		'$page_community'	=> array('page-flags', t('Community Forum/Celebrity Account'), PAGE_COMMUNITY,
 									t('Automatically approve all connection/friend requests as read-write fans'), 
 									($a->user['page-flags'] == PAGE_COMMUNITY)),
-									
-		'$page_freelove' 	=> array('page-flags', t('Automatic Friend Page'), PAGE_FREELOVE, 
+
+		'$page_freelove' 	=> array('page-flags', t('Automatic Friend Page'), PAGE_FREELOVE,
 									t('Automatically approve all connection/friend requests as friends'), 
 									($a->user['page-flags'] == PAGE_FREELOVE)),
 
-		'$page_prvgroup' 	=> array('page-flags', t('Private Forum [Experimental]'), PAGE_PRVGROUP, 
-									t('Private forum - approved members only'), 
+		'$page_prvgroup' 	=> array('page-flags', t('Private Forum [Experimental]'), PAGE_PRVGROUP,
+									t('Private forum - approved members only'),
 									($a->user['page-flags'] == PAGE_PRVGROUP)),
 
 
@@ -1004,7 +1005,7 @@ function settings_content(&$a) {
 			'$field' 	=> array('blockwall',  t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'),t('Yes'))),
 
 	));
- 
+
 
 	$blocktags = replace_macros($opt_tpl,array(
 			'$field' 	=> array('blocktags',  t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'),t('Yes'))),
@@ -1134,10 +1135,10 @@ function settings_content(&$a) {
 		'$profile_in_net_dir' => $profile_in_net_dir,
 		'$hide_friends' => $hide_friends,
 		'$hide_wall' => $hide_wall,
-		'$unkmail' => $unkmail,		
+		'$unkmail' => $unkmail,
 		'$cntunkmail' 	=> array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail ,t("\x28to prevent spam abuse\x29")),
-		
-		
+
+
 		'$h_not' 	=> t('Notification Settings'),
 		'$activity_options' => t('By default post a status message when:'),
 		'$post_newfriend' => array('post_newfriend',  t('accepting a friend request'), $post_newfriend, ''),
@@ -1152,16 +1153,16 @@ function settings_content(&$a) {
 		'$notify6'  => array('notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''),		
 		'$notify7'  => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),		
 		'$notify8'  => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''),		
-		
-		
+
+
 		'$h_advn' => t('Advanced Account/Page Type Settings'),
 		'$h_descadvn' => t('Change the behaviour of this account for special situations'),
 		'$pagetype' => $pagetype,
-		
+
 		'$relocate' => t('Relocate'),
 		'$relocate_text' => t("If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."),
 		'$relocate_button' => t("Resend relocate message to contacts"),
-		
+
 	));
 
 	call_hooks('settings_form',$o);
-- 
2.39.5