Fixes for broken order page and themes

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

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index c68de78391ea255a2ff13b5ba0befe0aede69141..998e929438226d9ac7308dd8a7076d429d6fa6f2 100644 (file)
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,19 +38,18 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-} elseif (!EXT_IS_ACTIVE('holiday')) {
+       die();
+} elseif (!isExtensionActive('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;
-//* DEBUG: */ echo basename(__FILE__)."<br />\n";
+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`
+FROM `{?_MYSQL_PREFIX?}_user_data`
 WHERE holiday_activated > 0 AND holiday_activated < UNIX_TIMESTAMP() AND `holiday_active`='N'
 ORDER BY holiday_activated",
 __FILE__, __LINE__);
@@ -58,14 +57,14 @@ __FILE__, __LINE__);
 // Entries found?
 if (SQL_NUMROWS($result_main) > 0) {
        // Init SQLs
-       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()
+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) {
@@ -80,15 +79,15 @@ LIMIT 1",
                        );
 
                        // Send email to user
-                       $msg = LOAD_EMAIL_TEMPLATE("member_holiday_activated", $content, $content['userid']);
-                       sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_ACTIVATED_SUBJ'), $msg);
+                       $message = loadEmailTemplate('member_holiday_activated', $content, $content['userid']);
+                       sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_ACTIVATED_SUBJ'), $message);
 
                        // Update account
-                       ADD_SQL(SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
+                       addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data`
 SET `holiday_active`='Y'
-WHERE userid=%s
+WHERE `userid`=%s
 LIMIT 1",
-                       array(bigintval($content['userid'])), __FILE__, __LINE__, false));
+                               array(bigintval($content['userid'])), __FILE__, __LINE__, false));
                } // END - if
 
                // Free memory
@@ -103,7 +102,7 @@ LIMIT 1",
 SQL_FREERESULT($result_main);
 
 // Stop currently activated holidays
-HOLIDAY_STOP_HOLIDAYS();
+stopHolidays();
 
-//
+// [EOF]
 ?>