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 93dc5fdebf3902eb2f19301d5ec94b34681a38de..6d1dd45e9cfb2dad0e98ea9531aae9b5a3a90ece 100644 (file)
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -82,13 +82,10 @@ if (SQL_NUMROWS($result) == 1)
        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_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);