Merge pull request #6181 from JonnyTischbein/feature_admin_subsubpages

[friendica.git] / src / Protocol / Feed.php

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 7bae9ef588894e6f7e467e7d823818933a33914a..5939e5ce1a929b96c00f0fc21b642acab4856106 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -9,6 +9,8 @@ namespace Friendica\Protocol;
 use DOMDocument;
 use DOMXPath;
 use Friendica\Content\Text\HTML;
+use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
@@ -39,12 +41,12 @@ class Feed {
                $a = get_app();
 
                if (!$simulate) {
-                       logger("Import Atom/RSS feed '".$contact["name"]."' (Contact ".$contact["id"].") for user ".$importer["uid"], LOGGER_DEBUG);
+                       Logger::log("Import Atom/RSS feed '".$contact["name"]."' (Contact ".$contact["id"].") for user ".$importer["uid"], Logger::DEBUG);
                } else {
-                       logger("Test Atom/RSS feed", LOGGER_DEBUG);
+                       Logger::log("Test Atom/RSS feed", Logger::DEBUG);
                }
                if (empty($xml)) {
-                       logger('XML is empty.', LOGGER_DEBUG);
+                       Logger::log('XML is empty.', Logger::DEBUG);
                        return;
                }
 
@@ -121,7 +123,13 @@ class Feed {
                                $author["author-name"] = $value;
                        }
                        if ($simulate) {
-                               $author["author-id"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:uri/text()');
+                               $author["author-id"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:id/text()');
+
+                               // See https://tools.ietf.org/html/rfc4287#section-3.2.2
+                               $value = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()');
+                               if ($value != "") {
+                                       $author["author-link"] = $value;
+                               }
 
                                $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()');
                                if ($value != "") {
@@ -187,7 +195,7 @@ class Feed {
 
                $header = [];
                $header["uid"] = $importer["uid"];
-               $header["network"] = NETWORK_FEED;
+               $header["network"] = Protocol::FEED;
                $header["wall"] = 0;
                $header["origin"] = 0;
                $header["gravity"] = GRAVITY_PARENT;
@@ -198,7 +206,7 @@ class Feed {
                $header["contact-id"] = $contact["id"];
 
                if (!is_object($entries)) {
-                       logger("There are no entries in this feed.", LOGGER_DEBUG);
+                       Logger::log("There are no entries in this feed.", Logger::DEBUG);
                        return;
                }
 
@@ -244,10 +252,10 @@ class Feed {
 
                        if (!$simulate) {
                                $condition = ["`uid` = ? AND `uri` = ? AND `network` IN (?, ?)",
-                                       $importer["uid"], $item["uri"], NETWORK_FEED, NETWORK_DFRN];
+                                       $importer["uid"], $item["uri"], Protocol::FEED, Protocol::DFRN];
                                $previous = Item::selectFirst(['id'], $condition);
                                if (DBA::isResult($previous)) {
-                                       logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$previous["id"], LOGGER_DEBUG);
+                                       Logger::log("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$previous["id"], Logger::DEBUG);
                                        continue;
                                }
                        }
@@ -270,9 +278,14 @@ class Feed {
                        }
                        $updated = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $entry);
 
-                       if (empty($updated)) {
+                       if (empty($updated) && !empty($published)) {
                                $updated = $published;
                        }
+
+                       if (empty($published) && !empty($updated)) {
+                               $published = $updated;
+                       }
+
                        if ($published != "") {
                                $item["created"] = $published;
                        }
@@ -337,7 +350,7 @@ class Feed {
                                        $tags .= ', ';
                                }
 
-                               $taglink = "#[url=" . System::baseUrl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url]";
+                               $taglink = "#[url=" . System::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url]";
                                $tags .= $taglink;
                        }
 
@@ -417,14 +430,14 @@ class Feed {
                        }
 
                        if (!$simulate) {
-                               logger("Stored feed: ".print_r($item, true), LOGGER_DEBUG);
+                               Logger::log("Stored feed: ".print_r($item, true), Logger::DEBUG);
 
                                $notify = Item::isRemoteSelf($contact, $item);
 
                                // Distributed items should have a well formatted URI.
                                // Additionally we have to avoid conflicts with identical URI between imported feeds and these items.
                                if ($notify) {
-                                       $item['guid'] = Item::guidFromUri($orig_plink, $a->get_hostname());
+                                       $item['guid'] = Item::guidFromUri($orig_plink, $a->getHostName());
                                        unset($item['uri']);
                                        unset($item['parent-uri']);
 
@@ -434,7 +447,7 @@ class Feed {
 
                                $id = Item::insert($item, false, $notify);
 
-                               logger("Feed for contact ".$contact["url"]." stored under id ".$id);
+                               Logger::log("Feed for contact ".$contact["url"]." stored under id ".$id);
                        } else {
                                $items[] = $item;
                        }