Naming convention further applied, TODOs.txt updated

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

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 1e1139e3a9b0f4365a3255a7cb65c69c9bdf622e..b0fd3a9943681453f315d277b4a1bacc472cc6dd 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -177,8 +177,8 @@ WHERE
 function addReferalRallyePrices ($rallye, $mode = 'email') {
        // Output mode
        switch($mode) {
-               case 'email': $mode = "\n";       break;
-               case 'html' : $mode = "<br />\n"; break;
+               case 'email': $mode = "\n";     break;
+               case 'html' : $mode = '<br />'; break;
        } // END - switch
 
        // Load prices
@@ -193,7 +193,7 @@ ORDER BY
                array($rallye), __FUNCTION__, __LINE__);
 
        // Entries found?
-       if (SQL_NUMROWS($result_prices) > 0) {
+       if (!SQL_HASZERONUMS($result_prices)) {
                // Load prices
                if ($mode == "\n") $prices = '{--RALLYE_MEMBER_PRICES_ADDED--}:' . $mode . '------------------------------' . $mode;
 
@@ -311,7 +311,6 @@ LIMIT 1",
 
        // Generate table
        $OUT = '';
-       $SW = 2;
        for ($idx = '0'; $idx < $prices; $idx++) {
                // Prepare marking of default (maybe current user's) id
                $start = ''; $end = '';
@@ -322,7 +321,6 @@ LIMIT 1",
 
                // Prepare content
                $content = array(
-                       'sw'     => $SW,
                        'idx'    => ($idx + 1),
                        'start'  => $start,
                        'end'    => $end,
@@ -333,7 +331,6 @@ LIMIT 1",
 
                // Load row template and switch color
                $OUT .= loadTemplate('guest_rallye_row', true, $content);
-               $SW = 3 - $SW;
        } // END - for
 
        // Add min_prices/users
@@ -712,7 +709,7 @@ function addReferalRallyeWinners ($rallye, $default=0) {
        $DATA = getArrayFromReferalRallyeUsers($rallye);
 
        // Generate table
-       $OUT = ''; $SW = 2;
+       $OUT = '';
        for ($idx = '0'; $idx < $prices; $idx++) {
                // Check status
                //   active = 1: account is still confirmed
@@ -742,7 +739,6 @@ function addReferalRallyeWinners ($rallye, $default=0) {
 
                // Prepare content
                $content = array(
-                       'sw'     => $SW,
                        'idx'    => ($idx + 1),
                        'userid' => $DATA['userid'][$idx],
                        'ref'    => $DATA['ref'][$idx],
@@ -753,7 +749,6 @@ function addReferalRallyeWinners ($rallye, $default=0) {
 
                // Load row template
                $OUT .= loadTemplate('guest_rallye_row', true, $content);
-               $SW = 3 - $SW;
        } // END - for
 
        // Prepare content
@@ -780,7 +775,7 @@ WHERE
        `expired`='Y'",
                array($EXPIRE), __FUNCTION__, __LINE__);
 
-       if (SQL_NUMROWS($result_rallye) > 0) {
+       if (!SQL_HASZERONUMS($result_rallye)) {
                // Init SQLs
                initSqls();