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

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 7bbd91f4f4..3247190093 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
-if ($CSS == 1) return;
+global $CSS;
+if (($CSS == 1) || (!defined('__DAILY_RESET'))) 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";
@@ -123,7 +120,7 @@ if (!empty($SQL))
 		{
 			// 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!
@@ -135,7 +132,7 @@ SET beg_ral_notify='%s', beg_ral_%s_notify='%s' WHERE userid=%d LIMIT 1",
 			 else
 			{
 				// Send normal notification mail to the members
-				$MSG = LOAD_EMAIL_TEMPLATE("beg_".$MODE."_notify", "", $uid);
+				$MSG = LOAD_EMAIL_TEMPLATE("beg_".$MODE."_notify", array(), $uid);
 				SEND_EMAIL($email, $SUBJECT, $MSG);
 			}
 		}
@@ -147,7 +144,7 @@ SET beg_ral_notify='%s', beg_ral_%s_notify='%s' WHERE userid=%d LIMIT 1",
 			$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,