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

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index b168a75d47..c5d0db38d4 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -32,15 +32,14 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
 
 // 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;
@@ -48,23 +47,12 @@ function ADMINS_CHECK_ACL($act, $wht) {
 	// Default is deny
 	$ret = false;
 
+	// Get admin's ID
+	$aid = GET_ADMIN_ID(get_session('admin_login'));
+
 	// Get admin's defult access right
-	if (!empty($ADMINS['def_acl'][$_SESSION['admin_login']])) {
-		// Load from cache
-		$default = $ADMINS['def_acl'][$_SESSION['admin_login']];
-
-		// Count cache hits
-		$_CONFIG['cache_hits']++;
-	} elseif (!is_object($CACHE)) {
-		// 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__);
-		list($default) = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
-	}
+	$default = GET_ADMIN_DEFAULT_ACL($aid);
 
-	// Get admin's ID
-	$aid = GET_ADMIN_ID($_SESSION['admin_login']);
 
 	if (!empty($wht)) {
 		// Check for parent menu:
@@ -82,24 +70,24 @@ 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) {
 						// Count cache hits
-						$_CONFIG['cache_hits']++;
+						if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 						break;
 					}
 				}
@@ -119,11 +107,11 @@ function ADMINS_CHECK_ACL($act, $wht) {
 		if (!empty($act))
 		{
 			// Main menu
-			$result = SQL_QUERY_ESC("SELECT access_mode FROM "._MYSQL_PREFIX."_admins_acls WHERE admin_id=%d AND action_menu='%s' LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT access_mode FROM "._MYSQL_PREFIX."_admins_acls WHERE admin_id=%s AND action_menu='%s' LIMIT 1",
 			 array(bigintval($aid), $act), __FILE__, __LINE__);
 		} elseif (!empty($wht)) {
 			// Sub menu
-			$result = SQL_QUERY_ESC("SELECT access_mode FROM "._MYSQL_PREFIX."_admins_acls WHERE admin_id=%d AND what_menu='%s' LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT access_mode FROM "._MYSQL_PREFIX."_admins_acls WHERE admin_id=%s AND what_menu='%s' LIMIT 1",
 			 array(bigintval($aid), $wht), __FILE__, __LINE__);
 		}
 
@@ -175,18 +163,18 @@ 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";
-	foreach ($POST['login'] as $id=>$login) {
+	$cache_update = 0;
+	foreach ($POST['login'] as $id => $login) {
 		// Secure ID number
 		$id = bigintval($id);
 
 		// 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 = ""; $cache_update = "1";
 
 			// Generate hash
 			$hash = generateHash($POST['pass1'][$id]);
@@ -195,37 +183,38 @@ 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($_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);
 				}
+			} // 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_ADMIN_ID(get_session('admin_login')));
 
 			// 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',
 la_mode='%s'
-WHERE id=%d LIMIT 1",
+WHERE id=%s LIMIT 1",
  array(
 	$login,
 	$POST['email'][$id],
@@ -233,6 +222,23 @@ WHERE id=%d LIMIT 1",
 	$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=%s LIMIT 1",
+ array(
+	$login,
+	$POST['email'][$id],
+	$POST['la_mode'][$id],
+	$id
+), __FILE__, __LINE__);
+			}
+
+			// Purge cache
+			CACHE_PURGE_ADMIN_MENU($id);
 
 			// Admin account saved
 			$MSG = ADMIN_ACCOUNT_SAVED;
@@ -248,8 +254,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")) && ($cache_update == "1")) {
+		if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy();
 	}
 }
 
@@ -257,12 +263,12 @@ WHERE id=%d LIMIT 1",
 function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
 	// Begin the edit loop
 	$SW = 2; $OUT = "";
-	foreach ($POST['sel'] as $id=>$sel) {
+	foreach ($POST['sel'] as $id => $sel) {
 		// Secure ID number
 		$id = bigintval($id);
 
 		// Get the admin's data
-		$result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM "._MYSQL_PREFIX."_admins WHERE id=%d LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
 		 array($id), __FILE__, __LINE__);
 		if ((SQL_NUMROWS($result) == 1) && ($sel == 1)) {
 			// Entry found
@@ -270,9 +276,17 @@ function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
 			SQL_FREERESULT($result);
 
 			// 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']);
+			$content['sw'] = $SW;
+			$content['id'] = $id;
+
+			// 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
@@ -295,21 +309,19 @@ function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
 	if ($accounts > 1) {
 		// Delete accounts
 		$SW = 2; $OUT = "";
-		foreach ($POST['sel'] as $id=>$sel) {
+		foreach ($POST['sel'] as $id => $sel) {
 			// Secure ID number
 			$id = bigintval($id);
 
 			// Get the admin's data
-			$result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM "._MYSQL_PREFIX."_admins WHERE id=%d LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
 			 array($id), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// 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;
@@ -333,28 +345,30 @@ function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
 // Remove the given accounts
 function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
 	// Begin removal
-	$CACHE_UPDATE = "0";
-	foreach ($POST['sel'] as $id=>$del) {
+	$cache_update = 0;
+	foreach ($POST['sel'] as $id => $del) {
 		// Secure ID number
 		$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'",
+			$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin=0 WHERE assigned_admin=%s",
 			 array($id), __FILE__, __LINE__);
 
 			// Remove account
-			$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admins WHERE id=%d LIMIT 1",
+			$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
 			 array($id), __FILE__, __LINE__);
 
-			$CACHE_UPDATE = "1";
+			// Purge cache
+			CACHE_PURGE_ADMIN_MENU($id);
+			$cache_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")) && ($cache_update == "1")) {
+		if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy();
 	}
 }
 
@@ -365,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;