X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-rallyes.php;h=bb0448e6ba67fce928cc2bed67b842a77899a91e;hp=7a47b42e709c48876da8e2e050bda5602c7ff795;hb=8da353fa4bb729bb3299d247803c23833a52a327;hpb=c6017cf76200e2a5e68bd1984fa2d31f0e3be9d8

diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index 7a47b42e70..bb0448e6ba 100644
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 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 *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } // END - if
 
 // Add description as navigation point
@@ -52,33 +52,43 @@ if ((!isExtensionActive('rallye')) && (!isAdmin())) {
 outputHtml('<div align="center">');
 
 // 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
+	`{?_MYSQL_PREFIX?}_rallye_data` AS `d`
 INNER JOIN
-	`{?_MYSQL_PREFIX?}_admins` AS a
+	`{?_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
+	`d`.`end_time` ASC
 LIMIT 1", __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) == 1) {
 	// Found some (normally one...
-	list($id, $adminId, $login, $title, $descr, $templ, $start, $end, $min_users, $min_prices) = SQL_FETCHROW($result);
+	$content = SQL_FETCHARRAY($result);
 
-	$expired = false;
-	if ($end < time()) {
+	$expired = FALSE;
+	if (($content['end_time'] < time()) && (getTotalConfirmedUser() >= $content['min_users']) && (getTotalRallyeWinners($content['id']) >= $content['min_prices'])) {
 		// Rallye is expired
 		$content['extras'] = '{--RALLYE_HAS_EXPIRED--}';
-		$expired = true;
-	} elseif (time() >= ($end - getOneDay())) {
+		$expired = TRUE;
+	} elseif (time() >= ($content['end_time'] - getOneDay())) {
 		// Rallye will expire in less one day!
 		$content['extras'] = '{--RALLYE_EXPIRE_ONE_DAY--}';
 	} else {
@@ -86,45 +96,33 @@ if (SQL_NUMROWS($result) == 1) {
 	}
 
 	// 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>';
-
-	// Set title
-	$content['title'] = $title;
+	// @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($descr)) && (!empty($templ))) {
+	if ((empty($content['descr'])) && (!empty($content['template']))) {
 		// Use description from template
-		$content['descr'] = loadTemplate('rallye_' . $templ, true);
-	} else {
-		// Use description from database
-		$content['descr'] = $descr;
-	}
+		$content['descr'] = '{%template,LoadTemplate=rallye_' . $content['template'] . '%}';
+	} // END - if
 
 	// Set start and end time
-	$content['start'] = generateDateTime($start, 1);
-	$content['end']   = generateDateTime($end  , 1);
-
-	// Determine min_users
-	$content['min_users'] = determineReferalRallyeMinimumUsers($min_users);
-
-	// Determine min prices (now in function)
-	$content['min_prices'] = determineReferalRallyeMinimumPrices($min_prices);
+	$content['start_time'] = generateDateTime($content['start_time'], 1);
+	$content['end_time']   = generateDateTime($content['end_time']  , 1);
 
-	if ($expired === true) {
-		$content['prices']       = addReferalRallyeWinners($id);
+	if ($expired === TRUE) {
+		$content['prices']       = addReferralRallyeWinners('guest', $content['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, getMemberId());
+		$content['prices']       = addReferralRallyePrices($content['id'], 'html');
+		$content['top_users']    = addReferralRallyeTopUsers('guest', $content['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