Make sure that we only quit when we are sure we can

[friendica.git] / include / feed.php

diff --git a/include/feed.php b/include/feed.php
index 7ce0729c6cac530eae535fc51a0b6d28282b2a6d..e0fef50dbbc6f7ed832e11451bf6bed47df3c9f6 100644 (file)
--- a/include/feed.php
+++ b/include/feed.php
@@ -59,8 +59,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                                if ($attributes->name == "href")
                                        $author["author-link"] = $attributes->textContent;
 
-               $author["author-id"] = $xpath->evaluate('/atom:feed/atom:author/atom:uri/text()')->item(0)->nodeValue;
-
                if ($author["author-link"] == "")
                        $author["author-link"] = $author["author-id"];
 
@@ -144,10 +142,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                $author["owner-link"] = $contact["url"];
                $author["owner-name"] = $contact["name"];
                $author["owner-avatar"] = $contact["thumb"];
-
-               // This is no field in the item table. So we have to unset it.
-               unset($author["author-nick"]);
-               unset($author["author-id"]);
        }
 
        $header = array();
@@ -183,18 +177,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
        foreach (array_reverse($entrylist) AS $entry) {
                $item = array_merge($header, $author);
 
-               $item["title"] = $xpath->evaluate('atom:title/text()', $entry)->item(0)->nodeValue;
-
-               if ($item["title"] == "")
-                       $item["title"] = $xpath->evaluate('title/text()', $entry)->item(0)->nodeValue;
-
-               if ($item["title"] == "")
-                       $item["title"] = $xpath->evaluate('rss:title/text()', $entry)->item(0)->nodeValue;
-
-               $alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes;
-               if (!is_object($alternate))
-                       $alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
-
                if (is_object($alternate))
                        foreach($alternate AS $attributes)
                                if ($attributes->name == "href")
@@ -218,6 +200,27 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 
                $item["parent-uri"] = $item["uri"];
 
+               if (!$simulate) {
+                       $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s', '%s')",
+                               intval($importer["uid"]), dbesc($item["uri"]), dbesc(NETWORK_FEED), dbesc(NETWORK_DFRN));
+                       if ($r) {
+                               logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG);
+                               continue;
+                       }
+               }
+
+               $item["title"] = $xpath->evaluate('atom:title/text()', $entry)->item(0)->nodeValue;
+
+               if ($item["title"] == "")
+                       $item["title"] = $xpath->evaluate('title/text()', $entry)->item(0)->nodeValue;
+
+               if ($item["title"] == "")
+                       $item["title"] = $xpath->evaluate('rss:title/text()', $entry)->item(0)->nodeValue;
+
+               $alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes;
+               if (!is_object($alternate))
+                       $alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
+
                $published = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
 
                if ($published == "")
@@ -256,15 +259,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                if ($creator != "")
                        $item["author-name"] = $creator;
 
-               if (!$simulate) {
-                       $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s', '%s')",
-                               intval($importer["uid"]), dbesc($item["uri"]), dbesc(NETWORK_FEED), dbesc(NETWORK_DFRN));
-                       if ($r) {
-                               logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG);
-                               continue;
-                       }
-               }
-
                /// @TODO ?
                // <category>Ausland</category>
                // <media:thumbnail width="152" height="76" url="http://www.taz.de/picture/667875/192/14388767.jpg"/>