X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsocgraph.php;h=f055aebdf86ad7e7e0080a9f2c6317df50f4656f;hb=578cb0a55c643702504b1c4c18a0d1a02af5cf80;hp=a39eca5e86fe9ec39628a60b04cccb255ccec7b4;hpb=4e5b926d2360671ceac530a2ba6550bdcd1dbf51;p=friendica.git diff --git a/include/socgraph.php b/include/socgraph.php index a39eca5e86..f055aebdf8 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -1,20 +1,22 @@ 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) { + foreach ($j->entry as $entry) { $total ++; $profile_url = ''; @@ -148,18 +154,19 @@ function poco_load_worker($cid, $uid, $zcid, $url) { $gender = $entry->gender; } - if (isset($entry->generation) AND ($entry->generation > 0)) { + if (isset($entry->generation) && ($entry->generation > 0)) { $generation = ++$entry->generation; } if (isset($entry->tags)) { - foreach($entry->tags as $tag) { + foreach ($entry->tags as $tag) { $keywords = implode(", ", $tag); } } - if (isset($entry->contactType) AND ($entry->contactType >= 0)) + if (isset($entry->contactType) && ($entry->contactType >= 0)) { $contact_type = $entry->contactType; + } $gcontact = array("url" => $profile_url, "name" => $name, @@ -236,7 +243,7 @@ function sanitize_gcontact($gcontact) { $alternate = poco_alternate_ostatus_url($gcontact['url']); // The global contacts should contain the original picture, not the cached one - if (($gcontact['generation'] != 1) AND stristr(normalise_link($gcontact['photo']), normalise_link(App::get_baseurl()."/photo/"))) { + if (($gcontact['generation'] != 1) && stristr(normalise_link($gcontact['photo']), normalise_link(App::get_baseurl()."/photo/"))) { $gcontact['photo'] = ""; } @@ -248,7 +255,7 @@ function sanitize_gcontact($gcontact) { $gcontact['network'] = $r[0]["network"]; } - if (($gcontact['network'] == "") OR ($gcontact['network'] == NETWORK_OSTATUS)) { + if (($gcontact['network'] == "") || ($gcontact['network'] == NETWORK_OSTATUS)) { $r = q("SELECT `network`, `url` FROM `contact` WHERE `uid` = 0 AND `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1", dbesc($gcontact['url']), dbesc(normalise_link($gcontact['url'])), dbesc(NETWORK_STATUSNET) ); @@ -265,14 +272,14 @@ function sanitize_gcontact($gcontact) { dbesc(normalise_link($gcontact['url'])) ); - if (count($x)) { - if (!isset($gcontact['network']) AND ($x[0]["network"] != NETWORK_STATUSNET)) { + if (dbm::is_result($x)) { + if (!isset($gcontact['network']) && ($x[0]["network"] != NETWORK_STATUSNET)) { $gcontact['network'] = $x[0]["network"]; } if ($gcontact['updated'] <= NULL_DATE) { $gcontact['updated'] = $x[0]["updated"]; } - if (!isset($gcontact['server_url']) AND (normalise_link($x[0]["server_url"]) != normalise_link($x[0]["url"]))) { + if (!isset($gcontact['server_url']) && (normalise_link($x[0]["server_url"]) != normalise_link($x[0]["url"]))) { $gcontact['server_url'] = $x[0]["server_url"]; } if (!isset($gcontact['addr'])) { @@ -280,8 +287,8 @@ function sanitize_gcontact($gcontact) { } } - if ((!isset($gcontact['network']) OR !isset($gcontact['name']) OR !isset($gcontact['addr']) OR !isset($gcontact['photo']) OR !isset($gcontact['server_url']) OR $alternate) - AND poco_reachable($gcontact['url'], $gcontact['server_url'], $gcontact['network'], false)) { + if ((!isset($gcontact['network']) || !isset($gcontact['name']) || !isset($gcontact['addr']) || !isset($gcontact['photo']) || !isset($gcontact['server_url']) || $alternate) + && poco_reachable($gcontact['url'], $gcontact['server_url'], $gcontact['network'], false)) { $data = Probe::uri($gcontact['url']); if ($data["network"] == NETWORK_PHANTOM) { @@ -294,17 +301,17 @@ function sanitize_gcontact($gcontact) { $gcontact = array_merge($gcontact, $data); - if ($alternate AND ($gcontact['network'] == NETWORK_OSTATUS)) { + 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"])); } } } - if (!isset($gcontact['name']) OR !isset($gcontact['photo'])) { + if (!isset($gcontact['name']) || !isset($gcontact['photo'])) { throw new Exception('No name and photo for URL '.$gcontact['url']); } @@ -351,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), @@ -372,11 +380,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); } @@ -479,11 +489,11 @@ function poco_last_updated($profile, $force = false) { $server_url = normalise_link(poco_detect_server($profile)); } - if (($server_url == '') AND ($gcontacts[0]["server_url"] != "")) { + if (($server_url == '') && ($gcontacts[0]["server_url"] != "")) { $server_url = $gcontacts[0]["server_url"]; } - if (!$force AND (($server_url == '') OR ($gcontacts[0]["server_url"] == $gcontacts[0]["nurl"]))) { + if (!$force && (($server_url == '') || ($gcontacts[0]["server_url"] == $gcontacts[0]["nurl"]))) { $server_url = normalise_link(poco_detect_server($profile)); } @@ -517,7 +527,7 @@ function poco_last_updated($profile, $force = false) { } // noscrape is really fast so we don't cache the call. - if (($server_url != "") AND ($gcontacts[0]["nick"] != "")) { + if (($server_url != "") && ($gcontacts[0]["nick"] != "")) { // Use noscrape if possible $server = q("SELECT `noscrape`, `network` FROM `gserver` WHERE `nurl` = '%s' AND `noscrape` != ''", dbesc(normalise_link($server_url))); @@ -525,7 +535,7 @@ function poco_last_updated($profile, $force = false) { if ($server) { $noscraperet = z_fetch_url($server[0]["noscrape"]."/".$gcontacts[0]["nick"]); - if ($noscraperet["success"] AND ($noscraperet["body"] != "")) { + if ($noscraperet["success"] && ($noscraperet["body"] != "")) { $noscrape = json_decode($noscraperet["body"], true); @@ -589,7 +599,7 @@ function poco_last_updated($profile, $force = false) { } // If we only can poll the feed, then we only do this once a while - if (!$force AND !poco_do_update($gcontacts[0]["created"], $gcontacts[0]["updated"], $gcontacts[0]["last_failure"], $gcontacts[0]["last_contact"])) { + if (!$force && !poco_do_update($gcontacts[0]["created"], $gcontacts[0]["updated"], $gcontacts[0]["last_failure"], $gcontacts[0]["last_contact"])) { logger("Profile ".$profile." was last updated at ".$gcontacts[0]["updated"]." (cached)", LOGGER_DEBUG); update_gcontact($contact); @@ -600,8 +610,8 @@ function poco_last_updated($profile, $force = false) { // Is the profile link the alternate OStatus link notation? (http://domain.tld/user/4711) // Then check the other link and delete this one - if (($data["network"] == NETWORK_OSTATUS) AND poco_alternate_ostatus_url($profile) AND - (normalise_link($profile) == normalise_link($data["alias"])) AND + if (($data["network"] == NETWORK_OSTATUS) && poco_alternate_ostatus_url($profile) && + (normalise_link($profile) == normalise_link($data["alias"])) && (normalise_link($profile) != normalise_link($data["url"]))) { // Delete the old entry @@ -625,7 +635,7 @@ function poco_last_updated($profile, $force = false) { return false; } - if (($data["poll"] == "") OR (in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))) { + if (($data["poll"] == "") || (in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))) { q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc(normalise_link($profile))); @@ -659,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; @@ -692,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)) AND ($contact_time > $failure_time)) + //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)) AND (($now - $created_time) > (60 * 60 * 24 * 7)) AND (($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)) AND (($now - $created_time) > (60 * 60 * 24 * 30)) AND (($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") OR ($val == 1)) - return(true); - if (($val == "false") OR ($val == 0)) - return(false); + if (($val == "true") || ($val == 1)) { + return true; + } elseif (($val == "false") || ($val == 0)) { + return false; + } - return ($val); + return $val; } /** @@ -761,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'; @@ -796,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; } @@ -821,7 +838,7 @@ function poco_fetch_nodeinfo($server_url) { $server['register_policy'] = REGISTER_CLOSED; - if (is_bool($nodeinfo->openRegistrations) AND $nodeinfo->openRegistrations) { + if (is_bool($nodeinfo->openRegistrations) && $nodeinfo->openRegistrations) { $server['register_policy'] = REGISTER_OPEN; } @@ -849,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; } @@ -888,9 +905,9 @@ function poco_fetch_nodeinfo($server_url) { function poco_detect_server_type($body) { $server = false; - $doc = new \DOMDocument(); + $doc = new DOMDocument(); @$doc->loadHTML($body); - $xpath = new \DomXPath($doc); + $xpath = new DomXPath($doc); $list = $xpath->query("//meta[@name]"); @@ -924,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; } } } @@ -949,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)) { @@ -962,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"]; @@ -973,7 +990,7 @@ function poco_check_server($server_url, $network = "", $force = false) { $info = $servers[0]["info"]; $register_policy = $servers[0]["register_policy"]; - if (!$force AND !poco_do_update($servers[0]["created"], "", $last_failure, $last_contact)) { + if (!$force && !poco_do_update($servers[0]["created"], "", $last_failure, $last_contact)) { logger("Use cached data for server ".$server_url, LOGGER_DEBUG); return ($last_contact >= $last_failure); } @@ -1005,15 +1022,16 @@ function poco_check_server($server_url, $network = "", $force = false) { // Quit if there is a timeout. // But we want to make sure to only quit if we are mostly sure that this server url fits. - if (dbm::is_result($servers) AND ($orig_server_url == $server_url) AND + if (dbm::is_result($servers) && ($orig_server_url == $server_url) && ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) { logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG); + dba::p("UPDATE `gserver` SET `last_failure` = ? WHERE `nurl` = ?", datetime_convert(), normalise_link($server_url)); return false; } // Maybe the page is unencrypted only? $xmlobj = @simplexml_load_string($serverret["body"],'SimpleXMLElement',0, "http://docs.oasis-open.org/ns/xri/xrd-1.0"); - if (!$serverret["success"] OR ($serverret["body"] == "") OR (@sizeof($xmlobj) == 0) OR !is_object($xmlobj)) { + if (!$serverret["success"] || ($serverret["body"] == "") || (@sizeof($xmlobj) == 0) || !is_object($xmlobj)) { $server_url = str_replace("https://", "http://", $server_url); // We set the timeout to 20 seconds since this operation should be done in no time if the server was vital @@ -1022,21 +1040,20 @@ function poco_check_server($server_url, $network = "", $force = false) { // Quit if there is a timeout if ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT) { logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG); + dba::p("UPDATE `gserver` SET `last_failure` = ? WHERE `nurl` = ?", datetime_convert(), normalise_link($server_url)); return false; } $xmlobj = @simplexml_load_string($serverret["body"],'SimpleXMLElement',0, "http://docs.oasis-open.org/ns/xri/xrd-1.0"); } - if (!$serverret["success"] OR ($serverret["body"] == "") OR (sizeof($xmlobj) == 0) OR !is_object($xmlobj)) { + if (!$serverret["success"] || ($serverret["body"] == "") || (sizeof($xmlobj) == 0) || !is_object($xmlobj)) { // Workaround for bad configured servers (known nginx problem) if (!in_array($serverret["debug"]["http_code"], array("403", "404"))) { - $last_failure = datetime_convert(); $failure = true; } $possible_failure = true; - } elseif ($network == NETWORK_DIASPORA) - $last_contact = datetime_convert(); + } // If the server has no possible failure we reset the cached data if (!$possible_failure) { @@ -1054,8 +1071,6 @@ function poco_check_server($server_url, $network = "", $force = false) { $data = json_decode($serverret["body"]); if (isset($data->totalResults)) { $poco = $server_url."/poco"; - $last_contact = datetime_convert(); - $server = poco_detect_poco_data($data); if ($server) { $platform = $server['platform']; @@ -1071,8 +1086,7 @@ function poco_check_server($server_url, $network = "", $force = false) { // Test for Diaspora, Hubzilla, Mastodon or older Friendica servers $serverret = z_fetch_url($server_url); - if (!$serverret["success"] OR ($serverret["body"] == "")) { - $last_failure = datetime_convert(); + if (!$serverret["success"] || ($serverret["body"] == "")) { $failure = true; } else { $server = poco_detect_server_type($serverret["body"]); @@ -1081,60 +1095,66 @@ function poco_check_server($server_url, $network = "", $force = false) { $network = $server['network']; $version = $server['version']; $site_name = $server['site_name']; - $last_contact = datetime_convert(); } $lines = explode("\n",$serverret["header"]); - if(count($lines)) { + if (count($lines)) { foreach($lines as $line) { $line = trim($line); - if(stristr($line,'X-Diaspora-Version:')) { + if (stristr($line,'X-Diaspora-Version:')) { $platform = "Diaspora"; $version = trim(str_replace("X-Diaspora-Version:", "", $line)); $version = trim(str_replace("x-diaspora-version:", "", $version)); $network = NETWORK_DIASPORA; $versionparts = explode("-", $version); $version = $versionparts[0]; - $last_contact = datetime_convert(); } - if(stristr($line,'Server: Mastodon')) { + if (stristr($line,'Server: Mastodon')) { $platform = "Mastodon"; $network = NETWORK_OSTATUS; - // Mastodon doesn't reveal version numbers - $version = ""; - $last_contact = datetime_convert(); } } } } } - if (!$failure AND ($poco == "")) { + if (!$failure && ($poco == "")) { // Test for Statusnet // Will also return data for Friendica and GNU Social - but it will be overwritten later // The "not implemented" is a special treatment for really, really old Friendica versions $serverret = z_fetch_url($server_url."/api/statusnet/version.json"); - if ($serverret["success"] AND ($serverret["body"] != '{"error":"not implemented"}') AND - ($serverret["body"] != '') AND (strlen($serverret["body"]) < 30)) { + if ($serverret["success"] && ($serverret["body"] != '{"error":"not implemented"}') && + ($serverret["body"] != '') && (strlen($serverret["body"]) < 30)) { $platform = "StatusNet"; // Remove junk that some GNU Social servers return $version = str_replace(chr(239).chr(187).chr(191), "", $serverret["body"]); $version = trim($version, '"'); $network = NETWORK_OSTATUS; - $last_contact = datetime_convert(); } // Test for GNU Social $serverret = z_fetch_url($server_url."/api/gnusocial/version.json"); - if ($serverret["success"] AND ($serverret["body"] != '{"error":"not implemented"}') AND - ($serverret["body"] != '') AND (strlen($serverret["body"]) < 30)) { + if ($serverret["success"] && ($serverret["body"] != '{"error":"not implemented"}') && + ($serverret["body"] != '') && (strlen($serverret["body"]) < 30)) { $platform = "GNU Social"; // Remove junk that some GNU Social servers return $version = str_replace(chr(239).chr(187).chr(191), "", $serverret["body"]); $version = trim($version, '"'); $network = NETWORK_OSTATUS; - $last_contact = datetime_convert(); + } + + // Test for Mastodon + $serverret = z_fetch_url($server_url."/api/v1/instance"); + if ($serverret["success"] && ($serverret["body"] != '')) { + $data = json_decode($serverret["body"]); + if (isset($data->version)) { + $platform = "Mastodon"; + $version = $data->version; + $site_name = $data->title; + $info = $data->description; + $network = NETWORK_OSTATUS; + } } } @@ -1144,8 +1164,6 @@ function poco_check_server($server_url, $network = "", $force = false) { if ($serverret["success"]) { $data = json_decode($serverret["body"]); if (isset($data->site->server)) { - $last_contact = datetime_convert(); - if (isset($data->site->platform)) { $platform = $data->site->platform->PLATFORM_NAME; $version = $data->site->platform->STD_VERSION; @@ -1162,10 +1180,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; @@ -1182,17 +1201,17 @@ 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 && !$data->site->private and $data->site->inviteonly) { $register_policy = REGISTER_APPROVE; - elseif (!$data->site->closed AND !$data->site->private) + } elseif (!$data->site->closed && !$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) { $serverret = z_fetch_url($server_url."/statistics.json"); @@ -1220,9 +1239,6 @@ function poco_check_server($server_url, $network = "", $force = false) { } else { $register_policy = REGISTER_CLOSED; } - - if (isset($data->version)) - $last_contact = datetime_convert(); } } @@ -1247,24 +1263,22 @@ function poco_check_server($server_url, $network = "", $force = false) { if (isset($server['site_name'])) { $site_name = $server['site_name']; } - - $last_contact = datetime_convert(); } } // Check for noscrape // Friendica servers could be detected as OStatus servers - if (!$failure AND in_array($network, array(NETWORK_DFRN, NETWORK_OSTATUS))) { + if (!$failure && 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"]); if (isset($data->version)) { - $last_contact = datetime_convert(); $network = NETWORK_DFRN; $noscrape = $data->no_scrape_url; @@ -1289,20 +1303,21 @@ function poco_check_server($server_url, $network = "", $force = false) { } } - if ($possible_failure AND !$failure) { - $last_failure = datetime_convert(); + if ($possible_failure && !$failure) { $failure = true; } if ($failure) { $last_contact = $orig_last_contact; + $last_failure = datetime_convert(); } else { + $last_contact = datetime_convert(); $last_failure = $orig_last_failure; } - if (($last_contact <= $last_failure) AND !$failure) { + 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) AND $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); } @@ -1349,12 +1364,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` @@ -1367,20 +1382,22 @@ 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) + 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` @@ -1399,12 +1416,13 @@ 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; } -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` @@ -1414,23 +1432,25 @@ 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` where `glink`.`zcid` = %d - and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 ) + and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 ) $sql_extra limit %d, %d", intval($zcid), intval($uid), @@ -1438,12 +1458,13 @@ 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; } -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` @@ -1453,14 +1474,15 @@ function count_all_friends($uid,$cid) { intval($uid) ); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { return $r[0]['total']; + } return 0; } -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` @@ -1476,6 +1498,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; } @@ -1487,20 +1510,24 @@ 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); - 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."'"; @@ -1527,9 +1554,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; } @@ -1553,18 +1582,23 @@ 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. -// 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; } @@ -1575,7 +1609,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'; @@ -1605,8 +1639,9 @@ 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); + } } } } @@ -1627,7 +1662,7 @@ 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))); @@ -1643,8 +1678,9 @@ function poco_discover_federation() { if ($last) { $next = $last + (24 * 60 * 60); - if($next > time()) + if ($next > time()) { return; + } } // Discover Friendica, Hubzilla and Diaspora servers @@ -1653,7 +1689,7 @@ function poco_discover_federation() { if ($serverdata) { $servers = json_decode($serverdata); - foreach ($servers->pods AS $server) { + foreach ($servers->pods as $server) { proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode("https://".$server->host)); } } @@ -1665,7 +1701,7 @@ 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)); } @@ -1682,7 +1718,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); // } //} @@ -1732,7 +1768,7 @@ function poco_discover_single_server($id) { $success = poco_discover_server(json_decode($retdata["body"])); } - if (!$success AND (get_config('system','poco_discovery') > 2)) { + if (!$success && (get_config('system','poco_discovery') > 2)) { logger("Fetch contacts from users of the server ".$server["nurl"], LOGGER_DEBUG); poco_discover_server_users($data, $server); } @@ -1768,7 +1804,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 @@ -1779,7 +1815,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'])); - if (!$complete AND (--$no_of_queries == 0)) { + if (!$complete && (--$no_of_queries == 0)) { break; } } @@ -1788,18 +1824,20 @@ 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) { + 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); @@ -1808,20 +1846,22 @@ 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) || !count($data->entry)) { return false; + } $success = false; - foreach ($data->entry AS $entry) { + foreach ($data->entry as $entry) { $profile_url = ''; $profile_photo = ''; $connect_url = ''; @@ -1838,7 +1878,7 @@ function poco_discover_server($data, $default_generation = 0) { $name = $entry->displayName; if (isset($entry->urls)) { - foreach($entry->urls as $url) { + foreach ($entry->urls as $url) { if ($url->type == 'profile') { $profile_url = $url->value; continue; @@ -1863,31 +1903,31 @@ function poco_discover_server($data, $default_generation = 0) { $updated = date("Y-m-d H:i:s", strtotime($entry->updated)); } - if(isset($entry->network)) { + if (isset($entry->network)) { $network = $entry->network; } - if(isset($entry->currentLocation)) { + if (isset($entry->currentLocation)) { $location = $entry->currentLocation; } - if(isset($entry->aboutMe)) { + if (isset($entry->aboutMe)) { $about = html2bbcode($entry->aboutMe); } - if(isset($entry->gender)) { + if (isset($entry->gender)) { $gender = $entry->gender; } - if(isset($entry->generation) AND ($entry->generation > 0)) { + if(isset($entry->generation) && ($entry->generation > 0)) { $generation = ++$entry->generation; } - if(isset($entry->contactType) AND ($entry->contactType >= 0)) { + if(isset($entry->contactType) && ($entry->contactType >= 0)) { $contact_type = $entry->contactType; } - if(isset($entry->tags)) { + if (isset($entry->tags)) { foreach ($entry->tags as $tag) { $keywords = implode(", ", $tag); } @@ -1933,19 +1973,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"]) || !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; } @@ -1956,7 +2000,7 @@ function clean_contact_url($url) { * @param arr $contact contact array (called by reference) */ function fix_alternate_contact_address(&$contact) { - if (($contact["network"] == NETWORK_OSTATUS) AND poco_alternate_ostatus_url($contact["url"])) { + if (($contact["network"] == NETWORK_OSTATUS) && poco_alternate_ostatus_url($contact["url"])) { $data = probe_url($contact["url"]); if ($contact["network"] == NETWORK_OSTATUS) { logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".App::callstack(), LOGGER_DEBUG); @@ -1984,24 +2028,28 @@ function get_gcontact_id($contact) { return false; } - if ($contact["network"] == NETWORK_STATUSNET) + 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", + dba::lock('gcontact'); + $r = q("SELECT `id`, `last_contact`, `last_failure`, `network` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", dbesc(normalise_link($contact["url"]))); - if ($r) { + if (dbm::is_result($r)) { $gcontact_id = $r[0]["id"]; // Update every 90 days @@ -2010,7 +2058,7 @@ function get_gcontact_id($contact) { $last_failure = strtotime($r[0]["last_failure"]); $last_contact_str = $r[0]["last_contact"]; $last_contact = strtotime($r[0]["last_contact"]); - $doprobing = (((time() - $last_contact) > (90 * 86400)) AND ((time() - $last_failure) > (90 * 86400))); + $doprobing = (((time() - $last_contact) > (90 * 86400)) && ((time() - $last_failure) > (90 * 86400))); } } else { q("INSERT INTO `gcontact` (`name`, `nick`, `addr` , `network`, `url`, `nurl`, `photo`, `created`, `updated`, `location`, `about`, `hide`, `generation`) @@ -2033,23 +2081,19 @@ 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, "")); } } + dba::unlock(); 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"])); } - 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; } @@ -2062,7 +2106,7 @@ function get_gcontact_id($contact) { function update_gcontact($contact) { // Check for invalid "contact-type" value - if (isset($contact['contact-type']) AND (intval($contact['contact-type']) < 0)) { + if (isset($contact['contact-type']) && (intval($contact['contact-type']) < 0)) { $contact['contact-type'] = 0; } @@ -2070,8 +2114,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` @@ -2080,8 +2125,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"]); @@ -2089,49 +2135,60 @@ 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) - if (!isset($contact[$field]) OR ($contact[$field] == "")) + foreach ($fields as $field => $data) { + if (!isset($contact[$field]) || ($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) + 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"] != "")) { + if (($contact["addr"] == "") && ($contact["server_url"] != "") && ($contact["nick"] != "")) { $hostname = str_replace("http://", "", $contact["server_url"]); $contact["addr"] = $contact["nick"]."@".$hostname; } @@ -2140,12 +2197,13 @@ function update_gcontact($contact) { $update = false; unset($fields["generation"]); - if ((($contact["generation"] > 0) AND ($contact["generation"] <= $r[0]["generation"])) OR ($r[0]["generation"] == 0)) { - foreach ($fields AS $field => $data) + if ((($contact["generation"] > 0) && ($contact["generation"] <= $r[0]["generation"])) || ($r[0]["generation"] == 0)) { + 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); @@ -2177,7 +2235,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"]); @@ -2237,16 +2295,17 @@ 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"], "birthday" => $r[0]["dob"], "photo" => $r[0]["photo"], "notify" => $r[0]["notify"], "url" => $r[0]["url"], - "hide" => ($r[0]["hidewall"] OR !$r[0]["net-publish"]), + "hide" => ($r[0]["hidewall"] || !$r[0]["net-publish"]), "nick" => $r[0]["nickname"], "addr" => $addr, "connect" => $addr, "server_url" => App::get_baseurl(), "generation" => 1, "network" => NETWORK_DFRN); @@ -2268,33 +2327,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, @@ -2306,6 +2369,7 @@ function gs_fetch_users($server) { "photo" => App::get_baseurl()."/images/person-175.jpg"); get_gcontact_id($contact); } + } } /** @@ -2321,10 +2385,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"])); } @@ -2343,6 +2408,6 @@ function poco_serverlist() { if (!dbm::is_result($r)) { return false; } + return $r; } -?>