Fix/Rewrite for getMaskedMessage() error, thanks to meinnimbuzz

[mailer.git] / inc / reset / reset_holiday.php

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index c8397325c613ee3716e7896af4cb2fb542cc254e..33689d69dec2932dd7ea432183153a087bb04fe3 100644 (file)
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 12/10/2005 *
- * ===================                          Last change: 12/10/2005 *
+ * ===================                          Last change: 06/20/2010 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : reset_holiday.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,14 +38,14 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
+} elseif ((!isHtmlOutputMode()) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == 'RESET'))) {
+       // Do not execute when script is in CSS mode or no daily reset
+       return;
 } elseif (!isExtensionActive('holiday')) {
+       logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
        return;
 }
 
-// Do not execute when script is in CSS mode or no daily reset
-if ((getOutputMode() != 0) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == 'RESET'))) return;
-//* DEBUG: */ outputHtml(basename(__FILE__)."<br />");
-
 // Check for holidays we need to enable and send email to user
 $result_main = SQL_QUERY("SELECT
        `userid`, `holiday_activated`
@@ -62,7 +60,7 @@ ORDER BY
 __FILE__, __LINE__);
 
 // Entries found?
-if (SQL_NUMROWS($result_main) > 0) {
+if (!SQL_HASZERONUMS($result_main)) {
        // Init SQLs
        initSqls();
 
@@ -78,7 +76,9 @@ WHERE
        `holiday_start` <= UNIX_TIMESTAMP() AND
        `holiday_end` > UNIX_TIMESTAMP()
 LIMIT 1",
-               array(bigintval($content['userid'])), __FILE__, __LINE__);
+                       array(bigintval($content['userid'])), __FILE__, __LINE__);
+
+               // Do we have an entry?
                if (SQL_NUMROWS($result_holiday) == 1) {
                        // Okay, this user can be send away to holiday...
                        $content = merge_array($content, SQL_FETCHARRAY($result_holiday));
@@ -92,7 +92,7 @@ LIMIT 1",
 
                        // Send email to user
                        $message = loadEmailTemplate('member_holiday_activated', $content, $content['userid']);
-                       sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_ACTIVATED_SUBJ'), $message);
+                       sendEmail($content['userid'], '{--MEMBER_HOLIDAY_ACTIVATED_SUBJECT--}', $message);
 
                        // Update account
                        addSql(SQL_QUERY_ESC("UPDATE