X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Freceive.php;h=80be7d2a2957edb1fdc0b7820efe64ec60952301;hb=dd2d680258e1c594cc585fa31108da5a151a6e47;hp=60b8ed7961afe143aa1129c95ff9f276d99f6995;hpb=cd3643d17485aa1000c41312f5b363788e755c49;p=friendica.git

diff --git a/mod/receive.php b/mod/receive.php
index 60b8ed7961..80be7d2a29 100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -6,9 +6,9 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Protocol\Diaspora;
-use Friendica\Util\Network;
 
 /**
  * @param object $a App
@@ -19,23 +19,23 @@ function receive_post(App $a)
 	$enabled = intval(Config::get('system', 'diaspora_enabled'));
 	if (!$enabled) {
 		logger('mod-diaspora: disabled');
-		Network::httpStatusExit(500);
+		System::httpExit(500);
 	}
 
 	if (($a->argc == 2) && ($a->argv[1] === 'public')) {
 		$public = true;
-		$importer = false;
+		$importer = [];
 	} else {
 		$public = false;
 
 		if ($a->argc != 3 || $a->argv[1] !== 'users') {
-			Network::httpStatusExit(500);
+			System::httpExit(500);
 		}
 		$guid = $a->argv[2];
 
-		$importer = dba::selectFirst('user', [], ['guid' => $guid, 'account_expired' => false, 'account_removed' => false]);
-		if (!DBM::is_result($importer)) {
-			Network::httpStatusExit(500);
+		$importer = DBA::selectFirst('user', [], ['guid' => $guid, 'account_expired' => false, 'account_removed' => false]);
+		if (!DBA::isResult($importer)) {
+			System::httpExit(500);
 		}
 	}
 
@@ -43,17 +43,17 @@ function receive_post(App $a)
 
 	logger('mod-diaspora: receiving post', LOGGER_DEBUG);
 
-	$xml = urldecode($_POST['xml']);
-
-	if (!$xml) {
+	if (empty($_POST['xml'])) {
 		$postdata = file_get_contents("php://input");
 		if ($postdata == '') {
-			Network::httpStatusExit(500);
+			System::httpExit(500);
 		}
 
 		logger('mod-diaspora: message is in the new format', LOGGER_DEBUG);
 		$msg = Diaspora::decodeRaw($importer, $postdata);
 	} else {
+		$xml = urldecode($_POST['xml']);
+
 		logger('mod-diaspora: decode message in the old format', LOGGER_DEBUG);
 		$msg = Diaspora::decode($importer, $xml);
 
@@ -68,7 +68,7 @@ function receive_post(App $a)
 	logger('mod-diaspora: decoded msg: ' . print_r($msg, true), LOGGER_DATA);
 
 	if (!is_array($msg)) {
-		Network::httpStatusExit(500);
+		System::httpExit(500);
 	}
 
 	logger('mod-diaspora: dispatching', LOGGER_DEBUG);
@@ -80,6 +80,6 @@ function receive_post(App $a)
 		$ret = Diaspora::dispatch($importer, $msg);
 	}
 
-	Network::httpStatusExit(($ret) ? 200 : 500);
+	System::httpExit(($ret) ? 200 : 500);
 	// NOTREACHED
 }