X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fadmins_functions.php;h=2ee0d45299818018c59b3aa0b7ae2b8887f339eb;hb=1fe7cf281be6832ba105934537aba5127892c576;hp=403c32150ce7d1f047e1f9968965bf8d41f75341;hpb=3b7577d3b3e6522d8898ed1799031b6de696accc;p=mailer.git

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 403c32150c..2ee0d45299 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -53,7 +53,6 @@ function ADMINS_CHECK_ACL($act, $wht) {
 	// 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
@@ -107,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=%s 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=%s 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__);
 		}
 
@@ -131,13 +130,13 @@ function ADMINS_CHECK_ACL($act, $wht) {
 }
 
 // Create email link to admins's account
-function ADMINS_CREATE_EMAIL_LINK($email, $mod="admin") {
-	$locked = " AND status='CONFIRMED'";
+function ADMINS_CREATE_EMAIL_LINK ($email, $mod="admin") {
+	$locked = " AND `status`='CONFIRMED'";
 	if (IS_ADMIN()) $locked = "";
 	if (strpos("@", $email) > 0) {
 		// Create email link
 		$result = SQL_QUERY_ESC("SELECT id
-FROM "._MYSQL_PREFIX."_admins
+FROM `{!_MYSQL_PREFIX!}_admins`
 WHERE email='%s'".$locked." LIMIT 1",
  array($email), __FILE__, __LINE__);
 
@@ -147,14 +146,14 @@ WHERE email='%s'".$locked." LIMIT 1",
 			list($uid) = SQL_FETCHROW($result);
 
 			// Rewrite email address to contact link
-			$email = URL."/modules.php?module=".$mod."&what=user_contct&u_id=".bigintval($uid);
+			$email = "{!URL!}/modules.php?module=".$mod."&what=user_contct&u_id=".bigintval($uid);
 		}
 
 		// Free memory
 		SQL_FREERESULT($result);
 	} elseif (bigintval($email) > 0) {
 		// Direct ID given
-		$email = URL."/modules.php?module=".$mod."&what=admins_contct&admin=".bigintval($email);
+		$email = "{!URL!}/modules.php?module=".$mod."&what=admins_contct&admin=".bigintval($email);
 	}
 
 	// Return rewritten (?) email address
@@ -189,17 +188,17 @@ function ADMINS_CHANGE_ADMIN_ACCOUNT($POST) {
 			// 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 != 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);
+					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
 
@@ -209,32 +208,32 @@ function ADMINS_CHANGE_ADMIN_ACCOUNT($POST) {
 			// Update admin account
 			if ($default == "allow") {
 				// Allow changing default ACL
-				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=%s LIMIT 1",
- array(
-	$login,
-	$POST['email'][$id],
-	$POST['mode'][$id],
-	$POST['la_mode'][$id],
-	$id
-), __FILE__, __LINE__);
+					array(
+						$login,
+						$POST['email'][$id],
+						$POST['mode'][$id],
+						$POST['la_mode'][$id],
+						$id
+					), __FILE__, __LINE__);
 			} else {
 				// Do not allow it here
-				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=%s LIMIT 1",
- array(
-	$login,
-	$POST['email'][$id],
-	$POST['la_mode'][$id],
-	$id
-), __FILE__, __LINE__);
+					array(
+						$login,
+						$POST['email'][$id],
+						$POST['la_mode'][$id],
+						$id
+					), __FILE__, __LINE__);
 			}
 
 			// Purge cache
@@ -249,7 +248,7 @@ WHERE id=%s 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);
 		}
 	}
 
@@ -259,6 +258,9 @@ WHERE id=%s LIMIT 1",
 
 // 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) {
@@ -266,8 +268,8 @@ function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
 		$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=%s 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);
@@ -278,9 +280,9 @@ function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
 			$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']);
+				$content['mode']    = ADD_OPTION_LINES("/ARRAY/", array("allow", "deny"), array(constant('ADMINS_ALLOW_MODE'), constant('ADMINS_DENY_MODE')), $content['mode']);
 			} else {
 				// Don't allow it
 				$content['mode'] = "&nbsp;";
@@ -301,7 +303,7 @@ function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
 // Delete given admin accounts
 function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
 	// Check if this account is the last one which cannot be deleted...
-	$result_main = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_admins", __FILE__, __LINE__);
+	$result_main = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_admins`", __FILE__, __LINE__);
 	$accounts = SQL_NUMROWS($result_main);
 	SQL_FREERESULT($result_main);
 	if ($accounts > 1) {
@@ -312,7 +314,7 @@ function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
 			$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=%s 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
@@ -336,7 +338,7 @@ function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
 		LOAD_TEMPLATE("admin_del_admins");
 	} else {
 		// Cannot delete last account!
-		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ADMINS_CANNOT_DELETE_LAST);
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_CANNOT_DELETE_LAST'));
 	}
 }
 
@@ -351,11 +353,11 @@ function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
 		// Delete only when it's not your own account!
 		if (($del == 1) && (GET_CURRENT_ADMIN_ID() != $id)) {
 			// Rewrite his tasks to all admins
-			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
-			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
 				array($id), __FILE__, __LINE__);
 
 			// Purge cache
@@ -371,7 +373,7 @@ function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
 // List all admin accounts
 function ADMINS_LIST_ADMIN_ACCOUNTS() {
 	// Select all admin accounts
-	$result = SQL_QUERY("SELECT id, login, email, default_acl AS mode, la_mode FROM "._MYSQL_PREFIX."_admins ORDER BY login ASC", __FILE__, __LINE__);
+	$result = SQL_QUERY("SELECT id, login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY login ASC", __FILE__, __LINE__);
 	$SW = 2; $OUT = "";
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Compile some variables
@@ -396,14 +398,11 @@ function ADMINS_LIST_ADMIN_ACCOUNTS() {
 }
 
 // Filter for adding extra data to the query
-function FILTER_ADD_EXTRA_SQL_DATA () {
-	// Init extra data
-	$ADD = "";
-
+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.0") $ADD .= ", login_failtures, UNIX_TIMESTAMP(last_failture) AS last_failture";
+	if (GET_EXT_VERSION("admins") >= "0.7.2") $ADD .= ", login_failures, UNIX_TIMESTAMP(last_failure) AS last_failure";
 
 	// Return it
 	return $ADD;