]> git.mxchange.org Git - friendica.git/blobdiff - include/socgraph.php
Merge pull request #3539 from AndyHee/20170617-admin_settings
[friendica.git] / include / socgraph.php
index d9fd6f8be8a04db27482cf19a3180cb7b398f8b4..f055aebdf86ad7e7e0080a9f2c6317df50f4656f 100644 (file)
@@ -1,21 +1,30 @@
 <?php
 /**
  * @file include/socgraph.php
- * 
+ *
  * @todo Move GNU Social URL schemata (http://server.tld/user/number) to http://server.tld/username
  * @todo Fetch profile data from profile page for Redmatrix users
  * @todo Detect if it is a forum
  */
 
-require_once('include/datetime.php');
-require_once("include/Scrape.php");
-require_once("include/network.php");
-require_once("include/html2bbcode.php");
-require_once("include/Contact.php");
-require_once("include/Photo.php");
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Network\Probe;
+
+require_once 'include/datetime.php';
+require_once 'include/probe.php';
+require_once 'include/network.php';
+require_once 'include/html2bbcode.php';
+require_once 'include/Contact.php';
+require_once 'include/Photo.php';
 
-/*
- * poco_load
+/**
+ * @brief Fetch POCO data
+ *
+ * @param integer $cid Contact ID
+ * @param integer $uid User ID
+ * @param integer $zcid Global Contact ID
+ * @param integer $url POCO address that should be polled
  *
  * Given a contact-id (minimum), load the PortableContacts friend list for that contact,
  * and add the entries to the gcontact (Global Contact) table, or update existing entries
@@ -27,16 +36,25 @@ require_once("include/Photo.php");
  * pointing to the same global contact id.
  *
  */
+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));
+}
 
