Missing bonus mode 'ADD' added

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

diff --git a/inc/reset/reset_daily.php b/inc/reset/reset_daily.php
index 371b4c4ecf69effb92a9ad956e4a2d83621bbf4d..02b19d73f955b46c133ac856d0aee7d7630fbfbc 100644 (file)
--- a/inc/reset/reset_daily.php
+++ b/inc/reset/reset_daily.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -40,7 +38,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('sql_patches')) {
@@ -48,24 +46,27 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
+
 // 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
@@ -80,7 +81,7 @@ ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 
 //* DEBUG: */ debugOutput(basename(__FILE__) . ':payout=0;daily|numRows=' . SQL_NUMROWS($result_daily));
-if (SQL_NUMROWS($result_daily) > 0) {
+if (!SQL_HASZERONUMS($result_daily)) {
        // Init SQLs
        initSqls();
 
@@ -100,7 +101,7 @@ ORDER BY
                        array(bigintval($content['userid'])), __FILE__, __LINE__);
 
                //* DEBUG: */ debugOutput(basename(__FILE__) . ':payout=0;points|numRows=' . SQL_NUMROWS($result_points));
-               if (SQL_NUMROWS($result_points) > 0) {
+               if (!SQL_HASZERONUMS($result_points)) {
                        // Ok transfer points
                        while ($content2 = SQL_FETCHARRAY($result_points)) {
                                // Merge both arrays
@@ -141,5 +142,8 @@ LIMIT 1",
 // Free memory
 SQL_FREERESULT($result_daily);
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
+
 // [EOF]
 ?>