X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-admins_mails.php;h=3305017e372963fb8468f7a29077bdce6a4e2a6e;hb=77cdaff2afb97ed32985ced906a3a95ee078c2ef;hp=08c14b722df7a4c592dcca4b26c195ef823ac0ad;hpb=0369c36aaab5af6ed44da1e13a53baef285f79b4;p=mailer.git

diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 08c14b722d..3305017e37 100644
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -32,13 +32,13 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
+
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 if (isset($_POST['edit']))
 {
@@ -46,29 +46,27 @@ if (isset($_POST['edit']))
 	$SEL = SELECTION_COUNT($_POST['sel']);
 	if ($SEL > 0)
 	{
-		// Add option for userlog
+		// Add option for events
 		$cacheArray['admins'] = ADD_OPTION_LINES("admins", "id", "login", "", "email");
 		$SW = 2; $rowNameS = "";
-		foreach ($_POST['sel'] as $template => $sel)
-		{
+		foreach ($_POST['sel'] as $template => $sel) {
 			// First of all load data from DB
-			$result = SQL_QUERY_ESC("SELECT admin_id, id FROM "._MYSQL_PREFIX."_admins_mails WHERE mail_template='%s' ORDER BY id",
+			$result = SQL_QUERY_ESC("SELECT admin_id, id FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' ORDER BY `id`",
 			 array($template), __FILE__, __LINE__);
 			$OUT = ""; $aid = 0; $aid2 = 0;
-			while (list($aid, $id) = SQL_FETCHROW($result))
-			{
-				$OUT .= "<SELECT name=\"admin_id[".$id."]\" size=\"1\" class=\"admin_select\">
-<OPTION value=\"0\"";
-				if ($aid == "0") $OUT .= " selected default";
-				$OUT .=">".ADMINS_ALL_ADMINS."</OPTION>\n";
-				if (EXT_IS_ACTIVE("userlog"))
-				{
-					$OUT .= "<OPTION value=\"-1\"";
-					if ($aid == "-1") $OUT .= " selected default";
-					$OUT .= ">".ADMINS_TO_USERLOG."</OPTION>\n";
+			while (list($aid, $id) = SQL_FETCHROW($result)) {
+				// @TODO Can this be rewritten???
+				$OUT .= "<select name=\"admin_id[".$id."]\" size=\"1\" class=\"admin_select\">
+<option value=\"0\"";
+				if ($aid == "0") $OUT .= " selected=\"selected\"";
+				$OUT .=">{--ADMINS_ALL_ADMINS--}</option>\n";
+				if (EXT_IS_ACTIVE("events")) {
+					$OUT .= "<option value=\"-1\"";
+					if ($aid == "-1") $OUT .= " selected=\"selected\"";
+					$OUT .= ">{--ADMINS_TO_USERLOG--}</option>\n";
 				}
 				$OUT .= ADD_OPTION_LINES("admins", "id", "login", $aid, "email");
-				$OUT .= "</SELECT><br />\n";
+				$OUT .= "</select><br />\n";
 				$aid2 = $aid; $id2 = $id;
 			}
 
@@ -110,8 +108,8 @@ if (isset($_POST['edit']))
 {
 	// Load all assigned mails
 	$result = SQL_QUERY("SELECT DISTINCT m.id, m.admin_id, a.login, m.mail_template
-FROM "._MYSQL_PREFIX."_admins_mails AS m
-LEFT JOIN "._MYSQL_PREFIX."_admins AS a
+FROM `{!_MYSQL_PREFIX!}_admins_mails` AS m
+LEFT JOIN `{!_MYSQL_PREFIX!}_admins` AS a
 ON m.admin_id=a.id
 WHERE (m.admin_id=a.id OR m.admin_id < 1) AND m.mail_template != ''
 ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
@@ -129,50 +127,36 @@ ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
 				$aid = bigintval($aid);
 
 				// Update entry
-				$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins_mails SET admin_id=%s WHERE id=%s ORDER BY id LIMIT 1",
-				 array($aid, $id), __FILE__, __LINE__);
+				SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins_mails` SET admin_id=%s WHERE id=%s ORDER BY `id` LIMIT 1",
+					array($aid, $id), __FILE__, __LINE__);
 
 				if (($aid < 1) && (!empty($_POST['template'][$id])))
 				{
 					// Remove any other admin entries
-					$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admins_mails WHERE mail_template='%s' AND id != '%s'",
-					 array($_POST['template'][$id], $id), __FILE__, __LINE__);
+					SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' AND id != '%s'",
+						array($_POST['template'][$id], $id), __FILE__, __LINE__);
 				}
 				if ($_POST['admin_new'][$_POST['template'][$id]] > 0)
 				{
 					// Add new admin
-					$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins_mails (admin_id, mail_template) VALUES ('%s', '%s')",
-					 array($aid, $_POST['template'][$id]), __FILE__, __LINE__);
+					SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins_mails` (admin_id, mail_template) VALUES ('%s','%s')",
+						array($aid, $_POST['template'][$id]), __FILE__, __LINE__);
 				}
 			}
 
 			// Query again...
-			$result = SQL_QUERY("SELECT DISTINCT m.id, m.admin_id, a.login, m.mail_template FROM "._MYSQL_PREFIX."_admins_mails AS m, "._MYSQL_PREFIX."_admins AS a WHERE m.admin_id=a.id OR m.admin_id < 1 ORDER BY m.admin_id", __FILE__, __LINE__);
+			$result = SQL_QUERY("SELECT DISTINCT m.id, m.admin_id, a.login, m.mail_template FROM `{!_MYSQL_PREFIX!}_admins_mails` AS m, `{!_MYSQL_PREFIX!}_admins` AS a WHERE m.admin_id=a.id OR m.admin_id < 1 ORDER BY m.admin_id", __FILE__, __LINE__);
 		}
 
 		// List found entries
 		$SW = 2; $OUT = "";
-		while(list($id, $aid, $admin, $templ) = SQL_FETCHROW($result))
-		{
-			if ($aid > 0)
-			{
-				// Admin assigned
-				$admin_link = "<A href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$aid."\">".$admin."</A>";
-			}
-			 elseif ($aid == 0)
-			{
-				// All admins
-				$admin_link = "<I>".ADMINS_ALL_ADMINS."</I>";
-			}
-			 elseif (($aid == -1) && (EXT_IS_ACTIVE("usrlog")))
-			{
-				// To userlog
-				$admin_link = "<I>".ADMINS_TO_USERLOG."</I>";
-			}
+		while ($data = SQL_FETCHARRAY($result)) {
+			// Prepare content
 			$content = array(
 				'sw'   => $SW,
-				'tpl'  => $templ,
-				'alnk' => $admin_link
+				'id'   => $data['id'],
+				'tpl'  => $data['mail_template'],
+				'alnk' => GENERATE_AID_LINK($data['admin_id'])
 			);
 
 			// Load row template
@@ -186,12 +170,11 @@ ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
 
 		// Load template
 		LOAD_TEMPLATE("admin_admins_mails_list");
-	}
-	 else
-	{
+	} else {
 		// No entries found
 		LOAD_TEMPLATE("admin_settings_saved", false, ADMINS_MAILS_NO_ENTRIES);
 	}
 }
+
 //
 ?>