]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/GContact.php
If no record is found, below $r[0] will fail with a E_NOTICE and the code
[friendica.git] / src / Model / GContact.php
index 0d0969ca0cdc700c7843d171b7852fefc350e3b4..efb4b6a401e7955b6894fe0a66566ea5f7ee7851 100644 (file)
@@ -1,25 +1,23 @@
 <?php
+
 /**
  * @file src/Model/GlobalContact.php
  * @brief This file includes the GlobalContact class with directory related functions
  */
 namespace Friendica\Model;
 
+use Exception;
 use Friendica\Core\Config;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
-use Friendica\Model\Contact;
-use Friendica\Model\Profile;
+use Friendica\Database\DBA;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use dba;
-use Exception;
 
-require_once 'include/datetime.php';
 require_once 'include/dba.php';
-require_once 'include/html2bbcode.php';
 
 /**
  * @brief This class handles GlobalContact related functions
@@ -36,56 +34,53 @@ class GContact
         */
        public static function searchByName($search, $mode = '')
        {
-               if ($search) {
-                       // check supported networks
-                       if (Config::get('system', 'diaspora_enabled')) {
-                               $diaspora = NETWORK_DIASPORA;
-                       } else {
-                               $diaspora = NETWORK_DFRN;
-                       }
+               if (empty($search)) {
+                       return [];
+               }
 
-                       if (!Config::get('system', 'ostatus_disabled')) {
-                               $ostatus = NETWORK_OSTATUS;
-                       } else {
-                               $ostatus = NETWORK_DFRN;
-                       }
+               // check supported networks
+               if (Config::get('system', 'diaspora_enabled')) {
+                       $diaspora = Protocol::DIASPORA;
+               } else {
+                       $diaspora = Protocol::DFRN;
+               }
 
-                       // check if we search only communities or every contact
-                       if ($mode === "community") {
-                               $extra_sql = " AND `community`";
-                       } else {
-                               $extra_sql = "";
-                       }
+               if (!Config::get('system', 'ostatus_disabled')) {
+                       $ostatus = Protocol::OSTATUS;
+               } else {
+                       $ostatus = Protocol::DFRN;
+               }
 
-                       $search .= "%";
-
-                       $results = q(
-                               "SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`nick`, `gcontact`.`photo`,
-                                               `gcontact`.`network`, `gcontact`.`keywords`, `gcontact`.`addr`, `gcontact`.`community`
-                               FROM `gcontact`
-                               LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
-                                       AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
-                                       AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s')
-                               WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
-                               ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR
-                               (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
-                               (`gcontact`.`addr` LIKE '%s' OR `gcontact`.`name` LIKE '%s' OR `gcontact`.`nick` LIKE '%s') $extra_sql
-                                       GROUP BY `gcontact`.`nurl`
-                                       ORDER BY `gcontact`.`nurl` DESC
-                                       LIMIT 1000",
-                               intval(local_user()),
-                               dbesc(CONTACT_IS_SHARING),
-                               dbesc(CONTACT_IS_FRIEND),
-                               dbesc(NETWORK_DFRN),
-                               dbesc($ostatus),
-                               dbesc($diaspora),
-                               dbesc(escape_tags($search)),
-                               dbesc(escape_tags($search)),
-                               dbesc(escape_tags($search))
-                       );
+               // check if we search only communities or every contact
+               if ($mode === "community") {
+                       $extra_sql = " AND `community`";
+               } else {
+                       $extra_sql = "";
+               }
+
+               $search .= "%";
+
+               $results = DBA::p("SELECT `nurl` FROM `gcontact`
+                       WHERE NOT `hide` AND `network` IN (?, ?, ?) AND
+                               ((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`)) AND
+                               (`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?) $extra_sql
+                               GROUP BY `nurl` ORDER BY `nurl` DESC LIMIT 1000",
+                       Protocol::DFRN, $ostatus, $diaspora, $search, $search, $search
+               );
+
+               $gcontacts = [];
+               while ($result = DBA::fetch($results)) {
+                       $urlparts = parse_url($result["nurl"]);
+
+                       // Ignore results that look strange.
+                       // For historic reasons the gcontact table does contain some garbage.
+                       if (!empty($urlparts['query']) || !empty($urlparts['fragment'])) {
+                               continue;
+                       }
 
-                       return $results;
+                       $gcontacts[] = Contact::getDetailsByURL($result["nurl"], local_user());
                }
+               return $gcontacts;
        }
 
        /**
@@ -111,19 +106,19 @@ class GContact
                        intval($zcid)
                );
 
-               if (!DBM::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        q(
                                "INSERT INTO `glink` (`cid`, `uid`, `gcid`, `zcid`, `updated`) VALUES (%d, %d, %d, %d, '%s') ",
                                intval($cid),
                                intval($uid),
                                intval($gcid),
                                intval($zcid),
-                               dbesc(datetime_convert())
+                               DBA::escape(DateTimeFormat::utcNow())
                        );
                } else {
                        q(
                                "UPDATE `glink` SET `updated` = '%s' WHERE `cid` = %d AND `uid` = %d AND `gcid` = %d AND `zcid` = %d",
-                               dbesc(datetime_convert()),
+                               DBA::escape(DateTimeFormat::utcNow()),
                                intval($cid),
                                intval($uid),
                                intval($gcid),
@@ -157,18 +152,18 @@ class GContact
                        throw new Exception("This (".$gcontact['url'].") doesn't seem to be an url.");
                }
 
-               if (in_array($urlparts["host"], ["www.facebook.com", "facebook.com", "twitter.com", "identi.ca", "alpha.app.net"])) {
+               if (in_array($urlparts["host"], ["twitter.com", "identi.ca"])) {
                        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 ($gcontact['network'] == NETWORK_STATUSNET) {
+               // We can't simply set this to Protocol::OSTATUS since the connector could have fetched posts from friendica as well
+               if ($gcontact['network'] == Protocol::STATUSNET) {
                        $gcontact['network'] = "";
                }
 
                // Assure that there are no parameter fragments in the profile url
-               if (in_array($gcontact['network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
+               if (in_array($gcontact['network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
                        $gcontact['url'] = self::cleanContactUrl($gcontact['url']);
                }
 
@@ -182,21 +177,21 @@ class GContact
                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)
+                               DBA::escape(normalise_link($gcontact['url'])),
+                               DBA::escape(Protocol::STATUSNET)
                        );
-                       if (DBM::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                $gcontact['network'] = $r[0]["network"];
                        }
 
-                       if (($gcontact['network'] == "") || ($gcontact['network'] == NETWORK_OSTATUS)) {
+                       if (($gcontact['network'] == "") || ($gcontact['network'] == Protocol::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)
+                                       DBA::escape($gcontact['url']),
+                                       DBA::escape(normalise_link($gcontact['url'])),
+                                       DBA::escape(Protocol::STATUSNET)
                                );
-                               if (DBM::is_result($r)) {
+                               if (DBA::isResult($r)) {
                                        $gcontact['network'] = $r[0]["network"];
                                }
                        }
@@ -207,11 +202,11 @@ class GContact
 
                $x = q(
                        "SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-                       dbesc(normalise_link($gcontact['url']))
+                       DBA::escape(normalise_link($gcontact['url']))
                );
 
-               if (DBM::is_result($x)) {
-                       if (!isset($gcontact['network']) && ($x[0]["network"] != NETWORK_STATUSNET)) {
+               if (DBA::isResult($x)) {
+                       if (!isset($gcontact['network']) && ($x[0]["network"] != Protocol::STATUSNET)) {
                                $gcontact['network'] = $x[0]["network"];
                        }
                        if ($gcontact['updated'] <= NULL_DATE) {
@@ -230,7 +225,7 @@ class GContact
                ) {
                        $data = Probe::uri($gcontact['url']);
 
-                       if ($data["network"] == NETWORK_PHANTOM) {
+                       if ($data["network"] == Protocol::PHANTOM) {
                                throw new Exception('Probing for URL '.$gcontact['url'].' failed');
                        }
 
@@ -240,12 +235,10 @@ class GContact
 
                        $gcontact = array_merge($gcontact, $data);
 
-                       if ($alternate && ($gcontact['network'] == NETWORK_OSTATUS)) {
+                       if ($alternate && ($gcontact['network'] == Protocol::OSTATUS)) {
                                // Delete the old entry - if it exists
-                               $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
-                               if (DBM::is_result($r)) {
-                                       q("DELETE FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
-                                       q("DELETE FROM `glink` WHERE `gcid` = %d", intval($r[0]["id"]));
+                               if (DBA::exists('gcontact', ['nurl' => normalise_link($orig_profile)])) {
+                                       DBA::delete('gcontact', ['nurl' => normalise_link($orig_profile)]);
                                }
                        }
                }
@@ -254,7 +247,7 @@ class GContact
                        throw new Exception('No name and photo for URL '.$gcontact['url']);
                }
 
-               if (!in_array($gcontact['network'], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA])) {
+               if (!in_array($gcontact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
                        throw new Exception('No federated network ('.$gcontact['network'].') detected for URL '.$gcontact['url']);
                }
 
@@ -297,7 +290,7 @@ class GContact
                );
 
                // logger("countCommonFriends: $uid $cid {$r[0]['total']}");
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        return $r[0]['total'];
                }
                return 0;
@@ -319,7 +312,7 @@ class GContact
                        intval($uid)
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        return $r[0]['total'];
                }
 
@@ -360,7 +353,7 @@ class GContact
                        intval($limit)
                );
 
-               /// @TODO Check all calling-findings of this function if they properly use DBM::is_result()
+               /// @TODO Check all calling-findings of this function if they properly use DBA::isResult()
                return $r;
        }
 
@@ -392,7 +385,7 @@ class GContact
                        intval($limit)
                );
 
-               /// @TODO Check all calling-findings of this function if they properly use DBM::is_result()
+               /// @TODO Check all calling-findings of this function if they properly use DBA::isResult()
                return $r;
        }
 
@@ -412,7 +405,7 @@ class GContact
                        intval($uid)
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        return $r[0]['total'];
                }
 
@@ -443,7 +436,7 @@ class GContact
                        intval($limit)
                );
 
-               /// @TODO Check all calling-findings of this function if they properly use DBM::is_result()
+               /// @TODO Check all calling-findings of this function if they properly use DBA::isResult()
                return $r;
        }
 
@@ -468,14 +461,14 @@ class GContact
                //      return $list;
                //}
 
-               $network = [NETWORK_DFRN];
+               $network = [Protocol::DFRN];
 
                if (Config::get('system', 'diaspora_enabled')) {
-                       $network[] = NETWORK_DIASPORA;
+                       $network[] = Protocol::DIASPORA;
                }
 
                if (!Config::get('system', 'ostatus_disabled')) {
-                       $network[] = NETWORK_OSTATUS;
+                       $network[] = Protocol::OSTATUS;
                }
 
                $sql_network = implode("', '", $network);
@@ -497,13 +490,13 @@ class GContact
                        intval($uid),
                        intval($uid),
                        intval($uid),
-                       dbesc(NULL_DATE),
+                       DBA::escape(NULL_DATE),
                        $sql_network,
                        intval($start),
                        intval($limit)
                );
 
-               if (DBM::is_result($r) && count($r) >= ($limit -1)) {
+               if (DBA::isResult($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.
@@ -526,7 +519,7 @@ class GContact
                        intval($uid),
                        intval($uid),
                        intval($uid),
-                       dbesc(NULL_DATE),
+                       DBA::escape(NULL_DATE),
                        $sql_network,
                        intval($start),
                        intval($limit)
@@ -569,15 +562,16 @@ class GContact
 
                if (strlen(Config::get('system', 'directory'))) {
                        $x = Network::fetchUrl(get_server()."/pubsites");
-                       if ($x) {
+                       if (!empty($x)) {
                                $j = json_decode($x);
-                               if ($j->entries) {
+                               if (!empty($j->entries)) {
                                        foreach ($j->entries as $entry) {
                                                PortableContact::checkServer($entry->url);
 
                                                $url = $entry->url . '/poco';
-                                               if (! in_array($url, $done)) {
-                                                       PortableContact::loadWorker(0, 0, 0, $entry->url . '/poco');
+                                               if (!in_array($url, $done)) {
+                                                       PortableContact::loadWorker(0, 0, 0, $url);
+                                                       $done[] = $url;
                                                }
                                        }
                                }
@@ -587,11 +581,11 @@ class GContact
                // Query your contacts from Friendica and Redmatrix/Hubzilla for their contacts
                $r = q(
                        "SELECT DISTINCT(`poco`) AS `poco` FROM `contact` WHERE `network` IN ('%s', '%s')",
-                       dbesc(NETWORK_DFRN),
-                       dbesc(NETWORK_DIASPORA)
+                       DBA::escape(Protocol::DFRN),
+                       DBA::escape(Protocol::DIASPORA)
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        foreach ($r as $rr) {
                                $base = substr($rr['poco'], 0, strrpos($rr['poco'], '/'));
                                if (! in_array($base, $done)) {
@@ -641,9 +635,9 @@ class GContact
         */
        public static function fixAlternateContactAddress(&$contact)
        {
-               if (($contact["network"] == NETWORK_OSTATUS) && PortableContact::alternateOStatusUrl($contact["url"])) {
+               if (($contact["network"] == Protocol::OSTATUS) && PortableContact::alternateOStatusUrl($contact["url"])) {
                        $data = Probe::uri($contact["url"]);
-                       if ($contact["network"] == NETWORK_OSTATUS) {
+                       if ($contact["network"] == Protocol::OSTATUS) {
                                logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
                                $contact["url"] = $data["url"];
                                $contact["addr"] = $data["addr"];
@@ -664,14 +658,21 @@ class GContact
        {
                $gcontact_id = 0;
                $doprobing = false;
+               $last_failure_str = '';
+               $last_contact_str = '';
 
-               if (in_array($contact["network"], [NETWORK_PHANTOM])) {
+               if (empty($contact["network"])) {
+                       logger("Empty network for contact url ".$contact["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
+                       return false;
+               }
+
+               if (in_array($contact["network"], [Protocol::PHANTOM])) {
                        logger("Invalid network for contact url ".$contact["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
                        return false;
                }
 
-               if ($contact["network"] == NETWORK_STATUSNET) {
-                       $contact["network"] = NETWORK_OSTATUS;
+               if ($contact["network"] == Protocol::STATUSNET) {
+                       $contact["network"] = Protocol::OSTATUS;
                }
 
                // All new contacts are hidden by default
@@ -683,21 +684,21 @@ class GContact
                self::fixAlternateContactAddress($contact);
 
                // Remove unwanted parts from the contact url (e.g. "?zrl=...")
-               if (in_array($contact["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
+               if (in_array($contact["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
                        $contact["url"] = self::cleanContactUrl($contact["url"]);
                }
 
-               dba::lock('gcontact');
+               DBA::lock('gcontact');
                $r = q(
                        "SELECT `id`, `last_contact`, `last_failure`, `network` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-                       dbesc(normalise_link($contact["url"]))
+                       DBA::escape(normalise_link($contact["url"]))
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        $gcontact_id = $r[0]["id"];
 
                        // Update every 90 days
-                       if (in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
+                       if (in_array($r[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
                                $last_failure_str = $r[0]["last_failure"];
                                $last_failure = strtotime($r[0]["last_failure"]);
                                $last_contact_str = $r[0]["last_contact"];
@@ -705,36 +706,40 @@ class GContact
                                $doprobing = (((time() - $last_contact) > (90 * 86400)) && ((time() - $last_failure) > (90 * 86400)));
                        }
                } else {
+                       $contact['location'] = defaults($contact, 'location', '');
+                       $contact['about'] = defaults($contact, 'about', '');
+                       $contact['generation'] = defaults($contact, 'generation', 0);
+
                        q(
                                "INSERT INTO `gcontact` (`name`, `nick`, `addr` , `network`, `url`, `nurl`, `photo`, `created`, `updated`, `location`, `about`, `hide`, `generation`)
                                VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
-                               dbesc($contact["name"]),
-                               dbesc($contact["nick"]),
-                               dbesc($contact["addr"]),
-                               dbesc($contact["network"]),
-                               dbesc($contact["url"]),
-                               dbesc(normalise_link($contact["url"])),
-                               dbesc($contact["photo"]),
-                               dbesc(datetime_convert()),
-                               dbesc(datetime_convert()),
-                               dbesc($contact["location"]),
-                               dbesc($contact["about"]),
+                               DBA::escape($contact["name"]),
+                               DBA::escape($contact["nick"]),
+                               DBA::escape($contact["addr"]),
+                               DBA::escape($contact["network"]),
+                               DBA::escape($contact["url"]),
+                               DBA::escape(normalise_link($contact["url"])),
+                               DBA::escape($contact["photo"]),
+                               DBA::escape(DateTimeFormat::utcNow()),
+                               DBA::escape(DateTimeFormat::utcNow()),
+                               DBA::escape($contact["location"]),
+                               DBA::escape($contact["about"]),
                                intval($contact["hide"]),
                                intval($contact["generation"])
                        );
 
                        $r = q(
                                "SELECT `id`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2",
-                               dbesc(normalise_link($contact["url"]))
+                               DBA::escape(normalise_link($contact["url"]))
                        );
 
-                       if (DBM::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                $gcontact_id = $r[0]["id"];
 
-                               $doprobing = in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""]);
+                               $doprobing = in_array($r[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""]);
                        }
                }
-               dba::unlock();
+               DBA::unlock();
 
                if ($doprobing) {
                        logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG);
@@ -785,11 +790,11 @@ class GContact
 
                // 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 (!empty($contact["keywords"]) && ($contact["keywords"] == "0")) {
                        unset($contact["keywords"]);
                }
 
-               if ($public_contact[0]["keywords"] == "0") {
+               if (!empty($public_contact[0]["keywords"]) && ($public_contact[0]["keywords"] == "0")) {
                        $public_contact[0]["keywords"] = "";
                }
 
@@ -806,24 +811,24 @@ class GContact
 
                $fields["hide"] = $public_contact[0]["hide"];
 
-               if ($contact["network"] == NETWORK_STATUSNET) {
-                       $contact["network"] = NETWORK_OSTATUS;
+               if ($contact["network"] == Protocol::STATUSNET) {
+                       $contact["network"] = Protocol::OSTATUS;
                }
 
                // Replace alternate OStatus user format with the primary one
                self::fixAlternateContactAddress($contact);
 
                if (!isset($contact["updated"])) {
-                       $contact["updated"] = DBM::date();
+                       $contact["updated"] = DateTimeFormat::utcNow();
                }
 
-               if ($contact["network"] == NETWORK_TWITTER) {
+               if ($contact["network"] == Protocol::TWITTER) {
                        $contact["server_url"] = 'http://twitter.com';
                }
 
                if ($contact["server_url"] == "") {
                        $data = Probe::uri($contact["url"]);
-                       if ($data["network"] != NETWORK_PHANTOM) {
+                       if ($data["network"] != Protocol::PHANTOM) {
                                $contact["server_url"] = $data['baseurl'];
                        }
                } else {
@@ -857,7 +862,7 @@ class GContact
                        logger("Update gcontact for ".$contact["url"], LOGGER_DEBUG);
                        $condition = ['`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)',
                                        normalise_link($contact["url"]), $contact["generation"]];
-                       $contact["updated"] = DBM::date($contact["updated"]);
+                       $contact["updated"] = DateTimeFormat::utc($contact["updated"]);
 
                        $updated = ['photo' => $contact['photo'], 'name' => $contact['name'],
                                        'nick' => $contact['nick'], 'addr' => $contact['addr'],
@@ -870,13 +875,14 @@ class GContact
                                        'generation' => $contact['generation'], 'updated' => $contact['updated'],
                                        'server_url' => $contact['server_url'], 'connect' => $contact['connect']];
 
-                       dba::update('gcontact', $updated, $condition, $fields);
+                       DBA::update('gcontact', $updated, $condition, $fields);
 
                        // Now update the contact entry with the user id "0" as well.
                        // This is used for the shadow copies of public items.
-
-                       $public_contact = dba::selectFirst('contact', ['id'], ['nurl' => normalise_link($contact["url"]), 'uid' => 0]);
-                       if (DBM::is_result($public_contact)) {
+                       /// @todo Check if we really should do this.
+                       // The quality of the gcontact table is mostly lower than the public contact
+                       $public_contact = DBA::selectFirst('contact', ['id'], ['nurl' => normalise_link($contact["url"]), 'uid' => 0]);
+                       if (DBA::isResult($public_contact)) {
                                logger("Update public contact ".$public_contact["id"], LOGGER_DEBUG);
 
                                Contact::updateAvatar($contact["photo"], 0, $public_contact["id"]);
@@ -885,7 +891,7 @@ class GContact
                                                'network', 'bd', 'gender',
                                                'keywords', 'alias', 'contact-type',
                                                'url', 'location', 'about'];
-                               $old_contact = dba::selectFirst('contact', $fields, ['id' => $public_contact["id"]]);
+                               $old_contact = DBA::selectFirst('contact', $fields, ['id' => $public_contact["id"]]);
 
                                // Update it with the current values
                                $fields = ['name' => $contact['name'], 'nick' => $contact['nick'],
@@ -895,7 +901,13 @@ class GContact
                                                'contact-type' => $contact['contact-type'], 'url' => $contact['url'],
                                                'location' => $contact['location'], 'about' => $contact['about']];
 
-                               dba::update('contact', $fields, ['id' => $public_contact["id"]], $old_contact);
+                               // Don't update the birthday field if not set or invalid
+                               if (empty($contact['birthday']) || ($contact['birthday'] < '0001-01-01')) {
+                                       unset($fields['bd']);
+                               }
+
+
+                               DBA::update('contact', $fields, ['id' => $public_contact["id"]], $old_contact);
                        }
                }
 
@@ -912,7 +924,7 @@ class GContact
        {
                $data = Probe::uri($url);
 
-               if (in_array($data["network"], [NETWORK_PHANTOM])) {
+               if (in_array($data["network"], [Protocol::PHANTOM])) {
                        logger("Invalid network for contact url ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
                        return;
                }
@@ -943,6 +955,11 @@ class GContact
                        intval($uid)
                );
 
+               if (!DBM::is_result($r)) {
+                       logger('Cannot find user with uid=' . $uid, LOGGER_NORMAL);
+                       return false;
+               }
+
                $location = Profile::formatLocation(
                        ["locality" => $r[0]["locality"], "region" => $r[0]["region"], "country-name" => $r[0]["country-name"]]
                );
@@ -961,7 +978,7 @@ class GContact
                                "hide" => ($r[0]["hidewall"] || !$r[0]["net-publish"]),
                                "nick" => $r[0]["nickname"], "addr" => $addr,
                                "connect" => $addr, "server_url" => System::baseUrl(),
-                               "generation" => 1, "network" => NETWORK_DFRN];
+                               "generation" => 1, "network" => Protocol::DFRN];
 
                self::update($gcontact);
        }
@@ -987,7 +1004,7 @@ class GContact
 
                $statistics = json_decode($result["body"]);
 
-               if (is_object($statistics->config)) {
+               if (!empty($statistics->config)) {
                        if ($statistics->config->instance_with_ssl) {
                                $server = "https://";
                        } else {
@@ -997,8 +1014,7 @@ class GContact
                        $server .= $statistics->config->instance_address;
 
                        $hostname = $statistics->config->instance_address;
-               } else {
-                       /// @TODO is_object() above means here no object, still $statistics is being used as object
+               } elseif (!empty($statistics)) {
                        if ($statistics->instance_with_ssl) {
                                $server = "https://";
                        } else {
@@ -1010,7 +1026,7 @@ class GContact
                        $hostname = $statistics->instance_address;
                }
 
-               if (is_object($statistics->users)) {
+               if (!empty($statistics->users)) {
                        foreach ($statistics->users as $nick => $user) {
                                $profile_url = $server."/".$user->nickname;
 
@@ -1018,9 +1034,13 @@ class GContact
                                                "name" => $user->fullname,
                                                "addr" => $user->nickname."@".$hostname,
                                                "nick" => $user->nickname,
-                                               "about" => $user->bio,
-                                               "network" => NETWORK_OSTATUS,
+                                               "network" => Protocol::OSTATUS,
                                                "photo" => System::baseUrl()."/images/person-175.jpg"];
+
+                               if (isset($user->bio)) {
+                                       $contact["about"] = $user->bio;
+                               }
+
                                self::getId($contact);
                        }
                }
@@ -1038,17 +1058,17 @@ class GContact
 
                $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)
+                       DBA::escape(Protocol::OSTATUS),
+                       DBA::escape($last_update)
                );
 
-               if (!DBM::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        return;
                }
 
                foreach ($r as $server) {
                        self::fetchGsUsers($server["url"]);
-                       q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
+                       q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", DBA::escape(DateTimeFormat::utcNow()), DBA::escape($server["nurl"]));
                }
        }
 
@@ -1062,10 +1082,10 @@ class GContact
                                        AND `last_contact` >= `last_failure`
                                        AND `updated` > UTC_TIMESTAMP - INTERVAL 1 MONTH
                                ORDER BY rand() LIMIT 1",
-                       dbesc(NETWORK_DFRN)
+                       DBA::escape(Protocol::DFRN)
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        return dirname($r[0]['url']);
                }