-
-
-
-function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
-
+/**
+ * @brief Fetch POCO data from the worker
+ *
+ * @param integer $cid Contact ID
+ * @param integer $uid User ID
+ * @param integer $zcid Global Contact ID
+ * @param integer $url POCO address that should be polled
+ *
+ */
+function poco_load_worker($cid, $uid, $zcid, $url) {
        $a = get_app();
 
-       if($cid) {
-               if((! $url) || (! $uid)) {
+       if ($cid) {
+               if ((! $url) || (! $uid)) {
                        $r = q("select `poco`, `uid` from `contact` where `id` = %d limit 1",
                                intval($cid)
                        );
@@ -45,12 +63,14 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
                                $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') ;
 
@@ -62,18 +82,20 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 
        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) {
+       foreach ($j->entry as $entry) {
 
                $total ++;
                $profile_url = '';
@@ -132,40 +154,41 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
                        $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;
+               }
 
-               // If you query a Friendica server for its profiles, the network has to be Friendica
-               /// TODO It could also be a Redmatrix server
-               //if ($uid == 0)
-               //      $network = NETWORK_DFRN;
-
-               poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid, $uid, $zcid);
+               $gcontact = array("url" => $profile_url,
+                               "name" => $name,
+                               "network" => $network,
+                               "photo" => $profile_photo,
+                               "about" => $about,
+                               "location" => $location,
+                               "gender" => $gender,
+                               "keywords" => $keywords,
+                               "connect" => $connect_url,
+                               "updated" => $updated,
+                               "contact-type" => $contact_type,
+                               "generation" => $generation);
 
-               $gcontact = array("url" => $profile_url, "contact-type" => $contact_type, "generation" => $generation);
-               update_gcontact($gcontact);
+               try {
+                       $gcontact = sanitize_gcontact($gcontact);
+                       $gcid = update_gcontact($gcontact);
 
-               // Update the Friendica contacts. Diaspora is doing it via a message. (See include/diaspora.php)
-               // Deactivated because we now update Friendica contacts in dfrn.php
-               //if (($location != "") OR ($about != "") OR ($keywords != "") OR ($gender != ""))
-               //      q("UPDATE `contact` SET `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s'
-               //              WHERE `nurl` = '%s' AND NOT `self` AND `network` = '%s'",
-               //              dbesc($location),
-               //              dbesc($about),
-               //              dbesc($keywords),
-               //              dbesc($gender),
-               //              dbesc(normalise_link($profile_url)),
-               //              dbesc(NETWORK_DFRN));
+                       link_gcontact($gcid, $uid, $cid, $zcid);
+               } catch (Exception $e) {
+                       logger($e->getMessage(), LOGGER_DEBUG);
+               }
        }
        logger("poco_load: loaded $total entries",LOGGER_DEBUG);
 
@@ -176,172 +199,158 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
        );
 
 }
+/**
+ * @brief Sanitize the given gcontact data
+ *
+ * @param array $gcontact array with gcontact data
+ * @throw Exception
+ *
+ * Generation:
+ *  0: No definition
+ *  1: Profiles on this server
+ *  2: Contacts of profiles on this server
+ *  3: Contacts of contacts of profiles on this server
+ *  4: ...
+ *
+ */
+function sanitize_gcontact($gcontact) {
 
-function poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid = 0, $uid = 0, $zcid = 0) {
-
-       // Generation:
-       //  0: No definition
-       //  1: Profiles on this server
-       //  2: Contacts of profiles on this server
-       //  3: Contacts of contacts of profiles on this server
-       //  4: ...
-
-       $gcid = "";
-
-       if ($profile_url == "")
-               return $gcid;
+       if ($gcontact['url'] == "") {
+               throw new Exception('URL is empty');
+       }
 
-       $urlparts = parse_url($profile_url);
-       if (!isset($urlparts["scheme"]))
-               return $gcid;
+       $urlparts = parse_url($gcontact['url']);
+       if (!isset($urlparts["scheme"])) {
+               throw new Exception("This (".$gcontact['url'].") doesn't seem to be an url.");
+       }
 
        if (in_array($urlparts["host"], array("www.facebook.com", "facebook.com", "twitter.com",
-                                               "identi.ca", "alpha.app.net")))
-               return $gcid;
+                                               "identi.ca", "alpha.app.net"))) {
+               throw new Exception('Contact from a non federated network ignored. ('.$gcontact['url'].')');
+       }
 
        // Don't store the statusnet connector as network
        // We can't simply set this to NETWORK_OSTATUS since the connector could have fetched posts from friendica as well
-       if ($network == NETWORK_STATUSNET)
-               $network = "";
+       if ($gcontact['network'] == NETWORK_STATUSNET) {
+               $gcontact['network'] = "";
+       }
 
        // Assure that there are no parameter fragments in the profile url
-       if (in_array($network, array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, "")))
-               $profile_url = clean_contact_url($profile_url);
-
-       $alternate = poco_alternate_ostatus_url($profile_url);
+       if (in_array($gcontact['network'], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) {
+               $gcontact['url'] = clean_contact_url($gcontact['url']);
+       }
 
-       $orig_updated = $updated;
+       $alternate = poco_alternate_ostatus_url($gcontact['url']);
 
        // The global contacts should contain the original picture, not the cached one
-       if (($generation != 1) AND stristr(normalise_link($profile_photo), normalise_link(App::get_baseurl()."/photo/"))) {
-               $profile_photo = "";
-       }
-
-       $r = q("SELECT `network` FROM `contact` WHERE `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1",
-               dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET)
-       );
-       if (dbm::is_result($r)) {
-               $network = $r[0]["network"];
+       if (($gcontact['generation'] != 1) && stristr(normalise_link($gcontact['photo']), normalise_link(App::get_baseurl()."/photo/"))) {
+               $gcontact['photo'] = "";
        }
 
-       if (($network == "") OR ($network == NETWORK_OSTATUS)) {
-               $r = q("SELECT `network`, `url` FROM `contact` WHERE `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1",
-                       dbesc($profile_url), dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET)
+       if (!isset($gcontact['network'])) {
+               $r = q("SELECT `network` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1",
+                       dbesc(normalise_link($gcontact['url'])), dbesc(NETWORK_STATUSNET)
                );
                if (dbm::is_result($r)) {
-                       $network = $r[0]["network"];
-                       //$profile_url = $r[0]["url"];
+                       $gcontact['network'] = $r[0]["network"];
+               }
+
+               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)
+                       );
+                       if (dbm::is_result($r)) {
+                               $gcontact['network'] = $r[0]["network"];
+                       }
                }
        }
 
