X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-rallyes.php;h=465f9d5b9a546778f820c76da5c3cb9d22abcd9b;hb=1f98151ba359a81bb54a1c4c8010b24fa4c9dcf0;hp=0f8fcc58fe80995247e15d45f35dc6cd999239a3;hpb=56b24f7a0fb2373847ecf00d08cfb52a0ffb5d28;p=mailer.git

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index 0f8fcc58fe..465f9d5b9a 100644
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Ref-Rallyes                                      *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -38,110 +43,82 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
 	LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("rallye")) && (!IS_ADMIN())) {
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "rallye");
+	addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "rallye");
 	return;
 }
 
 // Add description as navigation point
 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__);
 
-if (SQL_NUMROWS($result) == 1)
-{
+if (SQL_NUMROWS($result) == 1) {
 	// Found some (normally one...
 	list($id, $aid, $login, $title, $descr, $templ, $start, $end, $min_users, $min_prices) = SQL_FETCHROW($result);
 	SQL_FREERESULT($result);
 
 	$expired = false;
-	if ($end < time())
-	{
+	if ($end < time()) {
 		// Rallye is expired
-		define('__RALLYE_EXTRAS', RALLYE_HAS_EXPIRED);
+		define('__RALLYE_EXTRAS', getMessage('RALLYE_HAS_EXPIRED'));
 		$expired = true;
-	}
-	 elseif (time() >= ($end - $_CONFIG['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', getMessage('RALLYE_EXPIRE_ONE_DAY'));
+	} else {
+		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));
 
 	// Handle description...
-	if ((empty($descr)) && (!empty($templ)))
-	{
+	if ((empty($descr)) && (!empty($templ))) {
 		// Use description from template
 		define('__RALLYE_DESCR', LOAD_TEMPLATE("rallye_".$templ, true));
-	}
-	 else
-	{
+	} else {
 		// Use description from database
 		define('__RALLYE_DESCR', COMPILE_CODE($descr));
 	}
 
-	if ($min_users == 0)
-	{
-		// Rallye ends without user limitation
-		define('__RALLYE_MAX_USERS', RALLYE_END_NO_USER_LIMITATION);
-	}
-	 else
-	{
-		// Rallye ends when X members are totally in your exchange
-		define('__RALLYE_MAX_USERS', RALLYE_END_USERS_1." ".$min_users." ".RALLYE_END_USERS_2);
-	}
-	if ($min_prices == 0)
-	{
-		// Rallye ends without user limitation
-		define('__RALLYE_MIN_PRICES', RALLYE_END_NO_PRICE_LIMITATION);
-	}
-	 else
-	{
-		// Rallye ends when X members are totally in your exchange
-		define('__RALLYE_MIN_PRICES', RALLYE_END_PRICES_1." ".$min_prices." ".RALLYE_END_PRICES_2);
-	}
+	// Determine min_users/prices
+	define('__RALLYE_MAX_USERS' ,  RALLYE_DETERMINE_MIN_USERS($min_users));
+	define('__RALLYE_MAX_PRICES',  RALLYE_DETERMINE_MIN_PRICES($min_prices));
 
 	// Set start and end time
 	define('__RALLYE_START', MAKE_DATETIME($start, "1"));
 	define('__RALLYE_END'  , MAKE_DATETIME($end  , "1"));
 
-	if ($expired)
-	{
+	if ($expired === true) {
 		define('__RALLYE_PRICES', RALLYE_LIST_WINNERS($id));
-		define('__RALLYE_TOP_USERS', "<DIV align=\"center\" class=\"big\">".__RALLYE_EXTRAS."</DIV>");
-		define('__RALLYE_CAN_WIN_THIS', RALLYE_OUR_WINNERS_ARE);
-	}
-	 else
-	{
+		define('__RALLYE_TOP_USERS', "<div align=\"center\" class=\"big\">{!__RALLYE_EXTRAS!}</div>");
+		define('__RALLYE_CAN_WIN_THIS', getMessage('RALLYE_OUR_WINNERS_ARE'));
+	} else {
 		define('__RALLYE_PRICES', RALLYE_ADD_PRICES($id, "html"));
-		define('__RALLYE_TOP_USERS', RALLYE_ADD_TOPUSERS($id, $GLOBALS['userid']));
-		define('__RALLYE_CAN_WIN_THIS', RALLYE_YOU_CAN_WIN);
+		define('__RALLYE_TOP_USERS', RALLYE_ADD_TOPUSERS($id, getUserId()));
+		define('__RALLYE_CAN_WIN_THIS', getMessage('RALLYE_YOU_CAN_WIN'));
 	}
 
 	// And load final template
 	LOAD_TEMPLATE("guest_rallye_show");
-}
- else
-{
+} else {
 	// No rallye found so far
 	LOAD_TEMPLATE("guest_no_rallyes");
 }
+
 //
-OUTPUT_HTML("</DIV>");
+OUTPUT_HTML("</div>");
+
 //
 ?>