Nested EL code is not yet suppported, so we need to rewrite all these parts

[mailer.git] / inc / monthly / monthly_bonus.php

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 0210ff69b6937235db61045d930546db0e8bf4d6..1b746af267666e101d90ba5e1802398569a52c5b 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -40,7 +38,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getScriptOutputMode() == 1) || (!isResetModeEnabled())) {
+} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('bonus')) {
@@ -51,7 +49,7 @@ if (!defined('__SECURITY')) {
 // Get current month (2 digits)
 $curr = getMonth();
 
-if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (getScriptOutputMode() != 1)) {
+if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (!isCssOutputMode())) {
        // Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = "WHERE `status`='CONFIRMED'";
 
@@ -80,7 +78,7 @@ if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (get
 
        // Run SQL string to check for accounts
        $result_main = SQL_QUERY('SELECT
-       `userid`, `email`, `gender`, `surname`, `family`, (0" . $add . ") AS points
+       `userid`, `email`, `gender`, `surname`, `family`, (0' . $add . ') AS points
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 ' . $whereStatement1 . '