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

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

diff --git a/inc/modules/member/what-surfbar_start.php b/inc/modules/member/what-surfbar_start.php
index f81baeaff7af69b69e1ec4724b528d3107d1ab2f..7f95a74b2752f642698ee4ef55aa97c66c81028e 100644 (file)
--- a/inc/modules/member/what-surfbar_start.php
+++ b/inc/modules/member/what-surfbar_start.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        // Not logged in
-       LOAD_URL('modules.php?module=index');
+       redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('surfbar')) && (!IS_ADMIN())) {
        addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'surfbar'));
        return;
@@ -53,36 +53,36 @@ ADD_DESCR('member', __FILE__);
 
 // Prepare content for output
 $content = array(
-       'surfbar_static_reward' => TRANSLATE_COMMA(getConfig('surfbar_static_reward')),
-       'surfbar_static_time'   => CREATE_FANCY_TIME(getConfig('surfbar_static_time')),
-       'surfbar_static_lock'   => CREATE_FANCY_TIME(getConfig('surfbar_static_lock')),
-       'surfbar_total_urls'    => SURFBAR_GET_TOTAL_URLS("ACTIVE", "0")
+       'surfbar_static_reward' => translateComma(getConfig('surfbar_static_reward')),
+       'surfbar_static_time'   => createFancyTime(getConfig('surfbar_static_time')),
+       'surfbar_static_lock'   => createFancyTime(getConfig('surfbar_static_lock')),
+       'surfbar_total_urls'    => SURFBAR_GET_TOTAL_URLS('ACTIVE', '0')
 );
 
 // In dynamic mode we need some more data
-if (getConfig('surfbar_pay_model') == "DYNAMIC") {
+if (getConfig('surfbar_pay_model') == 'DYNAMIC') {
        // Total URLs
        $content = array(
-               'surfbar_dynamic_percent' => TRANSLATE_COMMA(getConfig('surfbar_dynamic_percent')),
-               'surfbar_total_urls'      => SURFBAR_GET_TOTAL_URLS("ACTIVE", "0"),
+               'surfbar_dynamic_percent' => translateComma(getConfig('surfbar_dynamic_percent')),
+               'surfbar_total_urls'      => SURFBAR_GET_TOTAL_URLS('ACTIVE', '0'),
                'surfbar_user_urls'       => SURFBAR_GET_TOTAL_USER_URLS(),
                'surfbar_total_online'    => SURFBAR_DETERMINE_TOTAL_ONLINE(),
-               'surfbar_total_users'     => TRANSLATE_COMMA(GET_TOTAL_DATA("CONFIRMED", "user_data", 'userid', "status", true)),
-               'surfbar_min_reward'      => TRANSLATE_COMMA(SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE()),
-               'surfbar_max_reward'      => TRANSLATE_COMMA(SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE()),
-               'surfbar_min_time'        => CREATE_FANCY_TIME(SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE()),
-               'surfbar_max_time'        => CREATE_FANCY_TIME(SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE()),
-               'surfbar_dynamic_lock'    => CREATE_FANCY_TIME(SURFBAR_CALCULATE_DYNAMIC_LOCK()),
-               'surfbar_static_reward'   => TRANSLATE_COMMA(getConfig('surfbar_static_reward')),
-               'surfbar_static_time'     => CREATE_FANCY_TIME(getConfig('surfbar_static_time'))
+               'surfbar_total_users'     => translateComma(GET_TOTAL_DATA('CONFIRMED', 'user_data', 'userid', 'status', true)),
+               'surfbar_min_reward'      => translateComma(SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE()),
+               'surfbar_max_reward'      => translateComma(SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE()),
+               'surfbar_min_time'        => createFancyTime(SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE()),
+               'surfbar_max_time'        => createFancyTime(SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE()),
+               'surfbar_dynamic_lock'    => createFancyTime(SURFBAR_CALCULATE_DYNAMIC_LOCK()),
+               'surfbar_static_reward'   => translateComma(getConfig('surfbar_static_reward')),
+               'surfbar_static_time'     => createFancyTime(getConfig('surfbar_static_time'))
        );
 } // END - if
 
 // Load the template
-LOAD_TEMPLATE("member_surfbar_start_".strtolower(getConfig('surfbar_pay_model')), false, $content);
+LOAD_TEMPLATE('member_surfbar_start_' . strtolower(getConfig('surfbar_pay_model')), false, $content);
 
 // Load surfbar link template
-LOAD_TEMPLATE("member_surfbar_link");
+LOAD_TEMPLATE('member_surfbar_link');
 
 //
 ?>