A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

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

diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index fc616fb5acbeb9c38e68094c0390e0a1c9fa71fa..6d1dd45e9cfb2dad0e98ea9531aae9b5a3a90ece 100644 (file)
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -36,21 +36,21 @@ 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(EXTENSION_PROBLEM_EXT_INACTIVE, "rallye");
+       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "rallye");
        return;
 }
 
 // Add description as navigation point
 ADD_DESCR("guest", __FILE__);
 
-OUTPUT_HTML("<DIV align=\"center\">");
+OUTPUT_HTML("<div align=\"center\">");
 
 // 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
+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__);
 
@@ -73,22 +73,19 @@ if (SQL_NUMROWS($result) == 1)
        }
         else
        {
-               define('__RALLYE_EXTRAS', "<A href=\"".URL."/modules.php?module=index&amp;what=register\">".RALLYE_REGISTER_NOW."</A>");
+               define('__RALLYE_EXTRAS', "<a href=\"{!URL!}/modules.php?module=index&amp;what=register\">".RALLYE_REGISTER_NOW."</a>");
        }
        // Set admin line (currently set to impressum, later to contact form)
-       define('__RALLYE_ADMIN', "<A href=\"".URL."/modules.php?module=index&amp;what=impressum&amp;admin=".$aid."\">".$login."</A>");
+       define('__RALLYE_ADMIN', "<a href=\"{!URL!}/modules.php?module=index&amp;what=impressum&amp;admin=".$aid."\">".$login."</a>");
 
        // Set title
        define('__RALLYE_TITLE', COMPILE_CODE($title));
 
        // Handle description...
-       if ((empty($descr)) && (!empty($templ)))
-       {
+       if ((empty($descr)) && (!empty($templ))) {
                // Use description from template
                define('__RALLYE_DESCR', LOAD_TEMPLATE("rallye_".$templ, true));
-       }
-        else
-       {
+       } else {
                // Use description from database
                define('__RALLYE_DESCR', COMPILE_CODE($descr));
        }
@@ -97,35 +94,22 @@ if (SQL_NUMROWS($result) == 1)
        define('__RALLYE_START', MAKE_DATETIME($start, "1"));
        define('__RALLYE_END'  , MAKE_DATETIME($end  , "1"));
 
-       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)
-       {
+       // 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
-       {
+       } 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);
        }
 
-       if ($expired)
-       {
+       if ($expired === true) {
                define('__RALLYE_PRICES', RALLYE_LIST_WINNERS($id));
-               define('__RALLYE_TOP_USERS', "<DIV align=\"center\" class=\"big\">".__RALLYE_EXTRAS."</DIV>");
+               define('__RALLYE_TOP_USERS', "<div align=\"center\" class=\"big\">".__RALLYE_EXTRAS."</div>");
                define('__RALLYE_CAN_WIN_THIS', RALLYE_OUR_WINNERS_ARE);
-       }
-        else
-       {
+       } 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);
@@ -140,6 +124,6 @@ if (SQL_NUMROWS($result) == 1)
        LOAD_TEMPLATE("guest_no_rallyes");
 }
 //
-OUTPUT_HTML("</DIV>");
+OUTPUT_HTML("</div>");
 //
 ?>