Huge script change, see http://forum.mxchange.org/topic-458.html for details:

[mailer.git] / inc / libs / holiday_functions.php

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index e23f772dd42fda387cad593560c43d5627de682f..2ddd8df6870217a9aa2e3eccc0263c663e0c11f5 100644 (file)
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.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,17 +38,16 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-}
+       die();
+} // END - if
 
-//
-function HOLIDAY_STOP_HOLIDAYS () {
+// Stops all expired holidays
+function stopHolidays () {
        // Let's find some expired holiday requests...
        $result_stop = SQL_QUERY("SELECT
        `userid`, `holiday_start`, `holiday_end`, `comments`
 FROM
-       `{!_MYSQL_PREFIX!}_user_holidays`
+       `{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
        `holiday_end` <= UNIX_TIMESTAMP()
 ORDER BY
@@ -57,17 +56,17 @@ ORDER BY
                // We foud at least one
                $admin = '';
                // Init SQLs
-               INIT_SQLS();
+               initSqls();
 
                // Process all found entries
                while ($content = SQL_FETCHARRAY($result_stop)) {
                        // Stop holiday
-                       ADD_SQL(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_holidays` WHERE `userid`=%s LIMIT 1",
+                       addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_holidays` WHERE `userid`=%s LIMIT 1",
                                array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
 
                        // Unlock account
-                       ADD_SQL(SQL_QUERY_ESC("UPDATE
-       `{!_MYSQL_PREFIX!}_user_data`
+                       addSql(SQL_QUERY_ESC("UPDATE
+       `{?_MYSQL_PREFIX?}_user_data`
 SET
        `holiday_active`='N', `holiday_activated`=0
 WHERE
@@ -83,7 +82,7 @@ LIMIT 1",
                        );
 
                        // Send mail to user
-                       $message = LOAD_EMAIL_TEMPLATE('member_holiday_unlock', $content, $content['userid']);
+                       $message = loadEmailTemplate('member_holiday_unlock', $content, $content['userid']);
                        sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_UNLOCK_SUBJ'), $message);
 
                        // Remember userid for admin