X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-admins_mails.php;h=16e4a6a3950e0777b4432b4825de5d5399a3f9d7;hb=d49fe31440f5946f23cd2b4044c6e0256640dde4;hp=101f6f21a8448fed92d5d06c76d9beae68d3e377;hpb=5071030af40e69ca4284642f44758964e18f5be8;p=mailer.git

diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 101f6f21a8..16e4a6a395 100644
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,110 +37,114 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
 }
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addMenuDescription('admin', __FILE__);
 
-if (REQUEST_ISSET_POST('edit')) {
+if (isPostRequestElementSet('edit')) {
 	// Check if entires are checked
 	$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 (REQUEST_POST('sel') as $template => $sel) {
+		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__);
-			$OUT = ''; $aid2 = 0;
+			$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"';
 				$OUT .=">{--ADMINS_ALL_ADMINS--}</option>\n";
-				if (EXT_IS_ACTIVE('events')) {
+				if (isExtensionActive('events')) {
 					$OUT .= "<option value=\"-1\"";
 					if ($content['admin_id'] == '-1') $OUT .= ' selected="selected"';
 					$OUT .= ">{--ADMINS_TO_USER_EVENTS--}</option>\n";
 				}
-				$OUT .= generateOptionList('admins', "id", "login", $content['admin_id'], 'email');
+				$OUT .= generateOptionList('admins', 'id', 'login', $content['admin_id'], 'email');
 				$OUT .= "</select>\n<br />\n";
-				$aid2 = $content['admin_id']; $id2 = $content['id'];
+				$adminId2 = $content['admin_id']; $id2 = $content['id'];
 			}
 
 			// 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 ($aid2 > 0) {
+			if ($adminId2 > 0) {
 				// Add form for an additional admin
-				$OUT .= LOAD_TEMPLATE("admin_admins_mails_edit_form", true, $content);
-			}
+				$OUT .= loadTemplate('admin_admins_mails_edit_form', true, $content);
+			} // END - if
 
 			// Save full rendered content
 			$content['content'] = $OUT;
 
 			// Start outputing line
-			$rowNameS .= LOAD_TEMPLATE("admin_admins_mails_edit_row", true, $content);
+			$rowNameS .= loadTemplate('admin_admins_mails_edit_row', true, $content);
 			$SW = 3 - $SW;
 		}
 
-		// @TODO Rewrite this constant
-		define('__ADMINS_ROWS', $rowNameS);
-
 		// Edit checked entries
-		LOAD_TEMPLATE("admin_admins_mails_edit");
+		loadTemplate('admin_admins_mails_edit', false, $rowNameS);
 	} else {
 		// Nothing selected
-		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMINS_NO_MAIL_CHECKED'));
+		loadTemplate('admin_settings_saved', false, getMessage('ADMINS_NO_MAIL_CHECKED'));
 	}
 } else {
 	// 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
-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?
-		if (REQUEST_ISSET_POST('change')) {
+		if (isPostRequestElementSet('change')) {
 			// Init SQLs
-			INIT_SQLS();
+			initSqls();
 
 			// Ok, update database
-			foreach (REQUEST_POST('admin_id') as $id => $content['admin_id']) {
+			foreach (postRequestElement('admin_id') as $id => $content['admin_id']) {
 				// Secure IDs
 				$id  = bigintval($id);
 				$content['admin_id'] = bigintval($content['admin_id']);
 
 				// Update entry
-				ADD_SQL(SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins_mails` SET admin_id=%s WHERE `id`=%s ORDER BY `id` LIMIT 1",
+				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));
 
-				if (($content['admin_id'] < 1) && (REQUEST_ISSET_POST('template', $id))) {
+				if (($content['admin_id'] < 1) && (isPostRequestElementSet('template', $id))) {
 					// Remove any other admin entries
-					ADD_SQL(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' AND id != '%s'",
-					array(REQUEST_POST('template', $id), $id), __FILE__, __LINE__, false));
+					addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admins_mails` WHERE mail_template='%s' AND id != '%s'",
+					array(postRequestElement('template', $id), $id), __FILE__, __LINE__, false));
 				} // END - if
 
-				if (REQUEST_POST('admin_new', REQUEST_POST('template', $id)) > 0) {
+				if (postRequestElement('admin_new', postRequestElement('template', $id)) > 0) {
 					// Add new admin
-					ADD_SQL(SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins_mails` (admin_id, mail_template) VALUES ('%s','%s')",
-					array($content['admin_id'], REQUEST_POST('template', $id)), __FILE__, __LINE__, false));
+					addSql(SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_mails` (admin_id, mail_template) VALUES ('%s','%s')",
+					array($content['admin_id'], postRequestElement('template', $id)), __FILE__, __LINE__, false));
 				} // END - if
 			} // END - foreach
 
@@ -148,7 +152,7 @@ ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
 			runFilterChain('run_sqls');
 
 			// 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 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__);
 		} // END - if
 
 		// List found entries
@@ -163,23 +167,20 @@ ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
 			);
 
 			// Load row template
-			$OUT .= LOAD_TEMPLATE("admin_admins_mails_list_row", true, $content);
+			$OUT .= loadTemplate('admin_admins_mails_list_row', true, $content);
 			$SW = 3 - $SW;
 		} // END - while
 
 		// Free result
 		SQL_FREERESULT($result);
 
-		// @TODO Rewrite this constant
-		define('__MAILS_ROWS', $OUT);
-
 		// Load template
-		LOAD_TEMPLATE("admin_admins_mails_list");
+		loadTemplate('admin_admins_mails_list', false, $OUT);
 	} else {
 		// No entries found
-		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMINS_MAILS_NO_ENTRIES'));
+		loadTemplate('admin_settings_saved', false, getMessage('ADMINS_MAILS_NO_ENTRIES'));
 	}
 }
 
-//
+// [EOF]
 ?>