Heavy rewrite:

[mailer.git] / inc / modules / member / what-beg2.php

diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php
index cb646e6d445510adc3999e19f09fd5dcdb97fa16..99ffbfe1cc581cbeb2c7b585a70430508d5bb3b7 100644 (file)
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Alle moeglichen Gewinner der Bettel-Rallye aufl. *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
+ * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -38,34 +38,44 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $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);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL("modules.php[5~?module=index");
-} elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "beg");
+       redirectToUrl('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('beg')) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('beg'));
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __FILE__);
+ADD_DESCR('member', __FILE__);
 
 // 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
 
-// Let's check if there are some points left we can "pay"...
-$result = SQL_QUERY_ESC("SELECT userid, beg_points AS beg, last_online FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE beg_points > 0 AND `status`='CONFIRMED'".$lastOnline."
-ORDER BY beg_points DESC, last_online DESC, userid LIMIT %s",
-       array($ONLINE, getConfig('beg_ranks')), __FILE__, __LINE__);
+// Let's check if there are some points left we can 'pay'...
+$result = SQL_QUERY_ESC("SELECT
+       `userid`, `beg_points` AS beg, `last_online`
+FROM
+       `{!_MYSQL_PREFIX!}_user_data`
+WHERE
+       `beg_points` > 0 AND `status`='CONFIRMED'".$lastOnline."
+ORDER BY
+       `beg_points` DESC, `last_online` DESC, `userid` ASC LIMIT %s",
+       array(
+               $ONLINE,
+               getConfig('beg_ranks')
+       ), __FILE__, __LINE__);
 
 // Reset temporary variable and check for users
-$OUT = "";
+$OUT = '';
 if (SQL_NUMROWS($result) > 0) {
        // Load our winners...
        $SW = 2; $cnt = 1;
@@ -75,19 +85,19 @@ if (SQL_NUMROWS($result) > 0) {
                        'sw'     => $SW,
                        'cnt'    => $cnt,
                        'uid'    => bigintval($content['userid']),
-                       'points' => TRANSLATE_COMMA($content['beg']),
-                       'last'   => MAKE_DATETIME($content['last_online'], "2"),
+                       'points' => translateComma($content['beg']),
+                       'last'   => generateDateTime($content['last_online'], '2'),
                );
 
                // Load row template
-               $OUT .= LOAD_TEMPLATE("member_list_beg_row", true, $content);
+               $OUT .= LOAD_TEMPLATE('member_list_beg_row', true, $content);
 
                // Count one up and switch colors
                $cnt++; $SW = 3 - $SW;
        }
 } else {
        // No one is interested in our "active rallye" ! :-(
-       $OUT = LOAD_TEMPLATE("member_beg_404", true);
+       $OUT = LOAD_TEMPLATE('member_beg_404', true);
 }
 
 // Free memory
@@ -97,7 +107,7 @@ SQL_FREERESULT($result);
 define('__BEG_ROWS', $OUT);
 
 // Load final template
-LOAD_TEMPLATE("member_list_beg");
+LOAD_TEMPLATE('member_list_beg');
 
 //
 ?>