X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-admins_mails.php;h=995060ba3ae40523e4f47e7469b455474efb6204;hb=eac9b7b757e50ad6536ccc00f46eae5d194a6b12;hp=9e582cac8ee340129112f5a1088f871504bcd5fe;hpb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb;p=mailer.git

diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 9e582cac8e..995060ba3a 100644
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/14/2004 *
- * ================                             Last change: 10/22/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 08/14/2004 *
+ * ===================                          Last change: 10/22/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-admins_mails.php                            *
@@ -39,28 +39,28 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
 if (isPostRequestElementSet('edit')) {
 	// Check if entires are checked
-	$SEL = countPostSelection();
-	if ($SEL > 0) {
+	if (countPostSelection() > 0) {
 		// Add option for events
 		$adminsList = generateOptionList('admins', 'id', 'login', '', 'email');
-		$SW = 2; $rowNameS = '';
+		$SW = 2; $rows = '';
 		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` ASC",
 				array($template), __FILE__, __LINE__);
-			$OUT = ''; $adminId2 = 0;
+			$OUT = '';
+			$adminId2 = '0'; $id = '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\"";
@@ -69,20 +69,20 @@ if (isPostRequestElementSet('edit')) {
 				}
 				$OUT .= generateOptionList('admins', 'id', 'login', $content['admin_id'], 'email');
 				$OUT .= "</select>\n<br />\n";
-				$adminId2 = $content['admin_id']; $id2 = $content['id'];
-			}
+
+				// Transfer ids
+				$adminId2 = $content['admin_id'];
+				$id = $content['id'];
+			} // END - while
 
 			// Free memory
 			SQL_FREERESULT($result);
 
 			// Prepare content
-			$content = array(
-				'sw'      => $SW,
-				'id'      => $id,
-				'id2'     => $id2,
-				'tpl'     => $template,
-				'admins'  => $adminsList
-			);
+			$content['id']            = $id;
+			$content['sw']            = $SW;
+			$content['mail_template'] = $template;
+			$content['admins']        = $adminsList;
 
 			if ($adminId2 > 0) {
 				// Add form for an additional admin
@@ -93,12 +93,12 @@ if (isPostRequestElementSet('edit')) {
 			$content['content'] = $OUT;
 
 			// Start outputing line
-			$rowNameS .= loadTemplate('admin_admins_mails_edit_row', true, $content);
+			$rows .= loadTemplate('admin_admins_mails_edit_row', true, $content);
 			$SW = 3 - $SW;
 		}
 
 		// Edit checked entries
-		loadTemplate('admin_admins_mails_edit', false, $rowNameS);
+		loadTemplate('admin_admins_mails_edit', false, $rows);
 	} else {
 		// Nothing selected
 		loadTemplate('admin_settings_saved', false, getMessage('ADMINS_NO_MAIL_CHECKED'));
@@ -133,7 +133,7 @@ ORDER BY
 
 				// Update entry
 				addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins_mails` SET admin_id=%s WHERE `id`=%s ORDER BY `id` LIMIT 1",
-				array($content['admin_id'], $id), __FILE__, __LINE__, false));
+					array($content['admin_id'], $id), __FILE__, __LINE__, false));
 
 				if (($content['admin_id'] < 1) && (isPostRequestElementSet('template', $id))) {
 					// Remove any other admin entries
@@ -152,19 +152,27 @@ ORDER BY
 			runFilterChain('run_sqls');
 
 			// Query again...
-			$result = SQL_QUERY("SELECT 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
+	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__);
 		} // END - if
 
 		// List found entries
 		$OUT = ''; $SW = 2;
-		while ($data = SQL_FETCHARRAY($result)) {
+		while ($content = SQL_FETCHARRAY($result)) {
 			// Prepare content
-			$content = array(
-				'sw'   => $SW,
-				'id'   => $data['id'],
-				'tpl'  => $data['mail_template'],
-				'alnk' => generateAdminLink($data['admin_id'])
-			);
+			$content['sw']   = $SW;
+			$content['alnk'] = generateAdminLink($content['admin_id']);
 
 			// Load row template
 			$OUT .= loadTemplate('admin_admins_mails_list_row', true, $content);