Merge pull request #3861 from annando/direct-forum-post

[friendica.git] / mod / receive.php

diff --git a/mod/receive.php b/mod/receive.php
index 2873cb971af703286836e10049a2548c9bf039fc..68fc7f69fe962143346fc92bff02f82cf35c5f27 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -17,11 +17,11 @@ function receive_post(App $a) {
                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);
@@ -49,8 +49,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 +68,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
 }