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

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index d10f3bdc32..47bb4712c1 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -106,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__);
 		}
 
@@ -136,7 +136,7 @@ function ADMINS_CREATE_EMAIL_LINK($email, $mod="admin") {
 	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__);
 
@@ -146,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
@@ -208,7 +208,7 @@ 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',
@@ -223,7 +223,7 @@ WHERE id=%s LIMIT 1",
 					), __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'
@@ -268,7 +268,7 @@ 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",
+		$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
@@ -282,7 +282,7 @@ function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
 			// Shall we allow changing default ACL?
 			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'] = " ";
@@ -303,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) {
@@ -314,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
@@ -338,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'));
 	}
 }
 
@@ -353,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
@@ -373,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