Some fixes for surfbar extension (#123), double->single, misc cleanups/fixes

[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 da4610be15534c9ed240c86131edfd97722ca155..0b2fe94e44d0d9a6514b5accc1f2e8bd598656b1 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -48,7 +48,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);
 }
 
@@ -70,7 +70,7 @@ if (REQUEST_ISSET_GET(('mid'))) {
        //              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 id='".bigintval(REQUEST_GET('mid'))."'
+        WHERE `id`='".bigintval(REQUEST_GET('mid'))."'
         LIMIT 1";
        $WHO = MAIL_ID.": ".REQUEST_GET('mid');
 } elseif (REQUEST_ISSET_GET('uid')) {
@@ -99,7 +99,7 @@ ORDER BY timestamp DESC";
 $result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Set offset an current page to default values
-if (!REQUEST_ISSET_GET('page')) REQUEST_SET_GET('page', "1");
+if (!REQUEST_ISSET_GET('page')) REQUEST_SET_GET('page', '1');
 
 if (!REQUEST_ISSET_GET('offset')) {
        if (isConfigEntrySet('mails_page')) {
@@ -145,7 +145,7 @@ if (SQL_NUMROWS($result_list) > 0) {
        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",
-                array(bigintval($pool['id'])), __FILE__, __LINE__);
+               array(bigintval($pool['id'])), __FILE__, __LINE__);
                list($pool['sent_email'], $pool['clicks']) = SQL_FETCHROW($result_uncon);
                SQL_FREERESULT($result_uncon);
 
@@ -161,16 +161,16 @@ if (SQL_NUMROWS($result_list) > 0) {
 
                // Prepare content
                $content = $pool;
-               $content['sender_link'] = ADMIN_USER_PROFILE_LINK($pool['sender']);
+               $content['sender_link'] = generateUserProfileLink($pool['sender']);
                $content['subject']     = COMPILE_CODE($pool['subject']);
                $content['text']        = COMPILE_CODE($pool['text']);
-               $content['payment']     = GET_PAYMENT($pool['payment_id']);
-               $content['category']    = GET_CATEGORY($pool['cat_id']);
+               $content['payment']     = getPaymentTitlePrice($pool['payment_id']);
+               $content['category']    = getCategory($pool['cat_id']);
                $content['receivers']   = str_replace(';', ", ", $pool['receivers']);
-               $content['type']        = TRANSLATE_POOL_TYPE($pool['data_type']);
+               $content['type']        = translatePoolType($pool['data_type']);
                $content['frametester'] = FRAMETESTER($pool['url']);
                $content['url']         = COMPILE_CODE($pool['url']);
-               $content['timestamp']   = MAKE_DATETIME($pool['timestamp'], "0");
+               $content['timestamp']   = generateDateTime($pool['timestamp'], '0');
 
                // Load row template
                $OUT .= LOAD_TEMPLATE("admin_list_emails_row", true, $content);
@@ -181,7 +181,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, getConfig('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;
@@ -217,12 +217,12 @@ if ((EXT_IS_ACTIVE('bonus')) && ($WHO == _ALL)) {
 
                        // Prepare content
                        $content = $bonus;
-                       $content['time']        = CREATE_FANCY_TIME($content['time']);
-                       $content['category']    = GET_CATEGORY($content['cat_id']);
+                       $content['time']        = createFancyTime($content['time']);
+                       $content['category']    = getCategory($content['cat_id']);
                        $content['receivers']   = str_replace(';', ", ", $content['receivers']);
-                       $content['type']        = TRANSLATE_POOL_TYPE($content['data_type']);
+                       $content['type']        = translatePoolType($content['data_type']);
                        $content['frametester'] = FRAMETESTER($content['url']);
-                       $content['timestamp']   = MAKE_DATETIME($content['timestamp'], "0");
+                       $content['timestamp']   = generateDateTime($content['timestamp'], '0');
 
                        // Load row template
                        $OUT .= LOAD_TEMPLATE("admin_list_bonus_emails_row", true, $content);
@@ -230,7 +230,7 @@ if ((EXT_IS_ACTIVE('bonus')) && ($WHO == _ALL)) {
 
                // Add navigation (without change box but with colspan=3)
                $content['nav'] = '';
-               if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, getConfig('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;