X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsocgraph.php;h=55e0e6fc3a98a560c32573c442707e7c39de878a;hb=33b61ab26283deccb9ecf7f7b28fce7aa27ef2f1;hp=7fa73a45ca2d8ce572d734bd18192dba890e7553;hpb=4e49939421d39dfa971d8744691568bcdbdca15e;p=friendica.git

diff --git a/include/socgraph.php b/include/socgraph.php
index 7fa73a45ca..55e0e6fc3a 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -38,7 +38,7 @@ require_once 'include/Photo.php';
  */
 function poco_load($cid, $uid = 0, $zcid = 0, $url = null) {
 	// Call the function "poco_load_worker" via the worker
-	proc_run(PRIORITY_LOW, "include/discover_poco.php", "poco_load", intval($cid), intval($uid), intval($zcid), base64_encode($url));
+	proc_run(PRIORITY_LOW, "include/discover_poco.php", "poco_load", (int)$cid, (int)$uid, (int)$zcid, $url);
 }
 
 /**
@@ -63,12 +63,14 @@ function poco_load_worker($cid, $uid, $zcid, $url) {
 				$uid = $r[0]['uid'];
 			}
 		}
-		if (! $uid)
+		if (! $uid) {
 			return;
+		}
 	}
 
-	if (! $url)
+	if (! $url) {
 		return;
+	}
 
 	$url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation') ;
 
@@ -80,15 +82,17 @@ function poco_load_worker($cid, $uid, $zcid, $url) {
 
 	logger('poco_load: return code: ' . $a->get_curl_code(), LOGGER_DEBUG);
 
-	if (($a->get_curl_code() > 299) || (! $s))
+	if (($a->get_curl_code() > 299) || (! $s)) {
 		return;
+	}
 
 	$j = json_decode($s);
 
 	logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA);
 
-	if (! isset($j->entry))
+	if (! isset($j->entry)) {
 		return;
+	}
 
 	$total = 0;
 	foreach ($j->entry as $entry) {
@@ -160,8 +164,9 @@ function poco_load_worker($cid, $uid, $zcid, $url) {
 			}
 		}
 
-		if (isset($entry->contactType) && ($entry->contactType >= 0))
+		if (isset($entry->contactType) && ($entry->contactType >= 0)) {
 			$contact_type = $entry->contactType;
+		}
 
 		$gcontact = array("url" => $profile_url,
 				"name" => $name,
@@ -267,7 +272,7 @@ function sanitize_gcontact($gcontact) {
 		dbesc(normalise_link($gcontact['url']))
 	);
 
-	if (count($x)) {
+	if (dbm::is_result($x)) {
 		if (!isset($gcontact['network']) && ($x[0]["network"] != NETWORK_STATUSNET)) {
 			$gcontact['network'] = $x[0]["network"];
 		}
@@ -299,7 +304,7 @@ function sanitize_gcontact($gcontact) {
 		if ($alternate && ($gcontact['network'] == NETWORK_OSTATUS)) {
 			// Delete the old entry - if it exists
 			$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
-			if ($r) {
+			if (dbm::is_result($r)) {
 				q("DELETE FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
 				q("DELETE FROM `glink` WHERE `gcid` = %d", intval($r[0]["id"]));
 			}
@@ -353,6 +358,7 @@ function link_gcontact($gcid, $uid = 0, $cid = 0, $zcid = 0) {
 		intval($gcid),
 		intval($zcid)
 	);
+
 	if (!dbm::is_result($r)) {
 		q("INSERT INTO `glink` (`cid`, `uid`, `gcid`, `zcid`, `updated`) VALUES (%d, %d, %d, %d, '%s') ",
 			intval($cid),
@@ -663,7 +669,7 @@ function poco_last_updated($profile, $force = false) {
 
 	$last_updated = "";
 
-	foreach ($entries AS $entry) {
+	foreach ($entries as $entry) {
 		$published = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
 		$updated = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue;
 
@@ -696,48 +702,55 @@ function poco_last_updated($profile, $force = false) {
 function poco_do_update($created, $updated, $last_failure,  $last_contact) {
 	$now = strtotime(datetime_convert());
 
-	if ($updated > $last_contact)
+	if ($updated > $last_contact) {
 		$contact_time = strtotime($updated);
-	else
+	} else {
 		$contact_time = strtotime($last_contact);
+	}
 
 	$failure_time = strtotime($last_failure);
 	$created_time = strtotime($created);
 
 	// If there is no "created" time then use the current time
-	if ($created_time <= 0)
+	if ($created_time <= 0) {
 		$created_time = $now;
+	}
 
 	// If the last contact was less than 24 hours then don't update
-	if (($now - $contact_time) < (60 * 60 * 24))
+	if (($now - $contact_time) < (60 * 60 * 24)) {
 		return false;
+	}
 
 	// If the last failure was less than 24 hours then don't update
-	if (($now - $failure_time) < (60 * 60 * 24))
+	if (($now - $failure_time) < (60 * 60 * 24)) {
 		return false;
+	}
 
 	// If the last contact was less than a week ago and the last failure is older than a week then don't update
 	//if ((($now - $contact_time) < (60 * 60 * 24 * 7)) && ($contact_time > $failure_time))
 	//	return false;
 
 	// If the last contact time was more than a week ago and the contact was created more than a week ago, then only try once a week
-	if ((($now - $contact_time) > (60 * 60 * 24 * 7)) && (($now - $created_time) > (60 * 60 * 24 * 7)) && (($now - $failure_time) < (60 * 60 * 24 * 7)))
+	if ((($now - $contact_time) > (60 * 60 * 24 * 7)) && (($now - $created_time) > (60 * 60 * 24 * 7)) && (($now - $failure_time) < (60 * 60 * 24 * 7))) {
 		return false;
+	}
 
 	// If the last contact time was more than a month ago and the contact was created more than a month ago, then only try once a month
-	if ((($now - $contact_time) > (60 * 60 * 24 * 30)) && (($now - $created_time) > (60 * 60 * 24 * 30)) && (($now - $failure_time) < (60 * 60 * 24 * 30)))
+	if ((($now - $contact_time) > (60 * 60 * 24 * 30)) && (($now - $created_time) > (60 * 60 * 24 * 30)) && (($now - $failure_time) < (60 * 60 * 24 * 30))) {
 		return false;
+	}
 
 	return true;
 }
 
 function poco_to_boolean($val) {
-	if (($val == "true") || ($val == 1))
-		return(true);
-	if (($val == "false") || ($val == 0))
-		return(false);
+	if (($val == "true") || ($val == 1)) {
+		return true;
+	} elseif (($val == "false") || ($val == 0)) {
+		return false;
+	}
 
-	return ($val);
+	return $val;
 }
 
 /**
@@ -765,7 +778,7 @@ function poco_detect_poco_data($data) {
 		return false;
 	}
 
-	foreach ($data->entry[0]->urls AS $url) {
+	foreach ($data->entry[0]->urls as $url) {
 		if ($url->type == 'zot') {
 			$server = array();
 			$server["platform"] = 'Hubzilla';
@@ -800,7 +813,7 @@ function poco_fetch_nodeinfo($server_url) {
 
 	$nodeinfo_url = '';
 
-	foreach ($nodeinfo->links AS $link) {
+	foreach ($nodeinfo->links as $link) {
 		if ($link->rel == 'http://nodeinfo.diaspora.software/ns/schema/1.0') {
 			$nodeinfo_url = $link->href;
 		}
@@ -853,7 +866,7 @@ function poco_fetch_nodeinfo($server_url) {
 	$gnusocial = false;
 
 	if (is_array($nodeinfo->protocols->inbound)) {
-		foreach ($nodeinfo->protocols->inbound AS $inbound) {
+		foreach ($nodeinfo->protocols->inbound as $inbound) {
 			if ($inbound == 'diaspora') {
 				$diaspora = true;
 			}
@@ -928,13 +941,11 @@ function poco_detect_server_type($body) {
 					$attr[$attribute->name] = $attribute->value;
 				}
 			}
-			if ($attr['property'] == 'generator') {
-				if (in_array($attr['content'], array("hubzilla", "BlaBlaNet"))) {
-					$server = array();
-					$server["platform"] = $attr['content'];
-					$server["version"] = "";
-					$server["network"] = NETWORK_DIASPORA;
-				}
+			if ($attr['property'] == 'generator' && in_array($attr['content'], array("hubzilla", "BlaBlaNet"))) {
+				$server = array();
+				$server["platform"] = $attr['content'];
+				$server["version"] = "";
+				$server["network"] = NETWORK_DIASPORA;
 			}
 		}
 	}
@@ -953,8 +964,9 @@ function poco_check_server($server_url, $network = "", $force = false) {
 	$server_url = trim($server_url, "/");
 	$server_url = str_replace("/index.php", "", $server_url);
 
-	if ($server_url == "")
+	if ($server_url == "") {
 		return false;
+	}
 
 	$servers = q("SELECT * FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
 	if (dbm::is_result($servers)) {
@@ -966,8 +978,9 @@ function poco_check_server($server_url, $network = "", $force = false) {
 		$poco = $servers[0]["poco"];
 		$noscrape = $servers[0]["noscrape"];
 
-		if ($network == "")
+		if ($network == "") {
 			$network = $servers[0]["network"];
+		}
 
 		$last_contact = $servers[0]["last_contact"];
 		$last_failure = $servers[0]["last_failure"];
@@ -1146,54 +1159,78 @@ function poco_check_server($server_url, $network = "", $force = false) {
 	}
 
 	if (!$failure) {
-		// Test for Hubzilla, Redmatrix or Friendica
-		$serverret = z_fetch_url($server_url."/api/statusnet/config.json");
+		// Test for Hubzilla and Red
+		$serverret = z_fetch_url($server_url."/siteinfo.json");
 		if ($serverret["success"]) {
 			$data = json_decode($serverret["body"]);
-			if (isset($data->site->server)) {
-				if (isset($data->site->platform)) {
-					$platform = $data->site->platform->PLATFORM_NAME;
-					$version = $data->site->platform->STD_VERSION;
-					$network = NETWORK_DIASPORA;
-				}
-				if (isset($data->site->BlaBlaNet)) {
-					$platform = $data->site->BlaBlaNet->PLATFORM_NAME;
-					$version = $data->site->BlaBlaNet->STD_VERSION;
-					$network = NETWORK_DIASPORA;
-				}
-				if (isset($data->site->hubzilla)) {
-					$platform = $data->site->hubzilla->PLATFORM_NAME;
-					$version = $data->site->hubzilla->RED_VERSION;
-					$network = NETWORK_DIASPORA;
-				}
-				if (isset($data->site->redmatrix)) {
-					if (isset($data->site->redmatrix->PLATFORM_NAME)) {
-						$platform = $data->site->redmatrix->PLATFORM_NAME;
-					} elseif (isset($data->site->redmatrix->RED_PLATFORM)) {
-						$platform = $data->site->redmatrix->RED_PLATFORM;
+			if (isset($data->url)) {
+				$platform = $data->platform;
+				$version = $data->version;
+				$network = NETWORK_DIASPORA;
+			}
+			$site_name = $data->site_name;
+			switch ($data->register_policy) {
+				case "REGISTER_OPEN":
+					$register_policy = REGISTER_OPEN;
+					break;
+				case "REGISTER_APPROVE":
+					$register_policy = REGISTER_APPROVE;
+					break;
+				case "REGISTER_CLOSED":
+				default:
+					$register_policy = REGISTER_CLOSED;
+					break;
+			}
+		} else {
+			// Test for Hubzilla, Redmatrix or Friendica
+			$serverret = z_fetch_url($server_url."/api/statusnet/config.json");
+			if ($serverret["success"]) {
+				$data = json_decode($serverret["body"]);
+				if (isset($data->site->server)) {
+					if (isset($data->site->platform)) {
+						$platform = $data->site->platform->PLATFORM_NAME;
+						$version = $data->site->platform->STD_VERSION;
+						$network = NETWORK_DIASPORA;
 					}
+					if (isset($data->site->BlaBlaNet)) {
+						$platform = $data->site->BlaBlaNet->PLATFORM_NAME;
+						$version = $data->site->BlaBlaNet->STD_VERSION;
+						$network = NETWORK_DIASPORA;
+					}
+					if (isset($data->site->hubzilla)) {
+						$platform = $data->site->hubzilla->PLATFORM_NAME;
+						$version = $data->site->hubzilla->RED_VERSION;
+						$network = NETWORK_DIASPORA;
+					}
+					if (isset($data->site->redmatrix)) {
+						if (isset($data->site->redmatrix->PLATFORM_NAME)) {
+							$platform = $data->site->redmatrix->PLATFORM_NAME;
+						} elseif (isset($data->site->redmatrix->RED_PLATFORM)) {
+							$platform = $data->site->redmatrix->RED_PLATFORM;
+						}
 
-					$version = $data->site->redmatrix->RED_VERSION;
-					$network = NETWORK_DIASPORA;
-				}
-				if (isset($data->site->friendica)) {
-					$platform = $data->site->friendica->FRIENDICA_PLATFORM;
-					$version = $data->site->friendica->FRIENDICA_VERSION;
-					$network = NETWORK_DFRN;
-				}
+						$version = $data->site->redmatrix->RED_VERSION;
+						$network = NETWORK_DIASPORA;
+					}
+					if (isset($data->site->friendica)) {
+						$platform = $data->site->friendica->FRIENDICA_PLATFORM;
+						$version = $data->site->friendica->FRIENDICA_VERSION;
+						$network = NETWORK_DFRN;
+					}
 
-				$site_name = $data->site->name;
+					$site_name = $data->site->name;
 
-				$data->site->closed = poco_to_boolean($data->site->closed);
-				$data->site->private = poco_to_boolean($data->site->private);
-				$data->site->inviteonly = poco_to_boolean($data->site->inviteonly);
+					$data->site->closed = poco_to_boolean($data->site->closed);
+					$data->site->private = poco_to_boolean($data->site->private);
+					$data->site->inviteonly = poco_to_boolean($data->site->inviteonly);
 
-				if (!$data->site->closed && !$data->site->private and $data->site->inviteonly) {
-					$register_policy = REGISTER_APPROVE;
-				} elseif (!$data->site->closed && !$data->site->private) {
-					$register_policy = REGISTER_OPEN;
-				} else {
-					$register_policy = REGISTER_CLOSED;
+					if (!$data->site->closed && !$data->site->private and $data->site->inviteonly) {
+						$register_policy = REGISTER_APPROVE;
+					} elseif (!$data->site->closed && !$data->site->private) {
+						$register_policy = REGISTER_OPEN;
+					} else {
+						$register_policy = REGISTER_CLOSED;
+					}
 				}
 			}
 		}
@@ -1304,7 +1341,7 @@ function poco_check_server($server_url, $network = "", $force = false) {
 
 	if (($last_contact <= $last_failure) && !$failure) {
 		logger("Server ".$server_url." seems to be alive, but last contact wasn't set - could be a bug", LOGGER_DEBUG);
-	} else if (($last_contact >= $last_failure) && $failure) {
+	} elseif (($last_contact >= $last_failure) && $failure) {
 		logger("Server ".$server_url." seems to be dead, but last failure wasn't set - could be a bug", LOGGER_DEBUG);
 	}
 
@@ -1351,12 +1388,12 @@ function poco_check_server($server_url, $network = "", $force = false) {
 				dbesc(datetime_convert())
 		);
 	}
-	logger("End discovery for server ".$server_url, LOGGER_DEBUG);
+	logger("End discovery for server " . $server_url, LOGGER_DEBUG);
 
 	return !$failure;
 }
 
-function count_common_friends($uid,$cid) {
+function count_common_friends($uid, $cid) {
 
 	$r = q("SELECT count(*) as `total`
 		FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
@@ -1369,15 +1406,16 @@ function count_common_friends($uid,$cid) {
 		intval($cid)
 	);
 
-//	logger("count_common_friends: $uid $cid {$r[0]['total']}");
-	if (dbm::is_result($r))
+	// logger("count_common_friends: $uid $cid {$r[0]['total']}");
+	if (dbm::is_result($r)) {
 		return $r[0]['total'];
+	}
 	return 0;
 
 }
 
 
-function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) {
+function common_friends($uid, $cid, $start = 0, $limit = 9999, $shuffle = false) {
 
 	if ($shuffle) {
 		$sql_extra = " order by rand() ";
@@ -1408,7 +1446,7 @@ function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) {
 }
 
 
-function count_common_friends_zcid($uid,$zcid) {
+function count_common_friends_zcid($uid, $zcid) {
 
 	$r = q("SELECT count(*) as `total`
 		FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
@@ -1418,18 +1456,20 @@ function count_common_friends_zcid($uid,$zcid) {
 		intval($uid)
 	);
 
-	if (dbm::is_result($r))
+	if (dbm::is_result($r)) {
 		return $r[0]['total'];
+	}
 	return 0;
 
 }
 
-function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle = false) {
+function common_friends_zcid($uid, $zcid, $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`.*
 		FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
@@ -1448,7 +1488,7 @@ function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle = fal
 }
 
 
-function count_all_friends($uid,$cid) {
+function count_all_friends($uid, $cid) {
 
 	$r = q("SELECT count(*) as `total`
 		FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
@@ -1466,7 +1506,7 @@ function count_all_friends($uid,$cid) {
 }
 
 
-function all_friends($uid,$cid,$start = 0, $limit = 80) {
+function all_friends($uid, $cid, $start = 0, $limit = 80) {
 
 	$r = q("SELECT `gcontact`.*, `contact`.`id` AS `cid`
 		FROM `glink`
@@ -1494,12 +1534,14 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 		return array();
 	}
 
-// 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.
-//	$list = Cache::get("suggestion_query:".$uid.":".$start.":".$limit);
-//	if (!is_null($list)) {
-//		return $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.
+	 */
+	//$list = Cache::get("suggestion_query:".$uid.":".$start.":".$limit);
+	//if (!is_null($list)) {
+	//	return $list;
+	//}
 
 	$network = array(NETWORK_DFRN);
 
