Rename Core\Acl to Core\ACL

diff --git a/mod/acl.php b/mod/acl.php
index 23875b683120fbb99709e708ffefaf0bcfa25727..11d9e5683a76a9014802c527e3d0cba8d49fa9ad 100644 (file)
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -4,7 +4,7 @@
 
 use Friendica\App;
 use Friendica\Content\Widget;
-use Friendica\Core\Acl;
+use Friendica\Core\ACL;
 use Friendica\Core\Addon;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
@@ -186,7 +186,7 @@ function acl_content(App $a)
                $search = notags(trim($_REQUEST['search']));
                $mode = $_REQUEST['smode'];
 
-               $r = Acl::contactAutocomplete($search, $mode);
+               $r = ACL::contactAutocomplete($search, $mode);
 
                $contacts = [];
                foreach ($r as $g) {

diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php
index 5d8d02c477499826e6a740123e41da5ac075ce61..9ae3e28f085feb59d59665439dab9e1fb4be5a13 100644 (file)
--- a/mod/bookmarklet.php
+++ b/mod/bookmarklet.php
@@ -4,7 +4,7 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Acl;
+use Friendica\Core\ACL;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Module\Login;
@@ -37,8 +37,8 @@ function bookmarklet_content(App $a)
                        'default_location' => $a->user['default-location'],
                        'nickname' => $a->user['nickname'],
                        'lockstate' => ((is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid'])))) ? 'lock' : 'unlock'),
-                       'default_perms' => Acl::getDefaultUserPermissions($a->user),
-                       'acl' => Acl::getFullSelectorHTML($a->user, true),
+                       'default_perms' => ACL::getDefaultUserPermissions($a->user),
+                       'acl' => ACL::getFullSelectorHTML($a->user, true),
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),

diff --git a/mod/community.php b/mod/community.php
index 5f0bd34a1389f5709d84e5b3d3cfc4e1ebbc2d02..40ebdbb6e011f2aa5cea9a9f0a55523da7815d8b 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -5,7 +5,7 @@
 
 use Friendica\App;
 use Friendica\Content\Nav;
-use Friendica\Core\Acl;
+use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -106,7 +106,7 @@ function community_content(App $a, $update = 0)
                                'default_location' => $a->user['default-location'],
                                'nickname' => $a->user['nickname'],
                                'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
-                               'acl' => Acl::getFullSelectorHTML($a->user, true),
+                               'acl' => ACL::getFullSelectorHTML($a->user, true),
                                'bang' => '',
                                'visitor' => 'block',
                                'profile_uid' => local_user(),

diff --git a/mod/display.php b/mod/display.php
index 59e8aa277e5beb6a33dd020b88d4099f9b63e31f..ab27b283b764f4ea847963f6864c867d6ff92e95 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -5,7 +5,7 @@
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Acl;
+use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
@@ -317,7 +317,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
                        'default_location' => $a->user['default-location'],
                        'nickname' => $a->user['nickname'],
                        'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
-                       'acl' => Acl::getFullSelectorHTML($a->user, true),
+                       'acl' => ACL::getFullSelectorHTML($a->user, true),
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),

diff --git a/mod/events.php b/mod/events.php
index 3cc2ae2b4b3015a42f24f761e4efe221e7e20b2e..8dab59b0380c6403f76c90218cf0588c91ad1a1c 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -6,7 +6,7 @@
 
 use Friendica\App;
 use Friendica\Content\Nav;
-use Friendica\Core\Acl;
+use Friendica\Core\ACL;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
@@ -479,10 +479,10 @@ 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');
 
-               $perms = Acl::getDefaultUserPermissions($orig_event);
+               $perms = ACL::getDefaultUserPermissions($orig_event);
 
                if ($mode === 'new' || $mode === 'copy') {
-                       $acl = (($cid) ? '' : Acl::getFullSelectorHTML(((x($orig_event)) ? $orig_event : $a->user)));
+                       $acl = (($cid) ? '' : ACL::getFullSelectorHTML(((x($orig_event)) ? $orig_event : $a->user)));
                }
 
                // If we copy an old event, we need to remove the ID and URI

diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index 55f9c3231a300b97a3b47588da1dbd4533f864ff..4f432d840a89287e5927214f3e190671c31cdd6e 100644 (file)
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -4,7 +4,7 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Acl;
+use Friendica\Core\ACL;
 use Friendica\Core\L10n;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
@@ -104,7 +104,7 @@ function fsuggest_content(App $a)
 
        $o .= '<form id="fsuggest-form" action="fsuggest/' . $contact_id . '" method="post" >';
 
-       $o .= Acl::getSuggestContactSelectHTML(
+       $o .= ACL::getSuggestContactSelectHTML(
                'suggest',
                'suggest-select',
                ['size' => 4, 'exclude' => $contact_id, 'networks' => 'DFRN_ONLY', 'single' => true]

diff --git a/mod/message.php b/mod/message.php
index 27ba765d02ff1f27412abbe9082d6074c237b0d3..e9bfc076bb50e9ff42dcd5969a7610c1161cf48a 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -7,7 +7,7 @@ use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Smilies;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Acl;
+use Friendica\Core\ACL;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
@@ -243,7 +243,7 @@ function message_content(App $a)
                $prefill = $preselect ? $prename : '';
 
                // the ugly select box
-               $select = Acl::getMessageContactSelectHTML('messageto', 'message-to-select', $preselect, 4, 10);
+               $select = ACL::getMessageContactSelectHTML('messageto', 'message-to-select', $preselect, 4, 10);
 
                $tpl = get_markup_template('prv_message.tpl');
                $o .= replace_macros($tpl, [

diff --git a/mod/network.php b/mod/network.php
index 9e1a05a1121915f173a1295c3832bd0f4d4741ea..4ab773bd324e93da16fd388fc9a0ebd5c5a7b56f 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -9,7 +9,7 @@ use Friendica\Content\Feature;
 use Friendica\Content\ForumManager;
 use Friendica\Content\Nav;
 use Friendica\Content\Widget;
-use Friendica\Core\Acl;
+use Friendica\Core\ACL;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -427,8 +427,8 @@ function networkFlatView(App $a, $update = 0)
                        'lockstate' => (((is_array($a->user) &&
                        ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) ||
                        (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
-                       'default_perms' => Acl::getDefaultUserPermissions($a->user),
-                       'acl' => Acl::getFullSelectorHTML($a->user, true),
+                       'default_perms' => ACL::getDefaultUserPermissions($a->user),
+                       'acl' => ACL::getFullSelectorHTML($a->user, true),
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
@@ -576,8 +576,8 @@ function networkThreadedView(App $a, $update, $parent)
                        'lockstate' => ((($gid) || ($cid) || ($nets) || (is_array($a->user) &&
                        ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) ||
                        (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
-                       'default_perms' => Acl::getDefaultUserPermissions($a->user),
-                       'acl' => Acl::getFullSelectorHTML((($gid || $cid || $nets) ? $def_acl : $a->user), true),
+                       'default_perms' => ACL::getDefaultUserPermissions($a->user),
+                       'acl' => ACL::getFullSelectorHTML((($gid || $cid || $nets) ? $def_acl : $a->user), true),
                        'bang' => (($gid || $cid || $nets) ? '!' : ''),
                        'visitor' => 'block',
                        'profile_uid' => local_user(),

diff --git a/mod/photos.php b/mod/photos.php
index a34a28fc1a1c45efdd2521e1f12baed4e18fb584..c8dad750d1528b95f9231b7eb0d69706b76c9ffa 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -7,7 +7,7 @@ use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Acl;
+use Friendica\Core\ACL;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -1084,7 +1084,7 @@ function photos_content(App $a)
 
                $tpl = get_markup_template('photos_upload.tpl');
 
-               $aclselect_e = ($visitor ? '' : Acl::getFullSelectorHTML($a->user));
+               $aclselect_e = ($visitor ? '' : ACL::getFullSelectorHTML($a->user));
 
                $o .= replace_macros($tpl,[
                        '$pagename' => L10n::t('Upload Photos'),
@@ -1425,7 +1425,7 @@ function photos_content(App $a)
 
                        $album_e = $ph[0]['album'];
                        $caption_e = $ph[0]['desc'];
-                       $aclselect_e = Acl::getFullSelectorHTML($ph[0]);
+                       $aclselect_e = ACL::getFullSelectorHTML($ph[0]);
 
                        $edit = replace_macros($edit_tpl, [
                                '$id' => $ph[0]['id'],

diff --git a/mod/profile.php b/mod/profile.php
index 830fc04c7fc05d75452c3b69128074d3f6b61545..ab11b4d5fe509850c97c48fdc9e4346feb9f9215 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -6,7 +6,7 @@
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Widget;
-use Friendica\Core\Acl;
+use Friendica\Core\ACL;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -213,7 +213,7 @@ function profile_content(App $a, $update = 0)
                                                || strlen($a->user['deny_cid'])
                                                || strlen($a->user['deny_gid'])
                                        ) ? 'lock' : 'unlock',
-                               'acl' => $is_owner ? Acl::getFullSelectorHTML($a->user, true) : '',
+                               'acl' => $is_owner ? ACL::getFullSelectorHTML($a->user, true) : '',
                                'bang' => '',
                                'visitor' => $is_owner || $commvisitor ? 'block' : 'none',
                                'profile_uid' => $a->profile['profile_uid'],

diff --git a/mod/settings.php b/mod/settings.php
index 1ac3f434bb1e952bf2aa6457c9a7126d4210b36e..46c3d2ec9650ba504f681ea380d3e30b767f9433 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -6,7 +6,7 @@
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
-use Friendica\Core\Acl;
+use Friendica\Core\ACL;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -1223,7 +1223,7 @@ function settings_content(App $a)
                '$permissions' => L10n::t('Default Post Permissions'),
                '$permdesc' => L10n::t("\x28click to open/close\x29"),
                '$visibility' => $profile['net-publish'],
-               '$aclselect' => Acl::getFullSelectorHTML($a->user),
+               '$aclselect' => ACL::getFullSelectorHTML($a->user),
                '$suggestme' => $suggestme,
                '$blockwall'=> $blockwall, // array('blockwall', L10n::t('Allow friends to post to your profile page:'), !$blockwall, ''),
                '$blocktags'=> $blocktags, // array('blocktags', L10n::t('Allow friends to tag your posts:'), !$blocktags, ''),