- Surfbar further extended, currently broken!

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

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 3fbf81c9acb61caff7ee68c526ed69dd14eb9338..cc3eba1700290d80e7f6a5bac12a76faf0f20309 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // 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);
 }
@@ -58,8 +57,8 @@ if ($_CONFIG['beg_rallye'] == "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']);
+               $LAST   = " AND last_online >= (UNIX_TIMESTAMP() - %s)";
+               $ONLINE = $_CONFIG['ap_inactive_since'];
        }
 
        // Check if at least one is in the active rallye
@@ -117,7 +116,11 @@ ORDER BY beg_points 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_beg");