New wrapper functions enableBlockMode() and isBlockModeEnabled() introduced

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

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index a1840572702d3317594969c0f0cbacbe288c56a5..0624cd4f2fdb7da4b039e5a2d460daeac4ff6243 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.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
@@ -80,7 +80,7 @@ while ($content = SQL_FETCHARRAY($result_depths)) {
 
        // Load referal counts
        $result_refs = SQL_QUERY_ESC("SELECT counter FROM `{!_MYSQL_PREFIX!}_refsystem` WHERE userid=%s AND level='%s' LIMIT 1",
-               array(getUserId(), bigintval($content['level'])), __FILE__, __LINE__);
+       array(getUserId(), bigintval($content['level'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_refs) == 1) {
                list($REFS) = SQL_FETCHROW($result_refs);
                SQL_FREERESULT($result_refs);
@@ -92,9 +92,9 @@ while ($content = SQL_FETCHARRAY($result_depths)) {
        // Transfer data to array for template
        $content = array(
                'lvl'    => $content['level'],
-               'per'    => TRANSLATE_COMMA($content['percents']),
-               'points' => TRANSLATE_COMMA($points),
-               'refs'   => TRANSLATE_COMMA($REFS),
+               'per'    => translateComma($content['percents']),
+               'points' => translateComma($points),
+               'refs'   => translateComma($REFS),
        );
 
        // Output row
@@ -108,7 +108,7 @@ SQL_FREERESULT($result_depths);
 define('__REF_LEVEL_ROWS', $OUT);
 
 $result = SQL_QUERY_ESC("SELECT used_points, ref_payout FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-       array(getUserId()), __FILE__, __LINE__);
+array(getUserId()), __FILE__, __LINE__);
 list($USED, $PAY) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
@@ -134,13 +134,13 @@ if (GET_EXT_VERSION('user') >= '0.1.2') {
 }
 
 // If TLOCK is 0 add 3 zeros for floating
-if ($TLOCK == "0") $TLOCK = "0.00000";
+if ($TLOCK == '0') $TLOCK = "0.00000";
 
 // Remember several values in constants
-define('__USED_VALUE' , TRANSLATE_COMMA($USED));
-define('__TPTS_VALUE' , TRANSLATE_COMMA($TPTS - $USED));
+define('__USED_VALUE' , translateComma($USED));
+define('__TPTS_VALUE' , translateComma($TPTS - $USED));
 define('__TREF_VALUE' , $TREF);
-define('__TLOCK_VALUE', TRANSLATE_COMMA($TLOCK));
+define('__TLOCK_VALUE', translateComma($TLOCK));
 
 // Fixes a bug when there is no bonus extension installed
 if (EXT_VERSION_IS_OLDER('bonus', '0.4.4')) setConfigEntry('bonus_active', "X");
@@ -152,25 +152,25 @@ if ((GET_EXT_VERSION('bonus') >= '0.2.2') && (EXT_IS_ACTIVE('bonus')) && (getCon
 
        // Load data
        $result = SQL_QUERY_ESC("SELECT login_bonus, turbo_bonus".$add." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-               array(getUserId()), __FILE__, __LINE__);
+       array(getUserId()), __FILE__, __LINE__);
 
        // We don't add this points now. This will be done after each month
        list($login, $turbo, $ref, $order, $stats) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
        // Prepare constants
-       define('__TURBO_VALUE',  TRANSLATE_COMMA($turbo));
-       define('__LOGIN_VALUE',  TRANSLATE_COMMA($login));
+       define('__TURBO_VALUE',  translateComma($turbo));
+       define('__LOGIN_VALUE',  translateComma($login));
 
        if (GET_EXT_VERSION('bonus') >= '0.4.4') {
                // Add referal, stats and order bonys
-               define('__REF_VALUE'  ,  TRANSLATE_COMMA($ref));
-               define('__ORDER_VALUE',  TRANSLATE_COMMA($order));
-               define('__STATS_VALUE',  TRANSLATE_COMMA($stats));
+               define('__REF_VALUE'  ,  translateComma($ref));
+               define('__ORDER_VALUE',  translateComma($order));
+               define('__STATS_VALUE',  translateComma($stats));
        }
 
        // Total bonus points
-       define('__TTOTAL_VALUE', TRANSLATE_COMMA($turbo + $login + $ref + $order + $stats));
+       define('__TTOTAL_VALUE', translateComma($turbo + $login + $ref + $order + $stats));
 
        // Output rows
        define('__SPECIAL_ROWS', LOAD_TEMPLATE("member_points_bonus_rows", true));
@@ -197,7 +197,7 @@ if (EXT_IS_ACTIVE('user')) {
        LOAD_TEMPLATE("member_points");
 } elseif (IS_ADMIN()) {
        // Missing extension
-       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'user'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('user'));
 } else {
        // Message for user
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('PROBLEM_POINTS_OVERVIEW_UNAVAILABLE'));
@@ -205,7 +205,7 @@ if (EXT_IS_ACTIVE('user')) {
 
 if (EXT_IS_ACTIVE('payout')) {
        // Payput extension is installed and active so we can check if the user has enougth points
-       PAYOUT_OUTPUT_PAYOUT_LIST(REVERT_COMMA(($TPTS - $USED)));
+       PAYOUT_OUTPUT_PAYOUT_LIST(convertCommaToDot(($TPTS - $USED)));
 }
 
 //