X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ffeed.php;h=22deff535a2383dd47822296ccb7ee680f3c7d90;hb=3b2cd854837e5df38f75f323aab24e31098812d4;hp=2117676dbab6eb9cf34c4581e81ec0450df8df12;hpb=c58d7715ef4292ea46a2474b1c3a77cf649fe9d1;p=friendica.git
diff --git a/include/feed.php b/include/feed.php
index 2117676dba..22deff535a 100644
--- a/include/feed.php
+++ b/include/feed.php
@@ -1,4 +1,5 @@
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/");
@@ -55,7 +64,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 +77,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 +117,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 +180,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 +205,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;
}
@@ -219,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;
}
@@ -271,6 +288,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
if ($creator != "") {
$item["author-name"] = $creator;
}
+
/// @TODO ?
// Ausland
//
@@ -284,7 +302,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,14 +311,39 @@ 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);
$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 = "";
@@ -311,29 +354,36 @@ 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);
+ // 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;
}
- if ($body == "") {
- $body = trim($xpath->evaluate('description/text()', $entry)->item(0)->nodeValue);
+
+ // Replace it, when there is a link in the body
+ if (strstr($item["body"], '[/url]')) {
+ $replace = true;
}
- if ($body == "") {
- $body = trim($xpath->evaluate('atom:summary/text()', $entry)->item(0)->nodeValue);
+
+ if ($replace) {
+ $item["body"] = $item["title"];
}
- // 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"] = "";
+ // 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"] .= "[hr][url]".$item['plink']."[/url]";
}
- $item["body"] = html2bbcode($body);
}
if (!$simulate) {
@@ -364,4 +414,3 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
return array("header" => $author, "items" => $items);
}
}
-?>