if (empty($content['timestamp'])) $content['timestamp'] = '0';
if (empty($content['timestamp_ordered'])) $content['timestamp_ordered'] = '0';
- if ((($content['timestamp'] + getConfig('holiday_lock')) > time()) || (($content['timestamp_ordered'] + getConfig('holiday_lock')) > time())) {
+ if ((($content['timestamp'] + getHolidayLock()) > time()) || (($content['timestamp_ordered'] + getHolidayLock()) > time())) {
// Mail order is to close away!
unsetPostRequestElement('ok');
unsetPostRequestElement('stop');
- if (($content['timestamp'] + getConfig('holiday_lock')) > time()) {
+ if (($content['timestamp'] + getHolidayLock()) > time()) {
// Mail found in pool
$stamp = $content['timestamp'];
} else {
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 {
// 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(getMemberId(), $START, $content['holiday_end'], postRequestElement('comments')), __FILE__, __LINE__);
+ SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_holidays` (`userid`, `holiday_start`, `holiday_end`, `comments`) VALUES ('%s','%s','%s','%s')",
+ array(
+ getMemberId(),
+ $content['holiday_start'],
+ $content['holiday_end'],
+ postRequestElement('comments')
+ ), __FILE__, __LINE__);
// Activate holiday system
SQL_QUERY_ESC("UPDATE
// Merge arrays
$content = merge_array($content, SQL_FETCHARRAY($result));
- if (($content['holiday_active'] == 'Y') && (($content['holiday_activated'] + getConfig('holiday_lock')) < time())) {
+ if (($content['holiday_active'] == 'Y') && (($content['holiday_activated'] + getHolidayLock()) < time())) {
// Load data
$result2 = SQL_QUERY_ESC("SELECT
`holiday_start`,
SQL_FREERESULT($result);
// Check for lock
- if (($content['holiday_activated'] + getConfig('holiday_lock')) < time()) {
+ if (($content['holiday_activated'] + getHolidayLock()) < time()) {
// User can deactivate his holiday request
switch ($content['holiday_active']) {
case 'Y': // Display deactivation form
// Load starting and ending date
$result = SQL_QUERY_ESC("SELECT
- `holiday_start`,`holiday_end`
+ `holiday_start`,
+ `holiday_end`
FROM
`{?_MYSQL_PREFIX?}_user_holidays`
WHERE
$content['lock'] = generateDateTime($content['holiday_activated'], 1);
// Load template
- loadTemplate('member_holiday_deactivate', false, $content);
+ loadTemplate('member_holiday_deactivate', FALSE, $content);
} else {
// Free memory
SQL_FREERESULT($result);
$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);
+ loadTemplate('member_holiday_form', FALSE, $content);
break;
} // END - switch
} else {