Our convention says if(-else) blocks should not be put in one line

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

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index acb09444c5c049133c79d66149084909a22c21c2..ca7e60fb54485d1b44931d4c2fcb8de472c457bd 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;
 
@@ -292,8 +292,12 @@ LIMIT 1",
                $userid = '---';
 
                // List only users with at least one ref!
-               //* DEBUG: */ print("*".$cnt.'/'.$content['userid'].'/'.$content['curr_points'].'/'.$refpoints."*<br />");
-               if (($cnt > 0) && ($refpoints > $content['curr_points'])) { $userid = $content['userid']; } else { $cnt = ''; }
+               //* DEBUG: */ debugOutput('*'.$cnt.'/'.$content['userid'].'/'.$content['curr_points'].'/'.$refpoints.'*');
+               if (($cnt > 0) && ($refpoints > $content['curr_points'])) {
+                       $userid = $content['userid'];
+               } else {
+                       $cnt = '';
+               }
 
                // Save values to array
                $DATA['userid'][]   = $userid;
@@ -311,11 +315,7 @@ LIMIT 1",
 
        // Generate table
        $OUT = '';
-       $SW = 2;
        for ($idx = '0'; $idx < $prices; $idx++) {
-               if (empty($DATA['userid'][$idx])) $DATA['userid'][$idx] = '---';
-               if (empty($DATA['ref'][$idx])) $DATA['ref'][$idx] = '---';
-
                // Prepare marking of default (maybe current user's) id
                $start = ''; $end = '';
                if (($DATA['userid'][$idx] == $default) && ($default > 0)) {
@@ -325,18 +325,16 @@ LIMIT 1",
 
                // Prepare content
                $content = array(
-                       'sw'     => $SW,
                        'idx'    => ($idx + 1),
                        'start'  => $start,
                        'end'    => $end,
                        'userid' => $DATA['userid'][$idx],
                        'ref'    => $DATA['ref'][$idx],
-                       'info'   => ''
+                       'infos'  => ''
                );
 
                // Load row template and switch color
                $OUT .= loadTemplate('guest_rallye_row', true, $content);
-               $SW = 3 - $SW;
        } // END - for
 
        // Add min_prices/users
@@ -530,7 +528,7 @@ function markReferalRallyesAsExpired ($result) {
 
                                // Load template
                                $message = loadEmailTemplate($template, $DATA, $userid);
-                               sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_EXPIRED_SUBJ', $DATA['level']), $message);
+                               sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_EXPIRED_SUBJECT', $DATA['level']), $message);
                        } // END - if
 
                        // Count userid
@@ -549,9 +547,9 @@ function markReferalRallyesAsExpired ($result) {
        }
 
        // Send mail to admin
-       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_EXPIRED_SUBJ', $title), $templ, $cnt);
+       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_EXPIRED_SUBJECT', $title), $templ, $cnt);
 
-       // Add task
+       // Add task (we ignore the task id here)
        createNewTask('{--RALLYE_ADMIN_EXPIRED--}: ' . $title, '{--RALLYE_ADMIN_EXPIRED_TEXT--}', 'RALLYE_EXPIRED');
 }
 
@@ -694,9 +692,7 @@ LIMIT 1",
                // We only need to check one element in $users, see above while() block
                if (isset($users['userid'][$k])) {
                        $prices['userid'][$k]  = $users['userid'][$k];
-                       if (empty($prices['userid'][$k])) $prices['userid'][$k]  = '---';
-                       $prices['ref'][$k] = $users['ref'][$k];
-                       if (empty($prices['ref'][$k])) $prices['ref'][$k] = '---';
+                       $prices['ref'][$k]     = $users['ref'][$k];
                        $prices['cpoints'][$k] = $users['cpoints'][$k];
                } // END - if
        } // END - foreach
