X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-admins_mails.php;h=b4f752c93986e2618dd5037c3cba9a372958d404;hp=3d7e951eff67f322159bee5e7b81e51c58785613;hb=d0d885e08aba45b77818d49bcf40396bf788c386;hpb=7f104f6fe558bb56b4205241435a2357c2feece1

diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 3d7e951eff..b4f752c939 100644
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Stellen Sie ein, welcher Admin welche Mail erh.  *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * 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 *
@@ -32,166 +37,149 @@
  ************************************************************************/
 
 // 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", basename(__FILE__));
+addMenuDescription('admin', __FILE__);
 
-if (isset($_POST['edit']))
-{
+if (isPostRequestElementSet('edit')) {
 	// Check if entires are checked
-	$SEL = SELECTION_COUNT($_POST['sel']);
-	if ($SEL > 0)
-	{
-		// Add option for userlog
-		$cacheArray['admins'] = ADD_OPTION_LINES("admins", "id", "login", "", "email");
-		$SW = 2; $rowNameS = "";
-		foreach ($_POST['sel'] as $template => $sel)
-		{
+	if (countPostSelection() > 0) {
+		// Add option for events
+		$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__);
-			$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";
+			$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 (isExtensionActive('events')) {
+					$OUT .= "<option value=\"-1\"";
+					if ($content['admin_id'] == '-1') $OUT .= ' selected="selected"';
+					$OUT .= ">{--ADMINS_TO_USER_EVENTS--}</option>\n";
 				}
-				$OUT .= ADD_OPTION_LINES("admins", "id", "login", $aid, "email");
-				$OUT .= "</SELECT><br />\n";
-				$aid2 = $aid; $id2 = $id;
+				$OUT .= generateOptionList('admins', 'id', 'login', $content['admin_id'], 'email');
+				$OUT .= "</select>\n<br />\n";
+				$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'  => $cacheArray['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;
 		}
-		define('__ADMINS_ROWS', $rowNameS);
 
 		// Edit checked entries
-		LOAD_TEMPLATE("admin_admins_mails_edit");
-	}
-	 else
-	{
+		loadTemplate('admin_admins_mails_edit', false, $rowNameS);
+	} else {
 		// Nothing selected
-		LOAD_TEMPLATE("admin_settings_saved", false, ADMINS_NO_MAIL_CHECKED);
+		loadTemplate('admin_settings_saved', false, getMessage('ADMINS_NO_MAIL_CHECKED'));
 	}
-}
- else
-{
+} 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__);
-
-	if (SQL_NUMROWS($result) > 0)
-	{
+	$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 (isset($_POST['change']))
-		{
+		if (isPostRequestElementSet('change')) {
+			// Init SQLs
+			initSqls();
+
 			// Ok, update database
-			foreach ($_POST['admin_id'] as $id => $aid)
-			{
-				// Secure IDs
+			foreach (postRequestElement('admin_id') as $id => $content['admin_id']) {
+				// Secure ids
 				$id  = bigintval($id);
-				$aid = bigintval($aid);
+				$content['admin_id'] = bigintval($content['admin_id']);
 
 				// 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__);
+				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 (($aid < 1) && (!empty($_POST['template'][$id])))
-				{
+				if (($content['admin_id'] < 1) && (isPostRequestElementSet('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__);
-				}
-				if ($_POST['admin_new'][$_POST['template'][$id]] > 0)
-				{
+					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 (postRequestElement('admin_new', postRequestElement('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__);
-				}
-			}
+					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
+
+			// Run all queries
+			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
-		$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>";
-			}
+		$OUT = ''; $SW = 2;
+		while ($data = SQL_FETCHARRAY($result)) {
+			// Prepare content
 			$content = array(
 				'sw'   => $SW,
-				'tpl'  => $templ,
-				'alnk' => $admin_link
+				'id'   => $data['id'],
+				'tpl'  => $data['mail_template'],
+				'alnk' => generateAdminLink($data['admin_id'])
 			);
 
 			// 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);
-		define('__MAILS_ROWS', $OUT);
 
 		// Load template
-		LOAD_TEMPLATE("admin_admins_mails_list");
-	}
-	 else
-	{
+		loadTemplate('admin_admins_mails_list', false, $OUT);
+	} else {
 		// No entries found
-		LOAD_TEMPLATE("admin_settings_saved", false, ADMINS_MAILS_NO_ENTRIES);
+		loadTemplate('admin_settings_saved', false, getMessage('ADMINS_MAILS_NO_ENTRIES'));
 	}
 }
-//
+
+// [EOF]
 ?>