From 015ef6cd6b87e8591104e5a1b8b15f5d462c386e Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Wed, 16 Apr 2014 09:42:52 +0200
Subject: [PATCH] Fix attachment/message links; avoid double-escaping of folder
 names in drop-down list

---
 plugins/kolab_notes/kolab_notes.php    | 6 +-----
 plugins/kolab_notes/kolab_notes_ui.php | 1 +
 plugins/kolab_notes/notes.js           | 1 +
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/kolab_notes/kolab_notes.php b/plugins/kolab_notes/kolab_notes.php
index 2c478558..6442a710 100644
--- a/plugins/kolab_notes/kolab_notes.php
+++ b/plugins/kolab_notes/kolab_notes.php
@@ -261,11 +261,7 @@ class kolab_notes extends rcube_plugin
                 $this->rc->output->set_env('kolab_notes_template', array(
                     '_from_mail' => true,
                     'title' => $message->get('subject'),
-                    'links' => array(array(
-                        'uri' => $this->get_message_uri($message, $folder),
-                        'message_id' => $message->get('message-id'),
-                        'subject' => $message->get('subject'),
-                    )),
+                    'links' => array($this->get_message_reference($this->get_message_uri($message, $folder))),
                 ));
             }
         }
diff --git a/plugins/kolab_notes/kolab_notes_ui.php b/plugins/kolab_notes/kolab_notes_ui.php
index bbb3ca75..770d3045 100644
--- a/plugins/kolab_notes/kolab_notes_ui.php
+++ b/plugins/kolab_notes/kolab_notes_ui.php
@@ -97,6 +97,7 @@ class kolab_notes_ui
         $attrib += array('id' => 'rcmkolabnotebooks');
 
         if ($attrib['type'] == 'select') {
+            $attrib['is_escaped'] = true;
             $select = new html_select($attrib);
         }
 
diff --git a/plugins/kolab_notes/notes.js b/plugins/kolab_notes/notes.js
index 41dcac15..23b8d3ef 100644
--- a/plugins/kolab_notes/notes.js
+++ b/plugins/kolab_notes/notes.js
@@ -1006,6 +1006,7 @@ function rcube_kolab_notes_ui(settings)
         $('.tagline, .dates', rcmail.gui_objects.noteviewtitle).hide();
         $(rcmail.gui_objects.noteseditform).hide();
         $(rcmail.gui_objects.notesdetailview).hide();
+        $(rcmail.gui_objects.notesattachmentslist).html('');
         rcmail.enable_command('save', false);
     }