Huge rewrite:

[mailer.git] / inc / modules / member / what-holiday.php

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index d7f8b2bb7cafb28924482b1ef33a63383c42adb8..761577cad27e19b846b9882f137e4bb76933b73a 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -118,15 +118,14 @@ WHERE userid=%s LIMIT 1",
                define('_END_YEAR'   , REQUEST_POST('end_year'));
 
                // Send mail to member
-               $msg = LOAD_EMAIL_TEMPLATE('member_holiday_request', REQUEST_POST('comments'), getUserId());
-               sendEmail(getUserId(), getMessage('HOLIDAY_MEMBER_SUBJECT'), $msg);
+               $message = LOAD_EMAIL_TEMPLATE('member_holiday_request', REQUEST_POST('comments'), getUserId());
+               sendEmail(getUserId(), getMessage('HOLIDAY_MEMBER_SUBJECT'), $message);
 
                // Send mail to all admins
                sendAdminNotification(getMessage('HOLIDAY_ADMIN_SUBJECT'), 'admin_holiday_request', REQUEST_POST('comments'), getUserId());
 
                // Create task
-               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (userid, assigned_admin, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','HOLIDAY_REQUEST','{--HOLIDAY_ADMIN_SUBJECT--}','%s', UNIX_TIMESTAMP())",
-               array(getUserId(), $msg), __FILE__, __LINE__);
+               createNewTask('{--HOLIDAY_ADMIN_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getUserId());
 
                // Display message
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_IS_ACTIVATED_NOW'));
@@ -136,15 +135,15 @@ WHERE userid=%s LIMIT 1",
 // Holiday shall be ended now
 if (REQUEST_ISSET_POST('stop')) {
        // Okay, end the holiday here...
-       $result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `holiday_active`, `holiday_activated` FROM `{!_MYSQL_PREFIX!}_user_data`
+WHERE `userid`=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
        list($active, $locked) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
        if (($active == 'Y') && (($locked + getConfig('holiday_lock')) < time())) {
                // Load data
-               $result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM `{!_MYSQL_PREFIX!}_user_holidays`
-WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT `holiday_start`, `holiday_end` FROM `{!_MYSQL_PREFIX!}_user_holidays`
+WHERE `userid`=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Data was found
                        list($start, $end) = SQL_FETCHROW($result);