X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdiaspora.php;h=762018b170c4f1f9ec35ff498b143f319427b051;hb=0cd9db9cb7f4c96f597e37590a536eaae123238d;hp=89915c3d1403273bc98f42f4fc7db2b40994671b;hpb=d301a363b0c6b7ebb9e70d44ddf82f3d715e4041;p=friendica.git

diff --git a/include/diaspora.php b/include/diaspora.php
index 89915c3d14..762018b170 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -4,15 +4,16 @@
  * @brief The implementation of the diaspora protocol
  *
  * The new protocol is described here: http://diaspora.github.io/diaspora_federation/index.html
- * Currently this implementation here interprets the old and the new protocol and sends the old one.
- * This will change in the future.
+ * This implementation here interprets the old and the new protocol and sends the new one.
+ * In the future we will remove most stuff from "valid_posting" and interpret only the new protocol.
  */
 
-use \Friendica\Core\Config;
+use Friendica\App;
+use Friendica\Core\Config;
 
 require_once 'include/items.php';
 require_once 'include/bb2diaspora.php';
-require_once 'include/Scrape.php';
+require_once 'include/probe.php';
 require_once 'include/Contact.php';
 require_once 'include/Photo.php';
 require_once 'include/socgraph.php';
@@ -45,7 +46,7 @@ class Diaspora {
 
 		$servers = explode(",", $serverdata);
 
-		foreach($servers AS $server) {
+		foreach ($servers AS $server) {
 			$server = trim($server);
 			$addr = "relay@".str_replace("http://", "", normalise_link($server));
 			$batch = $server."/receive/public";
@@ -187,7 +188,80 @@ class Diaspora {
 	}
 
 	/**
-	 * @brief: Decodes incoming Diaspora message
+	 * @brief: Decodes incoming Diaspora message in the new format
+	 *
+	 * @param array $importer Array of the importer user
+	 * @param string $raw raw post message
+	 *
+	 * @return array
+	 * 'message' -> decoded Diaspora XML message
+	 * 'author' -> author diaspora handle
+	 * 'key' -> author public key (converted to pkcs#8)
+	 */
+	public static function decode_raw($importer, $raw) {
+		$data = json_decode($raw);
+
+		// Is it a private post? Then decrypt the outer Salmon
+		if (is_object($data)) {
+			$encrypted_aes_key_bundle = base64_decode($data->aes_key);
+			$ciphertext = base64_decode($data->encrypted_magic_envelope);
+
+			$outer_key_bundle = '';
+			@openssl_private_decrypt($encrypted_aes_key_bundle, $outer_key_bundle, $importer['prvkey']);
+			$j_outer_key_bundle = json_decode($outer_key_bundle);
+
+			if (!is_object($j_outer_key_bundle)) {
+				logger('Outer Salmon did not verify. Discarding.');
+				http_status_exit(400);
+			}
+
+			$outer_iv = base64_decode($j_outer_key_bundle->iv);
+			$outer_key = base64_decode($j_outer_key_bundle->key);
+
+			$xml = diaspora::aes_decrypt($outer_key, $outer_iv, $ciphertext);
+		} else {
+			$xml = $raw;
+		}
+
+		$basedom = parse_xml_string($xml);
+
+		if (!is_object($basedom)) {
+			logger('Received data does not seem to be an XML. Discarding.');
+			http_status_exit(400);
+		}
+
+		$base = $basedom->children(NAMESPACE_SALMON_ME);
+
+		// Not sure if this cleaning is needed
+		$data = str_replace(array(" ", "\t", "\r", "\n"), array("", "", "", ""), $base->data);
+
+		// Build the signed data
+		$type = $base->data[0]->attributes()->type[0];
+		$encoding = $base->encoding;
+		$alg = $base->alg;
+		$signed_data = $data.'.'.base64url_encode($type).'.'.base64url_encode($encoding).'.'.base64url_encode($alg);
+
+		// This is the signature
+		$signature = base64url_decode($base->sig);
+
+		// Get the senders' public key
+		$key_id = $base->sig[0]->attributes()->key_id[0];
+		$author_addr = base64_decode($key_id);
+		$key = diaspora::key($author_addr);
+
+		$verify = rsa_verify($signed_data, $signature, $key);
+		if (!$verify) {
+			logger('Message did not verify. Discarding.');
+			http_status_exit(400);
+		}
+
+		return array('message' => (string)base64url_decode($base->data),
+				'author' => unxmlify($author_addr),
+				'key' => (string)$key);
+	}
+
+	/**
+	 * @brief: Decodes incoming Diaspora message in the deprecated format
 	 *
 	 * @param array $importer Array of the importer user
 	 * @param string $xml urldecoded Diaspora salmon
@@ -202,12 +276,13 @@ class Diaspora {
 		$public = false;
 		$basedom = parse_xml_string($xml);
 
-		if (!is_object($basedom))
+		if (!is_object($basedom)) {
+			logger("XML is not parseable.");
 			return false;
-
+		}
 		$children = $basedom->children('https://joindiaspora.com/protocol');
 
-		if($children->header) {
+		if ($children->header) {
 			$public = true;
 			$author_link = str_replace('acct:','',$children->header->author_id);
 		} else {
@@ -240,11 +315,11 @@ class Diaspora {
 
 		// figure out where in the DOM tree our data is hiding
 
-		if($dom->provenance->data)
+		if ($dom->provenance->data)
 			$base = $dom->provenance;
-		elseif($dom->env->data)
+		elseif ($dom->env->data)
 			$base = $dom->env;
-		elseif($dom->data)
+		elseif ($dom->data)
 			$base = $dom;
 
 		if (!$base) {
@@ -277,7 +352,7 @@ class Diaspora {
 		$data = base64url_decode($data);
 
 
-		if($public)
+		if ($public)
 			$inner_decrypted = $data;
 		else {
 
@@ -333,6 +408,24 @@ class Diaspora {
 			return false;
 		}
 
+		if (!($postdata = self::valid_posting($msg))) {
+			logger("Invalid posting");
+			return false;
+		}
+
+		$fields = $postdata['fields'];
+
+		// Is it a an action (comment, like, ...) for our own post?
+		if (isset($fields->parent_guid) && !$postdata["relayed"]) {
+			$guid = notags(unxmlify($fields->parent_guid));
+			$importer = self::importer_for_guid($guid);
+			if (is_array($importer)) {
+				logger("delivering to origin: ".$importer["name"]);
+				$message_id = self::dispatch($importer, $msg, $fields);
+				return $message_id;
+			}
+		}
+
 		// Now distribute it to the followers
 		$r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
 			(SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s')
@@ -344,18 +437,14 @@ class Diaspora {
 		if (dbm::is_result($r)) {
 			foreach ($r as $rr) {
 				logger("delivering to: ".$rr["username"]);
-				self::dispatch($rr,$msg);
+				self::dispatch($rr, $msg, $fields);
 			}
+		} elseif (!Config::get('system', 'relay_subscribe', false)) {
+			logger("Unwanted message from ".$msg["author"]." send by ".$_SERVER["REMOTE_ADDR"]." with ".$_SERVER["HTTP_USER_AGENT"].": ".print_r($msg, true), LOGGER_DEBUG);
 		} else {
-			$social_relay = (bool)Config::get('system', 'relay_subscribe', false);
-
 			// Use a dummy importer to import the data for the public copy
-			if ($social_relay) {
-				$importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
-				$message_id = self::dispatch($importer,$msg);
-			} else {
-				logger("Unwanted message from ".$msg["author"]." send by ".$_SERVER["REMOTE_ADDR"]." with ".$_SERVER["HTTP_USER_AGENT"].": ".print_r($msg, true), LOGGER_DEBUG);
-			}
+			$importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
+			$message_id = self::dispatch($importer, $msg, $fields);
 		}
 
 		return $message_id;
@@ -366,18 +455,23 @@ class Diaspora {
 	 *
 	 * @param array $importer Array of the importer user
 	 * @param array $msg The post that will be dispatched
+	 * @param object $fields SimpleXML object that contains the message
 	 *
 	 * @return int The message id of the generated message, "true" or "false" if there was an error
 	 */
-	public static function dispatch($importer, $msg) {
+	public static function dispatch($importer, $msg, $fields = null) {
 
 		// The sender is the handle of the contact that sent the message.
 		// This will often be different with relayed messages (for example "like" and "comment")
 		$sender = $msg["author"];
 
-		if (!self::valid_posting($msg, $fields)) {
-			logger("Invalid posting");
-			return false;
+		// This is only needed for private postings since this is already done for public ones before
+		if (is_null($fields)) {
+			if (!($postdata = self::valid_posting($msg))) {
+				logger("Invalid posting");
+				return false;
+			}
+			$fields = $postdata['fields'];
 		}
 
 		$type = $fields->getName();
@@ -439,11 +533,10 @@ class Diaspora {
 	 * It also does the conversion between the old and the new diaspora format.
 	 *
 	 * @param array $msg Array with the XML, the sender handle and the sender signature
-	 * @param object $fields SimpleXML object that contains the posting when it is valid
 	 *
-	 * @return bool Is the posting valid?
+	 * @return bool|array If the posting is valid then an array with an SimpleXML object is returned
 	 */
-	private static function valid_posting($msg, &$fields) {
+	private static function valid_posting($msg) {
 
 		$data = parse_xml_string($msg["message"], false);
 
@@ -484,38 +577,44 @@ class Diaspora {
 		foreach ($element->children() AS $fieldname => $entry) {
 			if ($oldXML) {
 				// Translation for the old XML structure
-				if ($fieldname == "diaspora_handle")
+				if ($fieldname == "diaspora_handle") {
 					$fieldname = "author";
-
-				if ($fieldname == "participant_handles")
+				}
+				if ($fieldname == "participant_handles") {
 					$fieldname = "participants";
-
+				}
 				if (in_array($type, array("like", "participation"))) {
-					if ($fieldname == "target_type")
+					if ($fieldname == "target_type") {
 						$fieldname = "parent_type";
+					}
 				}
-
-				if ($fieldname == "sender_handle")
+				if ($fieldname == "sender_handle") {
 					$fieldname = "author";
-
-				if ($fieldname == "recipient_handle")
+				}
+				if ($fieldname == "recipient_handle") {
 					$fieldname = "recipient";
-
-				if ($fieldname == "root_diaspora_id")
+				}
+				if ($fieldname == "root_diaspora_id") {
 					$fieldname = "root_author";
-
+				}
+				if ($type == "status_message") {
+					if ($fieldname == "raw_message") {
+						$fieldname = "text";
+					}
+				}
 				if ($type == "retraction") {
-					if ($fieldname == "post_guid")
+					if ($fieldname == "post_guid") {
 						$fieldname = "target_guid";
-
-					if ($fieldname == "type")
+					}
+					if ($fieldname == "type") {
 						$fieldname = "target_type";
+					}
 				}
 			}
 
-			if (($fieldname == "author_signature") AND ($entry != ""))
+			if (($fieldname == "author_signature") && ($entry != ""))
 				$author_signature = base64_decode($entry);
-			elseif (($fieldname == "parent_author_signature") AND ($entry != ""))
+			elseif (($fieldname == "parent_author_signature") && ($entry != ""))
 				$parent_author_signature = base64_decode($entry);
 			elseif (!in_array($fieldname, array("author_signature", "parent_author_signature", "target_author_signature"))) {
 				if ($signed_data != "") {
@@ -525,7 +624,7 @@ class Diaspora {
 
 				$signed_data .= $entry;
 			}
-			if (!in_array($fieldname, array("parent_author_signature", "target_author_signature")) OR
+			if (!in_array($fieldname, array("parent_author_signature", "target_author_signature")) ||
 				($orig_type == "relayable_retraction"))
 				xml::copy($entry, $fields, $fieldname);
 		}
@@ -538,9 +637,9 @@ class Diaspora {
 			}
 
 		// Only some message types have signatures. So we quit here for the other types.
-		if (!in_array($type, array("comment", "message", "like")))
-			return true;
-
+		if (!in_array($type, array("comment", "like"))) {
+			return array("fields" => $fields, "relayed" => false);
+		}
 		// No author_signature? This is a must, so we quit.
 		if (!isset($author_signature)) {
 			logger("No author signature for type ".$type." - Message: ".$msg["message"], LOGGER_DEBUG);
@@ -548,12 +647,16 @@ class Diaspora {
 		}
 
 		if (isset($parent_author_signature)) {
+			$relayed = true;
+
 			$key = self::key($msg["author"]);
 
 			if (!rsa_verify($signed_data, $parent_author_signature, $key, "sha256")) {
 				logger("No valid parent author signature for parent author ".$msg["author"]. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$parent_author_signature, LOGGER_DEBUG);
 				return false;
 			}
+		} else {
+			$relayed = false;
 		}
 
 		$key = self::key($fields->author);
@@ -561,8 +664,9 @@ class Diaspora {
 		if (!rsa_verify($signed_data, $author_signature, $key, "sha256")) {
 			logger("No valid author signature for author ".$fields->author. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$author_signature, LOGGER_DEBUG);
 			return false;
-		} else
-			return true;
+		} else {
+			return array("fields" => $fields, "relayed" => $relayed);
+		}
 	}
 
 	/**
@@ -578,7 +682,7 @@ class Diaspora {
 		logger("Fetching diaspora key for: ".$handle);
 
 		$r = self::person_by_handle($handle);
-		if($r)
+		if ($r)
 			return $r["pubkey"];
 
 		return "";
@@ -591,7 +695,7 @@ class Diaspora {
 	 *
 	 * @return array the queried data
 	 */
-	private static function person_by_handle($handle) {
+	public static function person_by_handle($handle) {
 
 		$r = q("SELECT * FROM `fcontact` WHERE `network` = '%s' AND `addr` = '%s' LIMIT 1",
 			dbesc(NETWORK_DIASPORA),
@@ -610,13 +714,13 @@ class Diaspora {
 				$update = true;
 		}
 
-		if (!$person OR $update) {
+		if (!$person || $update) {
 			logger("create or refresh", LOGGER_DEBUG);
 			$r = probe_url($handle, PROBE_DIASPORA);
 
 			// Note that Friendica contacts will return a "Diaspora person"
 			// if Diaspora connectivity is enabled on their server
-			if ($r AND ($r["network"] === NETWORK_DIASPORA)) {
+			if ($r && ($r["network"] === NETWORK_DIASPORA)) {
 				self::add_fcontact($r, $update);
 				$person = $r;
 			}
@@ -634,7 +738,7 @@ class Diaspora {
 	 */
 	private static function add_fcontact($arr, $update = false) {
 
-		if($update) {
+		if ($update) {
 			$r = q("UPDATE `fcontact` SET
 					`name` = '%s',
 					`photo` = '%s',
@@ -776,11 +880,14 @@ class Diaspora {
 		if (dbm::is_result($r)) {
 			return $r[0];
 		} else {
-			// We haven't found it?
-			// We use another function for it that will possibly create a contact entry
+			/*
+			 * We haven't found it?
+			 * We use another function for it that will possibly create a contact entry.
+			 */
 			$cid = get_contact($handle, $uid);
 
 			if ($cid > 0) {
+				/// @TODO Contact retrieval should be encapsulated into an "entity" class like `Contact`
 				$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
 
 				if (dbm::is_result($r)) {
@@ -815,10 +922,12 @@ class Diaspora {
 	 */
 	private static function post_allow($importer, $contact, $is_comment = false) {
 
-		// perhaps we were already sharing with this person. Now they're sharing with us.
-		// That makes us friends.
-		// Normally this should have handled by getting a request - but this could get lost
-		if($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
+		/*
+		 * Perhaps we were already sharing with this person. Now they're sharing with us.
+		 * That makes us friends.
+		 * Normally this should have handled by getting a request - but this could get lost
+		 */
+		if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
 			q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
 				intval(CONTACT_IS_FRIEND),
 				intval($contact["id"]),
@@ -828,17 +937,23 @@ class Diaspora {
 			logger("defining user ".$contact["nick"]." as friend");
 		}
 
-		if(($contact["blocked"]) || ($contact["readonly"]) || ($contact["archive"]))
+		// We don't seem to like that person
+		if ($contact["blocked"] || $contact["readonly"] || $contact["archive"]) {
+			// Maybe blocked, don't accept.
 			return false;
-		if($contact["rel"] == CONTACT_IS_SHARING || $contact["rel"] == CONTACT_IS_FRIEND)
+		// We are following this person?
+		} elseif (($contact["rel"] == CONTACT_IS_SHARING) || ($contact["rel"] == CONTACT_IS_FRIEND)) {
+			// Yes, then it is fine.
 			return true;
-		if($contact["rel"] == CONTACT_IS_FOLLOWER)
-			if(($importer["page-flags"] == PAGE_COMMUNITY) OR $is_comment)
-				return true;
-
-		// Messages for the global users are always accepted
-		if ($importer["uid"] == 0)
+		// Is it a post to a community?
+		} elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && ($importer["page-flags"] == PAGE_COMMUNITY)) {
+			// That's good
+			return true;
+		// Is the message a global user or a comment?
+		} elseif (($importer["uid"] == 0) || $is_comment) {
+			// Messages for the global users and comments are always accepted
 			return true;
+		}
 
 		return false;
 	}
@@ -856,7 +971,12 @@ class Diaspora {
 		$contact = self::contact_by_handle($importer["uid"], $handle);
 		if (!$contact) {
 			logger("A Contact for handle ".$handle." and user ".$importer["uid"]." was not found");
-			return false;
+			// If a contact isn't found, we accept it anyway if it is a comment
+			if ($is_comment) {
+				return $importer;
+			} else {
+				return false;
+			}
 		}
 
 		if (!self::post_allow($importer, $contact, $is_comment)) {
@@ -991,7 +1111,7 @@ class Diaspora {
 		logger("Fetch post from ".$source_url, LOGGER_DEBUG);
 
 		$envelope = fetch_url($source_url);
-		if($envelope) {
+		if ($envelope) {
 			logger("Envelope was fetched.", LOGGER_DEBUG);
 			$x = self::verify_magic_envelope($envelope);
 			if (!$x)
@@ -1007,7 +1127,7 @@ class Diaspora {
 			logger("Fetch post from ".$source_url, LOGGER_DEBUG);
 
 			$x = fetch_url($source_url);
-			if(!$x)
+			if (!$x)
 				return false;
 		}
 
@@ -1031,7 +1151,7 @@ class Diaspora {
 		// Fetch the author - for the old and the new Diaspora version
 		if ($source_xml->post->status_message->diaspora_handle)
 			$author = (string)$source_xml->post->status_message->diaspora_handle;
-		elseif ($source_xml->author AND ($source_xml->getName() == "status_message"))
+		elseif ($source_xml->author && ($source_xml->getName() == "status_message"))
 			$author = (string)$source_xml->author;
 
 		// If this isn't a "status_message" then quit
@@ -1064,7 +1184,7 @@ class Diaspora {
 			FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
 			intval($uid), dbesc($guid));
 
-		if(!$r) {
+		if (!$r) {
 			$result = self::store_by_guid($guid, $contact["url"], $uid);
 
 			if (!$result) {
@@ -1111,9 +1231,9 @@ class Diaspora {
 			$cid = $r[0]["id"];
 			$network = $r[0]["network"];
 
-			// We are receiving content from a user that is about to be terminated
+			// We are receiving content from a user that possibly is about to be terminated
 			// This means the user is vital, so we remove a possible termination date.
-			unmark_for_death($contact);
+			unmark_for_death($r[0]);
 		} else {
 			$cid = $contact["id"];
 			$network = NETWORK_DIASPORA;
@@ -1227,6 +1347,26 @@ class Diaspora {
 		}
 	}
 
+	/**
+	 * @brief Find the best importer for a comment, like, ...
+	 *
+	 * @param string $guid The guid of the item
+	 *
+	 * @return array|boolean the origin owner of that post - or false
+	 */
+	private static function importer_for_guid($guid) {
+		$item = dba::fetch_first("SELECT `uid` FROM `item` WHERE `origin` AND `guid` = ? LIMIT 1", $guid);
+
+		if (dbm::is_result($item)) {
+			logger("Found user ".$item['uid']." as owner of item ".$guid, LOGGER_DEBUG);
+			$contact = dba::fetch_first("SELECT * FROM `contact` WHERE `self` AND `uid` = ?", $item['uid']);
+			if (dbm::is_result($contact)) {
+				return $contact;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * @brief Processes an incoming comment
 	 *
@@ -1238,10 +1378,10 @@ class Diaspora {
 	 * @return int The message id of the generated comment or "false" if there was an error
 	 */
 	private static function receive_comment($importer, $sender, $data, $xml) {
+		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
 		$parent_guid = notags(unxmlify($data->parent_guid));
 		$text = unxmlify($data->text);
-		$author = notags(unxmlify($data->author));
 
 		if (isset($data->created_at)) {
 			$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
@@ -1263,7 +1403,7 @@ class Diaspora {
 
 		$message_id = self::message_exists($importer["uid"], $guid);
 		if ($message_id) {
-			return $message_id;
+			return true;
 		}
 
 		$parent_item = self::parent_item($importer["uid"], $parent_guid, $author, $contact);
@@ -1308,7 +1448,9 @@ class Diaspora {
 		}
 
 		$datarray["object-type"] = ACTIVITY_OBJ_COMMENT;
-		$datarray["object"] = $xml;
+
+		$datarray["protocol"] = PROTOCOL_DIASPORA;
+		$datarray["source"] = $xml;
 
 		$datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
 
@@ -1320,12 +1462,16 @@ class Diaspora {
 
 		$message_id = item_store($datarray);
 
+		if ($message_id <= 0) {
+			return false;
+		}
+
 		if ($message_id) {
 			logger("Stored comment ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
 		}
 
 		// If we are the origin of the parent we store the original data and notify our followers
-		if($message_id AND $parent_item["origin"]) {
+		if ($message_id && $parent_item["origin"]) {
 
 			// Formerly we stored the signed text, the signature and the author in different fields.
 			// We now store the raw data so that we are more flexible.
@@ -1338,7 +1484,7 @@ class Diaspora {
 			proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $message_id);
 		}
 
-		return $message_id;
+		return true;
 	}
 
 	/**
@@ -1354,16 +1500,9 @@ class Diaspora {
 	 * @return bool "true" if it was successful
 	 */
 	private static function receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation) {
+		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
 		$subject = notags(unxmlify($data->subject));
-		$author = notags(unxmlify($data->author));
-
-		$msg_guid = notags(unxmlify($mesg->guid));
-		$msg_parent_guid = notags(unxmlify($mesg->parent_guid));
-		$msg_parent_author_signature = notags(unxmlify($mesg->parent_author_signature));
-		$msg_author_signature = notags(unxmlify($mesg->author_signature));
-		$msg_text = unxmlify($mesg->text);
-		$msg_created_at = datetime_convert("UTC", "UTC", notags(unxmlify($mesg->created_at)));
 
 		// "diaspora_handle" is the element name from the old version
 		// "author" is the element name from the new version
@@ -1375,7 +1514,10 @@ class Diaspora {
 			return false;
 		}
 
+		$msg_guid = notags(unxmlify($mesg->guid));
 		$msg_conversation_guid = notags(unxmlify($mesg->conversation_guid));
+		$msg_text = unxmlify($mesg->text);
+		$msg_created_at = datetime_convert("UTC", "UTC", notags(unxmlify($mesg->created_at)));
 
 		if ($msg_conversation_guid != $guid) {
 			logger("message conversation guid does not belong to the current conversation.");
@@ -1385,44 +1527,11 @@ class Diaspora {
 		$body = diaspora2bb($msg_text);
 		$message_uri = $msg_author.":".$msg_guid;
 
-		$author_signed_data = $msg_guid.";".$msg_parent_guid.";".$msg_text.";".unxmlify($mesg->created_at).";".$msg_author.";".$msg_conversation_guid;
-
-		$author_signature = base64_decode($msg_author_signature);
-
-		if (strcasecmp($msg_author,$msg["author"]) == 0) {
-			$person = $contact;
-			$key = $msg["key"];
-		} else {
-			$person = self::person_by_handle($msg_author);
-
-			if (is_array($person) && x($person, "pubkey")) {
-				$key = $person["pubkey"];
-			} else {
-				logger("unable to find author details");
-					return false;
-			}
-		}
-
-		if (!rsa_verify($author_signed_data, $author_signature, $key, "sha256")) {
-			logger("verification failed.");
-			return false;
-		}
-
-		if ($msg_parent_author_signature) {
-			$owner_signed_data = $msg_guid.";".$msg_parent_guid.";".$msg_text.";".unxmlify($mesg->created_at).";".$msg_author.";".$msg_conversation_guid;
-
-			$parent_author_signature = base64_decode($msg_parent_author_signature);
-
-			$key = $msg["key"];
+		$person = self::person_by_handle($msg_author);
 
-			if (!rsa_verify($owner_signed_data, $parent_author_signature, $key, "sha256")) {
-				logger("owner verification failed.");
-				return false;
-			}
-		}
-
-		$r = q("SELECT `id` FROM `mail` WHERE `uri` = '%s' LIMIT 1",
-			dbesc($message_uri)
+		$r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
+			dbesc($msg_guid),
+			intval($importer["uid"])
 		);
 		if (dbm::is_result($r)) {
 			logger("duplicate message already delivered.", LOGGER_DEBUG);
@@ -1479,10 +1588,10 @@ class Diaspora {
 	 * @return bool Success
 	 */
 	private static function receive_conversation($importer, $msg, $data) {
+		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
 		$subject = notags(unxmlify($data->subject));
 		$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
-		$author = notags(unxmlify($data->author));
 		$participants = notags(unxmlify($data->participants));
 
 		$messages = $data->message;
@@ -1502,7 +1611,7 @@ class Diaspora {
 			intval($importer["uid"]),
 			dbesc($guid)
 		);
-		if($c)
+		if ($c)
 			$conversation = $c[0];
 		else {
 			$r = q("INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`)
@@ -1515,21 +1624,21 @@ class Diaspora {
 				dbesc($subject),
 				dbesc($participants)
 			);
-			if($r)
+			if ($r)
 				$c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
 					intval($importer["uid"]),
 					dbesc($guid)
 				);
 
-			if($c)
+			if ($c)
 				$conversation = $c[0];
 		}
 		if (!$conversation) {
 			logger("unable to create conversation.");
-			return;
+			return false;
 		}
 
-		foreach($messages as $mesg)
+		foreach ($messages as $mesg)
 			self::receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation);
 
 		return true;
@@ -1587,11 +1696,11 @@ class Diaspora {
 	 * @return int The message id of the generated like or "false" if there was an error
 	 */
 	private static function receive_like($importer, $sender, $data) {
-		$positive = notags(unxmlify($data->positive));
+		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
-		$parent_type = notags(unxmlify($data->parent_type));
 		$parent_guid = notags(unxmlify($data->parent_guid));
-		$author = notags(unxmlify($data->author));
+		$parent_type = notags(unxmlify($data->parent_type));
+		$positive = notags(unxmlify($data->positive));
 
 		// likes on comments aren't supported by Diaspora - only on posts
 		// But maybe this will be supported in the future, so we will accept it.
@@ -1604,7 +1713,7 @@ class Diaspora {
 
 		$message_id = self::message_exists($importer["uid"], $guid);
 		if ($message_id)
-			return $message_id;
+			return true;
 
 		$parent_item = self::parent_item($importer["uid"], $parent_guid, $author, $contact);
 		if (!$parent_item)
@@ -1628,6 +1737,8 @@ class Diaspora {
 
 		$datarray = array();
 
+		$datarray["protocol"] = PROTOCOL_DIASPORA;
+
 		$datarray["uid"] = $importer["uid"];
 		$datarray["contact-id"] = $author_contact["cid"];
 		$datarray["network"]  = $author_contact["network"];
@@ -1655,11 +1766,16 @@ class Diaspora {
 
 		$message_id = item_store($datarray);
 
-		if ($message_id)
+		if ($message_id <= 0) {
+			return false;
+		}
+
+		if ($message_id) {
 			logger("Stored like ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
+		}
 
 		// If we are the origin of the parent we store the original data and notify our followers
-		if($message_id AND $parent_item["origin"]) {
+		if ($message_id && $parent_item["origin"]) {
 
 			// Formerly we stored the signed text, the signature and the author in different fields.
 			// We now store the raw data so that we are more flexible.
@@ -1672,7 +1788,7 @@ class Diaspora {
 			proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $message_id);
 		}
 
-		return $message_id;
+		return true;
 	}
 
 	/**
@@ -1684,12 +1800,11 @@ class Diaspora {
 	 * @return bool Success?
 	 */
 	private static function receive_message($importer, $data) {
+		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
-		$parent_guid = notags(unxmlify($data->parent_guid));
+		$conversation_guid = notags(unxmlify($data->conversation_guid));
 		$text = unxmlify($data->text);
 		$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
-		$author = notags(unxmlify($data->author));
-		$conversation_guid = notags(unxmlify($data->conversation_guid));
 
 		$contact = self::allowed_contact_by_handle($importer, $author, true);
 		if (!$contact) {
@@ -1717,8 +1832,8 @@ class Diaspora {
 			return false;
 		}
 
-		$r = q("SELECT `id` FROM `mail` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-			dbesc($message_uri),
+		$r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
+			dbesc($guid),
 			intval($importer["uid"])
 		);
 		if (dbm::is_result($r)) {
@@ -1744,7 +1859,7 @@ class Diaspora {
 			0,
 			1,
 			dbesc($message_uri),
-			dbesc($author.":".$parent_guid),
+			dbesc($author.":".$conversation["guid"]),
 			dbesc($created_at)
 		);
 
@@ -1813,9 +1928,9 @@ class Diaspora {
 		$name = unxmlify($data->first_name).((strlen($data->last_name)) ? " ".unxmlify($data->last_name) : "");
 		$image_url = unxmlify($data->image_url);
 		$birthday = unxmlify($data->birthday);
-		$location = diaspora2bb(unxmlify($data->location));
-		$about = diaspora2bb(unxmlify($data->bio));
 		$gender = unxmlify($data->gender);
+		$about = diaspora2bb(unxmlify($data->bio));
+		$location = diaspora2bb(unxmlify($data->location));
 		$searchable = (unxmlify($data->searchable) == "true");
 		$nsfw = (unxmlify($data->nsfw) == "true");
 		$tags = unxmlify($data->tag_string);
@@ -1834,10 +1949,10 @@ class Diaspora {
 		$handle_parts = explode("@", $author);
 		$nick = $handle_parts[0];
 
-		if($name === "")
+		if ($name === "")
 			$name = $handle_parts[0];
 
-		if( preg_match("|^https?://|", $image_url) === 0)
+		if ( preg_match("|^https?://|", $image_url) === 0)
 			$image_url = "http://".$handle_parts[1].$image_url;
 
 		update_contact_avatar($image_url, $importer["uid"], $contact["id"]);
@@ -1852,7 +1967,7 @@ class Diaspora {
 		// this is to prevent multiple birthday notifications in a single year
 		// if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year
 
-		if(substr($birthday,5) === substr($contact["bd"],5))
+		if (substr($birthday,5) === substr($contact["bd"],5))
 			$birthday = $contact["bd"];
 
 		$r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `name-date` = '%s', `bd` = '%s',
@@ -1895,7 +2010,7 @@ class Diaspora {
 
 		$a = get_app();
 
-		if($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
+		if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
 			q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
 				intval(CONTACT_IS_FRIEND),
 				intval($contact["id"]),
@@ -1908,7 +2023,7 @@ class Diaspora {
 			intval($importer["uid"])
 		);
 
-		if($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) {
+		if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) {
 
 			$self = q("SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1",
 				intval($importer["uid"])
@@ -1916,9 +2031,10 @@ class Diaspora {
 
 			// they are not CONTACT_IS_FOLLOWER anymore but that's what we have in the array
 
-			if($self && $contact["rel"] == CONTACT_IS_FOLLOWER) {
+			if ($self && $contact["rel"] == CONTACT_IS_FOLLOWER) {
 
 				$arr = array();
+				$arr["protocol"] = PROTOCOL_DIASPORA;
 				$arr["uri"] = $arr["parent-uri"] = item_new_uri($a->get_hostname(), $importer["uid"]);
 				$arr["uid"] = $importer["uid"];
 				$arr["contact-id"] = $self[0]["id"];
@@ -1947,7 +2063,7 @@ class Diaspora {
 				$arr["deny_gid"]  = $user[0]["deny_gid"];
 
 				$i = item_store($arr);
-				if($i)
+				if ($i)
 					proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
 			}
 		}
@@ -2008,7 +2124,7 @@ class Diaspora {
 		// perhaps we were already sharing with this person. Now they're sharing with us.
 		// That makes us friends.
 		if ($contact) {
-			if ($following AND $sharing) {
+			if ($following && $sharing) {
 				logger("Author ".$author." (Contact ".$contact["id"].") wants to have a bidirectional conection.", LOGGER_DEBUG);
 				self::receive_request_make_friend($importer, $contact);
 
@@ -2031,17 +2147,17 @@ class Diaspora {
 			}
 		}
 
-		if (!$following AND $sharing AND in_array($importer["page-flags"], array(PAGE_SOAPBOX, PAGE_NORMAL))) {
+		if (!$following && $sharing && in_array($importer["page-flags"], array(PAGE_SOAPBOX, PAGE_NORMAL))) {
 			logger("Author ".$author." wants to share with us - but doesn't want to listen. Request is ignored.", LOGGER_DEBUG);
 			return false;
-		} elseif (!$following AND !$sharing) {
+		} elseif (!$following && !$sharing) {
 			logger("Author ".$author." doesn't want anything - and we don't know the author. Request is ignored.", LOGGER_DEBUG);
 			return false;
-		} elseif (!$following AND $sharing) {
+		} elseif (!$following && $sharing) {
 			logger("Author ".$author." wants to share with us.", LOGGER_DEBUG);
-		} elseif ($following AND $sharing) {
+		} elseif ($following && $sharing) {
 			logger("Author ".$author." wants to have a bidirectional conection.", LOGGER_DEBUG);
-		} elseif ($following AND !$sharing) {
+		} elseif ($following && !$sharing) {
 			logger("Author ".$author." wants to listen to us.", LOGGER_DEBUG);
 		}
 
@@ -2086,12 +2202,12 @@ class Diaspora {
 
 		$def_gid = get_default_group($importer['uid'], $ret["network"]);
 
-		if(intval($def_gid))
+		if (intval($def_gid))
 			group_add_member($importer["uid"], "", $contact_record["id"], $def_gid);
 
 		update_contact_avatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
 
-		if($importer["page-flags"] == PAGE_NORMAL) {
+		if ($importer["page-flags"] == PAGE_NORMAL) {
 
 			logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
 
@@ -2119,9 +2235,9 @@ class Diaspora {
 			// but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
 			// we are going to change the relationship and make them a follower.
 
-			if (($importer["page-flags"] == PAGE_FREELOVE) AND $sharing AND $following)
+			if (($importer["page-flags"] == PAGE_FREELOVE) && $sharing && $following)
 				$new_relation = CONTACT_IS_FRIEND;
-			elseif (($importer["page-flags"] == PAGE_FREELOVE) AND $sharing)
+			elseif (($importer["page-flags"] == PAGE_FREELOVE) && $sharing)
 				$new_relation = CONTACT_IS_SHARING;
 			else
 				$new_relation = CONTACT_IS_FOLLOWER;
@@ -2141,7 +2257,7 @@ class Diaspora {
 			);
 
 			$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
-			if($u) {
+			if ($u) {
 				logger("Sending share message (Relation: ".$new_relation.") to author ".$author." - Contact: ".$contact_record["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
 				$ret = self::send_share($u[0], $contact_record);
 
@@ -2234,12 +2350,13 @@ class Diaspora {
 	 * @return int the message id
 	 */
 	private static function receive_reshare($importer, $data, $xml) {
+		$author = notags(unxmlify($data->author));
+		$guid = notags(unxmlify($data->guid));
+		$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
 		$root_author = notags(unxmlify($data->root_author));
 		$root_guid = notags(unxmlify($data->root_guid));
-		$guid = notags(unxmlify($data->guid));
-		$author = notags(unxmlify($data->author));
+		/// @todo handle unprocessed property "provider_display_name"
 		$public = notags(unxmlify($data->public));
-		$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
 
 		$contact = self::allowed_contact_by_handle($importer, $author, false);
 		if (!$contact) {
@@ -2248,7 +2365,7 @@ class Diaspora {
 
 		$message_id = self::message_exists($importer["uid"], $guid);
 		if ($message_id) {
-			return $message_id;
+			return true;
 		}
 
 		$original_item = self::original_item($root_guid, $root_author, $author);
@@ -2278,7 +2395,8 @@ class Diaspora {
 		$datarray["verb"] = ACTIVITY_POST;
 		$datarray["gravity"] = GRAVITY_PARENT;
 
-		$datarray["object"] = $xml;
+		$datarray["protocol"] = PROTOCOL_DIASPORA;
+		$datarray["source"] = $xml;
 
 		$prefix = share_header($original_item["author-name"], $original_item["author-link"], $original_item["author-avatar"],
 					$original_item["guid"], $original_item["created"], $orig_url);
@@ -2298,9 +2416,10 @@ class Diaspora {
 
 		if ($message_id) {
 			logger("Stored reshare ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
+			return true;
+		} else {
+			return false;
 		}
-
-		return $message_id;
 	}
 
 	/**
@@ -2313,9 +2432,9 @@ class Diaspora {
 	 * @return bool success
 	 */
 	private static function item_retraction($importer, $contact, $data) {
-		$target_type = notags(unxmlify($data->target_type));
-		$target_guid = notags(unxmlify($data->target_guid));
 		$author = notags(unxmlify($data->author));
+		$target_guid = notags(unxmlify($data->target_guid));
+		$target_type = notags(unxmlify($data->target_type));
 
 		$person = self::person_by_handle($author);
 		if (!is_array($person)) {
@@ -2323,11 +2442,16 @@ class Diaspora {
 			return false;
 		}
 
+		if (!isset($contact["url"])) {
+			$contact["url"] = $person["url"];
+		}
+
 		$r = q("SELECT `id`, `parent`, `parent-uri`, `author-link` FROM `item` WHERE `guid` = '%s' AND `uid` = %d AND NOT `file` LIKE '%%[%%' LIMIT 1",
 			dbesc($target_guid),
 			intval($importer["uid"])
 		);
 		if (!$r) {
+			logger("Target guid ".$target_guid." was not found for user ".$importer["uid"]);
 			return false;
 		}
 
@@ -2336,7 +2460,7 @@ class Diaspora {
 			intval($r[0]["parent"]));
 
 		// Only delete it if the parent author really fits
-		if (!link_compare($p[0]["author-link"], $contact["url"]) AND !link_compare($r[0]["author-link"], $contact["url"])) {
+		if (!link_compare($p[0]["author-link"], $contact["url"]) && !link_compare($r[0]["author-link"], $contact["url"])) {
 			logger("Thread author ".$p[0]["author-link"]." and item author ".$r[0]["author-link"]." don't fit to expected contact ".$contact["url"], LOGGER_DEBUG);
 			return false;
 		}
@@ -2373,7 +2497,7 @@ class Diaspora {
 		$target_type = notags(unxmlify($data->target_type));
 
 		$contact = self::contact_by_handle($importer["uid"], $sender);
-		if (!$contact) {
+		if (!$contact && (in_array($target_type, array("Contact", "Person")))) {
 			logger("cannot find contact for sender: ".$sender." and user ".$importer["uid"]);
 			return false;
 		}
@@ -2383,10 +2507,10 @@ class Diaspora {
 		switch ($target_type) {
 			case "Comment":
 			case "Like":
-			case "Post": // "Post" will be supported in a future version
+			case "Post":
 			case "Reshare":
 			case "StatusMessage":
-				return self::item_retraction($importer, $contact, $data);;
+				return self::item_retraction($importer, $contact, $data);
 
 			case "Contact":
 			case "Person":
@@ -2412,19 +2536,13 @@ class Diaspora {
 	 * @return int The message id of the newly created item
 	 */
 	private static function receive_status_message($importer, $data, $xml) {
-		$raw_message = unxmlify($data->raw_message);
-		$guid = notags(unxmlify($data->guid));
 		$author = notags(unxmlify($data->author));
-		$public = notags(unxmlify($data->public));
+		$guid = notags(unxmlify($data->guid));
 		$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
+		$public = notags(unxmlify($data->public));
+		$text = unxmlify($data->text);
 		$provider_display_name = notags(unxmlify($data->provider_display_name));
 
-		/// @todo enable support for polls
-		//if ($data->poll) {
-		//	foreach ($data->poll AS $poll)
-		//		print_r($poll);
-		//	die("poll!\n");
-		//}
 		$contact = self::allowed_contact_by_handle($importer, $author, false);
 		if (!$contact) {
 			return false;
@@ -2432,7 +2550,7 @@ class Diaspora {
 
 		$message_id = self::message_exists($importer["uid"], $guid);
 		if ($message_id) {
-			return $message_id;
+			return true;
 		}
 
 		$address = array();
@@ -2442,7 +2560,7 @@ class Diaspora {
 			}
 		}
 
-		$body = diaspora2bb($raw_message);
+		$body = diaspora2bb($text);
 
 		$datarray = array();
 
@@ -2463,6 +2581,15 @@ class Diaspora {
 			}
 		}
 
+		/// @todo enable support for polls
+		//if ($data->poll) {
+		//	foreach ($data->poll AS $poll)
+		//		print_r($poll);
+		//	die("poll!\n");
+		//}
+
+		/// @todo enable support for events
+
 		$datarray["uid"] = $importer["uid"];
 		$datarray["contact-id"] = $contact["id"];
 		$datarray["network"] = NETWORK_DIASPORA;
@@ -2481,7 +2608,8 @@ class Diaspora {
 		$datarray["verb"] = ACTIVITY_POST;
 		$datarray["gravity"] = GRAVITY_PARENT;
 
-		$datarray["object"] = $xml;
+		$datarray["protocol"] = PROTOCOL_DIASPORA;
+		$datarray["source"] = $xml;
 
 		$datarray["body"] = self::replace_people_guid($body, $contact["url"]);
 
@@ -2497,7 +2625,7 @@ class Diaspora {
 			$datarray["location"] = $address["address"];
 		}
 
-		if (isset($address["lat"]) AND isset($address["lng"])) {
+		if (isset($address["lat"]) && isset($address["lng"])) {
 			$datarray["coord"] = $address["lat"]." ".$address["lng"];
 		}
 
@@ -2506,9 +2634,10 @@ class Diaspora {
 
 		if ($message_id) {
 			logger("Stored item ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
+			return true;
+		} else {
+			return false;
 		}
-
-		return $message_id;
 	}
 
 	/* ************************************************************************************** *
@@ -2538,42 +2667,9 @@ class Diaspora {
 		return $nick."@".substr(App::get_baseurl(), strpos(App::get_baseurl(),"://") + 3);
 	}
 
-	/**
-	 * @brief Creates the envelope for the "fetch" endpoint
-	 *
-	 * @param string $msg The message that is to be transmitted
-	 * @param array $user The record of the sender
-	 *
-	 * @return string The envelope
-	 */
-
-	public static function build_magic_envelope($msg, $user) {
-
-		$b64url_data = base64url_encode($msg);
-		$data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
-
-		$key_id = base64url_encode(self::my_handle($user));
-		$type = "application/xml";
-		$encoding = "base64url";
-		$alg = "RSA-SHA256";
-		$signable_data = $data.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg);
-		$signature = rsa_sign($signable_data, $user["prvkey"]);
-		$sig = base64url_encode($signature);
-
-		$xmldata = array("me:env" => array("me:data" => $data,
-							"@attributes" => array("type" => $type),
-							"me:encoding" => $encoding,
-							"me:alg" => $alg,
-							"me:sig" => $sig,
-							"@attributes2" => array("key_id" => $key_id)));
-
-		$namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
-
-		return xml::from_array($xmldata, $xml, false, $namespaces);
-	}
 
 	/**
-	 * @brief Creates the envelope for a public message
+	 * @brief Creates the data for a private message in the new format
 	 *
 	 * @param string $msg The message that is to be transmitted
 	 * @param array $user The record of the sender
@@ -2581,129 +2677,72 @@ class Diaspora {
 	 * @param string $prvkey The private key of the sender
 	 * @param string $pubkey The public key of the receiver
 	 *
-	 * @return string The envelope
+	 * @return string The encrypted data
 	 */
-	private static function build_public_message($msg, $user, $contact, $prvkey, $pubkey) {
+	public static function encode_private_data($msg, $user, $contact, $prvkey, $pubkey) {
 
 		logger("Message: ".$msg, LOGGER_DATA);
 
-		$handle = self::my_handle($user);
-
-		$b64url_data = base64url_encode($msg);
-
-		$data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
-
-		$type = "application/xml";
-		$encoding = "base64url";
-		$alg = "RSA-SHA256";
+		// without a public key nothing will work
+		if (!$pubkey) {
+			logger("pubkey missing: contact id: ".$contact["id"]);
+			return false;
+		}
 
-		$signable_data = $data.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg);
+		$aes_key = openssl_random_pseudo_bytes(32);
+		$b_aes_key = base64_encode($aes_key);
+		$iv = openssl_random_pseudo_bytes(16);
+		$b_iv = base64_encode($iv);
 
-		$signature = rsa_sign($signable_data,$prvkey);
-		$sig = base64url_encode($signature);
+		$ciphertext = self::aes_encrypt($aes_key, $iv, $msg);
 
-		$xmldata = array("diaspora" => array("header" => array("author_id" => $handle),
-							"me:env" => array("me:encoding" => $encoding,
-							"me:alg" => $alg,
-							"me:data" => $data,
-							"@attributes" => array("type" => $type),
-							"me:sig" => $sig)));
+		$json = json_encode(array("iv" => $b_iv, "key" => $b_aes_key));
 
-		$namespaces = array("" => "https://joindiaspora.com/protocol",
-				"me" => "http://salmon-protocol.org/ns/magic-env");
+		$encrypted_key_bundle = "";
+		openssl_public_encrypt($json, $encrypted_key_bundle, $pubkey);
 
-		$magic_env = xml::from_array($xmldata, $xml, false, $namespaces);
+		$json_object = json_encode(array("aes_key" => base64_encode($encrypted_key_bundle),
+						"encrypted_magic_envelope" => base64_encode($ciphertext)));
 
-		logger("magic_env: ".$magic_env, LOGGER_DATA);
-		return $magic_env;
+		return $json_object;
 	}
 
 	/**
-	 * @brief Creates the envelope for a private message
+	 * @brief Creates the envelope for the "fetch" endpoint and for the new format
 	 *
 	 * @param string $msg The message that is to be transmitted
 	 * @param array $user The record of the sender
-	 * @param array $contact Target of the communication
-	 * @param string $prvkey The private key of the sender
-	 * @param string $pubkey The public key of the receiver
 	 *
 	 * @return string The envelope
 	 */
-	private static function build_private_message($msg, $user, $contact, $prvkey, $pubkey) {
-
-		logger("Message: ".$msg, LOGGER_DATA);
-
-		// without a public key nothing will work
-
-		if (!$pubkey) {
-			logger("pubkey missing: contact id: ".$contact["id"]);
-			return false;
-		}
-
-		$inner_aes_key = random_string(32);
-		$b_inner_aes_key = base64_encode($inner_aes_key);
-		$inner_iv = random_string(16);
-		$b_inner_iv = base64_encode($inner_iv);
-
-		$outer_aes_key = random_string(32);
-		$b_outer_aes_key = base64_encode($outer_aes_key);
-		$outer_iv = random_string(16);
-		$b_outer_iv = base64_encode($outer_iv);
-
-		$handle = self::my_handle($user);
-
-		$inner_encrypted = self::aes_encrypt($inner_aes_key, $inner_iv, $msg);
-
-		$b64_data = base64_encode($inner_encrypted);
-
+	public static function build_magic_envelope($msg, $user) {
 
-		$b64url_data = base64url_encode($b64_data);
+		$b64url_data = base64url_encode($msg);
 		$data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
 
+		$key_id = base64url_encode(self::my_handle($user));
 		$type = "application/xml";
 		$encoding = "base64url";
 		$alg = "RSA-SHA256";
-
 		$signable_data = $data.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg);
 
-		$signature = rsa_sign($signable_data,$prvkey);
-		$sig = base64url_encode($signature);
-
-		$xmldata = array("decrypted_header" => array("iv" => $b_inner_iv,
-							"aes_key" => $b_inner_aes_key,
-							"author_id" => $handle));
-
-		$decrypted_header = xml::from_array($xmldata, $xml, true);
-
-		$ciphertext = self::aes_encrypt($outer_aes_key, $outer_iv, $decrypted_header);
-
-		$outer_json = json_encode(array("iv" => $b_outer_iv, "key" => $b_outer_aes_key));
-
-		$encrypted_outer_key_bundle = "";
-		openssl_public_encrypt($outer_json, $encrypted_outer_key_bundle, $pubkey);
-
-		$b64_encrypted_outer_key_bundle = base64_encode($encrypted_outer_key_bundle);
-
-		logger("outer_bundle: ".$b64_encrypted_outer_key_bundle." key: ".$pubkey, LOGGER_DATA);
-
-		$encrypted_header_json_object = json_encode(array("aes_key" => base64_encode($encrypted_outer_key_bundle),
-								"ciphertext" => base64_encode($ciphertext)));
-		$cipher_json = base64_encode($encrypted_header_json_object);
+		// Fallback if the private key wasn't transmitted in the expected field
+		if ($user['uprvkey'] == "")
+			$user['uprvkey'] = $user['prvkey'];
 
-		$xmldata = array("diaspora" => array("encrypted_header" => $cipher_json,
-						"me:env" => array("me:encoding" => $encoding,
-								"me:alg" => $alg,
-								"me:data" => $data,
-								"@attributes" => array("type" => $type),
-								"me:sig" => $sig)));
+		$signature = rsa_sign($signable_data, $user["uprvkey"]);
+		$sig = base64url_encode($signature);
 
-		$namespaces = array("" => "https://joindiaspora.com/protocol",
-				"me" => "http://salmon-protocol.org/ns/magic-env");
+		$xmldata = array("me:env" => array("me:data" => $data,
+							"@attributes" => array("type" => $type),
+							"me:encoding" => $encoding,
+							"me:alg" => $alg,
+							"me:sig" => $sig,
+							"@attributes2" => array("key_id" => $key_id)));
 
-		$magic_env = xml::from_array($xmldata, $xml, false, $namespaces);
+		$namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
 
-		logger("magic_env: ".$magic_env, LOGGER_DATA);
-		return $magic_env;
+		return xml::from_array($xmldata, $xml, false, $namespaces);
 	}
 
 	/**
@@ -2720,14 +2759,15 @@ class Diaspora {
 	 */
 	private static function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) {
 
-		if ($public)
-			$magic_env =  self::build_public_message($msg,$user,$contact,$prvkey,$pubkey);
-		else
-			$magic_env =  self::build_private_message($msg,$user,$contact,$prvkey,$pubkey);
+		// The message is put into an envelope with the sender's signature
+		$envelope = self::build_magic_envelope($msg, $user);
+
+		// Private messages are put into a second envelope, encrypted with the receivers public key
+		if (!$public) {
+			$envelope = self::encode_private_data($envelope, $user, $contact, $prvkey, $pubkey);
+		}
 
-		// The data that will be transmitted is double encoded via "urlencode", strange ...
-		$slap = "xml=".urlencode(urlencode($magic_env));
-		return $slap;
+		return $envelope;
 	}
 
 	/**
@@ -2753,19 +2793,19 @@ class Diaspora {
 	 *
 	 * @param array $owner the array of the item owner
 	 * @param array $contact Target of the communication
-	 * @param string $slap The message that is to be transmitted
+	 * @param string $envelope The message that is to be transmitted
 	 * @param bool $public_batch Is it a public post?
 	 * @param bool $queue_run Is the transmission called from the queue?
 	 * @param string $guid message guid
 	 *
 	 * @return int Result of the transmission
 	 */
-	public static function transmit($owner, $contact, $slap, $public_batch, $queue_run=false, $guid = "") {
+	public static function transmit($owner, $contact, $envelope, $public_batch, $queue_run=false, $guid = "") {
 
 		$a = get_app();
 
 		$enabled = intval(get_config("system", "diaspora_enabled"));
-		if(!$enabled)
+		if (!$enabled)
 			return 200;
 
 		$logid = random_string(4);
@@ -2781,7 +2821,9 @@ class Diaspora {
 			$return_code = 0;
 		} else {
 			if (!intval(get_config("system", "diaspora_test"))) {
-				post_url($dest_url."/", $slap);
+				$content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
+
+				post_url($dest_url."/", $envelope, array("Content-Type: ".$content_type));
 				$return_code = $a->get_curl_code();
 			} else {
 				logger("test_mode");
@@ -2797,19 +2839,19 @@ class Diaspora {
 			$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d AND `network` = '%s' AND `content` = '%s' AND `batch` = %d LIMIT 1",
 				intval($contact["id"]),
 				dbesc(NETWORK_DIASPORA),
-				dbesc($slap),
+				dbesc($envelope),
 				intval($public_batch)
 			);
 			if ($r) {
 				logger("add_to_queue ignored - identical item already in queue");
 			} else {
 				// queue message for redelivery
-				add_to_queue($contact["id"], NETWORK_DIASPORA, $slap, $public_batch);
+				add_to_queue($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch);
 
 				// The message could not be delivered. We mark the contact as "dead"
 				mark_for_death($contact);
 			}
-		} elseif (($return_code >= 200) AND ($return_code <= 299)) {
+		} elseif (($return_code >= 200) && ($return_code <= 299)) {
 			// We successfully delivered a message, the contact is alive
 			unmark_for_death($contact);
 		}
@@ -2828,7 +2870,8 @@ class Diaspora {
 	 */
 	public static function build_post_xml($type, $message) {
 
-		$data = array("XML" => array("post" => array($type => $message)));
+		$data = array($type => $message);
+
 		return xml::from_array($data, $xml);
 	}
 
@@ -2856,13 +2899,13 @@ class Diaspora {
 		if ($owner['uprvkey'] == "")
 			$owner['uprvkey'] = $owner['prvkey'];
 
-		$slap = self::build_message($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
+		$envelope = self::build_message($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
 
 		if ($spool) {
-			add_to_queue($contact['id'], NETWORK_DIASPORA, $slap, $public_batch);
+			add_to_queue($contact['id'], NETWORK_DIASPORA, $envelope, $public_batch);
 			return true;
 		} else
-			$return_code = self::transmit($owner, $contact, $slap, $public_batch, false, $guid);
+			$return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid);
 
 		logger("guid: ".$item["guid"]." result ".$return_code, LOGGER_DEBUG);
 
@@ -2877,14 +2920,37 @@ class Diaspora {
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function send_share($owner,$contact) {
-
-		$message = array("sender_handle" => self::my_handle($owner),
-				"recipient_handle" => $contact["addr"]);
+	public static function send_share($owner, $contact) {
+
+		/**
+		 * @todo support the different possible combinations of "following" and "sharing"
+		 * Currently, Diaspora only interprets the "sharing" field
+		 *
+		 * Before switching this code productive, we have to check all "send_share" calls if "rel" is set correctly
+		 */
+
+		/*
+		switch ($contact["rel"]) {
+			case CONTACT_IS_FRIEND:
+				$following = true;
+				$sharing = true;
+			case CONTACT_IS_SHARING:
+				$following = false;
+				$sharing = true;
+			case CONTACT_IS_FOLLOWER:
+				$following = true;
+				$sharing = false;
+		}
+		*/
+
+		$message = array("author" => self::my_handle($owner),
+				"recipient" => $contact["addr"],
+				"following" => "true",
+				"sharing" => "true");
 
 		logger("Send share ".print_r($message, true), LOGGER_DEBUG);
 
-		return self::build_and_transmit($owner, $contact, "request", $message);
+		return self::build_and_transmit($owner, $contact, "contact", $message);
 	}
 
 	/**
@@ -2895,15 +2961,16 @@ class Diaspora {
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function send_unshare($owner,$contact) {
+	public static function send_unshare($owner, $contact) {
 
-		$message = array("post_guid" => $owner["guid"],
-				"diaspora_handle" => self::my_handle($owner),
-				"type" => "Person");
+		$message = array("author" => self::my_handle($owner),
+				"recipient" => $contact["addr"],
+				"following" => "false",
+				"sharing" => "false");
 
 		logger("Send unshare ".print_r($message, true), LOGGER_DEBUG);
 
-		return self::build_and_transmit($owner, $contact, "retraction", $message);
+		return self::build_and_transmit($owner, $contact, "contact", $message);
 	}
 
 	/**
@@ -2919,7 +2986,7 @@ class Diaspora {
 
 		// Skip if it isn't a pure repeated messages
 		// Does it start with a share?
-		if ((strpos($body, "[share") > 0) AND $complete)
+		if ((strpos($body, "[share") > 0) && $complete)
 			return(false);
 
 		// Does it end with a share?
@@ -2967,7 +3034,7 @@ class Diaspora {
 		$ret= array();
 
 		$ret["root_handle"] = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile);
-		if (($ret["root_handle"] == $profile) OR ($ret["root_handle"] == ""))
+		if (($ret["root_handle"] == $profile) || ($ret["root_handle"] == ""))
 			return(false);
 
 		$link = "";
@@ -2980,7 +3047,7 @@ class Diaspora {
 			$link = $matches[1];
 
 		$ret["root_guid"] = preg_replace("=https?://(.*)/posts/(.*)=ism", "$2", $link);
-		if (($ret["root_guid"] == $link) OR (trim($ret["root_guid"]) == ""))
+		if (($ret["root_guid"] == $link) || (trim($ret["root_guid"]) == ""))
 			return(false);
 
 		return($ret);
@@ -3040,7 +3107,7 @@ class Diaspora {
 		if ($event['start']) {
 			$eventdata['start'] = datetime_convert($eventdata['timezone'], "UTC", $event['start'], $mask);
 		}
-		if ($event['finish'] AND !$event['nofinish']) {
+		if ($event['finish'] && !$event['nofinish']) {
 			$eventdata['end'] = datetime_convert($eventdata['timezone'], "UTC", $event['finish'], $mask);
 		}
 		if ($event['summary']) {
@@ -3086,14 +3153,14 @@ class Diaspora {
 		$created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
 
 		// Detect a share element and do a reshare
-		if (!$item['private'] AND ($ret = self::is_reshare($item["body"]))) {
-			$message = array("root_diaspora_id" => $ret["root_handle"],
-					"root_guid" => $ret["root_guid"],
+		if (!$item['private'] && ($ret = self::is_reshare($item["body"]))) {
+			$message = array("author" => $myaddr,
 					"guid" => $item["guid"],
-					"diaspora_handle" => $myaddr,
-					"public" => $public,
 					"created_at" => $created,
-					"provider_display_name" => $item["app"]);
+					"root_author" => $ret["root_handle"],
+					"root_guid" => $ret["root_guid"],
+					"provider_display_name" => $item["app"],
+					"public" => $public);
 
 			$type = "reshare";
 		} else {
@@ -3104,14 +3171,14 @@ class Diaspora {
 			$body = html_entity_decode(bb2diaspora($body));
 
 			// Adding the title
-			if(strlen($title))
+			if (strlen($title))
 				$body = "## ".html_entity_decode($title)."\n\n".$body;
 
 			if ($item["attach"]) {
 				$cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER);
-				if(cnt) {
+				if (cnt) {
 					$body .= "\n".t("Attachments:")."\n";
-					foreach($matches as $mtch)
+					foreach ($matches as $mtch)
 						$body .= "[".$mtch[3]."](".$mtch[1].")\n";
 				}
 			}
@@ -3127,16 +3194,16 @@ class Diaspora {
 				$location["lng"] = $coord[1];
 			}
 
-			$message = array("raw_message" => $body,
-					"location" => $location,
+			$message = array("author" => $myaddr,
 					"guid" => $item["guid"],
-					"diaspora_handle" => $myaddr,
-					"public" => $public,
 					"created_at" => $created,
-					"provider_display_name" => $item["app"]);
+					"public" => $public,
+					"text" => $body,
+					"provider_display_name" => $item["app"],
+					"location" => $location);
 
 			// Diaspora rejects messages when they contain a location without "lat" or "lng"
-			if (!isset($location["lat"]) OR !isset($location["lng"])) {
+			if (!isset($location["lat"]) || !isset($location["lng"])) {
 				unset($message["location"]);
 			}
 
@@ -3146,7 +3213,7 @@ class Diaspora {
 					$message['event'] = $event;
 
 					/// @todo Once Diaspora supports it, we will remove the body
-					// $message['raw_message'] = '';
+					// $message['text'] = '';
 				}
 			}
 
@@ -3201,12 +3268,12 @@ class Diaspora {
 			$positive = "false";
 		}
 
-		return(array("positive" => $positive,
+		return(array("author" => self::my_handle($owner),
 				"guid" => $item["guid"],
-				"target_type" => $target_type,
 				"parent_guid" => $parent["guid"],
-				"author_signature" => "",
-				"diaspora_handle" => self::my_handle($owner)));
+				"parent_type" => $target_type,
+				"positive" => $positive,
+				"author_signature" => ""));
 	}
 
 	/**
@@ -3278,12 +3345,12 @@ class Diaspora {
 		$text = html_entity_decode(bb2diaspora($item["body"]));
 		$created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
 
-		$comment = array("guid" => $item["guid"],
+		$comment = array("author" => self::my_handle($owner),
+				"guid" => $item["guid"],
+				"created_at" => $created,
 				"parent_guid" => $parent["guid"],
-				"author_signature" => "",
 				"text" => $text,
-				/// @todo Currently disabled until Diaspora supports it: "created_at" => $created,
-				"diaspora_handle" => self::my_handle($owner));
+				"author_signature" => "");
 
 		// Send the thread parent guid only if it is a threaded comment
 		if ($item['thr-parent'] != $item['parent-uri']) {
@@ -3340,19 +3407,17 @@ class Diaspora {
 		$signed_parts = explode(";", $signature['signed_text']);
 
 		if ($item["deleted"])
-			$message = array("parent_author_signature" => "",
+			$message = array("author" => $signature['signer'],
 					"target_guid" => $signed_parts[0],
-					"target_type" => $signed_parts[1],
-					"sender_handle" => $signature['signer'],
-					"target_author_signature" => $signature['signature']);
+					"target_type" => $signed_parts[1]);
 		elseif ($item['verb'] === ACTIVITY_LIKE)
-			$message = array("positive" => $signed_parts[0],
+			$message = array("author" => $signed_parts[4],
 					"guid" => $signed_parts[1],
-					"target_type" => $signed_parts[2],
 					"parent_guid" => $signed_parts[3],
-					"parent_author_signature" => "",
+					"parent_type" => $signed_parts[2],
+					"positive" => $signed_parts[0],
 					"author_signature" => $signature['signature'],
-					"diaspora_handle" => $signed_parts[4]);
+					"parent_author_signature" => "");
 		else {
 			// Remove the comment guid
 			$guid = array_shift($signed_parts);
@@ -3366,12 +3431,12 @@ class Diaspora {
 			// Glue the parts together
 			$text = implode(";", $signed_parts);
 
-			$message = array("guid" => $guid,
+			$message = array("author" => $handle,
+					"guid" => $guid,
 					"parent_guid" => $parent_guid,
-					"parent_author_signature" => "",
-					"author_signature" => $signature['signature'],
 					"text" => implode(";", $signed_parts),
-					"diaspora_handle" => $handle);
+					"author_signature" => $signature['signature'],
+					"parent_author_signature" => "");
 		}
 		return $message;
 	}
@@ -3411,7 +3476,7 @@ class Diaspora {
 
 		// Old way - is used by the internal Friendica functions
 		/// @todo Change all signatur storing functions to the new format
-		if ($signature['signed_text'] AND $signature['signature'] AND $signature['signer'])
+		if ($signature['signed_text'] && $signature['signature'] && $signature['signer'])
 			$message = self::message_from_signature($item, $signature);
 		else {// New way
 			$msg = json_decode($signature['signed_text'], true);
@@ -3420,10 +3485,12 @@ class Diaspora {
 			if (is_array($msg)) {
 				foreach ($msg AS $field => $data) {
 					if (!$item["deleted"]) {
-						if ($field == "author")
-							$field = "diaspora_handle";
-						if ($field == "parent_type")
-							$field = "target_type";
+						if ($field == "diaspora_handle") {
+							$field = "author";
+						}
+						if ($field == "target_type") {
+							$field = "parent_type";
+						}
 					}
 
 					$message[$field] = $data;
@@ -3454,26 +3521,12 @@ class Diaspora {
 
 		$itemaddr = self::handle_from_contact($item["contact-id"], $item["gcontact-id"]);
 
-		// Check whether the retraction is for a top-level post or whether it's a relayable
-		if ($item["uri"] !== $item["parent-uri"]) {
-			$msg_type = "relayable_retraction";
-			$target_type = (($item["verb"] === ACTIVITY_LIKE) ? "Like" : "Comment");
-		} else {
-			$msg_type = "signed_retraction";
-			$target_type = "StatusMessage";
-		}
+		$msg_type = "retraction";
+		$target_type = "Post";
 
-		if ($relay AND ($item["uri"] !== $item["parent-uri"]))
-			$signature = "parent_author_signature";
-		else
-			$signature = "target_author_signature";
-
-		$signed_text = $item["guid"].";".$target_type;
-
-		$message = array("target_guid" => $item['guid'],
-				"target_type" => $target_type,
-				"sender_handle" => $itemaddr,
-				$signature => base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256')));
+		$message = array("author" => $itemaddr,
+				"target_guid" => $item['guid'],
+				"target_type" => $target_type);
 
 		logger("Got message ".print_r($message, true), LOGGER_DEBUG);
 
@@ -3505,40 +3558,35 @@ class Diaspora {
 		$cnv = $r[0];
 
 		$conv = array(
+			"author" => $cnv["creator"],
 			"guid" => $cnv["guid"],
 			"subject" => $cnv["subject"],
 			"created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d\TH:i:s\Z'),
-			"diaspora_handle" => $cnv["creator"],
-			"participant_handles" => $cnv["recips"]
+			"participants" => $cnv["recips"]
 		);
 
 		$body = bb2diaspora($item["body"]);
 		$created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
 
-		$signed_text = $item["guid"].";".$cnv["guid"].";".$body.";".$created.";".$myaddr.";".$cnv['guid'];
-		$sig = base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256"));
-
 		$msg = array(
+			"author" => $myaddr,
 			"guid" => $item["guid"],
-			"parent_guid" => $cnv["guid"],
-			"parent_author_signature" => $sig,
-			"author_signature" => $sig,
+			"conversation_guid" => $cnv["guid"],
 			"text" => $body,
 			"created_at" => $created,
-			"diaspora_handle" => $myaddr,
-			"conversation_guid" => $cnv["guid"]
 		);
 
 		if ($item["reply"]) {
 			$message = $msg;
 			$type = "message";
 		} else {
-			$message = array("guid" => $cnv["guid"],
+			$message = array(
+					"author" => $cnv["creator"],
+					"guid" => $cnv["guid"],
 					"subject" => $cnv["subject"],
 					"created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d\TH:i:s\Z'),
-					"message" => $msg,
-					"diaspora_handle" => $cnv["creator"],
-					"participant_handles" => $cnv["recips"]);
+					"participants" => $cnv["recips"],
+					"message" => $msg);
 
 			$type = "conversation";
 		}
@@ -3591,7 +3639,7 @@ class Diaspora {
 		if ($searchable === 'true') {
 			$dob = '1000-00-00';
 
-			if (($profile['dob']) && ($profile['dob'] != '0000-00-00'))
+			if (($profile['dob']) && ($profile['dob'] > '0001-01-01'))
 				$dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC','UTC',$profile['dob'],'m-d');
 
 			$about = $profile['about'];
@@ -3604,7 +3652,7 @@ class Diaspora {
 				$kw = str_replace('  ',' ',$kw);
 				$arr = explode(' ',$profile['pub_keywords']);
 				if (count($arr)) {
-					for($x = 0; $x < 5; $x ++) {
+					for ($x = 0; $x < 5; $x ++) {
 						if (trim($arr[$x]))
 							$tags .= '#'. trim($arr[$x]) .' ';
 					}
@@ -3613,7 +3661,7 @@ class Diaspora {
 			$tags = trim($tags);
 		}
 
-		$message = array("diaspora_handle" => $handle,
+		$message = array("author" => $handle,
 				"first_name" => $first,
 				"last_name" => $last,
 				"image_url" => $large,
@@ -3624,9 +3672,10 @@ class Diaspora {
 				"bio" => $about,
 				"location" => $location,
 				"searchable" => $searchable,
+				"nsfw" => "false",
 				"tag_string" => $tags);
 
-		foreach($recips as $recip) {
+		foreach ($recips as $recip) {
 			logger("Send updated profile data for user ".$uid." to contact ".$recip["id"], LOGGER_DEBUG);
 			self::build_and_transmit($profile, $recip, "profile", $message, false, "", true);
 		}
@@ -3643,29 +3692,34 @@ class Diaspora {
 	public static function store_like_signature($contact, $post_id) {
 
 		// Is the contact the owner? Then fetch the private key
-		if (!$contact['self'] OR ($contact['uid'] == 0)) {
+		if (!$contact['self'] || ($contact['uid'] == 0)) {
 			logger("No owner post, so not storing signature", LOGGER_DEBUG);
 			return false;
 		}
 
 		$r = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($contact['uid']));
-		if(!$r)
+		if (!dbm::is_result($r)) {
 			return false;
+		}
 
 		$contact["uprvkey"] = $r[0]['prvkey'];
 
 		$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", intval($post_id));
-		if (!$r)
+		if (!dbm::is_result($r)) {
 			return false;
+		}
 
-		if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE)))
+		if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
 			return false;
+		}
 
 		$message = self::construct_like($r[0], $contact);
 		$message["author_signature"] = self::signature($contact, $message);
 
-		// We now store the signature more flexible to dynamically support new fields.
-		// This will break Diaspora compatibility with Friendica versions prior to 3.5.
+		/*
+		 * Now store the signature more flexible to dynamically support new fields.
+		 * This will break Diaspora compatibility with Friendica versions prior to 3.5.
+		 */
 		q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
 			intval($message_id),
 			dbesc(json_encode($message))
@@ -3697,9 +3751,11 @@ class Diaspora {
 		$message = self::construct_comment($item, $contact);
 		$message["author_signature"] = self::signature($contact, $message);
 
-		// We now store the signature more flexible to dynamically support new fields.
-		// This will break Diaspora compatibility with Friendica versions prior to 3.5.
-		q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
+		/*
+		 * Now store the signature more flexible to dynamically support new fields.
+		 * This will break Diaspora compatibility with Friendica versions prior to 3.5.
+		 */
+		q("INSERT INTO `sign` (`iid`, `signed_text`) VALUES (%d, '%s')",
 			intval($message_id),
 			dbesc(json_encode($message))
 		);
@@ -3708,4 +3764,3 @@ class Diaspora {
 		return true;
 	}
 }
-?>