@@ -1536,9 +1578,11 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 	);
 
 	if (dbm::is_result($r) && count($r) >= ($limit -1)) {
-// 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.
-//		Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $r, CACHE_FIVE_MINUTES);
+		/*
+		 * 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.
+		 */
+		//Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $r, CACHE_FIVE_MINUTES);
 
 		return $r;
 	}
@@ -1562,11 +1606,11 @@ 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;
 	}
 
@@ -1574,9 +1618,11 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 		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.
-//	Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $list, CACHE_FIVE_MINUTES);
+	/*
+	 * 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.
+	 */
+	//Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $list, CACHE_FIVE_MINUTES);
 	return $list;
 }
 
@@ -1587,7 +1633,7 @@ function update_suggestions() {
 	$done = array();
 
 	/// @TODO Check if it is really neccessary to poll the own server
-	poco_load(0,0,0,App::get_baseurl() . '/poco');
+	poco_load(0, 0, 0, App::get_baseurl() . '/poco');
 
 	$done[] = App::get_baseurl() . '/poco';
 
@@ -1640,13 +1686,13 @@ function poco_fetch_serverlist($poco) {
 		return;
 	}
 
-	foreach ($serverlist AS $server) {
+	foreach ($serverlist as $server) {
 		$server_url = str_replace("/index.php", "", $server->url);
 
 		$r = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
 		if (!dbm::is_result($r)) {
 			logger("Call server check for server ".$server_url, LOGGER_DEBUG);
-			proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($server_url));
+			proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $server_url);
 		}
 	}
 }
