X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-rallyes.php;h=70d0e433a1a3f252ab9143067aea3543cbec1ef1;hb=428be1738c81a57e4e75b4f701df9414656a3b13;hp=e26d09807a4d5b6408ff3019c60ecabd9dad7d1b;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index e26d09807a..70d0e433a1 100644
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -14,12 +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                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 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 *
@@ -39,35 +37,45 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } elseif (!isMember()) {
 	redirectToIndexMemberOnlyModule();
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('rallye')) && (!isAdmin())) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('rallye'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=rallye%}');
 	return;
 } // END - if
 
 // Check for possible running rallyes
-$ADD = " AND d.is_active='Y'";
+$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
+	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
 INNER JOIN
 	`{?_MYSQL_PREFIX?}_admins` AS a
 ON
-	d.admin_id=a.id
+	d.`admin_id`=a.`id`
 WHERE
-	d.notified='Y'".$ADD."
+	d.`notified`='Y'
+	" . $ADD . "
 ORDER BY
-	d.end_time ASC
+	d.`end_time` ASC
 LIMIT 1", __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) == 1) {
@@ -75,20 +83,20 @@ if (SQL_NUMROWS($result) == 1) {
 	$content = SQL_FETCHARRAY($result);
 
 	$expired = false;
-	if ($content['end_time'] < time()) {
+	if (($content['end_time'] < time()) && (getTotalConfirmedUser() >= $content['min_users']) && (getTotalRallyeWinners($content['id']) >= $content['min_prices'])) {
 		// Rallye is expired
-		$content['extras'] = getMessage('RALLYE_HAS_EXPIRED');
+		$content['extras'] = '{--RALLYE_HAS_EXPIRED--}';
 		$expired = true;
-	} elseif (time() >= ($content['end_time'] - getConfig('ONE_DAY'))) {
+	} elseif (time() >= ($content['end_time'] - getOneDay())) {
 		// 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>';
+		// Link to referral links page
+		$content['extras'] = '<a href="{%url=modules.php?module=login&amp;what=reflinks%}">{--RALLYE_GET_REFERRAL_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;id=' . $content['admin_id'] . '%}">' . $content['login'] . '</a>';
 
 	// Handle description...
 	if ((empty($content['descr'])) && (!empty($content['template']))) {
@@ -97,28 +105,28 @@ if (SQL_NUMROWS($result) == 1) {
 	} // END - if
 
 	// Determine min_users/prices
-	$content['min_users']  = determineReferalRallyeMinimumUsers($content['min_users']);
-	$content['min_prices'] = determineReferalRallyeMinimumPrices($content['min_prices']);
+	$content['min_users']  = determineReferralRallyeMinimumUsers($content['min_users']);
+	$content['min_prices'] = determineReferralRallyeMinimumPrices($content['min_prices']);
 
 	// Set start and end time
-	$content['start'] = generateDateTime($content['start_time'], 1);
-	$content['end']   = generateDateTime($content['end_time']  , 1);
+	$content['start_time'] = generateDateTime($content['start_time'], 1);
+	$content['end_time']   = generateDateTime($content['end_time']  , 1);
 
 	if ($expired === true) {
-		$content['prices']       = addReferalRallyeWinners($content['id']);
+		$content['prices']       = addReferralRallyeWinners('member', $content['id']);
 		$content['top_users']    = '<div align="center" class="big">' . $content['extras'] . '</div>';
-		$content['can_win_this'] = getMessage('RALLYE_OUR_WINNERS_ARE');
+		$content['can_win_this'] = '{--RALLYE_OUR_WINNERS_ARE--}';
 	} else {
-		$content['prices']       = addReferalRallyePrices($content['id'], 'html');
-		$content['top_users']    = addReferalRallyeTopUsers($content['id'], getMemberId());
-		$content['can_win_this'] = getMessage('RALLYE_YOU_CAN_WIN');
+		$content['prices']       = addReferralRallyePrices($content['id'], 'html');
+		$content['top_users']    = addReferralRallyeTopUsers('member', $content['id'], getMemberId());
+		$content['can_win_this'] = '{--RALLYE_YOU_CAN_WIN--}';
 	}
 
 	// And load final template
-	loadTemplate('guest_rallye_show', false, $content);
+	loadTemplate('member_show_rallye', false, $content);
 } else {
 	// No rallye found so far
-	loadTemplate('guest_no_rallyes');
+	loadTemplate('member_rallye_404');
 }
 
 // Free result