X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-rallyes.php;h=95d5550a732b5e89410305b87d52efdad8e8e6b9;hb=8d2c9b91eb82ea74fac58b2541982f760d0f77fc;hp=26417389b94f979e1fd73c131f5dd7011a9bb0af;hpb=c00e0e9f034b4b3b73a45d3858b0d403a12fb8f1;p=mailer.git

diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index 26417389b9..95d5550a73 100644
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 06/29/2004 *
- * ================                             Last change: 08/22/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 06/29/2004 *
+ * ===================                          Last change: 08/22/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-rallyes.php                                 *
@@ -14,10 +14,9 @@
  * $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 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -53,8 +52,8 @@ if ((!isExtensionActive('rallye')) && (!isAdmin())) {
 outputHtml('<div align="center">');
 
 // Check for possible running rallyes
-$ADMIN = " AND d.is_active='Y'";
-if (isAdmin()) $ADMIN = '';
+$ADD = " AND d.is_active='Y'";
+if (isAdmin()) $ADD = '';
 
 $result = SQL_QUERY("SELECT
 	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
@@ -65,7 +64,7 @@ INNER JOIN
 ON
 	d.admin_id=a.id
 WHERE
-	d.notified='Y'".$ADMIN."
+	d.notified='Y'" . $ADD . "
 ORDER BY
 	d.end_time
 LIMIT 1", __FILE__, __LINE__);
@@ -77,17 +76,17 @@ if (SQL_NUMROWS($result) == 1) {
 	$expired = false;
 	if ($end < time()) {
 		// Rallye is expired
-		$content['extras'] = getMessage('RALLYE_HAS_EXPIRED');
+		$content['extras'] = '{--RALLYE_HAS_EXPIRED--}';
 		$expired = true;
 	} elseif (time() >= ($end - getConfig('ONE_DAY'))) {
 		// Rallye will expire in less one day!
-		$content['extras'] = getMessage('RALLYE_EXPIRE_ONE_DAY');
+		$content['extras'] = '{--RALLYE_EXPIRE_ONE_DAY--}';
 	} else {
-		$content['extras'] = "<a href=\"{?URL?}/modules.php?module=index&amp;what=register\">{--RALLYE_REGISTER_NOW--}</a>";
+		$content['extras'] = '<a href="{%url=modules.php?module=index&amp;what=register%}">{--RALLYE_REGISTER_NOW--}</a>';
 	}
 
 	// Set admin line (currently set to impressum, later to contact form)
-	// @TODO Reactivate this: $content['admin'] = "<a href=\"{?URL?}/modules.php?module=index&amp;what=impressum&amp;admin=".$adminId."\">".$login."</a>";
+	// @TODO Reactivate this: $content['admin'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;admin=' . $adminId . '%}">' . $login . '</a>';
 
 	// Set title
 	$content['title'] = $title;
@@ -109,16 +108,16 @@ if (SQL_NUMROWS($result) == 1) {
 	$content['min_users'] = determineReferalRallyeMinimumUsers($min_users);
 
 	// Determine min prices (now in function)
-	$content['min_prices'] = determineReferalRallyeMinimumPrices();
+	$content['min_prices'] = determineReferalRallyeMinimumPrices($min_prices);
 
 	if ($expired === true) {
 		$content['prices']       = addReferalRallyeWinners($id);
-		$content['top_users']    = "<div align=\"center\" class=\"big\">".$content['extras']."</div>";
-		$content['can_win_this'] = getMessage('RALLYE_OUR_WINNERS_ARE');
+		$content['top_users']    = '<div align="center" class="big">' . $content['extras'] . '</div>';
+		$content['can_win_this'] = '{--RALLYE_OUR_WINNERS_ARE--}';
 	} else {
 		$content['prices']       = addReferalRallyePrices($id, 'html');
-		$content['top_users']    = addReferalRallyeTopUsers($id, getUserId());
-		$content['can_win_this'] = getMessage('RALLYE_YOU_CAN_WIN');
+		$content['top_users']    = addReferalRallyeTopUsers($id, getMemberId());
+		$content['can_win_this'] = '{--RALLYE_YOU_CAN_WIN--}';
 	}
 
 	// And load final template