keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3934 from zeroadam/Contact

Browse source 
Second Contact
This commit is contained in:
Hypolite Petovan 2017-11-23 21:01:02 -05:00 committed by GitHub
commit fd8b9deaaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 51 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
src/Object/Contact.php
View file

@ -21,29 +21,29 @@ use dba;
require_once 'boot.php'; require_once 'boot.php';
require_once 'include/text.php'; require_once 'include/text.php';
/**
* @brief functions for interacting with a contact
*/
class Contact extends BaseObject class Contact extends BaseObject
{ {
/** /**
* @brief Marks a contact for removal * @brief Marks a contact for removal
* *
* @param int $id * @param int $id contact id
* @return null * @return null
*/ */
public static function remove($id) public static function remove($id)
{ {
// We want just to make sure that we don't delete our "self" contact // We want just to make sure that we don't delete our "self" contact
$r = q( $r = dba::select('contact', array('uid'), array('id' => $id, 'self' => false), array('limit' => 1));
"SELECT `uid` FROM `contact` WHERE `id` = %d AND NOT `self` LIMIT 1", intval($id)
); if (!DBM::is_result($r) || !intval($r['uid'])) {
if (!DBM::is_result($r) || !intval($r[0]['uid'])) {
return; return;
} }
$archive = PConfig::get($r[0]['uid'], 'system', 'archive_removed_contacts'); $archive = PConfig::get($r['uid'], 'system', 'archive_removed_contacts');
if ($archive) { if ($archive) {
q( dba::update('contact', array('archive' => true, 'network' => 'none', 'writable' => false), array('id' => $id));
"UPDATE `contact` SET `archive` = 1, `network` = 'none', `writable` = 0 WHERE id = %d", intval($id)
);
return; return;
} }
@ -58,6 +58,7 @@ class Contact extends BaseObject
* *
* @param array $user User unfriending * @param array $user User unfriending
* @param array $contact Contact unfriended * @param array $contact Contact unfriended
* @return void
*/ */
public static function terminateFriendship(array $user, array $contact) public static function terminateFriendship(array $user, array $contact)
{ {
@ -88,7 +89,7 @@ class Contact extends BaseObject
* This provides for the possibility that their database is temporarily messed * This provides for the possibility that their database is temporarily messed
* up or some other transient event and that there's a possibility we could recover from it. * up or some other transient event and that there's a possibility we could recover from it.
* *
* @param array $contact * @param array $contact contact to mark for archival
* @return type * @return type
*/ */
public static function markForArchival(array $contact) public static function markForArchival(array $contact)
@ -99,18 +100,12 @@ class Contact extends BaseObject
} }
if ($contact['term-date'] <= NULL_DATE) { if ($contact['term-date'] <= NULL_DATE) {
q( dba::update('contact', array('term-date' => datetime_convert()), array('id' => $contact['id']));
"UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), intval($contact['id'])
);
if ($contact['url'] != '') { if ($contact['url'] != '') {
q( dba::update('contact', array('term-date' => datetime_convert()), array('`nurl` = ? AND `term-date` <= ?', normalise_link($contact['url']), NULL_DATE));
"UPDATE `contact` SET `term-date` = '%s'
WHERE `nurl` = '%s' AND `term-date` <= '1000-00-00'", dbesc(datetime_convert()), dbesc(normalise_link($contact['url']))
);
} }
} else { } else {
/* @todo /* @todo
* We really should send a notification to the owner after 2-3 weeks * We really should send a notification to the owner after 2-3 weeks
* so they won't be surprised when the contact vanishes and can take * so they won't be surprised when the contact vanishes and can take
@ -120,19 +115,14 @@ class Contact extends BaseObject
/// @todo Check for contact vitality via probing /// @todo Check for contact vitality via probing
$expiry = $contact['term-date'] . ' + 32 days '; $expiry = $contact['term-date'] . ' + 32 days ';
if (datetime_convert() > datetime_convert('UTC', 'UTC', $expiry)) { if (datetime_convert() > datetime_convert('UTC', 'UTC', $expiry)) {
/* Relationship is really truly dead. archive them rather than /* Relationship is really truly dead. archive them rather than
* delete, though if the owner tries to unarchive them we'll start * delete, though if the owner tries to unarchive them we'll start
* the whole process over again. * the whole process over again.
*/ */
q( dba::update('contact', array('archive' => 1), array('id' => $contact['id']));
"UPDATE `contact` SET `archive` = 1 WHERE `id` = %d", intval($contact['id'])
);
if ($contact['url'] != '') { if ($contact['url'] != '') {
q( dba::update('contact', array('archive' => 1), array('nurl' => normalise_link($contact['url'])));
"UPDATE `contact` SET `archive` = 1 WHERE `nurl` = '%s'", dbesc(normalise_link($contact['url']))
);
} }
} }
} }
@ -143,17 +133,16 @@ class Contact extends BaseObject
* *
* @see Contact::markForArchival() * @see Contact::markForArchival()
* *
* @param array $contact * @param array $contact contact to be unmarked for archival
* @return null * @return null
*/ */
public static function unmarkForArchival(array $contact) public static function unmarkForArchival(array $contact)
{ {
$r = q( $condition = array('`id` => ? AND (`term-date` > ? OR `archive`)', $contact[`id`], NULL_DATE);
"SELECT `term-date` FROM `contact` WHERE `id` = %d AND (`term-date` > '%s' OR `archive`)", intval($contact['id']), dbesc('1000-00-00 00:00:00') $exists = dba::exists('contact', $condition);
);
// We don't need to update, we never marked this contact for archival // We don't need to update, we never marked this contact for archival
if (!DBM::is_result($r)) { if (!$exists) {
return; return;
} }
@ -237,7 +226,7 @@ class Contact extends BaseObject
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
// If there is more than one entry we filter out the connector networks // If there is more than one entry we filter out the connector networks
if (count($r) > 1) { if (count($r) > 1) {
foreach ($r AS $id => $result) { foreach ($r as $id => $result) {
if ($result["network"] == NETWORK_STATUSNET) { if ($result["network"] == NETWORK_STATUSNET) {
unset($r[$id]); unset($r[$id]);
} }
@ -291,8 +280,9 @@ class Contact extends BaseObject
$profile["micro"] = $profile["thumb"]; $profile["micro"] = $profile["thumb"];
} }
if ((($profile["addr"] == "") || ($profile["name"] == "")) && ($profile["gid"] != 0) && if ((($profile["addr"] == "") || ($profile["name"] == "")) && ($profile["gid"] != 0)
in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) { && in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))
) {
Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]); Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]);
} }
@ -362,8 +352,8 @@ class Contact extends BaseObject
/** /**
* @brief Returns the data array for the photo menu of a given contact * @brief Returns the data array for the photo menu of a given contact
* *
* @param array $contact * @param array $contact contact
* @param int $uid * @param int $uid optional, default 0
* @return array * @return array
*/ */
public static function photoMenu(array $contact, $uid = 0) public static function photoMenu(array $contact, $uid = 0)
@ -386,14 +376,14 @@ class Contact extends BaseObject
if ($contact['uid'] != $uid) { if ($contact['uid'] != $uid) {
if ($uid == 0) { if ($uid == 0) {
$profile_link = zrl($contact['url']); $profile_link = zrl($contact['url']);
$menu = Array('profile' => array(t('View Profile'), $profile_link, true)); $menu = array('profile' => array(t('View Profile'), $profile_link, true));
return $menu; return $menu;
} }
$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `network` = '%s' AND `uid` = %d", dbesc($contact['nurl']), dbesc($contact['network']), intval($uid)); $r = dba::select('contact', array(), array('nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid), array('limit' => 1));
if ($r) { if ($r) {
return self::photoMenu($r[0], $uid); return self::photoMenu($r, $uid);
} else { } else {
$profile_link = zrl($contact['url']); $profile_link = zrl($contact['url']);
$connlnk = 'follow/?url=' . $contact['url']; $connlnk = 'follow/?url=' . $contact['url'];
@ -438,7 +428,7 @@ class Contact extends BaseObject
$contact_drop_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/drop?confirm=1'; $contact_drop_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
/** /**
* menu array: * Menu array:
* "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ] * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
*/ */
$menu = array( $menu = array(
@ -459,7 +449,7 @@ class Contact extends BaseObject
$menucondensed = array(); $menucondensed = array();
foreach ($menu AS $menuname => $menuitem) { foreach ($menu as $menuname => $menuitem) {
if ($menuitem[1] != '') { if ($menuitem[1] != '') {
$menucondensed[$menuname] = $menuitem; $menucondensed[$menuname] = $menuitem;
} }
@ -469,14 +459,15 @@ class Contact extends BaseObject
} }
/** /**
* @brief Returns ungrouped contact count or list for user
*
* Returns either the total number of ungrouped contacts for the given user * Returns either the total number of ungrouped contacts for the given user
* id or a paginated list of ungrouped contacts. * id or a paginated list of ungrouped contacts.
* *
* @brief Returns ungrouped contact count or list for user * @param int $uid uid
* @param int $start optional, default 0
* @param int $count optional, default 0
* *
* @param int $uid
* @param int $start
* @param int $count
* @return array * @return array
*/ */
public static function getUngroupedList($uid, $start = 0, $count = 0) public static function getUngroupedList($uid, $start = 0, $count = 0)
@ -510,7 +501,6 @@ class Contact extends BaseObject
AND `pending` = 0 AND `pending` = 0
LIMIT %d, %d", intval($uid), intval($uid), intval($start), intval($count) LIMIT %d, %d", intval($uid), intval($uid), intval($start), intval($count)
); );
return $r; return $r;
} }
@ -561,7 +551,7 @@ class Contact extends BaseObject
if (!DBM::is_result($contact)) { if (!DBM::is_result($contact)) {
// The link could be provided as http although we stored it as https // The link could be provided as http although we stored it as https
$ssl_url = str_replace('http://', 'https://', $url); $ssl_url = str_replace('http://', 'https://', $url);
$r = dba::p("SELECT `id`, `avatar-date` FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = ? LIMIT 1", $url, normalise_link($url), $ssl_url, $uid); $r = dba::select('contact', array('id', 'avatar-date'), array('`alias` IN (?, ?, ?) AND `uid` = ?', $url, normalise_link($url), $ssl_url, $uid), array('limit' => 1));
$contact = dba::fetch($r); $contact = dba::fetch($r);
dba::close($r); dba::close($r);
} }
@ -608,7 +598,8 @@ class Contact extends BaseObject
$url = $data["url"]; $url = $data["url"];
if (!$contact_id) { if (!$contact_id) {
dba::insert('contact', array('uid' => $uid, 'created' => datetime_convert(), 'url' => $data["url"], dba::insert(
'contact', array('uid' => $uid, 'created' => datetime_convert(), 'url' => $data["url"],
'nurl' => normalise_link($data["url"]), 'addr' => $data["addr"], 'nurl' => normalise_link($data["url"]), 'addr' => $data["addr"],
'alias' => $data["alias"], 'notify' => $data["notify"], 'poll' => $data["poll"], 'alias' => $data["alias"], 'notify' => $data["notify"], 'poll' => $data["poll"],
'name' => $data["name"], 'nick' => $data["nick"], 'photo' => $data["photo"], 'name' => $data["name"], 'nick' => $data["nick"], 'photo' => $data["photo"],
@ -619,9 +610,11 @@ class Contact extends BaseObject
'confirm' => $data["confirm"], 'poco' => $data["poco"], 'confirm' => $data["confirm"], 'poco' => $data["poco"],
'name-date' => datetime_convert(), 'uri-date' => datetime_convert(), 'name-date' => datetime_convert(), 'uri-date' => datetime_convert(),
'avatar-date' => datetime_convert(), 'writable' => 1, 'blocked' => 0, 'avatar-date' => datetime_convert(), 'writable' => 1, 'blocked' => 0,
'readonly' => 0, 'pending' => 0)); 'readonly' => 0, 'pending' => 0)
);
$contacts = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2", dbesc(normalise_link($data["url"])), intval($uid)); $s = dba::select('contact', array('id'), array('nurl' => normalise_link($data["url"]), 'uid' => $uid), array('order' => 'id', 'limit' => 2));
$contacts = dba::inArray($s);
if (!DBM::is_result($contacts)) { if (!DBM::is_result($contacts)) {
return 0; return 0;
} }
@ -735,7 +728,6 @@ class Contact extends BaseObject
/** /**
* @brief Returns posts from a given contact url * @brief Returns posts from a given contact url
* *
* @param App $a argv application class
* @param string $contact_url Contact URL * @param string $contact_url Contact URL
* *
* @return string posts in HTML * @return string posts in HTML
@ -790,8 +782,7 @@ class Contact extends BaseObject
// "page-flags" is a field in the user table, // "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. // "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. // "community" is used in the gcontact table and is true if the contact is PAGE_COMMUNITY or PAGE_PRVGROUP.
if ( if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY))
(isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY))
|| (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP)) || (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP))
|| (isset($contact['forum']) && intval($contact['forum'])) || (isset($contact['forum']) && intval($contact['forum']))
|| (isset($contact['prv']) && intval($contact['prv'])) || (isset($contact['prv']) && intval($contact['prv']))