bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Fix for author-thumb/owner-thumb - DFRN: Relocate stuff

Browse source
This commit is contained in:
Michael Vogel 2016-06-19 20:01:25 +02:00
parent 91db7a549c
commit 0adff6f6b8
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/conversation.php
View file

@ -443,7 +443,7 @@ function item_joins() {
return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND
NOT `contact`.`blocked` AND NOT `contact`.`pending` NOT `contact`.`blocked` AND NOT `contact`.`pending`
LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`author-id`"; LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id`";
} }
/** /**

17
include/dfrn.php
View file

@ -369,6 +369,7 @@ class dfrn {
xml::add_element($doc, $relocate, "dfrn:url", $owner['url']); xml::add_element($doc, $relocate, "dfrn:url", $owner['url']);
xml::add_element($doc, $relocate, "dfrn:name", $owner['name']); xml::add_element($doc, $relocate, "dfrn:name", $owner['name']);
xml::add_element($doc, $relocate, "dfrn:addr", $owner['addr']); xml::add_element($doc, $relocate, "dfrn:addr", $owner['addr']);
xml::add_element($doc, $relocate, "dfrn:avatar", $owner['avatar']);
xml::add_element($doc, $relocate, "dfrn:photo", $photos[4]); xml::add_element($doc, $relocate, "dfrn:photo", $photos[4]);
xml::add_element($doc, $relocate, "dfrn:thumb", $photos[5]); xml::add_element($doc, $relocate, "dfrn:thumb", $photos[5]);
xml::add_element($doc, $relocate, "dfrn:micro", $photos[6]); xml::add_element($doc, $relocate, "dfrn:micro", $photos[6]);
@ -1548,6 +1549,7 @@ class dfrn {
$relocate["url"] = $xpath->query("dfrn:url/text()", $relocation)->item(0)->nodeValue; $relocate["url"] = $xpath->query("dfrn:url/text()", $relocation)->item(0)->nodeValue;
$relocate["addr"] = $xpath->query("dfrn:addr/text()", $relocation)->item(0)->nodeValue; $relocate["addr"] = $xpath->query("dfrn:addr/text()", $relocation)->item(0)->nodeValue;
$relocate["name"] = $xpath->query("dfrn:name/text()", $relocation)->item(0)->nodeValue; $relocate["name"] = $xpath->query("dfrn:name/text()", $relocation)->item(0)->nodeValue;
$relocate["avatar"] = $xpath->query("dfrn:avatar/text()", $relocation)->item(0)->nodeValue;
$relocate["photo"] = $xpath->query("dfrn:photo/text()", $relocation)->item(0)->nodeValue; $relocate["photo"] = $xpath->query("dfrn:photo/text()", $relocation)->item(0)->nodeValue;
$relocate["thumb"] = $xpath->query("dfrn:thumb/text()", $relocation)->item(0)->nodeValue; $relocate["thumb"] = $xpath->query("dfrn:thumb/text()", $relocation)->item(0)->nodeValue;
$relocate["micro"] = $xpath->query("dfrn:micro/text()", $relocation)->item(0)->nodeValue; $relocate["micro"] = $xpath->query("dfrn:micro/text()", $relocation)->item(0)->nodeValue;
@ -1557,6 +1559,9 @@ class dfrn {
$relocate["poll"] = $xpath->query("dfrn:poll/text()", $relocation)->item(0)->nodeValue; $relocate["poll"] = $xpath->query("dfrn:poll/text()", $relocation)->item(0)->nodeValue;
$relocate["sitepubkey"] = $xpath->query("dfrn:sitepubkey/text()", $relocation)->item(0)->nodeValue; $relocate["sitepubkey"] = $xpath->query("dfrn:sitepubkey/text()", $relocation)->item(0)->nodeValue;
if (($relocate["avatar"] == "") AND ($relocate["photo"] != ""))
$relocate["avatar"] = $relocate["photo"];
if ($relocate["addr"] == "") if ($relocate["addr"] == "")
$relocate["addr"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$3@$2", $relocate["url"]); $relocate["addr"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$3@$2", $relocate["url"]);
@ -1583,7 +1588,7 @@ class dfrn {
`server_url` = '%s' `server_url` = '%s'
WHERE `nurl` = '%s';", WHERE `nurl` = '%s';",
dbesc($relocate["name"]), dbesc($relocate["name"]),
dbesc($relocate["photo"]), dbesc($relocate["avatar"]),
dbesc($relocate["url"]), dbesc($relocate["url"]),
dbesc(normalise_link($relocate["url"])), dbesc(normalise_link($relocate["url"])),
dbesc($relocate["addr"]), dbesc($relocate["addr"]),
@ -1595,9 +1600,7 @@ class dfrn {
// Update the contact table. We try to find every entry. // Update the contact table. We try to find every entry.
$x = q("UPDATE `contact` SET $x = q("UPDATE `contact` SET
`name` = '%s', `name` = '%s',
`photo` = '%s', `avatar` = '%s',
`thumb` = '%s',
`micro` = '%s',
`url` = '%s', `url` = '%s',
`nurl` = '%s', `nurl` = '%s',
`addr` = '%s', `addr` = '%s',
@ -1608,9 +1611,7 @@ class dfrn {
`site-pubkey` = '%s' `site-pubkey` = '%s'
WHERE (`id` = %d AND `uid` = %d) OR (`nurl` = '%s');", WHERE (`id` = %d AND `uid` = %d) OR (`nurl` = '%s');",
dbesc($relocate["name"]), dbesc($relocate["name"]),
dbesc($relocate["photo"]), dbesc($relocate["avatar"]),
dbesc($relocate["thumb"]),
dbesc($relocate["micro"]),
dbesc($relocate["url"]), dbesc($relocate["url"]),
dbesc(normalise_link($relocate["url"])), dbesc(normalise_link($relocate["url"])),
dbesc($relocate["addr"]), dbesc($relocate["addr"]),
@ -1623,6 +1624,8 @@ class dfrn {
intval($importer["importer_uid"]), intval($importer["importer_uid"]),
dbesc(normalise_link($old["url"]))); dbesc(normalise_link($old["url"])));
update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
if ($x === false) if ($x === false)
return false; return false;