Branch 'roundcubemail-plugins-kolab-3.1' - 2 commits - plugins/calendar plugins/libkolab

[Thomas Brüderli]

 plugins/calendar/skins/larry/calendar.css  |    2 +-
 plugins/libkolab/lib/kolab_format_xcal.php |   15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 419e318533166d4e86daee82907aa2d9aa065d09
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Tue Mar 18 10:20:26 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 08637f1..ea215b0 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;


commit 392339fe26e4eea66b7fc9acb037c8f54275d068
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Tue Mar 18 10:13:42 2014 +0100

    Avoid saving attachments with empty mimetype; validate before adding to XML (#2927)

diff --git a/plugins/libkolab/lib/kolab_format_xcal.php b/plugins/libkolab/lib/kolab_format_xcal.php
index f751abc..cd69fa9 100644
--- a/plugins/libkolab/lib/kolab_format_xcal.php
+++ b/plugins/libkolab/lib/kolab_format_xcal.php
@@ -423,8 +423,19 @@ abstract class kolab_format_xcal extends kolab_format
                 continue;
             $attach = new Attachment;
             $attach->setLabel((string)$attr['name']);
-            $attach->setUri('cid:' . $cid, $attr['mimetype']);
-            $vattach->push($attach);
+            $attach->setUri('cid:' . $cid, $attr['mimetype'] ?: 'application/octet-stream');
+            if ($attach->isValid()) {
+              $vattach->push($attach);
+            }
+            else {
+              rcube::raise_error(array(
+                  'code' => 660,
+                  'type' => 'php',
+                  'file' => __FILE__,
+                  'line' => __LINE__,
+                  'message' => "Invalid attributes for attachment $cid: " . var_export($attr, true),
+              ), true);
+            }
         }
 
         foreach ((array)$object['links'] as $link) {