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

[mailer.git] / inc / monthly / monthly_bonus.php

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index f4e465fb585342d050283271a33d2349fc0e9a9c..c00a486e606ad53b5e7c1ca22f3d4d5de110a25d 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -32,13 +32,10 @@
  ************************************************************************/
 
 // 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 ((!EXT_IS_ACTIVE("bonus")) && (!IS_ADMIN()))
-{
+} elseif ((!EXT_IS_ACTIVE("bonus")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus");
        return;
 }
@@ -60,11 +57,11 @@ if (($curr != $_CONFIG['last_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS
        if (EXT_IS_ACTIVE("autopurge"))
        {
                // Use last online stamp only when autopurge for inactive members is activated
-               if ($_CONFIG['ap_in_since'] > 0)
+               if ($_CONFIG['ap_inactive_since'] > 0)
                {
                        // Okay, include last online timestamp
                        $whereStatement1 = "WHERE status='CONFIRMED' AND last_online >=";
-                       $whereStatement2 = bigintval(time() - $_CONFIG['ap_in_since']);
+                       $whereStatement2 = bigintval(time() - $_CONFIG['ap_inactive_since']);
                        $whereStatement3 = bigintval($_CONFIG['bonus_ranks']);
                }
        }