X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-rallyes.php;h=bbaec5f4718c45857b82c2def5a9382c2786052e;hb=ffe68abca0e9c3cffd40a43ded2a134343d588f5;hp=b90af17802f61f73115f3aaf866da50b367211f5;hpb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df;p=mailer.git

diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index b90af17802..bbaec5f471 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,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -42,19 +41,19 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('guest', __FILE__);
+addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('rallye')) && (!isAdmin())) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('rallye'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=rallye%}');
 	return;
 } // END - if
 
 // Open div tag
-outputHtml("<div align=\"center\">");
+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'))) {
+	} elseif (time() >= ($end - getOneDay())) {
 		// 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;id=' . $adminId . '%}">' . $login . '</a>';
 
 	// Set title
 	$content['title'] = $title;
@@ -109,23 +108,23 @@ 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['prices']       = addReferalRallyeWinners('guest', $id);
+		$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('guest', $id, getMemberId());
+		$content['can_win_this'] = '{--RALLYE_YOU_CAN_WIN--}';
 	}
 
 	// And load final template
-	loadTemplate('guest_rallye_show', false, $content);
+	loadTemplate('guest_show_rallye', false, $content);
 } else {
 	// No rallye found so far
-	loadTemplate('guest_no_rallyes');
+	loadTemplate('guest_rallye_404');
 }
 
 // Close the div tag