New extension added, more EL-rewrites, naming-convention applied:

[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..9f0435abfbe0c703f5a20ece651656dc01453ea4 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -91,6 +91,9 @@ ORDER BY
        $WHO = getMessage('USER_ID') . ': ' . getRequestParameter('userid');
 }
 
+// Init result_bonus
+$result_bonus = false;
+
 if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
        // Check for maximum pages
        $result_bonus = SQL_QUERY("SELECT
@@ -137,9 +140,9 @@ $result_list = SQL_QUERY($sql, __FILE__, __LINE__);
 if ((!empty($SQL2)) && ($WHO == getMessage('_ALL'))) $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
@@ -176,8 +179,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;
@@ -188,7 +190,7 @@ if (SQL_NUMROWS($result_list) > 0) {
 
        $MAIL = true;
        if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
-               // Check only if bonus extension is active
+               // Only check if bonus extension is active
                if (SQL_NUMROWS($result_bonus) > 0) outputHtml('<br /><br />');
        } // END - if
 }
@@ -197,7 +199,7 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
        // Load bonus mails only when extension is active
        if (SQL_NUMROWS($result_bonus) > 0) {
                // 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 +215,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;