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 67fb92f25f8f50353cd43a45522824e3cdd14269..fce5430be71ff433d64fd821d861edcb6b18d44c 100644 (file)
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -41,9 +41,9 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL('modules.php?module=index');
+       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;
 }
 
@@ -97,8 +97,8 @@ 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));