+       $gcontact['server_url'] = '';
+       $gcontact['network'] = '';
+
        $x = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-               dbesc(normalise_link($profile_url))
+               dbesc(normalise_link($gcontact['url']))
        );
 
-       if (count($x)) {
-               if (($network == "") AND ($x[0]["network"] != NETWORK_STATUSNET)) {
-                       $network = $x[0]["network"];
+       if (dbm::is_result($x)) {
+               if (!isset($gcontact['network']) && ($x[0]["network"] != NETWORK_STATUSNET)) {
+                       $gcontact['network'] = $x[0]["network"];
                }
-               if ($updated <= NULL_DATE) {
-                       $updated = $x[0]["updated"];
+               if ($gcontact['updated'] <= NULL_DATE) {
+                       $gcontact['updated'] = $x[0]["updated"];
+               }
+               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'])) {
+                       $gcontact['addr'] = $x[0]["addr"];
                }
-               $created = $x[0]["created"];
-               $server_url = $x[0]["server_url"];
-               $nick = $x[0]["nick"];
-               $addr = $x[0]["addr"];
-               $alias =  $x[0]["alias"];
-               $notify =  $x[0]["notify"];
-       } else {
-               $created = NULL_DATE;
-               $server_url = "";
-
-               $urlparts = parse_url($profile_url);
-               $nick = end(explode("/", $urlparts["path"]));
-               $addr = "";
-               $alias = "";
-               $notify = "";
        }
 
-       if ((($network == "") OR ($name == "") OR ($addr == "") OR ($profile_photo == "") OR ($server_url == "") OR $alternate)
-               AND poco_reachable($profile_url, $server_url, $network, false)) {
-               $data = probe_url($profile_url);
+       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) {
+                       throw new Exception('Probing for URL '.$gcontact['url'].' failed');
+               }
 
-               $orig_profile = $profile_url;
+               $orig_profile = $gcontact['url'];
 
-               $network = $data["network"];
-               $name = $data["name"];
-               $nick = $data["nick"];
-               $addr = $data["addr"];
-               $alias = $data["alias"];
-               $notify = $data["notify"];
-               $profile_url = $data["url"];
-               $profile_photo = $data["photo"];
-               $server_url = $data["baseurl"];
+               $gcontact["server_url"] = $data["baseurl"];
 
-               if ($alternate AND ($network == NETWORK_OSTATUS)) {
+               $gcontact = array_merge($gcontact, $data);
+
+               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"]));
                        }
-
-                       // possibly create a new entry
-                       poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid, $uid, $zcid);
                }
        }
 
-       if ($alternate AND ($network == NETWORK_OSTATUS))
-               return $gcid;
+       if (!isset($gcontact['name']) || !isset($gcontact['photo'])) {
+               throw new Exception('No name and photo for URL '.$gcontact['url']);
+       }
 
-       if (count($x) AND ($x[0]["network"] == "") AND ($network != "")) {
-               q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
-                       dbesc($network),
-                       dbesc(normalise_link($profile_url))
-               );
+       if (!in_array($gcontact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) {
+               throw new Exception('No federated network ('.$gcontact['network'].') detected for URL '.$gcontact['url']);
        }
 
-       if (($name == "") OR ($profile_photo == ""))
-               return $gcid;
+       if (!isset($gcontact['server_url'])) {
+               // We check the server url to be sure that it is a real one
+               $server_url = poco_detect_server($gcontact['url']);
 
-       if (!in_array($network, array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)))
-               return $gcid;
+               // We are now sure that it is a correct URL. So we use it in the future
+               if ($server_url != "") {
+                       $gcontact['server_url'] = $server_url;
+               }
+       }
 
