X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-rallyes.php;h=5a8a665c7b2ff93ef0944c6c8ca9c3589a95f3cb;hb=e9da1508b2a3ccbf63adc999981674740a47e074;hp=dc29eac5eb2ae385aca55b7a27505b87196a6193;hpb=bd13da550348ba1963a434be7ceb9f1675aecadd;p=mailer.git

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index dc29eac5eb..5a8a665c7b 100644
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/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 - 2015 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();
 } elseif (!isMember()) {
 	redirectToIndexMemberOnlyModule();
 }
@@ -51,76 +51,82 @@ if ((!isExtensionActive('rallye')) && (!isAdmin())) {
 } // 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
+$result = sqlQuery("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
-	`{?_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 ASC
+	`d`.`end_time` ASC
 LIMIT 1", __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) == 1) {
+if (sqlNumRows($result) == 1) {
 	// Found some (normally one...
-	$content = SQL_FETCHARRAY($result);
+	$content = sqlFetchArray($result);
 
-	$expired = false;
-	if ($content['end_time'] < 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;
+		$expired = TRUE;
 	} elseif (time() >= ($content['end_time'] - getOneDay())) {
 		// Rallye will expire in less 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_REFERAL_LINK--}</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']))) {
 		// Use description from template
-		$content['descr'] = loadTemplate('rallye_' . $content['template'], true);
+		$content['descr'] = '{%template,LoadTemplate=rallye_' . $content['template'] . '%}';
 	} // END - if
 
-	// Determine min_users/prices
-	$content['min_users']  = determineReferalRallyeMinimumUsers($content['min_users']);
-	$content['min_prices'] = determineReferalRallyeMinimumPrices($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('member', $content['id']);
+	if ($expired === TRUE) {
+		$content['prices']       = addReferralRallyeWinners('member', $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($content['id'], 'html');
-		$content['top_users']    = addReferalRallyeTopUsers('member', $content['id'], getMemberId());
+		$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('member_show_rallye', false, $content);
+	loadTemplate('member_show_rallye', FALSE, $content);
 } else {
 	// No rallye found so far
 	loadTemplate('member_rallye_404');
 }
 
 // Free result
-SQL_FREERESULT($result);
+sqlFreeResult($result);
 
 // [EOF]
 ?>