X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fadmins_functions.php;h=d10f3bdc328582e32fc554fc948f66f49ff35419;hp=d4ced65b01a0e87bb6b2b575251a1fec9b6dc33f;hb=3608f72d51e8126720024704398cf738e61f890b;hpb=ab6e23979a94ee3f68efca58da90137e88a95236

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index d4ced65b01..d10f3bdc32 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 $cacheArray, $_CONFIG, $cacheInstance;
+	global $cacheArray, $cacheInstance;
 	// If action is login or logout allow allways!
 	$default = "allow";
 	if (($act == "login") || ($act == "logout")) return true;
@@ -48,23 +47,11 @@ function ADMINS_CHECK_ACL($act, $wht) {
 	// Default is deny
 	$ret = false;
 
-	// Get admin's defult access right
-	if (!empty($cacheArray['admins']['def_acl'][$_SESSION['admin_login']])) {
-		// Load from cache
-		$default = $cacheArray['admins']['def_acl'][$_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__);
-		list($default) = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
-	}
-
 	// Get admin's ID
-	$aid = GET_ADMIN_ID($_SESSION['admin_login']);
+	$aid = GET_CURRENT_ADMIN_ID();
+
+	// Get admin's defult access right
+	$default = GET_ADMIN_DEFAULT_ACL($aid);
 
 	if (!empty($wht)) {
 		// Check for parent menu:
@@ -84,7 +71,7 @@ function ADMINS_CHECK_ACL($act, $wht) {
 		// Load only from array when there are lines!
 		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) {
+			foreach ($cacheArray['admin_acls']['admin_id'] as $id => $aid_acls) {
 				if ($aid == $aid_acls) {
 					// Okay, one line was found!
 					if ((!empty($act)) && ($cacheArray['admin_acls']['action_menu'][$id] == $act)) {
@@ -99,7 +86,7 @@ function ADMINS_CHECK_ACL($act, $wht) {
 					}
 					if ($lines == 1) {
 						// Count cache hits
-						$_CONFIG['cache_hits']++;
+						incrementConfigEntry('cache_hits');
 						break;
 					}
 				}
@@ -119,11 +106,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__);
 		}
 
@@ -178,15 +165,15 @@ function ADMINS_CHANGE_ADMIN_ACCOUNT($POST) {
 	global $cacheInstance;
 
 	// Begin the update
-	$cacheInstance_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 = ""; $cacheInstance_UPDATE = "1";
+			$ADD = ""; $cache_update = "1";
 
 			// Generate hash
 			$hash = generateHash($POST['pass1'][$id]);
@@ -195,66 +182,63 @@ 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']);
+			$aid = GET_CURRENT_ADMIN_ID();
+			$salt = substr(GET_ADMIN_HASH($aid), 0, -40);
 
 			// Rewrite cookie when it's own account
 			if ($aid == $id) {
 				// Set timeout cookie
-				set_session("admin_last", time());
+				set_session('admin_last', time());
 
-				if ($login != $_SESSION['admin_login']) {
+				if ($login != get_session('admin_login')) {
 					// Update login cookie
-					set_session("admin_login", $login);
+					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']) {
+					if (!empty($ADD)) set_session('admin_md5', $hash);
+				} elseif (generateHash($POST['pass1'][$id], $salt) != get_session('admin_md5')) {
 					// Update password cookie
-					set_session("admin_md5", $hash);
+					set_session('admin_md5', $hash);
 				}
-
-			}
+			} // END - if
 
 			// 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($_SESSION['admin_login']), __FILE__, __LINE__);
-			list($default) = SQL_FETCHROW($result);
-
-			// Free result
-			SQL_FREERESULT($result);
+			$default = GET_ADMIN_DEFAULT_ACL(GET_CURRENT_ADMIN_ID());
 
 			// Update admin account
 			if ($default == "allow") {
 				// Allow changing default ACL
-				$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET
+				SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET
 login='%s'".$ADD.",
 email='%s',
 default_acl='%s',
 la_mode='%s'
-WHERE id=%d LIMIT 1",
- array(
-	$login,
-	$POST['email'][$id],
-	$POST['mode'][$id],
-	$POST['la_mode'][$id],
-	$id
-), __FILE__, __LINE__);
+WHERE id=%s LIMIT 1",
+					array(
+						$login,
+						$POST['email'][$id],
+						$POST['mode'][$id],
+						$POST['la_mode'][$id],
+						$id
+					), __FILE__, __LINE__);
 			} else {
 				// Do not allow it here
-				$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET
+				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__);
+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;
 		} else {
@@ -264,38 +248,39 @@ WHERE id=%d LIMIT 1",
 
 		// Display message
 		if (!empty($MSG)) {
-			LOAD_TEMPLATE("admin_settings_saved", false, "<SPAN class=\"admin_done\">".$MSG."</SPAN>");
+			LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
 		}
 	}
 
 	// Remove cache file
-	if ((EXT_IS_ACTIVE("cache")) && ($cacheInstance_UPDATE == "1")) {
-		if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy();
-	}
+	RUN_FILTER('post_admin_edited', $_POST);
 }
 
 // Make admin accounts editable
 function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
