X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Freceive.php;h=3563f2d705a487f23b7a3b3652bdf308957f62bb;hb=e1d22ef5d4333cff860079c92fea92d82fe58fda;hp=3a30058cdc18fecbe0b30f2025a2fb3d7eadfaeb;hpb=0c764684bb32a9432fd161e62db907efb78af1a5;p=friendica.git diff --git a/mod/receive.php b/mod/receive.php index 3a30058cdc..3563f2d705 100644 --- 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'); -if(! function_exists('receive_post')) { -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]; } @@ -53,7 +54,7 @@ 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); @@ -65,12 +66,13 @@ function receive_post(&$a) { 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 } -} +