X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FFeed.php;h=203a2e83565d27396dcb4dc7486e17e8a5bab5a8;hb=9cbc4a7355027cf7b4e2d7439edcefe04e1c18c2;hp=2dafaaf6e71b0e01ac63b26b8b33d958df22c87c;hpb=34b80227e88f80bf22b2acbd09bd9cd7e78e086c;p=friendica.git

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 2dafaaf6e7..203a2e8356 100644
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -8,6 +8,8 @@ namespace Friendica\Protocol;
 
 use Friendica\Database\DBM;
 use Friendica\Core\System;
+use Friendica\Model\Item;
+use Friendica\Util\Network;
 use dba;
 use DOMDocument;
 use DOMXPath;
@@ -65,7 +67,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 +187,7 @@ class Feed {
 			$author["owner-avatar"] = $contact["thumb"];
 		}
 
-		$header = array();
+		$header = [];
 		$header["uid"] = $importer["uid"];
 		$header["network"] = NETWORK_FEED;
 		$header["type"] = "remote";
@@ -198,19 +200,14 @@ class Feed {
 
 		$header["contact-id"] = $contact["id"];
 
-		if (!strlen($contact["notify"])) {
-			// one way feed - no remote comment ability
-			$header["last-child"] = 0;
-		}
-
 		if (!is_object($entries)) {
 			logger("There are no entries in this feed.", LOGGER_DEBUG);
 			return;
 		}
 
-		$items = array();
+		$items = [];
 
-		$entrylist = array();
+		$entrylist = [];
 
 		foreach ($entries AS $entry) {
 			$entrylist[] = $entry;
@@ -247,7 +244,7 @@ class Feed {
 
 			$orig_plink = $item["plink"];
 
-			$item["plink"] = original_url($item["plink"]);
+			$item["plink"] = Network::finalUrl($item["plink"]);
 
 			$item["parent-uri"] = $item["uri"];
 
@@ -309,7 +306,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 +328,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]';
 			}
@@ -362,7 +359,7 @@ class Feed {
 
 			// 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)) {
+			if (self::titleIsBody($item["title"], $body)) {
 				$item["title"] = "";
 			}
 			$item["body"] = html2bbcode($body, $basepath);
@@ -417,8 +414,8 @@ class Feed {
 					}
 					$item["body"] .= "\n".$item['tag'];
 				}
-x				// Add the link to the original feed entry if not present in feed
-				if (!strstr($item["body"], $item['plink']) && ($item['plink'] != '')) {
+				// Add the link to the original feed entry if not present in feed
+				if (($item['plink'] != '') && !strstr($item["body"], $item['plink'])) {
 					$item["body"] .= "[hr][url]".$item['plink']."[/url]";
 				}
 			}
@@ -426,17 +423,17 @@ x				// Add the link to the original feed entry if not present in feed
 			if (!$simulate) {
 				logger("Stored feed: ".print_r($item, true), LOGGER_DEBUG);
 
-				$notify = item_is_remote_self($contact, $item);
+				$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'] = uri_to_guid($orig_plink, $a->get_hostname());
+					$item['guid'] = Item::guidFromUri($orig_plink, $a->get_hostname());
 					unset($item['uri']);
 					unset($item['parent-uri']);
 				}
 
-				$id = item_store($item, false, $notify);
+				$id = Item::insert($item, false, $notify);
 
 				logger("Feed for contact ".$contact["url"]." stored under id ".$id);
 			} else {
@@ -448,7 +445,33 @@ x				// Add the link to the original feed entry if not present in feed
 		}
 
 		if ($simulate) {
-			return array("header" => $author, "items" => $items);
+			return ["header" => $author, "items" => $items];
+		}
+	}
+
+	private static function titleIsBody($title, $body)
+	{
+		$title = strip_tags($title);
+		$title = trim($title);
+		$title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
+		$title = str_replace(["\n", "\r", "\t", " "], ["", "", "", ""], $title);
+
+		$body = strip_tags($body);
+		$body = trim($body);
+		$body = html_entity_decode($body, ENT_QUOTES, 'UTF-8');
+		$body = str_replace(["\n", "\r", "\t", " "], ["", "", "", ""], $body);
+
+		if (strlen($title) < strlen($body)) {
+			$body = substr($body, 0, strlen($title));
+		}
+
+		if (($title != $body) && (substr($title, -3) == "...")) {
+			$pos = strrpos($title, "...");
+			if ($pos > 0) {
+				$title = substr($title, 0, $pos);
+				$body = substr($body, 0, $pos);
+			}
 		}
+		return ($title == $body);
 	}
 }