$ret = false;
// Get admin's defult access right
- if (!empty($cacheArray['admins']['def_acl'][$_SESSION['admin_login']])) {
+ if (!empty($cacheArray['admins']['def_acl'][get_session('admin_login')])) {
// Load from cache
- $default = $cacheArray['admins']['def_acl'][$_SESSION['admin_login']];
+ $default = $cacheArray['admins']['def_acl'][get_session('admin_login')];
// Count cache hits
$_CONFIG['cache_hits']++;
} elseif (!is_object($cacheInstance)) {
// Load from database
$result = SQL_QUERY_ESC("SELECT default_acl FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
- array($_SESSION['admin_login']), __FILE__, __LINE__);
+ array(get_session('admin_login')), __FILE__, __LINE__);
list($default) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
}
// Get admin's ID
- $aid = GET_ADMIN_ID($_SESSION['admin_login']);
+ $aid = GET_ADMIN_ID(get_session('admin_login'));
if (!empty($wht)) {
// Check for parent menu:
$lines = 0; $acl_mode = "failed";
if (GET_EXT_VERSION("cache") >= "0.1.2") {
// Load only from array when there are lines!
- if (count($cacheArray['admin_acls']) > 0) {
+ if ((isset($cacheArray['admin_acls'])) && (is_array($cacheArray['admin_acls'])) && (count($cacheArray['admin_acls']) > 0)) {
// Load ACL from array
foreach ($cacheArray['admin_acls']['admin_id'] as $id=>$aid_acls) {
if ($aid == $aid_acls) {
if (!empty($POST['pass1'][$id])) $ADD = sprintf(", password='%s'", SQL_ESCAPE($hash));
// Get admin's ID
- $salt = substr(GET_ADMIN_HASH($_SESSION['admin_login']), 0, -40);
- $aid = GET_ADMIN_ID($_SESSION['admin_login']);
+ $salt = substr(GET_ADMIN_HASH(get_session('admin_login')), 0, -40);
+ $aid = GET_ADMIN_ID(get_session('admin_login'));
// Rewrite cookie when it's own account
if ($aid == $id) {
- // Timeout
- $TIMEOUT = time() + bigintval($_SESSION['admin_to']);
-
// Set timeout cookie
set_session("admin_last", time());
- if ($login != $_SESSION['admin_login']) {
+ if ($login != get_session('admin_login')) {
// Update login cookie
set_session("admin_login", $login);
// Update password cookie as well?
if (!empty($ADD)) set_session("admin_md5", $hash);
- } elseif (generateHash($POST['pass1'][$id], $salt) != $_SESSION['admin_md5']) {
+ } elseif (generateHash($POST['pass1'][$id], $salt) != get_session('admin_md5')) {
// Update password cookie
set_session("admin_md5", $hash);
}
}
+ // Get default ACL from admin to check if we can allow him to change the default ACL
+ $result = SQL_QUERY_ESC("SELECT default_acl FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
+ array(get_session('admin_login')), __FILE__, __LINE__);
+ list($default) = SQL_FETCHROW($result);
+
+ // Free result
+ SQL_FREERESULT($result);
+
// Update admin account
- $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET
+ if ($default == "allow") {
+ // Allow changing default ACL
+ $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET
login='%s'".$ADD.",
email='%s',
default_acl='%s',
$POST['la_mode'][$id],
$id
), __FILE__, __LINE__);
+ } else {
+ // Do not allow it here
+ $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET
+login='%s'".$ADD.",
+email='%s',
+la_mode='%s'
+WHERE id=%d LIMIT 1",
+ array(
+ $login,
+ $POST['email'][$id],
+ $POST['la_mode'][$id],
+ $id
+), __FILE__, __LINE__);
+ }
// Admin account saved
$MSG = ADMIN_ACCOUNT_SAVED;
// Prepare some more data for the template
$content['sw'] = $SW;
$content['id'] = $id;
- $content['mode'] = ADD_OPTION_LINES("/ARRAY/", array("allow", "deny"), array(ADMINS_ALLOW_MODE, ADMINS_DENY_MODE), $content['mode']);
+
+ // Shall we allow changing default ACL?
+ if ($content['mode'] == "allow") {
+ // Allow chaning it
+ $content['mode'] = ADD_OPTION_LINES("/ARRAY/", array("allow", "deny"), array(ADMINS_ALLOW_MODE, ADMINS_DENY_MODE), $content['mode']);
+ } else {
+ // Don't allow it
+ $content['mode'] = " ";
+ }
$content['la_mode'] = ADD_OPTION_LINES("/ARRAY/", array("global", "OLD", "NEW"), array(ADMINS_GLOBAL_LA_SETTING, ADMINS_OLD_LA_SETTING, ADMINS_NEW_LA_SETTING), $content['la_mode']);
// Load row template and switch color
$id = bigintval($id);
// Delete only when it's not your own account!
- if (($del == 1) && (GET_ADMIN_ID($_SESSION['admin_login']) != $id)) {
+ if (($del == 1) && (GET_ADMIN_ID(get_session('admin_login')) != $id)) {
// Rewrite his tasks to all admins
$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin='0' WHERE assigned_admin='%s'",
array($id), __FILE__, __LINE__);