3 commits - plugins/calendar plugins/libcalendaring
Thomas Brüderli
bruederli at kolabsys.com
Tue Mar 18 12:11:04 CET 2014
plugins/calendar/calendar.php | 3 +++
plugins/calendar/skins/larry/calendar.css | 2 +-
plugins/libcalendaring/libvcalendar.php | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 26824f3d51554b2c5a57bcedf3eeede760d1483a
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Tue Mar 18 12:08:54 2014 +0100
Consider VTODOs in pre-check
diff --git a/plugins/libcalendaring/libvcalendar.php b/plugins/libcalendaring/libvcalendar.php
index 674669d..0bfa521 100644
--- a/plugins/libcalendaring/libvcalendar.php
+++ b/plugins/libcalendaring/libvcalendar.php
@@ -129,7 +129,7 @@ class libvcalendar implements Iterator
try {
// estimate the memory usage and try to avoid fatal errors when allowed memory gets exhausted
if ($memcheck) {
- $count = substr_count($vcal, 'BEGIN:VEVENT');
+ $count = substr_count($vcal, 'BEGIN:VEVENT') + substr_count($vcal, 'BEGIN:VTODO');
$expected_memory = $count * 70*1024; // assume ~ 70K per event (empirically determined)
if (!rcube_utils::mem_check($expected_memory)) {
commit 36dda1afd4750a1e3f5d26c57bda728089fbd6a1
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Tue Mar 18 12:07:29 2014 +0100
Only list event-type iTip invitations for RSVP (#2928)
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index fe7c311..2f80a59 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -2093,6 +2093,9 @@ class calendar extends rcube_plugin
// show a box for every event in the file
foreach ($events as $idx => $event) {
+ if ($event['_type'] != 'event') // skip non-event objects (#2928)
+ continue;
+
// define buttons according to method
if ($this->ical->method == 'REPLY') {
$title = $this->gettext('itipreply');
commit 1cb1f59bbc30b3cd0d14e885381f435d5b724276
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Tue Mar 18 10:21:35 2014 +0100
Small CSS fix for attachments list
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index 6b4548b..c13905d 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -386,7 +386,7 @@ a.miniColors-trigger {
display: block;
color: #333;
font-weight: bold;
- padding: 8px 4px 3px 30px;
+ padding: 4px 4px 3px 30px;
text-shadow: 0px 1px 1px #fff;
text-decoration: none;
white-space: nowrap;
More information about the commits
mailing list