Previous fix fixed, a lot constants rewritten (unfinished)

[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 7d1d6522171eb8a3d785b53802dbf08b1ae013cd..a2193ec131550c4fa45cd7ebe5fe8a60d7fe8de4 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -48,36 +48,33 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Normal mails ordered by your members
 //              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
+FROM `{!_MYSQL_PREFIX!}_pool`
 WHERE data_type IN('ADMIN','TEMP','NEW','ACTIVE')
 ORDER BY timestamp DESC";
 
 $WHO = _ALL;
 $SQL2 = "";
 
-if (!empty($_GET['mid']))
-{
+if (!empty($_GET['mid'])) {
        // Only a specific mail shall be displayed
        //              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
+        FROM `{!_MYSQL_PREFIX!}_pool`
         WHERE id='".bigintval($_GET['mid'])."'
         LIMIT 1";
        $WHO = MAIL_ID.": ".$_GET['mid'];
-}
- elseif (!empty($_GET['u_id']))
-{
+} elseif (!empty($_GET['u_id'])) {
        // All mails by a specific member shall be displayed
        //              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 sender='".bigintval($_GET['u_id'])."'
-        ORDER by timestamp DESC";
+FROM `{!_MYSQL_PREFIX!}_pool`
+WHERE sender='".bigintval($_GET['u_id'])."'
+ORDER by timestamp DESC";
        $WHO = USER_ID.": ".$_GET['u_id'];
 }
 
@@ -85,9 +82,9 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
        // Bonus mails sent by you
        //               0     1       2        3        4      5       6          7       8      9         10          11        12
        $SQL2 = "SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, clicks
-       FROM "._MYSQL_PREFIX."_bonus
-       WHERE is_notify='N'
-       ORDER BY timestamp DESC";
+FROM `{!_MYSQL_PREFIX!}_bonus`
+WHERE is_notify='N'
+ORDER BY timestamp DESC";
 
        // Check for maximum pages
        $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
@@ -98,11 +95,10 @@ $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'] = $_CONFIG['mails_page'];
+if (empty($_GET['offset'])) $_GET['offset'] = getConfig('mails_page');
 
 // Add limitation to SQL string
-if (empty($_GET['mid']))
-{
+if (empty($_GET['mid'])) {
        // Create limitation line
        $ADD = " LIMIT ".(bigintval($_GET['offset']) * bigintval($_GET['page']) - bigintval($_GET['offset'])).", ".bigintval($_GET['offset']);
 
@@ -111,14 +107,14 @@ if (empty($_GET['mid']))
 
        // For bonus mails
        if (!empty($SQL2)) $SQL2 .= $ADD;
-}
+} // END - if
 
 // Run SQL query for normal mails
 $result_list = SQL_QUERY($SQL, __FILE__, __LINE__);
 if ((!empty($SQL2)) && ($WHO == _ALL)) $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
 
 // Calculate pages
-$PAGES = round(SQL_NUMROWS($result_normal) / $_CONFIG['mails_page'] + 0.3);
+$PAGES = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.3);
 SQL_FREERESULT($result_normal);
 
 $MAIL = false;
@@ -129,7 +125,7 @@ if (SQL_NUMROWS($result_list) > 0) {
        // Walk through all entries
        while ($pool = SQL_FETCHARRAY($result_list)) {
                // Unconfirmed mails and sent mails
-               $result_uncon = SQL_QUERY_ESC("SELECT max_rec, clicks FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s LIMIT 1",
+               $result_uncon = SQL_QUERY_ESC("SELECT max_rec, clicks FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
                 array(bigintval($pool['id'])), __FILE__, __LINE__);
                list($pool['sent_email'], $pool['clicks']) = SQL_FETCHROW($result_uncon);
                SQL_FREERESULT($result_uncon);
@@ -138,7 +134,7 @@ if (SQL_NUMROWS($result_list) > 0) {
                $pool['unconfirmed'] = $pool['sent_email'] - $pool['clicks'];
                if ($pool['unconfirmed'] > 0) {
                        // Add link to list_unconfirmed what-file
-                       $pool['unconfirmed'] = "<STRONG><A href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool['id']."\">".$pool['unconfirmed']."</A></STRONG>";
+                       $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;
@@ -166,7 +162,7 @@ if (SQL_NUMROWS($result_list) > 0) {
 
        // Add navigation (with change box and colspan=3)
        $content['nav'] = "";
-       if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3", true);
+       if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), false, "3", true);
 
        // Prepare content
        $content['rows'] = $OUT;
@@ -186,7 +182,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
        // Load bonus mails only when extension is active
        if (SQL_NUMROWS($result_bonus) > 0) {
                // Calculate pages
-               $PAGES = round(SQL_NUMROWS($result_bonus) / $_CONFIG['mails_page'] + 0.5);
+               $PAGES = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
 
                // List emails
                $OUT = ""; $content = array();
@@ -197,7 +193,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
                        // Add link?
                        if ($bonus['unconfirmed'] > 0) {
                                // Add link to list_unconfirmed what-file
-                               $bonus['unconfirmed'] = "<STRONG><A href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</A></STRONG>";
+                               $bonus['unconfirmed'] = "<strong><a href=\"{!URL!}/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</a></strong>";
                        } // END - if
 
                        // Prepare content
@@ -211,11 +207,11 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
 
                        // Load row template
                        $OUT .= LOAD_TEMPLATE("admin_list_bonus_emails_row", true, $content);
-               }
+               } // END - while
 
                // Add navigation (without change box but with colspan=3)
                $content['nav'] = "";
-               if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3", true);
+               if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), false, "3", true);
 
                // Prepare content
                $content['rows'] = $OUT;
@@ -223,13 +219,13 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
                // Load main template
                LOAD_TEMPLATE("admin_list_bonus_emails", false, $content);
                $MAIL = true;
-       }
-}
+       } // END - if
+} // END - if
 
 if (!$MAIL) {
        // No mail orders fond
-       OUTPUT_HTML("<SPAN class=\"admin_failed\">".ADMIN_NO_MAILS_IN_POOL."</SPAN>");
-}
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+} // END - if
 
 //
 ?>