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

[mailer.git] / inc / modules / admin / what-list_bonus.php

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index fbc0a6024784074c8bcd6a14024a619b4b11e65c..1a225c96f34836ffe89e8cc740750b81f907ea70 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -49,11 +49,11 @@ if (getConfig('bonus_active') == 'Y') {
        // Shall I withdraw now?
        if (REQUEST_ISSET_POST(('withdraw'))) {
                // Okay, let's prepare...
-               $curr = date("m", time()) - 1;
-               if (strlen($curr) == 1) $curr = "0".$curr;
-               UPDATE_CONFIG("last_month", $curr);
+               $curr = date('m', time()) - 1;
+               if (strlen($curr) == 1) $curr = '0'.$curr;
+               updateConfiguration('last_month', $curr);
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BONUS_WITHDRAW_PREPARED'));
-       }
+       } // END - if
 
        if (GET_EXT_VERSION('bonus') >= '0.6.9') {
                // Add more bonus points here
@@ -73,7 +73,7 @@ if (getConfig('bonus_active') == 'Y') {
        $lastOnline = "%s"; $ONLINE = '';
        if (EXT_IS_ACTIVE('autopurge')) {
                // Use last online timestamp to keep inactive members away from here
-               $lastOnline   = " AND last_online >= (UNIX_TIMESTAMP() - %s)";
+               $lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - %s)";
                $ONLINE = getConfig('ap_inactive_since');
        }
 
@@ -100,11 +100,11 @@ ORDER BY points DESC, last_online DESC, userid",
                        }
 
                        // Prepare content
-                       $content['uid']    = ADMIN_USER_PROFILE_LINK($content['uid']);
-                       $content['email']  = CREATE_EMAIL_LINK($content['email'], "user_data");
-                       $content['gender'] = TRANSLATE_GENDER($content['gender']);
-                       $content['points'] = TRANSLATE_COMMA($content['points']);
-                       $content['last']   = MAKE_DATETIME($content['last'], "2");
+                       $content['uid']    = generateUserProfileLink($content['uid']);
+                       $content['email']  = generateMemberEmailLink($content['email'], "user_data");
+                       $content['gender'] = translateGender($content['gender']);
+                       $content['points'] = translateComma($content['points']);
+                       $content['last']   = generateDateTime($content['last'], "2");
                        $content['sw']     = $SW;
                        $content['win1']   = $WIN1;
                        $content['win2']   = $WIN2;
@@ -115,10 +115,10 @@ ORDER BY points DESC, last_online DESC, userid",
                        $SW = 3 - $SW; $cnt++;
                }
                define('__BONUS_ROWS', $OUT);
-               define('__TOTAL', TRANSLATE_COMMA($total));
+               define('__TOTAL', translateComma($total));
 
                // Check if we need to display form or not with manuel withdraw
-               if (getConfig('last_month') == date("m", time())) {
+               if (getConfig('last_month') == date('m', time())) {
                        // Load form
                        define('__BONUS_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_bonus_form", true));
                } else {
@@ -128,7 +128,7 @@ ORDER BY points DESC, last_online DESC, userid",
 
                // Prepare constant for timemark
                if (EXT_IS_ACTIVE('autopurge')) {
-                       define('__AUTOPURGE_TIMEOUT', MAKE_DATETIME(time() - getConfig('ap_inactive_since'), "2"));
+                       define('__AUTOPURGE_TIMEOUT', generateDateTime(time() - getConfig('ap_inactive_since'), "2"));
                } else {
                        define('__AUTOPURGE_TIMEOUT', sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'autopurge'));
                }