X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-edit_emails.php;h=01880f16704002739a06db4aa12acf0d3cb9a594;hb=c5173c4d66be7ec72fbf8051a2097cbb377e87a0;hp=b18689ddeb299f100beab2e46d3234afbd41359d;hpb=e1a62db0c2a7a8b56e066aa3a2a032cfabf08267;p=mailer.git
diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index b18689ddeb..01880f1670 100644
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -40,28 +40,34 @@
// 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');
} // END - if
// Query the pool
-$result = SQL_QUERY("SELECT
- `id`, `sender`, `subject`, `payment_id`, `cat_id`
+$result = SQL_QUERY('SELECT
+ `id`, `sender` AS `userid`, `subject`, `payment_id`, `cat_id`
FROM
`{?_MYSQL_PREFIX?}_pool`
ORDER BY
- `timestamp` ASC", __FILE__, __LINE__);
+ `timestamp` ASC', __FILE__, __LINE__);
// Entries found?
-if (SQL_NUMROWS($result) > 0) {
+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
@@ -90,24 +96,20 @@ LIMIT 1",
bigintval(postRequestParameter('id')),
), __FILE__, __LINE__);
- if (SQL_AFFECTEDROWS() == 1) {
- $content = getMessage('SETTINGS_SAVED');
+ if (!SQL_HASZEROAFFECTED()) {
+ $content = '{--SETTINGS_SAVED--}';
} else {
- $content = '{--SETTINGS_NOT_SAVED--}';
+ $content = '{--SETTINGS_NOT_SAVED--}';
}
// Display message
loadTemplate('admin_settings_saved', false, $content);
} else {
// There are mail orders available
- $OUT = ''; $SW = 2;
+ $OUT = '';
while ($content = SQL_FETCHARRAY($result)) {
- // Add color swapping
- $content['sw'] = $SW;
-
// Load row template and switch colors
$OUT .= loadTemplate('admin_edit_email_row', true, $content);
- $SW = 3 - $SW;
} // END - while
// Free memory
@@ -118,7 +120,7 @@ LIMIT 1",
}
} else {
// No mail orders left in pool
- loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
}
// [EOF]