Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / receive.php

diff --git a/mod/receive.php b/mod/receive.php
index 051ea8c25c9b7657bd5141d07c80de270d315e01..90dcc05281cd9f4f82509b4d7eb0a42b88f6007c 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -10,7 +10,7 @@ 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,8 +34,9 @@ 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];
        }
@@ -54,7 +55,6 @@ function receive_post(&$a) {
        logger('mod-diaspora: message is okay', LOGGER_DEBUG);
 
        $msg = diaspora::decode($importer,$xml);
-       //$msg = diaspora_decode($importer,$xml);
 
        logger('mod-diaspora: decoded', LOGGER_DEBUG);
 
@@ -68,10 +68,8 @@ function receive_post(&$a) {
        $ret = 0;
        if($public) {
                diaspora::dispatch_public($msg);
-               //diaspora_dispatch_public($msg);
        } else {
                $ret = diaspora::dispatch($importer,$msg);
-               //$ret = diaspora_dispatch($importer,$msg);
        }
 
        http_status_exit(($ret) ? $ret : 200);