diff --git a/calendar/inc/class.calendar_tracking.inc.php b/calendar/inc/class.calendar_tracking.inc.php index a56f6f2dc4..25df1df0c8 100644 --- a/calendar/inc/class.calendar_tracking.inc.php +++ b/calendar/inc/class.calendar_tracking.inc.php @@ -59,6 +59,7 @@ class calendar_tracking extends bo_tracking 'start' => 'start', 'end' => 'end', + 'deleted' => 'deleted', 'participants' => array('user_id', 'status', 'role', 'recur'), 'participants-c' => array('user_id', 'status', 'quantity', 'role', 'recur'), @@ -86,6 +87,7 @@ class calendar_tracking extends bo_tracking 'start' => 'start', 'end' => 'end', + 'deleted' => 'deleted', 'participants' => 'Participants: User, Status, Role', 'participants-c'=> 'Participants: User, Status, Quantity, Role', diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index 6a50c67d44..f90a4667db 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -2430,6 +2430,8 @@ class calendar_uiforms extends calendar_ui 'start' => 'date-time', 'end' => 'date-time', + 'deleted' => 'date-time', + 'tz_id' => 'select-timezone', // Participants @@ -2560,7 +2562,7 @@ class calendar_uiforms extends calendar_ui } } } - + /** * imports a mail as Calendar * @@ -2576,13 +2578,13 @@ class calendar_uiforms extends calendar_ui egw_link::get_data ($_GET['egw_data']); return false; } - + if (is_array($mailContent)) { // Addressbook $AB = new addressbook_bo(); $accounts = array(0 => $GLOBALS['egw_info']['user']['account_id']); - + $participants[0] = array ( 'uid' => $GLOBALS['egw_info']['user']['account_id'], 'delete_id' => $GLOBALS['egw_info']['user']['account_id'], @@ -2620,7 +2622,7 @@ class calendar_uiforms extends calendar_ui "role" => "REQ-PARTICIPANT", "add" => "pressed" )); - + // Prepare calendar event draft $event = array( 'title' => $mailContent['subject'], @@ -2633,7 +2635,7 @@ class calendar_uiforms extends calendar_ui 'start' => $mailContent['date'], 'duration' => 60 * $this->cal_prefs['interval'] ); - + if (is_array($mailContent['attachments'])) { foreach ($mailContent['attachments'] as $attachment) @@ -2653,7 +2655,7 @@ class calendar_uiforms extends calendar_ui { egw_framework::window_close(lang('No content found to show up as calendar entry.')); } - + return $this->process_edit($event); } }