Fixes for broken installation routine

[mailer.git] / inc / modules / member / what-stats.php

diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php
index 6f740bf7f212efdee773fdef491cd765d136897d..739b83a55b0f262415df34f32587e20933921bc6 100644 (file)
--- a/inc/modules/member/what-stats.php
+++ b/inc/modules/member/what-stats.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL('modules.php?module=index');
+       redirectToUrl('modules.php?module=index');
 }
 
 // Add description as navigation point
@@ -55,7 +55,7 @@ $result = SQL_QUERY_ESC("SELECT id, cat_id, payment_id, subject, url, timestamp,
 FROM `{!_MYSQL_PREFIX!}_pool`
 WHERE sender=%s AND data_type != 'SEND'
 ORDER BY timestamp DESC",
-       array(getUserId()), __FILE__, __LINE__);
+array(getUserId()), __FILE__, __LINE__);
 
 // Are there mails left in pool?
 if (SQL_NUMROWS($result) > 0) {
@@ -63,19 +63,19 @@ if (SQL_NUMROWS($result) > 0) {
        $OUT = ''; $SW = 2;
        while ($data = SQL_FETCHARRAY($result)) {
                // Is the ZIP code set? If not, set dashes
-               if (empty($data['zip'])) $data['zip'] =  "---";
+               if (empty($data['zip'])) $data['zip'] =  '---';
 
                // Prepare content for output
                $content = array(
                        'sw'    => $SW,
                        'id'    => $data['id'],
-                       'cat'   => GET_CATEGORY($data['cat_id']),
-                       'pay'   => GET_PAYMENT($data['payment_id']),
+                       'cat'   => getCategory($data['cat_id']),
+                       'pay'   => getPaymentTitlePrice($data['payment_id']),
                        'subj'  => COMPILE_CODE($data['subject']),
                        'url'   => DEREFERER($data['url']),
-                       'stamp' => MAKE_DATETIME($data['timestamp'], "2"),
+                       'stamp' => generateDateTime($data['timestamp'], '2'),
                        'recs'  => $data['target_send'],
-                       'type'  => TRANSLATE_POOL_TYPE($data['data_type']),
+                       'type'  => translatePoolType($data['data_type']),
                        'zip'   => $data['zip']
                );
 
@@ -102,7 +102,7 @@ $result = SQL_QUERY_ESC("SELECT id, cat_id, payment_id, subject, url, timestamp_
 FROM `{!_MYSQL_PREFIX!}_user_stats`
 WHERE userid=%s
 ORDER BY timestamp_ordered DESC",
-       array(getUserId()), __FILE__, __LINE__);
+array(getUserId()), __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) > 0) {
        // Mail orders are in pool so we can display them
@@ -111,13 +111,13 @@ if (SQL_NUMROWS($result) > 0) {
                // Prepare data for the template
                $content = array(
                        'sw'    => $SW,
-                       'cat'   => GET_CATEGORY($data[1]),
-                       'pay'   => GET_PAYMENT($data[2]),
+                       'cat'   => getCategory($data[1]),
+                       'pay'   => getPaymentTitlePrice($data[2]),
                        'subj'  => COMPILE_CODE($data[3]),
                        'url'   => DEREFERER($data[4]),
-                       'stamp' => MAKE_DATETIME($data[5], "2"),
+                       'stamp' => generateDateTime($data[5], '2'),
                        'recs'  => $data[6],
-                       'sent'  => MAKE_DATETIME($data[7], "2"),
+                       'sent'  => generateDateTime($data[7], '2'),
                        'clix'  => $data[8],
                        'perc'  => COMPILE_CODE($data[8] / $data[6] * 100)."%",
                );