Stopped using deprecated constants NETWORK_* (#5537)

[friendica.git] / mod / acl.php

diff --git a/mod/acl.php b/mod/acl.php
index 90e85040f03b8ec1a1fa77fd812c8089f084766b..f9589598dda5b1ef0a5b4715a814c2c5cee68df9 100644 (file)
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -6,12 +6,13 @@ use Friendica\App;
 use Friendica\Content\Widget;
 use Friendica\Core\ACL;
 use Friendica\Core\Addon;
+use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
+use Friendica\Util\Proxy as ProxyUtils;
 
 require_once 'include/dba.php';
-require_once 'mod/proxy.php';
 
 function acl_content(App $a)
 {
@@ -36,8 +37,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 = '';
@@ -84,8 +85,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(Protocol::DFRN),
+                       DBA::escape(Protocol::DIASPORA)
                );
                $contact_count = (int) $r[0]['c'];
        } elseif ($type == 'a') {
@@ -143,8 +144,8 @@ function acl_content(App $a)
                                $sql_extra2
                                ORDER BY `name` ASC ",
                        intval(local_user()),
-                       dbesc(NETWORK_OSTATUS),
-                       dbesc(NETWORK_STATUSNET)
+                       DBA::escape(Protocol::OSTATUS),
+                       DBA::escape(Protocol::STATUSNET)
                );
        } elseif ($type == 'c') {
                $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact`
@@ -153,7 +154,7 @@ function acl_content(App $a)
                                $sql_extra2
                                ORDER BY `name` ASC ",
                        intval(local_user()),
-                       dbesc(NETWORK_STATUSNET)
+                       DBA::escape(Protocol::STATUSNET)
                );
        } elseif ($type == 'f') {
                $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact`
@@ -163,7 +164,7 @@ function acl_content(App $a)
                                $sql_extra2
                                ORDER BY `name` ASC ",
                        intval(local_user()),
-                       dbesc(NETWORK_STATUSNET)
+                       DBA::escape(Protocol::STATUSNET)
                );
        } elseif ($type == 'm') {
                $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr` FROM `contact`
@@ -172,8 +173,8 @@ function acl_content(App $a)
                                $sql_extra2
                                ORDER BY `name` ASC ",
                        intval(local_user()),
-                       dbesc(NETWORK_DFRN),
-                       dbesc(NETWORK_DIASPORA)
+                       DBA::escape(Protocol::DFRN),
+                       DBA::escape(Protocol::DIASPORA)
                );
        } elseif ($type == 'a') {
                $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact`
@@ -192,7 +193,7 @@ function acl_content(App $a)
                $contacts = [];
                foreach ($r as $g) {
                        $contacts[] = [
-                               'photo'   => proxy_url($g['photo'], false, PROXY_SIZE_MICRO),
+                               'photo'   => ProxyUtils::proxifyUrl($g['photo'], false, ProxyUtils::SIZE_MICRO),
                                'name'    => $g['name'],
                                'nick'    => defaults($g, 'addr', $g['url']),
                                'network' => $g['network'],
@@ -214,7 +215,7 @@ function acl_content(App $a)
                foreach ($r as $g) {
                        $entry = [
                                'type'    => 'c',
-                               'photo'   => proxy_url($g['micro'], false, PROXY_SIZE_MICRO),
+                               'photo'   => ProxyUtils::proxifyUrl($g['micro'], false, ProxyUtils::SIZE_MICRO),
                                'name'    => htmlentities($g['name']),
                                'id'      => intval($g['id']),
                                'network' => $g['network'],
@@ -275,7 +276,7 @@ function acl_content(App $a)
                        if (count($contact) > 0) {
                                $unknown_contacts[] = [
                                        'type'    => 'c',
-                                       'photo'   => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
+                                       'photo'   => ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO),
                                        'name'    => htmlentities($contact['name']),
                                        'id'      => intval($contact['cid']),
                                        'network' => $contact['network'],