Fixes:

[friendica.git] / mod / receive.php

diff --git a/mod/receive.php b/mod/receive.php
index abc91ce37e15ee96d296b05d77cb9ede6506812e..ebc20cfcd82759285f7c51308544e3d16c45492a 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -1,77 +1,86 @@
 <?php
-
 /**
- * Diaspora endpoint
+ * @file mod/receive.php
+ * @brief Diaspora endpoint
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+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'));
-       if(! $enabled) {
+/**
+ * @param object $a App
+ * @return void
+ */
+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);
        }
 
-       $public = false;
-
-       if(($a->argc == 2) && ($a->argv[1] === 'public')) {
+       if (($a->argc == 2) && ($a->argv[1] === 'public')) {
                $public = true;
-       }
-       else {
-
-               if($a->argc != 3 || $a->argv[1] !== 'users')
-                       http_status_exit(500);
+               $importer = [];
+       } else {
+               $public = false;
 
+               if ($a->argc != 3 || $a->argv[1] !== 'users') {
+                       System::httpExit(500);
+               }
                $guid = $a->argv[2];
 
-               $r = q("SELECT * FROM `user` WHERE `guid` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
-                       dbesc($guid)
-               );
-               if (! dbm::is_result($r)) {
-                       http_status_exit(500);
+               $importer = DBA::selectFirst('user', [], ['guid' => $guid, 'account_expired' => false, 'account_removed' => false]);
+               if (!DBM::is_result($importer)) {
+                       System::httpExit(500);
                }
-
-               $importer = $r[0];
        }
 
        // It is an application/x-www-form-urlencoded
 
        logger('mod-diaspora: receiving post', LOGGER_DEBUG);
 
-       $xml = urldecode($_POST['xml']);
-
-       logger('mod-diaspora: new salmon ' . $xml, LOGGER_DATA);
+       if (empty($_POST['xml'])) {
+               $postdata = file_get_contents("php://input");
+               if ($postdata == '') {
+                       System::httpExit(500);
+               }
 
-       if(! $xml)
-               http_status_exit(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: message is okay', LOGGER_DEBUG);
+               logger('mod-diaspora: decode message in the old format', LOGGER_DEBUG);
+               $msg = Diaspora::decode($importer, $xml);
 
-       $msg = Diaspora::decode($importer,$xml);
+               if ($public && !$msg) {
+                       logger('mod-diaspora: decode message in the new format', LOGGER_DEBUG);
+                       $msg = Diaspora::decodeRaw($importer, $xml);
+               }
+       }
 
        logger('mod-diaspora: decoded', LOGGER_DEBUG);
 
-       logger('mod-diaspora: decoded msg: ' . print_r($msg,true), LOGGER_DATA);
+       logger('mod-diaspora: decoded msg: ' . print_r($msg, true), LOGGER_DATA);
 
-       if(! is_array($msg))
-               http_status_exit(500);
+       if (!is_array($msg)) {
+               System::httpExit(500);
+       }
 
        logger('mod-diaspora: dispatching', LOGGER_DEBUG);
 
-       $ret = 0;
-       if($public) {
-               Diaspora::dispatch_public($msg);
+       $ret = true;
+       if ($public) {
+               Diaspora::dispatchPublic($msg);
        } else {
-               $ret = Diaspora::dispatch($importer,$msg);
+               $ret = Diaspora::dispatch($importer, $msg);
        }
 
-       http_status_exit(($ret) ? $ret : 200);
+       System::httpExit(($ret) ? 200 : 500);
        // NOTREACHED
 }
-