Fixes for member registration (IP lock) and rewrites for remote IP address

[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 ab6e348bb1d2f85f6b2d8226545986e152ac8ca0..a4b75fd4ef538a9ec82a9c786241e8b92633aa02 100644 (file)
--- a/inc/reset/reset_100_bonus.php
+++ b/inc/reset/reset_100_bonus.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/25/2009 *
- * ===============                              Last change: 10/25/2009 *
+ * Mailer v0.2.1-FINAL                                Start: 10/25/2009 *
+ * ===================                          Last change: 10/25/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * 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 *
@@ -44,7 +45,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if ((getOutputMode() != 0) || (!isResetModeEnabled()) || (getConfig('beg_rallye') == 'Y')) return;
+if ((getOutputMode() != 0) || (!isResetModeEnabled())) return;
 //* DEBUG: */ outputHtml(basename(__FILE__)."<br />");
 
 // Check for 100% klickrate mails
@@ -53,22 +54,21 @@ $result_bonus = SQL_QUERY("SELECT
 FROM
        `{?_MYSQL_PREFIX?}_user_stats`
 WHERE
-       `max_rec`=`clicks` AND `clicks` > 0 AND `bonus_stats_active`='N'
+       `max_rec`=`clicks` AND
+       `clicks` > 0 AND
+       `bonus_stats_active`='N'
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result_bonus) > 0) {
-       // Remember stats bonus in constant
-       $content['points'] = translateComma(getConfig('bonus_stats'));
-
        // 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__);
 
                // Translate some data
-               $content['timestamp'] = generateDateTime($content['timestamp_ordered'], '2');
+               $content['timestamp'] = generateDateTime($content['timestamp_ordered'], 2);
 
                // Load email template and send email
                $message = loadEmailTemplate('member_stats_bonus', $content, bigintval($content['userid']));