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

[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 3cb7911f3efe5333331c08052d57d743aa8064e3..3a63616d0485285715c0ea247beaceb50ac7288f 100644 (file)
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -55,28 +55,23 @@ $result = SQL_QUERY("SELECT DISTINCT d.id, d.admin_id, a.login, d.title, d.descr
  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 (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);
 
        $expired = false;
-       if ($end < time())
-       {
+       if ($end < 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() >= ($end - getConfig('one_day'))) {
                // Rallye will expire in less one day!
-               define('__RALLYE_EXTRAS', RALLYE_EXPIRE_ONE_DAY);
-       }
-        else
-       {
-               define('__RALLYE_EXTRAS', "<a href=\"{!URL!}/modules.php?module=login&amp;what=reflinks\">".RALLYE_GET_REFLINK."</a>");
+               define('__RALLYE_EXTRAS', getMessage('RALLYE_EXPIRE_ONE_DAY'));
+       } else {
+               define('__RALLYE_EXTRAS', "<a href=\"{!URL!}/modules.php?module=login&amp;what=reflinks\">{--RALLYE_GET_REFLINK--}</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>");
 
@@ -84,64 +79,41 @@ 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));
        }
 
-       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($min_users));
+       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"));
 
-       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
-       {
+               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_TOP_USERS', RALLYE_ADD_TOPUSERS($id, $GLOBALS['userid']));
-               define('__RALLYE_CAN_WIN_THIS', RALLYE_YOU_CAN_WIN);
+               define('__RALLYE_CAN_WIN_THIS', getMessage('RALLYE_YOU_CAN_WIN'));
        }
 
        // And load final template
        LOAD_TEMPLATE("guest_rallye_show");
-}
- else
-{
+} else {
        // No rallye found so far
        LOAD_TEMPLATE("guest_no_rallyes");
 }
+
 //
 OUTPUT_HTML("</div>");
+
 //
 ?>