X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-rallyes.php;h=a7a6fdb315ff4a72917d53eaab4374cdae60a964;hb=66b91ce490ab549425619c95fc12086e126d541b;hp=39f7f0ea03aa79b8c9b6349fba215e360849fda2;hpb=81bfbcd72e424060ea1223b49ad92fcfa150f361;p=mailer.git

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index 39f7f0ea03..a7a6fdb315 100644
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
 	redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('rallye')) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'rallye'));
+	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('rallye'));
 	return;
 }
 
@@ -55,70 +55,81 @@ OUTPUT_HTML("<div align=\"center\">");
 // Check for possible running rallyes
 $ADMIN = " AND d.is_active='Y'";
 if (IS_ADMIN()) $ADMIN = '';
-$result = SQL_QUERY("SELECT DISTINCT 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!}_admins` AS a
- WHERE d.admin_id=a.id".$ADMIN." AND d.notified='Y'
- ORDER BY d.end_time LIMIT 1", __FILE__, __LINE__);
+$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
+	`{!_MYSQL_PREFIX!}_rallye_data` AS d
+INNER JOIN
+	`{!_MYSQL_PREFIX!}_admins` AS a
+ON
+	d.admin_id=a.id
+WHERE
+	d.notified='Y'".$ADMIN."
+ORDER BY
+	d.end_time ASC
+LIMIT 1", __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) == 1) {
 	// Found some (normally one...
-	list($id, $aid, $login, $title, $descr, $templ, $start, $end, $min_users, $min_prices) = SQL_FETCHROW($result);
-	SQL_FREERESULT($result);
+	$content = SQL_FETCHARRAY($result);
 
 	$expired = false;
-	if ($end < time()) {
+	if ($content['end_time'] < time()) {
 		// Rallye is expired
 		define('__RALLYE_EXTRAS', getMessage('RALLYE_HAS_EXPIRED'));
 		$expired = true;
-	} elseif (time() >= ($end - getConfig('one_day'))) {
+	} elseif (time() >= ($content['end_time'] - getConfig('one_day'))) {
 		// Rallye will expire in less one day!
 		define('__RALLYE_EXTRAS', getMessage('RALLYE_EXPIRE_ONE_DAY'));
 	} else {
-		define('__RALLYE_EXTRAS', "<a href=\"{!URL!}/modules.php?module=login&amp;what=reflinks\">{--RALLYE_GET_REFLINK--}</a>");
+		define('__RALLYE_EXTRAS', "<a href=\"{?URL?}/modules.php?module=login&amp;what=reflinks\">{--RALLYE_GET_REFLINK--}</a>");
 	}
 
 	// Set admin line (currently set to impressum, later to contact form)
-	define('__RALLYE_ADMIN', "<a href=\"{!URL!}/modules.php?module=index&amp;what=impressum&amp;admin=".$aid."\">".$login."</a>");
+	define('__RALLYE_ADMIN', "<a href=\"{?URL?}/modules.php?module=index&amp;what=impressum&amp;admin=".$content['admin_id']."\">".$content['login']."</a>");
 
 	// Set title
-	define('__RALLYE_TITLE', COMPILE_CODE($title));
+	define('__RALLYE_TITLE', COMPILE_CODE($content['title']));
 
 	// Handle description...
-	if ((empty($descr)) && (!empty($templ))) {
+	if ((empty($content['descr'])) && (!empty($content['template']))) {
 		// Use description from template
-		define('__RALLYE_DESCR', LOAD_TEMPLATE("rallye_".$templ, true));
+		define('__RALLYE_DESCR', LOAD_TEMPLATE('rallye_' . $content['template'], true));
 	} else {
 		// Use description from database
-		define('__RALLYE_DESCR', COMPILE_CODE($descr));
+		define('__RALLYE_DESCR', COMPILE_CODE($content['descr']));
 	}
 
 	// Determine min_users/prices
-	define('__RALLYE_MAX_USERS' ,  RALLYE_DETERMINE_MIN_USERS($min_users));
-	define('__RALLYE_MAX_PRICES',  RALLYE_DETERMINE_MIN_PRICES($min_prices));
+	define('__RALLYE_MAX_USERS' ,  RALLYE_DETERMINE_MIN_USERS($content['min_users']));
+	define('__RALLYE_MAX_PRICES',  RALLYE_DETERMINE_MIN_PRICES($content['min_prices']));
 
 	// Set start and end time
-	define('__RALLYE_START', generateDateTime($start, '1'));
-	define('__RALLYE_END'  , generateDateTime($end  , '1'));
+	define('__RALLYE_START', generateDateTime($content['start_time'], '1'));
+	define('__RALLYE_END'  , generateDateTime($content['end_time']  , '1'));
 
 	if ($expired === true) {
-		define('__RALLYE_PRICES', RALLYE_LIST_WINNERS($id));
+		define('__RALLYE_PRICES', RALLYE_LIST_WINNERS($content['id']));
 		define('__RALLYE_TOP_USERS', "<div align=\"center\" class=\"big\">{!__RALLYE_EXTRAS!}</div>");
 		define('__RALLYE_CAN_WIN_THIS', getMessage('RALLYE_OUR_WINNERS_ARE'));
 	} else {
-		define('__RALLYE_PRICES', RALLYE_ADD_PRICES($id, 'html'));
-		define('__RALLYE_TOP_USERS', RALLYE_ADD_TOPUSERS($id, getUserId()));
+		define('__RALLYE_PRICES', RALLYE_ADD_PRICES($content['id'], 'html'));
+		define('__RALLYE_TOP_USERS', RALLYE_ADD_TOPUSERS($content['id'], getUserId()));
 		define('__RALLYE_CAN_WIN_THIS', getMessage('RALLYE_YOU_CAN_WIN'));
 	}
 
 	// And load final template
-	LOAD_TEMPLATE("guest_rallye_show");
+	LOAD_TEMPLATE('guest_rallye_show');
 } else {
 	// No rallye found so far
-	LOAD_TEMPLATE("guest_no_rallyes");
+	LOAD_TEMPLATE('guest_no_rallyes');
 }
 
-//
-OUTPUT_HTML("</div>");
+// Free result
+SQL_FREERESULT($result);
 
 //
+OUTPUT_HTML('</div>');
+
+// [EOF]
 ?>