More language strings renamed, TODOs.txt updated:

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

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index de88ca50c3e9f4200ab846707b49d62263ec5b26..8afdbb80b5302552ed3c35bcedaef43a6a02e802 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                                *
@@ -40,34 +40,47 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
+} elseif ((getScriptOutputMode() != 0) || ((!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
-FROM `{?_MYSQL_PREFIX?}_user_data`
-WHERE holiday_activated > 0 AND holiday_activated < UNIX_TIMESTAMP() AND `holiday_active`='N'
-ORDER BY holiday_activated",
+$result_main = SQL_QUERY("SELECT
+       `userid`, `holiday_activated`
+FROM
+       `{?_MYSQL_PREFIX?}_user_data`
+WHERE
+       `holiday_activated` > 0 AND
+       `holiday_activated` < UNIX_TIMESTAMP() AND
+       `holiday_active`='N'
+ORDER BY
+       `holiday_activated` ASC",
 __FILE__, __LINE__);
 
 // Entries found?
-if (SQL_NUMROWS($result_main) > 0) {
+if (!SQL_HASZERONUMS($result_main)) {
        // Init SQLs
        initSqls();
 
        // We have found at least one useraccount so let's check it...
        while ($content = SQL_FETCHARRAY($result_main)) {
                // Check if his holiday can be activated
-               $result_holiday = SQL_QUERY_ESC("SELECT holiday_start, holiday_end
-FROM `{?_MYSQL_PREFIX?}_user_holidays`
-WHERE `userid`=%s AND holiday_start <= UNIX_TIMESTAMP() AND holiday_end > UNIX_TIMESTAMP()
+               $result_holiday = SQL_QUERY_ESC("SELECT
+       `holiday_start`, `holiday_end`
+FROM
+       `{?_MYSQL_PREFIX?}_user_holidays`
+WHERE
+       `userid`=%s AND
+       `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));
@@ -81,12 +94,15 @@ 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 `{?_MYSQL_PREFIX?}_user_data`
-SET `holiday_active`='Y'
-WHERE `userid`=%s
+                       addSql(SQL_QUERY_ESC("UPDATE
+       `{?_MYSQL_PREFIX?}_user_data`
+SET
+       `holiday_active`='Y'
+WHERE
+       `userid`=%s
 LIMIT 1",
                                array(bigintval($content['userid'])), __FILE__, __LINE__, false));
                } // END - if
@@ -97,7 +113,7 @@ LIMIT 1",
 
        // Run all SQLs
        runFilterChain('run_sqls');
-}
+} // END - if
 
 // Free memory
 SQL_FREERESULT($result_main);