X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Freceive.php;h=41f2225cb4d3a54b4f072d13eedb509f7b434d69;hb=c9d403bcb5a68e79f0ac4facc82661123a9eb595;hp=34128518b55014e287f3f5fc9b4f398b8625af8a;hpb=0e1f868237d568ca7f4a0cb9f8216776fcb4c787;p=friendica.git

diff --git a/mod/receive.php b/mod/receive.php
index 34128518b5..41f2225cb4 100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -1,49 +1,85 @@
 <?php
-
 /**
- * Diaspora endpoint
+ * @file mod/receive.php
+ * @brief Diaspora endpoint
  */
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+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(&$a) {
-
-	if($a->argc != 3 || $a->argv[1] !== 'users')
-		http_status_exit(500);
+/**
+ * @param object $a App
+ * @return void
+ */
+function receive_post(App $a)
+{
+	$enabled = intval(Config::get('system', 'diaspora_enabled'));
+	if (!$enabled) {
+		logger('mod-diaspora: disabled');
+		System::httpExit(500);
+	}
+
+	if (($a->argc == 2) && ($a->argv[1] === 'public')) {
+		$public = true;
+		$importer = false;
+	} else {
+		$public = false;
+
+		if ($a->argc != 3 || $a->argv[1] !== 'users') {
+			System::httpExit(500);
+		}
+		$guid = $a->argv[2];
+
+		$importer = dba::selectFirst('user', [], ['guid' => $guid, 'account_expired' => false, 'account_removed' => false]);
+		if (!DBM::is_result($importer)) {
+			System::httpExit(500);
+		}
+	}
 
-	$guid = $a->argv[2];
+	// It is an application/x-www-form-urlencoded
 
-	$r = q("SELECT * FROM `user` WHERE `guid` = '%s' LIMIT 1",
-		dbesc($guid)
-	);
-	if(! count($r))
-		http_status_exit(500);
+	logger('mod-diaspora: receiving post', LOGGER_DEBUG);
 
-	$importer = $r[0];
+	$xml = urldecode($_POST['xml']);
 
-	// It is an application/x-www-form-urlencoded
+	if (!$xml) {
+		$postdata = file_get_contents("php://input");
+		if ($postdata == '') {
+			System::httpExit(500);
+		}
 
-	$xml = urldecode($_POST['xml']);
+		logger('mod-diaspora: message is in the new format', LOGGER_DEBUG);
+		$msg = Diaspora::decodeRaw($importer, $postdata);
+	} else {
+		logger('mod-diaspora: decode message in the old format', LOGGER_DEBUG);
+		$msg = Diaspora::decode($importer, $xml);
 
-	logger('mod-diaspora: new salmon ' . $xml, LOGGER_DATA);
+		if ($public && !$msg) {
+			logger('mod-diaspora: decode message in the new format', LOGGER_DEBUG);
+			$msg = Diaspora::decodeRaw($importer, $xml);
+		}
+	}
 
-	if(! $xml)
-		http_status_exit(500);
+	logger('mod-diaspora: decoded', LOGGER_DEBUG);
 
-	$msg = diaspora_decode($importer,$xml);
+	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)) {
+		System::httpExit(500);
+	}
 
-	if(! is_array($msg))
-		http_status_exit(500);
+	logger('mod-diaspora: dispatching', LOGGER_DEBUG);
 
-	diaspora_dispatch($importer,$msg);
+	$ret = true;
+	if ($public) {
+		Diaspora::dispatchPublic($msg);
+	} else {
+		$ret = Diaspora::dispatch($importer, $msg);
+	}
 
-	http_status_exit(200);
+	System::httpExit(($ret) ? 200 : 500);
 	// NOTREACHED
 }
-