Security line in all includes changed

[mailer.git] / inc / mails / beg_mails.php

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 9363f83e573729b33707486f5541b0000498026f..d6206350aef535f0271897ba44e1af680becf002 100644 (file)
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -32,13 +32,10 @@
  ************************************************************************/
 
 // 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()))
-{
+} elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "beg");
        return;
 }
@@ -47,15 +44,15 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 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?
 $SQL = "SELECT userid, email FROM "._MYSQL_PREFIX."_user_data WHERE (beg_ral_notify ";
-switch ($CONFIG['beg_rallye'])
+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";
@@ -89,10 +86,10 @@ if (!empty($SQL))
        $SQL .= ") AND status='CONFIRMED' ORDER BY last_online ASC";
 
        // Prepare data for the template
-       define('__BEG_MIN_POINTS' , TRANSLATE_COMMA($CONFIG['beg_points']));
-       define('__BEG_MAX_POINTS' , TRANSLATE_COMMA($CONFIG['beg_points_max']));
-       define('__BEG_MAX_WINNERS', round($CONFIG['beg_ranks']));
-       if ($CONFIG['beg_ip_timeout'] == 0)
+       define('__BEG_MIN_POINTS' , TRANSLATE_COMMA($_CONFIG['beg_points']));
+       define('__BEG_MAX_POINTS' , TRANSLATE_COMMA($_CONFIG['beg_points_max']));
+       define('__BEG_MAX_WINNERS', round($_CONFIG['beg_ranks']));
+       if ($_CONFIG['beg_ip_timeout'] == 0)
        {
                // No IP locking setuped!
                define('__BEG_IP_LOCKER', BEG_NO_LIMITATION);
@@ -100,7 +97,7 @@ if (!empty($SQL))
         else
        {
                // Create timemark
-               define('__BEG_IP_LOCKER', CREATE_FANCY_TIME($CONFIG['beg_ip_timeout']));
+               define('__BEG_IP_LOCKER', CREATE_FANCY_TIME($_CONFIG['beg_ip_timeout']));
        }
 
        // Check for accounts to be notified
@@ -108,7 +105,7 @@ if (!empty($SQL))
        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")));
+               $MAIL_MODE = (($_CONFIG['beg_notify_bonus'] > 0) && ($MODE == "en") && (EXT_IS_ACTIVE("bonus")));
 
                // Generate subject line
                $eval = "\$SUBJECT = BEG_RALLYE_".strtoupper($MODE)."_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!
@@ -152,8 +149,8 @@ VALUES ('%s', '%s', '%s', '%s', '%s', 'NEW', UNIX_TIMESTAMP(), '%s', '%s', '%s',
        $SUBJECT,
        $MSG,
        $RECEIVER,
-       $CONFIG['beg_notify_bonus'],
-       $CONFIG['beg_notify_wait'],
+       $_CONFIG['beg_notify_bonus'],
+       $_CONFIG['beg_notify_wait'],
        URL."/modules.php?module=index&what=login",
        0,
        SELECTION_COUNT(explode(";", $RECEIVER)),