X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fadmins_functions.php;h=e83bb3d1b92b3ef6346d9952e95f9f5f83fb7df7;hb=e6c47a5a789601b9ba3ff625091ec7b2b353cb4e;hp=550b8a69bc539399caf339908aafe5b8a0092070;hpb=427719103e37ed2e27803b833dc5db5841e4dec9;p=mailer.git

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 550b8a69bc..e83bb3d1b9 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -47,21 +47,13 @@ function ADMINS_CHECK_ACL($act, $wht) {
 	// Default is deny
 	$ret = false;
 
-	// Get admin's defult access right
-	if (!empty($cacheArray['admins']['def_acl'][get_session('admin_login')])) {
-		// Load from cache
-		$default = $cacheArray['admins']['def_acl'][get_session('admin_login')];
-
-		// Count cache hits
-		if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
-	} elseif (!is_object($cacheInstance)) {
-		// Load from database
-		$default = GET_ADMIN_DEFAULT_ACL(get_session('admin_login'));
-	}
-
 	// Get admin's ID
 	$aid = GET_ADMIN_ID(get_session('admin_login'));
 
+	// Get admin's defult access right
+	$default = GET_ADMIN_DEFAULT_ACL($aid);
+
+
 	if (!empty($wht)) {
 		// Check for parent menu:
 		// First get it's action value
@@ -191,8 +183,8 @@ function ADMINS_CHANGE_ADMIN_ACCOUNT($POST) {
 			if (!empty($POST['pass1'][$id])) $ADD = sprintf(", password='%s'", SQL_ESCAPE($hash));
 
 			// Get admin's ID
-			$salt = substr(GET_ADMIN_HASH(get_session('admin_login')), 0, -40);
 			$aid = GET_ADMIN_ID(get_session('admin_login'));
+			$salt = substr(GET_ADMIN_HASH($aid), 0, -40);
 
 			// Rewrite cookie when it's own account
 			if ($aid == $id) {
@@ -212,7 +204,7 @@ function ADMINS_CHANGE_ADMIN_ACCOUNT($POST) {
 			} // END - if
 
 			// Get default ACL from admin to check if we can allow him to change the default ACL
-			$default = GET_ADMIN_DEFAULT_ACL(get_session('admin_login'));
+			$default = GET_ADMIN_DEFAULT_ACL(GET_ADMIN_ID(get_session('admin_login')));
 
 			// Update admin account
 			if ($default == "allow") {