X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmails%2Fbonus_mails.php;h=d1a9ff84f04fe262c06ada7e962dda1bd97dd164;hb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d;hp=ed88899d9f5953dc9f50caa4a2b5d844228d6987;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index ed88899d9f..d1a9ff84f0 100644
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -14,8 +14,6 @@
  * $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                    *
@@ -40,26 +38,25 @@
 // 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_en_notify') == 'Y') {
+		if (getConfig('bonus_enable_notify') == 'Y') {
 			// Okay, let's check for member accounts
-			$sql .= '= 0 OR (`bonus_ral_notify` > 0 AND `bonus_ral_en_notify` < `bonus_ral_di_notify`)';
-			$mode = 'en';
+			$sql .= '= 0 OR (`bonus_rallye_enable_notify` > 0 AND `bonus_rallye_enable_notify` < `bonus_rallye_disable_notify`)';
+			$mode = 'enable';
 		} else {
 			// Do not notify!
 			$sql = '';
@@ -67,41 +64,38 @@ switch (getConfig('bonus_active'))
 		break;
 
 	case 'N': // Active rallye is deactivated
-		if (getConfig('bonus_di_notify') == 'Y') {
+		if (getConfig('bonus_disable_notify') == 'Y') {
 			// Okay, let's check for member accounts
-			$sql .= ' > 0 AND `bonus_ral_di_notify` < `bonus_ral_en_notify`';
-			$mode = 'di';
+			$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!)
 	$sql .= ") AND `status`='CONFIRMED' ORDER BY `last_online` ASC";
 
 	// Normal notification mails or bonus mails?
-	$sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == "en") && (isExtensionActive('bonus')));
-
-	// Generate subject line
-	$subject = getMessage('BONUS_RALLYE_' . strtoupper($mode).'_NOTIFY');
+	$sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
 
 	// Load message body for bonus mails
-	$message = loadEmailTemplate('bonus_en_notify_body', '', '{PER}userid{PER}');
+	$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`
+			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",
@@ -117,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['email'], '{--MEMBER_BONUS_RALLYE_' . strtoupper($mode) . '_SUBJECT--}', $message);
 			}
 		} // END - while
 
@@ -127,10 +121,10 @@ LIMIT 1",
 			$receiver = implode(';', $userids);
 
 			// Prepare URL
-			$URL = 'modules.php?module=index&amp;what=login';
+			$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