Rewrites/fixes for while() loops with merge_array() and SQL_FETCHARRAY() usage

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

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 201b11db96ccf777313e6744022fc79cceabe1e5..0744b6b32c535c3083d4084007623ebc4d669a5a 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -72,7 +73,10 @@ function autostartReferalRallyes ($result) {
        $result_user = SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC", __FUNCTION__, __LINE__);
 
        // Let's begin with the userids...
-       while ($content = merge_array($content, SQL_FETCHARRAY($result_user))) {
+       while ($row = SQL_FETCHARRAY($result_user)) {
+               // Merge both arrays
+               $content = merge_array($content, $row);
+
                $un = false;
 
                // Get refs by userid
@@ -131,7 +135,7 @@ VALUES (%s, %s, %s, %s)",
                if (($notify == 'Y') && ($un)) {
                        // Load email template and send it to the user
                        $message = loadEmailTemplate('member_rallye_notify', $content, $content['userid']);
-                       sendEmail($content['userid'], sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $message);
+                       sendEmail($content['userid'], getMaskedMessage('RALLYE_MEMBER_NOTIFY', $title), $message);
                } // END - if
        } // END - while
 
@@ -140,7 +144,7 @@ VALUES (%s, %s, %s, %s)",
        if ($notify == 'Y') $templ = 'admin_rallye_notify';
 
        // Send email to admin
-       sendAdminNotification(sprintf(getMessage('RALLYE_ADMIN_NOTIFY'), $title), $templ, $prices, 0);
+       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_NOTIFY', $title), $templ, $prices);
 
        // Free memory
        SQL_FREERESULT($result_user);
@@ -182,7 +186,7 @@ ORDER BY
                SQL_FREERESULT($result_prices);
        } else {
                // No prices???
-               $prices = sprintf(getMessage('RALLYE_MEMBER_NO_PRICES'), $mode);
+               $prices = getMaskedMessage('RALLYE_MEMBER_NO_PRICES', $mode);
        }
 
        // Add last line for email mode
@@ -285,16 +289,16 @@ LIMIT 1",
                if (empty($DATA['ref'][$idx])) $DATA['ref'][$idx] = '---';
                // Add row
                $OUT .= "<tr>
-  <td class=\"switch_sw".$SW." bottom2\">&nbsp;&nbsp;".($idx+1).".</td>
-  <td align=\"center\" class=\"switch_sw".$SW." bottom2\">";
-               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
+  <td class=\"switch_sw".$SW." bottom\">".($idx+1).".</td>
+  <td align=\"center\" class=\"switch_sw".$SW." bottom\">";
+               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '<strong>';
                $OUT .= $DATA['userid'][$idx];
-               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
+               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '</strong>';
                $OUT .= "</td>
-  <td align=\"center\" class=\"switch_sw".$SW." bottom2\">";
-               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
+  <td align=\"center\" class=\"switch_sw".$SW." bottom\">";
+               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '<strong>';
                $OUT .= $DATA['ref'][$idx];
-               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
+               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '</strong>';
                $OUT .= "</td>
 </tr>\n";
                $SW = 3 - $SW;
@@ -346,7 +350,7 @@ LIMIT 1", __FUNCTION__, __LINE__);
                SQL_FREERESULT($result);
 
                if ($notify == 'Y') {
-                       // Transfer all neccessary data to the global $content array
+                       // Transfer all neccessary data to $content array
                        $content['start'] = generateDateTime($start, 2);
                        $content['end']   = generateDateTime($end  , 2);
                        $content['now_t'] = generateDateTime(time(), 2);
@@ -364,7 +368,7 @@ LIMIT 1", __FUNCTION__, __LINE__);
 
                        // Send notification to member
                        $message = loadEmailTemplate('member_rallye_notify', $content, $userid);
-                       sendEmail($userid, sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $message);
+                       sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_NOTIFY', $title), $message);
                } // END - if
 
                // Check if line is already included...
@@ -491,7 +495,7 @@ LIMIT 1",
 
                                // Load template
                                $message = loadEmailTemplate($template, $DATA, $userid);
-                               sendEmail($userid, sprintf(getMessage('RALLYE_MEMBER_EXPIRED_SUBJ'), $DATA['level']), $message);
+                               sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_EXPIRED_SUBJ', $DATA['level']), $message);
                        } // END - if
 
                        // Count userid
@@ -510,7 +514,7 @@ LIMIT 1",
        }
 
        // Send mail to admin
-       sendAdminNotification(sprintf(getMessage('RALLYE_ADMIN_EXPIRED_SUBJ'), $title), $templ, $cnt, 0);
+       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_EXPIRED_SUBJ', $title), $templ, $cnt);
 
        // Add task
        createNewTask('{--RALLYE_ADMIN_EXPIRED--}: ' . $title, '{--RALLYE_ADMIN_EXPIRED_TEXT--}', 'RALLYE_EXPIRED');
@@ -685,21 +689,21 @@ function addReferalRallyeWinners ($rallye, $default=0) {
                // Add row
                $add = '';
                $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['userid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
+  <td class=\"switch_sw".$SW." bottom".$add."\">".($idx+1).".</td>
+  <td align=\"center\" class=\"switch_sw".$SW." bottom".$add."\">";
+               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '<strong>';
                $OUT .= $DATA['userid'][$idx];
-               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
+               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '</strong>';
                $OUT .= "</td>
-  <td align=\"center\" class=\"switch_sw".$SW." bottom2".$add."\">";
-               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
+  <td align=\"center\" class=\"switch_sw".$SW." bottom".$add."\">";
+               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '<strong>';
                $OUT .= $DATA['ref'][$idx];
-               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
+               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '</strong>';
                $OUT .= "</td>
-  <td align=\"center\" class=\"switch_sw".$SW." bottom2".$add."\">";
-               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
+  <td align=\"center\" class=\"switch_sw".$SW." bottom".$add."\">";
+               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '<strong>';
                $OUT .= $DATA['infos'][$idx];
-               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
+               if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '</strong>';
                $OUT .= "</td>
 </tr>\n";
                $SW = 3 - $SW;
@@ -733,7 +737,7 @@ WHERE end_time <= (UNIX_TIMESTAMP() - {?ONE_DAY?} - %s) AND expired='Y'",
                        $content['now_time']    = generateDateTime(time(), 1);
 
                        // Send mail to admin
-                       sendAdminNotification(sprintf(getMessage('RALLYE_ADMIN_PURGED_SUBJ'), $content['title']), 'admin_rallye_purged', $content, 0);
+                       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_PURGED_SUBJ', $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",
@@ -866,7 +870,7 @@ function determineReferalRallyeMinimumUsers ($min_users) {
 
        if ($min_users > 0) {
                // Rallye ends when X members are totally in your exchange
-               $return = sprintf(getMessage('RALLYE_END_USERS'), $min_users);
+               $return = getMaskedMessage('RALLYE_END_USERS', $min_users);
        } // END - if
 
        // Return
@@ -880,7 +884,7 @@ function determineReferalRallyeMinimumPrices ($min_prices) {
 
        if ($min_prices > 0) {
                // Rallye ends when X members are totally in your exchange
-               $return = sprintf(getMessage('RALLYE_END_PRICES'), $min_prices);
+               $return = getMaskedMessage('RALLYE_END_PRICES', $min_prices);
        } // END - if
 
        // Return