Add defuse/php-encryption 2.0 to Composer dependencies

[friendica.git] / include / feed.php

diff --git a/include/feed.php b/include/feed.php
index 74cff767333803626b3bf58234e865fded4193db..22deff535a2383dd47822296ccb7ee680f3c7d90 100644 (file)
--- a/include/feed.php
+++ b/include/feed.php
@@ -1,4 +1,5 @@
 <?php
+use Friendica\Database\DBM;
 require_once("include/html2bbcode.php");
 require_once("include/items.php");
 
@@ -27,8 +28,16 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                return;
        }
 
+       if (!empty($contact['poll'])) {
+               $basepath = $contact['poll'];
+       } elseif (!empty($contact['url'])) {
+               $basepath = $contact['url'];
+       } else {
+               $basepath = '';
+       }
+
        $doc = new DOMDocument();
-       @$doc->loadXML($xml);
+       @$doc->loadXML(trim($xml));
        $xpath = new DomXPath($doc);
        $xpath->registerNamespace('atom', NAMESPACE_ATOM1);
        $xpath->registerNamespace('dc', "http://purl.org/dc/elements/1.1/");
@@ -227,7 +236,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                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 (dbm::is_result($r)) {
+                       if (DBM::is_result($r)) {
                                logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG);
                                continue;
                        }
@@ -311,6 +320,30 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                        $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'"[/attach]';
                }
 
+               $body = trim($xpath->evaluate('atom:content/text()', $entry)->item(0)->nodeValue);
+
+               if ($body == "") {
+                       $body = trim($xpath->evaluate('content:encoded/text()', $entry)->item(0)->nodeValue);
+               }
+               if ($body == "") {
+                       $body = trim($xpath->evaluate('description/text()', $entry)->item(0)->nodeValue);
+               }
+               if ($body == "") {
+                       $body = trim($xpath->evaluate('atom:summary/text()', $entry)->item(0)->nodeValue);
+               }
+
+               // remove the content of the title if it is identically to the body
+               // This helps with auto generated titles e.g. from tumblr
+               if (title_is_body($item["title"], $body)) {
+                       $item["title"] = "";
+               }
+               $item["body"] = html2bbcode($body, $basepath);
+
+               if (($item["body"] == '') && ($item["title"] != '')) {
+                       $item["body"] = $item["title"];
+                       $item["title"] = '';
+               }
+
                if ($contact["fetch_further_information"]) {
                        $preview = "";
 
@@ -321,38 +354,35 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                                }
                        }
 
-                       $item["body"] = $item["title"].add_page_info($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
-                       $item["tag"] = add_page_keywords($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
-                       $item["title"] = "";
-                       $item["object-type"] = ACTIVITY_OBJ_BOOKMARK;
-                       unset($item["attach"]);
-               } else {
-                       $body = trim($xpath->evaluate('atom:content/text()', $entry)->item(0)->nodeValue);
+                       // Remove a possible link to the item itself
+                       $item["body"] = str_replace($item["plink"], '', $item["body"]);
+                       $item["body"] = preg_replace('/\[url\=\](\w+.*?)\[\/url\]/i', '', $item["body"]);
 
-                       if ($body == "") {
-                               $body = trim($xpath->evaluate('content:encoded/text()', $entry)->item(0)->nodeValue);
-                       }
-                       if ($body == "") {
-                               $body = trim($xpath->evaluate('description/text()', $entry)->item(0)->nodeValue);
-                       }
-                       if ($body == "") {
-                               $body = trim($xpath->evaluate('atom:summary/text()', $entry)->item(0)->nodeValue);
+                       // Replace the content when the title is longer than the body
+                       $replace = (strlen($item["title"]) > strlen($item["body"]));
+
+                       // Replace it, when there is an image in the body
+                       if (strstr($item["body"], '[/img]')) {
+                               $replace = true;
                        }
 
-                       // remove the content of the title if it is identically to the body
-                       // This helps with auto generated titles e.g. from tumblr
-                       if (title_is_body($item["title"], $body)) {
-                               $item["title"] = "";
+                       // Replace it, when there is a link in the body
+                       if (strstr($item["body"], '[/url]')) {
+                               $replace = true;
                        }
-                       $item["body"] = html2bbcode($body);
 
-                       if (($item["body"] == '') && ($item["title"] != '')) {
+                       if ($replace) {
                                $item["body"] = $item["title"];
-                               $item["title"] = '';
                        }
-
+                       // We always strip the title since it will be added in the page information
+                       $item["title"] = "";
+                       $item["body"] = $item["body"].add_page_info($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
+                       $item["tag"] = add_page_keywords($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
+                       $item["object-type"] = ACTIVITY_OBJ_BOOKMARK;
+                       unset($item["attach"]);
+               } else {
                        if (!strstr($item["body"], '[url') && ($item['plink'] != '')) {
-                               $item["body"] .= "\n[hr]\n[url]".$item['plink']."[/url]";
+                               $item["body"] .= "[hr][url]".$item['plink']."[/url]";
                        }
                }