Move populate_acl to Acl

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index ef7eef108f0868128688e04332a590593caad6f9..2c9770f9bdfaa76fe05601e3385445cd31d1d693 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -9,10 +9,6 @@ use Friendica\Model\Contact;
 
 require_once "mod/proxy.php";
 
-function populate_acl($user = null, $show_jotnets = false) {
-       return Acl::getFullSelectorHTML($user, $show_jotnets);
-}
-
 function navbar_complete(App $a) {
        $search = notags(trim($_REQUEST['search']));
        $mode = $_REQUEST['smode'];

diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php
index 45c3d319073e4ce879aaca2cf011850fe1f31e95..5d8d02c477499826e6a740123e41da5ac075ce61 100644 (file)
--- a/mod/bookmarklet.php
+++ b/mod/bookmarklet.php
@@ -38,7 +38,7 @@ function bookmarklet_content(App $a)
                        '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' => populate_acl($a->user, true),
+                       'acl' => Acl::getFullSelectorHTML($a->user, true),
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),

diff --git a/mod/community.php b/mod/community.php
index 88fc6168bbbe8041091e4a83878a53c9c54ab216..5f0bd34a1389f5709d84e5b3d3cfc4e1ebbc2d02 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -2,8 +2,10 @@
 /**
  * @file mod/community.php
  */
+
 use Friendica\App;
 use Friendica\Content\Nav;
+use Friendica\Core\Acl;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -104,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' => populate_acl($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 42aad736cc4e8503cd9fe94e9bb303af42c53352..d543535aa7a206a9fefc5f4713c178d74af97c2b 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -5,6 +5,7 @@
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
+use Friendica\Core\Acl;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
@@ -317,7 +318,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' => populate_acl($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 cf84dc7badc29bb3ae3f11abefb1df595a548747..7a54056b5ab9a90a4957cd58e9a242dd9423b27b 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -484,7 +484,7 @@ function events_content(App $a) {
                $perms = Acl::getDefaultUserPermissions($orig_event);
 
                if ($mode === 'new' || $mode === 'copy') {
-                       $acl = (($cid) ? '' : populate_acl(((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/network.php b/mod/network.php
index 9ab476004d00b28da0dd8b054bd40622abc425ea..f7cc167642d259375f6dea764dcf4a909bf675f6 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -429,7 +429,7 @@ function networkFlatView(App $a, $update = 0)
                        ((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' => populate_acl($a->user, true),
+                       'acl' => Acl::getFullSelectorHTML($a->user, true),
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
@@ -578,7 +578,7 @@ function networkThreadedView(App $a, $update, $parent)
                        ((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' => populate_acl((($gid || $cid || $nets) ? $def_acl : $a->user), true),
+                       '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 3cd8b752863b6a68b49a04113a9aa6659b8e7cd9..fd8f1c84c79c5a2ce4e41e88faa25ceb8752a695 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -7,6 +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\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -1084,7 +1085,7 @@ function photos_content(App $a)
 
                $tpl = get_markup_template('photos_upload.tpl');
 
-               $aclselect_e = ($visitor ? '' : populate_acl($a->user));
+               $aclselect_e = ($visitor ? '' : Acl::getFullSelectorHTML($a->user));
 
                $o .= replace_macros($tpl,[
                        '$pagename' => L10n::t('Upload Photos'),
@@ -1425,7 +1426,7 @@ function photos_content(App $a)
 
                        $album_e = $ph[0]['album'];
                        $caption_e = $ph[0]['desc'];
-                       $aclselect_e = populate_acl($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 5e5988994cbe0965c58060bb1a0f87239d74f908..6e8de352776a6a0ea0c524087bb79d7d23cb86a1 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -6,6 +6,7 @@
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Widget;
+use Friendica\Core\Acl;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -213,7 +214,7 @@ function profile_content(App $a, $update = 0)
                                                || strlen($a->user['deny_cid'])
                                                || strlen($a->user['deny_gid'])
                                        ) ? 'lock' : 'unlock',
-                               'acl' => $is_owner ? populate_acl($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 6fcbe4d116b9a7efaf6a7ee79213109946d5ad73..6646f1559c856e0ec5ac9212c099135083da7f02 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -6,6 +6,7 @@
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
+use Friendica\Core\Acl;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -1224,7 +1225,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' => populate_acl($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, ''),