Network 'HPSponsor' added

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

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index de88ca50c3e9f4200ab846707b49d62263ec5b26..c8397325c613ee3716e7896af4cb2fb542cc254e 100644 (file)
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -49,10 +49,16 @@ if ((getOutputMode() != 0) || ((!isResetModeEnabled()) && (getConfig('holiday_mo
 //* 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?
@@ -63,9 +69,14 @@ if (SQL_NUMROWS($result_main) > 0) {
        // 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__);
                if (SQL_NUMROWS($result_holiday) == 1) {
@@ -84,9 +95,12 @@ LIMIT 1",
                        sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_ACTIVATED_SUBJ'), $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 +111,7 @@ LIMIT 1",
 
        // Run all SQLs
        runFilterChain('run_sqls');
-}
+} // END - if
 
 // Free memory
 SQL_FREERESULT($result_main);