HTML->XHTML preparation (still *A LOT* to convert

[mailer.git] / inc / libs / rallye_functions.php

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index c313fa7389e2e3e40b4285d7032054eb35fe8c0a..c6ad2db0051b3fa74dd5c17d1ae7ffd089e5accb 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -249,14 +249,14 @@ LIMIT 1", array(bigintval($uid), getConfig('ref_payout')), __FILE__, __LINE__);
                $OUT .= "<TR>
   <TD class=\"switch_sw".$SW." bottom2\">&nbsp;&nbsp;".($idx+1).".</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2\">";
-               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
                $OUT .= $DATA['uid'][$idx];
-               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
+               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
                $OUT .= "</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2\">";
-               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
                $OUT .= $DATA['ref'][$idx];
-               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
+               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
                $OUT .= "</TD>
 </TR>\n";
                $SW = 3 - $SW;
@@ -511,9 +511,9 @@ function RALLYE_LOAD_PRICES_ARRAY($rallye)
        // Return array
        return $prices;
 }
+
 //
-function RALLYE_LOAD_USERS_ARRAY($rallye)
-{
+function RALLYE_LOAD_USERS_ARRAY ($rallye) {
        global $_CONFIG;
 
        // Fix zero points to 0.00000
@@ -528,9 +528,8 @@ function RALLYE_LOAD_USERS_ARRAY($rallye)
 
        // Load users                          uid    old  points earned
        $result_user = SQL_QUERY_ESC("SELECT userid, refs, curr_points FROM "._MYSQL_PREFIX."_rallye_users WHERE rallye_id=%s ORDER BY userid",
-        array(bigintval($rallye)), __FILE__, __LINE__);
-       while(list($uid, $refs, $cpoints) = SQL_FETCHROW($result_user))
-       {
+               array(bigintval($rallye)), __FILE__, __LINE__);
+       while (list($uid, $refs, $cpoints) = SQL_FETCHROW($result_user)) {
                // Load current ref count
                $cnt = RALLYE_GET_REFCOUNT($uid, $refs);
 
@@ -562,21 +561,23 @@ WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p
        $prices = RALLYE_LOAD_PRICES_ARRAY($rallye);
 
        // Merge users into prices
-       foreach ($prices['level'] as $k => $lvl)
-       {
-               $prices['uid'][$k]  = $users['uid'][$k];
-               if (empty($prices['uid'][$k])) $prices['uid'][$k]  = "---";
-               $prices['ref'][$k] = $users['ref'][$k];
-               if (empty($prices['ref'][$k])) $prices['ref'][$k] = "---";
-               $prices['cpoints'][$k] = $users['cpoints'][$k];
-       }
+       foreach ($prices['level'] as $k => $lvl) {
+               // We only need to check one element in $users, see above while() block
+               if (isset($users['uid'][$k])) {
+                       $prices['uid'][$k]  = $users['uid'][$k];
+                       if (empty($prices['uid'][$k])) $prices['uid'][$k]  = "---";
+                       $prices['ref'][$k] = $users['ref'][$k];
+                       if (empty($prices['ref'][$k])) $prices['ref'][$k] = "---";
+                       $prices['cpoints'][$k] = $users['cpoints'][$k];
+               } // END - if
+       } // END - foreach
 
        // Return completed array
        return $prices;
 }
+
 //
-function RALLYE_LIST_WINNERS($rallye,$default=0)
-{
+function RALLYE_LIST_WINNERS ($rallye, $default=0) {
        // First check how many prices are set
        $result_prices = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_rallye_prices WHERE rallye_id=%s ORDER BY price_level",
         array(bigintval($rallye)), __FILE__, __LINE__);
@@ -622,19 +623,19 @@ function RALLYE_LIST_WINNERS($rallye,$default=0)
                $OUT .= "<TR>
   <TD class=\"switch_sw".$SW." bottom2".$ADD."\">&nbsp;&nbsp;".($idx+1).".</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2".$ADD."\">";
-               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
                $OUT .= $DATA['uid'][$idx];
-               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
+               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
                $OUT .= "</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2".$ADD."\">";
-               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
                $OUT .= $DATA['ref'][$idx];
-               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
+               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
                $OUT .= "</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2".$ADD."\">";
-               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
                $OUT .= $DATA['infos'][$idx];
-               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
+               if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
                $OUT .= "</TD>
 </TR>\n";
                $SW = 3 - $SW;
@@ -716,15 +717,15 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
        if (!empty($ral[0]))
        {
                // Generate selection box for all found templates
-               $OUT  = "<SELECT name=\"".$name."\" size=\"1\" class=\"admin_select\">
-  <OPTION value=\"\">".SELECT_NONE."</OPTION>\n";
+               $OUT  = "<select name=\"".$name."\" size=\"1\" class=\"admin_select\">
+  <option value=\"\">".SELECT_NONE."</option>\n";
                foreach ($ral as $rallye)
                {
-                    $OUT .= "  <OPTION value=\"".$rallye."\"";
+                    $OUT .= "  <option value=\"".$rallye."\"";
                        if ($default == $rallye) $OUT .= " selected default";
-                       $OUT .= ">".$rallye."</OPTION>\n";
+                       $OUT .= ">".$rallye."</option>\n";
                }
-               $OUT .= "</SELECT>\n";
+               $OUT .= "</select>\n";
        }
         else
        {
@@ -743,15 +744,15 @@ function RALLYE_GET_REFCOUNT($uid, $old=0) {
        if (GET_EXT_VERSION("cache") >= "0.1.2") {
                // Get refs from cache
                $cnt = 0;
-               foreach ($cacheArray['ref_system']['userid'] as $id => $u_id) {
+               foreach ($cacheArray['refsystem']['userid'] as $id => $u_id) {
                        // Do we have a ref for this user?
-                       //* DEBUG: */ echo "id={$id},u_id={$u_id},uid={$uid},old={$old},level={$cacheArray['ref_system']['level'][$id]}<br />\n";
-                       if (($u_id == $uid) && ($cacheArray['ref_system']['level'][$id] == 1)) {
+                       //* DEBUG: */ echo "id={$id},u_id={$u_id},uid={$uid},old={$old},level={$cacheArray['refsystem']['level'][$id]}<br />\n";
+                       if (($u_id == $uid) && ($cacheArray['refsystem']['level'][$id] == 1)) {
                                //* DEBUG: */ echo "uid matches!<br />\n";
                                foreach ($cacheArray['ref_depths']['level'] as $level) {
-                                       if (($level == $cacheArray['ref_system']['level'][$id]) && ($level == 1)) {
+                                       if (($level == $cacheArray['refsystem']['level'][$id]) && ($level == 1)) {
                                                // Level does exist so abort here
-                                               $cnt = $cacheArray['ref_system']['counter'][$id];
+                                               $cnt = $cacheArray['refsystem']['counter'][$id];
                                                //* DEBUG: */ echo "*".$uid."/".$cnt."*<br />";
                                                break;
                                        } elseif ($level > 1) {
@@ -764,9 +765,9 @@ function RALLYE_GET_REFCOUNT($uid, $old=0) {
                                if ($cnt > 0) break;
                        }
                }
-               //* DEBUG: */ echo "<PRE>";
-               //* DEBUG: */ print_r($cacheArray['ref_system']);
-               //* DEBUG: */ echo "</PRE>";
+               //* DEBUG: */ echo "<pre>";
+               //* DEBUG: */ print_r($cacheArray['refsystem']);
+               //* DEBUG: */ echo "</pre>";
                //* DEBUG: */ die();
 
                if ($cnt > 0) {