X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fguest%2Fwhat-rallyes.php;h=43afabe64ddebad8cc450c4595834e51f45a3a64;hb=4f7df133f736da124e6f7bd02008b9093f736451;hp=408e2c041adee9ad59b307e7b8a48e215b85debb;hpb=63f159414369b5ea19a8ca75d8cd8033c45d8341;p=mailer.git

diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index 408e2c041a..43afabe64d 100644
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -52,42 +52,42 @@ 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'
+	`d`.`notified`='Y'
 	" . $ADD . "
 ORDER BY
-	d.`end_time` ASC
+	`d`.`end_time` ASC
 LIMIT 1", __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) == 1) {
 	// Found some (normally one...
 	$content = SQL_FETCHARRAY($result);
 
-	$expired = false;
+	$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--}';
@@ -101,7 +101,7 @@ if (SQL_NUMROWS($result) == 1) {
 	// Handle description...
 	if ((empty($content['descr'])) && (!empty($content['template']))) {
 		// Use description from template
-		$content['descr'] = loadTemplate('rallye_' . $content['template'], true);
+		$content['descr'] = loadTemplate('rallye_' . $content['template'], TRUE);
 	} // END - if
 
 	// Set start and end time
@@ -114,7 +114,7 @@ if (SQL_NUMROWS($result) == 1) {
 	// Determine min prices (now in function)
 	$content['min_prices'] = determineReferralRallyeMinimumPrices($content['min_prices']);
 
-	if ($expired === true) {
+	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--}';
@@ -125,7 +125,7 @@ if (SQL_NUMROWS($result) == 1) {
 	}
 
 	// And load final template
-	loadTemplate('guest_show_rallye', false, $content);
+	loadTemplate('guest_show_rallye', FALSE, $content);
 } else {
 	// No rallye found so far
 	loadTemplate('guest_rallye_404');