More fixes, missing js.php added

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

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index 14a9597bc34c068f9ba968a998a5edde83fee3fa..375699d1818e613ee5bfb8385dee38ed2980ac15 100644 (file)
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -32,25 +32,20 @@
  ************************************************************************/
 
 // 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())
-{
-       LOAD_URL(URL."/modules.php?module=index");
-}
- elseif ((!EXT_IS_ACTIVE("rallye")) && (!IS_ADMIN()))
-{
+} elseif (!IS_MEMBER()) {
+       LOAD_URL("modules.php?module=index");
+} elseif (!EXT_IS_ACTIVE("rallye")) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "rallye");
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
+ADD_DESCR("member", __FILE__);
 
-OUTPUT_HTML ("<DIV align=\"center\">");
+OUTPUT_HTML("<DIV align=\"center\">");
 
 // Check for possible running rallyes
 $ADMIN = " AND d.is_active='Y'";
@@ -73,7 +68,7 @@ if (SQL_NUMROWS($result) == 1)
                define('__RALLYE_EXTRAS', RALLYE_HAS_EXPIRED);
                $expired = true;
        }
-        elseif (time() >= ($end - ONE_DAY))
+        elseif (time() >= ($end - $_CONFIG['one_day']))
        {
                // Rallye will expire in less one day!
                define('__RALLYE_EXTRAS', RALLYE_EXPIRE_ONE_DAY);
@@ -147,6 +142,6 @@ if (SQL_NUMROWS($result) == 1)
        LOAD_TEMPLATE("guest_no_rallyes");
 }
 //
-OUTPUT_HTML ("</DIV>");
+OUTPUT_HTML("</DIV>");
 //
 ?>