Merge pull request #4243 from MrPetovan/task/switch-to-array-new-style

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

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 1bc8f513e0982e9629a0713126d1b3900712b8cd..b629c4ecb9b934e7cdbb71b9b0709e7955b23482 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -65,7 +65,7 @@ class Feed {
                $xpath->registerNamespace('media', "http://search.yahoo.com/mrss/");
                $xpath->registerNamespace('poco', NAMESPACE_POCO);
 
-               $author = array();
+               $author = [];
 
                // Is it RDF?
                if ($xpath->query('/rdf:RDF/rss:channel')->length > 0) {
@@ -185,7 +185,7 @@ class Feed {
                        $author["owner-avatar"] = $contact["thumb"];
                }
 
-               $header = array();
+               $header = [];
                $header["uid"] = $importer["uid"];
                $header["network"] = NETWORK_FEED;
                $header["type"] = "remote";
@@ -208,9 +208,9 @@ class Feed {
                        return;
                }
 
-               $items = array();
+               $items = [];
 
-               $entrylist = array();
+               $entrylist = [];
 
                foreach ($entries AS $entry) {
                        $entrylist[] = $entry;
@@ -254,7 +254,7 @@ class Feed {
                        if (!$simulate) {
                                $condition = ["`uid` = ? AND `uri` = ? AND `network` IN (?, ?)",
                                        $importer["uid"], $item["uri"], NETWORK_FEED, NETWORK_DFRN];
-                               $previous = dba::selectOne('item', ['id'], $condition);
+                               $previous = dba::selectFirst('item', ['id'], $condition);
                                if (DBM::is_result($previous)) {
                                        logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$previous["id"], LOGGER_DEBUG);
                                        continue;
@@ -309,7 +309,7 @@ class Feed {
                        // <category>Ausland</category>
                        // <media:thumbnail width="152" height="76" url="http://www.taz.de/picture/667875/192/14388767.jpg"/>
 
-                       $attachments = array();
+                       $attachments = [];
 
                        $enclosures = $xpath->query("enclosure", $entry);
                        foreach ($enclosures AS $enclosure) {
@@ -331,7 +331,7 @@ class Feed {
                                        $item["attach"] .= ',';
                                }
 
-                               $attachments[] = array("link" => $href, "type" => $type, "length" => $length);
+                               $attachments[] = ["link" => $href, "type" => $type, "length" => $length];
 
                                $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'"[/attach]';
                        }
@@ -417,7 +417,8 @@ class Feed {
                                        }
                                        $item["body"] .= "\n".$item['tag'];
                                }
-                               if (!strstr($item["body"], '[url') && ($item['plink'] != '')) {
+                               // Add the link to the original feed entry if not present in feed
+                               if (!strstr($item["body"], $item['plink']) && ($item['plink'] != '')) {
                                        $item["body"] .= "[hr][url]".$item['plink']."[/url]";
                                }
                        }
@@ -447,7 +448,7 @@ class Feed {
                }
 
                if ($simulate) {
-                       return array("header" => $author, "items" => $items);
+                       return ["header" => $author, "items" => $items];
                }
        }
 }