X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fbeg_mails.php;h=f6e2a9b52660b05d329474bbfdb4eca16a63441a;hb=d3384a2fb6eb9b4b9c7a022812380f2f549af7cd;hp=b4ea70bfd0f9c64b93bfdf831fad204ad7d91ea0;hpb=c364e5bc64df1f184602dec6a86ad2d70e8f83a9;p=mailer.git

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index b4ea70bfd0..f6e2a9b526 100644
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_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                    *
@@ -45,19 +43,19 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode
-if (getScriptOutputMode() != 0) return;
+if (!isHtmlOutputMode()) return;
 
 // Create timemark from saved month
 $mark = mktime(0, 0, 0, getConfig('last_month'), getDay(), getYear());
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?
-$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`beg_rallye_notify` ";
+$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`beg_rallye_enable_notify` ";
 switch (getConfig('beg_rallye')) {
 	case 'Y': // Begging rallye is activated
 		if (getConfig('beg_rallye_enable_notify') == 'Y') {
 			// Okay, let's check for member accounts
-			$sql .= '= 0 OR (`beg_rallye_notify` > 0 AND `beg_rallye_enable_notify` < `beg_rallye_disable_notify`)';
+			$sql .= '= 0 OR (`beg_rallye_enable_notify` > 0 AND `beg_rallye_enable_notify` < `beg_rallye_disable_notify`)';
 			$mode = 'enable';
 		} else {
 			// Do not notify!
@@ -86,7 +84,7 @@ if (!empty($sql)) {
 
 	if (getConfig('beg_ip_timeout') > 0) {
 		// Create timemark
-		$content['ip_locker'] = createFancyTime(getConfig('beg_ip_timeout'));
+		$content['ip_locker'] = '{%config,createFancyTime=beg_ip_timeout%}';
 	} // END - if
 
 	// Check for accounts to be notified
@@ -95,9 +93,6 @@ if (!empty($sql)) {
 		// Normal notification mails or bonus mails?
 		$sentBonusMails = ((getConfig('beg_notify_bonus') > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
 
-		// Generate subject line
-		$subject = '{--BEG_RALLYE_' . strtoupper($mode) . '_NOTIFY--}';
-
 		// Load message body for bonus mails
 		$message = loadEmailTemplate('beg_enable_notify_body', '', '{PER}userid{PER}');
 		$receiver = ''; $userids = array();
@@ -111,7 +106,6 @@ if (!empty($sql)) {
 			SQL_QUERY_ESC("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
-	`beg_rallye_notify`=UNIX_TIMESTAMP(),
 	`beg_rallye_%s_notify`=UNIX_TIMESTAMP()
 WHERE
 	`userid`=%s
@@ -128,7 +122,7 @@ LIMIT 1",
 			} else {
 				// Send normal notification mail to the members
 				$message = loadEmailTemplate('beg_' . $mode . '_notify', $content, $content['userid']);
-				sendEmail($content['email'], $subject, $message);
+				sendEmail($content['email'], '{--BEG_RALLYE_' . strtoupper($mode) . '_SUBJECT--}', $message);
 			}
 		} // END - while
 
@@ -141,7 +135,7 @@ LIMIT 1",
 			$url = 'modules.php?module=index&amp;what=login';
 
 			// Insert mail
-			addBonusMailToQueue($subject, $message, $receiver, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $url, 0, 'normal', SQL_NUMROWS($result_main));
+			addBonusMailToQueue('{--BEG_RALLYE_' . strtoupper($mode) . '_SUBJECT--}', $message, $receiver, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $url, 0, 'normal', SQL_NUMROWS($result_main));
 		} // END - if
 	} // END - if