Class file relocations

[friendica.git] / mod / receive.php

diff --git a/mod/receive.php b/mod/receive.php
index 2873cb971af703286836e10049a2548c9bf039fc..a1cb5f48fa87afd15eeefdf646decab85bef5840 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -5,23 +5,25 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
+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(App $a) {
-       $enabled = intval(get_config('system', 'diaspora_enabled'));
+       $enabled = intval(Config::get('system', 'diaspora_enabled'));
        if (!$enabled) {
                logger('mod-diaspora: disabled');
                http_status_exit(500);
        }
 
-       $public = false;
-
        if (($a->argc == 2) && ($a->argv[1] === 'public')) {
                $public = true;
+               $importer = false;
        } else {
+               $public = false;
 
                if ($a->argc != 3 || $a->argv[1] !== 'users') {
                        http_status_exit(500);
@@ -29,7 +31,7 @@ function receive_post(App $a) {
                $guid = $a->argv[2];
 
                $importer = dba::select('user', array(), array('guid' => $guid, 'account_expired' => false, 'account_removed' => false), array('limit' => 1));
-               if (!dbm::is_result($importer)) {
+               if (!DBM::is_result($importer)) {
                        http_status_exit(500);
                }
        }
@@ -49,8 +51,13 @@ function receive_post(App $a) {
                logger('mod-diaspora: message is in the new format', LOGGER_DEBUG);
                $msg = Diaspora::decode_raw($importer, $postdata);
        } else {
-               logger('mod-diaspora: message is in the old format', LOGGER_DEBUG);
+               logger('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);
+                       $msg = Diaspora::decode_raw($importer, $xml);
+               }
        }
 
        logger('mod-diaspora: decoded', LOGGER_DEBUG);
@@ -63,14 +70,14 @@ function receive_post(App $a) {
 
        logger('mod-diaspora: dispatching', LOGGER_DEBUG);
 
-       $ret = 0;
+       $ret = true;
        if ($public) {
                Diaspora::dispatch_public($msg);
        } else {
                $ret = Diaspora::dispatch($importer, $msg);
        }
 
-       http_status_exit(($ret) ? $ret : 200);
+       http_status_exit(($ret) ? 200 : 500);
        // NOTREACHED
 }