friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-06-28 16:11:41 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

gcontact is now updated with the new database functions as well

Browse source
This commit is contained in:
Michael 2017-09-17 08:13:10 +00:00
parent 8d4736c942
commit 926314a24c
1 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
include/socgraph.php
View file

@ -2238,22 +2238,22 @@ function update_gcontact($contact) {
if ($update) { if ($update) {
logger("Update gcontact for ".$contact["url"], LOGGER_DEBUG); logger("Update gcontact for ".$contact["url"], LOGGER_DEBUG);
$condition = array('`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)',
normalise_link($contact["url"]), $contact["generation"]);
$contact["updated"] = dbm::date($contact["updated"]);
q("UPDATE `gcontact` SET `photo` = '%s', `name` = '%s', `nick` = '%s', `addr` = '%s', `network` = '%s', $updated = array('photo' => $contact['photo'], 'name' => $contact['name'],
`birthday` = '%s', `gender` = '%s', `keywords` = '%s', `hide` = %d, `nsfw` = %d, 'nick' => $contact['nick'], 'addr' => $contact['addr'],
`contact-type` = %d, `alias` = '%s', `notify` = '%s', `url` = '%s', 'network' => $contact['network'], 'birthday' => $contact['birthday'],
`location` = '%s', `about` = '%s', `generation` = %d, `updated` = '%s', 'gender' => $contact['gender'], 'keywords' => $contact['keywords'],
`server_url` = '%s', `connect` = '%s' 'hide' => $contact['hide'], 'nsfw' => $contact['nsfw'],
WHERE `nurl` = '%s' AND (`generation` = 0 OR `generation` >= %d)", 'contact-type' => $contact['contact-type'], 'alias' => $contact['alias'],
dbesc($contact["photo"]), dbesc($contact["name"]), dbesc($contact["nick"]), 'notify' => $contact['notify'], 'url' => $contact['url'],
dbesc($contact["addr"]), dbesc($contact["network"]), dbesc($contact["birthday"]), 'location' => $contact['location'], 'about' => $contact['about'],
dbesc($contact["gender"]), dbesc($contact["keywords"]), intval($contact["hide"]), 'generation' => $contact['generation'], 'updated' => $contact['updated'],
intval($contact["nsfw"]), intval($contact["contact-type"]), dbesc($contact["alias"]), 'server_url' => $contact['server_url'], 'connect' => $contact['connect']);
dbesc($contact["notify"]), dbesc($contact["url"]), dbesc($contact["location"]),
dbesc($contact["about"]), intval($contact["generation"]), dbesc(dbm::date($contact["updated"])),
dbesc($contact["server_url"]), dbesc($contact["connect"]),
dbesc(normalise_link($contact["url"])), intval($contact["generation"]));
dba::update('gcontact', $updated, $condition, $fields);
// Now update the contact entry with the user id "0" as well. // Now update the contact entry with the user id "0" as well.
// This is used for the shadow copies of public items. // This is used for the shadow copies of public items.
@ -2261,20 +2261,25 @@ function update_gcontact($contact) {
dbesc(normalise_link($contact["url"]))); dbesc(normalise_link($contact["url"])));
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
logger("Update shadow contact ".$r[0]["id"], LOGGER_DEBUG); logger("Update public contact ".$r[0]["id"], LOGGER_DEBUG);
update_contact_avatar($contact["photo"], 0, $r[0]["id"]); update_contact_avatar($contact["photo"], 0, $r[0]["id"]);
q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', $fields = array('name', 'nick', 'addr',
`network` = '%s', `bd` = '%s', `gender` = '%s', 'network', 'bd', 'gender',
`keywords` = '%s', `alias` = '%s', `contact-type` = %d, 'keywords', 'alias', 'contact-type',
`url` = '%s', `location` = '%s', `about` = '%s' 'url', 'location', 'about');
WHERE `id` = %d", $old_contact = dba::select('contact', $fields, array('id' => $r[0]["id"]), array('limit' => 1));
dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["addr"]),
dbesc($contact["network"]), dbesc($contact["birthday"]), dbesc($contact["gender"]), // Update it with the current values
dbesc($contact["keywords"]), dbesc($contact["alias"]), intval($contact["contact-type"]), $fields = array('name' => $contact['name'], 'nick' => $contact['nick'],
dbesc($contact["url"]), dbesc($contact["location"]), dbesc($contact["about"]), 'addr' => $contact['addr'], 'network' => $contact['network'],
intval($r[0]["id"])); 'bd' => $contact['birthday'], 'gender' => $contact['gender'],
'keywords' => $contact['keywords'], 'alias' => $contact['alias'],
'contact-type' => $contact['contact-type'], 'url' => $contact['url'],
'location' => $contact['location'], 'about' => $contact['about']);
dba::update('contact', $fields, array('id' => $r[0]["id"]), $old_contact);
} }
} }