X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDFRN.php;h=88025b88ca956be4d1247ac7c4f2b86251c230d5;hb=eeadd2f9d61ca1dfd8acf157df5f4b8b06d87b0b;hp=fd95576dbe34ea4435ff2a6a99e2bc93c2887d9f;hpb=cdc8a3b68d524ae8f1476ba066410926f4f9c429;p=friendica.git

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index fd95576dbe..88025b88ca 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -11,6 +11,7 @@ namespace Friendica\Protocol;
 use Friendica\App;
 use Friendica\Content\OEmbed;
 use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -18,11 +19,11 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Event;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
-use Friendica\Model\Term;
 use Friendica\Model\User;
 use Friendica\Object\Image;
 use Friendica\Protocol\OStatus;
@@ -30,6 +31,7 @@ use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
+use Friendica\Protocol\Diaspora;
 use dba;
 use DOMDocument;
 use DOMXPath;
@@ -40,10 +42,7 @@ require_once 'boot.php';
 require_once 'include/dba.php';
 require_once "include/enotify.php";
 require_once "include/items.php";
-require_once "include/event.php";
 require_once "include/text.php";
-require_once "include/html2bbcode.php";
-require_once "include/bbcode.php";
 
 /**
  * @brief This class contain functions to create and send DFRN XML files
@@ -832,7 +831,7 @@ class DFRN
 				}
 			}
 			if ($r->content) {
-				XML::addElement($doc, $entry, "content", bbcode($r->content), ["type" => "html"]);
+				XML::addElement($doc, $entry, "content", BBCode::convert($r->content), ["type" => "html"]);
 			}
 
 			return $entry;
@@ -938,7 +937,7 @@ class DFRN
 				$htmlbody = "[b]".$item['title']."[/b]\n\n".$htmlbody;
 			}
 
-			$htmlbody = bbcode($htmlbody, false, false, 7);
+			$htmlbody = BBCode::convert($htmlbody, false, 7);
 		}
 
 		$author = self::addEntryAuthor($doc, "author", $item["author-link"], $item);
@@ -1147,13 +1146,20 @@ class DFRN
 	 * @param string $atom     Content that will be transmitted
 	 * @param bool   $dissolve (to be documented)
 	 *
-	 * @return int Deliver status. -1 means an error.
+	 * @return int Deliver status. Negative values mean an error.
 	 * @todo Add array type-hint for $owner, $contact
 	 */
 	public static function deliver($owner, $contact, $atom, $dissolve = false)
 	{
 		$a = get_app();
 
+		// At first try the Diaspora transport layer
+		$ret = self::transmit($owner, $contact, $atom);
+		if ($ret >= 200) {
+			logger('Delivery via Diaspora transport layer was successfull with status ' . $ret);
+			return $ret;
+		}
+
 		$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
 
 		if ($contact['duplex'] && $contact['dfrn-id']) {
@@ -1353,11 +1359,71 @@ class DFRN
 			return 3;
 		}
 
-		if ($contact['term-date'] > NULL_DATE) {
-			logger("dfrn_deliver: $url back from the dead - removing mark for death");
+		$res = XML::parseString($xml);
+
+		if (!isset($res->status)) {
+			return -11;
+		}
+
+		if (!empty($res->message)) {
+			logger('Transmit returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG);
+		}
+
+		if ($res->status == 200) {
 			Contact::unmarkForArchival($contact);
 		}
 
+		return intval($res->status);
+	}
+
+	/**
+	 * @brief Transmits atom content to the contacts via the Diaspora transport layer
+	 *
+	 * @param array  $owner    Owner record
+	 * @param array  $contact  Contact record of the receiver
+	 * @param string $atom     Content that will be transmitted
+	 *
+	 * @return int Deliver status. Negative values mean an error.
+	 */
+	public static function transmit($owner, $contact, $atom)
+	{
+		$a = get_app();
+
+		// Currently disabled, at first we will not use the batch delivery
+		// $public_batch = !$items[0]['private'];
+		$public_batch = false;
+
+		$msg = DFRN::entries($items, $owner);
+
+		$fcontact = Diaspora::personByHandle($contact['addr']);
+		if (empty($fcontact)) {
+			logger("unable to find contact details");
+			return;
+		}
+
+		$envelope = Diaspora::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $fcontact['pubkey'], $public_batch);
+
+		$dest_url = ($public_batch ? $fcontact["batch"] : $contact["notify"]);
+
+		$content_type = ($public_batch ? "application/magic-envelope+xml" : "application/json");
+
+		$xml = Network::post($dest_url, $envelope, ["Content-Type: ".$content_type]);
+
+		$curl_stat = $a->get_curl_code();
+		if (!$curl_stat || empty($xml)) {
+			return -9; // timed out
+		}
+
+		if (($curl_stat == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) {
+			return -10;
+		}
+
+		if (strpos($xml, '<?xml') === false) {
+			logger('no valid XML returned');
+			logger('returned XML: ' . $xml, LOGGER_DATA);
+			return 3;
+		}
+
 		$res = XML::parseString($xml);
 
 		if (!isset($res->status)) {
@@ -1368,6 +1434,10 @@ class DFRN
 			logger('Delivery returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG);
 		}
 
+		if ($res->status == 200) {
+			Contact::unmarkForArchival($contact);
+		}
+
 		return intval($res->status);
 	}
 
@@ -1433,10 +1503,10 @@ class DFRN
 		$author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue;
 		$author["link"] = $xpath->evaluate($element."/atom:uri/text()", $context)->item(0)->nodeValue;
 
-		$contact_old = dba::fetch_first("SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `name-date`, `uri-date`, `addr`,
+		$contact_old = dba::fetch_first("SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `avatar`, `name-date`, `uri-date`, `addr`,
 				`name`, `nick`, `about`, `location`, `keywords`, `xmpp`, `bdyear`, `bd`, `hidden`, `contact-type`
 				FROM `contact` WHERE `uid` = ? AND `nurl` = ? AND `network` != ?",
-			$importer["uid"],
+			$importer["importer_uid"],
 			normalise_link($author["link"]),
 			NETWORK_STATUSNET
 		);
@@ -1446,7 +1516,7 @@ class DFRN
 			$author["network"] = $contact_old["network"];
 		} else {
 			if (!$onlyfetch) {
-				logger("Contact ".$author["link"]." wasn't found for user ".$importer["uid"]." XML: ".$xml, LOGGER_DEBUG);
+				logger("Contact ".$author["link"]." wasn't found for user ".$importer["importer_uid"]." XML: ".$xml, LOGGER_DEBUG);
 			}
 
 			$author["contact-id"] = $importer["id"];
@@ -1470,7 +1540,7 @@ class DFRN
 					$width = $attributes->textContent;
 				}
 				if ($attributes->name == "updated") {
-					$contact_old["avatar-date"] = $attributes->textContent;
+					$author["avatar-date"] = $attributes->textContent;
 				}
 			}
 			if (($width > 0) && ($href != "")) {
@@ -1603,6 +1673,7 @@ class DFRN
 			unset($fields["uid"]);
 			unset($fields["url"]);
 			unset($fields["avatar-date"]);
+			unset($fields["avatar"]);
 			unset($fields["name-date"]);
 			unset($fields["uri-date"]);
 
@@ -1640,10 +1711,10 @@ class DFRN
 			}
 
 			Contact::updateAvatar(
-				$author["avatar"],
-				$importer["uid"],
-				$contact["id"],
-				(strtotime($contact["avatar-date"]) > strtotime($contact_old["avatar-date"]))
+				$author['avatar'],
+				$importer['importer_uid'],
+				$contact['id'],
+				(strtotime($contact['avatar-date']) > strtotime($contact_old['avatar-date']) || ($author['avatar'] != $contact_old['avatar']))
 			);
 
 			/*
@@ -1659,10 +1730,10 @@ class DFRN
 			$poco["contact-type"] = $contact["contact-type"];
 			$gcid = GContact::update($poco);
 
-			GContact::link($gcid, $importer["uid"], $contact["id"]);
+			GContact::link($gcid, $importer["importer_uid"], $contact["id"]);
 		}
 
-		return($author);
+		return $author;
 	}
 
 	/**
@@ -1742,7 +1813,7 @@ class DFRN
 		$msg["contact-id"] = $importer["id"];
 		$msg["uri"] = $xpath->query("dfrn:id/text()", $mail)->item(0)->nodeValue;
 		$msg["parent-uri"] = $xpath->query("dfrn:in-reply-to/text()", $mail)->item(0)->nodeValue;
-		$msg["created"] = $xpath->query("dfrn:sentdate/text()", $mail)->item(0)->nodeValue;
+		$msg["created"] = DateTimeFormat::utc($xpath->query("dfrn:sentdate/text()", $mail)->item(0)->nodeValue);
 		$msg["title"] = $xpath->query("dfrn:subject/text()", $mail)->item(0)->nodeValue;
 		$msg["body"] = $xpath->query("dfrn:content/text()", $mail)->item(0)->nodeValue;
 		$msg["seen"] = 0;
@@ -2080,8 +2151,8 @@ class DFRN
 				return false;
 			}
 
-			$fields = ['title' => $item["title"], 'body' => $item["body"],
-					'tag' => $item["tag"], 'changed' => DateTimeFormat::utcNow(),
+			$fields = ['title' => defaults($item, 'title', ''), 'body' => defaults($item, 'body', ''),
+					'tag' => defaults($item, 'tag', ''), 'changed' => DateTimeFormat::utcNow(),
 					'edited' => DateTimeFormat::utc($item["edited"])];
 
 			$condition = ["`uri` = ? AND `uid` IN (0, ?)", $item["uri"], $importer["importer_uid"]];
@@ -2455,7 +2526,7 @@ class DFRN
 			$purifier = new HTMLPurifier($config);
 			$item['body'] = $purifier->purify($item['body']);
 
-			$item['body'] = @html2bbcode($item['body']);
+			$item['body'] = @HTML::toBBCode($item['body']);
 		}
 
 		/// @todo We should check for a repeated post and if we know the repeated author.
@@ -2615,11 +2686,11 @@ class DFRN
 			// Is it an event?
 			if ($item["object-type"] == ACTIVITY_OBJ_EVENT) {
 				logger("Item ".$item["uri"]." seems to contain an event.", LOGGER_DEBUG);
-				$ev = bbtoevent($item["body"]);
+				$ev = Event::fromBBCode($item["body"]);
 				if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
 					logger("Event in item ".$item["uri"]." was found.", LOGGER_DEBUG);
 					$ev["cid"]     = $importer["id"];
-					$ev["uid"]     = $importer["uid"];
+					$ev["uid"]     = $importer["importer_uid"];
 					$ev["uri"]     = $item["uri"];
 					$ev["edited"]  = $item["edited"];
 					$ev["private"] = $item["private"];
@@ -2628,13 +2699,13 @@ class DFRN
 					$r = q(
 						"SELECT `id` FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($item["uri"]),
-						intval($importer["uid"])
+						intval($importer["importer_uid"])
 					);
 					if (DBM::is_result($r)) {
 						$ev["id"] = $r[0]["id"];
 					}
 
-					$event_id = event_store($ev);
+					$event_id = Event::store($ev);
 					logger("Event ".$event_id." was stored", LOGGER_DEBUG);
 					return;
 				}
@@ -2683,6 +2754,14 @@ class DFRN
 				return true;
 			}
 		} else { // $entrytype == DFRN_TOP_LEVEL
+			if ($importer["readonly"]) {
+				logger('ignoring read-only contact '.$importer["id"]);
+				return;
+			}
+			if ($importer["uid"] == 0) {
+				logger("Contact ".$importer["id"]." isn't known to user ".$importer["importer_uid"].". The post will be ignored.", LOGGER_DEBUG);
+				return;
+			}
 			if (!link_compare($item["owner-link"], $importer["url"])) {
 				/*
 				 * The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
@@ -2738,14 +2817,28 @@ class DFRN
 			return false;
 		}
 
-		$condition = ["`uri` = ? AND `uid` = ? AND `contact-id` = ? AND NOT `file` LIKE '%[%'",
-				$uri, $importer["uid"], $importer["id"]];
-		$item = dba::selectFirst('item', ['id'], $condition);
+		$condition = ["`uri` = ? AND `uid` = ? AND NOT `file` LIKE '%[%'", $uri, $importer["importer_uid"]];
+		$item = dba::selectFirst('item', ['id', 'parent', 'contact-id'], $condition);
 		if (!DBM::is_result($item)) {
-			logger("Item with uri " . $uri . " from contact " . $importer["id"] . " for user " . $importer["uid"] . " wasn't found.", LOGGER_DEBUG);
+			logger("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " wasn't found.", LOGGER_DEBUG);
 			return;
 		}
 
+		// When it is a starting post it has to belong to the person that wants to delete it
+		if (($item['id'] == $item['parent']) && ($item['contact-id'] != $importer["id"])) {
+			logger("Item with uri " . $uri . " don't belong to contact " . $importer["id"] . " - ignoring deletion.", LOGGER_DEBUG);
+			return;
+		}
+
+		// Comments can be deleted by the thread owner or comment owner
+		if (($item['id'] != $item['parent']) && ($item['contact-id'] != $importer["id"])) {
+			$condition = ['id' => $item['parent'], 'contact-id' => $importer["id"]];
+			if (!dba::exists('item', $condition)) {
+				logger("Item with uri " . $uri . " wasn't found or mustn't be deleted by contact " . $importer["id"] . " - ignoring deletion.", LOGGER_DEBUG);
+				return;
+			}
+		}
+
 		$entrytype = self::getEntryType($importer, $item);
 
 		if (!$item["deleted"]) {
@@ -2796,7 +2889,7 @@ class DFRN
 		$xpath->registerNamespace("statusnet", NAMESPACE_STATUSNET);
 
 		$header = [];
-		$header["uid"] = $importer["uid"];
+		$header["uid"] = $importer["importer_uid"];
 		$header["network"] = NETWORK_DFRN;
 		$header["type"] = "remote";
 		$header["wall"] = 0;
@@ -2815,7 +2908,7 @@ class DFRN
 			self::fetchauthor($xpath, $doc->firstChild, $importer, "dfrn:owner", false, $xml);
 		}
 
-		logger("Import DFRN message for user " . $importer["uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
+		logger("Import DFRN message for user " . $importer["importer_uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
 
 		// The account type is new since 3.5.1
 		if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) {
@@ -2841,21 +2934,16 @@ class DFRN
 			self::processRelocation($xpath, $relocation, $importer);
 		}
 
-		if ($importer["readonly"]) {
-			// We aren't receiving stuff from this person. But we will quietly ignore them
-			// rather than a blatant "go away" message.
-			logger('ignoring contact '.$importer["id"]);
-			return 403;
-		}
-
-		$mails = $xpath->query("/atom:feed/dfrn:mail");
-		foreach ($mails as $mail) {
-			self::processMail($xpath, $mail, $importer);
-		}
+		if (($importer["uid"] != 0) && !$importer["readonly"]) {
+			$mails = $xpath->query("/atom:feed/dfrn:mail");
+			foreach ($mails as $mail) {
+				self::processMail($xpath, $mail, $importer);
+			}
 
-		$suggestions = $xpath->query("/atom:feed/dfrn:suggest");
-		foreach ($suggestions as $suggestion) {
-			self::processSuggestion($xpath, $suggestion, $importer);
+			$suggestions = $xpath->query("/atom:feed/dfrn:suggest");
+			foreach ($suggestions as $suggestion) {
+				self::processSuggestion($xpath, $suggestion, $importer);
+			}
 		}
 
 		$deletions = $xpath->query("/atom:feed/at:deleted-entry");
@@ -2883,7 +2971,7 @@ class DFRN
 				self::processEntry($header, $xpath, $entry, $importer, $xml);
 			}
 		}
-		logger("Import done for user " . $importer["uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
+		logger("Import done for user " . $importer["importer_uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
 		return 200;
 	}