tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Move populate_acl to Acl

Browse source
This commit is contained in:
Hypolite Petovan 2018-02-25 20:03:03 -05:00
parent 2b35938e34
commit 824262b824
9 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/acl_selectors.php
View file

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

2
mod/bookmarklet.php
View file

@ -38,7 +38,7 @@ function bookmarklet_content(App $a)
'nickname' => $a->user['nickname'], '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'), '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), 'default_perms' => Acl::getDefaultUserPermissions($a->user),
'acl' => populate_acl($a->user, true), 'acl' => Acl::getFullSelectorHTML($a->user, true),
'bang' => '', 'bang' => '',
'visitor' => 'block', 'visitor' => 'block',
'profile_uid' => local_user(), 'profile_uid' => local_user(),

4
mod/community.php
View file

@ -2,8 +2,10 @@
/** /**
* @file mod/community.php * @file mod/community.php
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Content\Nav; use Friendica\Content\Nav;
use Friendica\Core\Acl;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
@ -104,7 +106,7 @@ function community_content(App $a, $update = 0)
'default_location' => $a->user['default-location'], 'default_location' => $a->user['default-location'],
'nickname' => $a->user['nickname'], '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'), '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' => '', 'bang' => '',
'visitor' => 'block', 'visitor' => 'block',
'profile_uid' => local_user(), 'profile_uid' => local_user(),

3
mod/display.php
View file

@ -5,6 +5,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Acl;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
@ -317,7 +318,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
'default_location' => $a->user['default-location'], 'default_location' => $a->user['default-location'],
'nickname' => $a->user['nickname'], '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'), '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' => '', 'bang' => '',
'visitor' => 'block', 'visitor' => 'block',
'profile_uid' => local_user(), 'profile_uid' => local_user(),

2
mod/events.php
View file

@ -484,7 +484,7 @@ function events_content(App $a) {
$perms = Acl::getDefaultUserPermissions($orig_event); $perms = Acl::getDefaultUserPermissions($orig_event);
if ($mode === 'new' || $mode === 'copy') { 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 // If we copy an old event, we need to remove the ID and URI

4
mod/network.php
View file

@ -429,7 +429,7 @@ function networkFlatView(App $a, $update = 0)
((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) ||
(strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'), (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
'default_perms' => Acl::getDefaultUserPermissions($a->user), 'default_perms' => Acl::getDefaultUserPermissions($a->user),
'acl' => populate_acl($a->user, true), 'acl' => Acl::getFullSelectorHTML($a->user, true),
'bang' => '', 'bang' => '',
'visitor' => 'block', 'visitor' => 'block',
'profile_uid' => local_user(), '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['allow_cid'])) || (strlen($a->user['allow_gid'])) ||
(strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'), (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
'default_perms' => Acl::getDefaultUserPermissions($a->user), '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) ? '!' : ''), 'bang' => (($gid || $cid || $nets) ? '!' : ''),
'visitor' => 'block', 'visitor' => 'block',
'profile_uid' => local_user(), 'profile_uid' => local_user(),

5
mod/photos.php
View file

@ -7,6 +7,7 @@ use Friendica\App;
use Friendica\Content\Feature; use Friendica\Content\Feature;
use Friendica\Content\Nav; use Friendica\Content\Nav;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Acl;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
@ -1084,7 +1085,7 @@ function photos_content(App $a)
$tpl = get_markup_template('photos_upload.tpl'); $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,[ $o .= replace_macros($tpl,[
'$pagename' => L10n::t('Upload Photos'), '$pagename' => L10n::t('Upload Photos'),
@ -1425,7 +1426,7 @@ function photos_content(App $a)
$album_e = $ph[0]['album']; $album_e = $ph[0]['album'];
$caption_e = $ph[0]['desc']; $caption_e = $ph[0]['desc'];
$aclselect_e = populate_acl($ph[0]); $aclselect_e = Acl::getFullSelectorHTML($ph[0]);
$edit = replace_macros($edit_tpl, [ $edit = replace_macros($edit_tpl, [
'$id' => $ph[0]['id'], '$id' => $ph[0]['id'],

3
mod/profile.php
View file

@ -6,6 +6,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Content\Nav; use Friendica\Content\Nav;
use Friendica\Content\Widget; use Friendica\Content\Widget;
use Friendica\Core\Acl;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
@ -213,7 +214,7 @@ function profile_content(App $a, $update = 0)
|| strlen($a->user['deny_cid']) || strlen($a->user['deny_cid'])
|| strlen($a->user['deny_gid']) || strlen($a->user['deny_gid'])
) ? 'lock' : 'unlock', ) ? 'lock' : 'unlock',
'acl' => $is_owner ? populate_acl($a->user, true) : '', 'acl' => $is_owner ? Acl::getFullSelectorHTML($a->user, true) : '',
'bang' => '', 'bang' => '',
'visitor' => $is_owner || $commvisitor ? 'block' : 'none', 'visitor' => $is_owner || $commvisitor ? 'block' : 'none',
'profile_uid' => $a->profile['profile_uid'], 'profile_uid' => $a->profile['profile_uid'],

3
mod/settings.php
View file

@ -6,6 +6,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Content\Feature; use Friendica\Content\Feature;
use Friendica\Content\Nav; use Friendica\Content\Nav;
use Friendica\Core\Acl;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
@ -1224,7 +1225,7 @@ function settings_content(App $a)
'$permissions' => L10n::t('Default Post Permissions'), '$permissions' => L10n::t('Default Post Permissions'),
'$permdesc' => L10n::t("\x28click to open/close\x29"), '$permdesc' => L10n::t("\x28click to open/close\x29"),
'$visibility' => $profile['net-publish'], '$visibility' => $profile['net-publish'],
'$aclselect' => populate_acl($a->user), '$aclselect' => Acl::getFullSelectorHTML($a->user),
'$suggestme' => $suggestme, '$suggestme' => $suggestme,
'$blockwall'=> $blockwall, // array('blockwall', L10n::t('Allow friends to post to your profile page:'), !$blockwall, ''), '$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, ''), '$blocktags'=> $blocktags, // array('blocktags', L10n::t('Allow friends to tag your posts:'), !$blocktags, ''),