X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Freset%2Freset_100_bonus.php;h=4686d552966307861782619d0f09bb243c30e02f;hb=19188207e6802b82a134b340408cfa34b9b3a80f;hp=cff7b3f84f2c08002b12a612735efbfce6050dbe;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/reset/reset_100_bonus.php b/inc/reset/reset_100_bonus.php
index cff7b3f84f..4686d55296 100644
--- 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                              *
@@ -40,14 +40,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`
@@ -62,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__);
@@ -72,7 +72,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",