applied coding convention:

[friendica.git] / mod / receive.php

diff --git a/mod/receive.php b/mod/receive.php
index 0523fd9cc5df45812613f3162932c7dd7a1d2a90..3563f2d705a487f23b7a3b3652bdf308957f62bb 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -9,8 +9,8 @@ require_once('include/salmon.php');
 require_once('include/crypto.php');
 require_once('include/diaspora.php');
 
-       
-function receive_post(&$a) {
+
+function receive_post(App $a) {
 
 
        $enabled = intval(get_config('system','diaspora_enabled'));
@@ -34,14 +34,17 @@ function receive_post(&$a) {
                $r = q("SELECT * FROM `user` WHERE `guid` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
                        dbesc($guid)
                );
-               if(! count($r))
+               if (! dbm::is_result($r)) {
                        http_status_exit(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);
@@ -49,18 +52,25 @@ function receive_post(&$a) {
        if(! $xml)
                http_status_exit(500);
 
-       $msg = diaspora_decode($importer,$xml);
+       logger('mod-diaspora: message is okay', LOGGER_DEBUG);
+
+       $msg = Diaspora::decode($importer,$xml);
+
+       logger('mod-diaspora: decoded', LOGGER_DEBUG);
 
        logger('mod-diaspora: decoded msg: ' . print_r($msg,true), LOGGER_DATA);
 
        if(! is_array($msg))
                http_status_exit(500);
 
+       logger('mod-diaspora: dispatching', LOGGER_DEBUG);
+
        $ret = 0;
-       if($public)
-               diaspora_dispatch_public($msg);
-       else
-               $ret = diaspora_dispatch($importer,$msg);
+       if($public) {
+               Diaspora::dispatch_public($msg);
+       } else {
+               $ret = Diaspora::dispatch($importer,$msg);
+       }
 
        http_status_exit(($ret) ? $ret : 200);
        // NOTREACHED