Complete rewrite of and , wrapper functions added, see bug #101

[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 3f3c29223d518141df2ab51b9b6261a316b07326..5bbf90d4c186fc1597da34ed7e5c06127a945d28 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -64,8 +64,8 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1))
        if ((($stamp1 + getConfig('holiday_lock')) > time()) || (($stamp2 + getConfig('holiday_lock')) > time()))
        {
                // Mail order is to close away!
-               unset($_POST['ok']);
-               unset($_POST['stop']);
+               REQUEST_UNSET_POST('ok');
+               REQUEST_UNSET_POST(('stop'));
 
                if (($stamp1 + getConfig('holiday_lock')) > time())
                {
@@ -88,24 +88,24 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1))
 SQL_FREERESULT($result1);
 SQL_FREERESULT($result2);
 
-if (isset($_POST['ok']))
+if (IS_FORM_SENT())
 {
        // Check holiday request...
-       $START = mktime(0, 0, 0, $_POST['start_month'], $_POST['start_day'], $_POST['start_year']);
-       $END   = mktime(0, 0, 0, $_POST['end_month']  , $_POST['end_day']  , $_POST['end_year']  );
+       $START = mktime(0, 0, 0, REQUEST_POST('start_month'), REQUEST_POST('start_day'), REQUEST_POST('start_year'));
+       $END   = mktime(0, 0, 0, REQUEST_POST('end_month')  , REQUEST_POST('end_day')  , REQUEST_POST('end_year')  );
 
        // Test both values
        $TEST = $END - $START;
        if (($TEST < 0) || ($TEST > (getConfig('one_day') * getConfig('holiday_max'))) || ($START < time()) || ($END < time()))
        {
                // Time test failed
-               unset($_POST['ok']);
+               REQUEST_UNSET_POST('ok');
        }
         else
        {
                // Everything went okay so let's store his request and send mails
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_holidays` (userid, holiday_start, holiday_end, comments) VALUES ('%s','%s','%s','%s')",
-                array($GLOBALS['userid'], $START, $END, $_POST['comments']), __FILE__, __LINE__);
+                array($GLOBALS['userid'], $START, $END, REQUEST_POST('comments')), __FILE__, __LINE__);
 
                // Activate holiday system
                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
@@ -114,19 +114,19 @@ WHERE userid=%s LIMIT 1",
                 array($GLOBALS['userid']), __FILE__, __LINE__);
 
                // Prepare constants
-               define('_START_DAY'  , $_POST['start_day']);
-               define('_START_MONTH', $MONTH_DESCR[$_POST['start_month']]);
-               define('_START_YEAR' , $_POST['start_year']);
-               define('_END_DAY'    , $_POST['end_day']);
-               define('_END_MONTH'  , $MONTH_DESCR[$_POST['end_month']]);
-               define('_END_YEAR'   , $_POST['end_year']);
+               define('_START_DAY'  , REQUEST_POST('start_day'));
+               define('_START_MONTH', $MONTH_DESCR[REQUEST_POST('start_month')]);
+               define('_START_YEAR' , REQUEST_POST('start_year'));
+               define('_END_DAY'    , REQUEST_POST('end_day'));
+               define('_END_MONTH'  , $MONTH_DESCR[REQUEST_POST('end_month')]);
+               define('_END_YEAR'   , REQUEST_POST('end_year'));
 
                // Send mail to member
-               $msg = LOAD_EMAIL_TEMPLATE("member_holiday_request", $_POST['comments'], $GLOBALS['userid']);
+               $msg = LOAD_EMAIL_TEMPLATE("member_holiday_request", REQUEST_POST('comments'), $GLOBALS['userid']);
                SEND_EMAIL($GLOBALS['userid'], HOLIDAY_MEMBER_SUBJECT, $msg);
 
                // Send mail to all admins
-               SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_SUBJECT, "admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
+               SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_SUBJECT, "admin_holiday_request", REQUEST_POST('comments'), $GLOBALS['userid']);
 
                // 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','%s','%s', UNIX_TIMESTAMP())",
@@ -138,7 +138,7 @@ WHERE userid=%s LIMIT 1",
 }
 
 // Holiday shall be ended now
-if (isset($_POST['stop']))
+if (REQUEST_ISSET_POST(('stop')))
 {
        // Okay, end the holiday here...
        $result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM `{!_MYSQL_PREFIX!}_user_data`
@@ -190,7 +190,7 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 }
 
 // If something is wrong or link in menu is just clicked display form
-if ((!isset($_POST['ok'])) && (!isset($_POST['stop'])))
+if ((!IS_FORM_SENT()) && (!REQUEST_ISSET_POST(('stop'))))
 {
        // Check if user is in holiday...
        $result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM `{!_MYSQL_PREFIX!}_user_data`