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

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

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index b68ff1d3061835b162728fa508e4cc7e24d7fa20..3bb5aba71f942586923c3e552d17eecd63b77fee 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -48,9 +48,9 @@ if (getConfig('beg_rallye') == '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_BEG_WITHDRAW_PREPARED'));
        } // END - if
 
@@ -58,7 +58,7 @@ if (getConfig('beg_rallye') == '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');
        } // END - if
 
@@ -86,12 +86,12 @@ ORDER BY beg_points DESC, last_online DESC, userid",
                        // @TODO to shorten this block. Please also do so with uid->userid
                        $content = array(
                                'uid'    => $content['userid'],
-                               'email'  => CREATE_EMAIL_LINK($content['email'], "user_data"),
-                               'gender' => TRANSLATE_GENDER($content['gender']),
+                               'email'  => generateMemberEmailLink($content['email'], "user_data"),
+                               'gender' => translateGender($content['gender']),
                                'sname'  => $content['surname'],
                                'fname'  => $content['family'],
-                               'turbo'  => TRANSLATE_COMMA($content['beg_points']),
-                               'last'   => MAKE_DATETIME($content['last_online'], "2"),
+                               'turbo'  => translateComma($content['beg_points']),
+                               'last'   => generateDateTime($content['last_online'], "2"),
                                'sw'     => $SW,
                                'win1'   => $WIN1,
                                'win2'   => $WIN2,
@@ -103,10 +103,10 @@ ORDER BY beg_points DESC, last_online DESC, userid",
                        $SW = 3 - $SW; $cnt++; $total += $content['beg_points'];
                }
                define('__BEG_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('__BEG_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_beg_form", true));
                } else {
@@ -116,7 +116,7 @@ ORDER BY beg_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'));
                }