Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention

[friendica.git] / mod / post.php

diff --git a/mod/post.php b/mod/post.php
index 631bf0eba63f5d058e813fdd5306730dd021f111..98a32711c62f19b8c296755fd5579d3a04771165 100644 (file)
--- a/mod/post.php
+++ b/mod/post.php
@@ -10,22 +10,21 @@ require_once('include/crypto.php');
 // not yet ready for prime time
 //require_once('include/zot.php');
 
-if(! function_exists('post_post')) {
-function post_post(&$a) {
+function post_post(App $a) {
 
        $bulk_delivery = false;
 
-       if($a->argc == 1) {
+       if ($a->argc == 1) {
                $bulk_delivery = true;
-       }
-       else {
+       } else {
                $nickname = $a->argv[2];
                $r = q("SELECT * FROM `user` WHERE `nickname` = '%s'
                                AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
                        dbesc($nickname)
                );
-               if(! count($r))
+               if (! dbm::is_result($r)) {
                        http_status_exit(500);
+               }
 
                $importer = $r[0];
        }
@@ -34,19 +33,21 @@ function post_post(&$a) {
 
        logger('mod-post: new zot: ' . $xml, LOGGER_DATA);
 
-       if(! $xml)
+       if (! $xml) {
                http_status_exit(500);
+       }
 
        $msg = zot_decode($importer,$xml);
 
        logger('mod-post: decoded msg: ' . print_r($msg,true), LOGGER_DATA);
 
-       if(! is_array($msg))
+       if (! is_array($msg)) {
                http_status_exit(500);
+       }
 
        $ret = 0;
        $ret = zot_incoming($bulk_delivery, $importer,$msg);
        http_status_exit(($ret) ? $ret : 200);
        // NOTREACHED
 }
-}
+