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 c761546c94d512b27e7dfaad86de1d683ced90e1..0e5023dc8e9e9924183d318278ae0ba2efec060b 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -65,7 +65,7 @@ WHERE
 ORDER BY
        `timestamp` DESC";
 
-$WHO = '{--_ALL--}';
+$WHO = '';
 $SQL2 = '';
 
 if (isGetRequestParameterSet(('mid'))) {
@@ -98,7 +98,7 @@ ORDER BY
 // Init result_bonus
 $result_bonus = false;
 
-if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
+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`
@@ -141,7 +141,7 @@ 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
 $numPages = '0';
@@ -153,7 +153,7 @@ if (isConfigEntrySet('mails_page')) {
 SQL_FREERESULT($result_normal);
 
 $MAIL = false;
-if (SQL_NUMROWS($result_list) > 0) {
+if (!SQL_HASZERONUMS($result_list)) {
        // Init rows
        $OUT = '';
 
@@ -193,15 +193,15 @@ if (SQL_NUMROWS($result_list) > 0) {
        loadTemplate('admin_list_emails', false, $content);
 
        $MAIL = true;
-       if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
+       if ((isExtensionActive('bonus')) && (empty($WHO))) {
                // Only check if bonus extension is active
-               if (SQL_NUMROWS($result_bonus) > 0) outputHtml('<br /><br />');
+               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
                $numPages = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);