X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Freset%2Freset_100_bonus.php;h=7514202808fe6be49a35626e7866335284b1305f;hb=0485696cfa583e48444a8c98a9eb0537b0cb33b1;hp=860af31134318f9cb90a00bf833e7875be156606;hpb=bcd59642c1ac0cf36f5b6890904a043529b9d974;p=mailer.git

diff --git a/inc/reset/reset_100_bonus.php b/inc/reset/reset_100_bonus.php
index 860af31134..7514202808 100644
--- 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: 06/20/2010 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : reset_100_bonus.php                              *
@@ -14,10 +14,9 @@
  * $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                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,14 +38,14 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
+} elseif ((!isHtmlOutputMode()) || (!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`
@@ -60,11 +59,8 @@ 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__);
@@ -74,7 +70,7 @@ if (SQL_NUMROWS($result_bonus) > 0) {
 
 		// Load email template and send email
 		$message = loadEmailTemplate('member_stats_bonus', $content, bigintval($content['userid']));
-		sendEmail($content['userid'], getMessage('BONUS_MEMBER_STATS_SUBJECT'), $message);
+		sendEmail($content['userid'], '{--MEMBER_BONUS_STATS_SUBJECT--}', $message);
 
 		// Update database
 		$result_update = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_stats` SET `bonus_stats_active`='Y' WHERE `id`=%s LIMIT 1",