Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix deletion/cancellation of this-and-future instances

Browse source
This commit is contained in:
Thomas Bruederli 2015-02-17 14:54:12 +01:00
parent ba84648fa7
commit 3ea6d43579
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plugins/calendar/calendar.php
View file

@ -1711,6 +1711,9 @@ class calendar extends rcube_plugin
if ($attendee['status'] == 'DELEGATED' && $attendee['rsvp'] == false) {
$event['attendees'][$i]['noreply'] = true;
}
else {
unset($event['attendees'][$i]['noreply']);
}
}
if ($organizer === null && !empty($event['organizer'])) {
@ -2432,12 +2435,14 @@ class calendar extends rcube_plugin
*/
function event_itip_remove()
{
$success = false;
$uid = rcube_utils::get_input_value('uid', rcube_utils::INPUT_POST);
$inst = rcube_utils::get_input_value('_instance', rcube_utils::INPUT_POST);
$success = false;
$uid = rcube_utils::get_input_value('uid', rcube_utils::INPUT_POST);
$instance = rcube_utils::get_input_value('_instance', rcube_utils::INPUT_POST);
$savemode = rcube_utils::get_input_value('_savemode', rcube_utils::INPUT_POST);
// search for event if only UID is given
if ($event = $this->driver->get_event(array('uid' => $uid, '_instance' => $inst), true)) {
if ($event = $this->driver->get_event(array('uid' => $uid, '_instance' => $instance), true)) {
$event['_savemode'] = $savemode;
$success = $this->driver->remove_event($event, true);
}

1
plugins/calendar/skins/larry/print.css
View file

@ -76,6 +76,7 @@ body, td, th, div, p, h3, select, input, textarea {
#calendarlist li div {
float: left;
padding-right: 3em;
padding-bottom: 1em;
}
#calendarlist input,