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

Bug fix for Login class and read sub data for edit access block

Browse Source
This commit is contained in:
Clemens Schwaighofer
2016-07-19 16:44:21 +09:00
parent f980b1e76a
commit 1551df058d
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/admin/header.inc
View File

@@ -64,6 +64,8 @@
$cms->menu_show_flag = 'main'; $cms->menu_show_flag = 'main';
// db nfo // db nfo
$cms->db_info(); $cms->db_info();
// set acl
$cms->acl = $login->acl;
//------------------------------ class init end //------------------------------ class init end
//------------------------------ logging start //------------------------------ logging start

8
www/libs/Class.Admin.Backend.inc
View File

@@ -8,7 +8,6 @@
* with your name on it ... * with your name on it ...
* DESCRIPTION * DESCRIPTION
* Basic Admin interface backend * Basic Admin interface backend
* - sets ACLs
* - sets action flags * - sets action flags
* - menu creation * - menu creation
* - array vars for smarty * - array vars for smarty
@@ -45,11 +44,8 @@
public $action_loaded; public $action_loaded;
public $action_value; public $action_value;
public $action_error; public $action_error;
// DEPRICATED -> use login acl // ACL array variable if we want to set acl data from outisde
// public $page_acl; // the acl the user has on this page public $acl = array ();
// public $default_acl;
// DEPRICATED access rights
// public $access_rights = array ();
// the current active edit access id // the current active edit access id
public $edit_access_id; public $edit_access_id;
// error/warning/info messages // error/warning/info messages

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

@@ -409,7 +409,7 @@
$ea_data = array (); $ea_data = array ();
while ($res_sub = $this->db_return($q_sub)) while ($res_sub = $this->db_return($q_sub))
{ {
$ea_data[$res_sub['name']] = $res['value']; $ea_data[$res_sub['name']] = $res_sub['value'];
} }
// build master unit array // build master unit array
$unit_access[$res['edit_access_id']] = array ( $unit_access[$res['edit_access_id']] = array (