Remove references to include/acl_selectors

diff --git a/include/conversation.php b/include/conversation.php
index c7a2379d539353f0bc07a623aef54695e7b6430f..ba7b7315b0f2231f92884971a7d3d38f6a60a75d 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -21,8 +21,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 
-require_once "include/acl_selectors.php";
-
 function item_extract_images($body) {
 
        $saved_image = [];

diff --git a/mod/acl.php b/mod/acl.php
index a178a6922183c9a60d11d333fdc2b37975df6c67..a3cc335b1dc52e7e451d3dd217101d67a9c74833 100644 (file)
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -9,7 +9,6 @@ use Friendica\Core\Addon;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 
-require_once 'include/acl_selectors.php';
 require_once 'include/dba.php';
 require_once 'mod/proxy.php';
 

diff --git a/mod/display.php b/mod/display.php
index d543535aa7a206a9fefc5f4713c178d74af97c2b..59e8aa277e5beb6a33dd020b88d4099f9b63e31f 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -205,7 +205,6 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 
        require_once 'include/security.php';
        require_once 'include/conversation.php';
-       require_once 'include/acl_selectors.php';
 
        $o = '';
 

diff --git a/mod/editpost.php b/mod/editpost.php
index 3081b67293730250e5f4fde90f687f8db9b64405..aa2c296845c95ce7d3dd34f201fa48024a703854 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -10,8 +10,6 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 
-require_once 'include/acl_selectors.php';
-
 function editpost_content(App $a) {
 
        $o = '';

diff --git a/mod/events.php b/mod/events.php
index 7a54056b5ab9a90a4957cd58e9a242dd9423b27b..3cc2ae2b4b3015a42f24f761e4efe221e7e20b2e 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -479,8 +479,6 @@ function events_content(App $a) {
                $fhour   = ((x($orig_event)) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00');
                $fminute = ((x($orig_event)) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00');
 
-               require_once 'include/acl_selectors.php' ;
-
                $perms = Acl::getDefaultUserPermissions($orig_event);
 
                if ($mode === 'new' || $mode === 'copy') {

diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index b0abeb2202f23d90a68ee53120d751ae4a42aa6e..55f9c3231a300b97a3b47588da1dbd4533f864ff 100644 (file)
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -76,8 +76,6 @@ function fsuggest_post(App $a)
 
 function fsuggest_content(App $a)
 {
-       require_once 'include/acl_selectors.php';
-
        if (! local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
                return;

diff --git a/mod/group.php b/mod/group.php
index 0473e2af9f6d56f6f582ec94fec76e726375bbb3..870025074c91b34b220c8d51ec1c5e8b5a39efee 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -146,7 +146,6 @@ function group_content(App $a) {
        }
 
        if (($a->argc > 1) && (intval($a->argv[1]))) {
-               require_once 'include/acl_selectors.php';
                require_once 'mod/contacts.php';
 
                $r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",

diff --git a/mod/message.php b/mod/message.php
index d2980aaea17419cb51bfed14f89f7283882ba3e6..e7d8a2080e7272eafe63395fb948172065581d17 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -16,7 +16,6 @@ use Friendica\Model\Mail;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 
-require_once 'include/acl_selectors.php';
 require_once 'include/conversation.php';
 
 function message_init(App $a)

diff --git a/mod/network.php b/mod/network.php
index f7cc167642d259375f6dea764dcf4a909bf675f6..9e1a05a1121915f173a1295c3832bd0f4d4741ea 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -25,7 +25,6 @@ use Friendica\Util\DateTimeFormat;
 
 require_once 'include/conversation.php';
 require_once 'include/items.php';
-require_once 'include/acl_selectors.php';
 
 function network_init(App $a)
 {

diff --git a/mod/notes.php b/mod/notes.php
index 3b46df07da000ba02c2b4c1c35d1547fcc8981c1..aa239fb0e0040b1aff493747bc2529c7ab9016ef 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -33,7 +33,6 @@ function notes_content(App $a, $update = false)
 
        require_once 'include/security.php';
        require_once 'include/conversation.php';
-       require_once 'include/acl_selectors.php';
        $groups = [];
 
 

diff --git a/mod/photos.php b/mod/photos.php
index fd8f1c84c79c5a2ce4e41e88faa25ceb8752a695..a34a28fc1a1c45efdd2521e1f12baed4e18fb584 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -27,7 +27,6 @@ use Friendica\Util\Map;
 use Friendica\Util\Temporal;
 
 require_once 'include/items.php';
-require_once 'include/acl_selectors.php';
 require_once 'include/security.php';
 
 function photos_init(App $a) {

diff --git a/mod/profile.php b/mod/profile.php
index 6e8de352776a6a0ea0c524087bb79d7d23cb86a1..830fc04c7fc05d75452c3b69128074d3f6b61545 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -119,7 +119,6 @@ function profile_content(App $a, $update = 0)
 
        require_once 'include/security.php';
        require_once 'include/conversation.php';
-       require_once 'include/acl_selectors.php';
        require_once 'include/items.php';
 
        $groups = [];

diff --git a/mod/settings.php b/mod/settings.php
index 6646f1559c856e0ec5ac9212c099135083da7f02..1ac3f434bb1e952bf2aa6457c9a7126d4210b36e 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1000,8 +1000,6 @@ function settings_content(App $a)
         * ACCOUNT SETTINGS
         */
 
-       require_once('include/acl_selectors.php');
-
        $profile = dba::selectFirst('profile', [], ['is-default' => true, 'uid' => local_user()]);
        if (!DBM::is_result($profile)) {
                notice(L10n::t('Unable to find your profile. Please contact your admin.') . EOL);

diff --git a/mod/videos.php b/mod/videos.php
index 75a4d031f333441359f230ab62c8e8327dce3f43..f4b8c46b1bd80d1e6dd06386b53f5ea26fcbed08 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -19,7 +19,6 @@ use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;
 
 require_once 'include/items.php';
-require_once 'include/acl_selectors.php';
 require_once 'include/security.php';
 
 function videos_init(App $a) {

diff --git a/src/Model/Group.php b/src/Model/Group.php
index c1430642de5480c43141ffbc9837b6b12898121f..f48dd5043190bc56b891a49caeda1527c81f6391 100644 (file)
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -289,7 +289,6 @@ class Group extends BaseObject
                }
 
                if ($check_dead && !$use_gcontact) {
-                       require_once 'include/acl_selectors.php';
                        Contact::pruneUnavailable($return);
                }
                return $return;