X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fadmins_functions.php;h=fa205b2f54baed1d6d7bb7d1c73eaa1d5303c35e;hp=c930c481845c0caf1ab32edc7b9f65268da5c172;hb=74393eb1dd9dc9775caa7d38e590af76826bc54a;hpb=14ae8b40cb632b2135707bd21f599a2bc8a4afdc

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index c930c48184..fa205b2f54 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -40,7 +40,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 
 // Check ACL for menu combination
 function ADMINS_CHECK_ACL($act, $wht) {
-	global $ADMINS, $ADMINS_ACLS, $_CONFIG, $CACHE;
+	global $cacheArray, $_CONFIG, $cacheInstance;
 	// If action is login or logout allow allways!
 	$default = "allow";
 	if (($act == "login") || ($act == "logout")) return true;
@@ -49,13 +49,13 @@ function ADMINS_CHECK_ACL($act, $wht) {
 	$ret = false;
 
 	// Get admin's defult access right
-	if (!empty($ADMINS['def_acl'][$_SESSION['admin_login']])) {
+	if (!empty($cacheArray['admins']['def_acl'][$_SESSION['admin_login']])) {
 		// Load from cache
-		$default = $ADMINS['def_acl'][$_SESSION['admin_login']];
+		$default = $cacheArray['admins']['def_acl'][$_SESSION['admin_login']];
 
 		// Count cache hits
 		$_CONFIG['cache_hits']++;
-	} elseif (!is_object($CACHE)) {
+	} 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__);
@@ -82,19 +82,19 @@ function ADMINS_CHECK_ACL($act, $wht) {
 	$lines = 0; $acl_mode = "failed";
 	if (GET_EXT_VERSION("cache") >= "0.1.2") {
 		// Load only from array when there are lines!
-		if (count($ADMINS_ACLS) > 0) {
+		if ((isset($cacheArray['admin_acls'])) && (is_array($cacheArray['admin_acls'])) && (count($cacheArray['admin_acls']) > 0)) {
 			// Load ACL from array
-			foreach ($ADMINS_ACLS['admin_id'] as $id=>$aid_acls) {
+			foreach ($cacheArray['admin_acls']['admin_id'] as $id=>$aid_acls) {
 				if ($aid == $aid_acls) {
 					// Okay, one line was found!
-					if ((!empty($act)) && ($ADMINS_ACLS['action_menu'][$id] == $act)) {
+					if ((!empty($act)) && ($cacheArray['admin_acls']['action_menu'][$id] == $act)) {
 						// Main menu line found
-						$acl_mode = $ADMINS_ACLS['access_mode'][$id];
+						$acl_mode = $cacheArray['admin_acls']['access_mode'][$id];
 						$lines = 1;
 					}
-					 elseif ((!empty($wht)) && ($ADMINS_ACLS['what_menu'][$id] == $wht)) {
+					 elseif ((!empty($wht)) && ($cacheArray['admin_acls']['what_menu'][$id] == $wht)) {
 						// Check sub menu
-						$acl_mode = $ADMINS_ACLS['access_mode'][$id];
+						$acl_mode = $cacheArray['admin_acls']['access_mode'][$id];
 						$lines = 1;
 					}
 					if ($lines == 1) {
@@ -175,10 +175,10 @@ WHERE email='%s'".$locked." LIMIT 1",
 
 // Change a lot admin account
 function ADMINS_CHANGE_ADMIN_ACCOUNT($POST) {
-	global $CACHE;
+	global $cacheInstance;
 
 	// Begin the update
-	$CACHE_UPDATE = "0";
+	$cacheInstance_UPDATE = "0";
 	foreach ($POST['login'] as $id=>$login) {
 		// Secure ID number
 		$id = bigintval($id);
@@ -186,7 +186,7 @@ function ADMINS_CHANGE_ADMIN_ACCOUNT($POST) {
 		// When both passwords match update admin account
 		if ($POST['pass1'][$id] == $POST['pass2'][$id]) {
 			// Save only when both passwords are the same (also when they are empty)
-			$ADD = ""; $CACHE_UPDATE = "1";
+			$ADD = ""; $cacheInstance_UPDATE = "1";
 
 			// Generate hash
 			$hash = generateHash($POST['pass1'][$id]);
@@ -204,17 +204,17 @@ function ADMINS_CHANGE_ADMIN_ACCOUNT($POST) {
 				$TIMEOUT = time() + bigintval($_SESSION['admin_to']);
 
 				// Set timeout cookie
-				set_session("admin_last", time(), $TIMEOUT, COOKIE_PATH);
+				set_session("admin_last", time());
 
 				if ($login != $_SESSION['admin_login']) {
 					// Update login cookie
-					set_session("admin_login", $login, $TIMEOUT, COOKIE_PATH);
+					set_session("admin_login", $login);
 
 					// Update password cookie as well?
-					if (!empty($ADD)) set_session("admin_md5", $hash, $TIMEOUT, COOKIE_PATH);
+					if (!empty($ADD)) set_session("admin_md5", $hash);
 				} elseif (generateHash($POST['pass1'][$id], $salt) != $_SESSION['admin_md5']) {
 					// Update password cookie
-					set_session("admin_md5", $hash, $TIMEOUT, COOKIE_PATH);
+					set_session("admin_md5", $hash);
 				}
 
 			}
@@ -248,8 +248,8 @@ WHERE id=%d LIMIT 1",
 	}
 
 	// Remove cache file
-	if ((EXT_IS_ACTIVE("cache")) && ($CACHE_UPDATE == "1")) {
-		if ($CACHE->cache_file("admins", true)) $CACHE->cache_destroy();
+	if ((EXT_IS_ACTIVE("cache")) && ($cacheInstance_UPDATE == "1")) {
+		if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy();
 	}
 }
 
@@ -333,7 +333,7 @@ function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
 // Remove the given accounts
 function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
 	// Begin removal
-	$CACHE_UPDATE = "0";
+	$cacheInstance_UPDATE = "0";
 	foreach ($POST['sel'] as $id=>$del) {
 		// Secure ID number
 		$id = bigintval($id);
@@ -348,13 +348,13 @@ function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
 			$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admins WHERE id=%d LIMIT 1",
 			 array($id), __FILE__, __LINE__);
 
-			$CACHE_UPDATE = "1";
+			$cacheInstance_UPDATE = "1";
 		}
 	}
 
 	// Remove cache if cache system is activated
-	if ((EXT_IS_ACTIVE("cache")) && ($CACHE_UPDATE == "1")) {
-		if ($CACHE->cache_file("admins", true)) $CACHE->cache_destroy();
+	if ((EXT_IS_ACTIVE("cache")) && ($cacheInstance_UPDATE == "1")) {
+		if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy();
 	}
 }