-       logger("profile-check generation: ".$generation." Network: ".$network." URL: ".$profile_url." name: ".$name." avatar: ".$profile_photo, LOGGER_DEBUG);
+       // The server URL doesn't seem to be valid, so we don't store it.
+       if (!poco_check_server($gcontact['server_url'], $gcontact['network'])) {
+               $gcontact['server_url'] = "";
+       }
 
-       // We check the server url to be sure that it is a real one
-       $server_url2 = poco_detect_server($profile_url);
+       return $gcontact;
+}
 
-       // We are no sure that it is a correct URL. So we use it in the future
-       if ($server_url2 != "") {
-               $server_url = $server_url2;
-       }
+/**
+ * @brief Link the gcontact entry with user, contact and global contact
+ *
+ * @param integer $gcid Global contact ID
+ * @param integer $cid Contact ID
+ * @param integer $uid User ID
+ * @param integer $zcid Global Contact ID
+ * *
+ */
+function link_gcontact($gcid, $uid = 0, $cid = 0, $zcid = 0) {
 
-       // The server URL doesn't seem to be valid, so we don't store it.
-       if (!poco_check_server($server_url, $network)) {
-               $server_url = "";
-       }
-
-       $gcontact = array("url" => $profile_url,
-                       "addr" => $addr,
-                       "alias" => $alias,
-                       "name" => $name,
-                       "network" => $network,
-                       "photo" => $profile_photo,
-                       "about" => $about,
-                       "location" => $location,
-                       "gender" => $gender,
-                       "keywords" => $keywords,
-                       "server_url" => $server_url,
-                       "connect" => $connect_url,
-                       "notify" => $notify,
-                       "updated" => $updated,
-                       "generation" => $generation);
-
-       $gcid = update_gcontact($gcontact);
-
-       if(!$gcid)
-               return $gcid;
+       if ($gcid <= 0) {
+               return;
+       }
 
        $r = q("SELECT * FROM `glink` WHERE `cid` = %d AND `uid` = %d AND `gcid` = %d AND `zcid` = %d LIMIT 1",
                intval($cid),
@@ -349,8 +358,9 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
                intval($gcid),
                intval($zcid)
        );
-       if (! dbm::is_result($r)) {
-               q("INSERT INTO `glink` (`cid`,`uid`,`gcid`,`zcid`, `updated`) VALUES (%d,%d,%d,%d, '%s') ",
+
+       if (!dbm::is_result($r)) {
+               q("INSERT INTO `glink` (`cid`, `uid`, `gcid`, `zcid`, `updated`) VALUES (%d, %d, %d, %d, '%s') ",
                        intval($cid),
                        intval($uid),
                        intval($gcid),
@@ -366,17 +376,17 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
                        intval($zcid)
                );
        }
-
-       return $gcid;
 }
 
 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);
 }
@@ -465,15 +475,26 @@ function poco_last_updated($profile, $force = false) {
        $gcontacts = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s'",
                        dbesc(normalise_link($profile)));
 
+       if (!dbm::is_result($gcontacts)) {
+               return false;
+       }
+
+       $contact = array("url" => $profile);
+
        if ($gcontacts[0]["created"] <= NULL_DATE) {
-               q("UPDATE `gcontact` SET `created` = '%s' WHERE `nurl` = '%s'",
-                       dbesc(datetime_convert()), dbesc(normalise_link($profile)));
+               $contact['created'] = datetime_convert();
+       }
+
+       if ($force) {
+               $server_url = normalise_link(poco_detect_server($profile));
        }
