X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-rallyes.php;h=11489d0b7e33f896ad782f25b18ca81a042e3b9f;hb=9e604ce404fe7d2d8dafc259a5fb8cd826aec5e6;hp=dd494cf90f877777051364886a2f5a03104364a7;hpb=81bfbcd72e424060ea1223b49ad92fcfa150f361;p=mailer.git
diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index dd494cf90f..11489d0b7e 100644
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
} elseif ((!EXT_IS_ACTIVE('rallye')) && (!IS_ADMIN())) {
- addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'rallye'));
+ addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('rallye'));
return;
}
@@ -55,10 +55,19 @@ OUTPUT_HTML("
");
$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 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
+INNER JOIN
+ `{!_MYSQL_PREFIX!}_admins` AS a
+ON
+ d.admin_id=a.id
+WHERE
+ d.notified='Y'".$ADMIN."
+ORDER BY
+ d.end_time
+LIMIT 1", __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Found some (normally one...
@@ -84,7 +93,7 @@ if (SQL_NUMROWS($result) == 1) {
// Handle description...
if ((empty($descr)) && (!empty($templ))) {
// Use description from template
- define('__RALLYE_DESCR', LOAD_TEMPLATE("rallye_".$templ, true));
+ define('__RALLYE_DESCR', LOAD_TEMPLATE('rallye_' . $templ, true));
} else {
// Use description from database
define('__RALLYE_DESCR', COMPILE_CODE($descr));
@@ -97,13 +106,8 @@ if (SQL_NUMROWS($result) == 1) {
// Determine min_users
define('__RALLYE_MAX_USERS', RALLYE_DETERMINE_MIN_USERS($min_users));
- if ($min_prices == 0) {
- // Rallye ends without user limitation
- define('__RALLYE_MIN_PRICES', getMessage('RALLYE_END_NO_PRICE_LIMITATION'));
- } else {
- // Rallye ends when X members are totally in your exchange
- define('__RALLYE_MIN_PRICES', getMessage('RALLYE_END_PRICES_1') . ' ' . $min_prices . ' ' . getMessage('RALLYE_END_PRICES_2'));
- }
+ // Determine min prices (now in function)
+ define('__RALLYE_MIN_PRICES', RALLYE_DETERMINE_MIN_PRICES());
if ($expired === true) {
define('__RALLYE_PRICES', RALLYE_LIST_WINNERS($id));
@@ -116,14 +120,14 @@ if (SQL_NUMROWS($result) == 1) {
}
// 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');
}
// Close the div tag
-OUTPUT_HTML("
");
+OUTPUT_HTML('');
-//
+// [EOF]
?>