added spaces + some curly braces + some usage of dbm::is_result()

Signed-off-by: Roland Haeder <roland@mxchange.org>

include/salmon.php

@@ -170,11 +170,14 @@ function slapper($owner, $url, $slap) {
 	}
 
 	logger('slapper for '.$url.' returned ' . $return_code);
+
 	if (! $return_code) {
-		return(-1);
+		return -1;
 	}
+
 	if (($return_code == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) {
-		return(-1);
+		return -1;
 	}
+
 	return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1);
 }

include/security.php

@@ -62,16 +62,17 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 			$a->module = 'profile_photo';
 			info( t("Welcome ") . $a->user['username'] . EOL);
 			info( t('Please upload a profile photo.') . EOL);
-		}
+		} else {
-		else
 			info( t("Welcome back ") . $a->user['username'] . EOL);
 		}
+	}
 
 	$member_since = strtotime($a->user['register_date']);
-	if(time() < ($member_since + ( 60 * 60 * 24 * 14)))
+	if (time() < ($member_since + ( 60 * 60 * 24 * 14))) {
 		$_SESSION['new_member'] = true;
-	else
+	} else {
 		$_SESSION['new_member'] = false;
+	}
 	if (strlen($a->user['timezone'])) {
 		date_default_timezone_set($a->user['timezone']);
 		$a->timezone = $a->user['timezone'];
@@ -80,34 +81,40 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 	$master_record = $a->user;
 
 	if ((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
-		$r = q("select * from user where uid = %d limit 1",
+		$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($_SESSION['submanage'])
 		);
-		if (dbm::is_result($r))
+		if (dbm::is_result($r)) {
 			$master_record = $r[0];
 		}
+	}
 
 	$r = q("SELECT `uid`,`username`,`nickname` FROM `user` WHERE `password` = '%s' AND `email` = '%s' AND `account_removed` = 0 ",
 		dbesc($master_record['password']),
 		dbesc($master_record['email'])
 	);
-	if (dbm::is_result($r))
+	if (dbm::is_result($r)) {
 		$a->identities = $r;
-	else
+	} else {
 		$a->identities = array();
+	}
 
-	$r = q("select `user`.`uid`, `user`.`username`, `user`.`nickname`
+	$r = q("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname`
-		from manage INNER JOIN user on manage.mid = user.uid where `user`.`account_removed` = 0
+		FROM `manage`
-		and `manage`.`uid` = %d",
+		INNER JOIN `user` ON `manage`.`mid` = `user`.`uid`
+		WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = %d",
 		intval($master_record['uid'])
 	);
-	if (dbm::is_result($r))
+	if (dbm::is_result($r)) {
 		$a->identities = array_merge($a->identities,$r);
+	}
 
-	if($login_initial)
+	if ($login_initial) {
 		logger('auth_identities: ' . print_r($a->identities,true), LOGGER_DEBUG);
-	if($login_refresh)
+	}
+	if ($login_refresh) {
 		logger('auth_identities refresh: ' . print_r($a->identities,true), LOGGER_DEBUG);
+	}
 
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
 		intval($_SESSION['uid']));
@@ -467,4 +474,3 @@ function init_groups_visitor($contact_id) {
 	}
 	return $groups;
 }}
-

include/socgraph.php

