Next wave of lesser getMessage() usage and more EL

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

diff --git a/inc/reset/reset_100_bonus.php b/inc/reset/reset_100_bonus.php
index f2509c85c6a028e68aa7ec697a115a3588e9c0b9..f5cff9424c94cdc307b6d5dab57e7bc291fa5607 100644 (file)
--- a/inc/reset/reset_100_bonus.php
+++ b/inc/reset/reset_100_bonus.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 10/25/2009 *
- * ===================                          Last change: 10/25/2009 *
+ * ===================                          Last change: 06/20/2010 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : reset_100_bonus.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 *
@@ -39,14 +40,14 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
+} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+       // Do not execute when script is in CSS mode or no daily reset
+       return;
 } elseif (!isExtensionActive('bonus')) {
+       logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
        return;
 }
 
-// Do not execute when script is in CSS mode or no daily reset
-if ((getOutputMode() != 0) || (!isResetModeEnabled())) return;
-//* DEBUG: */ outputHtml(basename(__FILE__)."<br />");
-
 // Check for 100% klickrate mails
 $result_bonus = SQL_QUERY("SELECT
        `id`, `userid`, `subject`, `timestamp_ordered`, `clicks`, `url`
@@ -61,7 +62,7 @@ ORDER BY
 
 if (SQL_NUMROWS($result_bonus) > 0) {
        // We found some mail orders...
-       while ($content = merge_array($content, SQL_FETCHARRAY($result_bonus))) {
+       while ($content = SQL_FETCHARRAY($result_bonus)) {
                // Add points
                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `bonus_stats`=`bonus_stats`+{?bonus_stats?} WHERE `userid`=%s LIMIT 1",
                        array(bigintval($content['userid'])), __FILE__, __LINE__);