diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 60daa378c8..79fa000f17 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -1556,6 +1556,7 @@ class DFRN logger("Contact ".$author["link"]." wasn't found for user ".$importer["importer_uid"]." XML: ".$xml, LOGGER_DEBUG); } + $author["contact-unknown"] = true; $author["contact-id"] = $importer["id"]; $author["network"] = $importer["network"]; $onlyfetch = true; @@ -2431,6 +2432,8 @@ class DFRN // Fetch the owner $owner = self::fetchauthor($xpath, $entry, $importer, "dfrn:owner", true); + $owner_unknown = (isset($owner["contact-unknown"]) && $owner["contact-unknown"]); + $item["owner-link"] = $owner["link"]; $item["owner-id"] = Contact::getIdForURL($owner["link"], 0); @@ -2626,7 +2629,7 @@ class DFRN } // Is it an event? - if ($item["object-type"] == ACTIVITY_OBJ_EVENT) { + if (($item["object-type"] == ACTIVITY_OBJ_EVENT) && !$owner_unknown) { logger("Item ".$item["uri"]." seems to contain an event.", LOGGER_DEBUG); $ev = Event::fromBBCode($item["body"]); if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) { @@ -2659,6 +2662,13 @@ class DFRN return; } + // This check is done here to be able to receive connection requests in "processVerbs" + if (($entrytype == DFRN::TOP_LEVEL) && $owner_unknown) { + logger("Item won't be stored because user " . $importer["importer_uid"] . " doesn't follow " . $item["owner-link"] . ".", LOGGER_DEBUG); + return; + } + + // Update content if 'updated' changes if (DBM::is_result($current)) { if (self::updateContent($current, $item, $importer, $entrytype)) {