@@ -374,11 +374,13 @@ function link_gcontact($gcid, $uid = 0, $cid = 0, $zcid = 0) {
 
 function poco_reachable($profile, $server = "", $network = "", $force = false) {
 
-	if ($server == "")
+	if ($server == "") {
 		$server = poco_detect_server($profile);
+	}
 
-	if ($server == "")
+	if ($server == "") {
 		return true;
+	}
 
 	return poco_check_server($server, $network, $force);
 }
@@ -1165,10 +1167,11 @@ function poco_check_server($server_url, $network = "", $force = false) {
 					$network = NETWORK_DIASPORA;
 				}
 				if (isset($data->site->redmatrix)) {
-					if (isset($data->site->redmatrix->PLATFORM_NAME))
+					if (isset($data->site->redmatrix->PLATFORM_NAME)) {
 						$platform = $data->site->redmatrix->PLATFORM_NAME;
-					elseif (isset($data->site->redmatrix->RED_PLATFORM))
+					} elseif (isset($data->site->redmatrix->RED_PLATFORM)) {
 						$platform = $data->site->redmatrix->RED_PLATFORM;
+					}
 
 					$version = $data->site->redmatrix->RED_VERSION;
 					$network = NETWORK_DIASPORA;
@@ -1185,15 +1188,16 @@ function poco_check_server($server_url, $network = "", $force = false) {
 				$data->site->private = poco_to_boolean($data->site->private);
 				$data->site->inviteonly = poco_to_boolean($data->site->inviteonly);
 
-				if (!$data->site->closed AND !$data->site->private and $data->site->inviteonly)
+				if (!$data->site->closed AND !$data->site->private and $data->site->inviteonly) {
 					$register_policy = REGISTER_APPROVE;
-				elseif (!$data->site->closed AND !$data->site->private)
+				} elseif (!$data->site->closed AND !$data->site->private) {
 					$register_policy = REGISTER_OPEN;
-				else
+				} else {
 					$register_policy = REGISTER_CLOSED;
 				}
 			}
 		}
+	}
 
 	// Query statistics.json. Optional package for Diaspora, Friendica and Redmatrix
 	if (!$failure) {
@@ -1254,8 +1258,9 @@ function poco_check_server($server_url, $network = "", $force = false) {
 	if (!$failure AND in_array($network, array(NETWORK_DFRN, NETWORK_OSTATUS))) {
 		$serverret = z_fetch_url($server_url."/friendica/json");
 
-		if (!$serverret["success"])
+		if (!$serverret["success"]) {
 			$serverret = z_fetch_url($server_url."/friendika/json");
+		}
 
 		if ($serverret["success"]) {
 			$data = json_decode($serverret["body"]);
@@ -1374,10 +1379,11 @@ function count_common_friends($uid,$cid) {
 
 function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) {
 
-	if($shuffle)
+	if ($shuffle) {
 		$sql_extra = " order by rand() ";
-	else
+	} else {
 		$sql_extra = " order by `gcontact`.`name` asc ";
+	}
 
 	$r = q("SELECT `gcontact`.*, `contact`.`id` AS `cid`
 		FROM `glink`
@@ -1396,6 +1402,7 @@ function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) {
 		intval($limit)
 	);
 
+	/// @TODO Check all calling-findings of this function if they properly use dbm::is_result()
 	return $r;
 
 }
@@ -1435,6 +1442,7 @@ function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle = fal
 		intval($limit)
 	);
 
+	/// @TODO Check all calling-findings of this function if they properly use dbm::is_result()
 	return $r;
 
 }
@@ -1450,8 +1458,9 @@ function count_all_friends($uid,$cid) {
 		intval($uid)
 	);
 
-	if (dbm::is_result($r))
+	if (dbm::is_result($r)) {
 		return $r[0]['total'];
+	}
 	return 0;
 
 }
@@ -1473,6 +1482,7 @@ function all_friends($uid,$cid,$start = 0, $limit = 80) {
 		intval($limit)
 	);
 
+	/// @TODO Check all calling-findings of this function if they properly use dbm::is_result()
 	return $r;
 }
 
@@ -1493,11 +1503,13 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 
 	$network = array(NETWORK_DFRN);
 
-	if (get_config('system','diaspora_enabled'))
+	if (get_config('system','diaspora_enabled')) {
 		$network[] = NETWORK_DIASPORA;
+	}
 
-	if (!get_config('system','ostatus_disabled'))
+	if (!get_config('system','ostatus_disabled')) {
 		$network[] = NETWORK_OSTATUS;
+	}
 
 	$sql_network = implode("', '", $network);
 	$sql_network = "'".$sql_network."'";
@@ -1550,14 +1562,17 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 	);
 
 	$list = array();
-	foreach ($r2 AS $suggestion)
+	foreach ($r2 AS $suggestion) {
 		$list[$suggestion["nurl"]] = $suggestion;
+	}
 
-	foreach ($r AS $suggestion)
+	foreach ($r AS $suggestion) {
 		$list[$suggestion["nurl"]] = $suggestion;
+	}
 
-	while (sizeof($list) > ($limit))
+	while (sizeof($list) > ($limit)) {
 		array_pop($list);
+	}
 
 // Uncommented because the result of the queries are to big to store it in the cache.
 // We need to decide if we want to change the db column type or if we want to delete it.
