X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ffeed.php;h=12cf06ca5093d6d674a3569bd76e05f1349c0de9;hb=785cfbbaefa94a63812efcb35ffcb70f04caf23c;hp=2117676dbab6eb9cf34c4581e81ec0450df8df12;hpb=29eac5ca4948f6b3bd39908d9601bdf06a146791;p=friendica.git

diff --git a/include/feed.php b/include/feed.php
index 2117676dba..12cf06ca50 100644
--- a/include/feed.php
+++ b/include/feed.php
@@ -55,7 +55,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 	if ($xpath->query('/atom:feed')->length > 0) {
 		$alternate = $xpath->query("atom:link[@rel='alternate']")->item(0)->attributes;
 		if (is_object($alternate)) {
-			foreach($alternate AS $attributes) {
+			foreach ($alternate AS $attributes) {
 				if ($attributes->name == "href") {
 					$author["author-link"] = $attributes->textContent;
 				}
@@ -68,7 +68,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 		if ($author["author-link"] == "") {
 			$self = $xpath->query("atom:link[@rel='self']")->item(0)->attributes;
 			if (is_object($self)) {
-				foreach($self AS $attributes) {
+				foreach ($self AS $attributes) {
 					if ($attributes->name == "href") {
 						$author["author-link"] = $attributes->textContent;
 					}
@@ -108,6 +108,14 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 			if ($value != "") {
 				$author["author-about"] = $value;
 			}
+			$avatar = $xpath->evaluate("atom:author/atom:link[@rel='avatar']")->item(0)->attributes;
+			if (is_object($avatar)) {
+				foreach ($avatar AS $attributes) {
+					if ($attributes->name == "href") {
+						$author["author-avatar"] = $attributes->textContent;
+					}
+				}
+			}
 		}
 
 		$author["edited"] = $author["created"] = $xpath->query('/atom:feed/atom:updated/text()')->item(0)->nodeValue;
@@ -163,7 +171,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 
 	$header["contact-id"] = $contact["id"];
 
-	if(!strlen($contact["notify"])) {
+	if (!strlen($contact["notify"])) {
 		// one way feed - no remote comment ability
 		$header["last-child"] = 0;
 	}
@@ -188,7 +196,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 			$alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
 		}
 		if (is_object($alternate)) {
-			foreach($alternate AS $attributes) {
+			foreach ($alternate AS $attributes) {
 				if ($attributes->name == "href") {
 					$item["plink"] = $attributes->textContent;
 				}
@@ -271,6 +279,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 		if ($creator != "") {
 			$item["author-name"] = $creator;
 		}
+
 		/// @TODO ?
 		// <category>Ausland</category>
 		// <media:thumbnail width="152" height="76" url="http://www.taz.de/picture/667875/192/14388767.jpg"/>
@@ -284,7 +293,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 			$type = "";
 			$title = "";
 
-			foreach($enclosure->attributes AS $attributes) {
+			foreach ($enclosure->attributes AS $attributes) {
 				if ($attributes->name == "url") {
 					$href = $attributes->textContent;
 				} elseif ($attributes->name == "length") {
@@ -293,8 +302,9 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 					$type = $attributes->textContent;
 				}
 			}
-			if(strlen($item["attach"]))
+			if (strlen($item["attach"])) {
 				$item["attach"] .= ',';
+			}
 
 			$attachments[] = array("link" => $href, "type" => $type, "length" => $length);
 
@@ -328,12 +338,22 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 			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);
+
+			if (($item["body"] == '') && ($item["title"] != '')) {
+				$item["body"] = $item["title"];
+				$item["title"] = '';
+			}
+
+			if (!strstr($item["body"], '[url') && ($item['plink'] != '')) {
+				$item["body"] .= "[hr][url]".$item['plink']."[/url]";
+			}
 		}
 
 		if (!$simulate) {
@@ -364,4 +384,3 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 		return array("header" => $author, "items" => $items);
 	}
 }
-?>