X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-rallyes.php;h=f246691a83547ed0213c87b292c59340f3b2b9ba;hp=7664ad0656a9ea7e3da887e7da934c3910e73e83;hb=a443166d3f417109c905dc399ee7149ca4de6319;hpb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index 7664ad0656..f246691a83 100644
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/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                                 *
@@ -18,6 +18,7 @@
  * 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 *
@@ -52,8 +53,9 @@ if ((!isExtensionActive('rallye')) && (!isAdmin())) {
 } // END - if
 
 // 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
 FROM
@@ -63,7 +65,7 @@ INNER JOIN
 ON
 	d.admin_id=a.id
 WHERE
-	d.notified='Y'".$ADMIN."
+	d.notified='Y'" . $ADD . "
 ORDER BY
 	d.end_time ASC
 LIMIT 1", __FILE__, __LINE__);
@@ -75,18 +77,18 @@ if (SQL_NUMROWS($result) == 1) {
 	$expired = false;
 	if ($content['end_time'] < time()) {
 		// Rallye is expired
-		$content['extras'] = getMessage('RALLYE_HAS_EXPIRED');
+		$content['extras'] = '{--RALLYE_HAS_EXPIRED--}';
 		$expired = true;
 	} elseif (time() >= ($content['end_time'] - getConfig('ONE_DAY'))) {
 		// Rallye will expire in less one day!
-		$content['extras'] = getMessage('RALLYE_EXPIRE_ONE_DAY');
+		$content['extras'] = '{--RALLYE_EXPIRE_ONE_DAY--}';
 	} else {
 		// Link to referal links page
-		$content['extras'] = "<a href=\"{?URL?}/modules.php?module=login&amp;what=reflinks\">{--RALLYE_GET_REFLINK--}</a>";
+		$content['extras'] = '<a href="{%url=modules.php?module=login&amp;what=reflinks%}">{--RALLYE_GET_REFERAL_LINK--}</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=".$content['admin_id']."\">".$content['login']."</a>";
+	// @TODO Reactivate this: $content['admin'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;admin=' . $content['admin_id'] . '%}">' . $content['login'] . '</a>';
 
 	// Handle description...
 	if ((empty($content['descr'])) && (!empty($content['template']))) {
@@ -104,12 +106,12 @@ if (SQL_NUMROWS($result) == 1) {
 
 	if ($expired === true) {
 		$content['prices']       = addReferalRallyeWinners($content['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($content['id'], 'html');
-		$content['top_users']    = addReferalRallyeTopUsers($content['id'], getUserId());
-		$content['can_win_this'] = getMessage('RALLYE_YOU_CAN_WIN');
+		$content['top_users']    = addReferalRallyeTopUsers($content['id'], getMemberId());
+		$content['can_win_this'] = '{--RALLYE_YOU_CAN_WIN--}';
 	}
 
 	// And load final template