X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fadmins_functions.php;h=c5d0db38d4de683a8a5c81a07980cefda2332cad;hp=65325e1a698ca1b755a5a82b27e9e2038d9be255;hb=64ac34f8ebcfef05d9b273dd2be693717483ba16;hpb=811c2a74188a97591fb05ed1dd3d1929b8bc23aa

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 65325e1a69..c5d0db38d4 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
-		$_CONFIG['cache_hits']++;
-	} 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
@@ -95,7 +87,7 @@ function ADMINS_CHECK_ACL($act, $wht) {
 					}
 					if ($lines == 1) {
 						// Count cache hits
-						$_CONFIG['cache_hits']++;
+						if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 						break;
 					}
 				}
@@ -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") {
@@ -328,10 +320,8 @@ function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
 				// Entry found
 				$content = SQL_FETCHARRAY($result);
 				SQL_FREERESULT($result);
-				$eval = "\$content['mode'] = ADMINS_".strtoupper($content['mode'])."_MODE;";
-				eval($eval);
-				$eval = "\$content['la_mode'] = ADMINS_".strtoupper($content['la_mode'])."_LA_SETTING;";
-				eval($eval);
+				$content['mode'] = constant('ADMINS_'.strtoupper($content['mode']).'_MODE');
+				$content['la_mode'] = constant('ADMINS_'.strtoupper($content['la_mode']).'_LA_SETTING');
 
 				// Prepare some more data
 				$content['sw'] = $SW;
@@ -389,10 +379,8 @@ function ADMINS_LIST_ADMIN_ACCOUNTS() {
 	$SW = 2; $OUT = "";
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Compile some variables
-		$eval = "\$content['mode'] = ADMINS_".strtoupper($content['mode'])."_MODE;";
-		eval($eval);
-		$eval = "\$content['la_mode'] = ADMINS_".strtoupper($content['la_mode'])."_LA_SETTING;";
-		eval($eval);
+		$content['mode'] = constant('ADMINS_'.strtoupper($content['mode']).'_MODE');
+		$content['la_mode'] = constant('ADMINS_'.strtoupper($content['la_mode']).'_LA_SETTING');
 
 		// Prepare some more data
 		$content['sw']         = $SW;