Burn notices, burn

[friendica.git/.git] / mod / delegate.php

diff --git a/mod/delegate.php b/mod/delegate.php
index 5604e91..ed4f854 100644 (file)
--- a/mod/delegate.php
+++ b/mod/delegate.php
@@ -5,6 +5,7 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
@@ -34,7 +35,7 @@ function delegate_post(App $a)
 
        if ($parent_uid != 0) {
                $user = DBA::selectFirst('user', ['nickname'], ['uid' => $parent_uid]);
-               if (!DBA::is_result($user)) {
+               if (!DBA::isResult($user)) {
                        notice(L10n::t('Parent user not found.') . EOL);
                        return;
                }
@@ -65,7 +66,7 @@ function delegate_content(App $a)
                $user_id = $a->argv[2];
 
                $user = DBA::selectFirst('user', ['nickname'], ['uid' => $user_id]);
-               if (DBA::is_result($user)) {
+               if (DBA::isResult($user)) {
                        $condition = [
                                'uid' => local_user(),
                                'nurl' => normalise_link(System::baseUrl() . '/profile/' . $user['nickname'])
@@ -92,7 +93,7 @@ function delegate_content(App $a)
        $r = q("SELECT * FROM `user` WHERE `uid` IN (SELECT `uid` FROM `manage` WHERE `mid` = %d)",
                intval(local_user())
        );
-       if (DBA::is_result($r)) {
+       if (DBA::isResult($r)) {
                $delegates = $r;
        }
 
@@ -110,21 +111,21 @@ function delegate_content(App $a)
                AND SUBSTRING_INDEX(`nurl`, '/', 3) = '%s'
                AND `uid` = %d
                AND `network` = '%s' ",
-               dbesc(normalise_link(System::baseUrl())),
+               DBA::escape(normalise_link(System::baseUrl())),
                intval(local_user()),
-               dbesc(NETWORK_DFRN)
+               DBA::escape(Protocol::DFRN)
        );
-       if (DBA::is_result($r)) {
+       if (DBA::isResult($r)) {
                $nicknames = [];
                foreach ($r as $rr) {
-                       $nicknames[] = "'" . dbesc(basename($rr['nurl'])) . "'";
+                       $nicknames[] = "'" . DBA::escape(basename($rr['nurl'])) . "'";
                }
 
                $nicks = implode(',', $nicknames);
 
                // get user records for all potential page delegates who are not already delegates or managers
                $r = q("SELECT `uid`, `username`, `nickname` FROM `user` WHERE `nickname` IN ($nicks)");
-               if (DBA::is_result($r)) {
+               if (DBA::isResult($r)) {
                        foreach ($r as $rr) {
                                if (!in_array($rr['uid'], $uids)) {
                                        $potentials[] = $rr;
@@ -139,7 +140,7 @@ function delegate_content(App $a)
 
        $parent_user = null;
 
-       if (DBA::is_result($user)) {
+       if (DBA::isResult($user)) {
                if (!DBA::exists('user', ['parent-uid' => local_user()])) {
                        $parent_uid = $user['parent-uid'];
                        $parents = [0 => L10n::t('No parent user')];