X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdfrn.php;h=78802563a625d6fcd6fdc0ef2ee4a46a6fcea05f;hb=0babc2c96ec398d1bbfa7bb82916892dc5d7fe91;hp=5977ed9a0c254c044516c70035bb1acf1b0a963a;hpb=62b6bbeef074e51971595c22da8d229aa6e53cec;p=friendica.git

diff --git a/include/dfrn.php b/include/dfrn.php
index 5977ed9a0c..78802563a6 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -7,6 +7,8 @@
  * https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
  */
 
+use Friendica\App;
+
 require_once("include/Contact.php");
 require_once("include/ostatus.php");
 require_once("include/enotify.php");
@@ -243,7 +245,7 @@ class dfrn {
 		/// @TODO This hook can't work anymore
 		//	call_hooks('atom_feed', $atom);
 
-		if (!dbm::is_result($items) OR $onlyheader) {
+		if (!dbm::is_result($items) || $onlyheader) {
 			$atom = trim($doc->saveXML());
 
 			call_hooks('atom_feed_end', $atom);
@@ -282,6 +284,62 @@ class dfrn {
 		return $atom;
 	}
 
+	/**
+	 * @brief Generate an atom entry for a given item id
+	 *
+	 * @param int $item_id The item id
+	 *
+	 * @return string DFRN feed entry
+	 */
+	public static function itemFeed($item_id) {
+		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+			`contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`,
+			`contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
+			`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+			`sign`.`signed_text`, `sign`.`signature`, `sign`.`signer`
+			FROM `item`
+			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
+			LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
+			WHERE `item`.`id` = %d AND `item`.`visible` AND NOT `item`.`moderated` AND `item`.`parent` != 0
+			AND `item`.`wall` AND NOT `item`.`private`",
+			intval($item_id)
+		);
+
+		if (!dbm::is_result($r)) {
+			killme();
+		}
+
+		$item = $r[0];
+
+		$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
+			FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
+			WHERE `contact`.`self` AND `user`.`uid` = %d LIMIT 1",
+			intval($item['uid'])
+		);
+
+		if (!dbm::is_result($r)) {
+			killme();
+		}
+
+		$owner = $r[0];
+
+		$doc = new DOMDocument('1.0', 'utf-8');
+		$doc->formatOutput = true;
+
+		$alternatelink = $owner['url'];
+
+		$root = self::add_header($doc, $owner, 'dfrn:owner', $alternatelink, true);
+
+		$type = 'html';
+
+		$entry = self::entry($doc, $type, $item, $owner, true);
+		$root->appendChild($entry);
+
+		$atom = trim($doc->saveXML());
+		return $atom;
+	}
+
 	/**
 	 * @brief Create XML text for DFRN mails
 	 *
@@ -370,7 +428,7 @@ class dfrn {
 		$ext = Photo::supportedTypes();
 
 		foreach ($rp as $p) {
-			$photos[$p['scale']] = app::get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
+			$photos[$p['scale']] = App::get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
 		}
 
 		unset($rp, $ext);
@@ -431,7 +489,7 @@ class dfrn {
 		$root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
 		$root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
 
-		xml::add_element($doc, $root, "id", app::get_baseurl()."/profile/".$owner["nick"]);
+		xml::add_element($doc, $root, "id", App::get_baseurl()."/profile/".$owner["nick"]);
 		xml::add_element($doc, $root, "title", $owner["name"]);
 
 		$attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
@@ -448,13 +506,13 @@ class dfrn {
 			// DFRN itself doesn't uses this. But maybe someone else wants to subscribe to the public feed.
 			ostatus::hublinks($doc, $root);
 
-			$attributes = array("rel" => "salmon", "href" => app::get_baseurl()."/salmon/".$owner["nick"]);
+			$attributes = array("rel" => "salmon", "href" => App::get_baseurl()."/salmon/".$owner["nick"]);
 			xml::add_element($doc, $root, "link", "", $attributes);
 
-			$attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => app::get_baseurl()."/salmon/".$owner["nick"]);
+			$attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => App::get_baseurl()."/salmon/".$owner["nick"]);
 			xml::add_element($doc, $root, "link", "", $attributes);
 
-			$attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => app::get_baseurl()."/salmon/".$owner["nick"]);
+			$attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => App::get_baseurl()."/salmon/".$owner["nick"]);
 			xml::add_element($doc, $root, "link", "", $attributes);
 		}
 
@@ -506,18 +564,18 @@ class dfrn {
 
 		$attributes = array();
 
-		if (!$public OR !$hidewall) {
+		if (!$public || !$hidewall) {
 			$attributes = array("dfrn:updated" => $namdate);
 		}
 
 		xml::add_element($doc, $author, "name", $owner["name"], $attributes);
-		xml::add_element($doc, $author, "uri", app::get_baseurl().'/profile/'.$owner["nickname"], $attributes);
+		xml::add_element($doc, $author, "uri", App::get_baseurl().'/profile/'.$owner["nickname"], $attributes);
 		xml::add_element($doc, $author, "dfrn:handle", $owner["addr"], $attributes);
 
 		$attributes = array("rel" => "photo", "type" => "image/jpeg",
 					"media:width" => 175, "media:height" => 175, "href" => $owner['photo']);
 
-		if (!$public OR !$hidewall) {
+		if (!$public || !$hidewall) {
 			$attributes["dfrn:updated"] = $picdate;
 		}
 
@@ -812,7 +870,7 @@ class dfrn {
 			$parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"]));
 			$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
 			$attributes = array("ref" => $parent_item, "type" => "text/html",
-						"href" => app::get_baseurl().'/display/'.$parent[0]['guid'],
+						"href" => App::get_baseurl().'/display/'.$parent[0]['guid'],
 						"dfrn:diaspora_guid" => $parent[0]['guid']);
 			xml::add_element($doc, $entry, "thr:in-reply-to", "", $attributes);
 		}
@@ -854,7 +912,7 @@ class dfrn {
 
 		// We save this value in "plink". Maybe we should read it from there as well?
 		xml::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
-								"href" => app::get_baseurl()."/display/".$item["guid"]));
+								"href" => App::get_baseurl()."/display/".$item["guid"]));
 
 		// "comment-allow" is some old fashioned stuff for old Friendica versions.
 		// It is included in the rewritten code for completeness
@@ -919,7 +977,7 @@ class dfrn {
 
 		if (count($tags)) {
 			foreach ($tags as $t) {
-				if (($type != 'html') OR ($t[0] != "@")) {
+				if (($type != 'html') || ($t[0] != "@")) {
 					xml::add_element($doc, $entry, "category", "", array("scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2]));
 				}
 			}
@@ -938,7 +996,7 @@ class dfrn {
 				intval($owner["uid"]),
 				dbesc(normalise_link($mention)));
 
-			if (dbm::is_result($r) AND ($r[0]["forum"] OR $r[0]["prv"])) {
+			if (dbm::is_result($r) && ($r[0]["forum"] || $r[0]["prv"])) {
 				xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
 											"ostatus:object-type" => ACTIVITY_OBJ_GROUP,
 											"href" => $mention));
@@ -1321,7 +1379,7 @@ class dfrn {
 					$contact["avatar-date"] = $attributes->textContent;
 				}
 			}
-			if (($width > 0) AND ($href != "")) {
+			if (($width > 0) && ($href != "")) {
 				$avatarlist[$width] = $href;
 			}
 		}
@@ -1330,7 +1388,7 @@ class dfrn {
 			$author["avatar"] = current($avatarlist);
 		}
 
-		if (dbm::is_result($r) AND !$onlyfetch) {
+		if (dbm::is_result($r) && !$onlyfetch) {
 			logger("Check if contact details for contact " . $r[0]["id"] . " (" . $r[0]["nick"] . ") have to be updated.", LOGGER_DEBUG);
 
 			$poco = array("url" => $contact["url"]);
@@ -1772,7 +1830,7 @@ class dfrn {
 		$relocate["poll"] = $xpath->query("dfrn:poll/text()", $relocation)->item(0)->nodeValue;
 		$relocate["sitepubkey"] = $xpath->query("dfrn:sitepubkey/text()", $relocation)->item(0)->nodeValue;
 
-		if (($relocate["avatar"] == "") AND ($relocate["photo"] != "")) {
+		if (($relocate["avatar"] == "") && ($relocate["photo"] != "")) {
 			$relocate["avatar"] = $relocate["photo"];
 		}
 
@@ -1900,7 +1958,7 @@ class dfrn {
 				return false;
 			}
 
-			$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
+			$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` IN (0, %d)",
 				dbesc($item["title"]),
 				dbesc($item["body"]),
 				dbesc($item["tag"]),
@@ -1920,13 +1978,13 @@ class dfrn {
 		}
 
 		// update last-child if it changes
-		if ($item["last-child"] AND ($item["last-child"] != $current["last-child"])) {
-			$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
+		if ($item["last-child"] && ($item["last-child"] != $current["last-child"])) {
+			$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
 				dbesc(datetime_convert()),
 				dbesc($item["parent-uri"]),
 				intval($importer["importer_uid"])
 			);
-			$r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
+			$r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` IN (0, %d)",
 				intval($item["last-child"]),
 				dbesc(datetime_convert()),
 				dbesc($item["uri"]),
@@ -2204,7 +2262,7 @@ class dfrn {
 					$title = $attributes->textContent;
 				}
 			}
-			if (($rel != "") AND ($href != "")) {
+			if (($rel != "") && ($href != "")) {
 				switch ($rel) {
 					case "alternate":
 						$item["plink"] = $href;
@@ -2252,7 +2310,7 @@ class dfrn {
 		);
 
 		// Is there an existing item?
-		if (dbm::is_result($current) AND edited_timestamp_is_newer($current[0], $item) AND
+		if (dbm::is_result($current) && edited_timestamp_is_newer($current[0], $item) &&
 			(datetime_convert("UTC","UTC",$item["edited"]) < $current[0]["edited"])) {
 			logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
 			return;
@@ -2326,7 +2384,7 @@ class dfrn {
 		}
 
 		$notice_info = $xpath->query("statusnet:notice_info", $entry);
-		if ($notice_info AND ($notice_info->length > 0)) {
+		if ($notice_info && ($notice_info->length > 0)) {
 			foreach ($notice_info->item(0)->attributes AS $attributes) {
 				if ($attributes->name == "source") {
 					$item["app"] = strip_tags($attributes->textContent);
@@ -2376,9 +2434,9 @@ class dfrn {
 					}
 				}
 
-				if (($term != "") AND ($scheme != "")) {
+				if (($term != "") && ($scheme != "")) {
 					$parts = explode(":", $scheme);
-					if ((count($parts) >= 4) AND (array_shift($parts) == "X-DFRN")) {
+					if ((count($parts) >= 4) && (array_shift($parts) == "X-DFRN")) {
 						$termhash = array_shift($parts);
 						$termurl = implode(":", $parts);
 
@@ -2438,7 +2496,7 @@ class dfrn {
 				$item["contact-id"] = $owner["contact-id"];
 			}
 
-			if (($item["network"] != $owner["network"]) AND ($owner["network"] != "")) {
+			if (($item["network"] != $owner["network"]) && ($owner["network"] != "")) {
 				$item["network"] = $owner["network"];
 			}
 
@@ -2446,7 +2504,7 @@ class dfrn {
 				$item["contact-id"] = $author["contact-id"];
 			}
 
-			if (($item["network"] != $author["network"]) AND ($author["network"] != "")) {
+			if (($item["network"] != $author["network"]) && ($author["network"] != "")) {
 				$item["network"] = $author["network"];
 			}
 
@@ -2546,7 +2604,7 @@ class dfrn {
 					);
 				}
 
-				if ($posted_id AND $parent AND ($entrytype == DFRN_REPLY_RC)) {
+				if ($posted_id && $parent && ($entrytype == DFRN_REPLY_RC)) {
 					logger("Notifying followers about comment ".$posted_id, LOGGER_DEBUG);
 					proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $posted_id);
 				}
@@ -2611,7 +2669,7 @@ class dfrn {
 			$when = datetime_convert("UTC", "UTC", "now", "Y-m-d H:i:s");
 		}
 
-		if (!$uri OR !$importer["id"]) {
+		if (!$uri || !$importer["id"]) {
 			return false;
 		}
 
@@ -2686,7 +2744,7 @@ class dfrn {
 			if ($entrytype == DFRN_TOP_LEVEL) {
 				$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
 						`body` = '', `title` = ''
-					WHERE `parent-uri` = '%s' AND `uid` = %d",
+					WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
 						dbesc($when),
 						dbesc(datetime_convert()),
 						dbesc($uri),
@@ -2698,7 +2756,7 @@ class dfrn {
 			} else {
 				$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
 						`body` = '', `title` = ''
-					WHERE `uri` = '%s' AND `uid` = %d",
+					WHERE `uri` = '%s' AND `uid` IN (0, %d)",
 						dbesc($when),
 						dbesc(datetime_convert()),
 						dbesc($uri),
@@ -2709,7 +2767,7 @@ class dfrn {
 				update_thread_uri($uri, $importer["importer_uid"]);
 				if ($item["last-child"]) {
 					// ensure that last-child is set in case the comment that had it just got wiped.
-					q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
+					q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
 						dbesc(datetime_convert()),
 						dbesc($item["parent-uri"]),
 						intval($item["uid"])