X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmails%2Fbonus_mails.php;h=2493a25e5918252d47ce4df5b82ce225b31d2b8f;hp=2b9ff117c477fa7130f3fc476e62017a78633f18;hb=596c8ab32594401ca84abfbfe35513ddfff31bec;hpb=67f53c107d5b68f6e735407b98803fc83e12d7b4

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 2b9ff117c4..2493a25e59 100644
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -14,12 +14,10 @@
  * $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                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -41,14 +39,15 @@
 if (!defined('__SECURITY')) {
 	die();
 } elseif ((!isExtensionActive('bonus')) || (isExtensionInstalledAndOlder('bonus', '0.9.2'))) {
+	// Do not execute script on missing/out-dated extension ext-bonus
+	return;
+} elseif (!isHtmlOutputMode()) {
+	// Do not execute script if not in HTML mode
 	return;
 }
 
-// Do not execute when script is in CSS mode
-if (getScriptOutputMode() != 0) return;
-
 // Create timemark from saved month
-$mark = mktime(0, 0, 0, getConfig('last_month'), getDay(), getYear());
+$mark = mktime(0, 0, 0, getLastMonth(), getDay(), getYear());
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?
@@ -79,14 +78,11 @@ switch (getConfig('bonus_active')) {
 
 if (!empty($sql)) {
 	// The SQL command needs to be finisched here (only confirmed accounts!)
-	$sql .= ") AND `status`='CONFIRMED' ORDER BY `last_online` ASC";
+	$sql .= ')' . runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'") . ' ORDER BY `last_online` ASC';
 
 	// Normal notification mails or bonus mails?
 	$sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
 
-	// Generate subject line
-	$subject = '{--MEMBER_BONUS_RALLYE_' . strtoupper($mode) . '_SUBJECT--}';
-
 	// Load message body for bonus mails
 	$message = loadEmailTemplate('bonus_enable_notify_body', '', '{PER}userid{PER}');
 	$receiver = ''; $userids = array();
@@ -110,18 +106,18 @@ LIMIT 1",
 				), __FILE__, __LINE__);
 
 			// Load email template and send it to the user!
-			if ($sentBonusMails === true) {
+			if ($sentBonusMails === TRUE) {
 				// Add userid to queue
-				$userids[] = $content['userid'];
+				array_push($userids, $content['userid']);
 			} else {
 				// Send normal notification mail to the members
 				$message = loadEmailTemplate('bonus_' . $mode . '_notify', $content, $content['userid']);
-				sendEmail($content['email'], $subject, $message);
+				sendEmail($content['userid'], '{--MEMBER_BONUS_RALLYE_' . strtoupper($mode) . '_SUBJECT--}', $message);
 			}
 		} // END - while
 
 		// Shall I send out bonus mails?
-		if ($sentBonusMails === true) {
+		if ($sentBonusMails === TRUE) {
 			// Okay, make array to string
 			$receiver = implode(';', $userids);
 
@@ -129,7 +125,7 @@ LIMIT 1",
 			$url = 'modules.php?module=index&what=login';
 
 			// Insert mail
-			addBonusMailToQueue($subject, $message, $receiver, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $url, 0, 'normal', SQL_NUMROWS($result_main));
+			addBonusMailToQueue('{--MEMBER_BONUS_RALLYE_' . strtoupper($mode) . '_SUBJECT--}', $message, $receiver, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $url, 0, 'normal', SQL_NUMROWS($result_main));
 		} // END - if
 	} // END - if