X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-edit_emails.php;h=350831451201e757e32367c7e1e641115941a654;hp=a02228e75abf5693ae70f2b1cd3a3f1b7c4e7d1a;hb=4001187f22197f55e5a1f211fc8defcc180f7c32;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc

diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index a02228e75a..3508314512 100644
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -40,26 +40,27 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR("admin", __FILE__);
 
-if ((isset($_POST['ok'])) && (empty($_POST['id']))) {
-	unset($_POST['ok']);
+if ((IS_FORM_SENT()) && (!REQUEST_ISSET_POST(('id')))) {
+	REQUEST_UNSET_POST('ok');
 }
 
 $result = SQL_QUERY("SELECT id, sender, subject, payment_id, cat_id FROM `{!_MYSQL_PREFIX!}_pool` ORDER BY timestamp", __FILE__, __LINE__);
 if (SQL_NUMROWS($result) > 0) {
-	if (isset($_POST['ok'])) {
+	if (IS_FORM_SENT()) {
 		// Make mail editable...
 		$result = SQL_QUERY_ESC("SELECT subject, text, url FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
-		 array(bigintval($_POST['id'])), __FILE__, __LINE__);
+		 array(bigintval(REQUEST_POST('id'))), __FILE__, __LINE__);
 		list($subj, $text, $url) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
-		define('__ID_VALUE'  , $_POST['id']);
+		// @TODO More constants to rewrite
+		define('__ID_VALUE'  , REQUEST_POST('id'));
 		define('__URL_VALUE' , $url);
 		define('__SUBJ_VALUE', $subj);
 		define('__TEXT_VALUE', $text);
 
 		// Load template
 		LOAD_TEMPLATE("admin_edit_email");
-	} elseif (!empty($_POST['save'])) {
+	} elseif (REQUEST_ISSET_POST(('save'))) {
 		// Save changes
 		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET
 subject='%s',
@@ -67,32 +68,33 @@ text='%s',
 url='%s'
 WHERE id=%s LIMIT 1",
  array(
-	$_POST['subj'],
-	$_POST['text'],
-	$_POST['url'],
-	bigintval($_POST['id']),
+	REQUEST_POST('subj'),
+	REQUEST_POST('text'),
+	REQUEST_POST('url'),
+	bigintval(REQUEST_POST('id')),
 ), __FILE__, __LINE__);
 
 		if (SQL_AFFECTEDROWS() == 1) {
-			$content = SETTINGS_SAVED;
+			$content = getMessage('SETTINGS_SAVED');
 		} else {
-			$content = "<span class=\"admin_failed\">".SETTINGS_NOT_SAVED."</span>";
+			$content = "<span class=\"admin_failed\">{--SETTINGS_NOT_SAVED--}</span>";
 		}
 
 		// Display message
 		LOAD_TEMPLATE("admin_settings_saved", false, $content);
 	} else {
 		// There are mail orders available
-		$SW = 2; $OUT = "";
-		while (list($id, $sender, $subj, $pay, $cat) = SQL_FETCHROW($result)) {
+		$OUT = ""; $SW = 2;
+		while ($content = SQL_FETCHARRAY($result)) {
 			// Prepare data for the row template
+			// @TODO Rewritings: subj->subject in template
 			$content = array(
 				'sw'   => $SW,
-				'id'   => $id,
-				'subj' => $subj,
-				'uid'  => ADMIN_USER_PROFILE_LINK($sender),
-				'pay'  => GET_PAYMENT($pay),
-				'cat'  => GET_CATEGORY($cat),
+				'id'   => $content['id'],
+				'subj' => $content['subject'],
+				'uid'  => ADMIN_USER_PROFILE_LINK($content['sender']),
+				'pay'  => GET_PAYMENT($content['payment_id']),
+				'cat'  => GET_CATEGORY($content['cat_id']),
 			);
 
 			// Load row template and switch colors
@@ -102,6 +104,8 @@ WHERE id=%s LIMIT 1",
 
 		// Free memory
 		SQL_FREERESULT($result);
+
+		// @TODO Yet another constant to rewrite
 		define('__EMAIL_SELECT_ROWS', $OUT);
 
 		// Load email template
@@ -109,7 +113,7 @@ WHERE id=%s LIMIT 1",
 	}
 } else {
 	// No mail orders left in pool
-	OUTPUT_HTML("<span class=\"admin_failed\">".ADMIN_NO_MAILS_IN_POOL."</span>");
+	LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"admin_failed\">{--ADMIN_NO_MAILS_IN_POOL--}</span>");
 }
 
 //