More misc fixes and rewrites (sorry, lame description)

[mailer.git] / inc / modules / member / what-rallyes.php

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index 465f9d5b9a546778f820c76da5c3cb9d22abcd9b..fce5430be71ff433d64fd821d861edcb6b18d44c 100644 (file)
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -38,23 +38,23 @@
 
 // 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(__FILE__, __LINE__, getMessage('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("<div align=\"center\">");
 
 // Check for possible running rallyes
 $ADMIN = " AND d.is_active='Y'";
-if (IS_ADMIN()) $ADMIN = "";
+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'
@@ -97,15 +97,15 @@ if (SQL_NUMROWS($result) == 1) {
        define('__RALLYE_MAX_PRICES',  RALLYE_DETERMINE_MIN_PRICES($min_prices));
 
        // 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'));
 
        if ($expired === true) {
                define('__RALLYE_PRICES', RALLYE_LIST_WINNERS($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_PRICES', RALLYE_ADD_PRICES($id, 'html'));
                define('__RALLYE_TOP_USERS', RALLYE_ADD_TOPUSERS($id, getUserId()));
                define('__RALLYE_CAN_WIN_THIS', getMessage('RALLYE_YOU_CAN_WIN'));
        }