From a7db21c8fd8d1584bbc77566c830e26d9ea3519b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 2 Mar 2018 18:41:24 -0500 Subject: [PATCH] Rename Core\Acl to Core\ACL --- mod/acl.php | 4 ++-- mod/bookmarklet.php | 6 +++--- mod/community.php | 4 ++-- mod/display.php | 4 ++-- mod/events.php | 6 +++--- mod/fsuggest.php | 4 ++-- mod/message.php | 4 ++-- mod/network.php | 10 +++++----- mod/photos.php | 6 +++--- mod/profile.php | 4 ++-- mod/settings.php | 4 ++-- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/mod/acl.php b/mod/acl.php index 23875b6831..11d9e5683a 100644 --- 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 5d8d02c477..9ae3e28f08 100644 --- 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 5f0bd34a13..40ebdbb6e0 100644 --- 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 59e8aa277e..ab27b283b7 100644 --- 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 3cc2ae2b4b..8dab59b038 100644 --- 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 55f9c3231a..4f432d840a 100644 --- 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 .= '
'; - $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 27ba765d02..e9bfc076bb 100644 --- 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 9e1a05a112..4ab773bd32 100644 --- 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 a34a28fc1a..c8dad750d1 100644 --- 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 830fc04c7f..ab11b4d5fe 100644 --- 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 1ac3f434bb..46c3d2ec96 100644 --- 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, ''),