X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Freceive.php;h=a1cb5f48fa87afd15eeefdf646decab85bef5840;hb=4ca68c7af05b7b41e1b04936b9080802ca2b7716;hp=3563f2d705a487f23b7a3b3652bdf308957f62bb;hpb=8e12b159d947fb27ad6bdd5e06e3a90c1713687e;p=friendica.git

diff --git a/mod/receive.php b/mod/receive.php
index 3563f2d705..a1cb5f48fa 100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -4,41 +4,36 @@
  * Diaspora endpoint
  */
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
 
 require_once('include/salmon.php');
 require_once('include/crypto.php');
-require_once('include/diaspora.php');
-
 
 function receive_post(App $a) {
-
-
-	$enabled = intval(get_config('system','diaspora_enabled'));
-	if(! $enabled) {
+	$enabled = intval(Config::get('system', 'diaspora_enabled'));
+	if (!$enabled) {
 		logger('mod-diaspora: disabled');
 		http_status_exit(500);
 	}
 
-	$public = false;
-
-	if(($a->argc == 2) && ($a->argv[1] === 'public')) {
+	if (($a->argc == 2) && ($a->argv[1] === 'public')) {
 		$public = true;
-	}
-	else {
+		$importer = false;
+	} else {
+		$public = false;
 
-		if($a->argc != 3 || $a->argv[1] !== 'users')
+		if ($a->argc != 3 || $a->argv[1] !== 'users') {
 			http_status_exit(500);
-
+		}
 		$guid = $a->argv[2];
 
-		$r = q("SELECT * FROM `user` WHERE `guid` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
-			dbesc($guid)
-		);
-		if (! dbm::is_result($r)) {
+		$importer = dba::select('user', array(), array('guid' => $guid, 'account_expired' => false, 'account_removed' => false), array('limit' => 1));
+		if (!DBM::is_result($importer)) {
 			http_status_exit(500);
 		}
-
-		$importer = $r[0];
 	}
 
 	// It is an application/x-www-form-urlencoded
@@ -47,32 +42,42 @@ function receive_post(App $a) {
 
 	$xml = urldecode($_POST['xml']);
 
-	logger('mod-diaspora: new salmon ' . $xml, LOGGER_DATA);
-
-	if(! $xml)
-		http_status_exit(500);
+	if (!$xml) {
+		$postdata = file_get_contents("php://input");
+	        if ($postdata == '') {
+			http_status_exit(500);
+		}
 
-	logger('mod-diaspora: message is okay', LOGGER_DEBUG);
+		logger('mod-diaspora: message is in the new format', LOGGER_DEBUG);
+		$msg = Diaspora::decode_raw($importer, $postdata);
+	} else {
+		logger('mod-diaspora: decode message in the old format', LOGGER_DEBUG);
+		$msg = Diaspora::decode($importer, $xml);
 
-	$msg = Diaspora::decode($importer,$xml);
+		if ($public && !$msg) {
+			logger('mod-diaspora: decode message in the new format', LOGGER_DEBUG);
+			$msg = Diaspora::decode_raw($importer, $xml);
+		}
+	}
 
 	logger('mod-diaspora: decoded', LOGGER_DEBUG);
 
-	logger('mod-diaspora: decoded msg: ' . print_r($msg,true), LOGGER_DATA);
+	logger('mod-diaspora: decoded msg: ' . print_r($msg, true), LOGGER_DATA);
 
-	if(! is_array($msg))
+	if (!is_array($msg)) {
 		http_status_exit(500);
+	}
 
 	logger('mod-diaspora: dispatching', LOGGER_DEBUG);
 
-	$ret = 0;
-	if($public) {
+	$ret = true;
+	if ($public) {
 		Diaspora::dispatch_public($msg);
 	} else {
-		$ret = Diaspora::dispatch($importer,$msg);
+		$ret = Diaspora::dispatch($importer, $msg);
 	}
 
-	http_status_exit(($ret) ? $ret : 200);
+	http_status_exit(($ret) ? 200 : 500);
 	// NOTREACHED
 }