CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edit_base.inc/edit_order.php:

Browse Source 
change the order of the includes and change them to require.
move session start away and only set session name as the session is no
started automatically.
set_paths.inc:
missing form set detection, auto create picture cache root folder if it
does not exist
Class.Login.inc
set new acl var show_ea_extra. Is set to 1 if the user has more than one
edit access group
This commit is contained in:
Clemens Schwaighofer
2014-01-08 13:07:02 +09:00
parent 2327fcb68f
commit 7093d2bba4
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
www/libs/Class.Login.inc
View File

@@ -516,7 +516,7 @@
if (!$this->acl['info']['admin'])
{
// this is the base if nothing is set
$this->acl['acl']['user'] = DEFAULT_ACL_LEVEL;
$this->acl['acl']['user'] = DEFAULT_ACL_LEVEL; // old base ACL
$this->acl['acl']['max'] = DEFAULT_ACL_LEVEL;
// group ACL 0
if ($_SESSION['GROUP_ACL_LEVEL'] != -1)
@@ -566,6 +566,11 @@
$this->acl['acl']['edit_access'][$unit['id']] = !$this->acl['info']['admin'] ? ($unit['acl_level'] != -1 ? $unit['acl_level'] : $this->acl['acl']['page']) : 100;
$this->acl['info']['edit_access'][$unit['id']] = $unit['name'];
}
// flag if to show extra edit access drop downs (because user has multiple groups assigned)
if (count($_SESSION['UNIT'] > 1))
$this->acl['acl']['show_ea_extra'] = 1;
else
$this->acl['acl']['show_ea_extra'] = 0;
// set the default edit access
$this->acl['info']['default_edit_access'] = $_SESSION['UNIT_DEFAULT'];
// integrate the default_acl list, but only for the keyword -> level