@@ -708,24 +704,20 @@ LIMIT 1",
 // @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId()
 function addReferalRallyeWinners ($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` ASC",
-               array(bigintval($rallye)), __FUNCTION__, __LINE__);
-       $prices = SQL_NUMROWS($result_prices);
-       SQL_FREERESULT($result_prices);
+       $prices = countSumTotalData(bigintval($rallye), 'rallye_prices', 'id', 'rallye_id', true);
 
        // Load data
        $DATA = getArrayFromReferalRallyeUsers($rallye);
 
        // Generate table
-       $OUT = ''; $SW = 2;
+       $OUT = '';
        for ($idx = '0'; $idx < $prices; $idx++) {
                // Check status
                //   active = 1: account is still confirmed
                //   active = 0: account is deleted or locked
                $active = countSumTotalData($DATA['userid'][$idx], 'user_data', 'userid', 'userid', true, " AND `status`='CONFIRMED'");
 
-               if (empty($DATA['userid'][$idx])) $DATA['userid'][$idx] = '---';
-               if ((empty($DATA['ref'][$idx])) || ($DATA['ref'][$idx] == '0') || ($active == '0') || ("".round($DATA['cpoints'][$idx])."" == '0') || (empty($DATA['cpoints'][$idx]))) {
+               if ((empty($DATA['ref'][$idx])) || ($DATA['ref'][$idx] == '0') || ($active == '0') || ('' . round($DATA['cpoints'][$idx]) . '' == '0') || (empty($DATA['cpoints'][$idx]))) {
                        // Allow valid and active users with at least one ref to get points
                        $DATA['ref'][$idx]   = '---';
                        $DATA['userid'][$idx]   = '---';
@@ -748,7 +740,6 @@ function addReferalRallyeWinners ($rallye, $default=0) {
 
                // Prepare content
                $content = array(
-                       'sw'     => $SW,
                        'idx'    => ($idx + 1),
                        'userid' => $DATA['userid'][$idx],
                        'ref'    => $DATA['ref'][$idx],
@@ -759,7 +750,6 @@ function addReferalRallyeWinners ($rallye, $default=0) {
 
                // Load row template
                $OUT .= loadTemplate('guest_rallye_row', true, $content);
-               $SW = 3 - $SW;
        } // END - for
 
        // Prepare content
@@ -786,7 +776,7 @@ WHERE
        `expired`='Y'",
                array($EXPIRE), __FUNCTION__, __LINE__);
 
-       if (SQL_NUMROWS($result_rallye) > 0) {
+       if (!SQL_HASZERONUMS($result_rallye)) {
                // Init SQLs
                initSqls();
 
@@ -798,7 +788,7 @@ WHERE
                        $content['now_time']    = generateDateTime(time(), 1);
 
                        // Send mail to admin
-                       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_PURGED_SUBJ', $content['title']), 'admin_rallye_purged', $content);
+                       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_PURGED_SUBJECT', $content['title']), 'admin_rallye_purged', $content);
 
                        // Purge whole rallye
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",
@@ -808,7 +798,7 @@ WHERE
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s LIMIT 1",
                                array(bigintval($content['id'])), __FUNCTION__, __LINE__, false));
 
-                       // Add task
+                       // Add task (we ignore the task id here
                        createNewTask('{--RALLYE_ADMIN_PURGED--}: ' . $content['title'], '{--RALLYE_ADMIN_PURGED_TEXT--}', 'RALLYE_PURGED');
                } // END - while
 
@@ -855,7 +845,7 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') {
                $OUT .= '</select>';
        } else {
                // No rallye templates found
-               $OUT = getMessage('RALLYE_NO_TEMPLATES_FOUND');
+               $OUT = '{--RALLYE_NO_TEMPLATES_FOUND--}';
        }
 
        // Return selection
@@ -870,14 +860,14 @@ function getReferalRallyeRefsCount ($currUserid, $old = '0') {
                $cnt = '0';
                foreach ($GLOBALS['cache_array']['refsystem']['userid'] as $id => $userid) {
                        // Do we have a ref for this user?
-                       //* DEBUG: */ print("id={$id},userid={$userid},userid={$userid},old={$old},level={$GLOBALS['cache_array']['refsystem']['level'][$id]}<br />");
+                       //* DEBUG: */ debugOutput('id='.$id.',userid='.$userid.',userid='.$userid.',old='.$old.',level='.$GLOBALS['cache_array']['refsystem']['level'][$id]);
                        if (($currUserid == $userid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) {
-                               //* DEBUG: */ print("userid matches!<br />");
+                               //* DEBUG: */ debugOutput('userid matches!');
                                foreach ($GLOBALS['cache_array']['refdepths']['level'] as $level) {
                                        if (($level == $GLOBALS['cache_array']['refsystem']['level'][$id]) && ($level == 1)) {
                                                // Level does exist so abort here
                                                $cnt = $GLOBALS['cache_array']['refsystem']['counter'][$id];
-                                               //* DEBUG: */ print("*".$userid.'/'.$cnt."*<br />");
+                                               //* DEBUG: */ debugOutput('*'.$userid.'/'.$cnt.'*');
                                                break;
                                        } elseif ($level > 1) {
                                                // Not interesting here...
@@ -890,9 +880,7 @@ function getReferalRallyeRefsCount ($currUserid, $old = '0') {
                        } // END - if
                } // END - foreach
 
-               //* DEBUG: */ print("<pre>");
-               //* DEBUG: */ print(print_r($GLOBALS['cache_array']['refsystem'], true));
-               //* DEBUG: */ print("</pre>");
+               //* DEBUG: */ debugOutput('<pre>'.print_r($GLOBALS['cache_array']['refsystem'], true).'</pre>');
                //* DEBUG: */ shutdown();
 
                if ($cnt > 0) {
@@ -900,7 +888,7 @@ function getReferalRallyeRefsCount ($currUserid, $old = '0') {
                        incrementStatsEntry('cache_hits');
 
                        // Remove old refs
-                       //* DEBUG: */ print('+'.$cnt.'/'.$old."+<br />");
+                       //* DEBUG: */ debugOutput('+'.$cnt.'/'.$old.'+');
                        $cnt -= $old;
                } // END - if
        } else {
@@ -933,14 +921,14 @@ WHERE
        }
 
        // Return count
-       //* DEBUG: */ print("*".$userid.'/'.$old.'/'.$cnt."*<br />");
+       //* DEBUG: */ debugOutput('*'.$userid.'/'.$old.'/'.$cnt.'*');
        return $cnt;
 }
 
 // Determines the right language string for min_users
 function determineReferalRallyeMinimumUsers ($min_users) {
        // Rallye ends without user limitation is the default
-       $return = getMessage('RALLYE_END_NO_USER_LIMITATION');
+       $return = '{--RALLYE_END_NO_USER_LIMITATION--}';
 
        if ($min_users > 0) {
                // Rallye ends when X members are totally in your exchange
@@ -954,7 +942,7 @@ function determineReferalRallyeMinimumUsers ($min_users) {
 // Determines the right language string for min_prices
 function determineReferalRallyeMinimumPrices ($min_prices) {
        // Rallye ends without user limitation is the default
-       $return = getMessage('RALLYE_END_NO_PRICE_LIMITATION');
+       $return = '{--RALLYE_END_NO_PRICE_LIMITATION--}';
 
        if ($min_prices > 0) {
                // Rallye ends when X members are totally in your exchange