X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-edit_emails.php;h=c03be85a37c421c0933cf5bfa34f5a6529a407f4;hp=3ac617bee570beab991fef8cfe8b7b1755410868;hb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;hpb=7b0f17cd637e388049d2167811e4332cec1e979b

diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index 3ac617bee5..c03be85a37 100644
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.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,47 +37,51 @@
  ************************************************************************/
 
 // 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 ((IS_FORM_SENT()) && (!REQUEST_ISSET_POST('id'))) {
-	REQUEST_UNSET_POST('ok');
+if ((isFormSent()) && (!isPostRequestElementSet('id'))) {
+	unsetPostRequestElement('ok');
 }
 
-$result = SQL_QUERY("SELECT id, sender, subject, payment_id, cat_id FROM `{!_MYSQL_PREFIX!}_pool` ORDER BY timestamp", __FILE__, __LINE__);
+$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 (IS_FORM_SENT()) {
+	if (isFormSent()) {
 		// Make mail editable...
-		$result = SQL_QUERY_ESC("SELECT subject, text, url FROM `{!_MYSQL_PREFIX!}_pool` WHERE `id`=%s LIMIT 1",
-		 array(bigintval(REQUEST_POST('id'))), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT subject, text, url FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
+		array(bigintval(postRequestElement('id'))), __FILE__, __LINE__);
 		list($subj, $text, $url) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
-		// @TODO More constants to rewrite
-		define('__ID_VALUE'  , REQUEST_POST('id'));
-		define('__URL_VALUE' , $url);
-		define('__SUBJ_VALUE', $subj);
-		define('__TEXT_VALUE', $text);
+
+		// Prepare constant for template
+		$content['id']       = bigintval(postRequestElement('id'));
+		$content['url']      = $url;
+		$content['subject']  = $subj;
+		$content['text']     = $text;
 
 		// Load template
-		LOAD_TEMPLATE("admin_edit_email");
-	} elseif (REQUEST_ISSET_POST(('save'))) {
+		loadTemplate('admin_edit_email', false, $content);
+	} elseif (isPostRequestElementSet('save')) {
 		// Save changes
-		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET
-subject='%s',
-text='%s',
-url='%s'
-WHERE `id`=%s LIMIT 1",
- array(
-	REQUEST_POST('subj'),
-	REQUEST_POST('text'),
-	REQUEST_POST('url'),
-	bigintval(REQUEST_POST('id')),
-), __FILE__, __LINE__);
+		SQL_QUERY_ESC("UPDATE
+	`{?_MYSQL_PREFIX?}_pool`
+SET
+	`subject`='%s',
+	`text`='%s',
+	`url`='%s'
+WHERE
+	`id`=%s
+LIMIT 1",
+			array(
+				postRequestElement('subj'),
+				postRequestElement('text'),
+				postRequestElement('url'),
+				bigintval(postRequestElement('id')),
+			), __FILE__, __LINE__);
 
 		if (SQL_AFFECTEDROWS() == 1) {
 			$content = getMessage('SETTINGS_SAVED');
@@ -86,7 +90,7 @@ WHERE `id`=%s LIMIT 1",
 		}
 
 		// Display message
-		LOAD_TEMPLATE('admin_settings_saved', false, $content);
+		loadTemplate('admin_settings_saved', false, $content);
 	} else {
 		// There are mail orders available
 		$OUT = ''; $SW = 2;
@@ -97,29 +101,26 @@ WHERE `id`=%s LIMIT 1",
 				'sw'   => $SW,
 				'id'   => $content['id'],
 				'subj' => $content['subject'],
-				'uid'  => generateUserProfileLink($content['sender']),
+				'userid'  => generateUserProfileLink($content['sender']),
 				'pay'  => getPaymentTitlePrice($content['payment_id']),
 				'cat'  => getCategory($content['cat_id']),
 			);
 
 			// Load row template and switch colors
-			$OUT .= LOAD_TEMPLATE("admin_edit_email_row", true, $content);
+			$OUT .= loadTemplate('admin_edit_email_row', true, $content);
 			$SW = 3 - $SW;
 		}
 
 		// Free memory
 		SQL_FREERESULT($result);
 
-		// @TODO Yet another constant to rewrite
-		define('__EMAIL_SELECT_ROWS', $OUT);
-
 		// Load email template
-		LOAD_TEMPLATE("admin_edit_email_select");
+		loadTemplate('admin_edit_email_select', false, $OUT);
 	}
 } else {
 	// No mail orders left in pool
-	LOAD_TEMPLATE('admin_settings_saved', false, "<span class=\"admin_failed\">{--ADMIN_NO_MAILS_IN_POOL--}</span>");
+	loadTemplate('admin_settings_saved', false, "<span class=\"admin_failed\">{--ADMIN_NO_MAILS_IN_POOL--}</span>");
 }
 
-//
+// [EOF]
 ?>