X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fbeg_mails.php;h=9a9872f746ee695a9967574d7f67cd0016b6ef98;hb=aac3cb15887577d2016bb5b4de91ad4da5b9cc6f;hp=59f16516a34c1d27e48ea365422ecf47fd9257dd;hpb=aa63aed07428a99ea09002c8d072990677700080;p=mailer.git

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 59f16516a3..9a9872f746 100644
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -48,40 +48,40 @@ if (!defined('__SECURITY')) {
 if ($GLOBALS['output_mode'] == 1) 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'), date('d', time()), date('Y', time()));
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?
 $sql = "SELECT userid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE (beg_ral_notify ";
 switch (getConfig('beg_rallye'))
 {
-case 'Y': // Begging rallye is activated
-	if (getConfig('beg_ral_en_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";
-	}
+	case 'Y': // Begging rallye is activated
+		if (getConfig('beg_ral_en_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";
+		}
 	 else
-	{
-		// Do not notify!
-		$sql = '';
-	}
-	break;
-
-case 'N': // Begging rallye is deactivated
-	if (getConfig('beg_ral_di_notify') == 'Y')
-	{
-		// Okay, let's check for member accounts
-		$sql .= " > 0 AND beg_ral_di_notify < beg_ral_en_notify";
-		$mode = "di";
-	}
+	 {
+	 	// Do not notify!
+	 	$sql = '';
+	 }
+	 break;
+
+	case 'N': // Begging rallye is deactivated
+		if (getConfig('beg_ral_di_notify') == 'Y')
+		{
+			// Okay, let's check for member accounts
+			$sql .= " > 0 AND beg_ral_di_notify < beg_ral_en_notify";
+			$mode = "di";
+		}
 	 else
-	{
-		// Do not notify!
-		$sql = '';
-	}
-	break;
+	 {
+	 	// Do not notify!
+	 	$sql = '';
+	 }
+	 break;
 }
 
 if (!empty($sql)) {
@@ -89,18 +89,18 @@ if (!empty($sql)) {
 	$sql .= ") AND `status`='CONFIRMED' ORDER BY last_online ASC";
 
 	// Prepare data for the template
-	define('__BEG_MIN_POINTS' , TRANSLATE_COMMA(getConfig('beg_points')));
-	define('__BEG_MAX_POINTS' , TRANSLATE_COMMA(getConfig('beg_points_max')));
+	define('__BEG_MIN_POINTS' , translateComma(getConfig('beg_points')));
+	define('__BEG_MAX_POINTS' , translateComma(getConfig('beg_points_max')));
 	define('__BEG_MAX_WINNERS', round(getConfig('beg_ranks')));
 	if (getConfig('beg_ip_timeout') == 0)
 	{
 		// No IP locking setuped!
-		define('__BEG_IP_LOCKER', BEG_NO_LIMITATION);
+		define('__BEG_IP_LOCKER', getMessage('BEG_NO_LIMITATION'));
 	}
-	 else
+	else
 	{
 		// Create timemark
-		define('__BEG_IP_LOCKER', CREATE_FANCY_TIME(getConfig('beg_ip_timeout')));
+		define('__BEG_IP_LOCKER', createFancyTime(getConfig('beg_ip_timeout')));
 	}
 
 	// Check for accounts to be notified
@@ -123,7 +123,7 @@ if (!empty($sql)) {
 SET beg_ral_notify='%s', beg_ral_%s_notify='%s'
 WHERE userid=%s
 LIMIT 1",
-				array(time(), $mode, time(), $content['userid']), __FILE__, __LINE__);
+			array(time(), $mode, time(), $content['userid']), __FILE__, __LINE__);
 
 			// Load email template and send it to the user!
 			if ($sentBonusMails === true) {
@@ -132,7 +132,7 @@ LIMIT 1",
 			} else {
 				// Send normal notification mail to the members
 				$message = LOAD_EMAIL_TEMPLATE('beg_' . $mode . '_notify', array(), $content['userid']);
-				SEND_EMAIL($content['email'], $subject, $message);
+				sendEmail($content['email'], $subject, $message);
 			}
 		} // END - while
 
@@ -145,7 +145,7 @@ LIMIT 1",
 			$URL = 'modules.php?module=index&amp;what=login';
 
 			// Insert mail
-			ADD_BONUS_MAIL_TO_QUEUE($subject, $message, $RECEIVER, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $URL, 0, 'normal', SQL_NUMROWS($result_main));
+			addBonusMailToQueue($subject, $message, $RECEIVER, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $URL, 0, 'normal', SQL_NUMROWS($result_main));
 		} // END - if
 	} // END - if