More usage of dbm::is_result($r) instead of count($r):

[friendica.git] / mod / salmon.php

diff --git a/mod/salmon.php b/mod/salmon.php
index 9c22e42d110b3368a7bf6a950761cec238789530..e3f57da62a1e1937ce17ca6eff4793107bb8dafc 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -31,7 +31,7 @@ function salmon_post(&$a) {
        $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
                dbesc($nick)
        );
-       if(! count($r))
+       if(! dbm::is_result($r))
                http_status_exit(500);
 
        $importer = $r[0];
@@ -84,7 +84,7 @@ function salmon_post(&$a) {
        // decode the data
        $data = base64url_decode($data);
 
-       $author = ostatus_salmon_author($data,$importer);
+       $author = ostatus::salmon_author($data,$importer);
        $author_link = $author["author-link"];
 
        if(! $author_link) {
@@ -150,7 +150,7 @@ function salmon_post(&$a) {
                dbesc(normalise_link($author_link)),
                intval($importer['uid'])
        );
-       if(! count($r)) {
+       if(! dbm::is_result($r)) {
                logger('mod-salmon: Author unknown to us.');
                if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) {
                        $result = new_contact($importer['uid'],$author_link);
@@ -169,8 +169,8 @@ function salmon_post(&$a) {
        // Have we ignored the person?
        // If so we can not accept this post.
 
-       //if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
-       if(count($r) && $r[0]['blocked']) {
+       //if((dbm::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
+       if(dbm::is_result($r) && $r[0]['blocked']) {
                logger('mod-salmon: Ignoring this author.');
                http_status_exit(202);
                // NOTREACHED
@@ -179,9 +179,9 @@ function salmon_post(&$a) {
        // Placeholder for hub discovery.
        $hub = '';
 
-       $contact_rec = ((count($r)) ? $r[0] : null);
+       $contact_rec = ((dbm::is_result($r)) ? $r[0] : null);
 
-       ostatus_import($data,$importer,$contact_rec, $hub);
+       ostatus::import($data,$importer,$contact_rec, $hub);
 
        http_status_exit(200);
 }