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

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

diff --git a/inc/modules/member/what-doubler.php b/inc/modules/member/what-doubler.php
index 76834e96be1ab4b7c56d535f692b69ef4d3cca2e..0941c4a58dd65deb23193e111b23e138c88f232c 100644 (file)
--- a/inc/modules/member/what-doubler.php
+++ b/inc/modules/member/what-doubler.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');
 } elseif ((!EXT_IS_ACTIVE('doubler')) && (!IS_ADMIN())) {
        addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'doubler'));
        return;
@@ -51,11 +51,11 @@ if (!defined('__SECURITY')) {
 ADD_DESCR('member', __FILE__);
 
 // Percent values etc.
-define('__CHARGE_VALUE', TRANSLATE_COMMA(getConfig('doubler_charge') * 100));
-define('__REF_VALUE'   , TRANSLATE_COMMA(getConfig('doubler_ref') * 100));
-define('__TOTAL_VALUE' , TRANSLATE_COMMA(getConfig('doubler_points')));
-define('__MIN_VALUE'   , TRANSLATE_COMMA(getConfig('doubler_min')));
-define('__MAX_VALUE'   , TRANSLATE_COMMA(getConfig('doubler_max')));
+define('__CHARGE_VALUE', translateComma(getConfig('doubler_charge') * 100));
+define('__REF_VALUE'   , translateComma(getConfig('doubler_ref') * 100));
+define('__TOTAL_VALUE' , translateComma(getConfig('doubler_points')));
+define('__MIN_VALUE'   , translateComma(getConfig('doubler_min')));
+define('__MAX_VALUE'   , translateComma(getConfig('doubler_max')));
 
 // Transfer referal ID
 if (EXT_IS_ACTIVE('nickname')) {
@@ -75,7 +75,7 @@ if (EXT_IS_ACTIVE('nickname')) {
 }
 
 // Usage counter
-define('__DOUBLER_COUNTER', TRANSLATE_COMMA(getConfig('doubler_counter')));
+define('__DOUBLER_COUNTER', translateComma(getConfig('doubler_counter')));
 
 // Which mail-send-mode did the admin setup?
 switch (getConfig('doubler_send_mode')) {
@@ -94,19 +94,19 @@ default:
 }
 
 // Generate table with already payed out doubles
-define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE(getUserId(), "Y", "N", "DESC"));
+define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE(getUserId(), 'Y', 'N', "DESC"));
 
 // Generate table with next-to-run payouts
 define('__DOUBLER_PAYOUT_NEXT', DOUBLER_GENERATE_TABLE(getUserId()));
 
 // Generate table with refferal payouts
-define('__DOUBLER_PAYOUT_REF', DOUBLER_GENERATE_TABLE(getUserId(), "N", "Y", "DESC"));
+define('__DOUBLER_PAYOUT_REF', DOUBLER_GENERATE_TABLE(getUserId(), 'N', 'Y', "DESC"));
 
 // Generate timemark
-define('__TIMEOUT_MARK', CREATE_FANCY_TIME(getConfig('doubler_timeout')));
+define('__TIMEOUT_MARK', createFancyTime(getConfig('doubler_timeout')));
 
 // Points left to double
-define('__LEFT_VALUE', TRANSLATE_COMMA(DOUBLER_GET_TOTAL_POINTS_LEFT()));
+define('__LEFT_VALUE', translateComma(DOUBLER_GET_TOTAL_POINTS_LEFT()));
 
 // Load template
 LOAD_TEMPLATE("member_doubler");