X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=84580b0898997cba66222e95bcac51353ac992a4;hb=0a519f500104712f9a07dd007ca078586aef76d1;hp=e504849f7c11fbf5dbcfd337cd1af685ad13922b;hpb=d71281e45b6398119ecb09d47dd8947c9e41d15b;p=friendica.git

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index e504849f7c..84580b0898 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -11,19 +11,16 @@ 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\Model\Photo;
-use Friendica\Model\Profile;
 use Friendica\Network\Probe;
-use Friendica\Protocol\DFRN;
+use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Object\Image;
-use dba;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -44,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`
@@ -58,7 +55,7 @@ class Contact extends BaseObject
 				local_user()
 			);
 			if (DBM::is_result($stmt)) {
-				$return = dba::inArray($stmt);
+				$return = DBA::inArray($stmt);
 			}
 		}
 
@@ -75,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`
@@ -102,16 +99,16 @@ 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'     => DateTimeFormat::utcNow(),
 			'self'        => 1,
@@ -149,20 +146,20 @@ class Contact extends BaseObject
 	{
 		$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]);
+		$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]);
+		$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]);
+		$profile = DBA::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]);
 		if (!DBM::is_result($profile)) {
 			return;
 		}
@@ -173,7 +170,7 @@ class Contact extends BaseObject
 			'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]);
+		$avatar = DBA::selectFirst('photo', ['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
 		if (DBM::is_result($avatar)) {
 			if ($update_avatar) {
 				$fields['avatar-date'] = DateTimeFormat::utcNow();
@@ -226,15 +223,15 @@ class Contact extends BaseObject
 
 		if ($update) {
 			$fields['name-date'] = DateTimeFormat::utcNow();
-			dba::update('contact', $fields, ['id' => $self['id']]);
+			DBA::update('contact', $fields, ['id' => $self['id']]);
 
 			// Update the public contact as well
-			dba::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]);
+			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]);
+			DBA::update('profile', $fields, ['uid' => $uid, 'is-default' => true]);
 		}
 	}
 
@@ -247,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', ['archive' => true, 'network' => 'none', 'writable' => false], ['id' => $id]);
+			DBA::update('contact', ['archive' => true, 'network' => 'none', 'writable' => false], ['id' => $id]);
 			return;
 		}
 
-		dba::delete('contact', ['id' => $id]);
+		DBA::delete('contact', ['id' => $id]);
 
 		// Delete the rest in the background
 		Worker::add(PRIORITY_LOW, 'RemoveContact', $id);
@@ -308,10 +305,10 @@ class Contact extends BaseObject
 		}
 
 		if ($contact['term-date'] <= NULL_DATE) {
-			dba::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+			DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 
 			if ($contact['url'] != '') {
-				dba::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`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
@@ -329,10 +326,10 @@ class Contact extends BaseObject
 				 * delete, though if the owner tries to unarchive them we'll start
 				 * the whole process over again.
 				 */
-				dba::update('contact', ['archive' => 1], ['id' => $contact['id']]);
+				DBA::update('contact', ['archive' => 1], ['id' => $contact['id']]);
 
 				if ($contact['url'] != '') {
-					dba::update('contact', ['archive' => 1], ['nurl' => normalise_link($contact['url']), 'self' => false]);
+					DBA::update('contact', ['archive' => 1], ['nurl' => normalise_link($contact['url']), 'self' => false]);
 				}
 			}
 		}
@@ -349,7 +346,7 @@ class Contact extends BaseObject
 	public static function unmarkForArchival(array $contact)
 	{
 		$condition = ['`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], NULL_DATE];
