mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-27 02:14:45 +01:00
Do not show out dated vacation in vacation notice
This commit is contained in:
parent
3258b766f4
commit
2a43aea1e2
@ -4109,6 +4109,7 @@ class mail_ui
|
|||||||
$dtfrmt = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
|
$dtfrmt = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
|
||||||
$refreshData['vacationnotice'] = lang('Vacation notice is active');
|
$refreshData['vacationnotice'] = lang('Vacation notice is active');
|
||||||
$refreshData['vacationrange'] = ($vacation['status']=='by_date'? common::show_date($vacation['start_date'],$dtfrmt,true).($vacation['end_date']>$vacation['start_date']?'->'.common::show_date($vacation['end_date']+ 24*3600-1,$dtfrmt,true):''):'');
|
$refreshData['vacationrange'] = ($vacation['status']=='by_date'? common::show_date($vacation['start_date'],$dtfrmt,true).($vacation['end_date']>$vacation['start_date']?'->'.common::show_date($vacation['end_date']+ 24*3600-1,$dtfrmt,true):''):'');
|
||||||
|
if ($vacation['status'] == 'by_date' && $vacation['end_date']+ 24*3600 < time())$refreshData = '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($vacation==false)
|
if ($vacation==false)
|
||||||
|
Loading…
Reference in New Issue
Block a user