X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-edit_emails.php;h=01880f16704002739a06db4aa12acf0d3cb9a594;hb=c5173c4d66be7ec72fbf8051a2097cbb377e87a0;hp=345830600eda1b7c1d86587bf19182d187dc810f;hpb=cb20090aa0558f1b74f0e9f925f29819e8bb3a45;p=mailer.git
diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index 345830600e..01880f1670 100644
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -40,29 +40,41 @@
// 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` AS `userid`, `subject`, `payment_id`, `cat_id`
+FROM
+ `{?_MYSQL_PREFIX?}_pool`
+ORDER BY
+ `timestamp` ASC', __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) {
+// Entries found?
+if (!SQL_HASZERONUMS($result)) {
if (isFormSent()) {
// Make mail editable...
- $result = SQL_QUERY_ESC("SELECT subject, text, url FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
- array(bigintval(postRequestParameter('id'))), __FILE__, __LINE__);
- list($subj, $text, $url) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
+ $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
+ $content = SQL_FETCHARRAY($result);
- // Prepare constant for template
- $content['id'] = bigintval(postRequestParameter('id'));
- $content['url'] = $url;
- $content['subject'] = $subj;
- $content['text'] = $text;
+ // Free result
+ SQL_FREERESULT($result);
// Load template
loadTemplate('admin_edit_email', false, $content);
@@ -84,32 +96,21 @@ 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)) {
- // Prepare data for the row template
- $content = array(
- 'sw' => $SW,
- 'id' => $content['id'],
- 'subject' => $content['subject'],
- 'userid' => generateUserProfileLink($content['sender']),
- 'pay' => getPaymentTitlePrice($content['payment_id']),
- 'cat' => getCategory($content['cat_id']),
- );
-
// Load row template and switch colors
$OUT .= loadTemplate('admin_edit_email_row', true, $content);
- $SW = 3 - $SW;
- }
+ } // END - while
// Free memory
SQL_FREERESULT($result);
@@ -119,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]