diff --git a/calendar/inc/class.bocalendar.inc.php b/calendar/inc/class.bocalendar.inc.php index f62e09157c..b4b892ddb9 100755 --- a/calendar/inc/class.bocalendar.inc.php +++ b/calendar/inc/class.bocalendar.inc.php @@ -1081,6 +1081,14 @@ $this->so->add_entry($event); $this->send_update(MSG_ADDED,$event['participants'],'',$this->get_cached_event()); print_debug('New Event ID',$event['id']); + + // set a new recur_exception + if ($event['reference'] && (int) $l_cal['new_exception']) + { + $recur_event = $this->read_entry($event['reference']); + $recur_event['recur_exception'][] = (int) $l_cal['new_exception']; + $this->so->add_entry($recur_event); + } } else { @@ -1105,7 +1113,6 @@ $this->prepare_recipients($new_event,$old_event); } - $date = sprintf("%04d%02d%02d",$event['start']['year'],$event['start']['month'],$event['start']['mday']); // check if infolog is availible if(isset($GLOBALS['phpgw_info']['apps']['infolog']) && isset($l_cal['project'])) { @@ -1201,6 +1208,7 @@ 'hour' => (int)(date('H',$time)), 'min' => (int)(date('i',$time)), 'sec' => (int)(date('s',$time)), + 'raw' => $time, 'alarm' => (int)($alarm) ); } diff --git a/calendar/inc/class.uicalendar.inc.php b/calendar/inc/class.uicalendar.inc.php index 01aa401dd4..133650b11f 100755 --- a/calendar/inc/class.uicalendar.inc.php +++ b/calendar/inc/class.uicalendar.inc.php @@ -3976,7 +3976,9 @@ 'common_hidden' => $this->html->input_hidden('cal[id]',$event['id']) . $this->html->input_hidden('cal[owner]',$event['owner']) . $this->html->input_hidden('cal[uid]',$event['uid']) - . ($_GET['cal_id'] && $event['id'] == 0?$this->html->input_hidden('cal[reference]',$_GET['cal_id']) : + . ($_GET['cal_id'] && $event['id'] == 0?$this->html->input_hidden(array( + 'cal[reference]' => $_GET['cal_id'], + 'cal[new_exception]' => $event['start']['raw'])) : (@isset($event['reference'])?$this->html->input_hidden('cal[reference]',$event['reference']):'')) . (@isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && $GLOBALS['phpgw_info']['server']['deny_user_grants_access']? $this->html->input_hidden('participants[]',$this->bo->owner):''),