-       if ($gcontacts[0]["server_url"] != "") {
+
+       if (($server_url == '') && ($gcontacts[0]["server_url"] != "")) {
                $server_url = $gcontacts[0]["server_url"];
        }
-       if (($server_url == '') OR ($gcontacts[0]["server_url"] == $gcontacts[0]["nurl"])) {
-               $server_url = poco_detect_server($profile);
+
+       if (!$force && (($server_url == '') || ($gcontacts[0]["server_url"] == $gcontacts[0]["nurl"]))) {
+               $server_url = normalise_link(poco_detect_server($profile));
        }
 
        if (!in_array($gcontacts[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_FEED, NETWORK_OSTATUS, ""))) {
@@ -483,67 +504,64 @@ function poco_last_updated($profile, $force = false) {
 
        if ($server_url != "") {
                if (!poco_check_server($server_url, $gcontacts[0]["network"], $force)) {
-
-                       if ($force)
+                       if ($force) {
                                q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
                                        dbesc(datetime_convert()), dbesc(normalise_link($profile)));
+                       }
 
                        logger("Profile ".$profile.": Server ".$server_url." wasn't reachable.", LOGGER_DEBUG);
                        return false;
                }
-
-               q("UPDATE `gcontact` SET `server_url` = '%s' WHERE `nurl` = '%s'",
-                       dbesc($server_url), dbesc(normalise_link($profile)));
+               $contact['server_url'] = $server_url;
        }
 
        if (in_array($gcontacts[0]["network"], array("", NETWORK_FEED))) {
                $server = q("SELECT `network` FROM `gserver` WHERE `nurl` = '%s' AND `network` != ''",
                        dbesc(normalise_link($server_url)));
 
-               if ($server)
-                       q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
-                               dbesc($server[0]["network"]), dbesc(normalise_link($profile)));
-               else
+               if ($server) {
+                       $contact['network'] = $server[0]["network"];
+               } else {
                        return false;
+               }
        }
 
        // noscrape is really fast so we don't cache the call.
-       if (($gcontacts[0]["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($gcontacts[0]["server_url"])));
+               $server = q("SELECT `noscrape`, `network` FROM `gserver` WHERE `nurl` = '%s' AND `noscrape` != ''", dbesc(normalise_link($server_url)));
 
                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);
 
                                if (is_array($noscrape)) {
-                                       $contact = array("url" => $profile,
-                                                       "network" => $server[0]["network"],
-                                                       "generation" => $gcontacts[0]["generation"]);
+                                       $contact["network"] = $server[0]["network"];
 
-                                       if (isset($noscrape["fn"]))
+                                       if (isset($noscrape["fn"])) {
                                                $contact["name"] = $noscrape["fn"];
-
-                                       if (isset($noscrape["comm"]))
+                                       }
+                                       if (isset($noscrape["comm"])) {
                                                $contact["community"] = $noscrape["comm"];
-
+                                       }
                                        if (isset($noscrape["tags"])) {
                                                $keywords = implode(" ", $noscrape["tags"]);
-                                               if ($keywords != "")
+                                               if ($keywords != "") {
                                                        $contact["keywords"] = $keywords;
+                                               }
                                        }
 
                                        $location = formatted_location($noscrape);
-                                       if ($location)
+                                       if ($location) {
                                                $contact["location"] = $location;
-
-                                       if (isset($noscrape["dfrn-notify"]))
+                                       }
+                                       if (isset($noscrape["dfrn-notify"])) {
                                                $contact["notify"] = $noscrape["dfrn-notify"];
-
+                                       }
                                        // Remove all fields that are not present in the gcontact table
                                        unset($noscrape["fn"]);
                                        unset($noscrape["key"]);
@@ -581,33 +599,43 @@ 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);
                return $gcontacts[0]["updated"];
        }
 
-       $data = probe_url($profile);
+       $data = Probe::uri($profile);
 
        // 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
                q("DELETE FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($profile)));
                q("DELETE FROM `glink` WHERE `gcid` = %d", intval($gcontacts[0]["id"]));
 
-               poco_check($data["url"], $data["name"], $data["network"], $data["photo"], $gcontacts[0]["about"], $gcontacts[0]["location"],
-                               $gcontacts[0]["gender"], $gcontacts[0]["keywords"], $data["addr"], $gcontacts[0]["updated"], $gcontacts[0]["generation"]);
+               $gcontact = array_merge($gcontacts[0], $data);
+
+               $gcontact["server_url"] = $data["baseurl"];
 
-               poco_last_updated($data["url"], $force);
+               try {
+                       $gcontact = sanitize_gcontact($gcontact);
+                       update_gcontact($gcontact);
+
+                       poco_last_updated($data["url"], $force);
+               } catch (Exception $e) {
+                       logger($e->getMessage(), LOGGER_DEBUG);
+               }
 
                logger("Profile ".$profile." was deleted", LOGGER_DEBUG);
                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)));
 
@@ -615,21 +643,10 @@ function poco_last_updated($profile, $force = false) {
                return false;
        }
 
-       $contact = array("generation" => $gcontacts[0]["generation"]);
-
        $contact = array_merge($contact, $data);
 
        $contact["server_url"] = $data["baseurl"];
 
-       unset($contact["batch"]);
-       unset($contact["poll"]);
-       unset($contact["request"]);
-       unset($contact["confirm"]);
-       unset($contact["poco"]);
-       unset($contact["priority"]);
-       unset($contact["pubkey"]);
-       unset($contact["baseurl"]);
-
        update_gcontact($contact);
 
        $feedret = z_fetch_url($data["poll"]);
@@ -652,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;
 
@@ -672,9 +689,10 @@ function poco_last_updated($profile, $force = false) {
        q("UPDATE `gcontact` SET `updated` = '%s', `last_contact` = '%s' WHERE `nurl` = '%s'",
                dbesc(dbm::date($last_updated)), dbesc(dbm::date()), dbesc(normalise_link($profile)));
 
-       if (($gcontacts[0]["generation"] == 0))
+       if (($gcontacts[0]["generation"] == 0)) {
                q("UPDATE `gcontact` SET `generation` = 9 WHERE `nurl` = '%s'",
                        dbesc(normalise_link($profile)));
+       }
 
        logger("Profile ".$profile." was last updated at ".$last_updated, LOGGER_DEBUG);
 
@@ -684,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;
 }
 
 /**
@@ -753,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';
@@ -788,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;
                }
@@ -813,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;
        }
 
@@ -841,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;
                        }
@@ -880,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]");
 
@@ -916,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;
                        }
                }
        }
@@ -941,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)) {
@@ -954,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"];
@@ -965,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);
                }
@@ -997,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
@@ -1014,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) {
@@ -1046,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'];
@@ -1063,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"]);
@@ -1073,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;
+                       }
                }
        }
 
@@ -1136,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;
@@ -1154,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;
@@ -1174,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");
@@ -1212,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();
                }
        }
 
@@ -1239,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;
@@ -1281,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);
        }
 
@@ -1341,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`
@@ -1359,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`
@@ -1391,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`
@@ -1406,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),
@@ -1430,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`
@@ -1445,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`
@@ -1468,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;
 }
 
@@ -1479,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."'";
@@ -1519,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;
        }
@@ -1545,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;
 }
 
@@ -1567,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';
 
@@ -1597,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);
+                       }
                }
        }
 }
@@ -1619,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)));
@@ -1635,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
@@ -1645,11 +1689,25 @@ 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));
                }
        }
 
+       // Disvover Mastodon servers
+       if (!Config::get('system','ostatus_disabled')) {
+               $serverdata = fetch_url("https://instances.mastodon.xyz/instances.json");
+
+               if ($serverdata) {
+                       $servers = json_decode($serverdata);
+
+                       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));
+                       }
+               }
+       }
+
        // Currently disabled, since the service isn't available anymore.
        // It is not removed since I hope that there will be a successor.
        // Discover GNU Social Servers.
@@ -1660,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);
        //      }
        //}
@@ -1668,96 +1726,118 @@ function poco_discover_federation() {
        set_config('poco','last_federation_discovery', time());
 }
 
-function poco_discover($complete = false) {
+function poco_discover_single_server($id) {
+       $r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `id` = %d", intval($id));
+       if (!dbm::is_result($r)) {
+               return false;
+       }
 
-       // Update the server list
-       poco_discover_federation();
+       $server = $r[0];
 
-       $no_of_queries = 5;
+       // Discover new servers out there (Works from Friendica version 3.5.2)
+       poco_fetch_serverlist($server["poco"]);
 
-       $requery_days = intval(get_config("system", "poco_requery_days"));
+       // Fetch all users from the other server
+       $url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
 
-       if ($requery_days == 0)
-               $requery_days = 7;
+       logger("Fetch all users from the server ".$server["url"], LOGGER_DEBUG);
 
-       $last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
+       $retdata = z_fetch_url($url);
+       if ($retdata["success"]) {
+               $data = json_decode($retdata["body"]);
 
-       $r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update));
-       if ($r)
-               foreach ($r AS $server) {
+               poco_discover_server($data, 2);
 
-                       if (!poco_check_server($server["url"], $server["network"])) {
-                               // The server is not reachable? Okay, then we will try it later
-                               q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
-                               continue;
+               if (get_config('system','poco_discovery') > 1) {
+
+                       $timeframe = get_config('system','poco_discovery_since');
+                       if ($timeframe == 0) {
+                               $timeframe = 30;
                        }
 
-                       // Discover new servers out there
-                       poco_fetch_serverlist($server["poco"]);
+                       $updatedSince = date("Y-m-d H:i:s", time() - $timeframe * 86400);
 
-                       // Fetch all users from the other server
-                       $url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
+                       // Fetch all global contacts from the other server (Not working with Redmatrix and Friendica versions before 3.3)
+                       $url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
 
-                       logger("Fetch all users from the server ".$server["nurl"], LOGGER_DEBUG);
+                       $success = false;
 
                        $retdata = z_fetch_url($url);
                        if ($retdata["success"]) {
-                               $data = json_decode($retdata["body"]);
+                               logger("Fetch all global contacts from the server ".$server["nurl"], LOGGER_DEBUG);
+                               $success = poco_discover_server(json_decode($retdata["body"]));
+                       }
 
-                               poco_discover_server($data, 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);
+                       }
+               }
 
-                               if (get_config('system','poco_discovery') > 1) {
+               q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
 
-                                       $timeframe = get_config('system','poco_discovery_since');
-                                       if ($timeframe == 0)
-                                               $timeframe = 30;
+               return true;
+       } else {
+               // If the server hadn't replied correctly, then force a sanity check
+               poco_check_server($server["url"], $server["network"], true);
 
-                                       $updatedSince = date("Y-m-d H:i:s", time() - $timeframe * 86400);
+               // If we couldn't reach the server, we will try it some time later
+               q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
 
-                                       // Fetch all global contacts from the other server (Not working with Redmatrix and Friendica versions before 3.3)
-                                       $url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
+               return false;
+       }
+}
 
-                                       $success = false;
+function poco_discover($complete = false) {
 
-                                       $retdata = z_fetch_url($url);
-                                       if ($retdata["success"]) {
-                                               logger("Fetch all global contacts from the server ".$server["nurl"], LOGGER_DEBUG);
-                                               $success = poco_discover_server(json_decode($retdata["body"]));
-                                       }
+       // Update the server list
+       poco_discover_federation();
 
-                                       if (!$success AND (get_config('system','poco_discovery') > 2)) {
-                                               logger("Fetch contacts from users of the server ".$server["nurl"], LOGGER_DEBUG);
-                                               poco_discover_server_users($data, $server);
-                                       }
-                               }
+       $no_of_queries = 5;
 
-                               q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
-                               if (!$complete AND (--$no_of_queries == 0))
-                                       break;
-                       } else {
-                               // If the server hadn't replied correctly, then force a sanity check
-                               poco_check_server($server["url"], $server["network"], true);
+       $requery_days = intval(get_config("system", "poco_requery_days"));
 
-                               // If we couldn't reach the server, we will try it some time later
+       if ($requery_days == 0) {
+               $requery_days = 7;
+       }
+       $last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
+
+       $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) {
+
+                       if (!poco_check_server($server["url"], $server["network"])) {
+                               // The server is not reachable? Okay, then we will try it later
                                q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
+                               continue;
+                       }
+
+                       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 && (--$no_of_queries == 0)) {
+                               break;
                        }
                }
+       }
 }
 
 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);
@@ -1766,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 = '';
@@ -1796,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;
@@ -1821,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);
                        }
@@ -1855,10 +1937,26 @@ function poco_discover_server($data, $default_generation = 0) {
                        $success = true;
 
                        logger("Store profile ".$profile_url, LOGGER_DEBUG);
-                       poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, 0, 0, 0);
 
-                       $gcontact = array("url" => $profile_url, "contact-type" => $contact_type, "generation" => $generation);
-                       update_gcontact($gcontact);
+                       $gcontact = array("url" => $profile_url,
+                                       "name" => $name,
+                                       "network" => $network,
+                                       "photo" => $profile_photo,
+                                       "about" => $about,
+                                       "location" => $location,
+                                       "gender" => $gender,
+                                       "keywords" => $keywords,
+                                       "connect" => $connect_url,
+                                       "updated" => $updated,
+                                       "contact-type" => $contact_type,
+                                       "generation" => $generation);
+
+                       try {
+                               $gcontact = sanitize_gcontact($gcontact);
+                               update_gcontact($gcontact);
+                       } catch (Exception $e) {
+                               logger($e->getMessage(), LOGGER_DEBUG);
+                       }
 
                        logger("Done for profile ".$profile_url, LOGGER_DEBUG);
                }
@@ -1875,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;
 }
@@ -1898,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);
@@ -1926,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
@@ -1952,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`)
@@ -1975,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;
 }
 
@@ -2004,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;
        }
 
@@ -2012,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`
@@ -2022,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"]);
@@ -2031,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"]))
-               $contact["updated"] = datetime_convert();
+       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;
        }
@@ -2082,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);
@@ -2109,7 +2225,7 @@ function update_gcontact($contact) {
                        dbesc($contact["gender"]), dbesc($contact["keywords"]), intval($contact["hide"]),
                        intval($contact["nsfw"]), intval($contact["contact-type"]), dbesc($contact["alias"]),
                        dbesc($contact["notify"]), dbesc($contact["url"]), dbesc($contact["location"]),
-                       dbesc($contact["about"]), intval($contact["generation"]), dbesc($contact["updated"]),
+                       dbesc($contact["about"]), intval($contact["generation"]), dbesc(dbm::date($contact["updated"])),
                        dbesc($contact["server_url"]), dbesc($contact["connect"]),
                        dbesc(normalise_link($contact["url"])), intval($contact["generation"]));
 
@@ -2119,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"]);
@@ -2153,6 +2269,8 @@ function update_gcontact_from_probe($url) {
                return;
        }
 
+       $data["server_url"] = $data["baseurl"];
+
        update_gcontact($data);
 }
 
@@ -2177,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);
@@ -2208,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,
@@ -2246,6 +2369,7 @@ function gs_fetch_users($server) {
                                        "photo" => App::get_baseurl()."/images/person-175.jpg");
                        get_gcontact_id($contact);
                }
+       }
 }
 
 /**
@@ -2261,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"]));
        }
@@ -2283,6 +2408,6 @@ function poco_serverlist() {
        if (!dbm::is_result($r)) {
                return false;
        }
+
        return $r;
 }
-?>