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

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index b9a65e462f..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                    *
@@ -40,25 +38,25 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif (!isExtensionActive('beg')) {
+} elseif ((!isExtensionActive('beg')) || (isExtensionInstalledAndOlder('beg', '0.2.8'))) {
 	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, 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_ral_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_ral_en_notify') == 'Y') {
+		if (getConfig('beg_rallye_enable_notify') == 'Y') {
 			// Okay, let's check for member accounts
-			$sql .= '= 0 OR (`beg_ral_notify` > 0 AND `beg_ral_en_notify` < `beg_ral_di_notify`)';
-			$mode = 'en';
+			$sql .= '= 0 OR (`beg_rallye_enable_notify` > 0 AND `beg_rallye_enable_notify` < `beg_rallye_disable_notify`)';
+			$mode = 'enable';
 		} else {
 			// Do not notify!
 			$sql = '';
@@ -66,10 +64,10 @@ switch (getConfig('beg_rallye')) {
 		break;
 
 	case 'N': // Begging rallye is deactivated
-		if (getConfig('beg_ral_di_notify') == 'Y') {
+		if (getConfig('beg_rallye_disable_notify') == 'Y') {
 			// Okay, let's check for member accounts
-			$sql .= ' > 0 AND `beg_ral_di_notify` < `beg_ral_en_notify`';
-			$mode = 'di';
+			$sql .= ' > 0 AND `beg_rallye_disable_notify` < `beg_rallye_enable_notify`';
+			$mode = 'disable';
 		} else {
 			// Do not notify!
 			$sql = '';
@@ -82,24 +80,21 @@ if (!empty($sql)) {
 	$sql .= ") AND `status`='CONFIRMED' ORDER BY `last_online` ASC";
 
 	// No IP locking setuped by default
-	$content['ip_locker'] = getMessage('BEG_NO_LIMITATION');
+	$content['ip_locker'] = '{--BEG_NO_LIMITATION--}';
 
 	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
 	$result_main = SQL_QUERY($sql, __FILE__, __LINE__);
-	if (SQL_NUMROWS($result_main) > 0) {
+	if (!SQL_HASZERONUMS($result_main)) {
 		// Normal notification mails or bonus mails?
-		$sentBonusMails = ((getConfig('beg_notify_bonus') > 0) && ($mode == "en") && (isExtensionActive('bonus')));
-
-		// Generate subject line
-		$subject = getMessage('BEG_RALLYE_'.strtoupper($mode).'_NOTIFY');
+		$sentBonusMails = ((getConfig('beg_notify_bonus') > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
 
 		// Load message body for bonus mails
-		$message = loadEmailTemplate('beg_en_notify_body', '', '{PER}userid{PER}');
+		$message = loadEmailTemplate('beg_enable_notify_body', '', '{PER}userid{PER}');
 		$receiver = ''; $userids = array();
 
 		// Okay lets notify all users!
@@ -111,8 +106,7 @@ if (!empty($sql)) {
 			SQL_QUERY_ESC("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
-	`beg_ral_notify`=UNIX_TIMESTAMP(),
-	`beg_ral_%s_notify`=UNIX_TIMESTAMP()
+	`beg_rallye_%s_notify`=UNIX_TIMESTAMP()
 WHERE
 	`userid`=%s
 LIMIT 1",
@@ -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
 
@@ -138,10 +132,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('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