X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-admins_mails.php;h=9e582cac8ee340129112f5a1088f871504bcd5fe;hb=5567f0a4ba3e655d5ae53b518e86ad9737faad79;hp=8cbbd054faf753555dda51e69dccf761fcf0f0dc;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 8cbbd054fa..9e582cac8e 100644
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -49,18 +49,18 @@ if (isPostRequestElementSet('edit')) {
 	$SEL = countPostSelection();
 	if ($SEL > 0) {
 		// Add option for events
-		$GLOBALS['cache_array']['admins'] = generateOptionList('admins', 'id', 'login', '', 'email');
+		$adminsList = generateOptionList('admins', 'id', 'login', '', 'email');
 		$SW = 2; $rowNameS = '';
 		foreach (postRequestElement('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`",
-			array($template), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT `admin_id`, `id` FROM `{?_MYSQL_PREFIX?}_admins_mails` WHERE `mail_template`='%s' ORDER BY `id` ASC",
+				array($template), __FILE__, __LINE__);
 			$OUT = ''; $adminId2 = 0;
 			while ($content = SQL_FETCHARRAY($result)) {
 				// @TODO Can this be rewritten???
 				$OUT .= "<select name=\"admin_id[".$content['id']."]\" size=\"1\" class=\"admin_select\">
 <option value=\"0\"";
-				if ($content['admin_id'] == '0') $OUT .= ' selected="selected"';
+				if ($content['admin_id'] == 0) $OUT .= ' selected="selected"';
 				$OUT .=">{--ADMINS_ALL_ADMINS--}</option>\n";
 				if (isExtensionActive('events')) {
 					$OUT .= "<option value=\"-1\"";
@@ -75,18 +75,19 @@ if (isPostRequestElementSet('edit')) {
 			// Free memory
 			SQL_FREERESULT($result);
 
+			// Prepare content
 			$content = array(
 				'sw'      => $SW,
 				'id'      => $id,
 				'id2'     => $id2,
 				'tpl'     => $template,
-				'admins'  => $GLOBALS['cache_array']['admins']
+				'admins'  => $adminsList
 			);
 
 			if ($adminId2 > 0) {
 				// Add form for an additional admin
 				$OUT .= loadTemplate('admin_admins_mails_edit_form', true, $content);
-			}
+			} // END - if
 
 			// Save full rendered content
 			$content['content'] = $OUT;
@@ -104,12 +105,19 @@ if (isPostRequestElementSet('edit')) {
 	}
 } else {
 	// Load all assigned mails
-	$result = SQL_QUERY("SELECT m.id, m.admin_id, a.login, m.mail_template
-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__);
+	$result = SQL_QUERY("SELECT
+	m.id, m.admin_id, a.login, m.mail_template
+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 ASC,
+	m.mail_template ASC", __FILE__, __LINE__);
 
 	if (SQL_NUMROWS($result) > 0) {
 		// Shall I change entries?
@@ -119,7 +127,7 @@ ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
 
 			// Ok, update database
 			foreach (postRequestElement('admin_id') as $id => $content['admin_id']) {
-				// Secure IDs
+				// Secure ids
 				$id  = bigintval($id);
 				$content['admin_id'] = bigintval($content['admin_id']);