Aliasing should be avoided, better we rename the column or/and use direct column...

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

diff --git a/inc/reset/reset_daily.php b/inc/reset/reset_daily.php
index 6071b76d863d1ed6728ba8d154680bc25e963e81..6b159cbcb245ce5acb4be647f93e9ced36c7ade4 100644 (file)
--- a/inc/reset/reset_daily.php
+++ b/inc/reset/reset_daily.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('sql_patches')) {
@@ -51,21 +51,21 @@ if (!defined('__SECURITY')) {
 // Update user profiles
 if (isExtensionInstalledAndNewer('order', '0.1.1')) {
        // Latest version
-       SQL_QUERY("UPDATE
+       SQL_QUERY('UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
        `receive_mails`=`max_mails`,
        `mail_orders`=0
 WHERE
-       `receive_mails` != `max_mails`", __FILE__, __LINE__);
+       `receive_mails` != `max_mails`', __FILE__, __LINE__);
 } else {
        // Obsolete version
-       SQL_QUERY("UPDATE
+       SQL_QUERY('UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
        `receive_mails`=`max_mails`
 WHERE
-       `receive_mails` != `max_mails`", __FILE__, __LINE__);
+       `receive_mails` != `max_mails`', __FILE__, __LINE__);
 }
 
 // Transfer points from locked_points to points
@@ -79,14 +79,14 @@ WHERE
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 
-//* DEBUG: */ outputHtml(basename(__FILE__).":payout=0;daily|numRows=".SQL_NUMROWS($result_daily)."<br />");
+//* DEBUG: */ debugOutput(basename(__FILE__) . ':payout=0;daily|numRows=' . SQL_NUMROWS($result_daily));
 if (SQL_NUMROWS($result_daily) > 0) {
        // Init SQLs
        initSqls();
 
        // 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 />");
+               //* DEBUG: */ debugOutput(basename(__FILE__) . ':' . $content['userid']);
                $result_points = SQL_QUERY_ESC("SELECT
        `ref_depth`,
        `locked_points`
@@ -99,14 +99,14 @@ ORDER BY
        `ref_depth` ASC",
                        array(bigintval($content['userid'])), __FILE__, __LINE__);
 
-               //* DEBUG: */ outputHtml(basename(__FILE__).":payout=0;points|numRows=".SQL_NUMROWS($result_points)."<br />");
+               //* DEBUG: */ debugOutput(basename(__FILE__) . ':payout=0;points|numRows=' . SQL_NUMROWS($result_points));
                if (SQL_NUMROWS($result_points) > 0) {
                        // Ok transfer points
                        while ($content2 = SQL_FETCHARRAY($result_points)) {
                                // Merge both arrays
                                $content = merge_array($content, $content2);
 
-                               //* DEBUG: */ outputHtml(basename(__FILE__).":userid={$content['userid']},depth={$content['ref_depth']},locked={$content['locked_points']}<br />");
+                               //* DEBUG: */ debugOutput(basename(__FILE__) . ':userid=' . $content['userid'].',depth='.$content['ref_depth'].',locked='.$content['locked_points']);
                                addSql(SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_user_points`
 SET