X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fbeg_mails.php;h=58fae33f77bf0cf589351da5ddc6685a92ac368b;hb=a524135c24dd0a8fa359c9a92399467d50fd69e0;hp=902997e72954985f496c63b83d8f25708e7af677;hpb=2df9f7a53f8b1dd5164f87824a324ccb3b6634cb;p=mailer.git

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 902997e729..58fae33f77 100644
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Versendet Erinnerungsmails                       *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -47,16 +42,16 @@ if (!defined('__SECURITY')) {
 }
 
 // Create timemark from saved month
-$mark = mktime(0, 0, 0, getLastMonth(), getDay(), getYear());
+$mark = mktime(0, 0, 0, getLastMonthly(), getDay(), getYear());
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?
-$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`beg_rallye_enable_notify` ";
+$sql = "SELECT `d`.`userid`, `d`.`email` FROM `{?_MYSQL_PREFIX?}_user_data` AS `d` WHERE (`d`.`beg_rallye_enable_notify` ";
 switch (getBegRallye()) {
 	case 'Y': // Begging rallye is activated
 		if (isBegRallyeEnableNotifyEnabled()) {
 			// Okay, let's check for member accounts
-			$sql .= '= 0 OR (`beg_rallye_enable_notify` > 0 AND `beg_rallye_enable_notify` < `beg_rallye_disable_notify`)';
+			$sql .= '= 0 OR (`d`.`beg_rallye_enable_notify` > 0 AND `d`.`beg_rallye_enable_notify` < `d`.`beg_rallye_disable_notify`)';
 			$mode = 'enable';
 		} else {
 			// Do not notify!
@@ -67,7 +62,7 @@ switch (getBegRallye()) {
 	case 'N': // Begging rallye is deactivated
 		if (isBegRallyeDisableNotifyEnabled()) {
 			// Okay, let's check for member accounts
-			$sql .= ' > 0 AND `beg_rallye_disable_notify` < `beg_rallye_enable_notify`';
+			$sql .= ' > 0 AND `d`.`beg_rallye_disable_notify` < `d`.`beg_rallye_enable_notify`';
 			$mode = 'disable';
 		} else {
 			// Do not notify!
@@ -78,7 +73,7 @@ switch (getBegRallye()) {
 
 if (!empty($sql)) {
 	// The SQL command needs to be finisched here (only confirmed accounts!)
-	$sql .= ')' . runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'") . ' ORDER BY `last_online` ASC';
+	$sql .= ')' . runFilterChain('user_exclusion_sql', " AND `d`.`status`='CONFIRMED'") . ' ORDER BY `d`.`last_online` ASC';
 
 	// No IP locking setuped by default
 	$content['ip_locker'] = '{--BEG_NO_LIMITATION--}';
@@ -89,8 +84,9 @@ if (!empty($sql)) {
 	} // END - if
 
 	// Check for accounts to be notified
-	$result_main = SQL_QUERY($sql, __FILE__, __LINE__);
-	if (!SQL_HASZERONUMS($result_main)) {
+	$result_main = sqlQuery($sql, __FILE__, __LINE__);
+
+	if (!ifSqlHasZeroNumRows($result_main)) {
 		// Normal notification mails or bonus mails?
 		$sentBonusMails = ((getBegNotifyBonus() > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
 
@@ -99,12 +95,12 @@ if (!empty($sql)) {
 		$receiver = ''; $userids = array();
 
 		// Okay lets notify all users!
-		while ($row = SQL_FETCHARRAY($result_main)) {
+		while ($row = sqlFetchArray($result_main)) {
 			// Merge arrays
 			$content = merge_array($content, $row);
 
 			// Update account
-			SQL_QUERY_ESC("UPDATE
+			sqlQueryEscaped("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
 	`beg_rallye_%s_notify`=UNIX_TIMESTAMP()
@@ -117,7 +113,7 @@ LIMIT 1",
 				), __FILE__, __LINE__);
 
 			// Load email template and send it to the user!
-			if ($sentBonusMails === true) {
+			if ($sentBonusMails === TRUE) {
 				// Add userid to queue
 				array_push($userids, $content['userid']);
 			} else {
@@ -128,7 +124,7 @@ LIMIT 1",
 		} // END - while
 
 		// Shall I send out bonus mails?
-		if ($sentBonusMails === true) {
+		if ($sentBonusMails === TRUE) {
 			// Okay, make array to string
 			$receiver = implode(';', $userids);
 
@@ -136,12 +132,12 @@ LIMIT 1",
 			$url = 'modules.php?module=index&amp;what=login';
 
 			// Insert mail
-			addBonusMailToQueue('{--BEG_RALLYE_' . strtoupper($mode) . '_SUBJECT--}', $message, $receiver, getBegNotifyBonus(), getBegNotifyWait(), $url, 0, 'normal', SQL_NUMROWS($result_main));
+			addBonusMailToQueue('{--BEG_RALLYE_' . strtoupper($mode) . '_SUBJECT--}', $message, $receiver, getBegNotifyBonus(), getBegNotifyWait(), $url, 0, 'normal', sqlNumRows($result_main));
 		} // END - if
 	} // END - if
 
 	// Free memory
-	SQL_FREERESULT($result_main);
+	sqlFreeResult($result_main);
 } // END - if
 
 // [EOF]