-		$exists = dba::exists('contact', $condition);
+		$exists = DBA::exists('contact', $condition);
 
 		// We don't need to update, we never marked this contact for archival
 		if (!$exists) {
@@ -358,15 +355,15 @@ class Contact extends BaseObject
 
 		// It's a miracle. Our dead contact has inexplicably come back to life.
 		$fields = ['term-date' => NULL_DATE, 'archive' => false];
-		dba::update('contact', $fields, ['id' => $contact['id']]);
+		DBA::update('contact', $fields, ['id' => $contact['id']]);
 
 		if (!empty($contact['url'])) {
-			dba::update('contact', $fields, ['nurl' => normalise_link($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);
+			DBA::update('contact', $fields, $condition);
 		}
 	}
 
@@ -401,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`,
+			$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)) {
@@ -475,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)
+		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"] = "";
@@ -596,7 +593,7 @@ class Contact extends BaseObject
 			$uid = local_user();
 		}
 
-		if ($contact['uid'] != $uid) {
+		if (empty($contact['uid']) || ($contact['uid'] != $uid)) {
 			if ($uid == 0) {
 				$profile_link = self::magicLink($contact['url']);
 				$menu = ['profile' => [L10n::t('View Profile'), $profile_link, true]];
@@ -605,7 +602,7 @@ class Contact extends BaseObject
 			}
 
 			// 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 {
@@ -696,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));
 	}
 
 	/**
@@ -778,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', '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', '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)
@@ -790,7 +758,7 @@ 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)) {
@@ -822,30 +790,30 @@ class Contact extends BaseObject
 
 			// Get data from the gcontact table
 			$fields = ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'];
-			$contact = dba::selectFirst('gcontact', $fields, ['nurl' => normalise_link($url)]);
+			$contact = DBA::selectFirst('gcontact', $fields, ['nurl' => normalise_link($url)]);
 			if (!DBM::is_result($contact)) {
-				$contact = dba::selectFirst('contact', $fields, ['nurl' => normalise_link($url)]);
+				$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]);
+				$contact = DBA::selectFirst('contact', $fields, ['addr' => $url]);
 			}
 
 			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);
+				$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);
+				$contact = DBA::selectFirst('fcontact', $fields, $condition);
 			}
 
 			if (!empty($default)) {
@@ -865,7 +833,7 @@ class Contact extends BaseObject
 
 		$url = $data["url"];
 		if (!$contact_id) {
-			dba::insert('contact', [
+			DBA::insert('contact', [
 				'uid'       => $uid,
 				'created'   => DateTimeFormat::utcNow(),
 				'url'       => $data["url"],
@@ -897,8 +865,8 @@ class Contact extends BaseObject
 				'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;
 			}
@@ -906,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'] != '') {
@@ -918,11 +886,11 @@ class Contact extends BaseObject
 				if ($data['about'] != '') {
 					unset($gcontact['about']);
 				}
-				dba::update('contact', $gcontact, ['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]);
 			}
 		}
@@ -930,7 +898,7 @@ 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)) {
@@ -985,7 +953,7 @@ class Contact extends BaseObject
 
 		$updated['avatar-date'] = DateTimeFormat::utcNow();
 
-		dba::update('contact', $updated, ['id' => $contact_id], $contact);
+		DBA::update('contact', $updated, ['id' => $contact_id], $contact);
 
 		return $contact_id;
 	}
@@ -1003,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;
 		}
@@ -1023,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;
 		}
@@ -1064,15 +1032,17 @@ class Contact extends BaseObject
 
 		$contact = ($r[0]["contact-type"] == ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
 
-		$condition = ["`$contact` = ? AND `verb` = ? AND " . $sql,
-			$author_id, ACTIVITY_POST, local_user()];
+		$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::select(local_user(), [], $condition, $params);
+		$r = Item::selectForUser(local_user(), [], $condition, $params);
 
-		$o = conversation($a, dba::inArray($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;
 	}
@@ -1137,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;
 	}
@@ -1150,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;
 	}
@@ -1167,7 +1137,7 @@ 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 {
@@ -1178,7 +1148,7 @@ class Contact extends BaseObject
 			$photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
 
 			if ($photos) {
-				dba::update(
+				DBA::update(
 					'contact',
 					['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()],
 					['id' => $cid]
@@ -1186,7 +1156,7 @@ class Contact extends BaseObject
 
 				// Update the public contact (contact id = 0)
 				if ($uid != 0) {
-					$pcontact = dba::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]);
+					$pcontact = DBA::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]);
 					if (DBM::is_result($pcontact)) {
 						self::updateAvatar($avatar, 0, $pcontact['id'], $force);
 					}
@@ -1211,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;
 		}
@@ -1240,7 +1210,7 @@ class Contact extends BaseObject
 			return true;
 		}
 
-		dba::update(
+		DBA::update(
 			'contact', [
 				'url'    => $ret['url'],
 				'nurl'   => normalise_link($ret['url']),
@@ -1343,7 +1313,7 @@ class Contact extends BaseObject
 
 		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());
@@ -1408,12 +1378,12 @@ class Contact extends BaseObject
 			$new_relation = (($r[0]['rel'] == CONTACT_IS_FOLLOWER) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
 
 			$fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false];
-			dba::update('contact', $fields, ['id' => $r[0]['id']]);
+			DBA::update('contact', $fields, ['id' => $r[0]['id']]);
 		} else {
 			$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' => DateTimeFormat::utcNow(),
 				'url'     => $ret['url'],
@@ -1439,7 +1409,7 @@ 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'] .= L10n::t('Unable to retrieve contact information.') . EOL;
 			return $result;
@@ -1509,7 +1479,7 @@ class Contact extends BaseObject
 			$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']]);
+			DBA::update('contact', $fields, ['id' => $contact['id']]);
 		}
 
 		return $contact;
@@ -1533,12 +1503,12 @@ class Contact extends BaseObject
 		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],
+				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])) {
+			if (DBA::exists('contact', ['nurl' => normalise_link($url), 'uid' => $importer['uid'], 'pending' => true])) {
 				logger('ignoring duplicated connection request from pending contact ' . $url);
 				return;
 			}
@@ -1559,20 +1529,24 @@ class Contact extends BaseObject
 			);
 
 			$contact_record = [
-				'id' => dba::lastInsertId(),
-				'network' => NETWORK_OSTATUS
+				'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']]);
+			$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'],
+					DBA::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'],
 								'blocked' => false, 'knowyou' => false,
 								'hash' => $hash, 'datetime' => DateTimeFormat::utcNow()]);
 				}
@@ -1610,7 +1584,7 @@ class Contact extends BaseObject
 	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']]);
+			DBA::update('contact', ['rel' => CONTACT_IS_SHARING], ['id' => $contact['id']]);
 		} else {
 			Contact::remove($contact['id']);
 		}
@@ -1619,7 +1593,7 @@ class Contact extends BaseObject
 	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']]);
+			DBA::update('contact', ['rel' => CONTACT_IS_FOLLOWER], ['id' => $contact['id']]);
 		} else {
 			Contact::remove($contact['id']);
 		}
@@ -1690,14 +1664,14 @@ class Contact extends BaseObject
 
 		$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");
+		$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)) {
+		while($contact = DBA::fetch($stmt)) {
 			$return[] = $contact['id'];
 		}
 
-		dba::close($stmt);
+		DBA::close($stmt);
 
 		$contact_ids = $return;
 	}
@@ -1730,8 +1704,21 @@ class Contact extends BaseObject
 	 */
 	public static function magicLinkbyId($cid, $url = '')
 	{
-		$contact = dba::selectFirst('contact', ['network', 'url', 'uid'], ['id' => $cid]);
+		$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'];
 		}
@@ -1745,7 +1732,7 @@ class Contact extends BaseObject
 			return self::magicLink($contact['url'], $url);
 		}
 
-		$redirect = 'redir/' . $cid;
+		$redirect = 'redir/' . $contact['id'];
 
 		if ($url != '') {
 			$redirect .= '?url=' . $url;