use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Network\Probe;
use Friendica\Object\Image;
use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\DFRN;
use Friendica\Protocol\OStatus;
use Friendica\Protocol\PortableContact;
use Friendica\Protocol\Salmon;
* @}
*/
+ /**
+ * @brief Returns the contact id for the user and the public contact id for a given contact id
+ *
+ * @param int $cid Either public contact id or user's contact id
+ * @param int $uid User ID
+ *
+ * @return array with public and user's contact id
+ */
+ private static function getPublicAndUserContacID($cid, $uid)
+ {
+ if (empty($uid) || empty($cid)) {
+ return [];
+ }
+
+ $contact = DBA::selectFirst('contact', ['id', 'uid', 'url'], ['id' => $cid]);
+ if (!DBA::isResult($contact)) {
+ return [];
+ }
+
+ // We quit when the user id don't match the user id of the provided contact
+ if (($contact['uid'] != $uid) && ($contact['uid'] != 0)) {
+ return [];
+ }
+
+ if ($contact['uid'] != 0) {
+ $pcid = Contact::getIdForURL($contact['url'], 0, true, ['url' => $contact['url']]);
+ if (empty($pcid)) {
+ return [];
+ }
+ $ucid = $contact['id'];
+ } else {
+ $pcid = $contact['id'];
+ $ucid = Contact::getIdForURL($contact['url'], $uid, true);
+ }
+
+ return ['public' => $pcid, 'user' => $ucid];
+ }
+
+ /**
+ * @brief Block contact id for user id
+ *
+ * @param int $cid Either public contact id or user's contact id
+ * @param int $uid User ID
+ * @param boolean $blocked Is the contact blocked or unblocked?
+ */
+ public static function setBlockedForUser($cid, $uid, $blocked)
+ {
+ $cdata = self::getPublicAndUserContacID($cid, $uid);
+ if (empty($cdata)) {
+ return;
+ }
+
+ if ($cdata['user'] != 0) {
+ DBA::update('contact', ['blocked' => $blocked], ['id' => $cdata['user'], 'pending' => false]);
+ }
+
+ DBA::update('user-contact', ['blocked' => $blocked], ['cid' => $cdata['public'], 'uid' => $uid], true);
+ }
+
+ /**
+ * @brief Returns "block" state for contact id and user id
+ *
+ * @param int $cid Either public contact id or user's contact id
+ * @param int $uid User ID
+ *
+ * @return boolean is the contact id blocked for the given user?
+ */
+ public static function isBlockedByUser($cid, $uid)
+ {
+ $cdata = self::getPublicAndUserContacID($cid, $uid);
+ if (empty($cdata)) {
+ return;
+ }
+
+ $public_blocked = false;
+
+ if (!empty($cdata['public'])) {
+ $public_contact = DBA::selectFirst('user-contact', ['blocked'], ['cid' => $cdata['public'], 'uid' => $uid]);
+ if (DBA::isResult($public_contact)) {
+ $public_blocked = $public_contact['blocked'];
+ }
+ }
+
+ $user_blocked = $public_blocked;
+
+ if (!empty($cdata['user'])) {
+ $user_contact = DBA::selectFirst('contact', ['blocked'], ['id' => $cdata['user'], 'pending' => false]);
+ if (DBA::isResult($user_contact)) {
+ $user_blocked = $user_contact['blocked'];
+ }
+ }
+
+ if ($user_blocked != $public_blocked) {
+ DBA::update('user-contact', ['blocked' => $user_blocked], ['cid' => $cdata['public'], 'uid' => $uid], true);
+ }
+
+ return $user_blocked;
+ }
+
+ /**
+ * @brief Ignore contact id for user id
+ *
+ * @param int $cid Either public contact id or user's contact id
+ * @param int $uid User ID
+ * @param boolean $ignored Is the contact ignored or unignored?
+ */
+ public static function setIgnoredForUser($cid, $uid, $ignored)
+ {
+ $cdata = self::getPublicAndUserContacID($cid, $uid);
+ if (empty($cdata)) {
+ return;
+ }
+
+ if ($cdata['user'] != 0) {
+ DBA::update('contact', ['readonly' => $ignored], ['id' => $cdata['user'], 'pending' => false]);
+ }
+
+ DBA::update('user-contact', ['ignored' => $ignored], ['cid' => $cdata['public'], 'uid' => $uid], true);
+ }
+
+ /**
+ * @brief Returns "ignore" state for contact id and user id
+ *
+ * @param int $cid Either public contact id or user's contact id
+ * @param int $uid User ID
+ *
+ * @return boolean is the contact id ignored for the given user?
+ */
+ public static function isIgnoredByUser($cid, $uid)
+ {
+ $cdata = self::getPublicAndUserContacID($cid, $uid);
+ if (empty($cdata)) {
+ return;
+ }
+
+ $public_ignored = false;
+
+ if (!empty($cdata['public'])) {
+ $public_contact = DBA::selectFirst('user-contact', ['ignored'], ['cid' => $cdata['public'], 'uid' => $uid]);
+ if (DBA::isResult($public_contact)) {
+ $public_ignored = $public_contact['ignored'];
+ }
+ }
+
+ $user_ignored = $public_ignored;
+
+ if (!empty($cdata['user'])) {
+ $user_contact = DBA::selectFirst('contact', ['readonly'], ['id' => $cdata['user'], 'pending' => false]);
+ if (DBA::isResult($user_contact)) {
+ $user_ignored = $user_contact['readonly'];
+ }
+ }
+
+ if ($user_ignored != $public_ignored) {
+ DBA::update('user-contact', ['ignored' => $user_ignored], ['cid' => $cdata['public'], 'uid' => $uid], true);
+ }
+
+ return $user_ignored;
+ }
+
+ /**
+ * @brief Set "collapsed" for contact id and user id
+ *
+ * @param int $cid Either public contact id or user's contact id
+ * @param int $uid User ID
+ * @param boolean $collapsed are the contact's posts collapsed or uncollapsed?
+ */
+ public static function setCollapsedForUser($cid, $uid, $collapsed)
+ {
+ $cdata = self::getPublicAndUserContacID($cid, $uid);
+ if (empty($cdata)) {
+ return;
+ }
+
+ DBA::update('user-contact', ['collapsed' => $collapsed], ['cid' => $cdata['public'], 'uid' => $uid], true);
+ }
+
+ /**
+ * @brief Returns "collapsed" state for contact id and user id
+ *
+ * @param int $cid Either public contact id or user's contact id
+ * @param int $uid User ID
+ *
+ * @return boolean is the contact id blocked for the given user?
+ */
+ public static function isCollapsedByUser($cid, $uid)
+ {
+ $cdata = self::getPublicAndUserContacID($cid, $uid);
+ if (empty($cdata)) {
+ return;
+ }
+
+ $collapsed = false;
+
+ if (!empty($cdata['public'])) {
+ $public_contact = DBA::selectFirst('user-contact', ['collapsed'], ['cid' => $cdata['public'], 'uid' => $uid]);
+ if (DBA::isResult($public_contact)) {
+ $collapsed = $public_contact['collapsed'];
+ }
+ }
+
+ return $collapsed;
+ }
+
/**
* @brief Returns a list of contacts belonging in a group
*
AND `contact`.`notify` != ""',
$gid,
local_user(),
- NETWORK_OSTATUS
+ Protocol::OSTATUS
);
$return = $contacts['count'];
}
return;
}
- $archive = PConfig::get($contact['uid'], 'system', 'archive_removed_contacts');
- if ($archive) {
- DBA::update('contact', ['archive' => true, 'network' => 'none', 'writable' => false], ['id' => $id]);
- return;
- }
+ // Archive the contact
+ DBA::update('contact', ['archive' => true, 'network' => Protocol::PHANTOM], ['id' => $id]);
- DBA::delete('contact', ['id' => $id]);
-
- // Delete the rest in the background
+ // Delete it in the background
Worker::add(PRIORITY_LOW, 'RemoveContact', $id);
}
/**
* @brief Sends an unfriend message. Does not remove the contact
*
- * @param array $user User unfriending
- * @param array $contact Contact unfriended
+ * @param array $user User unfriending
+ * @param array $contact Contact unfriended
+ * @param boolean $dissolve Remove the contact on the remote side
* @return void
*/
- public static function terminateFriendship(array $user, array $contact)
+ public static function terminateFriendship(array $user, array $contact, $dissolve = false)
{
- if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN])) {
+ if (($contact['network'] == Protocol::DFRN) && $dissolve) {
+ DFRN::deliver($user, $contact, 'placeholder', true);
+ } elseif (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
// create an unfollow slap
$item = [];
$item['verb'] = NAMESPACE_OSTATUS . "/unfollow";
if (!empty($contact['notify'])) {
Salmon::slapper($user, $contact['notify'], $slap);
}
- } elseif ($contact['network'] == NETWORK_DIASPORA) {
+ } elseif ($contact['network'] == Protocol::DIASPORA) {
Diaspora::sendUnshare($user, $contact);
}
}
*/
public static function markForArchival(array $contact)
{
+ if (!isset($contact['url']) && !empty($contact['id'])) {
+ $fields = ['id', 'url', 'archive', 'self', 'term-date'];
+ $contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]);
+ if (!DBA::isResult($contact)) {
+ return;
+ }
+ } elseif (!isset($contact['url'])) {
+ logger('Empty contact: ' . json_encode($contact) . ' - ' . System::callstack(20), LOGGER_DEBUG);
+ }
+
// Contact already archived or "self" contact? => nothing to do
if ($contact['archive'] || $contact['self']) {
return;
if ($contact['term-date'] <= NULL_DATE) {
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
* We really should send a notification to the owner after 2-3 weeks
* the whole process over again.
*/
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]);
}
}
}
return;
}
+ if (!isset($contact['url']) && !empty($contact['id'])) {
+ $fields = ['id', 'url', 'batch'];
+ $contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]);
+ if (!DBA::isResult($contact)) {
+ return;
+ }
+ }
+
// 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']]);
-
- 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' => self::ACCOUNT_TYPE_RELAY];
// If there is more than one entry we filter out the connector networks
if (count($r) > 1) {
foreach ($r as $id => $result) {
- if ($result["network"] == NETWORK_STATUSNET) {
+ if ($result["network"] == Protocol::STATUSNET) {
unset($r[$id]);
}
}
}
if ((empty($profile["addr"]) || empty($profile["name"])) && (defaults($profile, "gid", 0) != 0)
- && in_array($profile["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])
+ && in_array($profile["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])
) {
Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]);
}
// Show contact details of Diaspora contacts only if connected
- if ((defaults($profile, "cid", 0) == 0) && (defaults($profile, "network", "") == NETWORK_DIASPORA)) {
+ if ((defaults($profile, "cid", 0) == 0) && (defaults($profile, "network", "") == Protocol::DIASPORA)) {
$profile["location"] = "";
$profile["about"] = "";
$profile["gender"] = "";
$contact_own = DBA::selectFirst('contact', [], ['nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid]);
if (DBA::isResult($contact_own)) {
return self::photoMenu($contact_own, $uid);
- } else {
- $profile_link = self::magicLink($contact['url']);
- $connlnk = 'follow/?url=' . $contact['url'];
- $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) && !$contact['self']) {
+ if (($contact['network'] === Protocol::DFRN) && !$contact['self']) {
$sparkle = true;
$profile_link = System::baseUrl() . '/redir/' . $contact['id'];
} else {
$profile_link = $profile_link . '?url=profile';
}
- if (in_array($contact['network'], [NETWORK_DFRN, NETWORK_DIASPORA]) && !$contact['self']) {
+ if (in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA]) && !$contact['self']) {
$pm_url = System::baseUrl() . '/message/new/' . $contact['id'];
}
- if (($contact['network'] == NETWORK_DFRN) && !$contact['self']) {
+ if (($contact['network'] == Protocol::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';
+ $posts_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/conversations';
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' => [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],
- ];
+ if (empty($contact['uid'])) {
+ $connlnk = 'follow/?url=' . $contact['url'];
+ $menu = [
+ 'profile' => [L10n::t('View Profile'), $profile_link, true],
+ 'network' => [L10n::t('Network Posts'), $posts_link, false],
+ 'edit' => [L10n::t('View Contact'), $contact_url, false],
+ 'follow' => [L10n::t('Connect/Follow'), $connlnk, true],
+ ];
+ } else {
+ $menu = [
+ '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];
return 0;
}
- $data = Probe::uri($url, "", $uid);
+ // When we don't want to update, we look if some of our users already know this contact
+ if ($no_update) {
+ $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
+ 'photo', 'keywords', 'location', 'about', 'network',
+ 'priority', 'batch', 'request', 'confirm', 'poco'];
+ $data = DBA::selectFirst('contact', $fields, ['nurl' => normalise_link($url)]);
+
+ if (DBA::isResult($data)) {
+ // For security reasons we don't fetch key data from our users
+ $data["pubkey"] = '';
+ }
+ } else {
+ $data = [];
+ }
+
+ if (empty($data)) {
+ $data = Probe::uri($url, "", $uid);
+
+ // Ensure that there is a gserver entry
+ if (!empty($data['baseurl']) && ($data['network'] != Protocol::PHANTOM)) {
+ PortableContact::checkServer($data['baseurl']);
+ }
+ }
// Last try in gcontact for unsupported networks
- if (!in_array($data["network"], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO, NETWORK_MAIL, NETWORK_FEED])) {
+ if (!in_array($data["network"], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::PUMPIO, Protocol::MAIL, Protocol::FEED])) {
if ($uid != 0) {
return 0;
}
*
* @return string posts in HTML
*/
- public static function getPostsFromUrl($contact_url)
+ public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0)
{
$a = self::getApp();
return '';
}
- if (in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
+ if (in_array($r[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
$sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
} else {
$sql = "`item`.`uid` = ?";
$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()];
+ if ($thread_mode) {
+ $condition = ["`$contact` = ? AND `gravity` = ? AND " . $sql,
+ $author_id, GRAVITY_PARENT, local_user()];
+ } else {
+ $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);
- $items = Item::inArray($r);
+ if ($thread_mode) {
+ $r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
+
+ $items = Item::inArray($r);
- $o = conversation($a, $items, 'contact-posts', false);
+ $o = conversation($a, $items, 'contacts', $update);
+ } else {
+ $r = Item::selectForUser(local_user(), [], $condition, $params);
- $o .= alt_pager($a, count($items));
+ $items = Item::inArray($r);
+
+ $o = conversation($a, $items, 'contact-posts', false);
+ }
+
+ if (!$update) {
+ $o .= alt_pager($a, count($items));
+ }
return $o;
}
// 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),
- DBA::escape($ret['poll']),
- DBA::escape(normalise_link($ret['poll'])),
- DBA::escape($ret['network'])
- );
-
- 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),
- DBA::escape(normalise_link($url)),
- DBA::escape($ret['network'])
- );
+ $condition = ['uid' => $uid, 'poll' => [$ret['poll'], normalise_link($ret['poll'])], 'network' => $ret['network'], 'pending' => false];
+ $contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
+ if (!DBA::isResult($contact)) {
+ $condition = ['uid' => $uid, 'nurl' => normalise_link($url), 'network' => $ret['network'], 'pending' => false];
+ $contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
}
- if (($ret['network'] === NETWORK_DFRN) && !DBA::isResult($r)) {
+ if (($ret['network'] === Protocol::DFRN) && !DBA::isResult($contact)) {
if ($interactive) {
if (strlen($a->urlpath)) {
$myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
// NOTREACHED
}
- } elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != NETWORK_DFRN)) {
+ } elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != Protocol::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;
}
// This extra param just confuses things, remove it
- if ($ret['network'] === NETWORK_DIASPORA) {
+ if ($ret['network'] === Protocol::DIASPORA) {
$ret['url'] = str_replace('?absolute=true', '', $ret['url']);
}
return $result;
}
- if ($ret['network'] === NETWORK_OSTATUS && Config::get('system', 'ostatus_disabled')) {
+ if ($ret['network'] === Protocol::OSTATUS && Config::get('system', 'ostatus_disabled')) {
$result['message'] .= L10n::t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
$ret['notify'] = '';
}
$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);
+ $writeable = ((($ret['network'] === Protocol::OSTATUS) && ($ret['notify'])) ? 1 : 0);
- $subhub = (($ret['network'] === NETWORK_OSTATUS) ? true : false);
+ $subhub = (($ret['network'] === Protocol::OSTATUS) ? true : false);
- $hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
+ $hidden = (($ret['network'] === Protocol::MAIL) ? 1 : 0);
- if (in_array($ret['network'], [NETWORK_MAIL, NETWORK_DIASPORA])) {
+ if (in_array($ret['network'], [Protocol::MAIL, Protocol::DIASPORA])) {
$writeable = 1;
}
- if (DBA::isResult($r)) {
+ if (DBA::isResult($contact)) {
// update contact
- $new_relation = (($r[0]['rel'] == self::FOLLOWER) ? self::FRIEND : self::SHARING);
+ $new_relation = (($contact['rel'] == self::FOLLOWER) ? self::FRIEND : self::SHARING);
$fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false];
- DBA::update('contact', $fields, ['id' => $r[0]['id']]);
+ DBA::update('contact', $fields, ['id' => $contact['id']]);
} else {
- $new_relation = ((in_array($ret['network'], [NETWORK_MAIL])) ? self::FRIEND : self::SHARING);
+ $new_relation = (in_array($ret['network'], [Protocol::MAIL]) ? self::FRIEND : self::SHARING);
// create contact record
DBA::insert('contact', [
Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force");
- $r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
- WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
- intval($uid)
- );
+ $owner = User::getOwnerDataById($uid);
- if (DBA::isResult($r)) {
- if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN])) {
+ if (DBA::isResult($owner)) {
+ if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
// create a follow slap
$item = [];
$item['verb'] = ACTIVITY_FOLLOW;
$item['guid'] = '';
$item['tag'] = '';
$item['attach'] = '';
- $slap = OStatus::salmon($item, $r[0]);
+
+ $slap = OStatus::salmon($item, $owner);
+
if (!empty($contact['notify'])) {
- Salmon::slapper($r[0], $contact['notify'], $slap);
+ Salmon::slapper($owner, $contact['notify'], $slap);
}
- } elseif ($contact['network'] == NETWORK_DIASPORA) {
+ } elseif ($contact['network'] == Protocol::DIASPORA) {
$ret = Diaspora::sendShare($a->user, $contact);
logger('share returns: ' . $ret);
}
return $result;
}
- public static function updateSslPolicy($contact, $new_policy)
+ /**
+ * @brief Updated contact's SSL policy
+ *
+ * @param array $contact Contact array
+ * @param string $new_policy New policy, valid: self,full
+ *
+ * @return array Contact array with updated values
+ */
+ public static function updateSslPolicy(array $contact, $new_policy)
{
$ssl_changed = false;
if ((intval($new_policy) == SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'], 'https:')) {
}
} 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']),
- DBA::escape($url)
- );
+ $condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true];
+ DBA::update('contact', ['pending' => false], $condition);
}
}
}
*/
// 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']), DBA::escape(DateTimeFormat::utc($nextbd)), DBA::escape('birthday'));
-
- if (DBA::isResult($s)) {
+ $condition = ['uid' => $rr['uid'], 'cid' => $rr['id'],
+ 'start' => DateTimeFormat::utc($nextbd), 'type' => 'birthday'];
+ if (DBA::exists('event', $condition)) {
continue;
}
intval(0)
);
-
// update bdyear
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'])
*/
public static function magicLinkbyContact($contact, $url = '')
{
- if ($contact['network'] != NETWORK_DFRN) {
+ if ($contact['network'] != Protocol::DFRN) {
return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
}
projects / friendica.git / blobdiff