From 09c717d7519ef871a6f3ce0a73f7e24466bd50f0 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 25 Feb 2018 20:08:33 -0500 Subject: [PATCH] Remove references to include/acl_selectors --- include/conversation.php | 2 -- mod/acl.php | 1 - mod/display.php | 1 - mod/editpost.php | 2 -- mod/events.php | 2 -- mod/fsuggest.php | 2 -- mod/group.php | 1 - mod/message.php | 1 - mod/network.php | 1 - mod/notes.php | 1 - mod/photos.php | 1 - mod/profile.php | 1 - mod/settings.php | 2 -- mod/videos.php | 1 - src/Model/Group.php | 1 - 15 files changed, 20 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index c7a2379d5..ba7b7315b 100644 --- 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 a178a6922..a3cc335b1 100644 --- 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 d543535aa..59e8aa277 100644 --- 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 3081b6729..aa2c29684 100644 --- 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 7a54056b5..3cc2ae2b4 100644 --- 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 b0abeb220..55f9c3231 100644 --- 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 0473e2af9..870025074 100644 --- 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 d2980aaea..e7d8a2080 100644 --- 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 f7cc16764..9e1a05a11 100644 --- 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 3b46df07d..aa239fb0e 100644 --- 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 fd8f1c84c..a34a28fc1 100644 --- 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 6e8de3527..830fc04c7 100644 --- 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 6646f1559..1ac3f434b 100644 --- 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 75a4d031f..f4b8c46b1 100644 --- 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 c1430642d..f48dd5043 100644 --- 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;