@@ -1667,8 +1713,8 @@ function poco_discover_federation() {
 	if ($serverdata) {
 		$servers = json_decode($serverdata);
 
-		foreach ($servers->pods AS $server) {
-			proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode("https://".$server->host));
+		foreach ($servers->pods as $server) {
+			proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", "https://".$server->host);
 		}
 	}
 
@@ -1679,9 +1725,9 @@ function poco_discover_federation() {
 		if ($serverdata) {
 			$servers = json_decode($serverdata);
 
-			foreach ($servers AS $server) {
+			foreach ($servers as $server) {
 				$url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name;
-				proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($url));
+				proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $url);
 			}
 		}
 	}
@@ -1696,7 +1742,7 @@ function poco_discover_federation() {
 	//	if ($result["success"]) {
 	//		$servers = json_decode($result["body"]);
 
-	//		foreach($servers->data AS $server)
+	//		foreach($servers->data as $server)
 	//			poco_check_server($server->instance_address);
 	//	}
 	//}
@@ -1782,7 +1828,7 @@ function poco_discover($complete = false) {
 
 	$r = q("SELECT `id`, `url`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update));
 	if (dbm::is_result($r)) {
-		foreach ($r AS $server) {
+		foreach ($r as $server) {
 
 			if (!poco_check_server($server["url"], $server["network"])) {
 				// The server is not reachable? Okay, then we will try it later
@@ -1791,7 +1837,7 @@ function poco_discover($complete = false) {
 			}
 
 			logger('Update directory from server '.$server['url'].' with ID '.$server['id'], LOGGER_DEBUG);
-			proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", intval($server['id']));
+			proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", (int)$server['id']);
 
 			if (!$complete && (--$no_of_queries == 0)) {
 				break;
@@ -1806,7 +1852,7 @@ function poco_discover_server_users($data, $server) {
 		return;
 	}
 
-	foreach ($data->entry AS $entry) {
+	foreach ($data->entry as $entry) {
 		$username = "";
 		if (isset($entry->urls)) {
 			foreach ($entry->urls as $url) {
@@ -1839,7 +1885,7 @@ function poco_discover_server($data, $default_generation = 0) {
 
 	$success = false;
 
-	foreach ($data->entry AS $entry) {
+	foreach ($data->entry as $entry) {
 		$profile_url = '';
 		$profile_photo = '';
 		$connect_url = '';
@@ -2069,7 +2115,7 @@ function get_gcontact_id($contact) {
 
 	if ($doprobing) {
 		logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG);
-		proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($contact["url"]));
+		proc_run(PRIORITY_LOW, 'include/gprobe.php', $contact["url"]);
 	}
 
 	return $gcontact_id;
@@ -2103,7 +2149,7 @@ 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;
 	}
 
@@ -2122,7 +2168,7 @@ function update_gcontact($contact) {
 	}
 
 	// assign all unassigned fields from the database entry
-	foreach ($fields as $field => $data)
+	foreach ($fields as $field => $data) {
 		if (!isset($contact[$field]) || ($contact[$field] == "")) {
 			$contact[$field] = $r[0][$field];
 		}
@@ -2176,7 +2222,7 @@ function update_gcontact($contact) {
 	unset($fields["generation"]);
 
 	if ((($contact["generation"] > 0) && ($contact["generation"] <= $r[0]["generation"])) || ($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;
@@ -2273,10 +2319,11 @@ function update_gcontact_for_user($uid) {
 						"country-name" => $r[0]["country-name"]));
 
 	// The "addr" field was added in 3.4.3 so it can be empty for older users
-	if ($r[0]["addr"] != "")
+	if ($r[0]["addr"] != "") {
 		$addr = $r[0]["nickname"].'@'.str_replace(array("http://", "https://"), "", App::get_baseurl());
-	else
+	} else {
 		$addr = $r[0]["addr"];
+	}
 
 	$gcontact = array("name" => $r[0]["name"], "location" => $location, "about" => $r[0]["about"],
 			"gender" => $r[0]["gender"], "keywords" => $r[0]["pub_keywords"],
@@ -2304,33 +2351,37 @@ function gs_fetch_users($server) {
 	$url = $server."/main/statistics";
 
 	$result = z_fetch_url($url);
-	if (!$result["success"])
+	if (!$result["success"]) {
 		return false;
+	}
 
 	$statistics = json_decode($result["body"]);
 
 	if (is_object($statistics->config)) {
-		if ($statistics->config->instance_with_ssl)
+		if ($statistics->config->instance_with_ssl) {
 			$server = "https://";
-		else
+		} else {
 			$server = "http://";
+		}
 
 		$server .= $statistics->config->instance_address;
 
 		$hostname = $statistics->config->instance_address;
 	} else {
-		if ($statistics->instance_with_ssl)
+		/// @TODO is_object() above means here no object, still $statistics is being used as object
+		if ($statistics->instance_with_ssl) {
 			$server = "https://";
-		else
+		} else {
 			$server = "http://";
+		}
 
 		$server .= $statistics->instance_address;
 
 		$hostname = $statistics->instance_address;
 	}
 
-	if (is_object($statistics->users))
-		foreach ($statistics->users AS $nick => $user) {
+	if (is_object($statistics->users)) {
+		foreach ($statistics->users as $nick => $user) {
 			$profile_url = $server."/".$user->nickname;
 
 			$contact = array("url" => $profile_url,
@@ -2342,6 +2393,7 @@ function gs_fetch_users($server) {
 					"photo" => App::get_baseurl()."/images/person-175.jpg");
 			get_gcontact_id($contact);
 		}
+	}
 }
 
 /**
@@ -2357,10 +2409,11 @@ function gs_discover() {
 	$r = q("SELECT `nurl`, `url` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `network` = '%s' AND `last_poco_query` < '%s' ORDER BY RAND() LIMIT 5",
 		dbesc(NETWORK_OSTATUS), dbesc($last_update));
 
-	if (!$r)
+	if (!dbm::is_result($r)) {
 		return;
+	}
 
-	foreach ($r AS $server) {
+	foreach ($r as $server) {
 		gs_fetch_users($server["url"]);
 		q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
 	}
@@ -2379,5 +2432,6 @@ function poco_serverlist() {
 	if (!dbm::is_result($r)) {
 		return false;
 	}
+
 	return $r;
 }