X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-edit_emails.php;h=b9edf20f42b769b9e8cdc0952930cdb639c1deea;hb=cd7d344ea7007cfa20413acd3e03e50f0ab86d86;hp=5d34c42d86d5ffcdf7961434c3e20d00aaf9454c;hpb=0f3a135204757cc8750262871c8e62c42300acb4;p=mailer.git
diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index 5d34c42d86..b9edf20f42 100644
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -16,8 +16,8 @@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -43,59 +43,30 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
// Add description as navigation point
addYouAreHereLink('admin', __FILE__);
-if ((isFormSent()) && (!isPostRequestParameterSet('id'))) {
- unsetPostRequestParameter('ok');
+if ((isFormSent()) && (!isPostRequestElementSet('id'))) {
+ unsetPostRequestElement('ok');
} // END - if
// Form sent or anything else? ;-)
-if ((isFormSent()) && (postRequestParameterSet('mid'))) {
- // Make mail editable...
- $result = SQL_QUERY_ESC("SELECT
- `id`,`sender` AS `userid`,`subject`,`text`,`url`
-FROM
- `{?_MYSQL_PREFIX?}_pool`
-WHERE
- `id`=%s
-LIMIT 1",
- array(bigintval(postRequestParameter('mid'))), __FILE__, __LINE__);
-
- // Fetch row
- $content = SQL_FETCHARRAY($result);
-
- // Free result
- SQL_FREERESULT($result);
-
- // Load template
- loadTemplate('admin_edit_email', false, $content);
-} elseif (isGetRequestParameterSet('mid')) {
- // Make also this email editable
- $result = SQL_QUERY_ESC("SELECT
- `id`,`sender` AS `userid`,`subject`,`text`,`url`
-FROM
- `{?_MYSQL_PREFIX?}_pool`
-WHERE
- `id`=%s
-LIMIT 1",
- array(bigintval(getRequestParameter('mid'))), __FILE__, __LINE__);
-
- // Fetch row
- $content = SQL_FETCHARRAY($result);
-
- // Free result
- SQL_FREERESULT($result);
+if ((isFormSent('edit')) && (isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'normal')) {
+ // Get data
+ $content = getPoolDataFromId(postRequestElement('id'));
// Load template
- loadTemplate('admin_edit_email', false, $content);
-} elseif (isGetRequestParameterSet('bid')) {
+ loadTemplate('admin_edit_email', FALSE, $content);
+} elseif ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'bonus')) {
// Make also this email editable
- $result = SQL_QUERY_ESC("SELECT
- `id`,`subject`,`text`,`url`
+ $result = SQL_QUERY_ESC('SELECT
+ `id`,
+ `subject`,
+ `text`,
+ `url`
FROM
`{?_MYSQL_PREFIX?}_bonus`
WHERE
`id`=%s
-LIMIT 1",
- array(bigintval(getRequestParameter('bid'))), __FILE__, __LINE__);
+LIMIT 1',
+ array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
// Fetch row
$content = SQL_FETCHARRAY($result);
@@ -104,33 +75,18 @@ LIMIT 1",
SQL_FREERESULT($result);
// Load template
- loadTemplate('admin_edit_bonus_email', false, $content);
-} elseif (isFormSent('save')) {
+ loadTemplate('admin_edit_bonus_email', FALSE, $content);
+} elseif (isFormSent('do_edit')) {
// Save changes
- if (isPostRequestParameterSet('mid')) {
+ if ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'normal')) {
// Update pool
- SQL_QUERY_ESC("UPDATE
- `{?_MYSQL_PREFIX?}_pool`
-SET
- `subject`='%s',
- `text`='%s',
- `url`='%s'
-WHERE
- `id`=%s
-LIMIT 1",
- array(
- postRequestParameter('subject'),
- postRequestParameter('text'),
- postRequestParameter('url'),
- bigintval(postRequestParameter('mid')),
- ), __FILE__, __LINE__);
-
- if (!SQL_HASZEROAFFECTED()) {
+ $isUpdated = updatePoolDataById(postRequestElement('id'), NULL, array('subject' => postRequestElement('subject'), 'text' => postRequestElement('text'), 'url' => postRequestElemenet('url')));
+ if ($isUpdated === TRUE) {
$content = '{--ADMIN_EMAIL_CHANGES_SAVED--}';
} else {
- $content = '{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}';
+ $content = '{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}';
}
- } elseif (isPostRequestParameterSet('bid')) {
+ } elseif ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'bonus')) {
// Update pool
SQL_QUERY_ESC("UPDATE
`{?_MYSQL_PREFIX?}_bonus`
@@ -142,20 +98,20 @@ WHERE
`id`=%s
LIMIT 1",
array(
- postRequestParameter('subject'),
- postRequestParameter('text'),
- postRequestParameter('url'),
- bigintval(postRequestParameter('bid')),
+ postRequestElement('subject'),
+ postRequestElement('text'),
+ postRequestElement('url'),
+ bigintval(postRequestElement('id')),
), __FILE__, __LINE__);
if (!SQL_HASZEROAFFECTED()) {
$content = '{--ADMIN_EMAIL_CHANGES_SAVED--}';
} else {
- $content = '{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}';
+ $content = '{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}';
}
} else {
// No valid action
- $content = '{--ADMIN_EDIT_EMAIL_FAILED--}';
+ $content = '{--ADMIN_EDIT_EMAIL_FAILED--}';
}
// Display message
@@ -163,10 +119,15 @@ LIMIT 1",
} else {
// Query the pool
$result = SQL_QUERY('SELECT
- `id`,`sender` AS `userid`,`subject`,`payment_id`,`cat_id`
+ `id`,
+ `sender`,
+ `subject`,
+ `payment_id`,
+ `cat_id`
FROM
`{?_MYSQL_PREFIX?}_pool`
ORDER BY
+ `sender` ASC,
`timestamp` ASC', __FILE__, __LINE__);
// Entries found?
@@ -175,14 +136,14 @@ ORDER BY
$OUT = '';
while ($content = SQL_FETCHARRAY($result)) {
// Load row template and switch colors
- $OUT .= loadTemplate('admin_edit_email_row', true, $content);
+ $OUT .= loadTemplate('admin_edit_email_row', TRUE, $content);
} // END - while
// Free memory
SQL_FREERESULT($result);
// Load email template
- loadTemplate('admin_edit_email_select', false, $OUT);
+ loadTemplate('admin_edit_email_select', FALSE, $OUT);
} else {
// No mail orders left in pool
displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');