From bfe24b8d5abcc23e3330580c3ffbeab93166b29b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 12 Oct 2008 15:36:51 +0000
Subject: [PATCH] Notification mails rewritten

---
 inc/databases.php         |  2 +-
 inc/mails/beg_mails.php   | 47 +++++++++++++--------------------------
 inc/mails/bonus_mails.php | 28 +++++++++--------------
 3 files changed, 27 insertions(+), 50 deletions(-)

diff --git a/inc/databases.php b/inc/databases.php
index 3bf291b12a..ab9679c3e1 100644
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -113,7 +113,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_SVN_REVISION', "505");
+define('CURR_SVN_REVISION', "506");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 37272d712e..94ee8d216b 100644
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -80,8 +80,7 @@ case 'N': // Begging rallye is deactivated
 	break;
 }
 
-if (!empty($SQL))
-{
+if (!empty($SQL)) {
 	// The SQL command needs to be finisched here (only confirmed accounts!)
 	$SQL .= ") AND status='CONFIRMED' ORDER BY last_online ASC";
 
@@ -102,8 +101,7 @@ if (!empty($SQL))
 
 	// Check for accounts to be notified
 	$result_main = SQL_QUERY($SQL, __FILE__, __LINE__);
-	if (SQL_NUMROWS($result_main) > 0)
-	{
+	if (SQL_NUMROWS($result_main) > 0) {
 		// Normal notification mails or bonus mails?
 		$MAIL_MODE = (($_CONFIG['beg_notify_bonus'] > 0) && ($MODE == "en") && (EXT_IS_ACTIVE("bonus")));
 
@@ -115,52 +113,39 @@ if (!empty($SQL))
 		$RECEIVER = ""; $UIDs = array();
 
 		// Okay lets notify all users!
-		while(list($uid, $email) = SQL_FETCHROW($result_main))
-		{
+		while(list($uid, $email) = SQL_FETCHROW($result_main)) {
 			// Update account
 			$result_update = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
 SET beg_ral_notify='%s', beg_ral_%s_notify='%s' WHERE userid=%s LIMIT 1",
  array(time(), $MODE, time(), $uid), __FILE__, __LINE__);
 
 			// Load email template and send it to the user!
-			if ($MAIL_MODE)
-			{
+			if ($MAIL_MODE) {
 				// Add userid to queue
 				$UIDs[] = $uid;
-			}
-			 else
-			{
+			} else {
 				// Send normal notification mail to the members
 				$MSG = LOAD_EMAIL_TEMPLATE("beg_".$MODE."_notify", array(), $uid);
 				SEND_EMAIL($uid, $SUBJECT, $MSG);
 			}
-		}
+		} // END - while
 
 		// Shall I send out bonus mails?
-		if ($MAIL_MODE)
-		{
+		if ($MAIL_MODE) {
 			// Okay, make array to string
 			$RECEIVER = implode(";", $UIDs);
-			$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
-(subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, is_notify)
-VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(), '%s','%s','%s','%s','Y')",
- array(
-	$SUBJECT,
-	$MSG,
-	$RECEIVER,
-	$_CONFIG['beg_notify_bonus'],
-	$_CONFIG['beg_notify_wait'],
-	URL."/modules.php?module=index&what=login",
-	0,
-	SELECTION_COUNT(explode(";", $RECEIVER)),
-	SQL_NUMROWS($result_main),
-), __FILE__, __LINE__);
-		}
-	}
+
+			// Prepare URL
+			$url = URL."/modules.php?module=index&what=login";
+
+			// Insert mail
+			ADD_BONUS_MAIL_TO_QUEUE($SUBJECT, $MSG, $RECEIVER, $_CONFIG['beg_notify_bonus'], $_CONFIG['beg_notify_wait'], $url, 0, "normal", SQL_NUMROWS($result_main));
+		} // END - if
+	} // END - if
 
 	// Free memory
 	SQL_FREERESULT($result_main);
-}
+} // END - if
 
 //
 ?>
diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 0e4e19224b..ee2e1b7b57 100644
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -107,32 +107,24 @@ SET bonus_ral_notify='%s', bonus_ral_%s_notify='%s' WHERE userid=%s LIMIT 1",
 				$MSG = LOAD_EMAIL_TEMPLATE("bonus_".$MODE."_notify", array(), $uid);
 				SEND_EMAIL($uid, $SUBJECT, $MSG);
 			}
-		} // END - if
+		} // END - while
 
 		// Shall I send out bonus mails?
 		if ($MAIL_MODE) {
 			// Okay, make array to string
 			$RECEIVER = implode(";", $UIDs);
-			$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
-(subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, is_notify)
-VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(), '%s','%s','%s','%s','Y')",
- array(
-	$SUBJECT,
-	$MSG,
-	$RECEIVER,
-	$_CONFIG['bonus_notify_points'],
-	$_CONFIG['bonus_notify_wait'],
-	URL."/modules.php?module=index&what=login",
-	0,
-	SELECTION_COUNT(explode(";", $RECEIVER)),
-	SQL_NUMROWS($result_main),
-), __FILE__, __LINE__);
-		}
-	}
+
+			// Prepare URL
+			$url = URL."/modules.php?module=index&what=login";
+
+			// Insert mail
+			ADD_BONUS_MAIL_TO_QUEUE($SUBJECT, $MSG, $RECEIVER, $_CONFIG['bonus_notify_points'], $_CONFIG['bonus_notify_wait'], $url, 0, "normal", SQL_NUMROWS($result_main));
+		} // END - if
+	} // END - if
 
 	// Free memory
 	SQL_FREERESULT($result_main);
-}
+} // END - if
 
 //
 ?>
-- 
2.30.2