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

[mailer.git] / inc / reset / reset_daily.php

diff --git a/inc/reset/reset_daily.php b/inc/reset/reset_daily.php
index 0b5d3c7208f6bf35bc3f1f3cf80ee07bbf259f74..461fc4e19ae128709b42ee75b03197eac4aea027 100644 (file)
--- a/inc/reset/reset_daily.php
+++ b/inc/reset/reset_daily.php
@@ -40,56 +40,61 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
+if (($GLOBALS['output_mode'] == 1) || (!isResetModeEnabled())) return;
 //* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Update user profiles
 if (GET_EXT_VERSION("order") >= "0.1.1") {
        // Latest version
-       $result_daily = SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_user_data` SET receive_mails=max_mails, mail_orders=0 WHERE receive_mails != max_mails", __FILE__, __LINE__);
+       $result_daily = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET receive_mails=max_mails, mail_orders=0 WHERE receive_mails != max_mails", __FILE__, __LINE__);
 } else {
        // Obsolete version
-       $result_daily = SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_user_data` SET receive_mails=max_mails WHERE receive_mails != max_mails", __FILE__, __LINE__);
+       $result_daily = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET receive_mails=max_mails WHERE receive_mails != max_mails", __FILE__, __LINE__);
 }
 
 // Transfer points from locked_points to points
-$result_daily = SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE ref_payout=0 AND status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
+$result_daily = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE ref_payout=0 AND `status`='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
 
 //* DEBUG: */ echo basename(__FILE__).":payout=0;daily|numRows=".SQL_NUMROWS($result_daily)."<br />\n";
-if (SQL_NUMROWS($result_daily) > 0)
-{
+if (SQL_NUMROWS($result_daily) > 0) {
+       // Init SQLs
+       INIT_SQLS();
+
        // Start checking accounts which are on 0 confirmed-to-go mails
-       while (list($uid) = SQL_FETCHROW($result_daily))
-       {
-               //* DEBUG: */ echo basename(__FILE__).":uid={$uid}<br />\n";
-               $result_points = SQL_QUERY_ESC("SELECT ref_depth, locked_points FROM `{!MYSQL_PREFIX!}_user_points`
+       while ($content = SQL_FETCHARRAY($result_daily)) {
+               //* DEBUG: */ echo basename(__FILE__).":uid={$content['userid']}<br />\n";
+               $result_points = SQL_QUERY_ESC("SELECT ref_depth, locked_points FROM `{!_MYSQL_PREFIX!}_user_points`
 WHERE userid=%s AND locked_points != 0.00000 ORDER BY ref_depth",
-                array(bigintval($uid)), __FILE__, __LINE__);
+                       array(bigintval($content['userid'])), __FILE__, __LINE__);
+
                //* DEBUG: */ echo basename(__FILE__).":payout=0;points|numRows=".SQL_NUMROWS($result_points)."<br />\n";
-               if (SQL_NUMROWS($result_points) > 0)
-               {
+               if (SQL_NUMROWS($result_points) > 0) {
                        // Ok transfer points
-                       while (list($dep, $locked) = SQL_FETCHROW($result_points))
-                       {
-                               //* DEBUG: */ echo basename(__FILE__).":uid={$uid},depth={$dep},locked={$locked}<br />\n";
-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_points` SET points=points+%s, locked_points=0.00000
+                       while ($content2 = SQL_FETCHARRAY($result_points)) {
+                               // Merge both arrays
+                               $content = merge_array($content, $content2);
+
+                               //* DEBUG: */ echo basename(__FILE__).":uid={$content['userid']},depth={$content['ref_depth']},locked={$content['locked_points']}<br />\n";
+                               ADD_SQL(SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_points` SET points=points+%s, locked_points=0.00000
 WHERE userid=%s AND ref_depth=%d
 LIMIT 1",
-                                array($locked, bigintval($uid), $dep), __FILE__, __LINE__);
+                                       array($content['locked_points'], bigintval($content['userid']), $content['ref_depth']), __FILE__, __LINE__, false));
 
                                // Update mediadata as well
-                               if (GET_EXT_VERSION("mediadata") >= "0.0.4")
-                               {
+                               if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
                                        // Update database
-                                       MEDIA_UPDATE_ENTRY(array("total_points"), "add", $locked);
-                               }
-                       }
-               }
+                                       MEDIA_UPDATE_ENTRY(array("total_points"), "add", $content['locked_points']);
+                               } // END - if
+                       } // END - while
+               } // END - if
 
                // Free memory
                SQL_FREERESULT($result_points);
-       }
-}
+       } // END - while
+
+       // Run all SQLs
+       runFilterChain('run_sqls');
+} // END - if
 
 // Free memory
 SQL_FREERESULT($result_daily);