Filters for configurable userid exclusion added:

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

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 97e547a81e74aab7d18e5c81e70ea1fd94ed66e8..fed64612ec424b9e2da837248dc37ed349e9c676 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.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 *
@@ -46,8 +46,8 @@ addYouAreHereLink('admin', __FILE__);
 // Is 'sql_patches' updated?
 if (!isExtensionInstalledAndNewer('sql_patches', '0.7.4')) {
        // No, abort here
-       loadTemplate('admin_settings_saved', false, generateExtensionOutdatedMessage('sql_patches', '0.7.4'));
-       return false;
+       displayMessage(generateExtensionOutdatedMessage('sql_patches', '0.7.4'));
+       return FALSE;
 } // END - if
 
 // Normal mails ordered by your members
@@ -63,35 +63,35 @@ ORDER BY
 $WHO = '';
 $SQL2 = '';
 
-if (isGetRequestParameterSet('mid')) {
+if (isGetRequestElementSet('mid')) {
        // Only a specific mail shall be displayed
        $sql = sprintf("SELECT
-       `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
+       `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `mails_sent`, `cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
        `id`=%s
 LIMIT 1",
-               bigintval(getRequestParameter('mid'))
+               bigintval(getRequestElement('mid'))
        );
-       $WHO = '{--MAIL_ID--}' . ': ' . getRequestParameter('mid');
-} elseif (isGetRequestParameterSet('userid')) {
+       $WHO = '{--MAIL_ID--}' . ': ' . getRequestElement('mid');
+} elseif (isGetRequestElementSet('userid')) {
        // All mails by a specific member shall be displayed
        $sql = sprintf("SELECT
-       `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
+       `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `mails_sent`, `cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
        `sender`=%s
 ORDER BY
        `timestamp` DESC",
-               bigintval(getRequestParameter('userid'))
+               bigintval(getRequestElement('userid'))
        );
-       $WHO = '{--USER_ID--}' . ': ' . getRequestParameter('userid');
+       $WHO = '{--USER_ID--}' . ': ' . getRequestElement('userid');
 }
 
 // Init result_bonus
-$result_bonus = false;
+$result_bonus = FALSE;
 
 if ((isExtensionActive('bonus')) && (empty($WHO))) {
        // Check for maximum pages
@@ -110,22 +110,22 @@ ORDER BY
 $result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Set offset an current page to default values
-if (!isGetRequestParameterSet('page')) setGetRequestParameter('page', 1);
+if (!isGetRequestElementSet('page')) setGetRequestElement('page', 1);
 
-if (!isGetRequestParameterSet('offset')) {
+if (!isGetRequestElementSet('offset')) {
        if (isConfigEntrySet('mails_page')) {
                // Set config entry
-               setGetRequestParameter('offset', getMailsPage());
+               setGetRequestElement('offset', getMailsPage());
        } else {
                // Set default one
-               setGetRequestParameter('offset', 10);
+               setGetRequestElement('offset', 10);
        }
 } // END - if
 
 // Add limitation to SQL string
-if (!isGetRequestParameterSet('mid')) {
+if (!isGetRequestElementSet('mid')) {
        // Create limitation line
-       $add = ' LIMIT ' . (bigintval(getRequestParameter('offset')) * bigintval(getRequestParameter('page')) - bigintval(getRequestParameter('offset'))) . ', ' . bigintval(getRequestParameter('offset'));
+       $add = ' LIMIT ' . (bigintval(getRequestElement('offset')) * bigintval(getRequestElement('page')) - bigintval(getRequestElement('offset'))) . ', ' . bigintval(getRequestElement('offset'));
 
        // For normal mails
        $sql .= $add;
@@ -149,7 +149,7 @@ if (isConfigEntrySet('mails_page')) {
 // Free result
 SQL_FREERESULT($result_normal);
 
-$MAIL = false;
+$MAIL = FALSE;
 if (!SQL_HASZERONUMS($result_list)) {
        // Init rows
        $OUT = '';
@@ -173,23 +173,23 @@ if (!SQL_HASZERONUMS($result_list)) {
                $content['timestamp']   = generateDateTime($content['timestamp'], 0);
 
                // Load row template
-               $OUT .= loadTemplate('admin_list_emails_row', true, $content);
+               $OUT .= loadTemplate('admin_list_emails_row', TRUE, $content);
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result_list);
 
        // Add navigation (with change box and colspan=3)
-       $content['nav'] = addEmailNavigation($numPages, getMailsPage(), false, 3, true);
+       $content['nav'] = addEmailNavigation($numPages, getMailsPage(), FALSE, 3, TRUE);
 
        // Prepare content
        $content['rows'] = $OUT;
        $content['who'] = $WHO;
 
        // Mail orders are in pool so we can display them
-       loadTemplate('admin_list_emails', false, $content);
+       loadTemplate('admin_list_emails', FALSE, $content);
 
-       $MAIL = true;
+       $MAIL = TRUE;
        if ((isExtensionActive('bonus')) && (empty($WHO))) {
                // Only check if bonus extension is active
                if (!SQL_HASZERONUMS($result_bonus)) outputHtml('<br /><br />');
@@ -212,24 +212,24 @@ if ((isExtensionActive('bonus')) && (empty($WHO))) {
                        $content['timestamp']   = generateDateTime($content['timestamp'], 0);
 
                        // Load row template
-                       $OUT .= loadTemplate('admin_list_bonus_emails_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_bonus_emails_row', TRUE, $content);
                } // END - while
 
                // Add navigation (without change box but with colspan=3)
-               $content['nav'] = addEmailNavigation($numPages, getMailsPage(), false, 3, true);
+               $content['nav'] = addEmailNavigation($numPages, getMailsPage(), FALSE, 3, TRUE);
 
                // Prepare content
                $content['rows'] = $OUT;
 
                // Load main template
-               loadTemplate('admin_list_bonus_emails', false, $content);
-               $MAIL = true;
+               loadTemplate('admin_list_bonus_emails', FALSE, $content);
+               $MAIL = TRUE;
        } // END - if
 } // END - if
 
-if ($MAIL === false) {
+if ($MAIL === FALSE) {
        // No mail orders fond
-       loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
+       displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');
 } // END - if
 
 // [EOF]