Rename dbesc to DBA::escape

[friendica.git] / mod / acl.php

diff --git a/mod/acl.php b/mod/acl.php
index 32b86d90bbc338a703537d95068c5ab589155246..5d155511dbb478dba8ac0f27b0d08baf62dfde05 100644 (file)
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -6,8 +6,7 @@ use Friendica\App;
 use Friendica\Content\Widget;
 use Friendica\Core\ACL;
 use Friendica\Core\Addon;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 
@@ -37,8 +36,8 @@ function acl_content(App $a)
        logger("Searching for ".$search." - type ".$type." conversation ".$conv_id, LOGGER_DEBUG);
 
        if ($search != '') {
-               $sql_extra = "AND `name` LIKE '%%" . dbesc($search) . "%%'";
-               $sql_extra2 = "AND (`attag` LIKE '%%" . dbesc($search) . "%%' OR `name` LIKE '%%" . dbesc($search) . "%%' OR `nick` LIKE '%%" . dbesc($search) . "%%')";
+               $sql_extra = "AND `name` LIKE '%%" . DBA::escape($search) . "%%'";
+               $sql_extra2 = "AND (`attag` LIKE '%%" . DBA::escape($search) . "%%' OR `name` LIKE '%%" . DBA::escape($search) . "%%' OR `nick` LIKE '%%" . DBA::escape($search) . "%%')";
        } else {
                /// @TODO Avoid these needless else blocks by putting variable-initialization atop of if()
                $sql_extra = $sql_extra2 = '';
@@ -85,8 +84,8 @@ function acl_content(App $a)
                                AND `success_update` >= `failure_update`
                                AND `network` IN ('%s', '%s') $sql_extra2",
                        intval(local_user()),
-                       dbesc(NETWORK_DFRN),
-                       dbesc(NETWORK_DIASPORA)
+                       DBA::escape(NETWORK_DFRN),
+                       DBA::escape(NETWORK_DIASPORA)
                );
                $contact_count = (int) $r[0]['c'];
        } elseif ($type == 'a') {
@@ -144,8 +143,8 @@ function acl_content(App $a)
                                $sql_extra2
                                ORDER BY `name` ASC ",
                        intval(local_user()),
-                       dbesc(NETWORK_OSTATUS),
-                       dbesc(NETWORK_STATUSNET)
+                       DBA::escape(NETWORK_OSTATUS),
+                       DBA::escape(NETWORK_STATUSNET)
                );
        } elseif ($type == 'c') {
                $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact`
@@ -154,7 +153,7 @@ function acl_content(App $a)
                                $sql_extra2
                                ORDER BY `name` ASC ",
                        intval(local_user()),
-                       dbesc(NETWORK_STATUSNET)
+                       DBA::escape(NETWORK_STATUSNET)
                );
        } elseif ($type == 'f') {
                $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact`
@@ -164,7 +163,7 @@ function acl_content(App $a)
                                $sql_extra2
                                ORDER BY `name` ASC ",
                        intval(local_user()),
-                       dbesc(NETWORK_STATUSNET)
+                       DBA::escape(NETWORK_STATUSNET)
                );
        } elseif ($type == 'm') {
                $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr` FROM `contact`
@@ -173,8 +172,8 @@ function acl_content(App $a)
                                $sql_extra2
                                ORDER BY `name` ASC ",
                        intval(local_user()),
-                       dbesc(NETWORK_DFRN),
-                       dbesc(NETWORK_DIASPORA)
+                       DBA::escape(NETWORK_DFRN),
+                       DBA::escape(NETWORK_DIASPORA)
                );
        } elseif ($type == 'a') {
                $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact`
@@ -210,7 +209,7 @@ function acl_content(App $a)
                exit;
        }
 
-       if (DBM::is_result($r)) {
+       if (DBA::isResult($r)) {
                $forums = [];
                foreach ($r as $g) {
                        $entry = [
@@ -243,7 +242,7 @@ function acl_content(App $a)
        if ($conv_id) {
                // In multi threaded posts the conv_id is not the parent of the whole thread
                $parent_item = Item::selectFirst(['parent'], ['id' => $conv_id]);
-               if (DBM::is_result($parent_item)) {
+               if (DBA::isResult($parent_item)) {
                        $conv_id = $parent_item['parent'];
                }
 
@@ -264,7 +263,7 @@ function acl_content(App $a)
                while ($author = Item::fetch($authors)) {
                        $item_authors[$author['author-link']] = $author['author-link'];
                }
-               dba::close($authors);
+               DBA::close($authors);
 
                foreach ($item_authors as $author) {
                        if (in_array($author, $known_contacts)) {