X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-edit_emails.php;h=01880f16704002739a06db4aa12acf0d3cb9a594;hb=c5173c4d66be7ec72fbf8051a2097cbb377e87a0;hp=a4d49bed3694f6a242d5dedc2985e6a09b58b598;hpb=5ab494ec65f8d912c075480312b15b15a5076ea4;p=mailer.git

diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index a4d49bed36..01880f1670 100644
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -40,10 +40,10 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if ((isFormSent()) && (!isPostRequestParameterSet('id'))) {
 	unsetPostRequestParameter('ok');
@@ -51,7 +51,7 @@ if ((isFormSent()) && (!isPostRequestParameterSet('id'))) {
 
 // Query the pool
 $result = SQL_QUERY('SELECT
-	`id`, `sender`, `subject`, `payment_id`, `cat_id`
+	`id`, `sender` AS `userid`, `subject`, `payment_id`, `cat_id`
 FROM
 	`{?_MYSQL_PREFIX?}_pool`
 ORDER BY
@@ -61,7 +61,13 @@ ORDER BY
 if (!SQL_HASZERONUMS($result)) {
 	if (isFormSent()) {
 		// Make mail editable...
-		$result = SQL_QUERY_ESC("SELECT `id`, `subject`, `text`, `url` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT
+	`id`, `sender` AS `userid`, `subject`, `text`, `url`
+FROM
+	`{?_MYSQL_PREFIX?}_pool`
+WHERE
+	`id`=%s
+LIMIT 1",
 			array(bigintval(postRequestParameter('id'))), __FILE__, __LINE__);
 
 		// Fetch row
@@ -71,7 +77,7 @@ if (!SQL_HASZERONUMS($result)) {
 		SQL_FREERESULT($result);
 
 		// Load template
-		loadTemplate('form_submit_email', false, $content);
+		loadTemplate('admin_edit_email', false, $content);
 	} elseif (isPostRequestParameterSet('save')) {
 		// Save changes
 		SQL_QUERY_ESC("UPDATE
@@ -90,7 +96,7 @@ LIMIT 1",
 				bigintval(postRequestParameter('id')),
 			), __FILE__, __LINE__);
 
-		if (SQL_AFFECTEDROWS() == 1) {
+		if (!SQL_HASZEROAFFECTED()) {
 			$content = '{--SETTINGS_SAVED--}';
 		} else {
 			$content = '<span class="notice">{--SETTINGS_NOT_SAVED--}</span>';
@@ -103,14 +109,14 @@ LIMIT 1",
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Load row template and switch colors
-			$OUT .= loadTemplate('form_submit_email_row', true, $content);
+			$OUT .= loadTemplate('admin_edit_email_row', true, $content);
 		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// Load email template
-		loadTemplate('form_submit_email_select', false, $OUT);
+		loadTemplate('admin_edit_email_select', false, $OUT);
 	}
 } else {
 	// No mail orders left in pool