X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fbeg_mails.php;h=94ee8d216b6f194f0135380a95c89b2f4328eefb;hb=808db972209a973665be5ab9d69f520762a4e087;hp=7bbd91f4f422f9652abd63aad1af6349456f77f4;hpb=60494e212a67fe360bfbb481eb4928480a6f379b;p=mailer.git

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 7bbd91f4f4..94ee8d216b 100644
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -32,22 +32,19 @@
  ************************************************************************/
 
 // 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("beg")) && (!IS_ADMIN()))
-{
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "beg");
+} elseif (!EXT_IS_ACTIVE("beg")) {
 	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['beg_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?
@@ -55,7 +52,7 @@ $SQL = "SELECT userid, email FROM "._MYSQL_PREFIX."_user_data WHERE (beg_ral_not
 switch ($_CONFIG['beg_rallye'])
 {
 case 'Y': // Begging rallye is activated
-	if ($_CONFIG['beg_ral_en_notify'] == 'Y')
+	if ($_CONFIG['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)";
@@ -69,7 +66,7 @@ case 'Y': // Begging rallye is activated
 	break;
 
 case 'N': // Begging rallye is deactivated
-	if ($_CONFIG['beg_ral_di_notify'] == 'Y')
+	if ($_CONFIG['beg_ral_di_notify'] == "Y")
 	{
 		// Okay, let's check for member accounts
 		$SQL .= " > 0 AND beg_ral_di_notify < beg_ral_en_notify";
@@ -83,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";
 
@@ -105,66 +101,51 @@ 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")));
 
 		// Generate subject line
-		$eval = "\$SUBJECT = BEG_RALLYE_".strtoupper($MODE)."_NOTIFY;";
-		eval($eval);
+		$SUBJECT = constant('BEG_RALLYE_'.strtoupper($MODE).'_NOTIFY');
 
 		// Load message body for bonus mails
 		$MSG = LOAD_EMAIL_TEMPLATE("beg_en_notify_body", "", "{PER}uid{PER}");
 		$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=%d LIMIT 1",
+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", "", $uid);
-				SEND_EMAIL($email, $SUBJECT, $MSG);
+				$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
 
 //
 ?>