strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update function

Browse source 
Update the update function
This commit is contained in:
Adam Magness 2018-01-09 09:44:22 -05:00
parent 878ce3b858
commit fd1515eff4
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/Model/Contact.php
View file

@ -16,6 +16,7 @@ use Friendica\Model\Photo;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
use Friendica\Protocol\DFRN; use Friendica\Protocol\DFRN;
use Friendica\Protocol\OStatus; use Friendica\Protocol\OStatus;
use Friendica\Protocol\PortableContact;
use Friendica\Protocol\Salmon; use Friendica\Protocol\Salmon;
use dba; use dba;
@ -1014,33 +1015,33 @@ class Contact extends BaseObject
* @param integer $id contact id * @param integer $id contact id
* @return boolean * @return boolean
*/ */
function update_contact($id) public static function update($id)
{ {
/* /*
Warning: Never ever fetch the public key via Probe::uri and write it into the contacts. Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
This will reliably kill your communication with Friendica contacts. This will reliably kill your communication with Friendica contacts.
*/ */
$r = q("SELECT `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `network` FROM `contact` WHERE `id` = %d", intval($id)); $r = dba::select('contact', ['url', 'nurl', 'addr', 'alias', 'batch', 'notify', 'poll', 'poco', 'network'], ['id' => $id], ['limit' => 1]);
if (!$r) { if (!DBM::is_result($r)) {
return false; return false;
} }
$ret = Probe::uri($r[0]["url"]); $ret = Probe::uri($r["url"]);
// If Probe::uri fails the network code will be different // If Probe::uri fails the network code will be different
if ($ret["network"] != $r[0]["network"]) { if ($ret["network"] != $r["network"]) {
return false; return false;
} }
$update = false; $update = false;
// make sure to not overwrite existing values with blank entries // make sure to not overwrite existing values with blank entries
foreach ($ret AS $key => $val) { foreach ($ret as $key => $val) {
if (isset($r[0][$key]) && ($r[0][$key] != "") && ($val == "")) if (isset($r[$key]) && ($r[$key] != "") && ($val == ""))
$ret[$key] = $r[0][$key]; $ret[$key] = $r[$key];
if (isset($r[0][$key]) && ($ret[$key] != $r[0][$key])) if (isset($r[$key]) && ($ret[$key] != $r[$key]))
$update = true; $update = true;
} }
@ -1048,16 +1049,19 @@ class Contact extends BaseObject
return true; return true;
} }
q("UPDATE `contact` SET `url` = '%s', `nurl` = '%s', `addr` = '%s', `alias` = '%s', `batch` = '%s', `notify` = '%s', `poll` = '%s', `poco` = '%s' WHERE `id` = %d", dba::update(
dbesc($ret['url']), 'contact',
dbesc(normalise_link($ret['url'])), [
dbesc($ret['addr']), 'url' => $ret['url'],
dbesc($ret['alias']), 'nurl' => normalise_link($ret['url']),
dbesc($ret['batch']), 'addr' => $ret['addr'],
dbesc($ret['notify']), 'alias' => $ret['alias'],
dbesc($ret['poll']), 'batch' => $ret['batch'],
dbesc($ret['poco']), 'notify' => $ret['notify'],
intval($id) 'poll' => $ret['poll'],
'poco' => $ret['poco']
],
['id' => $id]
); );
// Update the corresponding gcontact entry // Update the corresponding gcontact entry