Bump DB version

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 6053ee2fbe1553e60d1fa182aff303fbd8e1dad0..2ba1958a25050cbce35e075d04d6081aa5d71907 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -26,7 +26,7 @@ function hub_post_return() {
 
 
 
-function pubsub_init(&$a) {
+function pubsub_init(App $a) {
 
        $nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
        $contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
@@ -47,7 +47,7 @@ function pubsub_init(&$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)) {
                        logger('pubsub: local account not found: ' . $nick);
                        hub_return(false, '');
                }
@@ -57,12 +57,12 @@ function pubsub_init(&$a) {
 
                $sql_extra = ((strlen($hub_verify)) ? sprintf(" AND `hub-verify` = '%s' ", dbesc($hub_verify)) : '');
 
-               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d 
+               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d
                        AND `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1",
                        intval($contact_id),
                        intval($owner['uid'])
                );
-               if(! count($r)) {
+               if (! dbm::is_result($r)) {
                        logger('pubsub: contact '.$contact_id.' not found.');
                        hub_return(false, '');
                }
@@ -75,7 +75,7 @@ function pubsub_init(&$a) {
 
                $contact = $r[0];
 
-               // We must initiate an unsubscribe request with a verify_token. 
+               // We must initiate an unsubscribe request with a verify_token.
                // Don't allow outsiders to unsubscribe us.
 
                if($hub_mode === 'unsubscribe') {
@@ -98,7 +98,7 @@ function pubsub_init(&$a) {
 
 require_once('include/security.php');
 
-function pubsub_post(&$a) {
+function pubsub_post(App $a) {
 
        $xml = file_get_contents('php://input');
 
@@ -117,8 +117,9 @@ function pubsub_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)) {
                hub_post_return();
+       }
 
        $importer = $r[0];
 
@@ -131,7 +132,7 @@ function pubsub_post(&$a) {
                dbesc(NETWORK_FEED)
        );
 
-       if(! count($r)) {
+       if (! dbm::is_result($r)) {
                logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml);
                hub_post_return();
        }