extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

* EMail/Calendar: for meeting requests to recuring events check recurrance enddate, not event-date, to deny importing it with "event is in the past"

Browse Source
This commit is contained in:
Ralf Becker 2012-03-12 08:52:40 +00:00
parent 3a4274af02
commit 1575434535
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -1689,8 +1689,9 @@ function replace_eTemplate_onsubmit()
$readonlys['button[accept]'] = $readonlys['button[tentativ]'] = $readonlys['button[reject]'] = true;
}
}
// ignore events in the past
if ($this->bo->date2ts($event['start']) < $this->bo->now_su)
// ignore events in the past (for recurring events check enddate!)
if ($this->bo->date2ts($event['start']) < $this->bo->now_su &&
(!$event['recur_type'] || $event['recur_enddate'] && $event['recur_enddate'] < $this->bo->now_su))
{
$msg = lang('Requested meeting is in the past!');
$readonlys['button[accept]'] = $readonlys['button[tentativ]'] = $readonlys['button[reject]'] = true;