Branch 'dev/kolab3' - 2 commits - plugins/calendar plugins/libkolab

[Thomas Brüderli]

 plugins/calendar/calendar_ui.js               |    2 --
 plugins/libkolab/lib/kolab_storage_cache.php  |    2 +-
 plugins/libkolab/lib/kolab_storage_folder.php |    6 ++++++
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 3fc78aa4096ae5976908a460cc6c32470bd57c89
Author: Thomas B <roundcube at gmail.com>
Date:   Wed May 2 18:04:42 2012 +0200

    Set mime-part ID when adding attachments

diff --git a/plugins/libkolab/lib/kolab_storage_cache.php b/plugins/libkolab/lib/kolab_storage_cache.php
index cfcacf5..ff11d63 100644
--- a/plugins/libkolab/lib/kolab_storage_cache.php
+++ b/plugins/libkolab/lib/kolab_storage_cache.php
@@ -388,7 +388,7 @@ class kolab_storage_cache
             }
             else if ($key == '_attachments') {
                 foreach ($val as $k => $att) {
-                    unset($att['content']);
+                    unset($att['content'], $att['path']);
                     if ($att['id'])
                         $data[$key][$k] = $att;
                 }
diff --git a/plugins/libkolab/lib/kolab_storage_folder.php b/plugins/libkolab/lib/kolab_storage_folder.php
index 246e58b..69770ab 100644
--- a/plugins/libkolab/lib/kolab_storage_folder.php
+++ b/plugins/libkolab/lib/kolab_storage_folder.php
@@ -574,6 +574,7 @@ class kolab_storage_folder
         $mime = new Mail_mime("\r\n");
         $rcmail = rcube::get_instance();
         $headers = array();
+        $part_id = 1;
 
         if ($ident = $rcmail->user->get_identity()) {
             $headers['From'] = $ident['email'];
@@ -598,6 +599,7 @@ class kolab_storage_folder
             $rcmail->config->get('mime_param_folding') == 2 ? 'quoted-printable' : null,
             '', RCMAIL_CHARSET
         );
+        $part_id++;
 
         // save object attachments as separate parts
         // TODO: optimize memory consumption by using tempfiles for transfer
@@ -608,10 +610,14 @@ class kolab_storage_folder
             }
             if (!empty($att['content'])) {
                 $mime->addAttachment($att['content'], $att['mimetype'], $name, false);
+                $part_id++;
             }
             else if (!empty($att['path'])) {
                 $mime->addAttachment($att['path'], $att['mimetype'], $name, true);
+                $part_id++;
             }
+
+            $object['_attachments'][$name]['id'] = $part_id;
         }
 
         return $mime->getMessage();


commit d2f8ae44d2e8d367ba9a4b2d8dad60e56bfd69bb
Author: Thomas B <roundcube at gmail.com>
Date:   Wed May 2 18:02:33 2012 +0200

    Remove debug code

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 063cbf5..b888825 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -268,8 +268,6 @@ function rcube_calendar_ui(settings)
         }
       }
 
-      return;
-
       rcmail.goto_url('get-attachment', qstring+'&_download=1', false);
     };