Double->single converted and fixed a display bug when theme is already installed

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

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index 4342c104d77078955c08e08f9c3985ccfd7baf46..d61b400649120891095ea72f72d9bcba4cb91981 100644 (file)
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Dinge, die beim taeglichen Reset erledigt werden *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
+ * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -38,22 +38,22 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
-} elseif (!EXT_IS_ACTIVE("holiday")) {
+} elseif (!EXT_IS_ACTIVE('holiday')) {
        return;
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if (($GLOBALS['output_mode'] == 1) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == "RESET"))) return;
+if ((getOutputMode() == 1) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == 'RESET'))) return;
 //* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // 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'
+WHERE holiday_activated > 0 AND holiday_activated < UNIX_TIMESTAMP() AND `holiday_active`='N'
 ORDER BY holiday_activated",
-       __FILE__, __LINE__);
+__FILE__, __LINE__);
 
 // Entries found?
 if (SQL_NUMROWS($result_main) > 0) {
@@ -67,28 +67,28 @@ if (SQL_NUMROWS($result_main) > 0) {
 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__);
                if (SQL_NUMROWS($result_holiday) == 1) {
                        // Okay, this user can be send away to holiday...
                        $content = merge_array($content, SQL_FETCHARRAY($result_holiday));
 
                        // Prepare all data for the template
                        $content = array(
-                               'activated' => MAKE_DATETIME($content['holiday_activated'], "1"),
-                               'start'     => MAKE_DATETIME($content['holiday_start']    , "1"),
-                               'end'       => MAKE_DATETIME($content['holiday_end']      , "1")
+                               'activated' => generateDateTime($content['holiday_activated'], '1'),
+                               'start'     => generateDateTime($content['holiday_start']    , '1'),
+                               'end'       => generateDateTime($content['holiday_end']      , '1')
                        );
 
                        // Send email to user
                        $msg = LOAD_EMAIL_TEMPLATE("member_holiday_activated", $content, $content['userid']);
-                       SEND_EMAIL($content['userid'], getMessage('HOLIDAY_MEMBER_ACTIVATED_SUBJ'), $msg);
+                       sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_ACTIVATED_SUBJ'), $msg);
 
                        // Update account
                        ADD_SQL(SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
-SET holiday_active='Y'
+SET `holiday_active`='Y'
 WHERE userid=%s
 LIMIT 1",
-                               array(bigintval($content['userid'])), __FILE__, __LINE__, false));
+                       array(bigintval($content['userid'])), __FILE__, __LINE__, false));
                } // END - if
 
                // Free memory