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

Fix https://github.com/friendica/friendica/issues/7298#issuecomment-522215746

Browse source
This commit is contained in:
Philipp Holzer 2019-08-18 14:51:11 +02:00
parent 1a2628f210
commit 9d3ad8f435
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
1 changed files with 56 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
src/Model/GContact.php
View file

@ -746,109 +746,115 @@ class GContact
return false; return false;
} }
$public_contact = q( $public_contact = DBA::selectFirst('gcontact', [
"SELECT `name`, `nick`, `photo`, `location`, `about`, `addr`, `generation`, `birthday`, `gender`, `keywords`, 'name', 'nick', 'photo', 'location', 'about', 'addr', 'generation', 'birthday', 'gender', 'keywords',
`contact-type`, `hide`, `nsfw`, `network`, `alias`, `notify`, `server_url`, `connect`, `updated`, `url` 'contact-type', 'hide', 'nsfw', 'network', 'alias', 'notify', 'server_url', 'connect', 'updated', 'url'
FROM `gcontact` WHERE `id` = %d LIMIT 1", ], ['id' => $gcontact_id]);
intval($gcontact_id)
); // If nothing found, return false
// @see https://github.com/friendica/friendica/issues/7298#issuecomment-522215746
if (!DBA::isResult($public_contact)) {
return false;
}
// Get all field names // Get all field names
$fields = []; $fields = [];
foreach ($public_contact[0] as $field => $data) { foreach ($public_contact as $field => $data) {
$fields[$field] = $data; $fields[$field] = $data;
} }
unset($fields["url"]); unset($fields['url']);
unset($fields["updated"]); unset($fields['updated']);
unset($fields["hide"]); unset($fields['hide']);
// Bugfix: We had an error in the storing of keywords which lead to the "0" // Bugfix: We had an error in the storing of keywords which lead to the "0"
// This value is still transmitted via poco. // This value is still transmitted via poco.
if (!empty($contact["keywords"]) && ($contact["keywords"] == "0")) { if (isset($contact['keywords']) && ($contact['keywords'] == '0')) {
unset($contact["keywords"]); unset($contact['keywords']);
} }
if (!empty($public_contact[0]["keywords"]) && ($public_contact[0]["keywords"] == "0")) { if (isset($public_contact['keywords']) && ($public_contact['keywords'] == '0')) {
$public_contact[0]["keywords"] = ""; $public_contact['keywords'] = '';
} }
// assign all unassigned fields from the database entry // assign all unassigned fields from the database entry
foreach ($fields as $field => $data) { foreach ($fields as $field => $data) {
if (!isset($contact[$field]) || ($contact[$field] == "")) { if (empty($contact[$field])) {
$contact[$field] = $public_contact[0][$field]; $contact[$field] = $public_contact[$field];
} }
} }
if (!isset($contact["hide"])) { if (!isset($contact['hide'])) {
$contact["hide"] = $public_contact[0]["hide"]; $contact['hide'] = $public_contact['hide'];
} }
$fields["hide"] = $public_contact[0]["hide"]; $fields['hide'] = $public_contact['hide'];
if ($contact["network"] == Protocol::STATUSNET) { if ($contact['network'] == Protocol::STATUSNET) {
$contact["network"] = Protocol::OSTATUS; $contact['network'] = Protocol::OSTATUS;
} }
// Replace alternate OStatus user format with the primary one // Replace alternate OStatus user format with the primary one
self::fixAlternateContactAddress($contact); self::fixAlternateContactAddress($contact);
if (!isset($contact["updated"])) { if (!isset($contact['updated'])) {
$contact["updated"] = DateTimeFormat::utcNow(); $contact['updated'] = DateTimeFormat::utcNow();
} }
if ($contact["network"] == Protocol::TWITTER) { if ($contact['network'] == Protocol::TWITTER) {
$contact["server_url"] = 'http://twitter.com'; $contact['server_url'] = 'http://twitter.com';
} }
if ($contact["server_url"] == "") { if (empty($contact['server_url'])) {
$data = Probe::uri($contact["url"]); $data = Probe::uri($contact['url']);
if ($data["network"] != Protocol::PHANTOM) { if ($data['network'] != Protocol::PHANTOM) {
$contact["server_url"] = $data['baseurl']; $contact['server_url'] = $data['baseurl'];
} }
} else { } else {
$contact["server_url"] = Strings::normaliseLink($contact["server_url"]); $contact['server_url'] = Strings::normaliseLink($contact['server_url']);
} }
if (($contact["addr"] == "") && ($contact["server_url"] != "") && ($contact["nick"] != "")) { if (empty($contact['addr']) && !empty($contact['server_url']) && !empty($contact['nick'])) {
$hostname = str_replace("http://", "", $contact["server_url"]); $hostname = str_replace('http://', '', $contact['server_url']);
$contact["addr"] = $contact["nick"]."@".$hostname; $contact['addr'] = $contact['nick'] . '@' . $hostname;
} }
// Check if any field changed // Check if any field changed
$update = false; $update = false;
unset($fields["generation"]); unset($fields['generation']);
if ((($contact["generation"] > 0) && ($contact["generation"] <= $public_contact[0]["generation"])) || ($public_contact[0]["generation"] == 0)) { if ((($contact['generation'] > 0) && ($contact['generation'] <= $public_contact['generation'])) || ($public_contact['generation'] == 0)) {
foreach ($fields as $field => $data) { foreach ($fields as $field => $data) {
if ($contact[$field] != $public_contact[0][$field]) { if ($contact[$field] != $public_contact[$field]) {
Logger::log("Difference for contact ".$contact["url"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$public_contact[0][$field]."'", Logger::DEBUG); Logger::debug('Difference found.', ['contact' => $contact["url"], 'field' => $field, 'new' => $contact[$field], 'old' => $public_contact[$field]]);
$update = true; $update = true;
} }
} }
if ($contact["generation"] < $public_contact[0]["generation"]) { if ($contact['generation'] < $public_contact['generation']) {
Logger::log("Difference for contact ".$contact["url"]." in field 'generation'. new value: '".$contact["generation"]."', old value '".$public_contact[0]["generation"]."'", Logger::DEBUG); Logger::debug('Difference found.', ['contact' => $contact["url"], 'field' => 'generation', 'new' => $contact['generation'], 'old' => $public_contact['generation']]);
$update = true; $update = true;
} }
} }
if ($update) { if ($update) {
Logger::log("Update gcontact for ".$contact["url"], Logger::DEBUG); Logger::debug('Update gcontact.', ['contact' => $contact['url']]);
$condition = ['`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)', $condition = ['`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)',
Strings::normaliseLink($contact["url"]), $contact["generation"]]; Strings::normaliseLink($contact["url"]), $contact["generation"]];
$contact["updated"] = DateTimeFormat::utc($contact["updated"]); $contact["updated"] = DateTimeFormat::utc($contact["updated"]);
$updated = ['photo' => $contact['photo'], 'name' => $contact['name'], $updated = [
'nick' => $contact['nick'], 'addr' => $contact['addr'], 'photo' => $contact['photo'], 'name' => $contact['name'],
'network' => $contact['network'], 'birthday' => $contact['birthday'], 'nick' => $contact['nick'], 'addr' => $contact['addr'],
'gender' => $contact['gender'], 'keywords' => $contact['keywords'], 'network' => $contact['network'], 'birthday' => $contact['birthday'],
'hide' => $contact['hide'], 'nsfw' => $contact['nsfw'], 'gender' => $contact['gender'], 'keywords' => $contact['keywords'],
'contact-type' => $contact['contact-type'], 'alias' => $contact['alias'], 'hide' => $contact['hide'], 'nsfw' => $contact['nsfw'],
'notify' => $contact['notify'], 'url' => $contact['url'], 'contact-type' => $contact['contact-type'], 'alias' => $contact['alias'],
'location' => $contact['location'], 'about' => $contact['about'], 'notify' => $contact['notify'], 'url' => $contact['url'],
'generation' => $contact['generation'], 'updated' => $contact['updated'], 'location' => $contact['location'], 'about' => $contact['about'],
'server_url' => $contact['server_url'], 'connect' => $contact['connect']]; 'generation' => $contact['generation'], 'updated' => $contact['updated'],
'server_url' => $contact['server_url'], 'connect' => $contact['connect']
];
DBA::update('gcontact', $updated, $condition, $fields); DBA::update('gcontact', $updated, $condition, $fields);
} }