X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Freceive.php;h=690abea15928d3c50c2e5087a432752ec501d187;hb=7d6717d97e3e6710b87566a7ed0bafcd49607c79;hp=41f2225cb4d3a54b4f072d13eedb509f7b434d69;hpb=29f7ebe307c22b275466390937b82ccb3820fb1c;p=friendica.git

diff --git a/mod/receive.php b/mod/receive.php
index 41f2225cb4..690abea159 100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -6,8 +6,9 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Protocol\Diaspora;
 
 /**
@@ -18,13 +19,13 @@ function receive_post(App $a)
 {
 	$enabled = intval(Config::get('system', 'diaspora_enabled'));
 	if (!$enabled) {
-		logger('mod-diaspora: disabled');
+		Logger::log('mod-diaspora: disabled');
 		System::httpExit(500);
 	}
 
 	if (($a->argc == 2) && ($a->argv[1] === 'public')) {
 		$public = true;
-		$importer = false;
+		$importer = [];
 	} else {
 		$public = false;
 
@@ -33,45 +34,45 @@ function receive_post(App $a)
 		}
 		$guid = $a->argv[2];
 
-		$importer = dba::selectFirst('user', [], ['guid' => $guid, 'account_expired' => false, 'account_removed' => false]);
-		if (!DBM::is_result($importer)) {
+		$importer = DBA::selectFirst('user', [], ['guid' => $guid, 'account_expired' => false, 'account_removed' => false]);
+		if (!DBA::isResult($importer)) {
 			System::httpExit(500);
 		}
 	}
 
 	// It is an application/x-www-form-urlencoded
 
-	logger('mod-diaspora: receiving post', LOGGER_DEBUG);
+	Logger::log('mod-diaspora: receiving post', Logger::DEBUG);
 
-	$xml = urldecode($_POST['xml']);
-
-	if (!$xml) {
+	if (empty($_POST['xml'])) {
 		$postdata = file_get_contents("php://input");
 		if ($postdata == '') {
 			System::httpExit(500);
 		}
 
-		logger('mod-diaspora: message is in the new format', LOGGER_DEBUG);
+		Logger::log('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);
+		$xml = urldecode($_POST['xml']);
+
+		Logger::log('mod-diaspora: decode message in the old format', Logger::DEBUG);
 		$msg = Diaspora::decode($importer, $xml);
 
 		if ($public && !$msg) {
-			logger('mod-diaspora: decode message in the new format', LOGGER_DEBUG);
+			Logger::log('mod-diaspora: decode message in the new format', Logger::DEBUG);
 			$msg = Diaspora::decodeRaw($importer, $xml);
 		}
 	}
 
-	logger('mod-diaspora: decoded', LOGGER_DEBUG);
+	Logger::log('mod-diaspora: decoded', Logger::DEBUG);
 
-	logger('mod-diaspora: decoded msg: ' . print_r($msg, true), LOGGER_DATA);
+	Logger::log('mod-diaspora: decoded msg: ' . print_r($msg, true), Logger::DATA);
 
 	if (!is_array($msg)) {
 		System::httpExit(500);
 	}
 
-	logger('mod-diaspora: dispatching', LOGGER_DEBUG);
+	Logger::log('mod-diaspora: dispatching', Logger::DEBUG);
 
 	$ret = true;
 	if ($public) {