X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-admins_mails.php;h=86f906e6ab447431090b4b7ce84185a14778ecf3;hb=c3f2beb3f1d47c9593d262d7f5dac47640b4aa52;hp=21ad2e4bdb11bfe6324953b55dcc4cd2be902cfe;hpb=dd7c9bf86a74049e3ca0c4df7dcddf48e33950d5;p=mailer.git

diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 21ad2e4bdb..86f906e6ab 100644
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -39,23 +39,23 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (isPostRequestElementSet('edit')) {
+if (isPostRequestParameterSet('edit')) {
 	// Check if entires are checked
 	if (countPostSelection() > 0) {
 		// Add option for events
 		$adminsList = generateOptionList('admins', 'id', 'login', '', 'email');
-		$SW = 2; $rowNameS = '';
-		foreach (postRequestElement('sel') as $template => $sel) {
+		$SW = 2; $rows = '';
+		foreach (postRequestParameter('sel') as $template => $sel) {
 			// First of all load data from DB
-			$result = SQL_QUERY_ESC("SELECT `admin_id`, `id`, `mail_template` FROM `{?_MYSQL_PREFIX?}_admins_mails` WHERE `mail_template`='%s' ORDER BY `id` ASC",
+			$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';
+			$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\">
@@ -72,15 +72,17 @@ if (isPostRequestElementSet('edit')) {
 
 				// Transfer ids
 				$adminId2 = $content['admin_id'];
-				$id2 = $content['id'];
+				$id = $content['id'];
 			} // END - while
 
 			// Free memory
 			SQL_FREERESULT($result);
 
 			// Prepare content
-			$content['sw']     = $SW;
-			$content['admins'] = $adminsList;
+			$content['id']            = $id;
+			$content['sw']            = $SW;
+			$content['mail_template'] = $template;
+			$content['admins']        = $adminsList;
 
 			if ($adminId2 > 0) {
 				// Add form for an additional admin
@@ -91,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'));
@@ -119,12 +121,12 @@ ORDER BY
 
 	if (SQL_NUMROWS($result) > 0) {
 		// Shall I change entries?
-		if (isPostRequestElementSet('change')) {
+		if (isPostRequestParameterSet('change')) {
 			// Init SQLs
 			initSqls();
 
 			// Ok, update database
-			foreach (postRequestElement('admin_id') as $id => $content['admin_id']) {
+			foreach (postRequestParameter('admin_id') as $id => $content['admin_id']) {
 				// Secure ids
 				$id  = bigintval($id);
 				$content['admin_id'] = bigintval($content['admin_id']);
@@ -133,16 +135,16 @@ ORDER BY
 				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) && (isPostRequestElementSet('template', $id))) {
+				if (($content['admin_id'] < 1) && (isPostRequestParameterSet('template', $id))) {
 					// Remove any other admin entries
 					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));
+					array(postRequestParameter('template', $id), $id), __FILE__, __LINE__, false));
 				} // END - if
 
-				if (postRequestElement('admin_new', postRequestElement('template', $id)) > 0) {
+				if (postRequestParameter('admin_new', postRequestParameter('template', $id)) > 0) {
 					// Add new admin
 					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));
+					array($content['admin_id'], postRequestParameter('template', $id)), __FILE__, __LINE__, false));
 				} // END - if
 			} // END - foreach