+	// "Resolve" current's admin access mode
+	$currMode = GET_ADMIN_DEFAULT_ACL(GET_CURRENT_ADMIN_ID());
+
 	// 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",
-		 array($id), __FILE__, __LINE__);
+		$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
 			$content = SQL_FETCHARRAY($result);
 			SQL_FREERESULT($result);
 
 			// Prepare some more data for the template
-			$content['sw']		= $SW;
-			$content['id']		= $id;
+			$content['sw'] = $SW;
+			$content['id'] = $id;
 
 			// Shall we allow changing default ACL?
-			if ($content['mode'] == "allow") {
+			if ($currMode == "allow") {
 				// Allow chaning it
 				$content['mode']    = ADD_OPTION_LINES("/ARRAY/", array("allow", "deny"), array(ADMINS_ALLOW_MODE, ADMINS_DENY_MODE), $content['mode']);
 			} else {
@@ -324,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;
@@ -362,29 +345,29 @@ function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
 // Remove the given accounts
 function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
 	// Begin removal
-	$cacheInstance_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_CURRENT_ADMIN_ID() != $id)) {
 			// Rewrite his tasks to all admins
-			$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin='0' WHERE assigned_admin='%s'",
+			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",
-			 array($id), __FILE__, __LINE__);
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
+				array($id), __FILE__, __LINE__);
 
-			$cacheInstance_UPDATE = "1";
+			// Purge cache
+			CACHE_PURGE_ADMIN_MENU($id);
+			$cache_update = "1";
 		}
 	}
 
 	// Remove cache if cache system is activated
-	if ((EXT_IS_ACTIVE("cache")) && ($cacheInstance_UPDATE == "1")) {
-		if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy();
-	}
+	RUN_FILTER('post_admin_deleted', $_POST);
 }
 
 // List all admin accounts
@@ -394,10 +377,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;
@@ -416,5 +397,16 @@ function ADMINS_LIST_ADMIN_ACCOUNTS() {
 	LOAD_TEMPLATE("admin_list_admins");
 }
 
+// Filter for adding extra data to the query
+function FILTER_ADD_EXTRA_SQL_DATA ($ADD = "") {
+	// Is the admins extension updated? (should be!)
+	if (GET_EXT_VERSION("admins") >= "0.3")   $ADD .= ", default_acl AS def_acl";
+	if (GET_EXT_VERSION("admins") >= "0.6.7") $ADD .= ", la_mode";
+	if (GET_EXT_VERSION("admins") >= "0.7.2") $ADD .= ", login_failures, UNIX_TIMESTAMP(last_failure) AS last_failure";
+
+	// Return it
+	return $ADD;
+}
+
 //
 ?>