extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 08:09:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for not set 20467start20467 and 20467end20467 when set in datefields, but vacation is set as active (not timed)

Browse Source
This commit is contained in:
Klaus Leithoff 2012-04-25 15:23:16 +00:00
parent 4aebbb187e
commit 87a323fd6c
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
felamimail/inc/class.uisieve.inc.php
View File

@ -589,12 +589,18 @@
$newVacation['forwards'] = get_var('vacation_forwards',array('POST')); $newVacation['forwards'] = get_var('vacation_forwards',array('POST'));
} }
if (!in_array($newVacation['status'],array('on','off','by_date'))) $newVacation['status'] = 'off'; if (!in_array($newVacation['status'],array('on','off','by_date'))) $newVacation['status'] = 'off';
if ($this->timed_vacation) if ($this->timed_vacation||isset($_POST['start_date']) || isset($_POST['end_date']))
{ {
$date = $jscal->input2date($_POST['start_date']); if (isset($_POST['start_date']))
if ($date['raw']) $newVacation['start_date'] = $date['raw']-12*3600; {
$date = $jscal->input2date($_POST['end_date']); $date = $jscal->input2date($_POST['start_date']);
if ($date['raw']) $newVacation['end_date'] = $date['raw']-12*3600; if ($date['raw']) $newVacation['start_date'] = $date['raw']-12*3600;
}
if (isset($_POST['end_date']))
{
$date = $jscal->input2date($_POST['end_date']);
if ($date['raw']) $newVacation['end_date'] = $date['raw']-12*3600;
}
} }
if(isset($_POST['save']) || isset($_POST['apply'])) if(isset($_POST['save']) || isset($_POST['apply']))
{ {