X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fmember%2Fwhat-rallyes.php;h=49683289523d0ea76f7822a7dca633f5a0f0381a;hb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc;hp=6a95c086fe8fff098ff41cc3176aa60bd8725283;hpb=5ef6ed7373ae85e5635e39e2a0adf9496a8add05;p=mailer.git

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index 6a95c086fe..4968328952 100644
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -32,31 +32,26 @@
  ************************************************************************/
 
 // 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()))
-{
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "rallye");
+} elseif (!IS_MEMBER()) {
+	LOAD_URL("modules.php?module=index");
+} elseif ((!EXT_IS_ACTIVE("rallye")) && (!IS_ADMIN())) {
+	addFatalMessage(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'";
 if (IS_ADMIN()) $ADMIN = "";
 $result = SQL_QUERY("SELECT DISTINCT d.id, d.admin_id, a.login, d.title, d.descr, d.template, d.start_time, d.end_time, d.min_users, d.min_prices
- FROM "._MYSQL_PREFIX."_rallye_data AS d, "._MYSQL_PREFIX."_admins AS a
+ FROM `{!_MYSQL_PREFIX!}_rallye_data` AS d, `{!_MYSQL_PREFIX!}_admins` AS a
  WHERE d.admin_id=a.id".$ADMIN." AND d.notified='Y'
  ORDER BY d.end_time LIMIT 1", __FILE__, __LINE__);
 
@@ -73,17 +68,17 @@ if (SQL_NUMROWS($result) == 1)
 		define('__RALLYE_EXTRAS', RALLYE_HAS_EXPIRED);
 		$expired = true;
 	}
-	 elseif (time() >= ($end - ONE_DAY))
+	 elseif (time() >= ($end - getConfig('one_day')))
 	{
 		// Rallye will expire in less one day!
 		define('__RALLYE_EXTRAS', RALLYE_EXPIRE_ONE_DAY);
 	}
 	 else
 	{
-		define('__RALLYE_EXTRAS', "<A href=\"".URL."/modules.php?module=login&amp;what=reflinks\">".RALLYE_GET_REFLINK."</A>");
+		define('__RALLYE_EXTRAS', "<a href=\"{!URL!}/modules.php?module=login&amp;what=reflinks\">".RALLYE_GET_REFLINK."</a>");
 	}
 	// Set admin line (currently set to impressum, later to contact form)
-	define('__RALLYE_ADMIN', "<A href=\"".URL."/modules.php?module=index&amp;what=impressum&amp;admin=".$aid."\">".$login."</A>");
+	define('__RALLYE_ADMIN', "<a href=\"{!URL!}/modules.php?module=index&amp;what=impressum&amp;admin=".$aid."\">".$login."</a>");
 
 	// Set title
 	define('__RALLYE_TITLE', COMPILE_CODE($title));
@@ -128,7 +123,7 @@ if (SQL_NUMROWS($result) == 1)
 	if ($expired)
 	{
 		define('__RALLYE_PRICES', RALLYE_LIST_WINNERS($id));
-		define('__RALLYE_TOP_USERS', "<DIV align=\"center\" class=\"big\">".__RALLYE_EXTRAS."</DIV>");
+		define('__RALLYE_TOP_USERS', "<div align=\"center\" class=\"big\">".__RALLYE_EXTRAS."</div>");
 		define('__RALLYE_CAN_WIN_THIS', RALLYE_OUR_WINNERS_ARE);
 	}
 	 else
@@ -147,6 +142,6 @@ if (SQL_NUMROWS($result) == 1)
 	LOAD_TEMPLATE("guest_no_rallyes");
 }
 //
-OUTPUT_HTML("</DIV>");
+OUTPUT_HTML("</div>");
 //
 ?>