X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=6f83dba0193c51cb4732a0a4b3e3c0f3427266b1;hb=82cef6c9e7326303d9790451d0a757978246b28c;hp=14382d4188e9e260aab74c249f64b538f06ec5b2;hpb=f051ae169868905d3f3debbed37c8cf0f8b2be35;p=friendica.git

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 14382d4188..6f83dba019 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -12,7 +12,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
+use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
@@ -31,6 +31,68 @@ require_once 'include/text.php';
  */
 class Contact extends BaseObject
 {
+	/**
+	 * @name page/profile types
+	 *
+	 * PAGE_NORMAL is a typical personal profile account
+	 * PAGE_SOAPBOX automatically approves all friend requests as Contact::SHARING, (readonly)
+	 * PAGE_COMMUNITY automatically approves all friend requests as Contact::SHARING, but with
+	 *      write access to wall and comments (no email and not included in page owner's ACL lists)
+	 * PAGE_FREELOVE automatically approves all friend requests as full friends (Contact::FRIEND).
+	 *
+	 * @{
+	 */
+	const PAGE_NORMAL    = 0;
+	const PAGE_SOAPBOX   = 1;
+	const PAGE_COMMUNITY = 2;
+	const PAGE_FREELOVE  = 3;
+	const PAGE_BLOG      = 4;
+	const PAGE_PRVGROUP  = 5;
+	/**
+	 * @}
+	 */
+
+	/**
+	 * @name account types
+	 *
+	 * ACCOUNT_TYPE_PERSON - the account belongs to a person
+	 *	Associated page types: PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE
+	 *
+	 * ACCOUNT_TYPE_ORGANISATION - the account belongs to an organisation
+	 *	Associated page type: PAGE_SOAPBOX
+	 *
+	 * ACCOUNT_TYPE_NEWS - the account is a news reflector
+	 *	Associated page type: PAGE_SOAPBOX
+	 *
+	 * ACCOUNT_TYPE_COMMUNITY - the account is community forum
+	 *	Associated page types: PAGE_COMMUNITY, PAGE_PRVGROUP
+	 *
+	 * ACCOUNT_TYPE_RELAY - the account is a relay
+	 *      This will only be assigned to contacts, not to user accounts
+	 * @{
+	 */
+	const ACCOUNT_TYPE_PERSON =       0;
+	const ACCOUNT_TYPE_ORGANISATION = 1;
+	const ACCOUNT_TYPE_NEWS =         2;
+	const ACCOUNT_TYPE_COMMUNITY =    3;
+	const ACCOUNT_TYPE_RELAY =        4;
+	/**
+	 * @}
+	 */
+
+	/**
+	 * @name Contact_is
+	 *
+	 * Relationship types
+	 * @{
+	 */
+	const FOLLOWER = 1;
+	const SHARING  = 2;
+	const FRIEND   = 3;
+	/**
+	 * @}
+	 */
+
 	/**
 	 * @brief Returns a list of contacts belonging in a group
 	 *
@@ -40,6 +102,7 @@ class Contact extends BaseObject
 	public static function getByGroupId($gid)
 	{
 		$return = [];
+
 		if (intval($gid)) {
 			$stmt = DBA::p('SELECT `group_member`.`contact-id`, `contact`.*
 				FROM `contact`
@@ -54,8 +117,9 @@ class Contact extends BaseObject
 				$gid,
 				local_user()
 			);
-			if (DBM::is_result($stmt)) {
-				$return = DBA::inArray($stmt);
+
+			if (DBA::isResult($stmt)) {
+				$return = DBA::toArray($stmt);
 			}
 		}
 
@@ -104,7 +168,7 @@ class Contact extends BaseObject
 		}
 
 		$user = DBA::selectFirst('user', ['uid', 'username', 'nickname'], ['uid' => $uid]);
-		if (!DBM::is_result($user)) {
+		if (!DBA::isResult($user)) {
 			return false;
 		}
 
@@ -147,20 +211,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]);
-		if (!DBM::is_result($self)) {
+		if (!DBA::isResult($self)) {
 			return;
 		}
 
 		$fields = ['nickname', 'page-flags', 'account-type'];
 		$user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
-		if (!DBM::is_result($user)) {
+		if (!DBA::isResult($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)) {
+		if (!DBA::isResult($profile)) {
 			return;
 		}
 
@@ -171,7 +235,7 @@ class Contact extends BaseObject
 			'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 (DBA::isResult($avatar)) {
 			if ($update_avatar) {
 				$fields['avatar-date'] = DateTimeFormat::utcNow();
 			}
@@ -200,8 +264,8 @@ class Contact extends BaseObject
 			$fields['micro'] = System::baseUrl() . '/images/person-48.jpg';
 		}
 
-		$fields['forum'] = $user['page-flags'] == PAGE_COMMUNITY;
-		$fields['prv'] = $user['page-flags'] == PAGE_PRVGROUP;
+		$fields['forum'] = $user['page-flags'] == self::PAGE_COMMUNITY;
+		$fields['prv'] = $user['page-flags'] == self::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'];
@@ -245,7 +309,7 @@ class Contact extends BaseObject
 	{
 		// We want just to make sure that we don't delete our "self" contact
 		$contact = DBA::selectFirst('contact', ['uid'], ['id' => $id, 'self' => false]);
-		if (!DBM::is_result($contact) || !intval($contact['uid'])) {
+		if (!DBA::isResult($contact) || !intval($contact['uid'])) {
 			return;
 		}
 
@@ -275,6 +339,11 @@ class Contact extends BaseObject
 			$item = [];
 			$item['verb'] = NAMESPACE_OSTATUS . "/unfollow";
 			$item['follow'] = $contact["url"];
+			$item['body'] = '';
+			$item['title'] = '';
+			$item['guid'] = '';
+			$item['tag'] = '';
+			$item['attach'] = '';
 			$slap = OStatus::salmon($item, $user);
 
 			if (!empty($contact['notify'])) {
@@ -362,7 +431,7 @@ class Contact extends BaseObject
 		}
 
 		if (!empty($contact['batch'])) {
-			$condition = ['batch' => $contact['batch'], 'contact-type' => ACCOUNT_TYPE_RELAY];
+			$condition = ['batch' => $contact['batch'], 'contact-type' => self::ACCOUNT_TYPE_RELAY];
 			DBA::update('contact', $fields, $condition);
 		}
 	}
@@ -401,41 +470,41 @@ class Contact extends BaseObject
 		$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::toArray($s);
 
 		// Fetch contact data from the contact table for the given user, checking with the alias
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($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`,
 				`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::toArray($s);
 		}
 
 		// Fetch the data from the contact table with "uid=0" (which is filled automatically)
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($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`,
 			`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::toArray($s);
 		}
 
 		// Fetch the data from the contact table with "uid=0" (which is filled automatically) - checked with the alias
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($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`,
 			`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::toArray($s);
 		}
 
 		// Fetch the data from the gcontact table
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($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`, 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::toArray($s);
 		}
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			// If there is more than one entry we filter out the connector networks
 			if (count($r) > 1) {
 				foreach ($r as $id => $result) {
@@ -537,28 +606,28 @@ class Contact extends BaseObject
 		$r = q("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 `addr` = '%s' AND `uid` = %d",
-			dbesc($addr),
+			DBA::escape($addr),
 			intval($uid)
 		);
 		// Fetch the data from the contact table with "uid=0" (which is filled automatically)
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			$r = q("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 `addr` = '%s' AND `uid` = 0",
-				dbesc($addr)
+				DBA::escape($addr)
 			);
 		}
 
 		// Fetch the data from the gcontact table
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			$r = q("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`
 				FROM `gcontact` WHERE `addr` = '%s'",
-				dbesc($addr)
+				DBA::escape($addr)
 			);
 		}
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			$data = Probe::uri($addr);
 
 			$profile = self::getDetailsByURL($data['url'], $uid);
@@ -603,7 +672,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]);
-			if (DBM::is_result($contact_own)) {
+			if (DBA::isResult($contact_own)) {
 				return self::photoMenu($contact_own, $uid);
 			} else {
 				$profile_link = self::magicLink($contact['url']);
@@ -749,19 +818,19 @@ class Contact extends BaseObject
 		$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)) {
+		if (!DBA::isResult($contact)) {
 			$contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid]);
 		}
 
 		// Then the alias (which could be anything)
-		if (!DBM::is_result($contact)) {
+		if (!DBA::isResult($contact)) {
 			// 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);
 		}
 
-		if (DBM::is_result($contact)) {
+		if (DBA::isResult($contact)) {
 			$contact_id = $contact["id"];
 
 			// Update the contact every 7 days
@@ -791,25 +860,25 @@ 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)]);
-			if (!DBM::is_result($contact)) {
+			if (!DBA::isResult($contact)) {
 				$contact = DBA::selectFirst('contact', $fields, ['nurl' => normalise_link($url)]);
 			}
 
-			if (!DBM::is_result($contact)) {
+			if (!DBA::isResult($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]);
 			}
 
-			if (!DBM::is_result($contact)) {
+			if (!DBA::isResult($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)) {
+			if (!DBA::isResult($contact)) {
 				$fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
 					'photo', 'network', 'priority', 'batch', 'request', 'confirm'];
 				$condition = ['url' => [$url, normalise_link($url), $ssl_url]];
@@ -820,7 +889,7 @@ class Contact extends BaseObject
 				$contact = $default;
 			}
 
-			if (!DBM::is_result($contact)) {
+			if (!DBA::isResult($contact)) {
 				return 0;
 			} else {
 				$data = array_merge($data, $contact);
@@ -850,7 +919,7 @@ class Contact extends BaseObject
 				'about'     => $data["about"],
 				'network'   => $data["network"],
 				'pubkey'    => $data["pubkey"],
-				'rel'       => CONTACT_IS_SHARING,
+				'rel'       => self::SHARING,
 				'priority'  => $data["priority"],
 				'batch'     => $data["batch"],
 				'request'   => $data["request"],
@@ -866,8 +935,8 @@ class Contact extends BaseObject
 			);
 
 			$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)) {
+			$contacts = DBA::toArray($s);
+			if (!DBA::isResult($contacts)) {
 				return 0;
 			}
 
@@ -875,7 +944,7 @@ class Contact extends BaseObject
 
 			// Update the newly created contact from data in the gcontact table
 			$gcontact = DBA::selectFirst('gcontact', ['location', 'about', 'keywords', 'gender'], ['nurl' => normalise_link($data["url"])]);
-			if (DBM::is_result($gcontact)) {
+			if (DBA::isResult($gcontact)) {
 				// Only use the information when the probing hadn't fetched these values
 				if ($data['keywords'] != '') {
 					unset($gcontact['keywords']);
@@ -901,7 +970,7 @@ class Contact extends BaseObject
 		$contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]);
 
 		// This condition should always be true
-		if (!DBM::is_result($contact)) {
+		if (!DBA::isResult($contact)) {
 			return $contact_id;
 		}
 
@@ -972,7 +1041,7 @@ class Contact extends BaseObject
 		}
 
 		$blocked = DBA::selectFirst('contact', ['blocked'], ['id' => $cid]);
-		if (!DBM::is_result($blocked)) {
+		if (!DBA::isResult($blocked)) {
 			return false;
 		}
 		return (bool) $blocked['blocked'];
@@ -992,7 +1061,7 @@ class Contact extends BaseObject
 		}
 
 		$hidden = DBA::selectFirst('contact', ['hidden'], ['id' => $cid]);
-		if (!DBM::is_result($hidden)) {
+		if (!DBA::isResult($hidden)) {
 			return false;
 		}
 		return (bool) $hidden['hidden'];
@@ -1015,10 +1084,10 @@ class Contact extends BaseObject
 		// This speeds up the query a lot
 		$r = q("SELECT `network`, `id` AS `author-id`, `contact-type` FROM `contact`
 			WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0",
-			dbesc(normalise_link($contact_url))
+			DBA::escape(normalise_link($contact_url))
 		);
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return '';
 		}
 
@@ -1030,7 +1099,7 @@ class Contact extends BaseObject
 
 		$author_id = intval($r[0]["author-id"]);
 
-		$contact = ($r[0]["contact-type"] == ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
+		$contact = ($r[0]["contact-type"] == self::ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
 
 		$condition = ["`$contact` = ? AND `gravity` IN (?, ?) AND " . $sql,
 			$author_id, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
@@ -1059,17 +1128,17 @@ class Contact extends BaseObject
 	{
 		// There are several fields that indicate that the contact or user is a forum
 		// "page-flags" is a field in the user table,
-		// "forum" and "prv" are used in the contact table. They stand for PAGE_COMMUNITY and PAGE_PRVGROUP.
-		// "community" is used in the gcontact table and is true if the contact is PAGE_COMMUNITY or PAGE_PRVGROUP.
-		if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY))
-			|| (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP))
+		// "forum" and "prv" are used in the contact table. They stand for self::PAGE_COMMUNITY and self::PAGE_PRVGROUP.
+		// "community" is used in the gcontact table and is true if the contact is self::PAGE_COMMUNITY or self::PAGE_PRVGROUP.
+		if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == self::PAGE_COMMUNITY))
+			|| (isset($contact['page-flags']) && (intval($contact['page-flags']) == self::PAGE_PRVGROUP))
 			|| (isset($contact['forum']) && intval($contact['forum']))
 			|| (isset($contact['prv']) && intval($contact['prv']))
 			|| (isset($contact['community']) && intval($contact['community']))
 		) {
-			$type = ACCOUNT_TYPE_COMMUNITY;
+			$type = self::ACCOUNT_TYPE_COMMUNITY;
 		} else {
-			$type = ACCOUNT_TYPE_PERSON;
+			$type = self::ACCOUNT_TYPE_PERSON;
 		}
 
 		// The "contact-type" (contact table) and "account-type" (user table) are more general then the chaos from above.
@@ -1082,15 +1151,18 @@ class Contact extends BaseObject
 		}
 
 		switch ($type) {
-			case ACCOUNT_TYPE_ORGANISATION:
+			case self::ACCOUNT_TYPE_ORGANISATION:
 				$account_type = L10n::t("Organisation");
 				break;
-			case ACCOUNT_TYPE_NEWS:
+
+			case self::ACCOUNT_TYPE_NEWS:
 				$account_type = L10n::t('News');
 				break;
-			case ACCOUNT_TYPE_COMMUNITY:
+
+			case self::ACCOUNT_TYPE_COMMUNITY:
 				$account_type = L10n::t("Forum");
 				break;
+
 			default:
 				$account_type = "";
 				break;
@@ -1138,7 +1210,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]);
-		if (!DBM::is_result($contact)) {
+		if (!DBA::isResult($contact)) {
 			return false;
 		} else {
 			$data = [$contact["photo"], $contact["thumb"], $contact["micro"]];
@@ -1157,7 +1229,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]);
-					if (DBM::is_result($pcontact)) {
+					if (DBA::isResult($pcontact)) {
 						self::updateAvatar($avatar, 0, $pcontact['id'], $force);
 					}
 				}
@@ -1182,7 +1254,7 @@ class Contact extends BaseObject
 
 		$fields = ['url', 'nurl', 'addr', 'alias', 'batch', 'notify', 'poll', 'poco', 'network'];
 		$contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
-		if (!DBM::is_result($contact)) {
+		if (!DBA::isResult($contact)) {
 			return false;
 		}
 
@@ -1298,20 +1370,20 @@ class Contact extends BaseObject
 
 		$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'])
+			DBA::escape($ret['poll']),
+			DBA::escape(normalise_link($ret['poll'])),
+			DBA::escape($ret['network'])
 		);
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($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'])
+				DBA::escape(normalise_link($url)),
+				DBA::escape($ret['network'])
 			);
 		}
 
-		if (($ret['network'] === NETWORK_DFRN) && !DBM::is_result($r)) {
+		if (($ret['network'] === NETWORK_DFRN) && !DBA::isResult($r)) {
 			if ($interactive) {
 				if (strlen($a->urlpath)) {
 					$myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
@@ -1373,14 +1445,14 @@ class Contact extends BaseObject
 			$writeable = 1;
 		}
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			// update contact
-			$new_relation = (($r[0]['rel'] == CONTACT_IS_FOLLOWER) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
+			$new_relation = (($r[0]['rel'] == self::FOLLOWER) ? self::FRIEND : self::SHARING);
 
 			$fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false];
 			DBA::update('contact', $fields, ['id' => $r[0]['id']]);
 		} else {
-			$new_relation = ((in_array($ret['network'], [NETWORK_MAIL])) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
+			$new_relation = ((in_array($ret['network'], [NETWORK_MAIL])) ? self::FRIEND : self::SHARING);
 
 			// create contact record
 			DBA::insert('contact', [
@@ -1410,7 +1482,7 @@ class Contact extends BaseObject
 		}
 
 		$contact = DBA::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]);
-		if (!DBM::is_result($contact)) {
+		if (!DBA::isResult($contact)) {
 			$result['message'] .= L10n::t('Unable to retrieve contact information.') . EOL;
 			return $result;
 		}
@@ -1432,12 +1504,17 @@ class Contact extends BaseObject
 			intval($uid)
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN])) {
 				// create a follow slap
 				$item = [];
 				$item['verb'] = ACTIVITY_FOLLOW;
 				$item['follow'] = $contact["url"];
+				$item['body'] = '';
+				$item['title'] = '';
+				$item['guid'] = '';
+				$item['tag'] = '';
+				$item['attach'] = '';
 				$slap = OStatus::salmon($item, $r[0]);
 				if (!empty($contact['notify'])) {
 					Salmon::slapper($r[0], $contact['notify'], $slap);
@@ -1486,24 +1563,28 @@ class Contact extends BaseObject
 	}
 
 	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;
+		// Should always be set
+		if (empty($datarray['author-id'])) {
+			return;
 		}
 
+		$fields = ['url', 'name', 'nick', 'photo', 'network'];
+		$pub_contact = DBA::selectFirst('contact', $fields, ['id' => $datarray['author-id']]);
+		if (!DBA::isResult($pub_contact)) {
+			// Should never happen
+			return;
+		}
+
+		$url = $pub_contact['url'];
+		$name = $pub_contact['name'];
+		$photo = $pub_contact['photo'];
+		$nick = $pub_contact['nick'];
+		$network = $pub_contact['network'];
+
 		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],
+			if (($contact['rel'] == self::SHARING)
+				|| ($sharing && $contact['rel'] == self::FOLLOWER)) {
+				DBA::update('contact', ['rel' => self::FRIEND, 'writable' => true],
 						['id' => $contact['id'], 'uid' => $importer['uid']]);
 			}
 			// send email notification to owner?
@@ -1518,19 +1599,19 @@ class Contact extends BaseObject
 				`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)
+				DBA::escape(DateTimeFormat::utcNow()),
+				DBA::escape($url),
+				DBA::escape(normalise_link($url)),
+				DBA::escape($name),
+				DBA::escape($nick),
+				DBA::escape($photo),
+				DBA::escape($network),
+				intval(self::FOLLOWER)
 			);
 
 			$contact_record = [
 				'id' => DBA::lastInsertId(),
-				'network' => NETWORK_OSTATUS,
+				'network' => $network,
 				'name' => $name,
 				'url' => $url,
 				'photo' => $photo
@@ -1541,7 +1622,7 @@ class Contact extends BaseObject
 			/// @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])) {
+			if (DBA::isResult($user) && !in_array($user['page-flags'], [self::PAGE_SOAPBOX, self::PAGE_FREELOVE, self::PAGE_COMMUNITY])) {
 				// create notification
 				$hash = random_string();
 
@@ -1554,7 +1635,7 @@ class Contact extends BaseObject
 				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])) {
+					in_array($user['page-flags'], [self::PAGE_NORMAL])) {
 
 					notification([
 						'type'         => NOTIFY_INTRO,
@@ -1563,7 +1644,7 @@ class Contact extends BaseObject
 						'to_name'      => $user['username'],
 						'to_email'     => $user['email'],
 						'uid'          => $user['uid'],
-						'link'		   => System::baseUrl() . '/notifications/intro',
+						'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'],
@@ -1572,28 +1653,28 @@ class Contact extends BaseObject
 					]);
 
 				}
-			} elseif (DBM::is_result($user) && in_array($user['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) {
+			} elseif (DBA::isResult($user) && in_array($user['page-flags'], [self::PAGE_SOAPBOX, self::PAGE_FREELOVE, self::PAGE_COMMUNITY])) {
 				q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
 						intval($importer['uid']),
-						dbesc($url)
+						DBA::escape($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']]);
+	public static function removeFollower($importer, $contact, array $datarray = [], $item = "")
+	{
+		if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::SHARING)) {
+			DBA::update('contact', ['rel' => self::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']]);
+	public static function removeSharer($importer, $contact, array $datarray = [], $item = "")
+	{
+		if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::FOLLOWER)) {
+			DBA::update('contact', ['rel' => self::FOLLOWER], ['id' => $contact['id']]);
 		} else {
 			Contact::remove($contact['id']);
 		}
@@ -1610,7 +1691,7 @@ class Contact extends BaseObject
 		// 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)) {
+		if (DBA::isResult($r)) {
 			foreach ($r as $rr) {
 				logger('update_contact_birthday: ' . $rr['bd']);
 
@@ -1626,9 +1707,9 @@ class Contact extends BaseObject
 
 				// 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'));
+					intval($rr['uid']), intval($rr['id']), DBA::escape(DateTimeFormat::utc($nextbd)), DBA::escape('birthday'));
 
-				if (DBM::is_result($s)) {
+				if (DBA::isResult($s)) {
 					continue;
 				}
 
@@ -1637,15 +1718,15 @@ class Contact extends BaseObject
 
 				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'),
+					DBA::escape(DateTimeFormat::utcNow()), DBA::escape(DateTimeFormat::utcNow()), DBA::escape(DateTimeFormat::utc($nextbd)),
+					DBA::escape(DateTimeFormat::utc($nextbd . ' + 1 day ')), DBA::escape($bdtext), DBA::escape($bdtext2), DBA::escape('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'])
+				q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d", DBA::escape(substr($nextbd, 0, 4)),
+					DBA::escape($nextbd), intval($rr['uid']), intval($rr['id'])
 				);
 			}
 		}
@@ -1662,7 +1743,7 @@ class Contact extends BaseObject
 			return;
 		}
 
-		$str = dbesc(implode(',', $contact_ids));
+		$str = DBA::escape(implode(',', $contact_ids));
 
 		$stmt = DBA::p("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0");
 
@@ -1739,5 +1820,5 @@ class Contact extends BaseObject
 		}
 
 		return $redirect;
-        }
+	}
 }