Missing column 'active_bonus' fixed, some while() loops rewritten

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

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index 8ddf806a42b0eae69bf27b794381853029f8d1e9..1c20685a78f851da8d566469045efb3d6351b3f1 100644 (file)
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -32,24 +32,18 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-}
- elseif (!IS_LOGGED_IN())
-{
+} elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php[5~?module=index");
-}
- elseif ((!EXT_IS_ACTIVE("bonus")) && (!IS_ADMIN()))
-{
+} elseif (!EXT_IS_ACTIVE("bonus"))
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus");
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
-OUTPUT_HTML("</FONT><br />");
+ADD_DESCR("member", __FILE__);
 
 if (GET_EXT_VERSION("bonus") >= "0.6.9")
 {
@@ -70,35 +64,32 @@ if (GET_EXT_VERSION("bonus") >= "0.6.9")
 
 // Autopurge installed?
 $LAST = "%s"; $ONLINE = "";
-if (EXT_IS_ACTIVE("autopurge"))
-{
+if (EXT_IS_ACTIVE("autopurge")) {
        // Use last online timestamp to keep inactive members away from here
-       $LAST   = " AND last_online >= %s";
-       $ONLINE = bigintval(time() - $_CONFIG['ap_in_since']);
+       $LAST   = " AND last_online >= (UNIX_TIMESTAMP() - %s)";
+       $ONLINE = $_CONFIG['ap_inactive_since'];
 }
 
 // Let's check if there are some points left we can "pay"...
-$result = SQL_QUERY_ESC("SELECT userid, ".$USE." AS active_bonus, last_online FROM "._MYSQL_PREFIX."_user_data
+$result = SQL_QUERY_ESC("SELECT userid, ".$USE." AS points, last_online FROM "._MYSQL_PREFIX."_user_data
 WHERE ".$USE." > 0 AND status='CONFIRMED'".$LAST."
-ORDER BY active_bonus DESC, last_online DESC, userid LIMIT %s",
+ORDER BY points DESC, last_online DESC, userid
+LIMIT %s",
  array($ONLINE, $_CONFIG['bonus_ranks']), __FILE__, __LINE__);
 
 // Reset temporary variable and check for users
 $OUT = "";
-if (SQL_NUMROWS($result) > 0)
-{
+if (SQL_NUMROWS($result) > 0) {
        // Load our winners...
        $SW = 2; $cnt = 1;
-       while(list($uid, $turbo, $last) = SQL_FETCHROW($result))
-       {
+       while ($content = SQL_FETCHARRAY($result)) {
                // Prepare data for the template
                $content = array(
-                       'sw'     => $SW,
-                       'cnt'    => $cnt,
-                       'uid'    => bigintval($uid),
-                       'points' => TRANSLATE_COMMA($turbo),
-                       'last'   => MAKE_DATETIME($last, "2"),
-               );
+               $content['sw']     = $SW;
+               $content['cnt']    = $cnt;
+               $content['uid']    = bigintval($content['uid']);
+               $content['points'] = TRANSLATE_COMMA($content['points']);
+               $content['last']   = MAKE_DATETIME($content['last'], "2");
 
                // Load row template
                $OUT .= LOAD_TEMPLATE("member_bonus_row", true, $content);
@@ -106,9 +97,7 @@ if (SQL_NUMROWS($result) > 0)
                // Count one up and switch colors
                $cnt++;$SW = 3 - $SW;
        }
-}
- else
-{
+} else {
        // No one is interested in our "active rallye" ! :-(
        $OUT = LOAD_TEMPLATE("member_bonus_404", true);
 }