X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fbonus_mails.php;h=ff07609ab54c7bdf1b1fddb4186b102ef78a116d;hb=59bd8a9805c51c895a92cc12825f4cbdfd792597;hp=0e4e19224b722e24422418f9b275fa55a9b3fbad;hpb=427719103e37ed2e27803b833dc5db5841e4dec9;p=mailer.git

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 0e4e19224b..ff07609ab5 100644
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -40,19 +40,18 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode
-global $CSS;
-if ($CSS == 1) return;
+if ($GLOBALS['output_mode'] == 1) return;
 
 // Create timemark from saved month
-$mark = mktime(0, 0, 0, $_CONFIG['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 (bonus_ral_notify ";
-switch ($_CONFIG['bonus_active'])
+$SQL = "SELECT userid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE (bonus_ral_notify ";
+switch (getConfig('bonus_active'))
 {
-case 'Y': // Active rallye is activated
-	if ($_CONFIG['bonus_en_notify'] == "Y") {
+case "Y": // Active rallye is activated
+	if (getConfig('bonus_en_notify') == "Y") {
 		// Okay, let's check for member accounts
 		$SQL .= "= 0 OR (bonus_ral_notify > 0 AND bonus_ral_en_notify < bonus_ral_di_notify)";
 		$MODE = "en";
@@ -62,8 +61,8 @@ case 'Y': // Active rallye is activated
 	}
 	break;
 
-case 'N': // Active rallye is deactivated
-	if ($_CONFIG['bonus_di_notify'] == "Y") {
+case "N": // Active rallye is deactivated
+	if (getConfig('bonus_di_notify') == "Y") {
 		// Okay, let's check for member accounts
 		$SQL .= " > 0 AND bonus_ral_di_notify < bonus_ral_en_notify";
 		$MODE = "di";
@@ -76,10 +75,10 @@ case 'N': // Active rallye is deactivated
 
 if (!empty($SQL)) {
 	// The SQL command needs to be finisched here (only confirmed accounts!)
-	$SQL .= ") AND status='CONFIRMED' ORDER BY last_online ASC";
+	$SQL .= ") AND `status`='CONFIRMED' ORDER BY last_online ASC";
 
 	// Normal notification mails or bonus mails?
-	$MAIL_MODE = (($_CONFIG['bonus_notify_points'] > 0) && ($MODE == "en") && (EXT_IS_ACTIVE("bonus")));
+	$MAIL_MODE = ((getConfig('bonus_notify_points') > 0) && ($MODE == "en") && (EXT_IS_ACTIVE("bonus")));
 
 	// Generate subject line
 	$SUBJECT = constant('BONUS_RALLYE_'.strtoupper($MODE).'_NOTIFY');
@@ -92,11 +91,13 @@ if (!empty($SQL)) {
 	$result_main = SQL_QUERY($SQL, __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_main) > 0) {
 		// 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 bonus_ral_notify='%s', bonus_ral_%s_notify='%s' WHERE userid=%s LIMIT 1",
- array(time(), $MODE, time(), $uid), __FILE__, __LINE__);
+			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
+SET bonus_ral_notify='%s', bonus_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) {
@@ -107,32 +108,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 = "modules.php?module=index&amp;what=login";
+
+			// Insert mail
+			ADD_BONUS_MAIL_TO_QUEUE($SUBJECT, $MSG, $RECEIVER, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $URL, 0, "normal", SQL_NUMROWS($result_main));
+		} // END - if
+	} // END - if
 
 	// Free memory
 	SQL_FREERESULT($result_main);
-}
+} // END - if
 
 //
 ?>