X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-edit_emails.php;h=cf78ba0e33834bb5cceaaf7ab2f47509d326aca6;hb=1410e014d23f244e73d3a7916a61c2473416bab9;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..cf78ba0e33 100644
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -14,11 +14,9 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -40,10 +38,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 +49,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 +59,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 +75,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,31 +94,31 @@ LIMIT 1",
bigintval(postRequestParameter('id')),
), __FILE__, __LINE__);
- if (SQL_AFFECTEDROWS() == 1) {
+ if (!SQL_HASZEROAFFECTED()) {
$content = '{--SETTINGS_SAVED--}';
} else {
$content = '{--SETTINGS_NOT_SAVED--}';
}
// Display message
- loadTemplate('admin_settings_saved', false, $content);
+ displayMessage($content);
} else {
// There are mail orders available
$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
- loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
+ displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');
}
// [EOF]