diff options
| -rw-r--r-- | plugins/calendar/calendar.php | 6 | ||||
| -rw-r--r-- | plugins/calendar/config.inc.php.dist | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php index 5121e88..c8dc4bd 100644 --- a/plugins/calendar/calendar.php +++ b/plugins/calendar/calendar.php @@ -8,7 +8,7 @@ * @author Thomas Bruederli <bruederli@kolabsys.com> * * Copyright (C) 2010, Lazlo Westerhof - Netherlands - * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com> + * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -740,7 +740,7 @@ class calendar extends rcube_plugin } else if (in_array($status, array('ACCEPTED','TENTATIVE','DECLINED'))) { $html = html::div('rsvp-status ' . strtolower($status), $this->gettext('youhave'.strtolower($status))); - if ($this->rc->config->get('calendar_itip_dtstampcheck', true) && $existing['changed'] && $event['changed'] < $existing['changed']) { + if ($this->rc->config->get('calendar_itip_dtstampcheck', false) && $existing['changed'] && $event['changed'] < $existing['changed']) { $action = ''; } } @@ -2213,7 +2213,7 @@ class calendar extends rcube_plugin } // import the (newer) event // TODO: compare SEQUENCE numbers instead of changed dates - else if ($event['changed'] >= $existing['changed'] || !$this->rc->config->get('calendar_itip_dtstampcheck', true)) { + else if ($event['changed'] >= $existing['changed'] || !$this->rc->config->get('calendar_itip_dtstampcheck', false)) { $event['id'] = $existing['id']; $event['calendar'] = $existing['calendar']; $success = $this->driver->edit_event($event); diff --git a/plugins/calendar/config.inc.php.dist b/plugins/calendar/config.inc.php.dist index 13c984a..4b78297 100644 --- a/plugins/calendar/config.inc.php.dist +++ b/plugins/calendar/config.inc.php.dist @@ -5,7 +5,7 @@ | Version 0.7.4 | | | | Copyright (C) 2010, Lazlo Westerhof - Netherlands | - | Copyright (C) 2011, Kolab Systems AG | + | Copyright (C) 2013, Kolab Systems AG | | | | This program is free software: you can redistribute it and/or modify | | it under the terms of the GNU Affero General Public License as | @@ -21,9 +21,10 @@ // backend type (database, google, kolab) $rcmail_config['calendar_driver'] = "database"; -// optionally disable the DTSTAMP check of iTip messages (enabled by default) -// setting this to false will always show RSVP buttons, even for invitations older than the local copy -$rcmail_config['calendar_itip_dtstampcheck'] = true; +// optionally enable the DTSTAMP check for iTip messages (disabled by default). +// setting this to true will only show RSVP buttons if an iTip inivation is newer +// than the local copy of the matching event. +$rcmail_config['calendar_itip_dtstampcheck'] = false; // default calendar view (agendaDay, agendaWeek, month) $rcmail_config['calendar_default_view'] = "agendaWeek"; |