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

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 1c4cb97331..0e4e19224b 100644
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -32,68 +32,57 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
-}
- elseif ((!EXT_IS_ACTIVE("bonus")) && (!IS_ADMIN()))
-{
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus");
+} elseif (!EXT_IS_ACTIVE("bonus")) {
 	return;
 }
 
 // Do not execute when script is in CSS mode
+global $CSS;
 if ($CSS == 1) return;
 
 // Create timemark from saved month
-$mark = mktime(0, 0, 0, $CONFIG['bonus_month'], date("d", time()), date('Y', time()));
+$mark = mktime(0, 0, 0, $_CONFIG['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'])
+switch ($_CONFIG['bonus_active'])
 {
 case 'Y': // Active rallye is activated
-	if ($CONFIG['bonus_en_notify'] == 'Y')
-	{
+	if ($_CONFIG['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";
-	}
-	 else
-	{
+	} else {
 		// Do not notify!
 		$SQL = "";
 	}
 	break;
 
 case 'N': // Active rallye is deactivated
-	if ($CONFIG['bonus_di_notify'] == 'Y')
-	{
+	if ($_CONFIG['bonus_di_notify'] == "Y") {
 		// Okay, let's check for member accounts
 		$SQL .= " > 0 AND bonus_ral_di_notify < bonus_ral_en_notify";
 		$MODE = "di";
-	}
-	 else
-	{
+	} else {
 		// Do not notify!
 		$SQL = "";
 	}
 	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";
 
 	// Normal notification mails or bonus mails?
-	$MAIL_MODE = (($CONFIG['bonus_notify_points'] > 0) && ($MODE == "en") && (EXT_IS_ACTIVE("bonus")));
+	$MAIL_MODE = (($_CONFIG['bonus_notify_points'] > 0) && ($MODE == "en") && (EXT_IS_ACTIVE("bonus")));
 
 	// Generate subject line
-	$eval = "\$SUBJECT = BONUS_RALLYE_".strtoupper($MODE)."_NOTIFY;";
-	eval($eval);
+	$SUBJECT = constant('BONUS_RALLYE_'.strtoupper($MODE).'_NOTIFY');
 
 	// Load message body for bonus mails
 	$MSG = LOAD_EMAIL_TEMPLATE("bonus_en_notify_body", "", "{PER}uid{PER}");
@@ -101,44 +90,38 @@ 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) {
 		// 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=%d LIMIT 1",
+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)
-			{
+			if ($MAIL_MODE) {
 				// Add userid to queue
 				$UIDs[] = $uid;
-			}
-			 else
-			{
+			} else {
 				// Send normal notification mail to the members
-				$MSG = LOAD_EMAIL_TEMPLATE("bonus_".$MODE."_notify", "", $uid);
-				SEND_EMAIL($email, $SUBJECT, $MSG);
+				$MSG = LOAD_EMAIL_TEMPLATE("bonus_".$MODE."_notify", array(), $uid);
+				SEND_EMAIL($uid, $SUBJECT, $MSG);
 			}
-		}
+		} // END - if
 
 		// 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')",
+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'],
+	$_CONFIG['bonus_notify_points'],
+	$_CONFIG['bonus_notify_wait'],
 	URL."/modules.php?module=index&what=login",
 	0,
 	SELECTION_COUNT(explode(";", $RECEIVER)),
@@ -150,5 +133,6 @@ VALUES ('%s', '%s', '%s', '%s', '%s', 'NEW', UNIX_TIMESTAMP(), '%s', '%s', '%s',
 	// Free memory
 	SQL_FREERESULT($result_main);
 }
+
 //
 ?>