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

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index d7566905b72f6291f64a7c0ce989f854a34416ad..66c891ef089cdf711e92eae1f4ca89225d8a7598 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -91,7 +91,7 @@ function dfrn_request_post(&$a) {
                                        dbesc(normalise_link($dfrn_url))
                                );
 
-                               if(count($r)) {
+                               if(dbm::is_result($r)) {
                                        if(strlen($r[0]['dfrn-id'])) {
 
                                                /*
@@ -185,7 +185,7 @@ function dfrn_request_post(&$a) {
                                        dbesc($dfrn_url),
                                        $parms['key'] // this was already escaped
                                );
-                               if(count($r)) {
+                               if(dbm::is_result($r)) {
                                        $def_gid = get_default_group(local_user(), $r[0]["network"]);
                                        if(intval($def_gid))
                                                group_add_member(local_user(), '', $r[0]['id'], $def_gid);
@@ -273,7 +273,7 @@ function dfrn_request_post(&$a) {
                                dbesc(datetime_convert('UTC','UTC','now - 24 hours')),
                                intval($uid)
                        );
-                       if(count($r) > $maxreq) {
+                       if(dbm::is_result($r) > $maxreq) {
                                notice( sprintf( t('%s has received too many connection requests today.'),  $a->profile['name']) . EOL);
                                notice( t('Spam protection measures have been invoked.') . EOL);
                                notice( t('Friends are advised to please try again in 24 hours.') . EOL);
@@ -295,7 +295,7 @@ function dfrn_request_post(&$a) {
                        AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ",
                        dbesc(NETWORK_MAIL2)
                );
-               if(count($r)) {
+               if(dbm::is_result($r)) {
                        foreach($r as $rr) {
                                if(! $rr['rel']) {
                                        q("DELETE FROM `contact` WHERE `id` = %d",
@@ -320,7 +320,7 @@ function dfrn_request_post(&$a) {
                        AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 3 DAY ",
                        dbesc(NETWORK_MAIL2)
                );
-               if(count($r)) {
+               if(dbm::is_result($r)) {
                        foreach($r as $rr) {
                                if(! $rr['rel']) {
                                        q("DELETE FROM `contact` WHERE `id` = %d",
@@ -370,7 +370,7 @@ function dfrn_request_post(&$a) {
                                $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
                                        intval($uid)
                                );
-                               if(! count($r)) {
+                               if(! dbm::is_result($r)) {
 
                                        notice( t('This account has not been configured for email. Request failed.') . EOL);
                                        return;
@@ -398,7 +398,7 @@ function dfrn_request_post(&$a) {
                                dbesc($poll),
                                intval($uid)
                        );
-                       if(count($r)) {
+                       if(dbm::is_result($r)) {
                                $contact_id = $r[0]['id'];
 
                                $def_gid = get_default_group($uid, $r[0]["network"]);
@@ -572,7 +572,7 @@ function dfrn_request_post(&$a) {
                                                $parms['url'],
                                                $parms['issued-id']
                                        );
-                                       if(count($r)) {
+                                       if(dbm::is_result($r)) {
                                                $contact_record = $r[0];
                                                update_contact_avatar($photo, $uid, $contact_record["id"], true);
                                        }
@@ -729,7 +729,7 @@ function dfrn_request_content(&$a) {
 
                        $auto_confirm = false;
 
-                       if(count($r)) {
+                       if(dbm::is_result($r)) {
                                if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP))
                                        $auto_confirm = true;
 
@@ -842,7 +842,7 @@ function dfrn_request_content(&$a) {
                        $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
                                intval($a->profile['uid'])
                        );
-                       if(! count($r))
+                       if(! dbm::is_result($r))
                                $mail_disabled = 1;
                }