Filters for configurable userid exclusion added:

[mailer.git] / inc / modules / admin / what-edit_emails.php

diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index 2c8568c37c1b35f6103f489cc55f85e9f9463fcc..9e42da8f8846a28cadab4936624ed8ada44808ae 100644 (file)
--- 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 - 2012 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,21 +43,25 @@ 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'))) {
+if ((isFormSent()) && (isPostRequestElementSet('mid'))) {
        // Make mail editable...
-       $result = SQL_QUERY_ESC("SELECT
-       `id`, `sender` AS `userid`, `subject`, `text`, `url`
+       $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__);
+LIMIT 1',
+               array(bigintval(postRequestElement('mid'))), __FILE__, __LINE__);
 
        // Fetch row
        $content = SQL_FETCHARRAY($result);
@@ -66,17 +70,21 @@ LIMIT 1",
        SQL_FREERESULT($result);
 
        // Load template
-       loadTemplate('admin_edit_email', false, $content);
-} elseif (isGetRequestParameterSet('mid')) {
+       loadTemplate('admin_edit_email', FALSE, $content);
+} elseif (isGetRequestElementSet('mid')) {
        // Make also this email editable
-       $result = SQL_QUERY_ESC("SELECT
-       `id`, `sender` AS `userid`, `subject`, `text`, `url`
+       $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__);
+LIMIT 1',
+               array(bigintval(getRequestElement('mid'))), __FILE__, __LINE__);
 
        // Fetch row
        $content = SQL_FETCHARRAY($result);
@@ -85,17 +93,20 @@ LIMIT 1",
        SQL_FREERESULT($result);
 
        // Load template
-       loadTemplate('admin_edit_email', false, $content);
-} elseif (isGetRequestParameterSet('bid')) {
+       loadTemplate('admin_edit_email', FALSE, $content);
+} elseif (isGetRequestElementSet('bid')) {
                // 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('bid'))), __FILE__, __LINE__);
 
        // Fetch row
        $content = SQL_FETCHARRAY($result);
@@ -104,10 +115,10 @@ 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('mid')) {
                // Update pool
                SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_pool`
@@ -119,18 +130,18 @@ WHERE
        `id`=%s
 LIMIT 1",
                        array(
-                               postRequestParameter('subject'),
-                               postRequestParameter('text'),
-                               postRequestParameter('url'),
-                               bigintval(postRequestParameter('mid')),
+                               postRequestElement('subject'),
+                               postRequestElement('text'),
+                               postRequestElement('url'),
+                               bigintval(postRequestElement('mid')),
                        ), __FILE__, __LINE__);
 
                if (!SQL_HASZEROAFFECTED()) {
                        $content = '{--ADMIN_EMAIL_CHANGES_SAVED--}';
                } else {
-                       $content = '<span class="notice">{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}</span>';
+                       $content = '<span class="bad">{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}</span>';
                }
-       } elseif (isPostRequestParameterSet('bid')) {
+       } elseif (isPostRequestElementSet('bid')) {
                // Update pool
                SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_bonus`
@@ -142,20 +153,20 @@ WHERE
        `id`=%s
 LIMIT 1",
                        array(
-                               postRequestParameter('subject'),
-                               postRequestParameter('text'),
-                               postRequestParameter('url'),
-                               bigintval(postRequestParameter('bid')),
+                               postRequestElement('subject'),
+                               postRequestElement('text'),
+                               postRequestElement('url'),
+                               bigintval(postRequestElement('bid')),
                        ), __FILE__, __LINE__);
 
                if (!SQL_HASZEROAFFECTED()) {
                        $content = '{--ADMIN_EMAIL_CHANGES_SAVED--}';
                } else {
-                       $content = '<span class="notice">{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}</span>';
+                       $content = '<span class="bad">{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}</span>';
                }
        } else {
                // No valid action
-               $content = '<span class="notice">{--ADMIN_EDIT_EMAIL_FAILED--}</span>';
+               $content = '<span class="bad">{--ADMIN_EDIT_EMAIL_FAILED--}</span>';
        }
 
        // Display message
@@ -163,7 +174,11 @@ LIMIT 1",
 } else {
        // Query the pool
        $result = SQL_QUERY('SELECT
-       `id`, `sender` AS `userid`, `subject`, `payment_id`, `cat_id`
+       `id`,
+       `sender` AS `userid`,
+       `subject`,
+       `payment_id`,
+       `cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 ORDER BY
@@ -175,14 +190,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--}');