- Surfbar further extended, currently broken!

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

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 673681010457c5346a55a77e919f7f517974bab5..8634d0a496fc917fa961a2659c9003abf754eb76 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_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("bonus")) && (!IS_ADMIN()))
-{
+} elseif ((!EXT_IS_ACTIVE("bonus")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus");
        return;
 }
@@ -47,7 +44,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 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?
@@ -55,7 +52,7 @@ $SQL = "SELECT userid, email FROM "._MYSQL_PREFIX."_user_data WHERE (bonus_ral_n
 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)";
@@ -69,7 +66,7 @@ case 'Y': // Active rallye is activated
        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";
@@ -108,7 +105,7 @@ if (!empty($SQL))
                {
                        // 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!
@@ -120,7 +117,7 @@ SET bonus_ral_notify='%s', bonus_ral_%s_notify='%s' WHERE userid=%d LIMIT 1",
                         else
                        {
                                // Send normal notification mail to the members
-                               $MSG = LOAD_EMAIL_TEMPLATE("bonus_".$MODE."_notify", "", $uid);
+                               $MSG = LOAD_EMAIL_TEMPLATE("bonus_".$MODE."_notify", array(), $uid);
                                SEND_EMAIL($email, $SUBJECT, $MSG);
                        }
                }
@@ -132,7 +129,7 @@ SET bonus_ral_notify='%s', bonus_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,