config.php partly solved, see #117

[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 7bb2df327c1fd13baee35c7198e03b7d9d4f2fa7..ed8b864cd4847370035fe5f55aaa3148c60a0976 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -38,27 +38,27 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);
 
-if (getConfig('beg_rallye') == "Y") {
+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);
-               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BEG_WITHDRAW_PREPARED'));
+               $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
 
        // Autopurge installed?
-       $lastOnline = "%s"; $ONLINE = "";
-       if (EXT_IS_ACTIVE("autopurge")) {
+       $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
 
@@ -71,10 +71,10 @@ ORDER BY beg_points DESC, last_online DESC, userid",
 
        if (SQL_NUMROWS($result) > 0) {
                // List users
-               $OUT = "";$SW = 2; $cnt = 1; $total = 0;
+               $OUT = '';$SW = 2; $cnt = 1; $total = 0;
                while ($content = SQL_FETCHARRAY($result)) {
                        // Init variables
-                       $WIN1 = ""; $WIN2 = "";
+                       $WIN1 = ''; $WIN2 = '';
                        if ($cnt <= getConfig('beg_ranks')) {
                                // Maybe he can win his active beg?
                                $WIN1 = "<strong>";
@@ -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 {
@@ -115,21 +115,21 @@ 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"));
+               if (EXT_IS_ACTIVE('autopurge')) {
+                       define('__AUTOPURGE_TIMEOUT', generateDateTime(time() - getConfig('ap_inactive_since'), '2'));
                } else {
-                       define('__AUTOPURGE_TIMEOUT', sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "autopurge"));
+                       define('__AUTOPURGE_TIMEOUT', sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'autopurge'));
                }
 
                // Load final template
                LOAD_TEMPLATE("admin_list_beg");
        } else {
                // No one has joined the begging rallye...
-               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BEG_NO_RALLYE'));
+               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BEG_NO_RALLYE'));
        }
 } else {
        // Rallye deactivated
-       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BEG_RALLYE_DEACTIVATED'));
+       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BEG_RALLYE_DEACTIVATED'));
 }
 
 //