X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDFRN.php;h=88025b88ca956be4d1247ac7c4f2b86251c230d5;hb=eeadd2f9d61ca1dfd8acf157df5f4b8b06d87b0b;hp=d4ad345626f301cd18a4d772b13e0fbb0d709c9f;hpb=7ffcb25321ce9b8517669c461fe58d90ad6d7ec6;p=friendica.git diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index d4ad345626..88025b88ca 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -10,6 +10,8 @@ namespace Friendica\Protocol; use Friendica\App; use Friendica\Content\OEmbed; +use Friendica\Content\Text\BBCode; +use Friendica\Content\Text\HTML; use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\L10n; @@ -17,11 +19,11 @@ use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBM; use Friendica\Model\Contact; +use Friendica\Model\Event; use Friendica\Model\GContact; use Friendica\Model\Group; use Friendica\Model\Item; use Friendica\Model\Profile; -use Friendica\Model\Term; use Friendica\Model\User; use Friendica\Object\Image; use Friendica\Protocol\OStatus; @@ -29,8 +31,7 @@ use Friendica\Util\Crypto; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; use Friendica\Util\XML; -use Friendica\Content\Text\BBCode; - +use Friendica\Protocol\Diaspora; use dba; use DOMDocument; use DOMXPath; @@ -40,12 +41,8 @@ use HTMLPurifier_Config; require_once 'boot.php'; require_once 'include/dba.php'; require_once "include/enotify.php"; -require_once "include/threads.php"; require_once "include/items.php"; -require_once "include/event.php"; require_once "include/text.php"; -require_once "include/html2bbcode.php"; -require_once "include/bbcode.php"; /** * @brief This class contain functions to create and send DFRN XML files @@ -834,7 +831,7 @@ class DFRN } } if ($r->content) { - XML::addElement($doc, $entry, "content", bbcode($r->content), ["type" => "html"]); + XML::addElement($doc, $entry, "content", BBCode::convert($r->content), ["type" => "html"]); } return $entry; @@ -930,8 +927,9 @@ class DFRN } // Remove the abstract element. It is only locally important. - $body = remove_abstract($body); + $body = BBCode::stripAbstract($body); + $htmlbody = ''; if ($type == 'html') { $htmlbody = $body; @@ -939,7 +937,7 @@ class DFRN $htmlbody = "[b]".$item['title']."[/b]\n\n".$htmlbody; } - $htmlbody = bbcode($htmlbody, false, false, 7); + $htmlbody = BBCode::convert($htmlbody, false, 7); } $author = self::addEntryAuthor($doc, "author", $item["author-link"], $item); @@ -1148,13 +1146,20 @@ class DFRN * @param string $atom Content that will be transmitted * @param bool $dissolve (to be documented) * - * @return int Deliver status. -1 means an error. + * @return int Deliver status. Negative values mean an error. * @todo Add array type-hint for $owner, $contact */ public static function deliver($owner, $contact, $atom, $dissolve = false) { $a = get_app(); + // At first try the Diaspora transport layer + $ret = self::transmit($owner, $contact, $atom); + if ($ret >= 200) { + logger('Delivery via Diaspora transport layer was successfull with status ' . $ret); + return $ret; + } + $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']); if ($contact['duplex'] && $contact['dfrn-id']) { @@ -1354,11 +1359,71 @@ class DFRN return 3; } - if ($contact['term-date'] > NULL_DATE) { - logger("dfrn_deliver: $url back from the dead - removing mark for death"); + $res = XML::parseString($xml); + + if (!isset($res->status)) { + return -11; + } + + if (!empty($res->message)) { + logger('Transmit returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG); + } + + if ($res->status == 200) { Contact::unmarkForArchival($contact); } + return intval($res->status); + } + + /** + * @brief Transmits atom content to the contacts via the Diaspora transport layer + * + * @param array $owner Owner record + * @param array $contact Contact record of the receiver + * @param string $atom Content that will be transmitted + * + * @return int Deliver status. Negative values mean an error. + */ + public static function transmit($owner, $contact, $atom) + { + $a = get_app(); + + // Currently disabled, at first we will not use the batch delivery + // $public_batch = !$items[0]['private']; + $public_batch = false; + + $msg = DFRN::entries($items, $owner); + + $fcontact = Diaspora::personByHandle($contact['addr']); + if (empty($fcontact)) { + logger("unable to find contact details"); + return; + } + + $envelope = Diaspora::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $fcontact['pubkey'], $public_batch); + + $dest_url = ($public_batch ? $fcontact["batch"] : $contact["notify"]); + + $content_type = ($public_batch ? "application/magic-envelope+xml" : "application/json"); + + $xml = Network::post($dest_url, $envelope, ["Content-Type: ".$content_type]); + + $curl_stat = $a->get_curl_code(); + if (!$curl_stat || empty($xml)) { + return -9; // timed out + } + + if (($curl_stat == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) { + return -10; + } + + if (strpos($xml, 'status)) { @@ -1369,6 +1434,10 @@ class DFRN logger('Delivery returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG); } + if ($res->status == 200) { + Contact::unmarkForArchival($contact); + } + return intval($res->status); } @@ -1434,22 +1503,20 @@ class DFRN $author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue; $author["link"] = $xpath->evaluate($element."/atom:uri/text()", $context)->item(0)->nodeValue; - $r = q( - "SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `name-date`, `uri-date`, `addr`, + $contact_old = dba::fetch_first("SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `avatar`, `name-date`, `uri-date`, `addr`, `name`, `nick`, `about`, `location`, `keywords`, `xmpp`, `bdyear`, `bd`, `hidden`, `contact-type` - FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` != '%s'", - intval($importer["uid"]), - dbesc(normalise_link($author["link"])), - dbesc(NETWORK_STATUSNET) + FROM `contact` WHERE `uid` = ? AND `nurl` = ? AND `network` != ?", + $importer["importer_uid"], + normalise_link($author["link"]), + NETWORK_STATUSNET ); - if (DBM::is_result($r)) { - $contact = $r[0]; - $author["contact-id"] = $r[0]["id"]; - $author["network"] = $r[0]["network"]; + if (DBM::is_result($contact_old)) { + $author["contact-id"] = $contact_old["id"]; + $author["network"] = $contact_old["network"]; } else { if (!$onlyfetch) { - logger("Contact ".$author["link"]." wasn't found for user ".$importer["uid"]." XML: ".$xml, LOGGER_DEBUG); + logger("Contact ".$author["link"]." wasn't found for user ".$importer["importer_uid"]." XML: ".$xml, LOGGER_DEBUG); } $author["contact-id"] = $importer["id"]; @@ -1473,7 +1540,7 @@ class DFRN $width = $attributes->textContent; } if ($attributes->name == "updated") { - $contact["avatar-date"] = $attributes->textContent; + $author["avatar-date"] = $attributes->textContent; } } if (($width > 0) && ($href != "")) { @@ -1485,10 +1552,10 @@ class DFRN $author["avatar"] = current($avatarlist); } - if (DBM::is_result($r) && !$onlyfetch) { - logger("Check if contact details for contact " . $r[0]["id"] . " (" . $r[0]["nick"] . ") have to be updated.", LOGGER_DEBUG); + if (DBM::is_result($contact_old) && !$onlyfetch) { + logger("Check if contact details for contact " . $contact_old["id"] . " (" . $contact_old["nick"] . ") have to be updated.", LOGGER_DEBUG); - $poco = ["url" => $contact["url"]]; + $poco = ["url" => $contact_old["url"]]; // When was the last change to name or uri? $name_element = $xpath->query($element . "/atom:name", $context)->item(0); @@ -1547,12 +1614,12 @@ class DFRN // If the "hide" element is present then the profile isn't searchable. $hide = intval($xpath->evaluate($element . "/dfrn:hide/text()", $context)->item(0)->nodeValue == "true"); - logger("Hidden status for contact " . $contact["url"] . ": " . $hide, LOGGER_DEBUG); + logger("Hidden status for contact " . $contact_old["url"] . ": " . $hide, LOGGER_DEBUG); // If the contact isn't searchable then set the contact to "hidden". // Problem: This can be manually overridden by the user. if ($hide) { - $contact["hidden"] = true; + $contact_old["hidden"] = true; } // Save the keywords into the contact table @@ -1567,8 +1634,6 @@ class DFRN } // "dfrn:birthday" contains the birthday converted to UTC - $old_bdyear = $contact["bdyear"]; - $birthday = $xpath->evaluate($element . "/dfrn:birthday/text()", $context)->item(0)->nodeValue; if (strtotime($birthday) > time()) { @@ -1592,15 +1657,15 @@ class DFRN $poco["bd"] = $value; } - $contact = array_merge($contact, $poco); + $contact = array_merge($contact_old, $poco); - if ($old_bdyear != $contact["bdyear"]) { + if ($contact_old["bdyear"] != $contact["bdyear"]) { self::birthdayEvent($contact, $birthday); } // Get all field names $fields = []; - foreach ($r[0] as $field => $data) { + foreach ($contact_old as $field => $data) { $fields[$field] = $data; } @@ -1608,21 +1673,23 @@ class DFRN unset($fields["uid"]); unset($fields["url"]); unset($fields["avatar-date"]); + unset($fields["avatar"]); unset($fields["name-date"]); unset($fields["uri-date"]); + $update = false; // Update check for this field has to be done differently $datefields = ["name-date", "uri-date"]; foreach ($datefields as $field) { - if (strtotime($contact[$field]) > strtotime($r[0][$field])) { - logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $r[0][$field] . "'", LOGGER_DEBUG); + if (strtotime($contact[$field]) > strtotime($contact_old[$field])) { + logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $contact_old[$field] . "'", LOGGER_DEBUG); $update = true; } } foreach ($fields as $field => $data) { - if ($contact[$field] != $r[0][$field]) { - logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $r[0][$field] . "'", LOGGER_DEBUG); + if ($contact[$field] != $contact_old[$field]) { + logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $contact_old[$field] . "'", LOGGER_DEBUG); $update = true; } } @@ -1644,10 +1711,10 @@ class DFRN } Contact::updateAvatar( - $author["avatar"], - $importer["uid"], - $contact["id"], - (strtotime($contact["avatar-date"]) > strtotime($r[0]["avatar-date"])) + $author['avatar'], + $importer['importer_uid'], + $contact['id'], + (strtotime($contact['avatar-date']) > strtotime($contact_old['avatar-date']) || ($author['avatar'] != $contact_old['avatar'])) ); /* @@ -1663,10 +1730,10 @@ class DFRN $poco["contact-type"] = $contact["contact-type"]; $gcid = GContact::update($poco); - GContact::link($gcid, $importer["uid"], $contact["id"]); + GContact::link($gcid, $importer["importer_uid"], $contact["id"]); } - return($author); + return $author; } /** @@ -1746,7 +1813,7 @@ class DFRN $msg["contact-id"] = $importer["id"]; $msg["uri"] = $xpath->query("dfrn:id/text()", $mail)->item(0)->nodeValue; $msg["parent-uri"] = $xpath->query("dfrn:in-reply-to/text()", $mail)->item(0)->nodeValue; - $msg["created"] = $xpath->query("dfrn:sentdate/text()", $mail)->item(0)->nodeValue; + $msg["created"] = DateTimeFormat::utc($xpath->query("dfrn:sentdate/text()", $mail)->item(0)->nodeValue); $msg["title"] = $xpath->query("dfrn:subject/text()", $mail)->item(0)->nodeValue; $msg["body"] = $xpath->query("dfrn:content/text()", $mail)->item(0)->nodeValue; $msg["seen"] = 0; @@ -2084,15 +2151,12 @@ class DFRN return false; } - $fields = ['title' => $item["title"], 'body' => $item["body"], - 'tag' => $item["tag"], 'changed' => DateTimeFormat::utcNow(), + $fields = ['title' => defaults($item, 'title', ''), 'body' => defaults($item, 'body', ''), + 'tag' => defaults($item, 'tag', ''), 'changed' => DateTimeFormat::utcNow(), 'edited' => DateTimeFormat::utc($item["edited"])]; $condition = ["`uri` = ? AND `uid` IN (0, ?)", $item["uri"], $importer["importer_uid"]]; - dba::update('item', $fields, $condition); - - Term::insertFromTagFieldByItemUri($item["uri"], $importer["importer_uid"]); - Item::updateThreadFromUri($item["uri"], $importer["importer_uid"]); + Item::update($fields, $condition); $changed = true; @@ -2329,13 +2393,9 @@ class DFRN // extract tag, if not duplicate, add to parent item if ($xo->content) { - if (!(stristr($r[0]["tag"], trim($xo->content)))) { - q( - "UPDATE `item` SET `tag` = '%s' WHERE `id` = %d", - dbesc($r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'), - intval($r[0]["id"]) - ); - Term::insertFromTagFieldByItemId($r[0]["id"]); + if (!stristr($r[0]["tag"], trim($xo->content))) { + $tag = $r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'; + Item::update(['tag' => $tag], ['id' => $r[0]["id"]]); } } } @@ -2413,17 +2473,13 @@ class DFRN $item["edited"] = $xpath->query("atom:updated/text()", $entry)->item(0)->nodeValue; - $current = q( - "SELECT `id`, `uid`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($item["uri"]), - intval($importer["importer_uid"]) + $current = dba::selectFirst('item', + ['id', 'uid', 'edited', 'body'], + ['uri' => $item["uri"], 'uid' => $importer["importer_uid"]] ); - // Is there an existing item? - if (DBM::is_result($current) && self::isEditedTimestampNewer($current[0], $item) - && (DateTimeFormat::utc($item["edited"]) < $current[0]["edited"]) - ) { - logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG); + if (DBM::is_result($current) && !self::isEditedTimestampNewer($current, $item)) { + logger("Item ".$item["uri"]." (".$item['edited'].") already existed.", LOGGER_DEBUG); return; } @@ -2470,7 +2526,7 @@ class DFRN $purifier = new HTMLPurifier($config); $item['body'] = $purifier->purify($item['body']); - $item['body'] = @html2bbcode($item['body']); + $item['body'] = @HTML::toBBCode($item['body']); } /// @todo We should check for a repeated post and if we know the repeated author. @@ -2630,11 +2686,11 @@ class DFRN // Is it an event? if ($item["object-type"] == ACTIVITY_OBJ_EVENT) { logger("Item ".$item["uri"]." seems to contain an event.", LOGGER_DEBUG); - $ev = bbtoevent($item["body"]); + $ev = Event::fromBBCode($item["body"]); if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) { logger("Event in item ".$item["uri"]." was found.", LOGGER_DEBUG); $ev["cid"] = $importer["id"]; - $ev["uid"] = $importer["uid"]; + $ev["uid"] = $importer["importer_uid"]; $ev["uri"] = $item["uri"]; $ev["edited"] = $item["edited"]; $ev["private"] = $item["private"]; @@ -2643,13 +2699,13 @@ class DFRN $r = q( "SELECT `id` FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($item["uri"]), - intval($importer["uid"]) + intval($importer["importer_uid"]) ); if (DBM::is_result($r)) { $ev["id"] = $r[0]["id"]; } - $event_id = event_store($ev); + $event_id = Event::store($ev); logger("Event ".$event_id." was stored", LOGGER_DEBUG); return; } @@ -2663,7 +2719,7 @@ class DFRN // Update content if 'updated' changes if (DBM::is_result($current)) { - if (self::updateContent($r[0], $item, $importer, $entrytype)) { + if (self::updateContent($current, $item, $importer, $entrytype)) { logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG); } else { logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG); @@ -2698,6 +2754,14 @@ class DFRN return true; } } else { // $entrytype == DFRN_TOP_LEVEL + if ($importer["readonly"]) { + logger('ignoring read-only contact '.$importer["id"]); + return; + } + if ($importer["uid"] == 0) { + logger("Contact ".$importer["id"]." isn't known to user ".$importer["importer_uid"].". The post will be ignored.", LOGGER_DEBUG); + return; + } if (!link_compare($item["owner-link"], $importer["url"])) { /* * The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, @@ -2742,126 +2806,54 @@ class DFRN private static function processDeletion($xpath, $deletion, $importer) { logger("Processing deletions"); - + $uri = null; foreach ($deletion->attributes as $attributes) { if ($attributes->name == "ref") { $uri = $attributes->textContent; } - if ($attributes->name == "when") { - $when = $attributes->textContent; - } - } - if ($when) { - $when = DateTimeFormat::utc($when); - } else { - $when = DateTimeFormat::utcNow(); } if (!$uri || !$importer["id"]) { return false; } - /// @todo Only select the used fields - $r = q( - "SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id` - WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1", - dbesc($uri), - intval($importer["uid"]), - intval($importer["id"]) - ); - if (!DBM::is_result($r)) { - logger("Item with uri " . $uri . " from contact " . $importer["id"] . " for user " . $importer["uid"] . " wasn't found.", LOGGER_DEBUG); + $condition = ["`uri` = ? AND `uid` = ? AND NOT `file` LIKE '%[%'", $uri, $importer["importer_uid"]]; + $item = dba::selectFirst('item', ['id', 'parent', 'contact-id'], $condition); + if (!DBM::is_result($item)) { + logger("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " wasn't found.", LOGGER_DEBUG); return; - } else { - $item = $r[0]; + } - $entrytype = self::getEntryType($importer, $item); + // When it is a starting post it has to belong to the person that wants to delete it + if (($item['id'] == $item['parent']) && ($item['contact-id'] != $importer["id"])) { + logger("Item with uri " . $uri . " don't belong to contact " . $importer["id"] . " - ignoring deletion.", LOGGER_DEBUG); + return; + } - if (!$item["deleted"]) { - logger('deleting item '.$item["id"].' uri='.$uri, LOGGER_DEBUG); - } else { + // Comments can be deleted by the thread owner or comment owner + if (($item['id'] != $item['parent']) && ($item['contact-id'] != $importer["id"])) { + $condition = ['id' => $item['parent'], 'contact-id' => $importer["id"]]; + if (!dba::exists('item', $condition)) { + logger("Item with uri " . $uri . " wasn't found or mustn't be deleted by contact " . $importer["id"] . " - ignoring deletion.", LOGGER_DEBUG); return; } + } - if ($item["object-type"] == ACTIVITY_OBJ_EVENT) { - logger("Deleting event ".$item["event-id"], LOGGER_DEBUG); - event_delete($item["event-id"]); - } - - if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) { - $xo = XML::parseString($item["object"], false); - $xt = XML::parseString($item["target"], false); - - if ($xt->type == ACTIVITY_OBJ_NOTE) { - $i = q( - "SELECT `id`, `contact-id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($xt->id), - intval($importer["importer_uid"]) - ); - if (DBM::is_result($i)) { - // For tags, the owner cannot remove the tag on the author's copy of the post. - - $owner_remove = (($item["contact-id"] == $i[0]["contact-id"]) ? true: false); - $author_remove = (($item["origin"] && $item["self"]) ? true : false); - $author_copy = (($item["origin"]) ? true : false); - - if ($owner_remove && $author_copy) { - return; - } - if ($author_remove || $owner_remove) { - $tags = explode(',', $i[0]["tag"]); - $newtags = []; - if (count($tags)) { - foreach ($tags as $tag) { - if (trim($tag) !== trim($xo->body)) { - $newtags[] = trim($tag); - } - } - } - q( - "UPDATE `item` SET `tag` = '%s' WHERE `id` = %d", - dbesc(implode(',', $newtags)), - intval($i[0]["id"]) - ); - Term::insertFromTagFieldByItemId($i[0]["id"]); - } - } - } - } + $entrytype = self::getEntryType($importer, $item); - if ($entrytype == DFRN_TOP_LEVEL) { - $r = q( - "UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', - `body` = '', `title` = '' - WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)", - dbesc($when), - dbesc(DateTimeFormat::utcNow()), - dbesc($uri), - intval($importer["uid"]) - ); - Term::insertFromTagFieldByItemUri($uri, $importer["uid"]); - Term::insertFromFileFieldByItemUri($uri, $importer["uid"]); - Item::updateThreadFromUri($uri, $importer["uid"]); - } else { - $r = q( - "UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', - `body` = '', `title` = '' - WHERE `uri` = '%s' AND `uid` IN (0, %d)", - dbesc($when), - dbesc(DateTimeFormat::utcNow()), - dbesc($uri), - intval($importer["uid"]) - ); - Term::insertFromTagFieldByItemUri($uri, $importer["uid"]); - Term::insertFromFileFieldByItemUri($uri, $importer["uid"]); - Item::updateThreadFromUri($uri, $importer["importer_uid"]); + if (!$item["deleted"]) { + logger('deleting item '.$item["id"].' uri='.$uri, LOGGER_DEBUG); + } else { + return; + } - // if this is a relayed delete, propagate it to other recipients + Item::deleteById($item["id"]); - if ($entrytype == DFRN_REPLY_RC) { - logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG); - Worker::add(PRIORITY_HIGH, "Notifier", "drop", $item["id"]); - } + if ($entrytype != DFRN_TOP_LEVEL) { + // if this is a relayed delete, propagate it to other recipients + if ($entrytype == DFRN_REPLY_RC) { + logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG); + Worker::add(PRIORITY_HIGH, "Notifier", "drop", $item["id"]); } } } @@ -2897,7 +2889,7 @@ class DFRN $xpath->registerNamespace("statusnet", NAMESPACE_STATUSNET); $header = []; - $header["uid"] = $importer["uid"]; + $header["uid"] = $importer["importer_uid"]; $header["network"] = NETWORK_DFRN; $header["type"] = "remote"; $header["wall"] = 0; @@ -2916,7 +2908,7 @@ class DFRN self::fetchauthor($xpath, $doc->firstChild, $importer, "dfrn:owner", false, $xml); } - logger("Import DFRN message for user " . $importer["uid"] . " from contact " . $importer["id"], LOGGER_DEBUG); + logger("Import DFRN message for user " . $importer["importer_uid"] . " from contact " . $importer["id"], LOGGER_DEBUG); // The account type is new since 3.5.1 if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) { @@ -2942,21 +2934,16 @@ class DFRN self::processRelocation($xpath, $relocation, $importer); } - if ($importer["readonly"]) { - // We aren't receiving stuff from this person. But we will quietly ignore them - // rather than a blatant "go away" message. - logger('ignoring contact '.$importer["id"]); - return 403; - } - - $mails = $xpath->query("/atom:feed/dfrn:mail"); - foreach ($mails as $mail) { - self::processMail($xpath, $mail, $importer); - } + if (($importer["uid"] != 0) && !$importer["readonly"]) { + $mails = $xpath->query("/atom:feed/dfrn:mail"); + foreach ($mails as $mail) { + self::processMail($xpath, $mail, $importer); + } - $suggestions = $xpath->query("/atom:feed/dfrn:suggest"); - foreach ($suggestions as $suggestion) { - self::processSuggestion($xpath, $suggestion, $importer); + $suggestions = $xpath->query("/atom:feed/dfrn:suggest"); + foreach ($suggestions as $suggestion) { + self::processSuggestion($xpath, $suggestion, $importer); + } } $deletions = $xpath->query("/atom:feed/at:deleted-entry"); @@ -2984,7 +2971,7 @@ class DFRN self::processEntry($header, $xpath, $entry, $importer, $xml); } } - logger("Import done for user " . $importer["uid"] . " from contact " . $importer["id"], LOGGER_DEBUG); + logger("Import done for user " . $importer["importer_uid"] . " from contact " . $importer["id"], LOGGER_DEBUG); return 200; }