Fixes:

[friendica.git] / mod / receive.php

diff --git a/mod/receive.php b/mod/receive.php
index fcc898a0c0375a0d97065c71f5162078cb18b621..ebc20cfcd82759285f7c51308544e3d16c45492a 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -6,6 +6,8 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 use Friendica\Protocol\Diaspora;
 
@@ -18,23 +20,23 @@ function receive_post(App $a)
        $enabled = intval(Config::get('system', 'diaspora_enabled'));
        if (!$enabled) {
                logger('mod-diaspora: disabled');
-               http_status_exit(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') {
-                       http_status_exit(500);
+                       System::httpExit(500);
                }
                $guid = $a->argv[2];
 
-               $importer = dba::select('user', array(), array('guid' => $guid, 'account_expired' => false, 'account_removed' => false), array('limit' => 1));
+               $importer = DBA::selectFirst('user', [], ['guid' => $guid, 'account_expired' => false, 'account_removed' => false]);
                if (!DBM::is_result($importer)) {
-                       http_status_exit(500);
+                       System::httpExit(500);
                }
        }
 
@@ -42,17 +44,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 == '') {
-                       http_status_exit(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);
 
@@ -67,7 +69,7 @@ function receive_post(App $a)
        logger('mod-diaspora: decoded msg: ' . print_r($msg, true), LOGGER_DATA);
 
        if (!is_array($msg)) {
-               http_status_exit(500);
+               System::httpExit(500);
        }
 
        logger('mod-diaspora: dispatching', LOGGER_DEBUG);
@@ -79,6 +81,6 @@ function receive_post(App $a)
                $ret = Diaspora::dispatch($importer, $msg);
        }
 
-       http_status_exit(($ret) ? 200 : 500);
+       System::httpExit(($ret) ? 200 : 500);
        // NOTREACHED
 }