X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-rallyes.php;h=c4cfe8bb6b7766e3f5b6c84e4d2c883c800749a8;hp=49683289523d0ea76f7822a7dca633f5a0f0381a;hb=d1637dad0b2ca0e5fb411ee0843f01bfb4cc94e0;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc
diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index 4968328952..c4cfe8bb6b 100644
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Ref-Rallyes *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: $ *
+ * $Date:: $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: $ *
+ * Needs to be in all Files and every File needs "svn propset *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -33,115 +38,98 @@
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+ $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
} elseif (!IS_MEMBER()) {
- LOAD_URL("modules.php?module=index");
-} elseif ((!EXT_IS_ACTIVE("rallye")) && (!IS_ADMIN())) {
- addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "rallye");
+ redirectToUrl('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('rallye')) && (!IS_ADMIN())) {
+ addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('rallye'));
return;
}
// Add description as navigation point
-ADD_DESCR("member", __FILE__);
+ADD_DESCR('member', __FILE__);
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__);
-
-if (SQL_NUMROWS($result) == 1)
-{
+if (IS_ADMIN()) $ADMIN = '';
+$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', RALLYE_HAS_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', RALLYE_EXPIRE_ONE_DAY);
- }
- else
- {
- define('__RALLYE_EXTRAS', "
".RALLYE_GET_REFLINK."");
+ define('__RALLYE_EXTRAS', getMessage('RALLYE_EXPIRE_ONE_DAY'));
+ } else {
+ define('__RALLYE_EXTRAS', "
{--RALLYE_GET_REFLINK--}");
}
+
// Set admin line (currently set to impressum, later to contact form)
- define('__RALLYE_ADMIN', "
".$login."");
+ define('__RALLYE_ADMIN', "
".$content['login']."");
// 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));
- }
- else
- {
+ 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']));
}
- if ($min_users == 0)
- {
- // Rallye ends without user limitation
- define('__RALLYE_MAX_USERS', RALLYE_END_NO_USER_LIMITATION);
- }
- else
- {
- // Rallye ends when X members are totally in your exchange
- define('__RALLYE_MAX_USERS', RALLYE_END_USERS_1." ".$min_users." ".RALLYE_END_USERS_2);
- }
- 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_users/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', MAKE_DATETIME($start, "1"));
- define('__RALLYE_END' , MAKE_DATETIME($end , "1"));
-
- if ($expired)
- {
- define('__RALLYE_PRICES', RALLYE_LIST_WINNERS($id));
- define('__RALLYE_TOP_USERS', "
".__RALLYE_EXTRAS."
");
- define('__RALLYE_CAN_WIN_THIS', RALLYE_OUR_WINNERS_ARE);
- }
- else
- {
- define('__RALLYE_PRICES', RALLYE_ADD_PRICES($id, "html"));
- define('__RALLYE_TOP_USERS', RALLYE_ADD_TOPUSERS($id, $GLOBALS['userid']));
- define('__RALLYE_CAN_WIN_THIS', RALLYE_YOU_CAN_WIN);
+ 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($content['id']));
+ define('__RALLYE_TOP_USERS', "
{!__RALLYE_EXTRAS!}
");
+ define('__RALLYE_CAN_WIN_THIS', getMessage('RALLYE_OUR_WINNERS_ARE'));
+ } else {
+ 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");
-}
- else
-{
+ LOAD_TEMPLATE('guest_rallye_show');
+} else {
// No rallye found so far
- LOAD_TEMPLATE("guest_no_rallyes");
+ LOAD_TEMPLATE('guest_no_rallyes');
}
+
+// Free result
+SQL_FREERESULT($result);
+
//
-OUTPUT_HTML("
");
+OUTPUT_HTML('');
+
//
?>