]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Contact.php
Fixes/tye-hints (#5449)
[friendica.git] / src / Model / Contact.php
index 99183295b5e71d8c63b1596bf3bf1929e2f615be..84580b0898997cba66222e95bcac51353ac992a4 100644 (file)
@@ -1,25 +1,26 @@
 <?php
-
 /**
  * @file src/Model/Contact.php
  */
-
 namespace Friendica\Model;
 
 use Friendica\BaseObject;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
-use Friendica\Model\Photo;
+use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
-use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
-use dba;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -40,7 +41,7 @@ class Contact extends BaseObject
        {
                $return = [];
                if (intval($gid)) {
-                       $stmt = dba::p('SELECT `group_member`.`contact-id`, `contact`.*
+                       $stmt = DBA::p('SELECT `group_member`.`contact-id`, `contact`.*
                                FROM `contact`
                                INNER JOIN `group_member`
                                        ON `contact`.`id` = `group_member`.`contact-id`
@@ -54,7 +55,7 @@ class Contact extends BaseObject
                                local_user()
                        );
                        if (DBM::is_result($stmt)) {
-                               $return = dba::inArray($stmt);
+                               $return = DBA::inArray($stmt);
                        }
                }
 
@@ -71,7 +72,7 @@ class Contact extends BaseObject
        {
                $return = 0;
                if (intval($gid)) {
-                       $contacts = dba::fetch_first('SELECT COUNT(*) AS `count`
+                       $contacts = DBA::fetch_first('SELECT COUNT(*) AS `count`
                                FROM `contact`
                                INNER JOIN `group_member`
                                        ON `contact`.`id` = `group_member`.`contact-id`
@@ -98,18 +99,18 @@ class Contact extends BaseObject
        public static function createSelfFromUserId($uid)
        {
                // Only create the entry if it doesn't exist yet
-               if (dba::exists('contact', ['uid' => $uid, 'self' => true])) {
+               if (DBA::exists('contact', ['uid' => $uid, 'self' => true])) {
                        return true;
                }
 
-               $user = dba::selectFirst('user', ['uid', 'username', 'nickname'], ['uid' => $uid]);
+               $user = DBA::selectFirst('user', ['uid', 'username', 'nickname'], ['uid' => $uid]);
                if (!DBM::is_result($user)) {
                        return false;
                }
 
-               $return = dba::insert('contact', [
+               $return = DBA::insert('contact', [
                        'uid'         => $user['uid'],
-                       'created'     => datetime_convert(),
+                       'created'     => DateTimeFormat::utcNow(),
                        'self'        => 1,
                        'name'        => $user['username'],
                        'nick'        => $user['nickname'],
@@ -126,15 +127,114 @@ class Contact extends BaseObject
                        'poll'        => System::baseUrl() . '/dfrn_poll/'    . $user['nickname'],
                        'confirm'     => System::baseUrl() . '/dfrn_confirm/' . $user['nickname'],
                        'poco'        => System::baseUrl() . '/poco/'         . $user['nickname'],
-                       'name-date'   => datetime_convert(),
-                       'uri-date'    => datetime_convert(),
-                       'avatar-date' => datetime_convert(),
+                       'name-date'   => DateTimeFormat::utcNow(),
+                       'uri-date'    => DateTimeFormat::utcNow(),
+                       'avatar-date' => DateTimeFormat::utcNow(),
                        'closeness'   => 0
                ]);
 
                return $return;
        }
 
+       /**
+        * Updates the self-contact for the provided user id
+        *
+        * @param int $uid
+        * @param boolean $update_avatar Force the avatar update
+        */
+       public static function updateSelfFromUserID($uid, $update_avatar = false)
+       {
+               $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'gender', 'avatar',
+                       'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'nurl'];
+               $self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
+               if (!DBM::is_result($self)) {
+                       return;
+               }
+
+               $fields = ['nickname', 'page-flags', 'account-type'];
+               $user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
+               if (!DBM::is_result($user)) {
+                       return;
+               }
+
+               $fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region',
+                       'country-name', 'gender', 'pub_keywords', 'xmpp'];
+               $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]);
+               if (!DBM::is_result($profile)) {
+                       return;
+               }
+
+               $fields = ['name' => $profile['name'], 'nick' => $user['nickname'],
+                       'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile),
+                       'about' => $profile['about'], 'keywords' => $profile['pub_keywords'],
+                       'gender' => $profile['gender'], 'avatar' => $profile['photo'],
+                       'contact-type' => $user['account-type'], 'xmpp' => $profile['xmpp']];
+
+               $avatar = DBA::selectFirst('photo', ['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
+               if (DBM::is_result($avatar)) {
+                       if ($update_avatar) {
+                               $fields['avatar-date'] = DateTimeFormat::utcNow();
+                       }
+
+                       // Creating the path to the avatar, beginning with the file suffix
+                       $types = Image::supportedTypes();
+                       if (isset($types[$avatar['type']])) {
+                               $file_suffix = $types[$avatar['type']];
+                       } else {
+                               $file_suffix = 'jpg';
+                       }
+
+                       // We are adding a timestamp value so that other systems won't use cached content
+                       $timestamp = strtotime($fields['avatar-date']);
+
+                       $prefix = System::baseUrl() . '/photo/' .$avatar['resource-id'] . '-';
+                       $suffix = '.' . $file_suffix . '?ts=' . $timestamp;
+
+                       $fields['photo'] = $prefix . '4' . $suffix;
+                       $fields['thumb'] = $prefix . '5' . $suffix;
+                       $fields['micro'] = $prefix . '6' . $suffix;
+               } else {
+                       // We hadn't found a photo entry, so we use the default avatar
+                       $fields['photo'] = System::baseUrl() . '/images/person-175.jpg';
+                       $fields['thumb'] = System::baseUrl() . '/images/person-80.jpg';
+                       $fields['micro'] = System::baseUrl() . '/images/person-48.jpg';
+               }
+
+               $fields['forum'] = $user['page-flags'] == PAGE_COMMUNITY;
+               $fields['prv'] = $user['page-flags'] == PAGE_PRVGROUP;
+
+               // it seems as if ported accounts can have wrong values, so we make sure that now everything is fine.
+               $fields['url'] = System::baseUrl() . '/profile/' . $user['nickname'];
+               $fields['nurl'] = normalise_link($fields['url']);
+               $fields['addr'] = $user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+               $fields['request'] = System::baseUrl() . '/dfrn_request/' . $user['nickname'];
+               $fields['notify'] = System::baseUrl() . '/dfrn_notify/'  . $user['nickname'];
+               $fields['poll'] = System::baseUrl() . '/dfrn_poll/'    . $user['nickname'];
+               $fields['confirm'] = System::baseUrl() . '/dfrn_confirm/' . $user['nickname'];
+               $fields['poco'] = System::baseUrl() . '/poco/'         . $user['nickname'];
+
+               $update = false;
+
+               foreach ($fields as $field => $content) {
+                       if ($self[$field] != $content) {
+                               $update = true;
+                       }
+               }
+
+               if ($update) {
+                       $fields['name-date'] = DateTimeFormat::utcNow();
+                       DBA::update('contact', $fields, ['id' => $self['id']]);
+
+                       // Update the public contact as well
+                       DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]);
+
+                       // Update the profile
+                       $fields = ['photo' => System::baseUrl() . '/photo/profile/' .$uid . '.jpg',
+                               'thumb' => System::baseUrl() . '/photo/avatar/' . $uid .'.jpg'];
+                       DBA::update('profile', $fields, ['uid' => $uid, 'is-default' => true]);
+               }
+       }
+
        /**
         * @brief Marks a contact for removal
         *
@@ -144,18 +244,18 @@ class Contact extends BaseObject
        public static function remove($id)
        {
                // We want just to make sure that we don't delete our "self" contact
-               $contact = dba::selectFirst('contact', ['uid'], ['id' => $id, 'self' => false]);
+               $contact = DBA::selectFirst('contact', ['uid'], ['id' => $id, 'self' => false]);
                if (!DBM::is_result($contact) || !intval($contact['uid'])) {
                        return;
                }
 
                $archive = PConfig::get($contact['uid'], 'system', 'archive_removed_contacts');
                if ($archive) {
-                       dba::update('contact', array('archive' => true, 'network' => 'none', 'writable' => false), array('id' => $id));
+                       DBA::update('contact', ['archive' => true, 'network' => 'none', 'writable' => false], ['id' => $id]);
                        return;
                }
 
-               dba::delete('contact', array('id' => $id));
+               DBA::delete('contact', ['id' => $id]);
 
                // Delete the rest in the background
                Worker::add(PRIORITY_LOW, 'RemoveContact', $id);
@@ -170,20 +270,18 @@ class Contact extends BaseObject
         */
        public static function terminateFriendship(array $user, array $contact)
        {
-               if ($contact['network'] === NETWORK_OSTATUS) {
+               if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN])) {
                        // create an unfollow slap
-                       $item = array();
+                       $item = [];
                        $item['verb'] = NAMESPACE_OSTATUS . "/unfollow";
                        $item['follow'] = $contact["url"];
                        $slap = OStatus::salmon($item, $user);
 
-                       if ((x($contact, 'notify')) && (strlen($contact['notify']))) {
+                       if (!empty($contact['notify'])) {
                                Salmon::slapper($user, $contact['notify'], $slap);
                        }
-               } elseif ($contact['network'] === NETWORK_DIASPORA) {
+               } elseif ($contact['network'] == NETWORK_DIASPORA) {
                        Diaspora::sendUnshare($user, $contact);
-               } elseif ($contact['network'] === NETWORK_DFRN) {
-                       DFRN::deliver($user, $contact, 'placeholder', 1);
                }
        }
 
@@ -207,10 +305,10 @@ class Contact extends BaseObject
                }
 
                if ($contact['term-date'] <= NULL_DATE) {
-                       dba::update('contact', array('term-date' => datetime_convert()), array('id' => $contact['id']));
+                       DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 
                        if ($contact['url'] != '') {
-                               dba::update('contact', array('term-date' => datetime_convert()), array('`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE));
+                               DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
                        }
                } else {
                        /* @todo
@@ -220,16 +318,18 @@ class Contact extends BaseObject
                         */
 
                        /// @todo Check for contact vitality via probing
-                       $expiry = $contact['term-date'] . ' + 32 days ';
-                       if (datetime_convert() > datetime_convert('UTC', 'UTC', $expiry)) {
+                       $archival_days = Config::get('system', 'archival_days', 32);
+
+                       $expiry = $contact['term-date'] . ' + ' . $archival_days . ' days ';
+                       if (DateTimeFormat::utcNow() > DateTimeFormat::utc($expiry)) {
                                /* Relationship is really truly dead. archive them rather than
                                 * delete, though if the owner tries to unarchive them we'll start
                                 * the whole process over again.
                                 */
-                               dba::update('contact', array('archive' => 1), array('id' => $contact['id']));
+                               DBA::update('contact', ['archive' => 1], ['id' => $contact['id']]);
 
                                if ($contact['url'] != '') {
-                                       dba::update('contact', array('archive' => 1), array('nurl' => normalise_link($contact['url']), 'self' => false));
+                                       DBA::update('contact', ['archive' => 1], ['nurl' => normalise_link($contact['url']), 'self' => false]);
                                }
                        }
                }
@@ -245,8 +345,8 @@ class Contact extends BaseObject
         */
        public static function unmarkForArchival(array $contact)
        {
-               $condition = array('`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], NULL_DATE);
-               $exists = dba::exists('contact', $condition);
+               $condition = ['`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], NULL_DATE];
+               $exists = DBA::exists('contact', $condition);
 
                // We don't need to update, we never marked this contact for archival
                if (!$exists) {
@@ -254,11 +354,16 @@ class Contact extends BaseObject
                }
 
                // It's a miracle. Our dead contact has inexplicably come back to life.
-               $fields = array('term-date' => NULL_DATE, 'archive' => false);
-               dba::update('contact', $fields, array('id' => $contact['id']));
+               $fields = ['term-date' => NULL_DATE, 'archive' => false];
+               DBA::update('contact', $fields, ['id' => $contact['id']]);
 
-               if ($contact['url'] != '') {
-                       dba::update('contact', $fields, array('nurl' => normalise_link($contact['url'])));
+               if (!empty($contact['url'])) {
+                       DBA::update('contact', $fields, ['nurl' => normalise_link($contact['url'])]);
+               }
+
+               if (!empty($contact['batch'])) {
+                       $condition = ['batch' => $contact['batch'], 'contact-type' => ACCOUNT_TYPE_RELAY];
+                       DBA::update('contact', $fields, $condition);
                }
        }
 
@@ -276,7 +381,7 @@ class Contact extends BaseObject
         */
        public static function getDetailsByURL($url, $uid = -1, array $default = [])
        {
-               static $cache = array();
+               static $cache = [];
 
                if ($url == '') {
                        return $default;
@@ -293,41 +398,41 @@ class Contact extends BaseObject
                $ssl_url = str_replace('http://', 'https://', $url);
 
                // Fetch contact data from the contact table for the given user
-               $s = dba::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+               $s = DBA::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
                        `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
                FROM `contact` WHERE `nurl` = ? AND `uid` = ?", normalise_link($url), $uid);
-               $r = dba::inArray($s);
+               $r = DBA::inArray($s);
 
                // Fetch contact data from the contact table for the given user, checking with the alias
                if (!DBM::is_result($r)) {
-                       $s = dba::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+                       $s = DBA::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
                                `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
                        FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = ?", normalise_link($url), $url, $ssl_url, $uid);
-                       $r = dba::inArray($s);
+                       $r = DBA::inArray($s);
                }
 
                // Fetch the data from the contact table with "uid=0" (which is filled automatically)
                if (!DBM::is_result($r)) {
-                       $s = dba::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+                       $s = DBA::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
                        `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
                        FROM `contact` WHERE `nurl` = ? AND `uid` = 0", normalise_link($url));
-                       $r = dba::inArray($s);
+                       $r = DBA::inArray($s);
                }
 
                // Fetch the data from the contact table with "uid=0" (which is filled automatically) - checked with the alias
                if (!DBM::is_result($r)) {
-                       $s = dba::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+                       $s = DBA::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
                        `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
                        FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = 0", normalise_link($url), $url, $ssl_url);
-                       $r = dba::inArray($s);
+                       $r = DBA::inArray($s);
                }
 
                // Fetch the data from the gcontact table
                if (!DBM::is_result($r)) {
-                       $s = dba::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
-                       `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
+                       $s = DBA::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
+                       `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, 0 AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
                        FROM `gcontact` WHERE `nurl` = ?", normalise_link($url));
-                       $r = dba::inArray($s);
+                       $r = DBA::inArray($s);
                }
 
                if (DBM::is_result($r)) {
@@ -367,34 +472,34 @@ class Contact extends BaseObject
                        $profile = $default;
                }
 
-               if (($profile["photo"] == "") && isset($default["photo"])) {
+               if (empty($profile["photo"]) && isset($default["photo"])) {
                        $profile["photo"] = $default["photo"];
                }
 
-               if (($profile["name"] == "") && isset($default["name"])) {
+               if (empty($profile["name"]) && isset($default["name"])) {
                        $profile["name"] = $default["name"];
                }
 
-               if (($profile["network"] == "") && isset($default["network"])) {
+               if (empty($profile["network"]) && isset($default["network"])) {
                        $profile["network"] = $default["network"];
                }
 
-               if (($profile["thumb"] == "") && isset($profile["photo"])) {
+               if (empty($profile["thumb"]) && isset($profile["photo"])) {
                        $profile["thumb"] = $profile["photo"];
                }
 
-               if (($profile["micro"] == "") && isset($profile["thumb"])) {
+               if (empty($profile["micro"]) && isset($profile["thumb"])) {
                        $profile["micro"] = $profile["thumb"];
                }
 
-               if ((($profile["addr"] == "") || ($profile["name"] == "")) && ($profile["gid"] != 0)
-                       && in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))
+               if ((empty($profile["addr"]) || empty($profile["name"])) && (defaults($profile, "gid", 0) != 0)
+                       && in_array($profile["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])
                ) {
                        Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]);
                }
 
                // Show contact details of Diaspora contacts only if connected
-               if (($profile["cid"] == 0) && ($profile["network"] == NETWORK_DIASPORA)) {
+               if ((defaults($profile, "cid", 0) == 0) && (defaults($profile, "network", "") == NETWORK_DIASPORA)) {
                        $profile["location"] = "";
                        $profile["about"] = "";
                        $profile["gender"] = "";
@@ -418,10 +523,10 @@ class Contact extends BaseObject
         */
        public static function getDetailsByAddr($addr, $uid = -1)
        {
-               static $cache = array();
+               static $cache = [];
 
                if ($addr == '') {
-                       return array();
+                       return [];
                }
 
                if ($uid == -1) {
@@ -488,32 +593,32 @@ class Contact extends BaseObject
                        $uid = local_user();
                }
 
-               if ($contact['uid'] != $uid) {
+               if (empty($contact['uid']) || ($contact['uid'] != $uid)) {
                        if ($uid == 0) {
-                               $profile_link = zrl($contact['url']);
-                               $menu = array('profile' => array(t('View Profile'), $profile_link, true));
+                               $profile_link = self::magicLink($contact['url']);
+                               $menu = ['profile' => [L10n::t('View Profile'), $profile_link, true]];
 
                                return $menu;
                        }
 
                        // Look for our own contact if the uid doesn't match and isn't public
-                       $contact_own = dba::selectFirst('contact', [], ['nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid]);
+                       $contact_own = DBA::selectFirst('contact', [], ['nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid]);
                        if (DBM::is_result($contact_own)) {
                                return self::photoMenu($contact_own, $uid);
                        } else {
-                               $profile_link = zrl($contact['url']);
+                               $profile_link = self::magicLink($contact['url']);
                                $connlnk = 'follow/?url=' . $contact['url'];
-                               $menu = array(
-                                       'profile' => array(t('View Profile'), $profile_link, true),
-                                       'follow' => array(t('Connect/Follow'), $connlnk, true)
-                               );
+                               $menu = [
+                                       'profile' => [L10n::t('View Profile'), $profile_link, true],
+                                       'follow' => [L10n::t('Connect/Follow'), $connlnk, true]
+                               ];
 
                                return $menu;
                        }
                }
 
                $sparkle = false;
-               if ($contact['network'] === NETWORK_DFRN) {
+               if (($contact['network'] === NETWORK_DFRN) && !$contact['self']) {
                        $sparkle = true;
                        $profile_link = System::baseUrl() . '/redir/' . $contact['id'];
                } else {
@@ -530,39 +635,42 @@ class Contact extends BaseObject
                        $profile_link = $profile_link . '?url=profile';
                }
 
-               if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DIASPORA))) {
+               if (in_array($contact['network'], [NETWORK_DFRN, NETWORK_DIASPORA]) && !$contact['self']) {
                        $pm_url = System::baseUrl() . '/message/new/' . $contact['id'];
                }
 
-               if ($contact['network'] == NETWORK_DFRN) {
+               if (($contact['network'] == NETWORK_DFRN) && !$contact['self']) {
                        $poke_link = System::baseUrl() . '/poke/?f=&c=' . $contact['id'];
                }
 
                $contact_url = System::baseUrl() . '/contacts/' . $contact['id'];
 
                $posts_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/posts';
-               $contact_drop_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
+
+               if (!$contact['self']) {
+                       $contact_drop_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
+               }
 
                /**
                 * Menu array:
                 * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
                 */
                $menu = [
-                       'status'  => [t("View Status")  , $status_link      , true],
-                       'profile' => [t("View Profile") , $profile_link     , true],
-                       'photos'  => [t("View Photos")  , $photos_link      , true],
-                       'network' => [t("Network Posts"), $posts_link       , false],
-                       'edit'    => [t("View Contact") , $contact_url      , false],
-                       'drop'    => [t("Drop Contact") , $contact_drop_link, false],
-                       'pm'      => [t("Send PM")      , $pm_url           , false],
-                       'poke'    => [t("Poke")         , $poke_link        , false],
+                       'status'  => [L10n::t("View Status")  , $status_link      , true],
+                       'profile' => [L10n::t("View Profile") , $profile_link     , true],
+                       'photos'  => [L10n::t("View Photos")  , $photos_link      , true],
+                       'network' => [L10n::t("Network Posts"), $posts_link       , false],
+                       'edit'    => [L10n::t("View Contact") , $contact_url      , false],
+                       'drop'    => [L10n::t("Drop Contact") , $contact_drop_link, false],
+                       'pm'      => [L10n::t("Send PM")      , $pm_url           , false],
+                       'poke'    => [L10n::t("Poke")         , $poke_link        , false],
                ];
 
                $args = ['contact' => $contact, 'menu' => &$menu];
 
-               call_hooks('contact_photo_menu', $args);
+               Addon::callHooks('contact_photo_menu', $args);
 
-               $menucondensed = array();
+               $menucondensed = [];
 
                foreach ($menu as $menuname => $menuitem) {
                        if ($menuitem[1] != '') {
@@ -585,49 +693,20 @@ class Contact extends BaseObject
         *
         * @return array
         */
-       public static function getUngroupedList($uid, $start = 0, $count = 0)
+       public static function getUngroupedList($uid)
        {
-               if (!$count) {
-                       $r = q(
-                               "SELECT COUNT(*) AS `total`
-                                FROM `contact`
-                                WHERE `uid` = %d
-                                AND NOT `self`
-                                AND NOT `blocked`
-                                AND NOT `pending`
-                                AND `id` NOT IN (
-                                       SELECT DISTINCT(`contact-id`)
-                                       FROM `group_member`
-                                       WHERE `uid` = %d
-                               )",
-                               intval($uid),
-                               intval($uid)
-                       );
-
-                       return $r;
-               }
-
-               $r = q(
-                       "SELECT *
-                       FROM `contact`
-                       WHERE `uid` = %d
-                       AND NOT `self`
-                       AND NOT `blocked`
-                       AND NOT `pending`
-                       AND `id` NOT IN (
-                               SELECT DISTINCT(`contact-id`)
-                               FROM `group_member`
-                               INNER JOIN `group` ON `group`.`id` = `group_member`.`gid`
-                               WHERE `group`.`uid` = %d
-                       )
-                       LIMIT %d, %d",
-                       intval($uid),
-                       intval($uid),
-                       intval($start),
-                       intval($count)
-               );
-               
-               return $r;
+               return q("SELECT *
+                          FROM `contact`
+                          WHERE `uid` = %d
+                          AND NOT `self`
+                          AND NOT `blocked`
+                          AND NOT `pending`
+                          AND `id` NOT IN (
+                               SELECT DISTINCT(`contact-id`)
+                               FROM `group_member`
+                               INNER JOIN `group` ON `group`.`id` = `group_member`.`gid`
+                               WHERE `group`.`uid` = %d
+                          )", intval($uid), intval($uid));
        }
 
        /**
@@ -651,10 +730,11 @@ class Contact extends BaseObject
         * @param string  $url       Contact URL
         * @param integer $uid       The user id for the contact (0 = public contact)
         * @param boolean $no_update Don't update the contact
+        * @param array   $default   Default value for creating the contact when every else fails
         *
         * @return integer Contact ID
         */
-       public static function getIdForURL($url, $uid = 0, $no_update = false)
+       public static function getIdForURL($url, $uid = 0, $no_update = false, $default = [])
        {
                logger("Get contact data for url " . $url . " and user " . $uid . " - " . System::callstack(), LOGGER_DEBUG);
 
@@ -666,11 +746,11 @@ class Contact extends BaseObject
 
                /// @todo Verify if we can't use Contact::getDetailsByUrl instead of the following
                // We first try the nurl (http://server.tld/nick), most common case
-               $contact = dba::selectFirst('contact', ['id', 'avatar-date'], ['nurl' => normalise_link($url), 'uid' => $uid]);
+               $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['nurl' => normalise_link($url), 'uid' => $uid]);
 
                // Then the addr (nick@server.tld)
                if (!DBM::is_result($contact)) {
-                       $contact = dba::selectFirst('contact', ['id', 'avatar-date'], ['addr' => $url, 'uid' => $uid]);
+                       $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid]);
                }
 
                // Then the alias (which could be anything)
@@ -678,14 +758,14 @@ class Contact extends BaseObject
                        // The link could be provided as http although we stored it as https
                        $ssl_url = str_replace('http://', 'https://', $url);
                        $condition = ['`alias` IN (?, ?, ?) AND `uid` = ?', $url, normalise_link($url), $ssl_url, $uid];
-                       $contact = dba::selectFirst('contact', ['id', 'avatar', 'avatar-date'], $condition);
+                       $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], $condition);
                }
 
                if (DBM::is_result($contact)) {
                        $contact_id = $contact["id"];
 
                        // Update the contact every 7 days
-                       $update_contact = ($contact['avatar-date'] < datetime_convert('', '', 'now -7 days'));
+                       $update_contact = ($contact['avatar-date'] < DateTimeFormat::utc('now -7 days'));
 
                        // We force the update if the avatar is empty
                        if (!x($contact, 'avatar')) {
@@ -703,18 +783,48 @@ class Contact extends BaseObject
                $data = Probe::uri($url, "", $uid);
 
                // Last try in gcontact for unsupported networks
-               if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO, NETWORK_MAIL))) {
+               if (!in_array($data["network"], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO, NETWORK_MAIL, NETWORK_FEED])) {
                        if ($uid != 0) {
                                return 0;
                        }
 
                        // Get data from the gcontact table
-                       $gcontact = dba::selectFirst('gcontact', ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'], ['nurl' => normalise_link($url)]);
-                       if (!DBM::is_result($gcontact)) {
-                               return 0;
+                       $fields = ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'];
+                       $contact = DBA::selectFirst('gcontact', $fields, ['nurl' => normalise_link($url)]);
+                       if (!DBM::is_result($contact)) {
+                               $contact = DBA::selectFirst('contact', $fields, ['nurl' => normalise_link($url)]);
+                       }
+
+                       if (!DBM::is_result($contact)) {
+                               $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
+                                       'photo', 'keywords', 'location', 'about', 'network',
+                                       'priority', 'batch', 'request', 'confirm', 'poco'];
+                               $contact = DBA::selectFirst('contact', $fields, ['addr' => $url]);
                        }
 
-                       $data = array_merge($data, $gcontact);
+                       if (!DBM::is_result($contact)) {
+                               // The link could be provided as http although we stored it as https
+                               $ssl_url = str_replace('http://', 'https://', $url);
+                               $condition = ['alias' => [$url, normalise_link($url), $ssl_url]];
+                               $contact = DBA::selectFirst('contact', $fields, $condition);
+                       }
+
+                       if (!DBM::is_result($contact)) {
+                               $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
+                                       'photo', 'network', 'priority', 'batch', 'request', 'confirm'];
+                               $condition = ['url' => [$url, normalise_link($url), $ssl_url]];
+                               $contact = DBA::selectFirst('fcontact', $fields, $condition);
+                       }
+
+                       if (!empty($default)) {
+                               $contact = $default;
+                       }
+
+                       if (!DBM::is_result($contact)) {
+                               return 0;
+                       } else {
+                               $data = array_merge($data, $contact);
+                       }
                }
 
                if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url)) {
@@ -723,9 +833,9 @@ class Contact extends BaseObject
 
                $url = $data["url"];
                if (!$contact_id) {
-                       dba::insert('contact', [
+                       DBA::insert('contact', [
                                'uid'       => $uid,
-                               'created'   => datetime_convert(),
+                               'created'   => DateTimeFormat::utcNow(),
                                'url'       => $data["url"],
                                'nurl'      => normalise_link($data["url"]),
                                'addr'      => $data["addr"],
@@ -746,17 +856,17 @@ class Contact extends BaseObject
                                'request'   => $data["request"],
                                'confirm'   => $data["confirm"],
                                'poco'      => $data["poco"],
-                               'name-date' => datetime_convert(),
-                               'uri-date'  => datetime_convert(),
-                               'avatar-date' => datetime_convert(),
+                               'name-date' => DateTimeFormat::utcNow(),
+                               'uri-date'  => DateTimeFormat::utcNow(),
+                               'avatar-date' => DateTimeFormat::utcNow(),
                                'writable'  => 1,
                                'blocked'   => 0,
                                'readonly'  => 0,
                                'pending'   => 0]
                        );
 
-                       $s = dba::select('contact', ['id'], ['nurl' => normalise_link($data["url"]), 'uid' => $uid], ['order' => ['id'], 'limit' => 2]);
-                       $contacts = dba::inArray($s);
+                       $s = DBA::select('contact', ['id'], ['nurl' => normalise_link($data["url"]), 'uid' => $uid], ['order' => ['id'], 'limit' => 2]);
+                       $contacts = DBA::inArray($s);
                        if (!DBM::is_result($contacts)) {
                                return 0;
                        }
@@ -764,7 +874,7 @@ class Contact extends BaseObject
                        $contact_id = $contacts[0]["id"];
 
                        // Update the newly created contact from data in the gcontact table
-                       $gcontact = dba::selectFirst('gcontact', ['location', 'about', 'keywords', 'gender'], ['nurl' => normalise_link($data["url"])]);
+                       $gcontact = DBA::selectFirst('gcontact', ['location', 'about', 'keywords', 'gender'], ['nurl' => normalise_link($data["url"])]);
                        if (DBM::is_result($gcontact)) {
                                // Only use the information when the probing hadn't fetched these values
                                if ($data['keywords'] != '') {
@@ -776,11 +886,11 @@ class Contact extends BaseObject
                                if ($data['about'] != '') {
                                        unset($gcontact['about']);
                                }
-                               dba::update('contact', $gcontact, array('id' => $contact_id));
+                               DBA::update('contact', $gcontact, ['id' => $contact_id]);
                        }
 
                        if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $data["url"] != "") {
-                               dba::delete('contact', ["`nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`",
+                               DBA::delete('contact', ["`nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`",
                                        normalise_link($data["url"]), $contact_id]);
                        }
                }
@@ -788,26 +898,19 @@ class Contact extends BaseObject
                self::updateAvatar($data["photo"], $uid, $contact_id);
 
                $fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'pubkey'];
-               $contact = dba::selectFirst('contact', $fields, ['id' => $contact_id]);
+               $contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]);
 
                // This condition should always be true
                if (!DBM::is_result($contact)) {
                        return $contact_id;
                }
 
-               $updated = array('addr' => $data['addr'],
+               $updated = ['addr' => $data['addr'],
                        'alias' => $data['alias'],
                        'url' => $data['url'],
                        'nurl' => normalise_link($data['url']),
                        'name' => $data['name'],
-                       'nick' => $data['nick']);
-
-               // Only fill the pubkey if it was empty before. We have to prevent identity theft.
-               if (!empty($contact['pubkey'])) {
-                       unset($contact['pubkey']);
-               } else {
-                       $updated['pubkey'] = $data['pubkey'];
-               }
+                       'nick' => $data['nick']];
 
                if ($data['keywords'] != '') {
                        $updated['keywords'] = $data['keywords'];
@@ -815,20 +918,42 @@ class Contact extends BaseObject
                if ($data['location'] != '') {
                        $updated['location'] = $data['location'];
                }
-               if ($data['about'] != '') {
-                       $updated['about'] = $data['about'];
+
+               // Update the technical stuff as well - if filled
+               if ($data['notify'] != '') {
+                       $updated['notify'] = $data['notify'];
+               }
+               if ($data['poll'] != '') {
+                       $updated['poll'] = $data['poll'];
+               }
+               if ($data['batch'] != '') {
+                       $updated['batch'] = $data['batch'];
+               }
+               if ($data['request'] != '') {
+                       $updated['request'] = $data['request'];
+               }
+               if ($data['confirm'] != '') {
+                       $updated['confirm'] = $data['confirm'];
+               }
+               if ($data['poco'] != '') {
+                       $updated['poco'] = $data['poco'];
+               }
+
+               // Only fill the pubkey if it had been empty before. We have to prevent identity theft.
+               if (empty($contact['pubkey'])) {
+                       $updated['pubkey'] = $data['pubkey'];
                }
 
                if (($data["addr"] != $contact["addr"]) || ($data["alias"] != $contact["alias"])) {
-                       $updated['uri-date'] = datetime_convert();
+                       $updated['uri-date'] = DateTimeFormat::utcNow();
                }
                if (($data["name"] != $contact["name"]) || ($data["nick"] != $contact["nick"])) {
-                       $updated['name-date'] = datetime_convert();
+                       $updated['name-date'] = DateTimeFormat::utcNow();
                }
 
-               $updated['avatar-date'] = datetime_convert();
+               $updated['avatar-date'] = DateTimeFormat::utcNow();
 
-               dba::update('contact', $updated, array('id' => $contact_id), $contact);
+               DBA::update('contact', $updated, ['id' => $contact_id], $contact);
 
                return $contact_id;
        }
@@ -846,7 +971,7 @@ class Contact extends BaseObject
                        return false;
                }
 
-               $blocked = dba::selectFirst('contact', ['blocked'], ['id' => $cid]);
+               $blocked = DBA::selectFirst('contact', ['blocked'], ['id' => $cid]);
                if (!DBM::is_result($blocked)) {
                        return false;
                }
@@ -866,7 +991,7 @@ class Contact extends BaseObject
                        return false;
                }
 
-               $hidden = dba::selectFirst('contact', ['hidden'], ['id' => $cid]);
+               $hidden = DBA::selectFirst('contact', ['hidden'], ['id' => $cid]);
                if (!DBM::is_result($hidden)) {
                        return false;
                }
@@ -897,25 +1022,27 @@ class Contact extends BaseObject
                        return '';
                }
 
-               if (in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) {
-                       $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = %d AND NOT `item`.`global`))";
+               if (in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
+                       $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
                } else {
-                       $sql = "`item`.`uid` = %d";
+                       $sql = "`item`.`uid` = ?";
                }
 
                $author_id = intval($r[0]["author-id"]);
 
                $contact = ($r[0]["contact-type"] == ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
 
-               $r = q(item_query() . " AND `item`.`" . $contact . "` = %d AND " . $sql .
-                       " AND `item`.`verb` = '%s' ORDER BY `item`.`created` DESC LIMIT %d, %d",
-                       intval($author_id), intval(local_user()), dbesc(ACTIVITY_POST),
-                       intval($a->pager['start']), intval($a->pager['itemspage'])
-               );
+               $condition = ["`$contact` = ? AND `gravity` IN (?, ?) AND " . $sql,
+                       $author_id, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
+               $params = ['order' => ['created' => true],
+                       'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+               $r = Item::selectForUser(local_user(), [], $condition, $params);
 
-               $o = conversation($a, $r, 'contact-posts', false);
+               $items = Item::inArray($r);
 
-               $o .= alt_pager($a, count($r));
+               $o = conversation($a, $items, 'contact-posts', false);
+
+               $o .= alt_pager($a, count($items));
 
                return $o;
        }
@@ -956,13 +1083,13 @@ class Contact extends BaseObject
 
                switch ($type) {
                        case ACCOUNT_TYPE_ORGANISATION:
-                               $account_type = t("Organisation");
+                               $account_type = L10n::t("Organisation");
                                break;
                        case ACCOUNT_TYPE_NEWS:
-                               $account_type = t('News');
+                               $account_type = L10n::t('News');
                                break;
                        case ACCOUNT_TYPE_COMMUNITY:
-                               $account_type = t("Forum");
+                               $account_type = L10n::t("Forum");
                                break;
                        default:
                                $account_type = "";
@@ -980,7 +1107,7 @@ class Contact extends BaseObject
         */
        public static function block($uid)
        {
-               $return = dba::update('contact', ['blocked' => true], ['id' => $uid]);
+               $return = DBA::update('contact', ['blocked' => true], ['id' => $uid]);
 
                return $return;
        }
@@ -993,7 +1120,7 @@ class Contact extends BaseObject
         */
        public static function unblock($uid)
        {
-               $return = dba::update('contact', ['blocked' => false], ['id' => $uid]);
+               $return = DBA::update('contact', ['blocked' => false], ['id' => $uid]);
 
                return $return;
        }
@@ -1010,26 +1137,26 @@ class Contact extends BaseObject
         */
        public static function updateAvatar($avatar, $uid, $cid, $force = false)
        {
-               $contact = dba::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid]);
+               $contact = DBA::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid]);
                if (!DBM::is_result($contact)) {
                        return false;
                } else {
-                       $data = array($contact["photo"], $contact["thumb"], $contact["micro"]);
+                       $data = [$contact["photo"], $contact["thumb"], $contact["micro"]];
                }
 
                if (($contact["avatar"] != $avatar) || $force) {
                        $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
 
                        if ($photos) {
-                               dba::update(
+                               DBA::update(
                                        'contact',
-                                       array('avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => datetime_convert()),
-                                       array('id' => $cid)
+                                       ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()],
+                                       ['id' => $cid]
                                );
 
                                // Update the public contact (contact id = 0)
                                if ($uid != 0) {
-                                       $pcontact = dba::selectFirst('contact', ['id'], ['nurl' => $contact['nurl']]);
+                                       $pcontact = DBA::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]);
                                        if (DBM::is_result($pcontact)) {
                                                self::updateAvatar($avatar, 0, $pcontact['id'], $force);
                                        }
@@ -1054,7 +1181,7 @@ class Contact extends BaseObject
                 */
 
                $fields = ['url', 'nurl', 'addr', 'alias', 'batch', 'notify', 'poll', 'poco', 'network'];
-               $contact = dba::selectFirst('contact', $fields, ['id' => $id]);
+               $contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
                if (!DBM::is_result($contact)) {
                        return false;
                }
@@ -1083,7 +1210,7 @@ class Contact extends BaseObject
                        return true;
                }
 
-               dba::update(
+               DBA::update(
                        'contact', [
                                'url'    => $ret['url'],
                                'nurl'   => normalise_link($ret['url']),
@@ -1123,31 +1250,36 @@ class Contact extends BaseObject
         */
        public static function createFromProbe($uid, $url, $interactive = false, $network = '')
        {
-               $result = array('cid' => -1, 'success' => false, 'message' => '');
+               $result = ['cid' => -1, 'success' => false, 'message' => ''];
 
                $a = get_app();
 
                // remove ajax junk, e.g. Twitter
                $url = str_replace('/#!/', '/', $url);
 
-               if (!allowed_url($url)) {
-                       $result['message'] = t('Disallowed profile URL.');
+               if (!Network::isUrlAllowed($url)) {
+                       $result['message'] = L10n::t('Disallowed profile URL.');
                        return $result;
                }
 
-               if (blocked_url($url)) {
-                       $result['message'] = t('Blocked domain');
+               if (Network::isUrlBlocked($url)) {
+                       $result['message'] = L10n::t('Blocked domain');
                        return $result;
                }
 
                if (!$url) {
-                       $result['message'] = t('Connect URL missing.');
+                       $result['message'] = L10n::t('Connect URL missing.');
                        return $result;
                }
 
-               $arr = array('url' => $url, 'contact' => array());
+               $arr = ['url' => $url, 'contact' => []];
 
-               call_hooks('follow', $arr);
+               Addon::callHooks('follow', $arr);
+
+               if (empty($arr)) {
+                       $result['message'] = L10n::t('The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page.');
+                       return $result;
+               }
 
                if (x($arr['contact'], 'name')) {
                        $ret = $arr['contact'];
@@ -1157,12 +1289,31 @@ class Contact extends BaseObject
 
                if (($network != '') && ($ret['network'] != $network)) {
                        logger('Expected network ' . $network . ' does not match actual network ' . $ret['network']);
-                       return result;
+                       return $result;
                }
 
-               if ($ret['network'] === NETWORK_DFRN) {
+               // check if we already have a contact
+               // the poll url is more reliable than the profile url, as we may have
+               // indirect links or webfinger links
+
+               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` IN ('%s', '%s') AND `network` = '%s' AND NOT `pending` LIMIT 1",
+                       intval($uid),
+                       dbesc($ret['poll']),
+                       dbesc(normalise_link($ret['poll'])),
+                       dbesc($ret['network'])
+               );
+
+               if (!DBM::is_result($r)) {
+                       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' AND NOT `pending` LIMIT 1",
+                               intval($uid),
+                               dbesc(normalise_link($url)),
+                               dbesc($ret['network'])
+                       );
+               }
+
+               if (($ret['network'] === NETWORK_DFRN) && !DBM::is_result($r)) {
                        if ($interactive) {
-                               if (strlen($a->path)) {
+                               if (strlen($a->urlpath)) {
                                        $myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
                                } else {
                                        $myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
@@ -1172,9 +1323,9 @@ class Contact extends BaseObject
 
                                // NOTREACHED
                        }
-               } elseif (Config::get('system', 'dfrn_only')) {
-                       $result['message'] = t('This site is not configured to allow communications with other networks.') . EOL;
-                       $result['message'] != t('No compatible communication protocols or feeds were discovered.') . EOL;
+               } elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != NETWORK_DFRN)) {
+                       $result['message'] = L10n::t('This site is not configured to allow communications with other networks.') . EOL;
+                       $result['message'] != L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
                        return $result;
                }
 
@@ -1186,30 +1337,30 @@ class Contact extends BaseObject
                // do we have enough information?
 
                if (!((x($ret, 'name')) && (x($ret, 'poll')) && ((x($ret, 'url')) || (x($ret, 'addr'))))) {
-                       $result['message'] .= t('The profile address specified does not provide adequate information.') . EOL;
+                       $result['message'] .= L10n::t('The profile address specified does not provide adequate information.') . EOL;
                        if (!x($ret, 'poll')) {
-                               $result['message'] .= t('No compatible communication protocols or feeds were discovered.') . EOL;
+                               $result['message'] .= L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
                        }
                        if (!x($ret, 'name')) {
-                               $result['message'] .= t('An author or name was not found.') . EOL;
+                               $result['message'] .= L10n::t('An author or name was not found.') . EOL;
                        }
                        if (!x($ret, 'url')) {
-                               $result['message'] .= t('No browser URL could be matched to this address.') . EOL;
+                               $result['message'] .= L10n::t('No browser URL could be matched to this address.') . EOL;
                        }
                        if (strpos($url, '@') !== false) {
-                               $result['message'] .= t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
-                               $result['message'] .= t('Use mailto: in front of address to force email check.') . EOL;
+                               $result['message'] .= L10n::t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
+                               $result['message'] .= L10n::t('Use mailto: in front of address to force email check.') . EOL;
                        }
                        return $result;
                }
 
                if ($ret['network'] === NETWORK_OSTATUS && Config::get('system', 'ostatus_disabled')) {
-                       $result['message'] .= t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
+                       $result['message'] .= L10n::t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
                        $ret['notify'] = '';
                }
 
                if (!$ret['notify']) {
-                       $result['message'] .= t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
+                       $result['message'] .= L10n::t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
                }
 
                $writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0);
@@ -1218,42 +1369,23 @@ class Contact extends BaseObject
 
                $hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
 
-               if (in_array($ret['network'], array(NETWORK_MAIL, NETWORK_DIASPORA))) {
+               if (in_array($ret['network'], [NETWORK_MAIL, NETWORK_DIASPORA])) {
                        $writeable = 1;
                }
 
-               // check if we already have a contact
-               // the poll url is more reliable than the profile url, as we may have
-               // indirect links or webfinger links
-
-               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` IN ('%s', '%s') AND `network` = '%s' LIMIT 1",
-                       intval($uid),
-                       dbesc($ret['poll']),
-                       dbesc(normalise_link($ret['poll'])),
-                       dbesc($ret['network'])
-               );
-
-               if (!DBM::is_result($r)) {
-                       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1",
-                               intval($uid),
-                               dbesc(normalise_link($url)),
-                               dbesc($ret['network'])
-                       );
-               }
-
                if (DBM::is_result($r)) {
                        // update contact
                        $new_relation = (($r[0]['rel'] == CONTACT_IS_FOLLOWER) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
 
-                       $fields = array('rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false);
-                       dba::update('contact', $fields, array('id' => $r[0]['id']));
+                       $fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false];
+                       DBA::update('contact', $fields, ['id' => $r[0]['id']]);
                } else {
-                       $new_relation = ((in_array($ret['network'], array(NETWORK_MAIL))) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
+                       $new_relation = ((in_array($ret['network'], [NETWORK_MAIL])) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
 
                        // create contact record
-                       dba::insert('contact', [
+                       DBA::insert('contact', [
                                'uid'     => $uid,
-                               'created' => datetime_convert(),
+                               'created' => DateTimeFormat::utcNow(),
                                'url'     => $ret['url'],
                                'nurl'    => normalise_link($ret['url']),
                                'addr'    => $ret['addr'],
@@ -1277,9 +1409,9 @@ class Contact extends BaseObject
                        ]);
                }
 
-               $contact = dba::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]);
+               $contact = DBA::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]);
                if (!DBM::is_result($contact)) {
-                       $result['message'] .= t('Unable to retrieve contact information.') . EOL;
+                       $result['message'] .= L10n::t('Unable to retrieve contact information.') . EOL;
                        return $result;
                }
 
@@ -1301,16 +1433,16 @@ class Contact extends BaseObject
                );
 
                if (DBM::is_result($r)) {
-                       if (($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
+                       if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN])) {
                                // create a follow slap
-                               $item = array();
+                               $item = [];
                                $item['verb'] = ACTIVITY_FOLLOW;
                                $item['follow'] = $contact["url"];
                                $slap = OStatus::salmon($item, $r[0]);
-                               Salmon::slapper($r[0], $contact['notify'], $slap);
-                       }
-
-                       if ($contact['network'] == NETWORK_DIASPORA) {
+                               if (!empty($contact['notify'])) {
+                                       Salmon::slapper($r[0], $contact['notify'], $slap);
+                               }
+                       } elseif ($contact['network'] == NETWORK_DIASPORA) {
                                $ret = Diaspora::sendShare($a->user, $contact);
                                logger('share returns: ' . $ret);
                        }
@@ -1319,4 +1451,293 @@ class Contact extends BaseObject
                $result['success'] = true;
                return $result;
        }
+
+       public static function updateSslPolicy($contact, $new_policy)
+       {
+               $ssl_changed = false;
+               if ((intval($new_policy) == SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'], 'https:')) {
+                       $ssl_changed = true;
+                       $contact['url']     =   str_replace('https:', 'http:', $contact['url']);
+                       $contact['request'] =   str_replace('https:', 'http:', $contact['request']);
+                       $contact['notify']  =   str_replace('https:', 'http:', $contact['notify']);
+                       $contact['poll']    =   str_replace('https:', 'http:', $contact['poll']);
+                       $contact['confirm'] =   str_replace('https:', 'http:', $contact['confirm']);
+                       $contact['poco']    =   str_replace('https:', 'http:', $contact['poco']);
+               }
+
+               if ((intval($new_policy) == SSL_POLICY_FULL || $new_policy === 'full') && strstr($contact['url'], 'http:')) {
+                       $ssl_changed = true;
+                       $contact['url']     =   str_replace('http:', 'https:', $contact['url']);
+                       $contact['request'] =   str_replace('http:', 'https:', $contact['request']);
+                       $contact['notify']  =   str_replace('http:', 'https:', $contact['notify']);
+                       $contact['poll']    =   str_replace('http:', 'https:', $contact['poll']);
+                       $contact['confirm'] =   str_replace('http:', 'https:', $contact['confirm']);
+                       $contact['poco']    =   str_replace('http:', 'https:', $contact['poco']);
+               }
+
+               if ($ssl_changed) {
+                       $fields = ['url' => $contact['url'], 'request' => $contact['request'],
+                                       'notify' => $contact['notify'], 'poll' => $contact['poll'],
+                                       'confirm' => $contact['confirm'], 'poco' => $contact['poco']];
+                       DBA::update('contact', $fields, ['id' => $contact['id']]);
+               }
+
+               return $contact;
+       }
+
+       public static function addRelationship($importer, $contact, $datarray, $item, $sharing = false) {
+               $url = notags(trim($datarray['author-link']));
+               $name = notags(trim($datarray['author-name']));
+               $photo = notags(trim($datarray['author-avatar']));
+               $nick = '';
+
+               if (is_object($item)) {
+                       $rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor');
+                       if ($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']) {
+                               $nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
+                       }
+               } else {
+                       $nick = $item;
+               }
+
+               if (is_array($contact)) {
+                       if (($contact['rel'] == CONTACT_IS_SHARING)
+                               || ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
+                               DBA::update('contact', ['rel' => CONTACT_IS_FRIEND, 'writable' => true],
+                                               ['id' => $contact['id'], 'uid' => $importer['uid']]);
+                       }
+                       // send email notification to owner?
+               } else {
+                       if (DBA::exists('contact', ['nurl' => normalise_link($url), 'uid' => $importer['uid'], 'pending' => true])) {
+                               logger('ignoring duplicated connection request from pending contact ' . $url);
+                               return;
+                       }
+
+                       // create contact record
+                       q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
+                               `blocked`, `readonly`, `pending`, `writable`)
+                               VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1)",
+                               intval($importer['uid']),
+                               dbesc(DateTimeFormat::utcNow()),
+                               dbesc($url),
+                               dbesc(normalise_link($url)),
+                               dbesc($name),
+                               dbesc($nick),
+                               dbesc($photo),
+                               dbesc(NETWORK_OSTATUS),
+                               intval(CONTACT_IS_FOLLOWER)
+                       );
+
+                       $contact_record = [
+                               'id' => DBA::lastInsertId(),
+                               'network' => NETWORK_OSTATUS,
+                               'name' => $name,
+                               'url' => $url,
+                               'photo' => $photo
+                       ];
+
+                       Contact::updateAvatar($photo, $importer["uid"], $contact_record["id"], true);
+
+                       /// @TODO Encapsulate this into a function/method
+                       $fields = ['uid', 'username', 'email', 'page-flags', 'notify-flags', 'language'];
+                       $user = DBA::selectFirst('user', $fields, ['uid' => $importer['uid']]);
+                       if (DBM::is_result($user) && !in_array($user['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) {
+                               // create notification
+                               $hash = random_string();
+
+                               if (is_array($contact_record)) {
+                                       DBA::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'],
+                                                               'blocked' => false, 'knowyou' => false,
+                                                               'hash' => $hash, 'datetime' => DateTimeFormat::utcNow()]);
+                               }
+
+                               Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);
+
+                               if (($user['notify-flags'] & NOTIFY_INTRO) &&
+                                       in_array($user['page-flags'], [PAGE_NORMAL])) {
+
+                                       notification([
+                                               'type'         => NOTIFY_INTRO,
+                                               'notify_flags' => $user['notify-flags'],
+                                               'language'     => $user['language'],
+                                               'to_name'      => $user['username'],
+                                               'to_email'     => $user['email'],
+                                               'uid'          => $user['uid'],
+                                               'link'             => System::baseUrl() . '/notifications/intro',
+                                               'source_name'  => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : L10n::t('[Name Withheld]')),
+                                               'source_link'  => $contact_record['url'],
+                                               'source_photo' => $contact_record['photo'],
+                                               'verb'         => ($sharing ? ACTIVITY_FRIEND : ACTIVITY_FOLLOW),
+                                               'otype'        => 'intro'
+                                       ]);
+
+                               }
+                       } elseif (DBM::is_result($user) && in_array($user['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) {
+                               q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
+                                               intval($importer['uid']),
+                                               dbesc($url)
+                               );
+                       }
+               }
+       }
+
+       public static function removeFollower($importer, $contact, array $datarray = [], $item = "") {
+
+               if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) {
+                       DBA::update('contact', ['rel' => CONTACT_IS_SHARING], ['id' => $contact['id']]);
+               } else {
+                       Contact::remove($contact['id']);
+               }
+       }
+
+       public static function removeSharer($importer, $contact, array $datarray = [], $item = "") {
+
+               if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) {
+                       DBA::update('contact', ['rel' => CONTACT_IS_FOLLOWER], ['id' => $contact['id']]);
+               } else {
+                       Contact::remove($contact['id']);
+               }
+       }
+
+       /**
+        * @brief Create a birthday event.
+        *
+        * Update the year and the birthday.
+        */
+       public static function updateBirthdays()
+       {
+               // This only handles foreign or alien networks where a birthday has been provided.
+               // In-network birthdays are handled within local_delivery
+
+               $r = q("SELECT * FROM `contact` WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`, 1, 4) != `bdyear` ");
+               if (DBM::is_result($r)) {
+                       foreach ($r as $rr) {
+                               logger('update_contact_birthday: ' . $rr['bd']);
+
+                               $nextbd = DateTimeFormat::utcNow('Y') . substr($rr['bd'], 4);
+
+                               /*
+                                * Add new birthday event for this person
+                                *
+                                * $bdtext is just a readable placeholder in case the event is shared
+                                * with others. We will replace it during presentation to our $importer
+                                * to contain a sparkle link and perhaps a photo.
+                                */
+
+                               // Check for duplicates
+                               $s = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
+                                       intval($rr['uid']), intval($rr['id']), dbesc(DateTimeFormat::utc($nextbd)), dbesc('birthday'));
+
+                               if (DBM::is_result($s)) {
+                                       continue;
+                               }
+
+                               $bdtext = L10n::t('%s\'s birthday', $rr['name']);
+                               $bdtext2 = L10n::t('Happy Birthday %s', ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]');
+
+                               q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
+                               VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ", intval($rr['uid']), intval($rr['id']),
+                                       dbesc(DateTimeFormat::utcNow()), dbesc(DateTimeFormat::utcNow()), dbesc(DateTimeFormat::utc($nextbd)),
+                                       dbesc(DateTimeFormat::utc($nextbd . ' + 1 day ')), dbesc($bdtext), dbesc($bdtext2), dbesc('birthday'),
+                                       intval(0)
+                               );
+
+
+                               // update bdyear
+                               q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d", dbesc(substr($nextbd, 0, 4)),
+                                       dbesc($nextbd), intval($rr['uid']), intval($rr['id'])
+                               );
+                       }
+               }
+       }
+
+       /**
+        * Remove the unavailable contact ids from the provided list
+        *
+        * @param array $contact_ids Contact id list
+        */
+       public static function pruneUnavailable(array &$contact_ids)
+       {
+               if (empty($contact_ids)) {
+                       return;
+               }
+
+               $str = dbesc(implode(',', $contact_ids));
+
+               $stmt = DBA::p("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0");
+
+               $return = [];
+               while($contact = DBA::fetch($stmt)) {
+                       $return[] = $contact['id'];
+               }
+
+               DBA::close($stmt);
+
+               $contact_ids = $return;
+       }
+
+       /**
+        * @brief Returns a magic link to authenticate remote visitors
+        *
+        * @param string $contact_url The address of the target contact profile
+        * @param integer $url An url that we will be redirected to after the authentication
+        *
+        * @return string with "redir" link
+        */
+       public static function magicLink($contact_url, $url = '')
+       {
+               $cid = self::getIdForURL($contact_url, 0, true);
+               if (empty($cid)) {
+                       return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
+               }
+
+               return self::magicLinkbyId($cid, $url);
+       }
+
+       /**
+        * @brief Returns a magic link to authenticate remote visitors
+        *
+        * @param integer $cid The contact id of the target contact profile
+        * @param integer $url An url that we will be redirected to after the authentication
+        *
+        * @return string with "redir" link
+        */
+       public static function magicLinkbyId($cid, $url = '')
+       {
+               $contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]);
+
+               return self::magicLinkbyContact($contact, $url);
+        }
+
+       /**
+        * @brief Returns a magic link to authenticate remote visitors
+        *
+        * @param array $contact The contact array with "uid", "network" and "url"
+        * @param integer $url An url that we will be redirected to after the authentication
+        *
+        * @return string with "redir" link
+        */
+       public static function magicLinkbyContact($contact, $url = '')
+       {
+               if ($contact['network'] != NETWORK_DFRN) {
+                       return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
+               }
+
+               // Only redirections to the same host do make sense
+               if (($url != '') && (parse_url($url, PHP_URL_HOST) != parse_url($contact['url'], PHP_URL_HOST))) {
+                       return $url;
+               }
+
+               if ($contact['uid'] != 0) {
+                       return self::magicLink($contact['url'], $url);
+               }
+
+               $redirect = 'redir/' . $contact['id'];
+
+               if ($url != '') {
+                       $redirect .= '?url=' . $url;
+               }
+
+               return $redirect;
+        }
 }