Rewrites from to , fixes

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

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index da5d22c5128459193a825a404d9aa822ae3437dc..568a2f0f98e116f2cd0cd160e8122c7ca5578d55 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,28 +38,27 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-} elseif (!EXT_IS_ACTIVE('bonus')) {
+       die();
+} elseif (!isExtensionActive('bonus')) {
        return;
 }
 
 // Do not execute when script is in CSS mode
-if (getOutputMode() == 1) return;
+if (getOutputMode() != 0) return;
 
 // Create timemark from saved month
 $mark = mktime(0, 0, 0, getConfig('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 ";
+$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`bonus_ral_notify` ";
 switch (getConfig('bonus_active'))
 {
        case 'Y': // Active rallye is activated
                if (getConfig('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";
+                       $sql .= "= 0 OR (`bonus_ral_notify` > 0 AND `bonus_ral_en_notify` < `bonus_ral_di_notify`)";
+                       $mode = 'en';
                } else {
                        // Do not notify!
                        $sql = '';
@@ -69,8 +68,8 @@ switch (getConfig('bonus_active'))
        case 'N': // Active rallye is deactivated
                if (getConfig('bonus_di_notify') == 'Y') {
                        // Okay, let's check for member accounts
-                       $sql .= " > 0 AND bonus_ral_di_notify < bonus_ral_en_notify";
-                       $mode = "di";
+                       $sql .= " > 0 AND `bonus_ral_di_notify` < `bonus_ral_en_notify`";
+                       $mode = 'di';
                } else {
                        // Do not notify!
                        $sql = '';
@@ -80,16 +79,16 @@ switch (getConfig('bonus_active'))
 
 if (!empty($sql)) {
        // The SQL command needs to be finisched here (only confirmed accounts!)
-       $sql .= ") AND `status`='CONFIRMED' ORDER BY last_online ASC";
+       $sql .= ") AND `status`='CONFIRMED' ORDER BY `last_online` ASC";
 
        // Normal notification mails or bonus mails?
-       $sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == "en") && (EXT_IS_ACTIVE('bonus')));
+       $sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == "en") && (isExtensionActive('bonus')));
 
        // Generate subject line
-       $subject = constant('BONUS_RALLYE_'.strtoupper($mode).'_NOTIFY');
+       $subject = getMessage('BONUS_RALLYE_' . strtoupper($mode).'_NOTIFY');
 
        // Load message body for bonus mails
-       $message = LOAD_EMAIL_TEMPLATE('bonus_en_notify_body', '', '{PER}uid{PER}');
+       $message = loadEmailTemplate('bonus_en_notify_body', '', '{PER}userid{PER}');
        $RECEIVER = ''; $UIDs = array();
 
        // Check for accounts to be notified
@@ -98,11 +97,17 @@ if (!empty($sql)) {
                // Okay lets notify all users!
                while ($content = SQL_FETCHARRAY($result_main)) {
                        // Update account
-                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
-SET bonus_ral_notify='%s', bonus_ral_%s_notify='%s'
-WHERE userid=%s
+                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data`
+SET
+       `bonus_ral_notify`=UNIX_TIMESTAMP(),
+       `bonus_ral_%s_notify`=UNIX_TIMESTAMP()
+WHERE
+       `userid`=%s
 LIMIT 1",
-                       array(time(), $mode, time(), $content['userid']), __FILE__, __LINE__);
+                               array(
+                                       $mode,
+                                       $content['userid']
+                               ), __FILE__, __LINE__);
 
                        // Load email template and send it to the user!
                        if ($sentBonusMails === true) {
@@ -110,7 +115,7 @@ LIMIT 1",
                                $UIDs[] = $content['userid'];
                        } else {
                                // Send normal notification mail to the members
-                               $message = LOAD_EMAIL_TEMPLATE('bonus_' . $mode . '_notify', array(), $content['userid']);
+                               $message = loadEmailTemplate('bonus_' . $mode . '_notify', $content, $content['userid']);
                                sendEmail($content['email'], $subject, $message);
                        }
                } // END - while