Huge rewrite of default parameters, ext-network continued:

[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 dada51d2cb9a6c7df79a35286a06f64bdf213be2..dd35fd9979ac405f937cf5c2e1e15cfc7684c5c0 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -98,7 +98,7 @@ ORDER BY timestamp DESC";
 $result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Set offset an current page to default values
-if (!isGetRequestElementSet('page')) setRequestGetElement('page', '1');
+if (!isGetRequestElementSet('page')) setRequestGetElement('page', 1);
 
 if (!isGetRequestElementSet('offset')) {
        if (isConfigEntrySet('mails_page')) {
@@ -127,7 +127,7 @@ $result_list = SQL_QUERY($sql, __FILE__, __LINE__);
 if ((!empty($SQL2)) && ($WHO == getMessage('_ALL'))) $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
 
 // Calculate pages
-$PAGES = 0;
+$PAGES = '0';
 if (isConfigEntrySet('mails_page')) {
        $PAGES = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.3);
 } // END - if
@@ -155,7 +155,7 @@ if (SQL_NUMROWS($result_list) > 0) {
                        $pool['unconfirmed'] = "<strong><a href=\"{?URL?}/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool['id']."\">".$pool['unconfirmed']."</a></strong>";
                } elseif ($pool['unconfirmed'] < 0) {
                        // Sometimes rarely displayed minus values will be "fixed" to zero
-                       $pool['unconfirmed'] = 0;
+                       $pool['unconfirmed'] = '0';
                }
 
                // Prepare content
@@ -163,10 +163,10 @@ if (SQL_NUMROWS($result_list) > 0) {
                $content['sender_link'] = generateUserProfileLink($pool['sender']);
                $content['payment']     = getPaymentTitlePrice($pool['payment_id']);
                $content['category']    = getCategory($pool['cat_id']);
-               $content['receivers']   = str_replace(';', ", ", $pool['receivers']);
+               $content['receivers']   = convertReceivers($pool['receivers']);
                $content['type']        = translatePoolType($pool['data_type']);
                $content['frametester'] = generateFrametesterUrl($pool['url']);
-               $content['timestamp']   = generateDateTime($pool['timestamp'], '0');
+               $content['timestamp']   = generateDateTime($pool['timestamp'], 0);
 
                // Load row template
                $OUT .= loadTemplate('admin_list_emails_row', true, $content);
@@ -177,7 +177,7 @@ if (SQL_NUMROWS($result_list) > 0) {
 
        // Add navigation (with change box and colspan=3)
        $content['nav'] = '';
-       if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, '3', true);
+       if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, 3, true);
 
        // Prepare content
        $content['rows'] = $OUT;
@@ -190,7 +190,7 @@ if (SQL_NUMROWS($result_list) > 0) {
        if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
                // Check only if bonus extension is active
                if (SQL_NUMROWS($result_bonus) > 0) outputHtml('<br /><br />');
-       }
+       } // END - if
 }
 
 if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
@@ -215,10 +215,10 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
                        $content = $bonus;
                        $content['time']        = createFancyTime($content['time']);
                        $content['category']    = getCategory($content['cat_id']);
-                       $content['receivers']   = str_replace(';', ", ", $content['receivers']);
+                       $content['receivers']   = convertReceivers($content['receivers']);
                        $content['type']        = translatePoolType($content['data_type']);
                        $content['frametester'] = generateFrametesterUrl($content['url']);
-                       $content['timestamp']   = generateDateTime($content['timestamp'], '0');
+                       $content['timestamp']   = generateDateTime($content['timestamp'], 0);
 
                        // Load row template
                        $OUT .= loadTemplate('admin_list_bonus_emails_row', true, $content);
@@ -226,7 +226,7 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
 
                // Add navigation (without change box but with colspan=3)
                $content['nav'] = '';
-               if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, '3', true);
+               if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, 3, true);
 
                // Prepare content
                $content['rows'] = $OUT;