@@ -1602,11 +1617,12 @@ function update_suggestions() {
 	if (dbm::is_result($r)) {
 		foreach ($r as $rr) {
 			$base = substr($rr['poco'],0,strrpos($rr['poco'],'/'));
-			if(! in_array($base,$done))
+			if (! in_array($base,$done)) {
 				poco_load(0,0,0,$base);
 			}
 		}
 	}
+}
 
 /**
  * @brief Fetch server list from remote servers and adds them when they are new.
@@ -1640,9 +1656,10 @@ function poco_discover_federation() {
 
 	if ($last) {
 		$next = $last + (24 * 60 * 60);
-		if($next > time())
+		if ($next > time()) {
 			return;
 		}
+	}
 
 	// Discover Friendica, Hubzilla and Diaspora servers
 	$serverdata = fetch_url("http://the-federation.info/pods.json");
@@ -1785,19 +1802,21 @@ function poco_discover($complete = false) {
 
 function poco_discover_server_users($data, $server) {
 
-	if (!isset($data->entry))
+	if (!isset($data->entry)) {
 		return;
+	}
 
 	foreach ($data->entry AS $entry) {
 		$username = "";
 		if (isset($entry->urls)) {
-			foreach($entry->urls as $url)
+			foreach ($entry->urls as $url) {
 				if ($url->type == 'profile') {
 					$profile_url = $url->value;
 					$urlparts = parse_url($profile_url);
 					$username = end(explode("/", $urlparts["path"]));
 				}
 			}
+		}
 		if ($username != "") {
 			logger("Fetch contacts for the user ".$username." from the server ".$server["nurl"], LOGGER_DEBUG);
 
@@ -1805,16 +1824,18 @@ function poco_discover_server_users($data, $server) {
 			$url = $server["poco"]."/".$username."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
 
 			$retdata = z_fetch_url($url);
-			if ($retdata["success"])
+			if ($retdata["success"]) {
 				poco_discover_server(json_decode($retdata["body"]), 3);
 			}
 		}
 	}
+}
 
 function poco_discover_server($data, $default_generation = 0) {
 
-	if (!isset($data->entry) OR !count($data->entry))
+	if (!isset($data->entry) OR !count($data->entry)) {
 		return false;
+	}
 
 	$success = false;
 
@@ -1930,19 +1951,23 @@ function poco_discover_server($data, $default_generation = 0) {
 function clean_contact_url($url) {
 	$parts = parse_url($url);
 
-	if (!isset($parts["scheme"]) OR !isset($parts["host"]))
+	if (!isset($parts["scheme"]) OR !isset($parts["host"])) {
 		return $url;
+	}
 
 	$new_url = $parts["scheme"]."://".$parts["host"];
 
-	if (isset($parts["port"]))
+	if (isset($parts["port"])) {
 		$new_url .= ":".$parts["port"];
+	}
 
-	if (isset($parts["path"]))
+	if (isset($parts["path"])) {
 		$new_url .= $parts["path"];
+	}
 
-	if ($new_url != $url)
+	if ($new_url != $url) {
 		logger("Cleaned contact url ".$url." to ".$new_url." - Called by: ".App::callstack(), LOGGER_DEBUG);
+	}
 
 	return $new_url;
 }
@@ -1981,24 +2006,28 @@ function get_gcontact_id($contact) {
 		return false;
 	}
 
-	if ($contact["network"] == NETWORK_STATUSNET)
+	/// @TODO backward-compatibility or old-lost code?
+	if ($contact["network"] == NETWORK_STATUSNET) {
 		$contact["network"] = NETWORK_OSTATUS;
+	}
 
 	// All new contacts are hidden by default
-	if (!isset($contact["hide"]))
+	if (!isset($contact["hide"])) {
 		$contact["hide"] = true;
+	}
 
 	// Replace alternate OStatus user format with the primary one
 	fix_alternate_contact_address($contact);
 
 	// Remove unwanted parts from the contact url (e.g. "?zrl=...")
-	if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
+	if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
 		$contact["url"] = clean_contact_url($contact["url"]);
+	}
 
 	$r = q("SELECT `id`, `last_contact`, `last_failure`, `network` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 2",
 		dbesc(normalise_link($contact["url"])));
 
-	if ($r) {
+	if (dbm::is_result($r)) {
 		$gcontact_id = $r[0]["id"];
 
 		// Update every 90 days
@@ -2030,7 +2059,7 @@ function get_gcontact_id($contact) {
 		$r = q("SELECT `id`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2",
 			dbesc(normalise_link($contact["url"])));
 
-		if ($r) {
+		if (dbm::is_result($r)) {
 			$gcontact_id = $r[0]["id"];
 
 			$doprobing = in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""));
@@ -2042,10 +2071,11 @@ function get_gcontact_id($contact) {
 		proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($contact["url"]));
 	}
 
-	if ((dbm::is_result($r)) AND (count($r) > 1) AND ($gcontact_id > 0) AND ($contact["url"] != ""))
+	if ((dbm::is_result($r)) AND (count($r) > 1) AND ($gcontact_id > 0) AND ($contact["url"] != "")) {
 		q("DELETE FROM `gcontact` WHERE `nurl` = '%s' AND `id` != %d",
 			dbesc(normalise_link($contact["url"])),
 			intval($gcontact_id));
+	}
 
 	return $gcontact_id;
 }
@@ -2067,8 +2097,9 @@ function update_gcontact($contact) {
 
 	$gcontact_id = get_gcontact_id($contact);
 
-	if (!$gcontact_id)
+	if (!$gcontact_id) {
 		return false;
+	}
 
 	$r = q("SELECT `name`, `nick`, `photo`, `location`, `about`, `addr`, `generation`, `birthday`, `gender`, `keywords`,
 			`contact-type`, `hide`, `nsfw`, `network`, `alias`, `notify`, `server_url`, `connect`, `updated`, `url`
@@ -2077,8 +2108,9 @@ function update_gcontact($contact) {
 
 	// Get all field names
 	$fields = array();
-	foreach ($r[0] AS $field => $data)
+	foreach ($r[0] AS $field => $data) {
 		$fields[$field] = $data;
+	}
 
 	unset($fields["url"]);
 	unset($fields["updated"]);
@@ -2086,47 +2118,59 @@ function update_gcontact($contact) {
 
 	// Bugfix: We had an error in the storing of keywords which lead to the "0"
 	// This value is still transmitted via poco.
-	if ($contact["keywords"] == "0")
+	if ($contact["keywords"] == "0") {
 		unset($contact["keywords"]);
+	}
 
-	if ($r[0]["keywords"] == "0")
+	if ($r[0]["keywords"] == "0") {
 		$r[0]["keywords"] = "";
+	}
 
 	// assign all unassigned fields from the database entry
-	foreach ($fields AS $field => $data)
+	foreach ($fields AS $field => $data) {
-		if (!isset($contact[$field]) OR ($contact[$field] == ""))
+		if (!isset($contact[$field]) OR ($contact[$field] == "")) {
 			$contact[$field] = $r[0][$field];
+		}
+	}
 
-	if (!isset($contact["hide"]))
+	if (!isset($contact["hide"])) {
 		$contact["hide"] = $r[0]["hide"];
+	}
 
 	$fields["hide"] = $r[0]["hide"];
 
-	if ($contact["network"] == NETWORK_STATUSNET)
+	/// @TODO backward-compatibility or old-lost code?
+	if ($contact["network"] == NETWORK_STATUSNET) {
 		$contact["network"] = NETWORK_OSTATUS;
+	}
 
 	// Replace alternate OStatus user format with the primary one
 	fix_alternate_contact_address($contact);
 
-	if (!isset($contact["updated"]))
+	if (!isset($contact["updated"])) {
 		$contact["updated"] = dbm::date();
+	}
 
 	if ($contact["server_url"] == "") {
 		$server_url = $contact["url"];
 
 		$server_url = matching_url($server_url, $contact["alias"]);
-		if ($server_url != "")
+		if ($server_url != "") {
 			$contact["server_url"] = $server_url;
+		}
 
 		$server_url = matching_url($server_url, $contact["photo"]);
-		if ($server_url != "")
+		if ($server_url != "") {
 			$contact["server_url"] = $server_url;
+		}
 
 		$server_url = matching_url($server_url, $contact["notify"]);
-		if ($server_url != "")
+		if ($server_url != "") {
 			$contact["server_url"] = $server_url;
-	} else
+		}
+	} else {
 		$contact["server_url"] = normalise_link($contact["server_url"]);
+	}
 
 	if (($contact["addr"] == "") AND ($contact["server_url"] != "") AND ($contact["nick"] != "")) {
 		$hostname = str_replace("http://", "", $contact["server_url"]);
@@ -2138,11 +2182,12 @@ function update_gcontact($contact) {
 	unset($fields["generation"]);
 
 	if ((($contact["generation"] > 0) AND ($contact["generation"] <= $r[0]["generation"])) OR ($r[0]["generation"] == 0)) {
-		foreach ($fields AS $field => $data)
+		foreach ($fields AS $field => $data) {
 			if ($contact[$field] != $r[0][$field]) {
 				logger("Difference for contact ".$contact["url"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
 				$update = true;
 			}
+		}
 
 		if ($contact["generation"] < $r[0]["generation"]) {
 			logger("Difference for contact ".$contact["url"]." in field 'generation'. new value: '".$contact["generation"]."', old value '".$r[0]["generation"]."'", LOGGER_DEBUG);
@@ -2174,7 +2219,7 @@ function update_gcontact($contact) {
 		$r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0 ORDER BY `id` LIMIT 1",
 			dbesc(normalise_link($contact["url"])));
 
-		if ($r) {
+		if (dbm::is_result($r)) {
 			logger("Update shadow contact ".$r[0]["id"], LOGGER_DEBUG);
 
 			update_contact_avatar($contact["photo"], 0, $r[0]["id"]);

include/tags.php

@@ -108,10 +108,11 @@ function create_tags_from_itemuri($itemuri, $uid) {
 	$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
 	if (count($messages)) {
-		foreach ($messages as $message)
+		foreach ($messages as $message) {
 			create_tags_from_item($message["id"]);
 		}
 	}
+}
 
 function update_items() {
 

include/template_processor.php

@@ -109,14 +109,16 @@ class Template implements ITemplateEngine {
 		//$vals = $this->r[$m[0]];
 		$vals = $this->_get_var($m[0]);
 		$ret = "";
-		if (!is_array($vals))
+		if (!is_array($vals)) {
 			return $ret;
+		}
 		foreach ($vals as $k => $v) {
 			$this->_push_stack();
 			$r = $this->r;
 			$r[$varname] = $v;
-			if ($keyname != '')
+			if ($keyname != '') {
 				$r[$keyname] = (($k === 0) ? '0' : $k);
+			}
 			$ret .= $this->replace($args[3], $r);
 			$this->_pop_stack();
 		}

include/text.php

@@ -2228,7 +2228,6 @@ function text_highlight($s, $lang) {
 	$o = $hl->highlight($s);
 	$o = str_replace("\n", '', $o);
 
-
 	if ($tag_added) {
 		$b = substr($o, 0, strpos($o, '<li>'));
 		$e = substr($o, strpos($o, '</li>'));

include/threads.php

@@ -177,29 +177,34 @@ function add_shadow_entry($itemid) {
 function update_thread_uri($itemuri, $uid) {
 	$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
-	if (dbm::is_result($messages))
+	if (dbm::is_result($messages)) {
-		foreach ($messages as $message)
+		foreach ($messages as $message) {
 			update_thread($message["id"]);
 		}
+	}
+}
 
 function update_thread($itemid, $setmention = false) {
 	$items = q("SELECT `uid`, `guid`, `title`, `body`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`, `gcontact-id`,
 			`deleted`, `origin`, `forum_mode`, `network`, `rendered-html`, `rendered-hash` FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid));
 
-	if (!dbm::is_result($items))
+	if (!dbm::is_result($items)) {
 		return;
+	}
 
 	$item = $items[0];
 
-	if ($setmention)
+	if ($setmention) {
 		$item["mention"] = 1;
+	}
 
 	$sql = "";
 
 	foreach ($item AS $field => $data)
 		if (!in_array($field, array("guid", "title", "body", "rendered-html", "rendered-hash"))) {
-			if ($sql != "")
+			if ($sql != "") {
 				$sql .= ", ";
+			}
 
 			$sql .= "`".$field."` = '".dbesc($data)."'";
 		}
@@ -211,8 +216,9 @@ function update_thread($itemid, $setmention = false) {
 	// Updating a shadow item entry
 	$items = q("SELECT `id` FROM `item` WHERE `guid` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item["guid"]));
 
-	if (!$items)
+	if (!dbm::is_result($items)) {
 		return;
+	}
 
 	$result = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `rendered-html` = '%s', `rendered-hash` = '%s' WHERE `id` = %d",
 			dbesc($item["title"]),
@@ -227,10 +233,12 @@ function update_thread($itemid, $setmention = false) {
 function delete_thread_uri($itemuri, $uid) {
 	$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
-	if(count($messages))
+	if (dbm::is_result($messages)) {
-		foreach ($messages as $message)
+		foreach ($messages as $message) {
 			delete_thread($message["id"], $itemuri);
 		}
+	}
+}
 
 function delete_thread($itemid, $itemuri = "") {
 	$item = q("SELECT `uid` FROM `thread` WHERE `iid` = %d", intval($itemid));