Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3214 from Hypolite/get_contact-rewrite

Browse source 
Reformatted get_contact()
This commit is contained in:
Tobias Diekershoff 2017-03-12 15:42:17 +01:00 committed by GitHub
parent 1bf089e424 37b15995d8
commit 7275319eb6
1 changed files with 84 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

141
include/Contact.php
View file

@ -1,7 +1,5 @@
<?php <?php
require_once('include/Probe.php');
// Included here for completeness, but this is a very dangerous operation. // Included here for completeness, but this is a very dangerous operation.
// It is the caller's responsibility to confirm the requestor's intent and // It is the caller's responsibility to confirm the requestor's intent and
// authorisation to do this. // authorisation to do this.
@ -355,6 +353,7 @@ function get_contact_details_by_addr($addr, $uid = -1) {
dbesc($addr)); dbesc($addr));
if (!dbm::is_result($r)) { if (!dbm::is_result($r)) {
require_once('include/Probe.php');
$data = Probe::uri($addr); $data = Probe::uri($addr);
$profile = get_contact_details_by_url($data['url'], $uid); $profile = get_contact_details_by_url($data['url'], $uid);
@ -508,72 +507,96 @@ function contacts_not_grouped($uid,$start = 0,$count = 0) {
/** /**
* @brief Fetch the contact id for a given url and user * @brief Fetch the contact id for a given url and user
* *
* First lookup in the contact table to find a record matching either `url`, `nurl`,
* `addr` or `alias`.
*
* If there's no record and we aren't looking for a public contact, we quit.
* If there's one, we check that it isn't time to update the picture else we
* directly return the found contact id.
*
* Second, we probe the provided $url wether it's http://server.tld/profile or
* nick@server.tld. We quit if we can't get any info back.
*
* Third, we create the contact record if it doesn't exist
*
* Fourth, we update the existing record with the new data (avatar, alias, nick)
* if there's any updates
*
* @param string $url Contact URL * @param string $url Contact URL
* @param integer $uid The user id for the contact * @param integer $uid The user id for the contact (0 = public contact)
* @param boolean $no_update Don't update the contact * @param boolean $no_update Don't update the contact
* *
* @return integer Contact ID * @return integer Contact ID
*/ */
function get_contact($url, $uid = 0, $no_update = false) { function get_contact($url, $uid = 0, $no_update = false) {
require_once("include/Scrape.php");
logger("Get contact data for url ".$url." and user ".$uid." - ".App::callstack(), LOGGER_DEBUG);; logger("Get contact data for url ".$url." and user ".$uid." - ".App::callstack(), LOGGER_DEBUG);;
$data = array(); $data = array();
$contactid = 0; $contact_id = 0;
// is it an address in the format user@server.tld? // We first try the nurl (http://server.tld/nick), most common case
/// @todo use gcontact and/or the addr field for a lookup $contacts = q("SELECT `id`, `avatar-date` FROM `contact`
if (!strstr($url, "http") OR strstr($url, "@")) { WHERE `nurl` = '%s'
$data = probe_url($url); AND `uid` = %d",
$url = $data["url"];
if ($url == "")
return 0;
}
$contact = q("SELECT `id`, `avatar-date` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2",
dbesc(normalise_link($url)), dbesc(normalise_link($url)),
intval($uid)); intval($uid));
if (!$contact)
$contact = q("SELECT `id`, `avatar-date` FROM `contact` WHERE `alias` IN ('%s', '%s') AND `uid` = %d ORDER BY `id` LIMIT 1",
dbesc($url),
dbesc(normalise_link($url)),
intval($uid));
if ($contact) { // Then the addr (nick@server.tld)
$contactid = $contact[0]["id"]; if (! dbm::is_result($contacts)) {
$contacts = q("SELECT `id`, `avatar-date` FROM `contact`
WHERE `addr` = '%s'
AND `uid` = %d",
dbesc($url),
intval($uid));
}
// Then the alias (which could be anything)
if (! dbm::is_result($contacts)) {
$contacts = q("SELECT `id`, `avatar-date` FROM `contact`
WHERE `alias` IN ('%s', '%s')
AND `uid` = %d",
dbesc($url),
dbesc(normalise_link($url)),
intval($uid));
}
if (dbm::is_result($contacts)) {
$contact_id = $contacts[0]["id"];
// Update the contact every 7 days // Update the contact every 7 days
$update_photo = ($contact[0]['avatar-date'] < datetime_convert('','','now -7 days')); $update_photo = ($contacts[0]['avatar-date'] < datetime_convert('','','now -7 days'));
//$update_photo = ($contact[0]['avatar-date'] < datetime_convert('','','now -12 hours'));
if (!$update_photo OR $no_update) { if (!$update_photo OR $no_update) {
return($contactid); return $contact_id;
} }
} elseif ($uid != 0) } elseif ($uid != 0) {
// Non-existing user-specific contact, exiting
return 0; return 0;
}
if (!count($data)) require_once('include/Probe.php');
$data = probe_url($url); $data = Probe::uri($url);
// Does this address belongs to a valid network? // Last try in gcontact for unsupported networks
if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) { if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO))) {
if ($uid != 0) if ($uid != 0) {
return 0; return 0;
}
// Get data from the gcontact table // Get data from the gcontact table
$r = q("SELECT `name`, `nick`, `url`, `photo`, `addr`, `alias`, `network` FROM `gcontact` WHERE `nurl` = '%s'", $gcontacts = q("SELECT `name`, `nick`, `url`, `photo`, `addr`, `alias`, `network` FROM `gcontact` WHERE `nurl` = '%s'",
dbesc(normalise_link($url))); dbesc(normalise_link($url)));
if (!$r) if (!$gcontacts) {
return 0; return 0;
}
$data = $r[0]; $data = $gcontacts[0];
} }
$url = $data["url"]; $url = $data["url"];
if ($contactid == 0) { if (!$contact_id) {
q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
`name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
`batch`, `request`, `confirm`, `poco`, `name-date`, `uri-date`, `batch`, `request`, `confirm`, `poco`, `name-date`, `uri-date`,
@ -602,45 +625,48 @@ function get_contact($url, $uid = 0, $no_update = false) {
dbesc(datetime_convert()) dbesc(datetime_convert())
); );
$contact = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2", $contacts = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2",
dbesc(normalise_link($data["url"])), dbesc(normalise_link($data["url"])),
intval($uid)); intval($uid));
if (!$contact) if (!dbm::is_result($contacts)) {
return 0; return 0;
}
$contactid = $contact[0]["id"]; $contact_id = $contacts[0]["id"];
// Update the newly created contact from data in the gcontact table // Update the newly created contact from data in the gcontact table
$r = q("SELECT `location`, `about`, `keywords`, `gender` FROM `gcontact` WHERE `nurl` = '%s'", $gcontacts = q("SELECT `location`, `about`, `keywords`, `gender` FROM `gcontact` WHERE `nurl` = '%s'",
dbesc(normalise_link($data["url"]))); dbesc(normalise_link($data["url"])));
if ($r) { if (dbm::is_result($gcontacts)) {
logger("Update contact ".$data["url"]); logger("Update contact " . $data["url"] . ' from gcontact');
q("UPDATE `contact` SET `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `id` = %d", q("UPDATE `contact` SET `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `id` = %d",
dbesc($r["location"]), dbesc($r["about"]), dbesc($r["keywords"]), dbesc($gcontacts[0]["location"]), dbesc($gcontacts[0]["about"]), dbesc($gcontacts[0]["keywords"]),
dbesc($r["gender"]), intval($contactid)); dbesc($gcontacts[0]["gender"]), intval($contact_id));
} }
} }
if ((count($contact) > 1) AND ($uid == 0) AND ($contactid != 0) AND ($url != "")) if (count($contacts) > 1 AND $uid == 0 AND $contact_id != 0 AND $url != "") {
q("DELETE FROM `contact` WHERE `nurl` = '%s' AND `id` != %d AND NOT `self`", q("DELETE FROM `contact` WHERE `nurl` = '%s' AND `id` != %d AND NOT `self`",
dbesc(normalise_link($url)), dbesc(normalise_link($url)),
intval($contactid)); intval($contact_id));
}
require_once("Photo.php"); require_once "Photo.php";
update_contact_avatar($data["photo"],$uid,$contactid); update_contact_avatar($data["photo"], $uid, $contact_id);
$r = q("SELECT `addr`, `alias`, `name`, `nick` FROM `contact` WHERE `id` = %d", intval($contactid)); $contacts = q("SELECT `addr`, `alias`, `name`, `nick` FROM `contact` WHERE `id` = %d", intval($contact_id));
// This condition should always be true // This condition should always be true
if (!dbm::is_result($r)) if (!dbm::is_result($contacts)) {
return $contactid; return $contact_id;
}
// Only update if there had something been changed // Only update if there had something been changed
if (($data["addr"] != $r[0]["addr"]) OR if ($data["addr"] != $contacts[0]["addr"] OR
($data["alias"] != $r[0]["alias"]) OR $data["alias"] != $contacts[0]["alias"] OR
($data["name"] != $r[0]["name"]) OR $data["name"] != $contacts[0]["name"] OR
($data["nick"] != $r[0]["nick"])) $data["nick"] != $contacts[0]["nick"]) {
q("UPDATE `contact` SET `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s', q("UPDATE `contact` SET `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s',
`name-date` = '%s', `uri-date` = '%s' WHERE `id` = %d", `name-date` = '%s', `uri-date` = '%s' WHERE `id` = %d",
dbesc($data["addr"]), dbesc($data["addr"]),
@ -649,10 +675,11 @@ function get_contact($url, $uid = 0, $no_update = false) {
dbesc($data["nick"]), dbesc($data["nick"]),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($contactid) intval($contact_id)
); );
}
return $contactid; return $contact_id;
} }
/** /**