Code style changed, ext-user continued:

[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 cad194c34a911739a9afcfd684b80ab720fb268c..ad47803a44c7e7c983ea984420b41724fc042cb0 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -45,7 +45,7 @@ addYouAreHereLink('admin', __FILE__);
 
 if (isBegRallyeEnabled()) {
        // Shall I withdraw now?
-       if (isPostRequestParameterSet('withdraw')) {
+       if (isPostRequestElementSet('withdraw')) {
                // Okay, let's prepare...
                $curr = getMonth() - 1;
                if (strlen($curr) == 1) $curr = '0' . $curr;
@@ -59,17 +59,22 @@ if (isBegRallyeEnabled()) {
        // Autopurge installed?
        if ((isExtensionActive('autopurge')) && (isBegActiveEnabled()) && ((getApInactiveSince() > 0))) {
                // Use last online timestamp to keep inactive members away from here
-               $lastOnline   = ' AND (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?}';
+               $lastOnline   = ' AND (UNIX_TIMESTAMP() - `last_online`) < {?ap_inactive_since?}';
        } // END - if
 
        // Check if at least one is in the active rallye
-       $result = SQL_QUERY("SELECT `userid`, `gender`, `surname`, `family`, `email`, `beg_points`, `last_online`
+       $result = SQL_QUERY("SELECT
+       `userid`,
+       `email`,
+       `beg_points`,
+       `last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
        `status`='CONFIRMED' AND
        `beg_points` > 0
        " . $lastOnline . "
+       " . runFilterChain('user_exclusion_sql', ' ') . "
 ORDER BY
        `beg_points` DESC,
        `last_online` DESC,
@@ -80,7 +85,8 @@ ORDER BY
                $OUT = ''; $count = 1; $total = '0';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Init variables
-                       $WIN1 = ''; $WIN2 = '';
+                       $WIN1 = '';
+                       $WIN2 = '';
 
                        // Maybe he can win his active beg?
                        if ($count <= getBegRanks()) {
@@ -90,20 +96,19 @@ ORDER BY
                        } // END - if
 
                        // Prepare content
-                       $content = array(
+                       $row = array(
                                'userid'      => $content['userid'],
                                'email'       => generateEmailLink($content['email'], 'user_data'),
-                               'gender'      => $content['gender'],
-                               'turbo'       => $content['beg_points'],
-                               'last_online' => generateDateTime($content['last_online'], 2),
+                               'last_online' => generateDateTime($content['last_online'], '2'),
                                'win1'        => $WIN1,
                                'win2'        => $WIN2,
-                               'cnt'         => $count,
+                               'count'       => $count,
                        );
 
                        // Load template and add it
-                       $OUT .= loadTemplate('admin_list_beg_rows', true, $content);
-                       $count++; $total += $content['beg_points'];
+                       $OUT .= loadTemplate('admin_list_beg_rows', TRUE, $row);
+                       $count++;
+                       $total += $content['beg_points'];
                } // END - while
 
                $content['rows']  = $OUT;
@@ -112,21 +117,21 @@ ORDER BY
                // Check if we need to display form or not with manuel withdraw
                if (getLastMonth() == getMonth()) {
                        // Load form
-                       $content['withdraw_form'] = loadTemplate('admin_list_beg_form', true);
+                       $content['withdraw_form'] = loadTemplate('admin_list_beg_form', TRUE);
                } else {
                        // Display message "no manual withdraw possible"
-                       $content['withdraw_form'] = displayMessage('{--ADMIN_BEG_ALREADY_WITHDRAW--}', true);
+                       $content['withdraw_form'] = displayMessage('{--ADMIN_BEG_ALREADY_WITHDRAW--}', TRUE);
                }
 
                // Prepare constant for timemark
                if (isExtensionActive('autopurge')) {
                        $content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
                } else {
-                       $content['autopurge_timeout'] = displayMessage(generateExtensionInactiveNotInstalledMessage('autopurge'), true);
+                       $content['autopurge_timeout'] = displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=autopurge%}', TRUE);
                }
 
                // Load final template
-               loadTemplate('admin_list_beg', false, $content);
+               loadTemplate('admin_list_beg', FALSE, $content);
        } else {
                // No one has joined the begging rallye...
                displayMessage('{--ADMIN_BEG_NO_RALLYE--}');