More fixes, thanks to Piter01

[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..c6b44cf930fd63d3f4ac9274cd849d398dd13500 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -32,13 +32,13 @@
  ************************************************************************/
 
 // 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__));
+ADD_DESCR("admin", __FILE__);
 
 if ($_CONFIG['bonus_active'] == "Y") {
        // Shall I withdraw now?
@@ -69,21 +69,24 @@ if ($_CONFIG['bonus_active'] == "Y") {
        $LAST = "%s"; $ONLINE = "";
        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'];
        }
 
        // 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 points, last_online
 FROM "._MYSQL_PREFIX."_user_data
 WHERE status='CONFIRMED' AND ".$USE." > 0".$LAST."
-ORDER BY active_bonus DESC, last_online DESC, userid",
+ORDER BY points DESC, last_online DESC, userid",
         array($ONLINE), __FILE__, __LINE__);
 
        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 ($content = SQL_FETCHARRAY($result)) {
+                       // Add total points
+                       $total += $content['points'];
+
                        // Generate array fore the dynamic template
                        $WIN1 = ""; $WIN2 = "";
                        if ($cnt <= $_CONFIG['bonus_ranks']) {
@@ -93,23 +96,18 @@ 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,
-                       );
+                       $content['email']  = CREATE_EMAIL_LINK($content['email'], "user_data");
+                       $content['gender'] = TRANSLATE_GENDER($content['gender']);
+                       $content['points'] = TRANSLATE_COMMA($content['points']);
+                       $content['last']   = MAKE_DATETIME($content['last'], "2");
+                       $content['sw']     = $SW;
+                       $content['win1']   = $WIN1;
+                       $content['win2']   = $WIN2;
+                       $content['cnt'     = $cnt;
 
                        // Load template and add it
                        $OUT .= LOAD_TEMPLATE("admin_list_bonus_rows", true, $content);
-                       $SW = 3 - $SW; $cnt++; $total += $turbo;
+                       $SW = 3 - $SW; $cnt++;
                }
                define('__BONUS_ROWS', $OUT);
                define('__TOTAL', TRANSLATE_COMMA($total));
@@ -127,7 +125,11 @@ ORDER BY active_bonus DESC, last_online DESC, userid",
                }
 
                // Prepare constant for timemark
-               define('__AUTOPURGE_TIMEOUT', MAKE_DATETIME(time() - $_CONFIG['ap_in_since'], "2"));
+               if (EXT_IS_ACTIVE("autopurge")) {
+                       define('__AUTOPURGE_TIMEOUT', MAKE_DATETIME(time() - $_CONFIG['ap_inactive_since'], "2"));
+               } else {
+                       define('__AUTOPURGE_TIMEOUT', sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "autopurge"));
+               }
 
                // Load final template
                LOAD_TEMPLATE("admin_list_bonus");