X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fbeg_mails.php;h=936bbc8b44c12e1675074bbc69cbc58a8e2f545a;hb=1551e5820800685c80c19871a376986c0ad6f0f6;hp=5806fe5f59fde9ba249d7924038f95c08d663447;hpb=00974432ffe0ed217b993e1ea5aaaac7dc31e82b;p=mailer.git

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 5806fe5f59..936bbc8b44 100644
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -45,19 +45,19 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode
-if (getOutputMode() != 0) return;
+if (getScriptOutputMode() != 0) 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_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!
@@ -82,7 +82,7 @@ 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
@@ -91,12 +91,12 @@ if (!empty($sql)) {
 
 	// 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 == 'enable') && (isExtensionActive('bonus')));
 
 		// Generate subject line
-		$subject = getMessage('BEG_RALLYE_'.strtoupper($mode).'_NOTIFY');
+		$subject = '{--BEG_RALLYE_' . strtoupper($mode) . '_NOTIFY--}';
 
 		// Load message body for bonus mails
 		$message = loadEmailTemplate('beg_enable_notify_body', '', '{PER}userid{PER}');
@@ -111,7 +111,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