diff --git a/www/admin/header.inc b/www/admin/header.inc index 5faa8152..25bebe91 100644 --- a/www/admin/header.inc +++ b/www/admin/header.inc @@ -64,6 +64,8 @@ $cms->menu_show_flag = 'main'; // db nfo $cms->db_info(); + // set acl + $cms->acl = $login->acl; //------------------------------ class init end //------------------------------ logging start diff --git a/www/libs/Class.Admin.Backend.inc b/www/libs/Class.Admin.Backend.inc index bb5d26d1..8c8e7423 100644 --- a/www/libs/Class.Admin.Backend.inc +++ b/www/libs/Class.Admin.Backend.inc @@ -8,7 +8,6 @@ * with your name on it ... * DESCRIPTION * Basic Admin interface backend - * - sets ACLs * - sets action flags * - menu creation * - array vars for smarty @@ -45,11 +44,8 @@ public $action_loaded; public $action_value; public $action_error; - // DEPRICATED -> use login acl -// public $page_acl; // the acl the user has on this page -// public $default_acl; - // DEPRICATED access rights -// public $access_rights = array (); + // ACL array variable if we want to set acl data from outisde + public $acl = array (); // the current active edit access id public $edit_access_id; // error/warning/info messages diff --git a/www/libs/Class.Login.inc b/www/libs/Class.Login.inc index 53b25eb7..a3fee68d 100644 --- a/www/libs/Class.Login.inc +++ b/www/libs/Class.Login.inc @@ -409,7 +409,7 @@ $ea_data = array (); 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 $unit_access[$res['edit_access_id']] = array (