X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fbonus_mails.php;h=495c2b52cba920d975214811d85f1217856e7118;hb=188495baa4eae4327a063f99989ea503598b2174;hp=80c2558a52b32de4a5066f2f4e011bb42bdcfeb3;hpb=82d72ce0fd29e2714e62bd11997272eaf6110fd6;p=mailer.git

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 80c2558a52..495c2b52cb 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 - 2011 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 *
@@ -40,25 +38,24 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif (!isExtensionActive('bonus')) {
+} elseif ((!isExtensionActive('bonus')) || (isExtensionInstalledAndOlder('bonus', '0.9.2'))) {
 	return;
 }
 
 // Do not execute when script is in CSS mode
-if (getOutputMode() != 0) return;
+if (!isHtmlOutputMode()) return;
 
 // Create timemark from saved month
-$mark = mktime(0, 0, 0, getConfig('last_month'), date('d', time()), date('Y', time()));
+$mark = mktime(0, 0, 0, getLastMonth(), getDay(), getYear());
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?
-$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`bonus_ral_notify` ";
-switch (getConfig('bonus_active'))
-{
+$sql = "SELECT `userid`,`email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`bonus_rallye_enable_notify` ";
+switch (getConfig('bonus_active')) {
 	case 'Y': // Active rallye is activated
 		if (getConfig('bonus_enable_notify') == 'Y') {
 			// Okay, let's check for member accounts
-			$sql .= '= 0 OR (`bonus_ral_notify` > 0 AND `bonus_ral_enable_notify` < `bonus_ral_disable_notify`)';
+			$sql .= '= 0 OR (`bonus_rallye_enable_notify` > 0 AND `bonus_rallye_enable_notify` < `bonus_rallye_disable_notify`)';
 			$mode = 'enable';
 		} else {
 			// Do not notify!
@@ -69,14 +66,14 @@ switch (getConfig('bonus_active'))
 	case 'N': // Active rallye is deactivated
 		if (getConfig('bonus_disable_notify') == 'Y') {
 			// Okay, let's check for member accounts
-			$sql .= ' > 0 AND `bonus_ral_disable_notify` < `bonus_ral_enable_notify`';
+			$sql .= ' > 0 AND `bonus_rallye_disable_notify` < `bonus_rallye_enable_notify`';
 			$mode = 'disable';
 		} else {
 			// Do not notify!
 			$sql = '';
 		}
 		break;
-}
+} // END - switch
 
 if (!empty($sql)) {
 	// The SQL command needs to be finisched here (only confirmed accounts!)
@@ -85,24 +82,20 @@ if (!empty($sql)) {
 	// Normal notification mails or bonus mails?
 	$sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
 
-	// Generate subject line
-	$subject = getMessage('BONUS_RALLYE_' . strtoupper($mode).'_NOTIFY');
-
 	// 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_NUMROWS($result_main) > 0) {
+	if (!SQL_HASZERONUMS($result_main)) {
 		// Okay lets notify all users!
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Update account
 			SQL_QUERY_ESC("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
-	`bonus_ral_notify`=UNIX_TIMESTAMP(),
-	`bonus_ral_%s_notify`=UNIX_TIMESTAMP()
+	`bonus_rallye_%s_notify`=UNIX_TIMESTAMP()
 WHERE
 	`userid`=%s
 LIMIT 1",
@@ -118,7 +111,7 @@ LIMIT 1",
 			} 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
 
@@ -131,7 +124,7 @@ 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, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $url, 0, 'normal', SQL_NUMROWS($result_main));
 		} // END - if
 	} // END - if