X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-rallyes.php;h=11489d0b7e33f896ad782f25b18ca81a042e3b9f;hb=d1637dad0b2ca0e5fb411ee0843f01bfb4cc94e0;hp=14fd1b861acf9fe69cf0acf8514f8c8028e589cb;hpb=f97a999e0737c0007ae9c3c26dfef49f75a175ac;p=mailer.git
diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index 14fd1b861a..11489d0b7e 100644
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -41,44 +41,48 @@ 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__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'rallye');
+ addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('rallye'));
return;
}
// Add description as navigation point
ADD_DESCR('guest', __FILE__);
+// Open div tag
OUTPUT_HTML("
");
// 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 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)
-{
+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);
$expired = false;
- if ($end < time())
- {
+ if ($end < time()) {
// Rallye is expired
- define('__RALLYE_EXTRAS', RALLYE_HAS_EXPIRED);
+ define('__RALLYE_EXTRAS', getMessage('RALLYE_HAS_EXPIRED'));
$expired = true;
- }
- elseif (time() >= ($end - getConfig('one_day')))
- {
+ } elseif (time() >= ($end - getConfig('one_day'))) {
// Rallye will expire in less one day!
- define('__RALLYE_EXTRAS', RALLYE_EXPIRE_ONE_DAY);
- }
- else
- {
- define('__RALLYE_EXTRAS', "
".RALLYE_REGISTER_NOW."");
+ define('__RALLYE_EXTRAS', getMessage('RALLYE_EXPIRE_ONE_DAY'));
+ } else {
+ define('__RALLYE_EXTRAS', "
{--RALLYE_REGISTER_NOW--}");
}
// Set admin line (currently set to impressum, later to contact form)
define('__RALLYE_ADMIN', "
".$login."");
@@ -89,46 +93,41 @@ 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));
}
// Set start and end time
- define('__RALLYE_START', MAKE_DATETIME($start, "1"));
- define('__RALLYE_END' , MAKE_DATETIME($end , "1"));
+ define('__RALLYE_START', generateDateTime($start, '1'));
+ define('__RALLYE_END' , generateDateTime($end , '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', RALLYE_END_NO_PRICE_LIMITATION);
- } else {
- // Rallye ends when X members are totally in your exchange
- define('__RALLYE_MIN_PRICES', RALLYE_END_PRICES_1." ".$min_prices." ".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));
- define('__RALLYE_TOP_USERS', "
".__RALLYE_EXTRAS."
");
- define('__RALLYE_CAN_WIN_THIS', RALLYE_OUR_WINNERS_ARE);
+ define('__RALLYE_TOP_USERS', "
{!__RALLYE_EXTRAS!}
");
+ 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_CAN_WIN_THIS', RALLYE_YOU_CAN_WIN);
+ define('__RALLYE_CAN_WIN_THIS', getMessage('RALLYE_YOU_CAN_WIN'));
}
// And load final template
- LOAD_TEMPLATE("guest_rallye_show");
-}
- else
-{
+ LOAD_TEMPLATE('guest_rallye_show');
+} else {
// No rallye found so far
- LOAD_TEMPLATE("guest_no_rallyes");
+ LOAD_TEMPLATE('guest_no_rallyes');
}
-//
-OUTPUT_HTML("
");
-//
+
+// Close the div tag
+OUTPUT_HTML('');
+
+// [EOF]
?>