Even more rewrites/fixes from EL branch (please report any broken part after you...

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

diff --git a/inc/reset/reset_daily.php b/inc/reset/reset_daily.php
index be14b25c2b6c771e5a22f94472418411b989b992..da40de9122c28a925f81e84aa2b6e7a38c02bcaf 100644 (file)
--- a/inc/reset/reset_daily.php
+++ b/inc/reset/reset_daily.php
@@ -51,14 +51,14 @@ if ((getOutputMode() != 0) || (!isResetModeEnabled())) return;
 // Update user profiles
 if (isExtensionInstalledAndNewer('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` ASC", __FILE__, __LINE__);
+$result_daily = SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `ref_payout`=0 AND `status`='CONFIRMED' ORDER BY `userid` ASC", __FILE__, __LINE__);
 
 //* DEBUG: */ outputHtml(basename(__FILE__).":payout=0;daily|numRows=".SQL_NUMROWS($result_daily)."<br />");
 if (SQL_NUMROWS($result_daily) > 0) {
@@ -68,8 +68,16 @@ if (SQL_NUMROWS($result_daily) > 0) {
        // Start checking accounts which are on 0 confirmed-to-go mails
        while ($content = SQL_FETCHARRAY($result_daily)) {
                //* DEBUG: */ outputHtml(basename(__FILE__).":userid={$content['userid']}<br />");
-               $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` ASC",
+               $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` ASC",
                        array(bigintval($content['userid'])), __FILE__, __LINE__);
 
                //* DEBUG: */ outputHtml(basename(__FILE__).":payout=0;points|numRows=".SQL_NUMROWS($result_points)."<br />");
@@ -80,10 +88,20 @@ WHERE `userid`=%s AND `locked_points` != 0.00000 ORDER BY `ref_depth` ASC",
                                $content = merge_array($content, $content2);
 
                                //* DEBUG: */ outputHtml(basename(__FILE__).":userid={$content['userid']},depth={$content['ref_depth']},locked={$content['locked_points']}<br />");
-                               addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_points` SET `points`=`points`+%s, `locked_points`=0.00000
-WHERE `userid`=%s AND `ref_depth`=%d
+                               addSql(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($content['locked_points'], bigintval($content['userid']), $content['ref_depth']), __FILE__, __LINE__, false));
+                                       array(
+                                               $content['locked_points'],
+                                               bigintval($content['userid']),
+                                               $content['ref_depth']
+                                       ), __FILE__, __LINE__, false));
 
                                // Update mediadata as well
                                if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {