New wrapper functions enableBlockMode() and isBlockModeEnabled() introduced

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

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 78449324e601d0ac5834007b6017014b4bea87d7..b10c723aa538b93a64efd76276ea38c4950bf127 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -41,9 +41,9 @@ 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');
 } elseif ((!EXT_IS_ACTIVE('mailid')) && (!IS_ADMIN())) {
-       LOAD_URL('modules.php?module=login');
+       redirectToUrl('modules.php?module=login');
 }
 
 // Add description as navigation point
@@ -54,8 +54,8 @@ if ((REQUEST_ISSET_GET(('bonusid'))) && (EXT_IS_ACTIVE('bonus'))) {
        // Display bonus mail by loading it's full data
        $result_data = SQL_QUERY_ESC("SELECT id, subject, timestamp, cat_id, points, text, is_notify, data_type, time, url
 FROM `{!_MYSQL_PREFIX!}_bonus`
-WHERE id=%s LIMIT 1",
-               array(bigintval(REQUEST_GET('bonusid'))), __FILE__, __LINE__);
+WHERE `id`=%s LIMIT 1",
+       array(bigintval(REQUEST_GET('bonusid'))), __FILE__, __LINE__);
 
        // Load data
        $content = SQL_FETCHARRAY($result_data);
@@ -63,17 +63,17 @@ WHERE id=%s LIMIT 1",
        // Translate some data
        $content['subject']   = COMPILE_CODE($content['subject']);
        $content['text']      = COMPILE_CODE($content['text']);
-       $content['timestamp'] = MAKE_DATETIME($content['timestamp'], '2');
-       $content['category']  = GET_CATEGORY($content['cat_id']);
-       $content['points']    = TRANSLATE_COMMA($content['points']);
-       $content['is_notify'] = TRANSLATE_YESNO($content['is_notify']);
-       $content['sender']    = _ADMIN_SHORT;
-       $content['time']      = CREATE_FANCY_TIME($content['time']);
+       $content['timestamp'] = generateDateTime($content['timestamp'], '2');
+       $content['category']  = getCategory($content['cat_id']);
+       $content['points']    = translateComma($content['points']);
+       $content['is_notify'] = translateYesNo($content['is_notify']);
+       $content['sender']    = getMessage('_ADMIN_SHORT');
+       $content['time']      = createFancyTime($content['time']);
        $content['uid']       = getUserId();
 
        // Get timestamp from insert
        $content['user_status'] = sprintf(getMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON'),
-               MAKE_DATETIME(USER_STATS_GET_TIMESTAMP('bonusid', $content['id']), '2')
+       generateDateTime(getTimestampFromUserStats('bonusid', $content['id']), '2')
        );
 
        // Display it depending on mail (data) type
@@ -90,7 +90,7 @@ ON s.pool_id=p.id
 LEFT JOIN `{!_MYSQL_PREFIX!}_payments` AS pay
 ON p.payment_id=pay.id
 WHERE s.id=%s LIMIT 1",
-               array(bigintval(REQUEST_GET('mailid'))), __FILE__, __LINE__);
+       array(bigintval(REQUEST_GET('mailid'))), __FILE__, __LINE__);
 
        // Load data
        $content = SQL_FETCHARRAY($result_data);
@@ -98,15 +98,15 @@ WHERE s.id=%s LIMIT 1",
        // Translate some data
        $content['subject']   = COMPILE_CODE($content['subject']);
        $content['text']      = COMPILE_CODE($content['text']);
-       $content['timestamp'] = MAKE_DATETIME($content['timestamp'], '2');
-       $content['category']  = GET_CATEGORY($content['cat_id']);
-       $content['points']    = TRANSLATE_COMMA($content['points']);
-       $content['time']      = CREATE_FANCY_TIME($content['time']);
+       $content['timestamp'] = generateDateTime($content['timestamp'], '2');
+       $content['category']  = getCategory($content['cat_id']);
+       $content['points']    = translateComma($content['points']);
+       $content['time']      = createFancyTime($content['time']);
        $content['uid']       = getUserId();
 
        // Get timestamp from insert
        $content['user_status'] = sprintf(getMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON'),
-               MAKE_DATETIME(USER_STATS_GET_TIMESTAMP('mailid', $content['id']), '2')
+       generateDateTime(getTimestampFromUserStats('mailid', $content['id']), '2')
        );
 
        // Display it depending on mail (data) type
@@ -119,11 +119,11 @@ WHERE s.id=%s LIMIT 1",
 if (EXT_IS_ACTIVE('bonus')) {
        // Load bonus ID
        $result = SQL_QUERY_ESC("SELECT stats_id, bonus_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY bonus_id DESC, stats_id DESC",
-               array(getUserId()), __FILE__, __LINE__);
+       array(getUserId()), __FILE__, __LINE__);
 } else {
        // Don't load bonus ID
        $result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY stats_id DESC",
-               array(getUserId()), __FILE__, __LINE__);
+       array(getUserId()), __FILE__, __LINE__);
 }
 
 // Mails left for confirmation?
@@ -137,26 +137,26 @@ if (SQL_NUMROWS($result) > 0) {
                $cat = ''; $result_data = false;
                switch ($type)
                {
-               case 'NORMAL':
-                       $result_data = SQL_QUERY_ESC("SELECT s.subject, s.timestamp_ordered, s.cat_id, s.payment_id, p.sender
+                       case 'NORMAL':
+                               $result_data = SQL_QUERY_ESC("SELECT s.subject, s.timestamp_ordered, s.cat_id, s.payment_id, p.sender
 FROM `{!_MYSQL_PREFIX!}_user_stats` AS s
 LEFT JOIN `{!_MYSQL_PREFIX!}_pool` AS p
 ON s.pool_id=p.id
 WHERE s.id=%s
 LIMIT 1",
                                array(bigintval($id)), __FILE__, __LINE__);
-                       $type = 'mailid'; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
-                       break;
+                               $type = 'mailid'; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
+                               break;
 
-               case 'BONUS':
-                       $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id, points, 0 FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
+                       case 'BONUS':
+                               $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id, points, 0 FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
                         array(bigintval($id2)), __FILE__, __LINE__);
-                       $type = 'bonusid'; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
-                       break;
+                        $type = 'bonusid'; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
+                        break;
 
-               default: // Unknown type detected!
-                       DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $type));
-                       break;
+                       default: // Unknown type detected!
+                               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $type));
+                               break;
                }
 
                // Data found to this mail?
@@ -193,9 +193,9 @@ LIMIT 1",
                                'type'    => $type,
                                'subject' => $subject,
                                'sender'  => $sender,
-                               'stamp'   => MAKE_DATETIME($timestamp, '2'),
-                               'cat'     => GET_CATEGORY($cat),
-                               'points'  => TRANSLATE_COMMA($pay),
+                               'stamp'   => generateDateTime($timestamp, '2'),
+                               'cat'     => getCategory($cat),
+                               'points'  => translateComma($pay),
                        );
 
                        // Load row template
@@ -234,7 +234,7 @@ LIMIT 1",
        SQL_FREERESULT($result);
 
        // Remember total points
-       define('__TOTAL_POINTS', TRANSLATE_COMMA($sum));
+       define('__TOTAL_POINTS', translateComma($sum));
 
        // Remember all generated rows in constant for the template
        define('__UNCONFIRMED_ROWS', $OUT);