Extension ext-blacklist continued:

[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 95e3f651d5b0c615c89c3a84d3b5d444422dc4ab..31c69e5283400c2787bd29ed7e81c6a0e7c09123 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -109,12 +109,12 @@ SQL_FREERESULT($result2);
 
 if (isFormSent()) {
        // Check holiday request...
-       $START = mktime(0, 0, 0, postRequestElement('start_month'), postRequestElement('start_day'), postRequestElement('start_year'));
-       $content['holiday_end']   = mktime(0, 0, 0, postRequestElement('end_month')  , postRequestElement('end_day')  , postRequestElement('end_year')  );
+       $content['holiday_start'] = mktime(0, 0, 0, postRequestElement('start_mo'), postRequestElement('start_da'), postRequestElement('start_ye'));
+       $content['holiday_end']   = mktime(0, 0, 0, postRequestElement('end_mo')  , postRequestElement('end_da')  , postRequestElement('end_ye')  );
 
        // Test both values
-       $TEST = $content['holiday_end'] - $START;
-       if (($TEST < 0) || ($TEST > (getOneDay() * getConfig('holiday_max'))) || ($START < time()) || ($content['holiday_end'] < time())) {
+       $TEST = $content['holiday_end'] - $content['holiday_start'];
+       if (($TEST < 0) || ($TEST > (getOneDay() * getConfig('holiday_max'))) || ($content['holiday_start'] < time()) || ($content['holiday_end'] < time())) {
                // Time test failed
                unsetPostRequestElement('ok');
        } else {
@@ -122,7 +122,7 @@ if (isFormSent()) {
                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_holidays` (`userid`, `holiday_start`, `holiday_end`, `comments`) VALUES ('%s','%s','%s','%s')",
                        array(
                                getMemberId(),
-                               $START,
+                               $content['holiday_start'],
                                $content['holiday_end'],
                                postRequestElement('comments')
                        ), __FILE__, __LINE__);
@@ -307,14 +307,14 @@ LIMIT 1",
                                $endingStamp   = $startingStamp + (getOneDay() * getConfig('holiday_max'));
 
                                // Starting day
-                               $content['start_day']   = addSelectionBox('day'  , getDay($startingStamp)  , 'start');
-                               $content['start_month'] = addSelectionBox('month', getMonth($startingStamp), 'start');
-                               $content['start_year']  = addSelectionBox('year' , getYear($startingStamp) , 'start');
+                               $content['start_day']   = addSelectionBox('da', getDay($startingStamp)  , 'start');
+                               $content['start_month'] = addSelectionBox('mo', getMonth($startingStamp), 'start');
+                               $content['start_year']  = addSelectionBox('ye', getYear($startingStamp) , 'start');
 
                                // Ending day
-                               $content['end_day']   = addSelectionBox('day'  , getDay($endingStamp)  , 'end');
-                               $content['end_month'] = addSelectionBox('month', getMonth($endingStamp), 'end');
-                               $content['end_year']  = addSelectionBox('year' , getYear($endingStamp) , 'end');
+                               $content['end_day']   = addSelectionBox('da', getDay($endingStamp)  , 'end');
+                               $content['end_month'] = addSelectionBox('mo', getMonth($endingStamp), 'end');
+                               $content['end_year']  = addSelectionBox('ye', getYear($endingStamp) , 'end');
 
                                // Output form
                                loadTemplate('member_holiday_form', FALSE, $content);