]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/GContact.php
Merge pull request #5561 from MrPetovan/bug/4584-fix-twitter-gif-still-image
[friendica.git] / src / Model / GContact.php
index f7984f0d37203dcfa6c2e2da44503a72fe93b7d5..13aa09333696a31fd63034b6550dc408067fdf5a 100644 (file)
@@ -1,25 +1,22 @@
 <?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\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 dba;
-use Exception;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 
-require_once 'include/datetime.php';
 require_once 'include/dba.php';
-require_once 'include/network.php';
-require_once 'include/html2bbcode.php';
 
 /**
  * @brief This class handles GlobalContact related functions
@@ -36,56 +33,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 = NETWORK_DIASPORA;
+               } else {
+                       $diaspora = NETWORK_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 = NETWORK_OSTATUS;
+               } else {
+                       $ostatus = NETWORK_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",
+                       NETWORK_DFRN, $ostatus, $diaspora, $search, $search, $search
+               );
+
+               $gcontacts = [];
+               while ($result = DBA::fetch($results)) {
+                       $urlparts = parse_url($result["nurl"]);
 
-                       return $results;
+                       // Ignore results that look strange.
+                       // For historic reasons the gcontact table does contain some garbage.
+                       if (!empty($urlparts['query']) || !empty($urlparts['fragment'])) {
+                               continue;
+                       }
+
+                       $gcontacts[] = Contact::getDetailsByURL($result["nurl"], local_user());
                }
+               return $gcontacts;
        }
 
        /**
@@ -111,19 +105,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,7 +151,7 @@ class GContact
                        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"))) {
+               if (in_array($urlparts["host"], ["www.facebook.com", "facebook.com", "twitter.com", "identi.ca", "alpha.app.net"])) {
                        throw new Exception('Contact from a non federated network ignored. ('.$gcontact['url'].')');
                }
 
@@ -168,7 +162,7 @@ class GContact
                }
 
                // Assure that there are no parameter fragments in the profile url
-               if (in_array($gcontact['network'], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) {
+               if (in_array($gcontact['network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
                        $gcontact['url'] = self::cleanContactUrl($gcontact['url']);
                }
 
@@ -182,21 +176,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(NETWORK_STATUSNET)
                        );
-                       if (DBM::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                $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)
+                                       DBA::escape($gcontact['url']),
+                                       DBA::escape(normalise_link($gcontact['url'])),
+                                       DBA::escape(NETWORK_STATUSNET)
                                );
-                               if (DBM::is_result($r)) {
+                               if (DBA::isResult($r)) {
                                        $gcontact['network'] = $r[0]["network"];
                                }
                        }
@@ -207,10 +201,10 @@ 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 (DBA::isResult($x)) {
                        if (!isset($gcontact['network']) && ($x[0]["network"] != NETWORK_STATUSNET)) {
                                $gcontact['network'] = $x[0]["network"];
                        }
@@ -242,10 +236,8 @@ class GContact
 
                        if ($alternate && ($gcontact['network'] == NETWORK_OSTATUS)) {
                                // Delete the old entry - if it exists
-                               $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
-                               if (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 +246,7 @@ class GContact
                        throw new Exception('No name and photo for URL '.$gcontact['url']);
                }
 
-               if (!in_array($gcontact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) {
+               if (!in_array($gcontact['network'], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA])) {
                        throw new Exception('No federated network ('.$gcontact['network'].') detected for URL '.$gcontact['url']);
                }
 
@@ -297,7 +289,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 +311,7 @@ class GContact
                        intval($uid)
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        return $r[0]['total'];
                }
 
@@ -360,7 +352,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 +384,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 +404,7 @@ class GContact
                        intval($uid)
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        return $r[0]['total'];
                }
 
@@ -443,7 +435,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;
        }
 
@@ -456,7 +448,7 @@ class GContact
        public static function suggestionQuery($uid, $start = 0, $limit = 80)
        {
                if (!$uid) {
-                       return array();
+                       return [];
                }
 
                /*
@@ -468,7 +460,7 @@ class GContact
                //      return $list;
                //}
 
-               $network = array(NETWORK_DFRN);
+               $network = [NETWORK_DFRN];
 
                if (Config::get('system', 'diaspora_enabled')) {
                        $network[] = NETWORK_DIASPORA;
@@ -497,13 +489,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,13 +518,13 @@ class GContact
                        intval($uid),
                        intval($uid),
                        intval($uid),
-                       dbesc(NULL_DATE),
+                       DBA::escape(NULL_DATE),
                        $sql_network,
                        intval($start),
                        intval($limit)
                );
 
-               $list = array();
+               $list = [];
                foreach ($r2 as $suggestion) {
                        $list[$suggestion["nurl"]] = $suggestion;
                }
@@ -560,7 +552,7 @@ class GContact
        {
                $a = get_app();
 
-               $done = array();
+               $done = [];
 
                /// @TODO Check if it is really neccessary to poll the own server
                PortableContact::loadWorker(0, 0, 0, System::baseUrl() . '/poco');
@@ -568,16 +560,17 @@ class GContact
                $done[] = System::baseUrl() . '/poco';
 
                if (strlen(Config::get('system', 'directory'))) {
-                       $x = fetch_url(get_server()."/pubsites");
-                       if ($x) {
+                       $x = Network::fetchUrl(get_server()."/pubsites");
+                       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 +580,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(NETWORK_DFRN),
+                       DBA::escape(NETWORK_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)) {
@@ -664,8 +657,15 @@ class GContact
        {
                $gcontact_id = 0;
                $doprobing = false;
+               $last_failure_str = '';
+               $last_contact_str = '';
+
+               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"], array(NETWORK_PHANTOM))) {
+               if (in_array($contact["network"], [NETWORK_PHANTOM])) {
                        logger("Invalid network for contact url ".$contact["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
                        return false;
                }
@@ -683,21 +683,21 @@ class GContact
                self::fixAlternateContactAddress($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"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_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"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) {
+                       if (in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
                                $last_failure_str = $r[0]["last_failure"];
                                $last_failure = strtotime($r[0]["last_failure"]);
                                $last_contact_str = $r[0]["last_contact"];
@@ -705,36 +705,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"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""));
+                               $doprobing = in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""]);
                        }
                }
-               dba::unlock();
+               DBA::unlock();
 
                if ($doprobing) {
                        logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG);
@@ -774,7 +778,7 @@ class GContact
                );
 
                // Get all field names
-               $fields = array();
+               $fields = [];
                foreach ($public_contact[0] as $field => $data) {
                        $fields[$field] = $data;
                }
@@ -785,11 +789,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"] = "";
                }
 
@@ -814,7 +818,7 @@ class GContact
                self::fixAlternateContactAddress($contact);
 
                if (!isset($contact["updated"])) {
-                       $contact["updated"] = DBM::date();
+                       $contact["updated"] = DateTimeFormat::utcNow();
                }
 
                if ($contact["network"] == NETWORK_TWITTER) {
@@ -855,11 +859,11 @@ class GContact
 
                if ($update) {
                        logger("Update gcontact for ".$contact["url"], LOGGER_DEBUG);
-                       $condition = array('`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)',
-                                       normalise_link($contact["url"]), $contact["generation"]);
-                       $contact["updated"] = DBM::date($contact["updated"]);
+                       $condition = ['`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)',
+                                       normalise_link($contact["url"]), $contact["generation"]];
+                       $contact["updated"] = DateTimeFormat::utc($contact["updated"]);
 
-                       $updated = array('photo' => $contact['photo'], 'name' => $contact['name'],
+                       $updated = ['photo' => $contact['photo'], 'name' => $contact['name'],
                                        'nick' => $contact['nick'], 'addr' => $contact['addr'],
                                        'network' => $contact['network'], 'birthday' => $contact['birthday'],
                                        'gender' => $contact['gender'], 'keywords' => $contact['keywords'],
@@ -868,34 +872,41 @@ class GContact
                                        'notify' => $contact['notify'], 'url' => $contact['url'],
                                        'location' => $contact['location'], 'about' => $contact['about'],
                                        'generation' => $contact['generation'], 'updated' => $contact['updated'],
-                                       'server_url' => $contact['server_url'], 'connect' => $contact['connect']);
+                                       '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"]);
 
-                               $fields = array('name', 'nick', 'addr',
+                               $fields = ['name', 'nick', 'addr',
                                                'network', 'bd', 'gender',
                                                'keywords', 'alias', 'contact-type',
-                                               'url', 'location', 'about');
-                               $old_contact = dba::selectFirst('contact', $fields, ['id' => $public_contact["id"]]);
+                                               'url', 'location', 'about'];
+                               $old_contact = DBA::selectFirst('contact', $fields, ['id' => $public_contact["id"]]);
 
                                // Update it with the current values
-                               $fields = array('name' => $contact['name'], 'nick' => $contact['nick'],
+                               $fields = ['name' => $contact['name'], 'nick' => $contact['nick'],
                                                'addr' => $contact['addr'], 'network' => $contact['network'],
                                                'bd' => $contact['birthday'], 'gender' => $contact['gender'],
                                                'keywords' => $contact['keywords'], 'alias' => $contact['alias'],
                                                'contact-type' => $contact['contact-type'], 'url' => $contact['url'],
-                                               'location' => $contact['location'], 'about' => $contact['about']);
+                                               'location' => $contact['location'], 'about' => $contact['about']];
+
+                               // 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, array('id' => $public_contact["id"]), $old_contact);
+                               DBA::update('contact', $fields, ['id' => $public_contact["id"]], $old_contact);
                        }
                }
 
@@ -912,7 +923,7 @@ class GContact
        {
                $data = Probe::uri($url);
 
-               if (in_array($data["network"], array(NETWORK_PHANTOM))) {
+               if (in_array($data["network"], [NETWORK_PHANTOM])) {
                        logger("Invalid network for contact url ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
                        return;
                }
@@ -944,24 +955,24 @@ class GContact
                );
 
                $location = Profile::formatLocation(
-                       array("locality" => $r[0]["locality"], "region" => $r[0]["region"], "country-name" => $r[0]["country-name"])
+                       ["locality" => $r[0]["locality"], "region" => $r[0]["region"], "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"] != "") {
-                       $addr = $r[0]["nickname"].'@'.str_replace(array("http://", "https://"), "", System::baseUrl());
+                       $addr = $r[0]["nickname"].'@'.str_replace(["http://", "https://"], "", System::baseUrl());
                } else {
                        $addr = $r[0]["addr"];
                }
 
-               $gcontact = array("name" => $r[0]["name"], "location" => $location, "about" => $r[0]["about"],
+               $gcontact = ["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"] || !$r[0]["net-publish"]),
                                "nick" => $r[0]["nickname"], "addr" => $addr,
                                "connect" => $addr, "server_url" => System::baseUrl(),
-                               "generation" => 1, "network" => NETWORK_DFRN);
+                               "generation" => 1, "network" => NETWORK_DFRN];
 
                self::update($gcontact);
        }
@@ -969,7 +980,7 @@ class GContact
        /**
         * @brief Fetches users of given GNU Social server
         *
-        * If the "Statistics" plugin is enabled (See http://gstools.org/ for details) we query user data with this.
+        * If the "Statistics" addon is enabled (See http://gstools.org/ for details) we query user data with this.
         *
         * @param string $server Server address
         * @return void
@@ -980,14 +991,14 @@ class GContact
 
                $url = $server."/main/statistics";
 
-               $result = z_fetch_url($url);
+               $result = Network::curl($url);
                if (!$result["success"]) {
                        return false;
                }
 
                $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 +1008,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,17 +1020,21 @@ 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;
 
-                               $contact = array("url" => $profile_url,
+                               $contact = ["url" => $profile_url,
                                                "name" => $user->fullname,
                                                "addr" => $user->nickname."@".$hostname,
                                                "nick" => $user->nickname,
-                                               "about" => $user->bio,
                                                "network" => NETWORK_OSTATUS,
-                                               "photo" => System::baseUrl()."/images/person-175.jpg");
+                                               "photo" => System::baseUrl()."/images/person-175.jpg"];
+
+                               if (isset($user->bio)) {
+                                       $contact["about"] = $user->bio;
+                               }
+
                                self::getId($contact);
                        }
                }
@@ -1038,17 +1052,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(NETWORK_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 +1076,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(NETWORK_DFRN)
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        return dirname($r[0]['url']);
                }