Merge pull request #5620 from annando/fix-remove

[friendica.git] / mod / profperm.php

diff --git a/mod/profperm.php b/mod/profperm.php
index 3486a1df52e45aacd26996b96a499022bbd81854..4ee933e6cbecea30c696b37722aefdaa42f20aae 100644 (file)
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -6,7 +6,8 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\Model\Profile;
 
 function profperm_init(App $a)
@@ -30,11 +31,13 @@ function profperm_content(App $a) {
        }
 
 
-       if($a->argc < 2) {
+       if ($a->argc < 2) {
                notice(L10n::t('Invalid profile identifier.') . EOL );
                return;
        }
 
+       $o = '';
+
        // Switch to text mod interface if we have more than 'n' contacts or group members
 
        $switchtotext = PConfig::get(local_user(),'system','groupedit_image_limit');
@@ -45,21 +48,23 @@ function profperm_content(App $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` = '%s' AND `id` = %d AND `uid` = %d LIMIT 1",
-                       dbesc(NETWORK_DFRN),
+                       DBA::escape(Protocol::DFRN),
                        intval($a->argv[2]),
                        intval(local_user())
                );
-               if (DBM::is_result($r))
+
+               if (DBA::isResult($r)) {
                        $change = intval($a->argv[2]);
+               }
        }
 
 
-       if(($a->argc > 1) && (intval($a->argv[1]))) {
+       if (($a->argc > 1) && (intval($a->argv[1]))) {
                $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
                        intval($a->argv[1]),
                        intval(local_user())
                );
-               if (! DBM::is_result($r)) {
+               if (! DBA::isResult($r)) {
                        notice(L10n::t('Invalid profile identifier.') . EOL );
                        return;
                }
@@ -71,7 +76,7 @@ function profperm_content(App $a) {
                );
 
                $ingroup = [];
-               if (DBM::is_result($r))
+               if (DBA::isResult($r))
                        foreach($r as $member)
                                $ingroup[] = $member['id'];
 
@@ -101,7 +106,7 @@ function profperm_content(App $a) {
                        $members = $r;
 
                        $ingroup = [];
-                       if (DBM::is_result($r))
+                       if (DBA::isResult($r))
                                foreach($r as $member)
                                        $ingroup[] = $member['id'];
                }
@@ -142,10 +147,10 @@ function profperm_content(App $a) {
                $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)
+                       DBA::escape(Protocol::DFRN)
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
                        foreach($r as $member) {
                                if(! in_array($member['id'],$ingroup)) {
@@ -165,4 +170,3 @@ function profperm_content(App $a) {
        return $o;
 
 }
-