More queries now depends on UNIX_TIMESTAMP() SQL function, wrong index in autopurge...

[mailer.git] / inc / modules / admin / what-list_bonus.php

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index caefd309c9a63003fd8b3966756ddc8691bc7460..7b02b64a92348de6184214e81487d95ff74ce458 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -32,11 +32,11 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
-{
+if ((!defined('__SECURITY')) || (!is_admin())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
@@ -70,11 +70,11 @@ if ($_CONFIG['bonus_active'] == "Y") {
        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']);
+               $ONLINE = bigintval(time() - $_CONFIG['ap_inactive_since']);
        }
 
        // Check if at least one is in the active rallye
-       $result = SQL_QUERY_ESC("SELECT userid, email, sex, surname, family, ".$USE." AS active_bonus, last_online
+       $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, ".$USE." AS active_bonus, last_online
 FROM "._MYSQL_PREFIX."_user_data
 WHERE status='CONFIRMED' AND ".$USE." > 0".$LAST."
 ORDER BY active_bonus DESC, last_online DESC, userid",
@@ -83,7 +83,7 @@ ORDER BY active_bonus DESC, last_online DESC, userid",
        if (SQL_NUMROWS($result) > 0) {
                // List users
                $OUT = "";$SW = 2; $cnt = 1; $total = 0;
-               while(list($uid, $email, $sex, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result)) {
+               while(list($uid, $email, $gender, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result)) {
                        // Generate array fore the dynamic template
                        $WIN1 = ""; $WIN2 = "";
                        if ($cnt <= $_CONFIG['bonus_ranks']) {
@@ -94,17 +94,17 @@ ORDER BY active_bonus DESC, last_online DESC, userid",
 
                        // Prepare content
                        $content = array(
-                               'uid'   => $uid,
-                               'email' => CREATE_EMAIL_LINK($email, "user_data"),
-                               'salut' => TRANSLATE_SEX($sex),
-                               'sname' => $sname,
-                               'fname' => $fname,
-                               'turbo' => TRANSLATE_COMMA($turbo),
-                               'last'  => MAKE_DATETIME($last, "2"),
-                               'sw'    => $SW,
-                               'win1'  => $WIN1,
-                               'win2'  => $WIN2,
-                               'cnt'   => $cnt,
+                               'uid'    => $uid,
+                               'email'  => CREATE_EMAIL_LINK($email, "user_data"),
+                               'gender' => TRANSLATE_GENDER($gender),
+                               'sname'  => $sname,
+                               'fname'  => $fname,
+                               'turbo'  => TRANSLATE_COMMA($turbo),
+                               'last'   => MAKE_DATETIME($last, "2"),
+                               'sw'     => $SW,
+                               'win1'   => $WIN1,
+                               'win2'   => $WIN2,
+                               'cnt'    => $cnt,
                        );
 
                        // Load template and add it
@@ -127,7 +127,7 @@ ORDER BY active_bonus DESC, last_online DESC, userid",
                }
 
                // Prepare constant for timemark
-               define('__AUTOPURGE_TIMEOUT', MAKE_DATETIME(time() - $_CONFIG['ap_in_since'], "2"));
+               define('__AUTOPURGE_TIMEOUT', MAKE_DATETIME(time() - $_CONFIG['ap_inactive_since'], "2"));
 
                // Load final template
                LOAD_TEMPLATE("admin_list_bonus");