X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmails%2Fbeg_mails.php;h=f29ca38451dcb5ae51457b743fb4de5a56b61a93;hb=15c90f3402a9f6db99e836e08fbf2fa0151d3dbd;hp=4f61d180fac8992287b497a416d376d20cf54385;hpb=1ebf518b9552f71ee95de6f4b80e6de3a27716d1;p=mailer.git

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 4f61d180fa..f29ca38451 100644
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 11/22/2005 *
- * ===============                              Last change: 11/22/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 11/22/2005 *
+ * ===================                          Last change: 11/22/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : beg_mails.php                                    *
@@ -51,13 +51,13 @@ $mark = mktime(0, 0, 0, getConfig('last_month'), date('d', time()), date('Y', ti
 $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_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";
+			$sql .= '= 0 OR (`beg_ral_notify` > 0 AND `beg_ral_en_notify` < `beg_ral_di_notify`)';
+			$mode = 'en';
 		} else {
 			// Do not notify!
 			$sql = '';
@@ -67,24 +67,19 @@ switch (getConfig('beg_rallye')) {
 	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";
+			$sql .= ' > 0 AND `beg_ral_di_notify` < `beg_ral_en_notify`';
+			$mode = 'di';
 		} else {
-		// Do not notify!
-		$sql = '';
+			// Do not notify!
+			$sql = '';
 		}
 		break;
-}
+} // END - switch
 
 if (!empty($sql)) {
 	// The SQL command needs to be finisched here (only confirmed accounts!)
 	$sql .= ") AND `status`='CONFIRMED' ORDER BY `last_online` ASC";
 
-	// Prepare data for the template
-	$content['min_points'] = translateComma(getConfig('beg_points'));
-	$content['max_points'] = translateComma(getConfig('beg_points_max'));
-	$content['max_winner'] = round(getConfig('beg_ranks'));
-
 	// No IP locking setuped by default
 	$content['ip_locker'] = getMessage('BEG_NO_LIMITATION');
 
@@ -104,14 +99,18 @@ if (!empty($sql)) {
 
 		// Load message body for bonus mails
 		$message = loadEmailTemplate('beg_en_notify_body', '', '{PER}userid{PER}');
-		$RECEIVER = ''; $UIDs = array();
+		$receiver = ''; $userids = array();
 
 		// Okay lets notify all users!
 		while ($content = merge_array($content, SQL_FETCHARRAY($result_main))) {
 			// Update account
-			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data`
-SET `beg_ral_notify`=UNIX_TIMESTAMP(),` beg_ral_%s_notify`=UNIX_TIMESTAMP()
-WHERE `userid`=%s
+			SQL_QUERY_ESC("UPDATE
+	`{?_MYSQL_PREFIX?}_user_data`
+SET
+	`beg_ral_notify`=UNIX_TIMESTAMP(),
+	`beg_ral_%s_notify`=UNIX_TIMESTAMP()
+WHERE
+	`userid`=%s
 LIMIT 1",
 				array(
 					$mode,
@@ -121,7 +120,7 @@ LIMIT 1",
 			// Load email template and send it to the user!
 			if ($sentBonusMails === true) {
 				// Add userid to queue
-				$UIDs[] = $content['userid'];
+				$userids[] = $content['userid'];
 			} else {
 				// Send normal notification mail to the members
 				$message = loadEmailTemplate('beg_' . $mode . '_notify', $content, $content['userid']);
@@ -132,13 +131,13 @@ LIMIT 1",
 		// Shall I send out bonus mails?
 		if ($sentBonusMails === true) {
 			// Okay, make array to string
-			$RECEIVER = implode(';', $UIDs);
+			$receiver = implode(';', $userids);
 
 			// Prepare URL
 			$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($subject, $message, $receiver, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $URL, 0, 'normal', SQL_NUMROWS($result_main));
 		} // END - if
 	} // END - if