A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

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

diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index cde9710ce303b01007c1a540376a3cf07187b38f..a7f26f043b431cd928bea2a2d0c14d5883a3c869 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -44,23 +44,23 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 //             0     1        2      3        4          5           6          7      8         9        10
-$SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
- FROM "._MYSQL_PREFIX."_pool
+$sql = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
+ FROM `{!_MYSQL_PREFIX!}_pool`
  WHERE data_type='SEND' OR data_type='DELETED'
  ORDER BY timestamp DESC";
 
 // Check for maximum pages
-$result_normal = SQL_QUERY($SQL, __FILE__, __LINE__);
+$result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Set offset an current page to default values
-if (empty($_GET['page']))   $_GET['page']   = "1";
-if (empty($_GET['offset'])) $_GET['offset'] = getConfig('mails_page');
+if (!REQUEST_ISSET_GET(('page')))   REQUEST_GET('page')   = "1";
+if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', getConfig('mails_page'));
 
 // Add limitation to SQL string
-$SQL .= " LIMIT ".($_GET['offset'] * $_GET['page'] - $_GET['offset']).", ".$_GET['offset'];
+$sql .= " LIMIT ".(REQUEST_GET('offset') * REQUEST_GET('page') - REQUEST_GET('offset')).", ".REQUEST_GET('offset');
 
 // Run SQL query for normal mails
-$result = SQL_QUERY($SQL, __FILE__, __LINE__);
+$result = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Calculate pages
 $PAGES = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.5);
@@ -82,11 +82,11 @@ if (SQL_NUMROWS($result) > 0)
                define('__BOTTOM_EMAIL_NAV', "");
        }
 
-       $SW = 2; $OUT = "";
+       $OUT = ""; $SW = 2;
        while ($pool = SQL_FETCHROW($result))
        {
                // Check sent mails and clicks
-               $result_mails = SQL_QUERY_ESC("SELECT max_rec, clicks FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s LIMIT 1",
+               $result_mails = SQL_QUERY_ESC("SELECT max_rec, clicks FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
                 array(bigintval($pool[0])), __FILE__, __LINE__);
                list($sent, $clicks) = SQL_FETCHROW($result_mails);
                SQL_FREERESULT($result_mails);
@@ -96,7 +96,7 @@ if (SQL_NUMROWS($result) > 0)
                if ($unconfirmed > 0)
                {
                        // Add link to list_unconfirmed what-file
-                       $unconfirmed = "<strong><a href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool[0]."\">".$unconfirmed."</a></strong>";
+                       $unconfirmed = "<strong><a href=\"{!URL!}/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool[0]."\">".$unconfirmed."</a></strong>";
                }
 
                // Prepare data for the row template
@@ -131,7 +131,7 @@ if (SQL_NUMROWS($result) > 0)
        LOAD_TEMPLATE("admin_email_archiv");
 } else {
        // No mail orders fond
-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MAILS_IN_POOL);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
 }
 //
 ?>