More misc fixes and rewrites (sorry, lame description)

[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 3e9cf6770b5b0d22148e1262eb018a1fa36d97ac..083402062f66e90aa288f87f3380cbda3fd0c0b4 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -41,7 +41,7 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
@@ -51,15 +51,15 @@ 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`
- WHERE data_type='SEND' OR data_type='DELETED'
+ WHERE `data_type`='SEND' OR `data_type`='DELETED'
  ORDER BY timestamp DESC";
 
 // Check for maximum pages
 $result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Set offset an current page to default values
-if (!REQUEST_ISSET_GET(('page')))   REQUEST_GET('page')   = "1";
-if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', getConfig('mails_page'));
+if (!REQUEST_ISSET_GET('page'))   REQUEST_SET_GET('page'  , '1');
+if (!REQUEST_ISSET_GET('offset')) REQUEST_SET_GET('offset', getConfig('mails_page'));
 
 // Add limitation to SQL string
 $sql .= " LIMIT ".(REQUEST_GET('offset') * REQUEST_GET('page') - REQUEST_GET('offset')).", ".REQUEST_GET('offset');
@@ -71,35 +71,29 @@ $result = SQL_QUERY($sql, __FILE__, __LINE__);
 $PAGES = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.5);
 SQL_FREERESULT($result_normal);
 
-if (SQL_NUMROWS($result) > 0)
-{
+if (SQL_NUMROWS($result) > 0) {
        // Mail orders are in pool so we can display them
 
        // Add navigation table rows
-       if ($PAGES > 1)
-       {
-               define('__TOP_EMAIL_NAV'   , ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), true , "3", true));
-               define('__BOTTOM_EMAIL_NAV', ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), false, "3", true));
-       }
-        else
-       {
+       if ($PAGES > 1) {
+               define('__TOP_EMAIL_NAV'   , ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), true , '3', true));
+               define('__BOTTOM_EMAIL_NAV', ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), false, '3', true));
+       } else {
                define('__TOP_EMAIL_NAV'   , '');
                define('__BOTTOM_EMAIL_NAV', '');
        }
 
        $OUT = ''; $SW = 2;
-       while ($pool = SQL_FETCHROW($result))
-       {
+       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",
-                array(bigintval($pool[0])), __FILE__, __LINE__);
+               array(bigintval($pool[0])), __FILE__, __LINE__);
                list($sent, $clicks) = SQL_FETCHROW($result_mails);
                SQL_FREERESULT($result_mails);
 
                // Unconfirmed mails
                $unconfirmed = $sent - $clicks;
-               if ($unconfirmed > 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>";
                }
@@ -107,19 +101,19 @@ if (SQL_NUMROWS($result) > 0)
                // Prepare data for the row template
                $content = array(
                        'sw'          => $SW,
-                       'u_link'      => ADMIN_USER_PROFILE_LINK($pool[1]),
+                       'u_link'      => generateUserProfileLink($pool[1]),
                        'subj'        => COMPILE_CODE($pool[2]),
                        'text'        => COMPILE_CODE($pool[3]),
-                       'pay'         => GET_PAYMENT($pool[5]),
-                       'cat'         => GET_CATEGORY($pool[10]),
+                       'pay'         => getPaymentTitlePrice($pool[5]),
+                       'cat'         => getCategory($pool[10]),
                        'sent'        => $sent,
                        'ruids'       => str_replace(';', ", ", $pool[4]),
                        'unconfirmed' => $unconfirmed,
-                       'type'        => TRANSLATE_POOL_TYPE($pool[6]),
+                       'type'        => translatePoolType($pool[6]),
                        'tsend'       => $pool[9],
                        'frametester' => FRAMETESTER($pool[8]),
                        'url'         => COMPILE_CODE($pool[8]),
-                       'stamp'       => MAKE_DATETIME($pool[7], "0"),
+                       'stamp'       => generateDateTime($pool[7], '0'),
                        'mid'         => $pool[0],
                );
 
@@ -138,5 +132,6 @@ if (SQL_NUMROWS($result) > 0)
        // No mail orders fond
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
 }
+
 //
 ?>