X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fbonus_mails.php;h=e036bebcffd0626109b56b53ea2efd3b42c318e3;hb=a00ad7dd8c36a5322e28f38d8d641efb90c00c92;hp=c236c76b44acf66ef528890cfc8d9e17bb71ea80;hpb=30ae22f62ae87c53a56baf0d134569ba91011111;p=mailer.git

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index c236c76b44..e036bebcff 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 - 2013 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,23 +39,24 @@
 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, getLastMonthly(), getDay(), getYear());
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?
-$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`bonus_rallye_notify` ";
-switch (getConfig('bonus_active')) {
+$sql = "SELECT `d`.`userid`, `d`.`email` FROM `{?_MYSQL_PREFIX?}_user_data` AS `d` WHERE (`d`.`bonus_rallye_enable_notify` ";
+switch (getBonusActive()) {
 	case 'Y': // Active rallye is activated
-		if (getConfig('bonus_enable_notify') == 'Y') {
+		if (getBonusEnableNotify() == 'Y') {
 			// Okay, let's check for member accounts
-			$sql .= '= 0 OR (`bonus_rallye_notify` > 0 AND `bonus_rallye_enable_notify` < `bonus_rallye_disable_notify`)';
+			$sql .= '= 0 OR (`d`.`bonus_rallye_enable_notify` > 0 AND `d`.`bonus_rallye_enable_notify` < `d`.`bonus_rallye_disable_notify`)';
 			$mode = 'enable';
 		} else {
 			// Do not notify!
@@ -66,9 +65,9 @@ switch (getConfig('bonus_active')) {
 		break;
 
 	case 'N': // Active rallye is deactivated
-		if (getConfig('bonus_disable_notify') == 'Y') {
+		if (getBonusDisableNotify() == 'Y') {
 			// Okay, let's check for member accounts
-			$sql .= ' > 0 AND `bonus_rallye_disable_notify` < `bonus_rallye_enable_notify`';
+			$sql .= ' > 0 AND `d`.`bonus_rallye_disable_notify` < `d`.`bonus_rallye_enable_notify`';
 			$mode = 'disable';
 		} else {
 			// Do not notify!
@@ -79,28 +78,24 @@ 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 `d`.`status`='CONFIRMED'") . ' ORDER BY `d`.`last_online` ASC';
 
 	// Normal notification mails or bonus mails?
-	$sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
-
-	// Generate subject line
-	$subject = '{--BONUS_RALLYE_' . strtoupper($mode) . '_NOTIFY--}';
+	$sentBonusMails = ((getBonusNotifyPoints() > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
 
 	// Load message body for bonus mails
 	$message = loadEmailTemplate('bonus_enable_notify_body', '', '{PER}userid{PER}');
 	$receiver = ''; $userids = array();
 
 	// Check for accounts to be notified
-	$result_main = SQL_QUERY($sql, __FILE__, __LINE__);
-	if (!SQL_HASZERONUMS($result_main)) {
+	$result_main = sqlQuery($sql, __FILE__, __LINE__);
+	if (!ifSqlHasZeroNums($result_main)) {
 		// Okay lets notify all users!
-		while ($content = SQL_FETCHARRAY($result_main)) {
+		while ($content = sqlFetchArray($result_main)) {
 			// Update account
-			SQL_QUERY_ESC("UPDATE
+			sqlQueryEscaped("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
-	`bonus_rallye_notify`=UNIX_TIMESTAMP(),
 	`bonus_rallye_%s_notify`=UNIX_TIMESTAMP()
 WHERE
 	`userid`=%s
@@ -111,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);
 
@@ -130,12 +125,12 @@ LIMIT 1",
 			$url = 'modules.php?module=index&amp;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, getBonusNotifyPoints(), getConfig('bonus_notify_wait'), $url, 0, 'normal', sqlNumRows($result_main));
 		} // END - if
 	} // END - if
 
 	// Free memory
-	SQL_FREERESULT($result_main);
+	sqlFreeResult($result_main);
 } // END - if
 
 //