More rewrites to make use of (cached) wrapper functions

[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 22ca7fb20afb36c6be8a91286566656502f3e4a0..0e5023dc8e9e9924183d318278ae0ba2efec060b 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -65,33 +65,40 @@ WHERE
 ORDER BY
        `timestamp` DESC";
 
-$WHO = getMessage('_ALL');
+$WHO = '';
 $SQL2 = '';
 
 if (isGetRequestParameterSet(('mid'))) {
        // Only a specific mail shall be displayed
-       $sql = "SELECT
+       $sql = sprintf("SELECT
        `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
-       `id`='".bigintval(getRequestParameter('mid'))."'
-LIMIT 1";
-       $WHO = getMessage('MAIL_ID') . ': ' . getRequestParameter('mid');
+       `id`=%s
+LIMIT 1",
+               bigintval(getRequestParameter('mid'))
+       );
+       $WHO = '{--MAIL_ID--}' . ': ' . getRequestParameter('mid');
 } elseif (isGetRequestParameterSet('userid')) {
        // All mails by a specific member shall be displayed
-       $sql = "SELECT
+       $sql = sprintf("SELECT
        `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
-       `sender`='".bigintval(getRequestParameter('userid'))."'
+       `sender`=%s
 ORDER BY
-       `timestamp` DESC";
-       $WHO = getMessage('USER_ID') . ': ' . getRequestParameter('userid');
+       `timestamp` DESC",
+               bigintval(getRequestParameter('userid'))
+       );
+       $WHO = '{--USER_ID--}' . ': ' . getRequestParameter('userid');
 }
 
-if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
+// Init result_bonus
+$result_bonus = false;
+
+if ((isExtensionActive('bonus')) && (empty($WHO))) {
        // Check for maximum pages
        $result_bonus = SQL_QUERY("SELECT
        `id`, `subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`, `clicks`
@@ -134,19 +141,19 @@ if (!isGetRequestParameterSet(('mid'))) {
 
 // Run SQL query for normal mails
 $result_list = SQL_QUERY($sql, __FILE__, __LINE__);
-if ((!empty($SQL2)) && ($WHO == getMessage('_ALL'))) $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
+if ((!empty($SQL2)) && (empty($WHO))) $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
 
 // Calculate pages
-$PAGES = '0';
+$numPages = '0';
 if (isConfigEntrySet('mails_page')) {
-       $PAGES = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.3);
+       $numPages = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.3);
 } // END - if
 
 // Free result
 SQL_FREERESULT($result_normal);
 
 $MAIL = false;
-if (SQL_NUMROWS($result_list) > 0) {
+if (!SQL_HASZERONUMS($result_list)) {
        // Init rows
        $OUT = '';
 
@@ -176,8 +183,7 @@ if (SQL_NUMROWS($result_list) > 0) {
        SQL_FREERESULT($result_list);
 
        // Add navigation (with change box and colspan=3)
-       $content['nav'] = '';
-       if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, 3, true);
+       $content['nav'] = addEmailNavigation($numPages, getConfig('mails_page'), false, 3, true);
 
        // Prepare content
        $content['rows'] = $OUT;
@@ -187,17 +193,17 @@ if (SQL_NUMROWS($result_list) > 0) {
        loadTemplate('admin_list_emails', false, $content);
 
        $MAIL = true;
-       if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
-               // Check only if bonus extension is active
-               if (SQL_NUMROWS($result_bonus) > 0) outputHtml('<br /><br />');
+       if ((isExtensionActive('bonus')) && (empty($WHO))) {
+               // Only check if bonus extension is active
+               if (!SQL_HASZERONUMS($result_bonus)) outputHtml('<br /><br />');
        } // END - if
 }
 
-if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
+if ((isExtensionActive('bonus')) && (empty($WHO))) {
        // Load bonus mails only when extension is active
-       if (SQL_NUMROWS($result_bonus) > 0) {
+       if (!SQL_HASZERONUMS($result_bonus)) {
                // Calculate pages
-               $PAGES = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
+               $numPages = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
 
                // List emails
                $OUT = '';
@@ -213,8 +219,7 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
                } // END - while
 
                // Add navigation (without change box but with colspan=3)
-               $content['nav'] = '';
-               if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, 3, true);
+               $content['nav'] = addEmailNavigation($numPages, getConfig('mails_page'), false, 3, true);
 
                // Prepare content
                $content['rows'] = $OUT;
@@ -227,7 +232,7 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
 
 if ($MAIL === false) {
        // No mail orders fond
-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
 } // END - if
 
 // [EOF]