Bug 'return is not bool' fixed

[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 fa28e4411d601cd7d321e3a33d49b90082849db3..626e3eed58109de6a545df5c9fb512743dd72678 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/22/2005 *
- * ================                             Last change: 10/22/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 10/22/2005 *
+ * ===================                          Last change: 10/22/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_beg.php                                *
@@ -46,10 +46,10 @@ addMenuDescription('admin', __FILE__);
 
 if (getConfig('beg_rallye') == 'Y') {
        // Shall I withdraw now?
-       if (isPostRequestElementSet(('withdraw'))) {
+       if (isPostRequestParameterSet(('withdraw'))) {
                // Okay, let's prepare...
                $curr = date('m', time()) - 1;
-               if (strlen($curr) == 1) $curr = '0'.$curr;
+               if (strlen($curr) == 1) $curr = '0' . $curr;
                updateConfiguration('last_month', $curr);
                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BEG_WITHDRAW_PREPARED'));
        } // END - if
@@ -71,31 +71,31 @@ 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 = '';
+
+                       // Maybe he can win his active beg?
                        if ($cnt <= getConfig('beg_ranks')) {
-                               // Maybe he can win his active beg?
-                               $WIN1 = "<strong>";
-                               $WIN2 = "</strong>";
+                               // Mark him
+                               $WIN1 = '<strong>';
+                               $WIN2 = '</strong>';
                        } // END - if
 
                        // Prepare content
-                       // @TODO Rewrite templates so s/family will be replaced by surname/family
-                       // @TODO to shorten this block. Please also do so with userid->userid
                        $content = array(
-                               'userid'    => $content['userid'],
-                               'email'  => generateEmailLink($content['email'], 'user_data'),
-                               'gender' => translateGender($content['gender']),
-                               'surname'  => $content['surname'],
-                               'family'  => $content['family'],
-                               'turbo'  => translateComma($content['beg_points']),
-                               'last_online'   => generateDateTime($content['last_online'], '2'),
-                               'sw'     => $SW,
-                               'win1'   => $WIN1,
-                               'win2'   => $WIN2,
-                               'cnt'    => $cnt,
+                               'userid'      => $content['userid'],
+                               'email'       => generateEmailLink($content['email'], 'user_data'),
+                               'gender'      => translateGender($content['gender']),
+                               'surname'     => $content['surname'],
+                               'family'      => $content['family'],
+                               'turbo'       => translateComma($content['beg_points']),
+                               'last_online' => generateDateTime($content['last_online'], 2),
+                               'sw'          => $SW,
+                               'win1'        => $WIN1,
+                               'win2'        => $WIN2,
+                               'cnt'         => $cnt,
                        );
 
                        // Load template and add it
@@ -112,14 +112,14 @@ ORDER BY beg_points DESC, last_online DESC, userid",
                        $content['withdraw_form'] = loadTemplate('admin_list_beg_form', true);
                } else {
                        // Display message "no manual withdraw possible"
-                       $content['withdraw_form'] = loadTemplate('admin_settings_saved', true, "<div class=\"admin_failed\">{--ADMIN_BEG_ALREADY_WITHDRAW--}</div>");
+                       $content['withdraw_form'] = loadTemplate('admin_settings_saved', true, '<div class="admin_failed">{--ADMIN_BEG_ALREADY_WITHDRAW--}</div>');
                }
 
                // Prepare constant for timemark
                if (isExtensionActive('autopurge')) {
-                       $content['autopurge_timeout'] = generateDateTime(time() - getConfig('ap_inactive_since'), '2');
+                       $content['autopurge_timeout'] = generateDateTime(time() - getConfig('ap_inactive_since'), 2);
                } else {
-                       $content['autopurge_timeout'] = loadTemplate('admin_settings_saved', true, sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'autopurge'));
+                       $content['autopurge_timeout'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('EXTENSION_PROBLEM_NOT_INSTALLED', 'autopurge'));
                }
 
                // Load final template