New naming convention applied to many functions, see #118 for details

[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 88c24a0096b11b9801ce64a81300cd16eb8e30ad..8b1a87da3ac879b3230baca3c43988f69943f2b8 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -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')) {
@@ -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);
@@ -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);