Fixes:

[friendica.git] / mod / receive.php

diff --git a/mod/receive.php b/mod/receive.php
index 41f2225cb4d3a54b4f072d13eedb509f7b434d69..ebc20cfcd82759285f7c51308544e3d16c45492a 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -7,6 +7,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 use Friendica\Protocol\Diaspora;
 
@@ -24,7 +25,7 @@ function receive_post(App $a)
 
        if (($a->argc == 2) && ($a->argv[1] === 'public')) {
                $public = true;
-               $importer = false;
+               $importer = [];
        } else {
                $public = false;
 
@@ -33,7 +34,7 @@ function receive_post(App $a)
                }
                $guid = $a->argv[2];
 
-               $importer = dba::selectFirst('user', [], ['guid' => $guid, 'account_expired' => false, 'account_removed' => false]);
+               $importer = DBA::selectFirst('user', [], ['guid' => $guid, 'account_expired' => false, 'account_removed' => false]);
                if (!DBM::is_result($importer)) {
                        System::httpExit(500);
                }
@@ -43,9 +44,7 @@ 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 == '') {
                        System::httpExit(500);
@@ -54,6 +53,8 @@ function receive_post(App $a)
                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);