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

[friendica.git] / mod / profperm.php

diff --git a/mod/profperm.php b/mod/profperm.php
index 444f7a5eabf2a49003dff5c3eaf2447ea4e79ce5..7893bdfa17c33da5aa0e3d03ed03693c4d5cea53 100644 (file)
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -37,11 +37,12 @@ function profperm_content(&$a) {
 
        if(($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
                $r = q("SELECT `id` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `self` = 0
-                       AND `network` = 'dfrn' AND `id` = %d AND `uid` = %d LIMIT 1",
+                       AND `network` = '%s' AND `id` = %d AND `uid` = %d LIMIT 1",
+                       dbesc(NETWORK_DFRN),
                        intval($a->argv[2]),
                        intval(local_user())
                );
-               if(count($r))
+               if(dbm::is_result($r))
                        $change = intval($a->argv[2]);
        }
 
@@ -51,7 +52,7 @@ function profperm_content(&$a) {
                        intval($a->argv[1]),
                        intval(local_user())
                );
-               if(! count($r)) {
+               if(! dbm::is_result($r)) {
                        notice( t('Invalid profile identifier.') . EOL );
                        return;
                }
@@ -63,7 +64,7 @@ function profperm_content(&$a) {
                );
 
                $ingroup = array();
-               if(count($r))
+               if(dbm::is_result($r))
                        foreach($r as $member)
                                $ingroup[] = $member['id'];
 
@@ -93,7 +94,7 @@ function profperm_content(&$a) {
                        $members = $r;
 
                        $ingroup = array();
-                       if(count($r))
+                       if(dbm::is_result($r))
                                foreach($r as $member)
                                        $ingroup[] = $member['id'];
                }
@@ -130,13 +131,14 @@ function profperm_content(&$a) {
        $o .= '<h3>' . t("All Contacts \x28with secure profile access\x29") . '</h3>';
        $o .= '</div>';
        $o .= '<div id="prof-all-contacts">';
-               
-               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0 
-                       AND `network` = 'dfrn' ORDER BY `name` ASC",
-                       intval(local_user())
+
+               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0
+                       AND `network` = '%s' ORDER BY `name` ASC",
+                       intval(local_user()),
+                       dbesc(NETWORK_DFRN)
                );
 
-               if(count($r)) {
+               if(dbm::is_result($r)) {
                        $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
                        foreach($r as $member) {
                                if(! in_array($member['id'],$ingroup)) {