From 8706209a7276f1bee61f7d39998d986c01a2ffd7 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Thu, 15 Oct 2015 11:14:06 +0200
Subject: [PATCH 01/26] Added file creation dialog

---
 plugins/kolab_files/kolab_files.js            | 119 ++++++++++++++----
 .../kolab_files/lib/kolab_files_engine.php    |  53 +++++++-
 plugins/kolab_files/localization/en_US.inc    |   7 +-
 plugins/kolab_files/skins/larry/style.css     |   2 +
 .../skins/larry/templates/files.html          |   5 +
 5 files changed, 159 insertions(+), 27 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 1759ee47..0229d34b 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -352,25 +352,14 @@ function kolab_files_folder_create_dialog()
   $('form', dialog).submit(kolab_dialog_submit_handler);
 
   // build parent selector
-  select.append($('<option>').val('').text('---'));
-  $.each(file_api.env.folders, function(i, f) {
-    var n, option = $('<option>'), name = escapeHTML(f.name);
-
-    for (n=0; n<f.depth; n++)
-      name = '&nbsp;&nbsp;&nbsp;' + name;
-
-    option.val(i).html(name).appendTo(select);
-
-    if (i == file_api.env.folder)
-      option.attr('selected', true);
-  });
+  kolab_files_folder_select_element(select, {empty: true});
 };
 
 // folder edit dialog
 function kolab_files_folder_edit_dialog()
 {
   var dialog = $('#files-folder-edit-dialog'),
-    buttons = {}, options = [],
+    buttons = {},
     separator = file_api.env.directory_separator,
     arr = file_api.env.folder.split(separator),
     folder = arr.pop(),
@@ -408,17 +397,7 @@ function kolab_files_folder_edit_dialog()
   $('form', dialog).submit(kolab_dialog_submit_handler);
 
   // build parent selector
-  options.push($('<option>').val('').text('---'));
-  $.each(file_api.env.folders, function(i, f) {
-    var n, name = escapeHTML(f.name);
-
-    for (n=0; n<f.depth; n++)
-      name = '&nbsp;&nbsp;&nbsp;' + name;
-
-    options.push($('<option>').val(i).html(name));
-  });
-
-  select.append(options).val(path);
+  kolab_files_folder_select_element(select, {selected: path, empty: true});
 };
 
 // folder mounting dialog
@@ -517,6 +496,72 @@ function kolab_files_file_edit_dialog(file)
   });
 };
 
+// file creation dialog
+function kolab_files_file_create_dialog()
+{
+  var dialog = $('#files-file-create-dialog'),
+    buttons = {},
+    type_select = $('select[name="type"]', dialog),
+    select = $('select[name="parent"]', dialog).html(''),
+    input = $('input[name="name"]', dialog).val('');
+
+  buttons[rcmail.gettext('kolab_files.create')] = function () {
+    var folder = select.val(), type = type_select.val(), name = input.val();
+
+    if (!name || !folder)
+      return;
+
+    if (!/\.[a-z0-9]{1,5}$/.test(name)) {
+      name += '.' + rcmail.env.file_extensions[type];
+    }
+
+    name = folder + file_api.env.directory_separator + name;
+
+    file_api.file_create(name, type);
+    kolab_dialog_close(this);
+  };
+  buttons[rcmail.gettext('kolab_files.cancel')] = function () {
+    kolab_dialog_close(this);
+  };
+
+  // Fix submitting form with Enter
+  $('form', dialog).submit(kolab_dialog_submit_handler);
+
+  // show dialog window
+  kolab_dialog_show(dialog, {
+    title: rcmail.gettext('kolab_files.createfile'),
+    buttons: buttons,
+    button_classes: ['mainaction']
+  });
+
+  // build folder selector
+  kolab_files_folder_select_element(select);
+};
+
+// builds folder selector options
+kolab_files_folder_select_element = function(select, params)
+{
+  var options = [],
+    selected = params && params.selected ? params.selected : file_api.env.folder;
+
+  if (params && params.empty)
+    options.push($('<option>').val('').text('---'));
+
+  $.each(file_api.env.folders, function(i, f) {
+    var n, name = escapeHTML(f.name);
+
+    for (n=0; n<f.depth; n++)
+      name = '&nbsp;&nbsp;&nbsp;' + name;
+
+    options.push($('<option>').val(i).html(name));
+  });
+
+  select.empty().append(options);
+
+  if (selected)
+    select.val(selected);
+};
+
 function kolab_dialog_show(content, params, onopen)
 {
   params = $.extend({
@@ -1104,6 +1149,11 @@ rcube_webmail.prototype.files_set_quota = function(p)
   this.set_quota(p);
 };
 
+rcube_webmail.prototype.files_create = function()
+{
+  kolab_files_file_create_dialog();
+};
+
 rcube_webmail.prototype.folder_create = function()
 {
   kolab_files_folder_create_dialog();
@@ -1257,6 +1307,8 @@ function kolab_files_ui()
     else if (first)
       rcmail.folder_list.select(first);
 
+    rcmail.enable_command('files-create', true);
+
     // add tree icons
 //    this.folder_list_tree(this.env.folders);
 
@@ -2205,6 +2257,25 @@ function kolab_files_ui()
     }
   };
 
+  // file(s) create request
+  this.file_create = function(file, type)
+  {
+    this.req = this.set_busy(true, 'kolab_files.filecreating');
+    this.request('file_create', {file: file, 'content-type': type, content: ''}, 'file_create_response');
+  };
+
+  // file(s) create response handler
+  this.file_create_response = function(response)
+  {
+    if (!this.response(response))
+      return;
+
+    // @TODO: we could update metadata instead
+    this.file_list();
+
+    // @TODO: open the file for editing if editable
+  };
+
   // file(s) rename request
   this.file_rename = function(oldfile, newfile)
   {
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index 15e3a999..fc9e9f7b 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -133,6 +133,7 @@ class kolab_files_engine
                 'folder-auth-options'=> array($this, 'folder_auth_options'),
                 'file-search-form'   => array($this, 'file_search_form'),
                 'file-edit-form'     => array($this, 'file_edit_form'),
+                'file-create-form'   => array($this, 'file_create_form'),
                 'filelist'           => array($this, 'file_list'),
                 'filequotadisplay'   => array($this, 'quota_display'),
             ));
@@ -325,10 +326,10 @@ class kolab_files_engine
             $attrib['id'] = 'file-edit-form';
         }
 
-        $input_name = new html_inputfield(array('id' => 'file-name', 'name' => 'name', 'size' => 30));
+        $input_name = new html_inputfield(array('id' => 'file-edit-name', 'name' => 'name', 'size' => 30));
         $table      = new html_table(array('cols' => 2, 'class' => 'propform'));
 
-        $table->add('title', html::label('file-name', rcube::Q($this->plugin->gettext('filename'))));
+        $table->add('title', html::label('file-edit-name', rcube::Q($this->plugin->gettext('filename'))));
         $table->add(null, $input_name->show());
 
         $out = $table->show();
@@ -344,6 +345,54 @@ class kolab_files_engine
         return $out;
     }
 
+    /**
+     * Template object for file_create form
+     */
+    public function file_create_form($attrib)
+    {
+        $attrib['name'] = 'file-create-form';
+        if (empty($attrib['id'])) {
+            $attrib['id'] = 'file-create-form';
+        }
+
+        $input_name    = new html_inputfield(array('id' => 'file-create-name', 'name' => 'name', 'size' => 30));
+        $select_parent = new html_select(array('id' => 'file-create-parent', 'name' => 'parent'));
+        $select_type   = new html_select(array('id' => 'file-create-type', 'name' => 'type'));
+        $table         = new html_table(array('cols' => 2, 'class' => 'propform'));
+
+        // @TODO: get this list from Chwala API
+        $types = array(
+            'application/vnd.oasis.opendocument.text' => 'odt',
+            'text/plain' => 'txt',
+            'text/html'  => 'html',
+        );
+        foreach (array_keys($types) as $type) {
+            list ($app, $label) = explode('/', $type);
+            $label = preg_replace('/[^a-z]/', '', $label);
+            $select_type->add($this->plugin->gettext('type.' . $label), $type);
+        }
+
+        $table->add('title', html::label('file-create-name', rcube::Q($this->plugin->gettext('filename'))));
+        $table->add(null, $input_name->show());
+        $table->add('title', html::label('file-create-type', rcube::Q($this->plugin->gettext('type'))));
+        $table->add(null, $select_type->show());
+        $table->add('title', html::label('folder-parent', rcube::Q($this->plugin->gettext('folderinside'))));
+        $table->add(null, $select_parent->show());
+
+        $out = $table->show();
+
+        // add form tag around text field
+        if (empty($attrib['form'])) {
+            $out = $this->rc->output->form_tag($attrib, $out);
+        }
+
+        $this->plugin->add_label('create', 'cancel', 'filecreating', 'createfile');
+        $this->rc->output->add_gui_object('file-create-form', $attrib['id']);
+        $this->rc->output->set_env('file_extensions', $types);
+
+        return $out;
+    }
+
     /**
      * Template object for file search form in "From cloud" dialog
      */
diff --git a/plugins/kolab_files/localization/en_US.inc b/plugins/kolab_files/localization/en_US.inc
index d3f1a308..62cfeac5 100644
--- a/plugins/kolab_files/localization/en_US.inc
+++ b/plugins/kolab_files/localization/en_US.inc
@@ -44,6 +44,7 @@ $labels['save'] = 'Save';
 $labels['savefile'] = 'Save file';
 $labels['printfile'] = 'Print file';
 $labels['fileedit'] = 'File properties';
+$labels['createfile'] = 'Create a file';
 
 $labels['collection_audio'] = 'Audio';
 $labels['collection_video'] = 'Video';
@@ -67,6 +68,7 @@ $labels['saveallnotice'] = 'Successfully saved $n file(s).';
 $labels['saveallerror'] = 'Saving $n file(s) failed.';
 $labels['attacherror'] = 'Failed to attach file(s) from the cloud';
 $labels['fileupdating'] = 'Updating file...';
+$labels['filecreating'] = 'Creating file...';
 $labels['filemoving'] = 'Moving file(s)...';
 $labels['filecopying'] = 'Copying file(s)...';
 $labels['filedeleting'] = 'Deleting file(s)...';
@@ -93,6 +95,7 @@ $labels['arialabelquicksearchbox'] = 'Search input';
 $labels['arialabellistoptions'] = 'Files list options';
 $labels['arialabelfolderoptions'] = 'Folder actions';
 $labels['arialabelfileeditform'] = 'File editing form';
+$labels['arialabelfilecreateform'] = 'File creation form';
 $labels['arialabelfilelist'] = 'List of files';
 $labels['arialabelfoldercreateform'] = 'Folder creation form';
 $labels['arialabelfoldereditform'] = 'Folder editing form';
@@ -105,4 +108,6 @@ $labels['arialabelfilesavedialog'] = 'File(s) saving dialog';
 $labels['arialabelfileprops'] = 'File properties';
 $labels['arialabelfilecontent'] = 'File content';
 
-?>
+$labels['type.plain'] = 'Plain Text Document';
+$labels['type.vndoasisopendocumenttext'] = 'Text Document (ODF)';
+$labels['type.html'] = 'HTML Document';
diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index bdbd13b0..88e2b059 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -44,6 +44,7 @@
   background-image: url(../../../../skins/larry/images/buttons.png);
 }
 
+#filestoolbar a.button.create,
 #filestoolbar a.button.edit {
   background-position: center -173px;
 }
@@ -330,6 +331,7 @@
 #files-dialog,
 #files-compose-dialog,
 #files-file-edit-dialog,
+#files-file-create-dialog,
 #files-folder-mount-dialog,
 #files-folder-auth-dialog,
 #files-folder-create-dialog,
diff --git a/plugins/kolab_files/skins/larry/templates/files.html b/plugins/kolab_files/skins/larry/templates/files.html
index 5569fee2..6b6146e0 100644
--- a/plugins/kolab_files/skins/larry/templates/files.html
+++ b/plugins/kolab_files/skins/larry/templates/files.html
@@ -19,6 +19,7 @@
         <roundcube:button command="files-upload" type="link" class="button upload disabled" classAct="button upload" classSel="button upload pressed" label="kolab_files.upload" title="kolab_files.uploadfile" />
     </form>
     <roundcube:button command="files-get" type="link" class="button get disabled" classAct="button get" classSel="button get pressed" label="kolab_files.get" title="kolab_files.getfile" />
+    <roundcube:button command="files-create" type="link" class="button create disabled" classAct="button create" classSel="button create pressed" label="kolab_files.create" title="kolab_files.createfile" />
     <roundcube:button command="files-open" type="link" class="button open disabled" classAct="button open" classSel="button open pressed" label="kolab_files.view" title="kolab_files.viewfile" />
     <roundcube:button command="files-delete" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="delete" title="kolab_files.deletefile" />
 </div>
@@ -94,6 +95,10 @@
     <h3 id="aria-label-fileeditform" class="voice"><roundcube:label name="kolab_files.arialabelfileeditform" /></h3>
     <roundcube:object name="file-edit-form" />
 </div>
+<div id="files-file-create-dialog" role="dialog" aria-labelledby="aria-label-filecreateform" aria-hidden="true">
+    <h3 id="aria-label-filecreateform" class="voice"><roundcube:label name="kolab_files.arialabelfilecreateform" /></h3>
+    <roundcube:object name="file-create-form" />
+</div>
 <div id="files-folder-auth-dialog" role="dialog" aria-labelledby="aria-label-folderauthform" aria-hidden="true">
     <h3 id="aria-label-folderauthform" class="voice"><roundcube:label name="kolab_files.arialabelfolderauthform" /></h3>
     <roundcube:object name="folder-auth-options">

From 83951483f97fbc155122e0773d50306e02e96b9c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Sat, 24 Oct 2015 19:52:03 +0200
Subject: [PATCH 02/26] Fix javascript error when selecting a contact in search
 result (#5269)

---
 .../kolab_addressbook/kolab_addressbook.js    | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/plugins/kolab_addressbook/kolab_addressbook.js b/plugins/kolab_addressbook/kolab_addressbook.js
index ea2494c5..6962e701 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.js
+++ b/plugins/kolab_addressbook/kolab_addressbook.js
@@ -146,11 +146,20 @@ if (window.rcmail) {
     // wait until rcmail.contact_list is ready and subscribe to 'select' events
     setTimeout(function() {
         rcmail.contact_list && rcmail.contact_list.addEventListener('select', function(list) {
-            var selected = list.selection.length,
-                source = rcmail.env.source ? rcmail.env.address_sources[rcmail.env.source] : null;
+            var source, is_writable = true;
 
-            if (selected && source.kolab) {
-                rcmail.enable_command('delete', 'move', selected && source.rights.indexOf('t') >= 0);
+            // delete/move commands status was set by Roundcube core,
+            // however, for Kolab addressbooks we like to check folder ACL
+            if (list.selection.length && rcmail.commands['delete']) {
+                for (n in rcmail.env.selection_sources) {
+                    source = rcmail.env.address_sources[n];
+                    if (source && source.kolab && source.rights.indexOf('t') < 0) {
+                        is_writable = false;
+                        break;
+                    }
+                }
+
+                rcmail.enable_command('delete', 'move', is_writable);
             }
         });
     }, 100);
@@ -160,9 +169,9 @@ if (window.rcmail) {
 rcube_webmail.prototype.set_book_actions = function()
 {
     var source = !this.env.group ? this.env.source : null,
-        sources = this.env.address_sources || {};
+        sources = this.env.address_sources || {},
+        props = source && sources[source] && sources[source].kolab ? sources[source] : { removable: false, rights: '' };
 
-    var props = source && sources[source] && sources[source].kolab ? sources[source] : { removable: false, rights: '' }
     this.enable_command('book-create', true);
     this.enable_command('book-edit',   props.rights.indexOf('a') >= 0);
     this.enable_command('book-delete', props.rights.indexOf('x') >= 0 || props.rights.indexOf('a') >= 0);

From 9a0ba625aa480ab932c6b8aff4eb012be3f2afc0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Mon, 2 Nov 2015 12:32:40 +0100
Subject: [PATCH 03/26] Manticore support - single-user mode

---
 plugins/kolab_files/kolab_files.js            | 77 ++++++++++++++-----
 .../kolab_files/lib/kolab_files_engine.php    |  7 +-
 plugins/kolab_files/skins/larry/style.css     |  9 +++
 .../skins/larry/templates/docedit.html        | 49 ++++++++++++
 plugins/kolab_files/skins/larry/ui.js         |  3 +
 5 files changed, 122 insertions(+), 23 deletions(-)
 create mode 100644 plugins/kolab_files/skins/larry/templates/docedit.html

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 0229d34b..1611cf7c 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -111,6 +111,16 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
 
     if (rcmail.env.action == 'open') {
       rcmail.enable_command('files-get', 'files-delete', rcmail.env.file);
+
+      if (rcmail.env.file_data.viewer && rcmail.env.file_data.viewer.manticore)
+        manticore = new manticore_api({
+          iframe: $('#fileframe').get(0),
+          ready: function(data) { manticore_init(); },
+          set_busy: function(state, message) { return rcmail.set_busy(state, message ? 'kolab_files.' + message : ''); },
+          hide_message: function(id) { return rcmail.hide_message(id); },
+          display_message: function(label, type) { return rcmail.display_message('kolab_files.' + label, type); },
+          gettext: function(label) { return rcmail.get_label('kolab_files.' + label); }
+        });
     }
     else {
       file_api.folder_list();
@@ -539,7 +549,7 @@ function kolab_files_file_create_dialog()
 };
 
 // builds folder selector options
-kolab_files_folder_select_element = function(select, params)
+function kolab_files_folder_select_element(select, params)
 {
   var options = [],
     selected = params && params.selected ? params.selected : file_api.env.folder;
@@ -677,7 +687,7 @@ function kolab_files_upload_input(button)
 
 // for reordering column array (Konqueror workaround)
 // and for setting some message list global variables
-kolab_files_list_coltypes = function()
+function kolab_files_list_coltypes()
 {
   var n, list = rcmail.file_list;
 
@@ -691,7 +701,7 @@ kolab_files_list_coltypes = function()
   list.init_header();
 };
 
-kolab_files_set_list_options = function(cols, sort_col, sort_order)
+function kolab_files_set_list_options(cols, sort_col, sort_order)
 {
   var update = 0, i, idx, name, newcols = [], oldcols = rcmail.env.coltypes;
 
@@ -736,7 +746,7 @@ kolab_files_set_list_options = function(cols, sort_col, sort_order)
   }
 };
 
-kolab_files_set_coltypes = function(list)
+function kolab_files_set_coltypes(list)
 {
   var i, found, name, cols = list.list.tHead.rows[0].cells;
 
@@ -755,12 +765,12 @@ kolab_files_set_coltypes = function(list)
   rcmail.http_post('files/prefs', {kolab_files_list_cols: rcmail.env.coltypes});
 };
 
-kolab_files_list_dblclick = function(list)
+function kolab_files_list_dblclick(list)
 {
   rcmail.command('files-open');
 };
 
-kolab_files_list_select = function(list)
+function kolab_files_list_select(list)
 {
   var selected = list.selection.length;
 
@@ -775,7 +785,7 @@ kolab_files_list_select = function(list)
   if (selected == 1) {
     // get file mimetype
     var type = $('tr.selected', list.list).data('type');
-    rcmail.env.viewer = file_api.file_type_supported(type);
+    rcmail.env.viewer = file_api.file_type_supported(type, rcmail.env.files_caps);
   }
   else
     rcmail.env.viewer = 0;
@@ -791,7 +801,7 @@ kolab_files_list_select = function(list)
   rcmail.enable_command('files-open', rcmail.env.viewer);
 };
 
-kolab_files_list_keypress = function(list)
+function kolab_files_list_keypress(list)
 {
   if (list.modkey == CONTROL_KEY)
     return;
@@ -802,7 +812,7 @@ kolab_files_list_keypress = function(list)
     rcmail.command('files-delete');
 };
 
-kolab_files_drag_start = function(e)
+function kolab_files_drag_start(e)
 {
   rcmail.env.drag_target = null;
 
@@ -810,7 +820,7 @@ kolab_files_drag_start = function(e)
     rcmail.folder_list.drag_start();
 };
 
-kolab_files_drag_end = function(e)
+function kolab_files_drag_end(e)
 {
   if (rcmail.folder_list) {
     rcmail.folder_list.drag_end();
@@ -832,7 +842,7 @@ kolab_files_drag_end = function(e)
   }
 };
 
-kolab_files_drag_move = function(e)
+function kolab_files_drag_move(e)
 {
   if (rcmail.folder_list) {
     var mouse = rcube_event.get_mouse_pos(e);
@@ -841,7 +851,7 @@ kolab_files_drag_move = function(e)
   }
 };
 
-kolab_files_drag_menu_action = function(command)
+function kolab_files_drag_menu_action(command)
 {
   var menu = rcmail.gui_objects.file_dragmenu;
 
@@ -851,7 +861,7 @@ kolab_files_drag_menu_action = function(command)
   rcmail.command(command, rcmail.env.drag_target);
 };
 
-kolab_files_selected = function()
+function kolab_files_selected()
 {
   var files = [];
   $.each(rcmail.file_list.get_selection(), function(i, v) {
@@ -864,11 +874,14 @@ kolab_files_selected = function()
   return files;
 };
 
-kolab_files_frame_load = function(frame)
+function kolab_files_frame_load(frame)
 {
   var win = frame.contentWindow;
 
-  rcmail.file_editor = win.file_editor && win.file_editor.editable ? win.file_editor : null;
+  try {
+    rcmail.file_editor = win.file_editor && win.file_editor.editable ? win.file_editor : null;
+  }
+  catch (e) {};
 
   if (rcmail.file_editor)
     rcmail.enable_command('files-edit', true);
@@ -885,7 +898,7 @@ kolab_files_frame_load = function(frame)
 };
 
 // activate html5 file drop feature (if browser supports it)
-kolab_files_drag_drop_init = function(container)
+function kolab_files_drag_drop_init(container)
 {
   if (!window.FormData && !(window.XMLHttpRequest && XMLHttpRequest.prototype && XMLHttpRequest.prototype.sendAsBinary)) {
     return;
@@ -916,7 +929,7 @@ kolab_files_drag_drop_init = function(container)
 };
 
 // handler for drag/drop on element
-kolab_files_drag_hover = function(e)
+function kolab_files_drag_hover(e)
 {
   if (!file_api.env.folder)
     return;
@@ -933,7 +946,7 @@ kolab_files_drag_hover = function(e)
 };
 
 // returns localized file size
-kolab_files_file_size = function(size)
+function kolab_files_file_size(size)
 {
   var i, units = ['GB', 'MB', 'KB', 'B'];
 
@@ -946,7 +959,7 @@ kolab_files_file_size = function(size)
   return size;
 };
 
-kolab_files_progress_str = function(param)
+function kolab_files_progress_str(param)
 {
   var current, total = file_api.file_size(param.total).toUpperCase();
 
@@ -968,6 +981,30 @@ kolab_files_progress_str = function(param)
 };
 
 
+/**********************************************************/
+/*********    Manticore editor functionality     **********/
+/**********************************************************/
+
+// Initialize document toolbar functionality
+function manticore_init()
+{
+  rcmail.enable_command('document-save', 'document-export', true);
+
+  // Populate document export menu with supported file types
+  manticore.export_menu($('ul', rcmail.gui_objects.exportmenu));
+};
+
+rcube_webmail.prototype.document_save = function()
+{
+  manticore.save();
+};
+
+rcube_webmail.prototype.document_export = function(type)
+{
+  manticore.export(type || 'odt');
+};
+
+
 /***********************************************************/
 /**********              Commands                 **********/
 /***********************************************************/
@@ -2556,7 +2593,7 @@ function kolab_files_ui()
   // open file in new window, using file API viewer
   this.file_open = function(file, viewer)
   {
-    var href = '?' + $.param({_task: 'files', _action: 'open', file: file, viewer: viewer == 2 ? 1 : 0});
+    var href = '?' + $.param({_task: 'files', _action: 'open', file: file, viewer: viewer || 0});
     rcmail.open_window(href, false, true);
   };
 
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index fc9e9f7b..e399f139 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -880,14 +880,15 @@ class kolab_files_engine
      */
     protected function action_open()
     {
-        $file = rcube_utils::get_input_value('file', rcube_utils::INPUT_GET);
+        $file   = rcube_utils::get_input_value('file', rcube_utils::INPUT_GET);
+        $viewer = intval($_GET['viewer']);
 
         // get file info
         $token   = $this->get_api_token();
         $request = $this->get_request(array(
             'method' => 'file_info',
             'file'   => $file,
-            'viewer' => !empty($_GET['viewer']),
+            'viewer' => $viewer,
             ), $token);
 
         // send request to the API
@@ -925,7 +926,7 @@ class kolab_files_engine
         $this->rc->output->set_env('file', $file);
         $this->rc->output->set_env('file_data', $this->file_data);
         $this->rc->output->set_pagetitle(rcube::Q($file));
-        $this->rc->output->send('kolab_files.filepreview');
+        $this->rc->output->send('kolab_files.' . ($viewer & 4 ? 'docedit' : 'filepreview'));
     }
 
     /**
diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index 88e2b059..6303d59b 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -36,6 +36,11 @@
   background-position: center -93px;
 }
 
+#filestoolbar a.button.export {
+  background-position: 0 -93px;
+  min-width: 50px;
+}
+
 #filestoolbar a.button.open {
   background-position: center -131px;
 }
@@ -88,6 +93,10 @@
   overflow: auto;
 }
 
+#filecontent.docedit {
+  left: 0;
+}
+
 #filelistbox {
   overflow: auto;
   top: 0;
diff --git a/plugins/kolab_files/skins/larry/templates/docedit.html b/plugins/kolab_files/skins/larry/templates/docedit.html
new file mode 100644
index 00000000..6fd93ee1
--- /dev/null
+++ b/plugins/kolab_files/skins/larry/templates/docedit.html
@@ -0,0 +1,49 @@
+<roundcube:object name="doctype" value="html5" />
+<html>
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script src="plugins/kolab_files/skins/larry/ui.js" type="text/javascript"></script>
+</head>
+<body class="files noscroll extwin">
+
+<roundcube:include file="/includes/header.html" />
+
+<div id="mainscreen">
+
+<h1 class="voice"><roundcube:label name="kolab_files.docedit" /></h1>
+
+<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+<div id="filestoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
+    <roundcube:button command="files-delete" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="delete" title="kolab_files.deletefile" />
+    <span class="dropbutton">
+        <roundcube:button command="document-export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="kolab_files.get" title="kolab_files.getfile" />
+        <a href="#export" class="dropbuttontip" id="exportmenulink" onclick="UI.toggle_popup('exportmenu',event);return false" aria-haspopup="true" aria-expanded="false" aria-owns="exportmenu-menu" tabindex="0">Export options</a>
+    </span>
+<!--
+    <roundcube:button command="document-print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="kolab_files.printfile" />
+-->
+    <roundcube:button command="document-save" type="link" class="button save disabled" classAct="button save" classSel="button save pressed" label="kolab_files.save" title="kolab_files.savefile" />
+</div>
+
+<div id="filecontent" class="uibox docedit">
+    <div class="iframebox">
+        <roundcube:object name="filepreviewframe" id="fileframe" frameborder="0" title="kolab_files.arialabelfilecontent" />
+    </div>
+</div>
+
+</div>
+
+<div id="exportmenu" class="popupmenu" aria-hidden="true">
+    <h3 id="aria-label-exportmenu" class="voice"><roundcube:label name="kolab_files.arialabelexportoptions" /></h3>
+    <ul id="exportmenu-menu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-exportmenu"></ul>
+</div>
+
+<roundcube:include file="/includes/footer.html" />
+
+<script type="text/javascript">
+kolab_files_ui_init();
+</script>
+
+</body>
+</html>
diff --git a/plugins/kolab_files/skins/larry/ui.js b/plugins/kolab_files/skins/larry/ui.js
index 2c8360f3..b3b7047c 100644
--- a/plugins/kolab_files/skins/larry/ui.js
+++ b/plugins/kolab_files/skins/larry/ui.js
@@ -5,6 +5,9 @@ function kolab_files_ui_init()
       orientation:'v', relative:true, start:226, min:150, size:12 }).init();
 
     rcmail.addEventListener('enable-command', kolab_files_enable_command);
+
+    if ($('#exportmenu').length)
+      rcmail.gui_object('exportmenu', 'exportmenu');
   }
   else
     var filesviewsplit = new rcube_splitter({ id:'filesviewsplitter', p1:'#folderlistbox', p2:'#filelistcontainer',

From c01447347cac4b38ff72093aa63205abf29d9380 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Mon, 2 Nov 2015 14:54:05 +0100
Subject: [PATCH 04/26] Add document title input to the toolbar

---
 plugins/kolab_files/kolab_files.js                    |  5 ++---
 plugins/kolab_files/localization/en_US.inc            |  1 +
 plugins/kolab_files/skins/larry/style.css             | 11 +++++++++++
 .../kolab_files/skins/larry/templates/docedit.html    |  5 ++++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 1611cf7c..cdd7b5a3 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -115,6 +115,8 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
       if (rcmail.env.file_data.viewer && rcmail.env.file_data.viewer.manticore)
         manticore = new manticore_api({
           iframe: $('#fileframe').get(0),
+          export_menu: rcmail.gui_objects.exportmenu ? $('ul', rcmail.gui_objects.exportmenu).get(0) : null,
+          title_input: $('#document-title').get(0),
           ready: function(data) { manticore_init(); },
           set_busy: function(state, message) { return rcmail.set_busy(state, message ? 'kolab_files.' + message : ''); },
           hide_message: function(id) { return rcmail.hide_message(id); },
@@ -989,9 +991,6 @@ function kolab_files_progress_str(param)
 function manticore_init()
 {
   rcmail.enable_command('document-save', 'document-export', true);
-
-  // Populate document export menu with supported file types
-  manticore.export_menu($('ul', rcmail.gui_objects.exportmenu));
 };
 
 rcube_webmail.prototype.document_save = function()
diff --git a/plugins/kolab_files/localization/en_US.inc b/plugins/kolab_files/localization/en_US.inc
index 62cfeac5..849c0620 100644
--- a/plugins/kolab_files/localization/en_US.inc
+++ b/plugins/kolab_files/localization/en_US.inc
@@ -45,6 +45,7 @@ $labels['savefile'] = 'Save file';
 $labels['printfile'] = 'Print file';
 $labels['fileedit'] = 'File properties';
 $labels['createfile'] = 'Create a file';
+$labels['documenttitle'] = 'Title:';
 
 $labels['collection_audio'] = 'Audio';
 $labels['collection_video'] = 'Video';
diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index 6303d59b..eb814b1f 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -68,6 +68,17 @@
   display: inline;
 }
 
+#filestoolbar > label {
+  line-height: 42px;
+  vertical-align: top;
+  color: #555;
+  text-shadow: 0 1px 1px #eee;
+}
+
+#document-title {
+  width: 200px;
+}
+
 #quicksearchbar #filesearchmenulink {
   position: absolute;
   top: 5px;
diff --git a/plugins/kolab_files/skins/larry/templates/docedit.html b/plugins/kolab_files/skins/larry/templates/docedit.html
index 6fd93ee1..c0d9c3c5 100644
--- a/plugins/kolab_files/skins/larry/templates/docedit.html
+++ b/plugins/kolab_files/skins/larry/templates/docedit.html
@@ -9,7 +9,7 @@
 
 <roundcube:include file="/includes/header.html" />
 
-<div id="mainscreen">
+<div id="mainscreen" class="manticore">
 
 <h1 class="voice"><roundcube:label name="kolab_files.docedit" /></h1>
 
@@ -23,7 +23,10 @@
 <!--
     <roundcube:button command="document-print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="kolab_files.printfile" />
 -->
+    <span class="spacer"></span>
     <roundcube:button command="document-save" type="link" class="button save disabled" classAct="button save" classSel="button save pressed" label="kolab_files.save" title="kolab_files.savefile" />
+    <span class="spacer"></span>
+    <label for="document-title"><roundcube:label name="kolab_files.documenttitle" />&nbsp;<input id="document-title" type="text" value="" /></label>
 </div>
 
 <div id="filecontent" class="uibox docedit">

From ec39aaaaf41287444bb97c91f3457a1b64f73a27 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Tue, 3 Nov 2015 16:28:05 +0100
Subject: [PATCH 05/26] Added collaborators list widget

---
 plugins/kolab_files/lib/kolab_files_engine.php   |  3 +++
 plugins/kolab_files/skins/larry/style.css        | 16 ++++++++++++++++
 .../skins/larry/templates/docedit.html           |  5 +++++
 3 files changed, 24 insertions(+)

diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index e399f139..20ddae80 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -921,10 +921,13 @@ class kolab_files_engine
             'filepreviewframe' => array($this, 'file_preview_frame'),
         ));
 
+        $placeholder = $this->rc->output->asset_url('program/resources/blank.gif');
+
         // this one is for styling purpose
         $this->rc->output->set_env('extwin', true);
         $this->rc->output->set_env('file', $file);
         $this->rc->output->set_env('file_data', $this->file_data);
+        $this->rc->output->set_env('photo_placeholder', $placeholder);
         $this->rc->output->set_pagetitle(rcube::Q($file));
         $this->rc->output->send('kolab_files.' . ($viewer & 4 ? 'docedit' : 'filepreview'));
     }
diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index eb814b1f..1bbbf3f5 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -79,6 +79,22 @@
   width: 200px;
 }
 
+#collaborators {
+  position: absolute;
+  right: 0;
+  top: -6px;
+}
+
+#collaborators #members img.photo {
+  width: 32px;
+  height: 32px;
+  overflow: hidden;
+  background: url(../../../../skins/larry/images/contactpic_32px.png) center center no-repeat #fff;
+  border-radius: 5px;
+  border: solid 3px #eee;
+  margin-left: 5px;
+}
+
 #quicksearchbar #filesearchmenulink {
   position: absolute;
   top: 5px;
diff --git a/plugins/kolab_files/skins/larry/templates/docedit.html b/plugins/kolab_files/skins/larry/templates/docedit.html
index c0d9c3c5..fdba1c96 100644
--- a/plugins/kolab_files/skins/larry/templates/docedit.html
+++ b/plugins/kolab_files/skins/larry/templates/docedit.html
@@ -29,6 +29,11 @@
     <label for="document-title"><roundcube:label name="kolab_files.documenttitle" />&nbsp;<input id="document-title" type="text" value="" /></label>
 </div>
 
+<h2 id="aria-label-collaborators" class="voice"><roundcube:label name="kolab_files.arialabelcollaborators" /></h2>
+<div id="collaborators" class="toolbar" role="toolbar" aria-labelledby="aria-label-collaborators">
+    <div id="members"></div>
+</div>
+
 <div id="filecontent" class="uibox docedit">
     <div class="iframebox">
         <roundcube:object name="filepreviewframe" id="fileframe" frameborder="0" title="kolab_files.arialabelfilecontent" />

From ea0b2a60ba1687047c0418c60d9710a97d33edd0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Thu, 12 Nov 2015 17:50:58 +0100
Subject: [PATCH 06/26] Small refactoring to have both View and Edit buttons
 for documents

---
 plugins/kolab_files/kolab_files.js            |  40 ++++--
 plugins/kolab_files/kolab_files.php           |   1 +
 .../kolab_files/lib/kolab_files_engine.php    | 114 ++++++++++--------
 .../skins/larry/images/buttons.png            | Bin 3401 -> 7648 bytes
 plugins/kolab_files/skins/larry/style.css     |   5 +-
 .../skins/larry/templates/docedit.html        |  10 +-
 .../skins/larry/templates/files.html          |   3 +-
 plugins/kolab_files/skins/larry/ui.js         |   2 +-
 8 files changed, 111 insertions(+), 64 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 13bcca53..d6ad0774 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -108,14 +108,17 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
 
     kolab_files_init();
 
-    if (rcmail.env.action == 'open') {
+    if (rcmail.env.action == 'open' || rcmail.env.action == 'edit') {
       rcmail.enable_command('files-get', 'files-delete', rcmail.env.file);
 
-      if (rcmail.env.file_data.viewer && rcmail.env.file_data.viewer.manticore)
+      if (rcmail.env.action == 'edit' && rcmail.env.file_data.viewer && rcmail.env.file_data.viewer.manticore)
         manticore = new manticore_api({
           iframe: $('#fileframe').get(0),
           export_menu: rcmail.gui_objects.exportmenu ? $('ul', rcmail.gui_objects.exportmenu).get(0) : null,
           title_input: $('#document-title').get(0),
+          members_list: $('#members').get(0),
+          photo_url: '?_task=addressbook&_action=photo&_email=%email',
+          photo_default_url: rcmail.env.photo_placeholder,
           ready: function(data) { manticore_init(); },
           set_busy: function(state, message) { return rcmail.set_busy(state, message ? 'kolab_files.' + message : ''); },
           hide_message: function(id) { return rcmail.hide_message(id); },
@@ -825,6 +828,7 @@ function kolab_files_list_select(list)
   else
     rcmail.env.viewer = 0;
 
+  rcmail.enable_command('files-edit', (rcmail.env.viewer & 4) == 4);
   rcmail.enable_command('files-open', rcmail.env.viewer);
 };
 
@@ -910,11 +914,10 @@ function kolab_files_frame_load(frame)
   }
   catch (e) {};
 
-  if (rcmail.file_editor)
-    rcmail.enable_command('files-edit', true);
-
-  rcmail.enable_command('files-print', (rcmail.file_editor && rcmail.file_editor.printable) ||
-    (rcmail.env.file_data && /^image\//i.test(rcmail.env.file_data.type)));
+  rcmail.enable_command('files-edit', rcmail.file_editor
+    || (rcmail.env.file_data.viewer && rcmail.env.file_data.viewer.manticore));
+  rcmail.enable_command('files-print', (rcmail.file_editor && rcmail.file_editor.printable)
+    || (rcmail.env.file_data && /^image\//i.test(rcmail.env.file_data.type)));
 
   // detect Print button and check if it can be accessed
   try {
@@ -1143,6 +1146,16 @@ rcube_webmail.prototype.files_edit = function()
     this.file_editor.enable();
     this.enable_command('files-save', true);
   }
+  else if (this.env.file) {
+    var viewer = file_api.file_type_supported(this.env.file_data.type, this.env.files_caps);
+    file_api.file_open(this.env.file, viewer, 'edit', true);
+  }
+  else if (!this.env.action) {
+    var files = kolab_files_selected();
+
+    if (files.length == 1)
+      file_api.file_open(files[0], this.env.viewer, 'edit');
+  }
 };
 
 rcube_webmail.prototype.files_save = function()
@@ -2657,10 +2670,17 @@ function kolab_files_ui()
   };
 
   // open file in new window, using file API viewer
-  this.file_open = function(file, viewer)
+  this.file_open = function(file, viewer, action, local)
   {
-    var href = '?' + $.param({_task: 'files', _action: 'open', file: file, viewer: viewer || 0});
-    rcmail.open_window(href, false, true);
+    var href = '?' + $.param({_task: 'files', _action: action || 'open', file: file, viewer: viewer || 0});
+
+    if (rcmail.env.extwin)
+      href += '&_extwin=1';
+
+    if (local)
+      location.href = href;
+    else
+      rcmail.open_window(href, false, true);
   };
 
   // save file
diff --git a/plugins/kolab_files/kolab_files.php b/plugins/kolab_files/kolab_files.php
index 9ff9a2a3..8efad587 100644
--- a/plugins/kolab_files/kolab_files.php
+++ b/plugins/kolab_files/kolab_files.php
@@ -49,6 +49,7 @@ class kolab_files extends rcube_plugin
         $this->register_action('index', array($this, 'actions'));
         $this->register_action('prefs', array($this, 'actions'));
         $this->register_action('open',  array($this, 'actions'));
+        $this->register_action('edit',  array($this, 'actions'));
 
         // we use libkolab::http_request() from libkolab with its configuration
         $this->require_plugin('libkolab');
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index 611af95c..add82156 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -892,56 +892,16 @@ class kolab_files_engine
      */
     protected function action_open()
     {
-        $file   = rcube_utils::get_input_value('file', rcube_utils::INPUT_GET);
-        $viewer = intval($_GET['viewer']);
+        $this->rc->output->set_env('files_caps', $_SESSION['kolab_files_caps']);
+        $this->file_opener(intval($_GET['viewer']) & ~4);
+    }
 
-        // get file info
-        $token   = $this->get_api_token();
-        $request = $this->get_request(array(
-            'method' => 'file_info',
-            'file'   => $file,
-            'viewer' => $viewer,
-            ), $token);
-
-        // send request to the API
-        try {
-            $response = $request->send();
-            $status   = $response->getStatus();
-            $body     = @json_decode($response->getBody(), true);
-
-            if ($status == 200 && $body['status'] == 'OK') {
-                $this->file_data = $body['result'];
-            }
-            else {
-                throw new Exception($body['reason']);
-            }
-        }
-        catch (Exception $e) {
-            rcube::raise_error(array(
-                'code' => 500, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
-                'message' => $e->getMessage()),
-                true, true);
-        }
-
-        $this->file_data['filename'] = $file;
-
-        $this->plugin->add_label('filedeleteconfirm', 'filedeleting', 'filedeletenotice');
-
-        // register template objects for dialogs (and main interface)
-        $this->rc->output->add_handlers(array(
-            'fileinfobox'      => array($this, 'file_info_box'),
-            'filepreviewframe' => array($this, 'file_preview_frame'),
-        ));
-
-        $placeholder = $this->rc->output->asset_url('program/resources/blank.gif');
-
-        // this one is for styling purpose
-        $this->rc->output->set_env('extwin', true);
-        $this->rc->output->set_env('file', $file);
-        $this->rc->output->set_env('file_data', $this->file_data);
-        $this->rc->output->set_env('photo_placeholder', $placeholder);
-        $this->rc->output->set_pagetitle(rcube::Q($file));
-        $this->rc->output->send('kolab_files.' . ($viewer & 4 ? 'docedit' : 'filepreview'));
+    /**
+     * Handler for file open action
+     */
+    protected function action_edit()
+    {
+        $this->file_opener(intval($_GET['viewer']));
     }
 
     /**
@@ -1226,6 +1186,62 @@ class kolab_files_engine
         $this->rc->output->send();
     }
 
+    /**
+     * Handler for file open/edit action
+     */
+    protected function file_opener($viewer)
+    {
+        $file = rcube_utils::get_input_value('file', rcube_utils::INPUT_GET);
+
+        // get file info
+        $token   = $this->get_api_token();
+        $request = $this->get_request(array(
+            'method' => 'file_info',
+            'file'   => $file,
+            'viewer' => $viewer,
+            ), $token);
+
+        // send request to the API
+        try {
+            $response = $request->send();
+            $status   = $response->getStatus();
+            $body     = @json_decode($response->getBody(), true);
+
+            if ($status == 200 && $body['status'] == 'OK') {
+                $this->file_data = $body['result'];
+            }
+            else {
+                throw new Exception($body['reason']);
+            }
+        }
+        catch (Exception $e) {
+            rcube::raise_error(array(
+                'code' => 500, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
+                'message' => $e->getMessage()),
+                true, true);
+        }
+
+        $this->file_data['filename'] = $file;
+
+        $this->plugin->add_label('filedeleteconfirm', 'filedeleting', 'filedeletenotice');
+
+        // register template objects for dialogs (and main interface)
+        $this->rc->output->add_handlers(array(
+            'fileinfobox'      => array($this, 'file_info_box'),
+            'filepreviewframe' => array($this, 'file_preview_frame'),
+        ));
+
+        $placeholder = $this->rc->output->asset_url('program/resources/blank.gif');
+
+        // this one is for styling purpose
+        $this->rc->output->set_env('extwin', true);
+        $this->rc->output->set_env('file', $file);
+        $this->rc->output->set_env('file_data', $this->file_data);
+        $this->rc->output->set_env('photo_placeholder', $placeholder);
+        $this->rc->output->set_pagetitle(rcube::Q($file));
+        $this->rc->output->send('kolab_files.' . ($viewer & 4 ? 'docedit' : 'filepreview'));
+    }
+
     /**
      * Returns mimetypes supported by File API viewers
      */
diff --git a/plugins/kolab_files/skins/larry/images/buttons.png b/plugins/kolab_files/skins/larry/images/buttons.png
index abd9b5484fe32792f6983d59732e23d20e4d02e2..a1dbccf5168a6bca459e3bacdb954e66358bd873 100644
GIT binary patch
literal 7648
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

literal 3401
zcmXX|cRZVI_YWy0W?NOO9(z4n!GjvLSBwy~iw3br5o%QISVdx#*gPS$HA=Orlva#V
zTUA%A)Na*_4#Ly-dVcTk{Bh;n=RVi>e9!ls`}0YbEz*n&CIo{(AY2G@V>|FG4uLSK
zvq6FPu8Lz60%1O|wX!z>kH7!VfMa1{0Zw3aI{kk>7K_cu$N=wcY-}toErDbBaQXW6
z>mUx&TwPs_jg9}885I?ULZLt~H#gVM&o4ec9twpP6&1;nM&sh*($mxb#f3nOENzaC
zj<U0}Z{50e<HijDn3k5--Q9h;dJ2Q_$<NORAVEPvGcz-bi;E(;ecs-fq@*NJ`r5T?
zjg5_<7PtberKJT_A08fdaBxgbO{=V|1VMn0!C=7I-rf$b1CmH2GA}Q$qN1X>xEREN
zg@uIyK7oOOPEJnA$;qCcp3Kb5U0q$^6~MG@dINAKCMLim$e~iH(b3UaSy_gLh9I)P
zzwhDU0muL!q=6obitgIm+nbx4g9wR4>ged`@9&4f{*~R?+1ba(XL)%UWTMe%P)j<Y
z4hRw+9^Tp6SzKI#Kp<*sYmIA0ff|{anO0U-k&%%>(Kv7y*yQ9SpF1ufAOPS4&HxQm
z2NwZ8xCKT)CX=V8ra*UcZ99^b#Y;_epavjt5!V0`4h{}hS63Yd4$fL&Ky`RwUv+gg
zm#WFy+L~1d9f)tzFa!LYoE$SVGf=CvwDjrIr_IgHpcc>#j0PTd$M(T29*^(q>jN!p
zZf=4h(r7f$5n#ouW->N529K{&POJ?M4%XAtvu>C~walB7dH@0rhXcBuoScA;Kx;tB
zkdTmwhzNit_LPyBm<UD?8X79~jPd>ZcQCS@ogJ_S?(XiszP?^wUSP6zc6RXR49ype
zU%!5V4Fu}N#>U>clLM9qa0AR89Ub@f_Q0YN2t>fg?$xnG7Xv8i@9z)TS_~a8EiLKw
zAIo<$wzs#zl)(Z6!AnX?OifL>@4uJ=5)Vb%A+JGXwe)$b`{wme&rmMDNMf0vM4r2&
z4~G`$!y5{bQvZCLnU2#G<EBgvoIBXvn4%;htr16iQ!o06X!xJMb~mTH3azaWsv?Zd
zsa^^t)pUPiVxYc0$KTz_%0P>IZ=Lr3Wivh@Oi^H`t)}KKAtofm*V73lL8nbmPf+_>
zDa14<l#ZCF(9zfR<ptXNcP03UP%p2O;~(D-c6Qbm7ib@5X2$#bdmdDl6EYIw;-dUK
zoitT0!HzfIPWH4uC@n5bLR$W5WXhcYfw1c$j1BDl7rvJHM9$jsCH+zVPJr{`WfoV=
zuZL~RK;-|oP=xtxkviF$#f5{0uIKC2>#3s^cOZz+3g`i&P5SG+|F?16&-2FyYr(OD
z4?FIVh`xuj!<;rHCDt`q^{TL6z0=f340aveiga&Gi%U;-M(*Ib4M$bg`9_*LUMVC9
zo2z--?(mTx_d48n;k=h`nH2ff%7dXnuIS+1%kxN;cD381b~;T7lN3n~%DWAhkRi>*
z&ji7(pF%TFa0_GmW!AW{0+Fzsqo3k)AAY_r7fiT}W$cdy;#yFRA0GKl3jH;{O$(rj
zb1lU^HWVR;s*%I7v(MNy>Md(2<+($FQJSVme=EfS%`U@pwfTj9J&ApaO6C&Z+JAmK
zH0^xnOy3*mF8%t&!8<ruqxV0@v0rY}ADzni=3T9~E_ib5dF(!`g~!szFr1TKo^rHt
zYf<lkka7uwYxKHYmlA%D!t`4K`{X(Los1}Uc2O4-qkZCN#?xuzw|{1V<{k6%M-;OX
zW#4PZ^`8jQJz2YzBf?-s#7)-39}1co;aguN6BnvhhCWgKm4Z6IEqF{k`bE5e<$13v
z--)J$%B+ocksfFCki2uF*p;KD%hY0&J4Jg}Mymy|L4w{_mDcvUce?n)yh4*X5|S=p
zrQKSrdq^KYN8DW+bj#Y<VDBN7^Imk9kX?-FEWCi#UOW_>Cj6*I=5%Q@{y4lzWx2V1
z=afeuZhb}gM8<d#`}{U(KzsiA275Azq5C=YvwoSnv2cJm2a@hmmxlWMI$mi6wPMJf
zk~ew5=A7n0+SJ}gA^0R^{SR&PX9Y6uRl^(G!XpgCB@x4of?obAWMTncKcM-vkaQYS
z?!IHQs~M_%JY5uTiP9(OkdO`3JxI6;D(-pJsFaUCoO9M(2q`jLX=u6{NzATA-y#~;
zvXyZe-d3?+6X>D|r96DYq#&3Idy}PFY8C!Tbs}%mmT$9AEhsR($%R3Z&mAI`2W^Dx
zDsqMMIP2=d&#;-4#<KD|*68D5Fq1RpwzgAV)>soLbg@y4-k!}?@c79tXS+f54DrC@
zgTT<;%UesrnS-z_?^s?xmFrD1Rc$g(_uRT*Ml&)q&!V<VMaa%7;@Qa%rUbRo15OKe
za^81p2G3h9yEZ}%T&up_NR-o8S&>lWnUU^3Gc`OgurZi(usP$PkYxzH<Rb6>?10&H
z9nY6C4PTxSFue3d5uMh-K@Pa|DZQ9N{eXus*;D-=pN=EJ*z6PyU&B7IO=oh6Hu|I`
zztk^kG<ALa1jR?J!SaL<CQ|163!$e|iM!0p;^<x3S0zdsT`t-Eh=Mv1oIxfh%rW&n
z`XMPMma{%Y{h~z~$(S~OKUpi~>50na>@E4A!R+(Rr{ZtG>Ft`GKCg>S__BB2*kIgx
zVy7(>H=R|4MxBJ#mxSv+dL8b*T!tGoz2yl_9a%09w|rUgdh%Ivj_}e=pSLyAR#~Wf
zt>z1t-RE-Oc_N=k`aZC|TItP>51c#KU}9B%mO`y?U>wa=`941yDVkeWZJ(6WmRVu8
z(4y?AODb8s_dtq>#{T`MiRLBQ)L~BJaHA;A)}A@tQkiQb-ThnF2+nuKQB+p+TKb+8
z69Hu=1x43im1znWxW2?6qyf>8Quy=C*Vm#it&+Ao=!L5@k{YDr>jFk1>>1j(dR%iK
zdosJ3(WTirM<$BO`9-el@W-%!t2Lp`-L3f@Q!Xmrw&urlg>PM|J406bWY<(n8_V9$
zQ4`m6yPMd=)r_pu9xF#=H?dn`DJJB8Cm!L2fXKnq+$r~`*<m6DT*8pnC-RrQr~eLr
zxIq?b$~?FYkG!u5Y52r?XK?AwUvfH>zNy06*<Cjn%bYvP+oS;_uFvbBQrhGw>tdhC
zEA}Fhs-X?tD<~_72w=ixStyXdhJ9*PlJ8~l`JMSI{;=u|?|BtR2UfFzVVf+z^F*OX
zMyZml*&G-$_v(XmR<o>|wWy3Wfdb)7_Bpj2w6K7*0&lKX<lr=0_)8bEk<-~`K}7{p
zP^28;-5@@lRn8wSpInBj5|ci~fp{i;YHA7v9X^9;Y_xqZ#24Gtl?LH=aa?`1QOw)!
z$|d-Rv-BzA#7c*vo4B|feav833n9JzlJQ}rE@=Ff`FS?prOvZu(0-S3p{*dksIvp7
zZCC<uM4^uMA%`Ez3NKn37PM<JE+!)cHg{35&y3^J9|Fq$qEr38RO?!=bpG*E*&F_q
zl)Tpb$u+fu9M9SO(qE?Wx~-@t$7Zh@w)^M)I)XR%%;1*#SQ{rg@hGNSF^}s$2K%xO
z^Q-3lEw}2elYA9jc9E4F*X_>p`$*7+qUIa0;+f=5)o^Xx#OUx{S@s^-SZ2wHDXX@C
zXGIn-3%hc@{gPG3dg)9j!GI14GkbDL{t>}blF7U>mBwPs?i$D$PtN2PYIY{&h59f-
zO&~<+vz!)Z`Sm0-8nU)&)7<N)dzBG3S~@2j={D7(S1P#wpoYqNGD^fMLVvs!80#I%
zu_M+g>uG<|qqaUOJj8OJV%zo8#9nCc5WQnz-q<<#YUyNoD3D3=W_b>$iOc25vw?h+
zl?bu&zVOd;wC>$#nf(Vnv4bKuzKQfJ$MtySV55)uMr(SwqnMxziS&UJMs&&J)=JHf
zJ?gDHdcCBf#Vd#ZB=qKg*&Z*}>D6<2A#m|}Vw&H2K$%0VjK5B6^{(QpPvdg_Jz2E4
z8jaWWKidq4nhw7&>ipcL{Il=IJk*oVqWNZ=mHAkc+X1uAAuYG*`|p|3|4f2VG@VjR
zvL;gf?DKYV!bNl`X?fCh&qgpW(84zw!b$fhSeerZ^W?u~*E?%})GCPSEY~EAoRw4`
zLvhW=`DO{{vPd*aknXLOT$M<cdzm|D%XYf<F3Y4k?#M;#eNl<0kI`obYx1d_Eq-VP
zTc#rXSVRQ3!c3>5klGggBVnbmJl!a*-0GU(RH{nWeOT+N*dzA_BS(e9VYu2vj`Af-
zul)Fj_<N7TUPC=*+x|wRe*Dh+$!#tfZYh8uDMY{=&*5Xm)!5eXEA}N(V^TXj0mvhT
zyUJpQVOte(t7?WtttF98gh=V*&CyERExk2#u9z-^I}i1rUSV%CCSGDVJ*h9JbrGE(
U{gp6$?%)642ot1niy=DYzni^(D*ylh

diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index 1a5db7b8..c992f090 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -49,7 +49,10 @@
   background-image: url(../../../../skins/larry/images/buttons.png);
 }
 
-#filestoolbar a.button.create,
+#filestoolbar a.button.create {
+  background-position: center -315px;
+}
+
 #filestoolbar a.button.edit {
   background-position: center -173px;
 }
diff --git a/plugins/kolab_files/skins/larry/templates/docedit.html b/plugins/kolab_files/skins/larry/templates/docedit.html
index fdba1c96..468ebd0c 100644
--- a/plugins/kolab_files/skins/larry/templates/docedit.html
+++ b/plugins/kolab_files/skins/larry/templates/docedit.html
@@ -15,15 +15,17 @@
 
 <h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 <div id="filestoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
+<!--
     <roundcube:button command="files-delete" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="delete" title="kolab_files.deletefile" />
+-->
     <span class="dropbutton">
         <roundcube:button command="document-export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="kolab_files.get" title="kolab_files.getfile" />
         <a href="#export" class="dropbuttontip" id="exportmenulink" onclick="UI.toggle_popup('exportmenu',event);return false" aria-haspopup="true" aria-expanded="false" aria-owns="exportmenu-menu" tabindex="0">Export options</a>
     </span>
 <!--
     <roundcube:button command="document-print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="kolab_files.printfile" />
--->
     <span class="spacer"></span>
+-->
     <roundcube:button command="document-save" type="link" class="button save disabled" classAct="button save" classSel="button save pressed" label="kolab_files.save" title="kolab_files.savefile" />
     <span class="spacer"></span>
     <label for="document-title"><roundcube:label name="kolab_files.documenttitle" />&nbsp;<input id="document-title" type="text" value="" /></label>
@@ -46,7 +48,11 @@
     <h3 id="aria-label-exportmenu" class="voice"><roundcube:label name="kolab_files.arialabelexportoptions" /></h3>
     <ul id="exportmenu-menu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-exportmenu"></ul>
 </div>
-
+<!--
+<div id="editors-dialog" class="uidialog" data-editable="true" role="dialog" aria-labelledby="aria-label-doceditorsdialog" aria-hidden="true">
+    <h3 id="aria-label-doceditorsdialog" class="voice"><roundcube:label name="kolab_files.arialabeldoceditorsdialog" /></h3>
+</div>
+-->
 <roundcube:include file="/includes/footer.html" />
 
 <script type="text/javascript">
diff --git a/plugins/kolab_files/skins/larry/templates/files.html b/plugins/kolab_files/skins/larry/templates/files.html
index 6b6146e0..df92e0b0 100644
--- a/plugins/kolab_files/skins/larry/templates/files.html
+++ b/plugins/kolab_files/skins/larry/templates/files.html
@@ -19,8 +19,9 @@
         <roundcube:button command="files-upload" type="link" class="button upload disabled" classAct="button upload" classSel="button upload pressed" label="kolab_files.upload" title="kolab_files.uploadfile" />
     </form>
     <roundcube:button command="files-get" type="link" class="button get disabled" classAct="button get" classSel="button get pressed" label="kolab_files.get" title="kolab_files.getfile" />
-    <roundcube:button command="files-create" type="link" class="button create disabled" classAct="button create" classSel="button create pressed" label="kolab_files.create" title="kolab_files.createfile" />
     <roundcube:button command="files-open" type="link" class="button open disabled" classAct="button open" classSel="button open pressed" label="kolab_files.view" title="kolab_files.viewfile" />
+    <roundcube:button command="files-edit" type="link" class="button edit disabled" classAct="button edit" classSel="button edit pressed" label="kolab_files.edit" title="kolab_files.editfile" />
+    <roundcube:button command="files-create" type="link" class="button create disabled" classAct="button create" classSel="button create pressed" label="kolab_files.create" title="kolab_files.createfile" />
     <roundcube:button command="files-delete" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="delete" title="kolab_files.deletefile" />
 </div>
 
diff --git a/plugins/kolab_files/skins/larry/ui.js b/plugins/kolab_files/skins/larry/ui.js
index a15f6fdf..07d7e7c2 100644
--- a/plugins/kolab_files/skins/larry/ui.js
+++ b/plugins/kolab_files/skins/larry/ui.js
@@ -1,6 +1,6 @@
 function kolab_files_ui_init()
 {
-  if (rcmail.env.action == 'open') {
+  if (rcmail.env.action == 'open' || rcmail.env.action == 'edit') {
     var filesviewsplit = new rcube_splitter({ id:'filesopensplitter', p1:'#fileinfobox', p2:'#filecontent',
       orientation:'v', relative:true, start:226, min:150, size:12 }).init();
 

From 83cbf1db333f8eb41934f92946256cb328052114 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Fri, 13 Nov 2015 13:13:15 +0100
Subject: [PATCH 07/26] Add "Create and Edit" button into file create dialog

---
 plugins/kolab_files/kolab_files.js            | 49 +++++++++++++------
 .../kolab_files/lib/kolab_files_engine.php    |  2 +-
 plugins/kolab_files/localization/en_US.inc    |  1 +
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index d6ad0774..24131c7b 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -546,22 +546,28 @@ function kolab_files_file_create_dialog()
     buttons = {},
     type_select = $('select[name="type"]', dialog),
     select = $('select[name="parent"]', dialog).html(''),
-    input = $('input[name="name"]', dialog).val('');
+    input = $('input[name="name"]', dialog).val(''),
+    create_func = function (dialog, editaction) {
+      var folder = select.val(), type = type_select.val(), name = input.val();
 
+      if (!name || !folder)
+        return;
+
+      if (!/\.[a-z0-9]{1,5}$/.test(name)) {
+        name += '.' + rcmail.env.file_extensions[type];
+      }
+
+      name = folder + file_api.env.directory_separator + name;
+
+      file_api.file_create(name, type, editaction);
+      kolab_dialog_close(dialog);
+  };
+
+  buttons[rcmail.gettext('kolab_files.createandedit')] = function () {
+    create_func(this, true);
+  };
   buttons[rcmail.gettext('kolab_files.create')] = function () {
-    var folder = select.val(), type = type_select.val(), name = input.val();
-
-    if (!name || !folder)
-      return;
-
-    if (!/\.[a-z0-9]{1,5}$/.test(name)) {
-      name += '.' + rcmail.env.file_extensions[type];
-    }
-
-    name = folder + file_api.env.directory_separator + name;
-
-    file_api.file_create(name, type);
-    kolab_dialog_close(this);
+    create_func(this);
   };
   buttons[rcmail.gettext('kolab_files.cancel')] = function () {
     kolab_dialog_close(this);
@@ -914,6 +920,10 @@ function kolab_files_frame_load(frame)
   }
   catch (e) {};
 
+  // on edit page switch immediately to edit mode
+  if (rcmail.file_editor && rcmail.env.action == 'edit')
+    rcmail.files_edit();
+
   rcmail.enable_command('files-edit', rcmail.file_editor
     || (rcmail.env.file_data.viewer && rcmail.env.file_data.viewer.manticore));
   rcmail.enable_command('files-print', (rcmail.file_editor && rcmail.file_editor.printable)
@@ -2374,8 +2384,11 @@ function kolab_files_ui()
   };
 
   // file(s) create request
-  this.file_create = function(file, type)
+  this.file_create = function(file, type, edit)
   {
+    this.file_create_edit_file = edit ? file : null;
+    this.file_create_edit_type = edit ? type : null;
+
     this.req = this.set_busy(true, 'kolab_files.filecreating');
     this.request('file_create', {file: file, 'content-type': type, content: ''}, 'file_create_response');
   };
@@ -2389,7 +2402,11 @@ function kolab_files_ui()
     // @TODO: we could update metadata instead
     this.file_list();
 
-    // @TODO: open the file for editing if editable
+    // open the file for editing if editable
+    if (this.file_create_edit_file) {
+      var viewer = this.file_type_supported(this.file_create_edit_type, rcmail.env.files_caps);
+      this.file_open(this.file_create_edit_file, viewer, 'edit');
+    }
   };
 
   // file(s) rename request
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index add82156..ba325715 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -398,7 +398,7 @@ class kolab_files_engine
             $out = $this->rc->output->form_tag($attrib, $out);
         }
 
-        $this->plugin->add_label('create', 'cancel', 'filecreating', 'createfile');
+        $this->plugin->add_label('create', 'cancel', 'filecreating', 'createfile', 'createandedit');
         $this->rc->output->add_gui_object('file-create-form', $attrib['id']);
         $this->rc->output->set_env('file_extensions', $types);
 
diff --git a/plugins/kolab_files/localization/en_US.inc b/plugins/kolab_files/localization/en_US.inc
index 849c0620..2d3b1acf 100644
--- a/plugins/kolab_files/localization/en_US.inc
+++ b/plugins/kolab_files/localization/en_US.inc
@@ -45,6 +45,7 @@ $labels['savefile'] = 'Save file';
 $labels['printfile'] = 'Print file';
 $labels['fileedit'] = 'File properties';
 $labels['createfile'] = 'Create a file';
+$labels['createandedit'] = 'Create and Edit';
 $labels['documenttitle'] = 'Title:';
 
 $labels['collection_audio'] = 'Audio';

From 45430717d50ecfdc7bed1e2664357eac5f6b1e24 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Fri, 13 Nov 2015 15:20:46 +0100
Subject: [PATCH 08/26] Add "Rename" button, remove edit icon from the list

---
 plugins/kolab_files/kolab_files.js            | 24 ++++++++++---------
 .../kolab_files/lib/kolab_files_engine.php    | 18 +++++++-------
 plugins/kolab_files/localization/en_US.inc    |  4 ++--
 plugins/kolab_files/skins/larry/style.css     | 10 +-------
 .../skins/larry/templates/files.html          |  7 +++---
 5 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 24131c7b..82dc2f17 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -102,7 +102,7 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
     }
 
     // "one file only" commands
-    rcmail.env.file_commands = ['files-get'];
+    rcmail.env.file_commands = ['files-get', 'files-rename'];
     // "one or more file" commands
     rcmail.env.file_commands_all = ['files-delete', 'files-move', 'files-copy'];
 
@@ -504,10 +504,10 @@ function kolab_files_folder_mount_dialog()
   });
 };
 
-// file edition dialog
-function kolab_files_file_edit_dialog(file)
+// file rename dialog
+function kolab_files_file_rename_dialog(file)
 {
-  var dialog = $('#files-file-edit-dialog'),
+  var dialog = $('#files-file-rename-dialog'),
     buttons = {}, name = file_api.file_name(file)
     input = $('input[name="name"]', dialog).val(name);
 
@@ -519,9 +519,9 @@ function kolab_files_file_edit_dialog(file)
 
     name = folder + file_api.env.directory_separator + name;
 
-    // @TODO: now we only update filename
     if (name != file)
       file_api.file_rename(file, name);
+
     kolab_dialog_close(this);
   };
   buttons[rcmail.gettext('kolab_files.cancel')] = function () {
@@ -533,7 +533,7 @@ function kolab_files_file_edit_dialog(file)
 
   // show dialog window
   kolab_dialog_show(dialog, {
-    title: rcmail.gettext('kolab_files.fileedit'),
+    title: rcmail.gettext('kolab_files.renamefile'),
     buttons: buttons,
     button_classes: ['mainaction']
   });
@@ -829,7 +829,7 @@ function kolab_files_list_select(list)
     rcmail.env.viewer = file_api.file_type_supported(type, rcmail.env.files_caps);
 
     if (!file_api.is_writable(file.replace(/\/[^/]+$/, '')))
-      rcmail.enable_command('files-delete', false);
+      rcmail.enable_command('files-delete', 'files-rename', false);
   }
   else
     rcmail.env.viewer = 0;
@@ -1239,6 +1239,12 @@ rcube_webmail.prototype.files_create = function()
   kolab_files_file_create_dialog();
 };
 
+rcube_webmail.prototype.files_rename = function()
+{
+  var files = kolab_files_selected();
+  kolab_files_file_rename_dialog(files[0]);
+};
+
 rcube_webmail.prototype.folder_create = function()
 {
   kolab_files_folder_create_dialog();
@@ -2155,10 +2161,6 @@ function kolab_files_ui()
       .html(row)
       .attr({id: 'rcmrow' + index, 'data-file': file, 'data-type': data.type});
 
-    $('td.options > span', row).click(function(e) {
-      kolab_files_file_edit_dialog(file);
-    });
-
     // collection (or search) lists files from all folders
     // display file name with full path as title
     if (!this.env.folder)
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index ba325715..e21e4519 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -142,7 +142,7 @@ class kolab_files_engine
                 'folder-mount-form'  => array($this, 'folder_mount_form'),
                 'folder-auth-options'=> array($this, 'folder_auth_options'),
                 'file-search-form'   => array($this, 'file_search_form'),
-                'file-edit-form'     => array($this, 'file_edit_form'),
+                'file-rename-form'   => array($this, 'file_rename_form'),
                 'file-create-form'   => array($this, 'file_create_form'),
                 'filelist'           => array($this, 'file_list'),
                 'filequotadisplay'   => array($this, 'quota_display'),
@@ -329,19 +329,19 @@ class kolab_files_engine
     }
 
     /**
-     * Template object for file_edit form
+     * Template object for file_rename form
      */
-    public function file_edit_form($attrib)
+    public function file_rename_form($attrib)
     {
-        $attrib['name'] = 'file-edit-form';
+        $attrib['name'] = 'file-rename-form';
         if (empty($attrib['id'])) {
-            $attrib['id'] = 'file-edit-form';
+            $attrib['id'] = 'file-rename-form';
         }
 
-        $input_name = new html_inputfield(array('id' => 'file-edit-name', 'name' => 'name', 'size' => 30));
+        $input_name = new html_inputfield(array('id' => 'file-rename-name', 'name' => 'name', 'size' => 30));
         $table      = new html_table(array('cols' => 2, 'class' => 'propform'));
 
-        $table->add('title', html::label('file-edit-name', rcube::Q($this->plugin->gettext('filename'))));
+        $table->add('title', html::label('file-rename-name', rcube::Q($this->plugin->gettext('filename'))));
         $table->add(null, $input_name->show());
 
         $out = $table->show();
@@ -351,8 +351,8 @@ class kolab_files_engine
             $out = $this->rc->output->form_tag($attrib, $out);
         }
 
-        $this->plugin->add_label('save', 'cancel', 'fileupdating', 'fileedit');
-        $this->rc->output->add_gui_object('file-edit-form', $attrib['id']);
+        $this->plugin->add_label('save', 'cancel', 'fileupdating', 'renamefile');
+        $this->rc->output->add_gui_object('file-rename-form', $attrib['id']);
 
         return $out;
     }
diff --git a/plugins/kolab_files/localization/en_US.inc b/plugins/kolab_files/localization/en_US.inc
index 2d3b1acf..e9eeeee7 100644
--- a/plugins/kolab_files/localization/en_US.inc
+++ b/plugins/kolab_files/localization/en_US.inc
@@ -36,14 +36,14 @@ $labels['get'] = 'Download';
 $labels['getfile'] = 'Download file';
 $labels['view'] = 'View';
 $labels['viewfile'] = 'View file';
-$labels['rename'] = 'Rename file';
+$labels['rename'] = 'Rename';
 $labels['deletefile'] = 'Delete file(s)';
 $labels['edit'] = 'Edit';
 $labels['editfile'] = 'Edit file';
 $labels['save'] = 'Save';
 $labels['savefile'] = 'Save file';
 $labels['printfile'] = 'Print file';
-$labels['fileedit'] = 'File properties';
+$labels['renamefile'] = 'Rename a file';
 $labels['createfile'] = 'Create a file';
 $labels['createandedit'] = 'Create and Edit';
 $labels['documenttitle'] = 'Title:';
diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index c992f090..de18dcfc 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -256,7 +256,6 @@
 
 .filelist tr > .options {
   width: 32px;
-  cursor: pointer;
 }
 
 .filelist thead tr th.filename,
@@ -318,13 +317,6 @@
   border-radius: 4px 0 0 0;
 }
 
-.filelist tbody tr td.options:hover span {
-  width: 26px;
-  height: 18px;
-  background: url(../../../../skins/larry/images/buttons.png) -5px -417px no-repeat;
-  display: block;
-}
-
 .filelist td.filename {
   padding: 0 4px;
 }
@@ -387,7 +379,7 @@
 
 #files-dialog,
 #files-compose-dialog,
-#files-file-edit-dialog,
+#files-file-rename-dialog,
 #files-file-create-dialog,
 #files-folder-mount-dialog,
 #files-folder-auth-dialog,
diff --git a/plugins/kolab_files/skins/larry/templates/files.html b/plugins/kolab_files/skins/larry/templates/files.html
index df92e0b0..0d1a6da2 100644
--- a/plugins/kolab_files/skins/larry/templates/files.html
+++ b/plugins/kolab_files/skins/larry/templates/files.html
@@ -22,6 +22,7 @@
     <roundcube:button command="files-open" type="link" class="button open disabled" classAct="button open" classSel="button open pressed" label="kolab_files.view" title="kolab_files.viewfile" />
     <roundcube:button command="files-edit" type="link" class="button edit disabled" classAct="button edit" classSel="button edit pressed" label="kolab_files.edit" title="kolab_files.editfile" />
     <roundcube:button command="files-create" type="link" class="button create disabled" classAct="button create" classSel="button create pressed" label="kolab_files.create" title="kolab_files.createfile" />
+    <roundcube:button command="files-rename" type="link" class="button rename disabled" classAct="button rename" classSel="button rename pressed" label="kolab_files.rename" title="kolab_files.renamefile" />
     <roundcube:button command="files-delete" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="delete" title="kolab_files.deletefile" />
 </div>
 
@@ -92,9 +93,9 @@
     <h3 id="aria-label-foldermountform" class="voice"><roundcube:label name="kolab_files.arialabelfoldermountform" /></h3>
     <roundcube:object name="folder-mount-form" />
 </div>
-<div id="files-file-edit-dialog" role="dialog" aria-labelledby="aria-label-fileeditform" aria-hidden="true">
-    <h3 id="aria-label-fileeditform" class="voice"><roundcube:label name="kolab_files.arialabelfileeditform" /></h3>
-    <roundcube:object name="file-edit-form" />
+<div id="files-file-rename-dialog" role="dialog" aria-labelledby="aria-label-filerenameform" aria-hidden="true">
+    <h3 id="aria-label-filerenameform" class="voice"><roundcube:label name="kolab_files.arialabelfilerenameform" /></h3>
+    <roundcube:object name="file-rename-form" />
 </div>
 <div id="files-file-create-dialog" role="dialog" aria-labelledby="aria-label-filecreateform" aria-hidden="true">
     <h3 id="aria-label-filecreateform" class="voice"><roundcube:label name="kolab_files.arialabelfilecreateform" /></h3>

From 31587cfdf7288789024ed2345276f6025b09adfa Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Fri, 13 Nov 2015 15:24:05 +0100
Subject: [PATCH 09/26] Make rename dialog smaller, but the input wider

---
 plugins/kolab_files/kolab_files.js             | 4 +++-
 plugins/kolab_files/lib/kolab_files_engine.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 82dc2f17..90febcb1 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -535,7 +535,9 @@ function kolab_files_file_rename_dialog(file)
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.renamefile'),
     buttons: buttons,
-    button_classes: ['mainaction']
+    button_classes: ['mainaction'],
+    minHeight: 100,
+    height: 200
   });
 };
 
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index e21e4519..427353df 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -338,7 +338,7 @@ class kolab_files_engine
             $attrib['id'] = 'file-rename-form';
         }
 
-        $input_name = new html_inputfield(array('id' => 'file-rename-name', 'name' => 'name', 'size' => 30));
+        $input_name = new html_inputfield(array('id' => 'file-rename-name', 'name' => 'name', 'size' => 50));
         $table      = new html_table(array('cols' => 2, 'class' => 'propform'));
 
         $table->add('title', html::label('file-rename-name', rcube::Q($this->plugin->gettext('filename'))));

From 303efd96eff3d20a7628d7ca257473578c1b5d1e Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 16 Nov 2015 09:29:26 +0100
Subject: [PATCH 10/26] Add some icons for future use

---
 .../skins/larry/images/buttons.png            | Bin 7648 -> 3630 bytes
 .../skins/larry/images/listicons.png          | Bin 2582 -> 2963 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/plugins/kolab_files/skins/larry/images/buttons.png b/plugins/kolab_files/skins/larry/images/buttons.png
index a1dbccf5168a6bca459e3bacdb954e66358bd873..d5f83b39509b8d5cf83647d3be8f9616a4a5e381 100644
GIT binary patch
literal 3630
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

literal 7648
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

diff --git a/plugins/kolab_files/skins/larry/images/listicons.png b/plugins/kolab_files/skins/larry/images/listicons.png
index 5b5ca85b2b95110ae2193769b04e6c17a6248d8b..aeea5f51ac1b58a08a765e860543c07a85f8794f 100644
GIT binary patch
literal 2963
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
UYGvsX@Mi(ifWlPDpIV0f2Y^x}UjP6A

delta 2538
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
R5B&2Wy70%EMH=X!zW{ffH?aT!


From 2ad06d8870c2cd9df0dd2634479b1c6fee3214ce Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Mon, 16 Nov 2015 12:20:32 +0100
Subject: [PATCH 11/26] Display editing sessions status on files list, added
 icon on "Rename" button

---
 plugins/kolab_files/kolab_files.js        | 49 ++++++++++++++++++++++-
 plugins/kolab_files/skins/larry/style.css | 25 +++++++++---
 2 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 90febcb1..e2495659 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -1270,6 +1270,7 @@ rcube_webmail.prototype.folder_mount = function()
 function kolab_files_ui()
 {
   this.requests = {};
+  this.sessions = {};
   this.uploads = [];
 
 /*
@@ -2006,6 +2007,10 @@ function kolab_files_ui()
 
     this.env.file_list = list;
     rcmail.file_list.resize();
+
+    // update document sessions info of this folder
+    if (list && list.length)
+      this.request('folder_info', {folder: this.file_path(list[0].filename), sessions: 1}, 'folder_info_response');
   };
 
   // call file_list request for every folder (used for search and virt. collections)
@@ -2078,7 +2083,7 @@ function kolab_files_ui()
     // lock table, other list responses will wait
     this.env.folders_loop_lock = true;
 
-    var n, i, len, elem, list = [], rows = [],
+    var n, i, len, elem, row, folder, list = [],
       index = this.env.file_list.length,
       table = rcmail.file_list;
 
@@ -2088,11 +2093,15 @@ function kolab_files_ui()
         if (this.sort_compare(elem, result[i]) < 0)
           break;
 
-        var row = this.file_list_row(i, result[i], ++index);
+        row = this.file_list_row(i, result[i], ++index);
         table.insert_row(row, elem.row);
         result[i].row = row;
         result[i].filename = i;
         list.push(result[i]);
+
+        if (!folder)
+          folder = this.file_path(i);
+
         delete result[i];
       }
 
@@ -2106,10 +2115,17 @@ function kolab_files_ui()
       result[key].row = row;
       result[key].filename = key;
       list.push(result[key]);
+
+      if (!folder)
+        folder = file_api.file_path(key);
     });
 
     this.env.file_list = list;
     this.env.folders_loop_lock = false;
+
+    // update document sessions info of this folder
+    if (folder)
+      this.request('folder_info', {folder: folder, sessions: 1}, 'folder_info_response');
   };
 
   // sort files list (without API request)
@@ -2189,6 +2205,35 @@ function kolab_files_ui()
     }
   };
 
+  // handler for folder info response
+  this.folder_info_response = function(response)
+  {
+    if (!this.response(response) || !response.result)
+      return;
+
+    if (response.result.sessions)
+      this.sessions[response.folder] = response.result.sessions;
+
+    // update files list with document session info
+    $.each(file_api.env.file_list || [], function(i, file) {
+      var classes = [];
+
+      $.each(response.result.sessions || [], function(session_id, session) {
+        if (file.filename == session.file) {
+          if ($.inArray('session', classes) < 0)
+            classes.push('session');
+
+          if (session.is_owner && $.inArray('owner', classes) < 0)
+            classes.push('owner');
+          else if (session.is_invited && $.inArray('invited', classes) < 0)
+            classes.push('invited');
+        }
+      });
+
+      $(file.row).attr('class', classes.join(' '));
+    });
+  };
+
   this.file_get = function(file, params)
   {
     if (!params)
diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index de18dcfc..7963e7bb 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -57,6 +57,10 @@
   background-position: center -173px;
 }
 
+#filestoolbar a.button.rename {
+  background-position: center -357px;
+}
+
 #filestoolbar a.button.save {
   background-position: center -213px;
 }
@@ -327,12 +331,23 @@
   height: 16px;
 }
 
-/*
-.filelist tbody td.filename span input {
-  padding: 0 2px;
-  height: 18px;
+.filelist tbody td.options span {
+  background-image: url(images/listicons.png);
+  display: block;
+  height: 16px;
+}
+
+.filelist tbody tr.session > td.options span {
+  background-position: center -212px;
+}
+
+.filelist tbody tr.session.invited > td.options span {
+  background-position: center -236px;
+}
+
+.filelist tbody tr.session.owner > td.options span {
+  background-position: center -188px;
 }
-*/
 
 #fileinfobox table {
   table-layout: fixed;

From c323706a9bb37b2eb654ba26d12b29a91dd7295f Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Tue, 17 Nov 2015 14:35:13 +0100
Subject: [PATCH 12/26] Open and join collaborative sessions (T724, T725),
 Editing read-only documents (T757)

---
 plugins/kolab_files/kolab_files.js            | 262 +++++++++++++-----
 .../kolab_files/lib/kolab_files_engine.php    |  33 ++-
 plugins/kolab_files/localization/en_US.inc    |  14 +
 plugins/kolab_files/skins/larry/style.css     |   6 +
 .../skins/larry/templates/filepreview.html    |  10 +
 .../skins/larry/templates/files.html          |   4 +
 6 files changed, 255 insertions(+), 74 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index e2495659..6e7ca0a9 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -6,7 +6,7 @@
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
- * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2011-2015, 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
@@ -125,6 +125,14 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
           display_message: function(label, type) { return rcmail.display_message('kolab_files.' + label, type); },
           gettext: function(label) { return rcmail.get_label('kolab_files.' + label); }
         });
+
+      if (rcmail.env.action == 'open') {
+        // initialize folders list (for dialogs)
+        file_api.folder_list();
+
+        // get ongoing sessions
+        file_api.request('folder_info', {folder: file_api.file_path(rcmail.env.file), sessions: 1}, 'folder_info_response');
+      }
     }
     else {
       file_api.folder_list();
@@ -395,7 +403,7 @@ function kolab_files_folder_create_dialog()
   $('form', dialog).submit(kolab_dialog_submit_handler);
 
   // build parent selector
-  kolab_files_folder_select_element(select, {empty: true});
+  file_api.folder_select_element(select, {empty: true, writable: true});
 };
 
 // folder edit dialog
@@ -440,7 +448,7 @@ function kolab_files_folder_edit_dialog()
   $('form', dialog).submit(kolab_dialog_submit_handler);
 
   // build parent selector
-  kolab_files_folder_select_element(select, {selected: path, empty: true});
+  file_api.folder_select_element(select, {selected: path, empty: true});
 };
 
 // folder mounting dialog
@@ -504,6 +512,92 @@ function kolab_files_folder_mount_dialog()
   });
 };
 
+// file edit dialog
+function kolab_files_file_edit_dialog(file, sessions, readonly)
+{
+  var content = [], items = [], height = 300;
+    dialog = $('#files-file-edit-dialog'),
+    buttons = {}, name = file_api.file_name(file),
+    title = rcmail.gettext('kolab_files.editfiledialog'),
+    mainaction = rcmail.gettext('kolab_files.select'),
+    item_fn = function(id, txt, classes) {
+        return $('<label>').attr('class', 'session' + (classes ? ' ' + classes : ''))
+          .append($('<input>').attr({name: 'opt', value: id, type: 'radio'})).append($('<span>').text(txt));
+      },
+    select_fn = function(dlg) {
+      var input = $('input:checked', dialog), id = input.val();
+
+      if (dlg)
+        kolab_dialog_close(dlg);
+
+      if (readonly && (id == 0 || !input.length))
+        return kolab_files_file_create_dialog(file);
+
+      // @todo: invitations
+      rcmail.files_edit(id ? id : true);
+    };
+
+  // Create sessions selection
+  if (sessions && sessions.length) {
+    items.push($('<div>').text(rcmail.gettext('kolab_files.editfilesessions')));
+
+    // first display owned sessions, then invited, other at the end
+    $.each(sessions, function() {
+      if (this.is_owner) {
+        var txt = rcmail.gettext('kolab_files.ownedsession');
+        items.push(item_fn(this.id, txt, 'owner'));
+      }
+    });
+
+    if (items.length == 1)
+      items.push(item_fn(0, rcmail.gettext('kolab_files.newsession' + (readonly ? 'ro' : ''))));
+
+    $.each(sessions, function() {
+      if (this.is_invited) {
+        var txt = rcmail.gettext('kolab_files.invitedsession').replace('$user', this.owner);
+        items.push(item_fn(this.id, txt, 'invited'));
+      }
+    });
+
+    $.each(sessions, function() {
+      if (!this.is_owner && !this.is_invited) {
+        var txt = rcmail.gettext('kolab_files.joinsession').replace('$user', this.owner);
+        items.push(item_fn(this.id, txt));
+      }
+    });
+
+    // check the first option
+    $('input', items[1]).attr('checked', true);
+
+    $('div', dialog).html(items);
+
+    // if there's only one session and it's owned, skip the dialog
+    if (!readonly && items.length == 2 && $('input:checked', dialog).parent().is('.owner'))
+      return select_fn();
+  }
+  // no ongoing session, folder is readonly warning
+  else {
+    title = rcmail.gettext('kolab_files.editfilerotitle');
+    height = 150;
+    $('div', dialog).text(rcmail.gettext('kolab_files.editfilero'));
+    mainaction = rcmail.gettext('kolab_files.create');
+  }
+
+  buttons[mainaction] = function() { select_fn(this); };
+  buttons[rcmail.gettext('kolab_files.cancel')] = function () {
+    kolab_dialog_close(this);
+  };
+
+  // show dialog window
+  kolab_dialog_show(dialog, {
+    title: title,
+    buttons: buttons,
+    button_classes: ['mainaction'],
+    minHeight: height - 100,
+    height: height
+  });
+};
+
 // file rename dialog
 function kolab_files_file_rename_dialog(file)
 {
@@ -511,7 +605,7 @@ function kolab_files_file_rename_dialog(file)
     buttons = {}, name = file_api.file_name(file)
     input = $('input[name="name"]', dialog).val(name);
 
-  buttons[rcmail.gettext('kolab_files.save')] = function () {
+  buttons[rcmail.gettext('kolab_files.save')] = function() {
     var folder = file_api.file_path(file), name = input.val();
 
     if (!name)
@@ -524,7 +618,7 @@ function kolab_files_file_rename_dialog(file)
 
     kolab_dialog_close(this);
   };
-  buttons[rcmail.gettext('kolab_files.cancel')] = function () {
+  buttons[rcmail.gettext('kolab_files.cancel')] = function() {
     kolab_dialog_close(this);
   };
 
@@ -541,16 +635,16 @@ function kolab_files_file_rename_dialog(file)
   });
 };
 
-// file creation dialog
-function kolab_files_file_create_dialog()
+// file creation (or cloning) dialog
+function kolab_files_file_create_dialog(file)
 {
-  var dialog = $('#files-file-create-dialog'),
-    buttons = {},
+  var buttons = {}, action = file ? 'copy' : 'create',
+    dialog = $('#files-file-create-dialog'),
     type_select = $('select[name="type"]', dialog),
     select = $('select[name="parent"]', dialog).html(''),
     input = $('input[name="name"]', dialog).val(''),
-    create_func = function (dialog, editaction) {
-      var folder = select.val(), type = type_select.val(), name = input.val();
+    create_func = function(dialog, editaction) {
+      var sel, folder = select.val(), type = type_select.val(), name = input.val();
 
       if (!name || !folder)
         return;
@@ -561,17 +655,36 @@ function kolab_files_file_create_dialog()
 
       name = folder + file_api.env.directory_separator + name;
 
-      file_api.file_create(name, type, editaction);
+      // get type of cloned file
+      if (file) {
+        if (rcmail.env.file_data)
+          type = rcmail.env.file_data.type;
+        else {
+          sel = rcmail.file_list.get_selection();
+          type = $('#rcmrow' + sel[0]).data('type');
+        }
+      }
+
+      file_api.file_create(name, type, editaction, file);
       kolab_dialog_close(dialog);
   };
 
-  buttons[rcmail.gettext('kolab_files.createandedit')] = function () {
+  buttons[rcmail.gettext('kolab_files.' + action + 'andedit')] = function() {
     create_func(this, true);
   };
-  buttons[rcmail.gettext('kolab_files.create')] = function () {
-    create_func(this);
-  };
-  buttons[rcmail.gettext('kolab_files.cancel')] = function () {
+
+  if (action == 'create') {
+    buttons[rcmail.gettext('kolab_files.create')] = function() {
+      create_func(this);
+    };
+    type_select.parent('tr').show();
+  }
+  else {
+    input.val(file_api.file_name(file));
+    type_select.parent('tr').hide();
+  }
+
+  buttons[rcmail.gettext('kolab_files.cancel')] = function() {
     kolab_dialog_close(this);
   };
 
@@ -580,37 +693,15 @@ function kolab_files_file_create_dialog()
 
   // show dialog window
   kolab_dialog_show(dialog, {
-    title: rcmail.gettext('kolab_files.createfile'),
+    title: rcmail.gettext('kolab_files.' + action + 'file'),
     buttons: buttons,
-    button_classes: ['mainaction']
+    button_classes: ['mainaction'],
+    minHeight: 150,
+    height: 250
   });
 
   // build folder selector
-  kolab_files_folder_select_element(select);
-};
-
-// builds folder selector options
-function kolab_files_folder_select_element(select, params)
-{
-  var options = [],
-    selected = params && params.selected ? params.selected : file_api.env.folder;
-
-  if (params && params.empty)
-    options.push($('<option>').val('').text('---'));
-
-  $.each(file_api.env.folders, function(i, f) {
-    var n, name = escapeHTML(f.name);
-
-    for (n=0; n<f.depth; n++)
-      name = '&nbsp;&nbsp;&nbsp;' + name;
-
-    options.push($('<option>').val(i).html(name));
-  });
-
-  select.empty().append(options);
-
-  if (selected)
-    select.val(selected);
+  file_api.folder_select_element(select, {writable: true});
 };
 
 function kolab_dialog_show(content, params, onopen)
@@ -826,11 +917,11 @@ function kolab_files_list_select(list)
     // get file mimetype
     var elem = $('tr.selected', list.list),
       type = elem.data('type'),
-      file = elem.data('file');
+      folder = file_api.file_path(elem.data('file'));
 
     rcmail.env.viewer = file_api.file_type_supported(type, rcmail.env.files_caps);
 
-    if (!file_api.is_writable(file.replace(/\/[^/]+$/, '')))
+    if (!file_api.is_writable(folder))
       rcmail.enable_command('files-delete', 'files-rename', false);
   }
   else
@@ -1152,21 +1243,40 @@ rcube_webmail.prototype.files_open = function()
 };
 
 // enable file editor
-rcube_webmail.prototype.files_edit = function()
+rcube_webmail.prototype.files_edit = function(session)
 {
-  if (this.file_editor) {
+  var files, readonly, sessions, file = this.env.file,
+    params = {action: 'edit'};
+
+  if (!file && !this.env.action) {
+    files = kolab_files_selected();
+    if (files.length == 1)
+      file = files[0];
+  }
+
+  // check if the folder is read-only or there are ongoing sessions
+  // in such cases display dialog for the user to decide what to do
+  if (!session) {
+    sessions = file_api.file_sessions(file);
+    if (sessions.length || (readonly = !file_api.is_writable(file_api.file_path(file)))) {
+      kolab_files_file_edit_dialog(file, sessions, readonly);
+      return;
+    }
+  }
+  else if (session !== true)
+    params.session = session;
+
+  if (this.file_editor && !session) {
     this.file_editor.enable();
     this.enable_command('files-save', true);
   }
   else if (this.env.file) {
     var viewer = file_api.file_type_supported(this.env.file_data.type, this.env.files_caps);
-    file_api.file_open(this.env.file, viewer, 'edit', true);
+    params.local = true;
+    file_api.file_open(file, viewer, params);
   }
-  else if (!this.env.action) {
-    var files = kolab_files_selected();
-
-    if (files.length == 1)
-      file_api.file_open(files[0], this.env.viewer, 'edit');
+  else if (file) {
+    file_api.file_open(file, this.env.viewer, params);
   }
 };
 
@@ -1270,7 +1380,6 @@ rcube_webmail.prototype.folder_mount = function()
 function kolab_files_ui()
 {
   this.requests = {};
-  this.sessions = {};
   this.uploads = [];
 
 /*
@@ -1435,7 +1544,8 @@ function kolab_files_ui()
 //    this.folder_list_tree(this.env.folders);
 
     // handle authentication errors on external sources
-    this.folder_list_auth_errors(response.result);
+    if (elem.length)
+      this.folder_list_auth_errors(response.result);
   };
 
   this.folder_select = function(folder)
@@ -2212,7 +2322,7 @@ function kolab_files_ui()
       return;
 
     if (response.result.sessions)
-      this.sessions[response.folder] = response.result.sessions;
+      this.sessions[response.result.folder] = response.result.sessions;
 
     // update files list with document session info
     $.each(file_api.env.file_list || [], function(i, file) {
@@ -2432,14 +2542,21 @@ function kolab_files_ui()
     }
   };
 
-  // file(s) create request
-  this.file_create = function(file, type, edit)
+  // file(s) create (or clone) request
+  this.file_create = function(file, type, edit, cloneof)
   {
     this.file_create_edit_file = edit ? file : null;
     this.file_create_edit_type = edit ? type : null;
+    this.file_create_folder = this.file_path(file);
 
-    this.req = this.set_busy(true, 'kolab_files.filecreating');
-    this.request('file_create', {file: file, 'content-type': type, content: ''}, 'file_create_response');
+    if (cloneof) {
+      this.req = this.set_busy(true, 'kolab_files.filecopying');
+      this.request('file_copy', {file: cloneof, 'new': file}, 'file_create_response');
+    }
+    else {
+      this.req = this.set_busy(true, 'kolab_files.filecreating');
+      this.request('file_create', {file: file, 'content-type': type, content: ''}, 'file_create_response');
+    }
   };
 
   // file(s) create response handler
@@ -2449,12 +2566,13 @@ function kolab_files_ui()
       return;
 
     // @TODO: we could update metadata instead
-    this.file_list();
+    if (this.file_create_folder == this.env.folder)
+      this.file_list();
 
     // open the file for editing if editable
     if (this.file_create_edit_file) {
       var viewer = this.file_type_supported(this.file_create_edit_type, rcmail.env.files_caps);
-      this.file_open(this.file_create_edit_file, viewer, 'edit');
+      this.file_open(this.file_create_edit_file, viewer, {action: 'edit'});
     }
   };
 
@@ -2736,14 +2854,24 @@ function kolab_files_ui()
   };
 
   // open file in new window, using file API viewer
-  this.file_open = function(file, viewer, action, local)
+  this.file_open = function(file, viewer, params)
   {
-    var href = '?' + $.param({_task: 'files', _action: action || 'open', file: file, viewer: viewer || 0});
+    var args = {
+      _task: 'files',
+      _action: params && params.action ? params.action : 'open',
+      _file: file,
+      _viewer: viewer || 0,
+    };
+
+    if (params && params.session)
+      args._session = params.session;
 
     if (rcmail.env.extwin)
-      href += '&_extwin=1';
+      args._extwin = 1;
 
-    if (local)
+    href = '?' + $.param(args);
+
+    if (params && params.local)
       location.href = href;
     else
       rcmail.open_window(href, false, true);
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index 427353df..5607ee63 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -144,6 +144,7 @@ class kolab_files_engine
                 'file-search-form'   => array($this, 'file_search_form'),
                 'file-rename-form'   => array($this, 'file_rename_form'),
                 'file-create-form'   => array($this, 'file_create_form'),
+                'file-edit-dialog'   => array($this, 'file_edit_dialog'),
                 'filelist'           => array($this, 'file_list'),
                 'filequotadisplay'   => array($this, 'quota_display'),
             ));
@@ -328,6 +329,19 @@ class kolab_files_engine
         );
     }
 
+    /**
+     * Template object for file edit dialog/warnings
+     */
+    public function file_edit_dialog($attrib)
+    {
+        $this->plugin->add_label('select', 'create', 'cancel', 'editfiledialog', 'editfilesessions',
+            'newsession', 'ownedsession', 'invitedsession', 'joinsession', 'editfilero', 'editfilerotitle',
+            'newsessionro'
+        );
+
+        return '<div></div>';
+    }
+
     /**
      * Template object for file_rename form
      */
@@ -398,7 +412,8 @@ class kolab_files_engine
             $out = $this->rc->output->form_tag($attrib, $out);
         }
 
-        $this->plugin->add_label('create', 'cancel', 'filecreating', 'createfile', 'createandedit');
+        $this->plugin->add_label('create', 'cancel', 'filecreating', 'createfile', 'createandedit',
+            'copyfile', 'copyandedit');
         $this->rc->output->add_gui_object('file-create-form', $attrib['id']);
         $this->rc->output->set_env('file_extensions', $types);
 
@@ -893,7 +908,9 @@ class kolab_files_engine
     protected function action_open()
     {
         $this->rc->output->set_env('files_caps', $_SESSION['kolab_files_caps']);
-        $this->file_opener(intval($_GET['viewer']) & ~4);
+        $this->rc->output->set_env('file_mimetypes', $this->get_mimetypes());
+
+        $this->file_opener(intval($_GET['_viewer']) & ~4);
     }
 
     /**
@@ -901,7 +918,7 @@ class kolab_files_engine
      */
     protected function action_edit()
     {
-        $this->file_opener(intval($_GET['viewer']));
+        $this->file_opener(intval($_GET['_viewer']));
     }
 
     /**
@@ -1191,14 +1208,16 @@ class kolab_files_engine
      */
     protected function file_opener($viewer)
     {
-        $file = rcube_utils::get_input_value('file', rcube_utils::INPUT_GET);
+        $file    = rcube_utils::get_input_value('_file', rcube_utils::INPUT_GET);
+        $session = rcube_utils::get_input_value('_session', rcube_utils::INPUT_GET);
 
         // get file info
         $token   = $this->get_api_token();
         $request = $this->get_request(array(
-            'method' => 'file_info',
-            'file'   => $file,
-            'viewer' => $viewer,
+            'method'  => 'file_info',
+            'file'    => $file,
+            'viewer'  => $viewer,
+            'session' => $session,
             ), $token);
 
         // send request to the API
diff --git a/plugins/kolab_files/localization/en_US.inc b/plugins/kolab_files/localization/en_US.inc
index e9eeeee7..b8eb0ac7 100644
--- a/plugins/kolab_files/localization/en_US.inc
+++ b/plugins/kolab_files/localization/en_US.inc
@@ -46,6 +46,8 @@ $labels['printfile'] = 'Print file';
 $labels['renamefile'] = 'Rename a file';
 $labels['createfile'] = 'Create a file';
 $labels['createandedit'] = 'Create and Edit';
+$labels['copyfile'] = 'Copy a file';
+$labels['copyandedit'] = 'Copy and Edit';
 $labels['documenttitle'] = 'Title:';
 
 $labels['collection_audio'] = 'Audio';
@@ -89,6 +91,17 @@ $labels['fileoverwrite'] = 'Overwrite';
 $labels['fileoverwriteall'] = 'Overwrite all';
 $labels['filemoveconfirm'] = 'This action is going to overwrite the destination file: <b>$file</b>.';
 
+$labels['editfiledialog'] = 'Confirm editing action';
+$labels['editfilesessions'] = 'There are ongoing sessions on the selected file. Please, select the action you want to take.';
+$labels['newsession'] = 'Create a new session';
+$labels['newsessionro'] = 'Create a new session (copy the file into read-write location)';
+$labels['ownedsession'] = 'Continue your existing session';
+$labels['invitedsession'] = 'Join the session of $user';
+$labels['joinsession'] = 'Request an invitation from $user';
+$labels['editfilero'] = 'This file is read-only. Do you want to create and edit a copy of the file?';
+$labels['editfilerotitle'] = 'Read-only file';
+$labels['select'] = 'Select';
+
 $labels['storepasswords'] = 'remember password';
 $labels['storepasswordsdesc'] = 'Stored passwords will be encrypted. Enable this if you do not want to be asked for the password on every login or you want this storage to be available via WebDAV.';
 
@@ -109,6 +122,7 @@ $labels['arialabelattachmentoptions'] = 'Attachment save options';
 $labels['arialabelfilesavedialog'] = 'File(s) saving dialog';
 $labels['arialabelfileprops'] = 'File properties';
 $labels['arialabelfilecontent'] = 'File content';
+$labels['arialabelfileeditdialog'] = 'File editing dialog';
 
 $labels['type.plain'] = 'Plain Text Document';
 $labels['type.vndoasisopendocumenttext'] = 'Text Document (ODF)';
diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index 7963e7bb..dd61b9f5 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -396,6 +396,7 @@
 #files-compose-dialog,
 #files-file-rename-dialog,
 #files-file-create-dialog,
+#files-file-edit-dialog,
 #files-folder-mount-dialog,
 #files-folder-auth-dialog,
 #files-folder-create-dialog,
@@ -463,6 +464,11 @@
   cursor: pointer;
 }
 
+#files-file-edit-dialog label {
+  display: block;
+  height: 20px;
+}
+
 a.filesaveall {
   display: inline-block;
   margin-top: .5em;
diff --git a/plugins/kolab_files/skins/larry/templates/filepreview.html b/plugins/kolab_files/skins/larry/templates/filepreview.html
index a0b51393..f669e32f 100644
--- a/plugins/kolab_files/skins/larry/templates/filepreview.html
+++ b/plugins/kolab_files/skins/larry/templates/filepreview.html
@@ -35,7 +35,17 @@
 
 </div>
 
+<div id="files-file-create-dialog" role="dialog" aria-labelledby="aria-label-filecreateform" aria-hidden="true">
+    <h3 id="aria-label-filecreateform" class="voice"><roundcube:label name="kolab_files.arialabelfilecreateform" /></h3>
+    <roundcube:object name="file-create-form" />
+</div>
+<div id="files-file-edit-dialog" role="dialog" aria-labelledby="aria-label-fileeditdialog" aria-hidden="true">
+    <h3 id="aria-label-fileeditdialog" class="voice"><roundcube:label name="kolab_files.arialabelfileeditdialog" /></h3>
+    <roundcube:object name="file-edit-dialog">
+</div>
+
 <roundcube:include file="/includes/footer.html" />
+
 <script type="text/javascript">
 kolab_files_ui_init();
 </script>
diff --git a/plugins/kolab_files/skins/larry/templates/files.html b/plugins/kolab_files/skins/larry/templates/files.html
index 0d1a6da2..6b8b8178 100644
--- a/plugins/kolab_files/skins/larry/templates/files.html
+++ b/plugins/kolab_files/skins/larry/templates/files.html
@@ -105,6 +105,10 @@
     <h3 id="aria-label-folderauthform" class="voice"><roundcube:label name="kolab_files.arialabelfolderauthform" /></h3>
     <roundcube:object name="folder-auth-options">
 </div>
+<div id="files-file-edit-dialog" role="dialog" aria-labelledby="aria-label-fileeditdialog" aria-hidden="true">
+    <h3 id="aria-label-fileeditdialog" class="voice"><roundcube:label name="kolab_files.arialabelfileeditdialog" /></h3>
+    <roundcube:object name="file-edit-dialog">
+</div>
 
 <div id="listoptions" class="propform popupdialog" data-editable="true" role="dialog" aria-labelledby="aria-label-listoptions" aria-hidden="true">
     <h3 id="aria-label-listoptions" class="voice"><roundcube:label name="kolab_files.arialabellistoptions" /></h3>

From 9d32f5cbae593617fe8817dfbfded8756e2b4dd1 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Wed, 18 Nov 2015 13:03:37 +0100
Subject: [PATCH 13/26] Add Terminate button on document editing page (T845)

---
 plugins/kolab_files/kolab_files.js            | 37 +++++++++++++++++--
 .../kolab_files/lib/kolab_files_engine.php    |  2 +
 plugins/kolab_files/localization/en_US.inc    |  3 ++
 .../skins/larry/templates/docedit.html        |  1 +
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 6e7ca0a9..2ed926fa 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -1006,7 +1006,8 @@ function kolab_files_selected()
 
 function kolab_files_frame_load(frame)
 {
-  var win = frame.contentWindow;
+  var win = frame.contentWindow,
+    info = rcmail.env.file_data;
 
   try {
     rcmail.file_editor = win.file_editor && win.file_editor.editable ? win.file_editor : null;
@@ -1018,10 +1019,9 @@ function kolab_files_frame_load(frame)
     rcmail.files_edit();
 
   rcmail.enable_command('files-edit', rcmail.file_editor
-    || (rcmail.env.file_data.viewer && rcmail.env.file_data.viewer.manticore));
+    || (info && info.viewer && info.viewer.manticore));
   rcmail.enable_command('files-print', (rcmail.file_editor && rcmail.file_editor.printable)
-    || (rcmail.env.file_data && /^image\//i.test(rcmail.env.file_data.type)));
-
+    || (info && /^image\//i.test(info.type)));
   // detect Print button and check if it can be accessed
   try {
     if ($('#fileframe').contents().find('#print').length)
@@ -1122,7 +1122,10 @@ function kolab_files_progress_str(param)
 // Initialize document toolbar functionality
 function manticore_init()
 {
+  var info = rcmail.env.file_data;
+
   rcmail.enable_command('document-save', 'document-export', true);
+  rcmail.enable_command('files-close', info && info.session && info.session.is_owner);
 };
 
 rcube_webmail.prototype.document_save = function()
@@ -1280,6 +1283,13 @@ rcube_webmail.prototype.files_edit = function(session)
   }
 };
 
+// close editing session
+rcube_webmail.prototype.files_close = function()
+{
+    // @todo: check document "unsaved changes" state and display a warning
+    file_api.document_delete(this.env.file_data.session.id);
+};
+
 rcube_webmail.prototype.files_save = function()
 {
   if (!this.file_editor)
@@ -2906,6 +2916,25 @@ function kolab_files_ui()
     }
   };
 
+  // document session delete request
+  this.document_delete = function(id)
+  {
+    this.req = this.set_busy(true, 'kolab_files.sessionterminating');
+    this.request('document_delete', {id: id}, 'document_delete_response');
+  };
+
+  // document session delete response handler
+  this.document_delete_response = function(response)
+  {
+    if (!this.response(response))
+      return;
+
+    if (rcmail.task == 'files' && rcmail.env.action == 'edit')
+      window.close();
+
+    // @todo: force sessions info update
+  };
+
   // handle auth errors on folder list
   this.folder_list_auth_errors = function(result)
   {
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index 5607ee63..7954b1cb 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -918,6 +918,8 @@ class kolab_files_engine
      */
     protected function action_edit()
     {
+        $this->plugin->add_label('sessionterminating');
+
         $this->file_opener(intval($_GET['_viewer']));
     }
 
diff --git a/plugins/kolab_files/localization/en_US.inc b/plugins/kolab_files/localization/en_US.inc
index b8eb0ac7..a95b6586 100644
--- a/plugins/kolab_files/localization/en_US.inc
+++ b/plugins/kolab_files/localization/en_US.inc
@@ -101,6 +101,9 @@ $labels['joinsession'] = 'Request an invitation from $user';
 $labels['editfilero'] = 'This file is read-only. Do you want to create and edit a copy of the file?';
 $labels['editfilerotitle'] = 'Read-only file';
 $labels['select'] = 'Select';
+$labels['terminatesession'] = 'Terminate the session';
+$labels['terminate'] = 'Terminate';
+$labels['sessionterminating'] = 'Terminating the session...';
 
 $labels['storepasswords'] = 'remember password';
 $labels['storepasswordsdesc'] = 'Stored passwords will be encrypted. Enable this if you do not want to be asked for the password on every login or you want this storage to be available via WebDAV.';
diff --git a/plugins/kolab_files/skins/larry/templates/docedit.html b/plugins/kolab_files/skins/larry/templates/docedit.html
index 468ebd0c..4839d22a 100644
--- a/plugins/kolab_files/skins/larry/templates/docedit.html
+++ b/plugins/kolab_files/skins/larry/templates/docedit.html
@@ -18,6 +18,7 @@
 <!--
     <roundcube:button command="files-delete" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="delete" title="kolab_files.deletefile" />
 -->
+    <roundcube:button command="files-close" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="kolab_files.terminate" title="kolab_files.terminatesession" />
     <span class="dropbutton">
         <roundcube:button command="document-export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="kolab_files.get" title="kolab_files.getfile" />
         <a href="#export" class="dropbuttontip" id="exportmenulink" onclick="UI.toggle_popup('exportmenu',event);return false" aria-haspopup="true" aria-expanded="false" aria-owns="exportmenu-menu" tabindex="0">Export options</a>

From 48ddb0eea438c1933efacd263486d26f5c44324a Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Thu, 19 Nov 2015 21:10:41 +0100
Subject: [PATCH 14/26] Partial invitations handling, participants
 autocompletion (T726, T729)

---
 plugins/kolab_files/kolab_files.js            | 180 +++++++++++++++++-
 .../kolab_files/lib/kolab_files_engine.php    |  32 ++++
 plugins/kolab_files/localization/en_US.inc    |  13 ++
 plugins/kolab_files/skins/larry/style.css     |  60 +++++-
 .../skins/larry/templates/docedit.html        |   8 +-
 5 files changed, 277 insertions(+), 16 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 2ed926fa..59f767fe 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -1125,7 +1125,9 @@ function manticore_init()
   var info = rcmail.env.file_data;
 
   rcmail.enable_command('document-save', 'document-export', true);
-  rcmail.enable_command('files-close', info && info.session && info.session.is_owner);
+
+  if (info && info.session && info.session.is_owner)
+    rcmail.enable_command('files-close', 'document-editors', true);
 };
 
 rcube_webmail.prototype.document_save = function()
@@ -1138,6 +1140,144 @@ rcube_webmail.prototype.document_export = function(type)
   manticore.export(type || 'odt');
 };
 
+rcube_webmail.prototype.document_editors = function()
+{
+  var info = rcmail.env.file_data;
+
+  if (!info || !info.session || !info.session.is_owner)
+    return;
+
+  kolab_files_editors_dialog(info.session);
+};
+
+// close editing session
+rcube_webmail.prototype.files_close = function()
+{
+    // @todo: check document "unsaved changes" state and display a warning
+    file_api.document_delete(this.env.file_data.session.id);
+};
+
+// document editors management dialog
+function kolab_files_editors_dialog(session)
+{
+  var ac_props, items = [], buttons = {},
+    dialog = $('#document-editors-dialog');
+
+  // always add the session organizer
+  items.push(kolab_files_attendee_record(session.owner, 'organizer'));
+
+  $.each(session.invitations || [], function() {
+    items.push(kolab_files_attendee_record(this.user, this.status));
+  });
+
+  $('table > tbody', dialog).html(items);
+
+  buttons[rcmail.gettext('kolab_files.close')] = function() {
+    kolab_dialog_close(this);
+  };
+
+  // show dialog window
+  kolab_dialog_show(dialog, {
+    title: rcmail.gettext('kolab_files.manageeditors'),
+    buttons: buttons,
+    button_classes: ['mainaction']
+  });
+
+  if (!rcmail.env.editors_dialog) {
+    rcmail.env.editors_dialog = dialog;
+
+    // init attendees autocompletion
+    if (rcmail.env.autocomplete_threads > 0) {
+      ac_props = {
+        threads: rcmail.env.autocomplete_threads,
+        sources: rcmail.env.autocomplete_sources
+      };
+    }
+
+    rcmail.init_address_input_events($('#invitation-editor-name'), ac_props);
+
+    rcmail.addEventListener('autocomplete_insert', function(e) {
+      var success = false;
+      if (e.field.name == 'participant') {
+        success = kolab_files_add_attendees(e.insert, 'invited', e.data && e.data.type == 'group' ? 'GROUP' : 'INDIVIDUAL');
+      }
+      if (e.field && success) {
+        e.field.value = '';
+      }
+    });
+
+    $('#invitation-editor-add').click(function() {
+      var input = $('#invitation-editor-name');
+      rcmail.ksearch_blur();
+      if (kolab_files_add_attendees(input.val(), 'invited', 'INDIVIDUAL')) {
+        input.val('');
+      }
+    });
+  }
+};
+
+// add the given list of participants
+function kolab_files_add_attendees(names)
+{
+  var i, item, email, name, attendees = {}, counter = 0;
+
+  names = file_api.explode_quoted_string(names.replace(/,\s*$/, ''), ',');
+
+  // parse name/email pairs
+  for (i = 0; i < names.length; i++) {
+    email = name = '';
+    item = $.trim(names[i]);
+
+    if (!item.length) {
+      continue;
+    } // address in brackets without name (do nothing)
+    else if (item.match(/^<[^@]+@[^>]+>$/)) {
+      email = item.replace(/[<>]/g, '');
+    } // address without brackets and without name (add brackets)
+    else if (rcube_check_email(item)) {
+      email = item;
+    } // address with name
+    else if (item.match(/([^\s<@]+@[^>]+)>*$/)) {
+      email = RegExp.$1;
+      name = item.replace(email, '').replace(/^["\s<>]+/, '').replace(/["\s<>]+$/, '');
+    }
+
+    if (email) {
+      attendees[email] = {user: email, name: name};
+      counter++;
+    }
+    else {
+      alert(rcmail.gettext('noemailwarning'));
+    }
+  }
+
+  // remove already existing entries
+  if (counter) {
+    if (attendees[rcmail.env.file_data.session.owner]) {
+      delete attendees[this.user];
+      counter--;
+    }
+    $.each(rcmail.env.file_data.session.invitations || [], function() {
+      if (this.user in attendees) {
+        delete attendees[this.user];
+        counter--;
+      }
+    });
+  }
+
+  if (counter)
+    file_api.document_invite(rcmail.env.file_data.session.id, attendees);
+};
+
+function kolab_files_attendee_record(user, status)
+{
+  return $('<tr>').attr('class', 'invitation' + (status ? ' ' + status : ''))
+      .append($('<td class="name">').text(user))
+      .append($('<td class="status">').text(rcmail.gettext('kolab_files.status' + status)))
+      .append($('<td class="options">'));
+      // @todo: delete and accept button
+};
+
 
 /***********************************************************/
 /**********              Commands                 **********/
@@ -1283,13 +1423,7 @@ rcube_webmail.prototype.files_edit = function(session)
   }
 };
 
-// close editing session
-rcube_webmail.prototype.files_close = function()
-{
-    // @todo: check document "unsaved changes" state and display a warning
-    file_api.document_delete(this.env.file_data.session.id);
-};
-
+// save changes to the file
 rcube_webmail.prototype.files_save = function()
 {
   if (!this.file_editor)
@@ -2935,6 +3069,36 @@ function kolab_files_ui()
     // @todo: force sessions info update
   };
 
+  // Invite document session participants
+  this.document_invite = function(id, attendees)
+  {
+    var list = [];
+
+    // expect attendees to be email => name hash
+    $.each(attendees || {}, function() { list.push(this); });
+
+    if (list.length) {
+      this.req = this.set_busy(true, 'kolab_files.documentinviting');
+      this.request('document_invite', {id: id, users: list}, 'document_invite_response');
+    }
+  };
+
+  // document invite response handler
+  this.document_invite_response = function(response)
+  {
+    if (!this.response(response))
+      return;
+
+    var info = rcmail.env.file_data,
+      table = $('#document-editors-dialog table > tbody');
+
+    $.each(response.list || {}, function() {
+      table.appned(kolab_files_attendee_record(this.user, this.status));
+      if (info.session && info.session.invitations)
+        info.session.invitations.push($.merge({status: 'invited'}, this));
+    });
+  };
+
   // handle auth errors on folder list
   this.folder_list_auth_errors = function(result)
   {
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index 7954b1cb..efa70769 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -147,6 +147,7 @@ class kolab_files_engine
                 'file-edit-dialog'   => array($this, 'file_edit_dialog'),
                 'filelist'           => array($this, 'file_list'),
                 'filequotadisplay'   => array($this, 'quota_display'),
+                'document-editors-dialog' => array($this, 'document_editors_dialog'),
             ));
 
             if ($this->rc->task != 'files') {
@@ -342,6 +343,37 @@ class kolab_files_engine
         return '<div></div>';
     }
 
+    /**
+     * Template object for dcument editors dialog
+     */
+    public function document_editors_dialog($attrib)
+    {
+        $table = new html_table(array('cols' => 3, 'border' => 0, 'cellpadding' => 0, 'class' => 'records-table'));
+
+        $table->add_header('username', $this->plugin->gettext('participant'));
+        $table->add_header('status', $this->plugin->gettext('status'));
+        $table->add_header('options', null);
+
+        $input    = new html_inputfield(array('name' => 'participant', 'id' => 'invitation-editor-name', 'size' => 30));
+        $textarea = new html_textarea(array('name' => 'comment', 'id' => 'invitation-comment',
+            'rows' => 4, 'cols' => 55, 'title' => $this->plugin->gettext('invitationtexttitle')));
+        $button   = new html_inputfield(array('type' => 'button', 'class' => 'button', 'id' => 'invitation-editor-add', 'value' => $this->plugin->gettext('addparticipant')));
+
+        $this->plugin->add_label('close', 'manageeditors', 'statusorganizer', 'statusaccepted',
+            'statusinvited', 'statusdeclined', 'statusrequested'
+        );
+
+        // initialize attendees autocompletion
+        $this->rc->autocomplete_init();
+
+        return '<div>' . $table->show() . html::div(null,
+            html::div(null, $input->show() . " " . $button->show())
+            . html::p('attendees-commentbox', html::label(null,
+                $this->plugin->gettext('invitationtextlabel') . $textarea->show())
+            )
+        ) . '</div>';
+    }
+
     /**
      * Template object for file_rename form
      */
diff --git a/plugins/kolab_files/localization/en_US.inc b/plugins/kolab_files/localization/en_US.inc
index a95b6586..a2812d2b 100644
--- a/plugins/kolab_files/localization/en_US.inc
+++ b/plugins/kolab_files/localization/en_US.inc
@@ -49,6 +49,7 @@ $labels['createandedit'] = 'Create and Edit';
 $labels['copyfile'] = 'Copy a file';
 $labels['copyandedit'] = 'Copy and Edit';
 $labels['documenttitle'] = 'Title:';
+$labels['close'] = 'Close';
 
 $labels['collection_audio'] = 'Audio';
 $labels['collection_video'] = 'Video';
@@ -104,6 +105,18 @@ $labels['select'] = 'Select';
 $labels['terminatesession'] = 'Terminate the session';
 $labels['terminate'] = 'Terminate';
 $labels['sessionterminating'] = 'Terminating the session...';
+$labels['manageeditors'] = 'Invite to document';
+$labels['participant'] = 'Participant';
+$labels['status'] = 'Status';
+$labels['addparticipant'] = 'Add participant';
+$labels['delparticipant'] = 'Remove participant';
+$labels['invitationtexttitle'] = 'This comment will be attached to the invitation/notification message sent to the participant';
+$labels['invitationtextlabel'] = 'Invitation/notification comment';
+$labels['statusorganizer'] = 'Organizer';
+$labels['statusinvited'] = 'Invited';
+$labels['statusaccepted'] = 'Accepted';
+$labels['statusdeclined'] = 'Declined';
+$labels['statusrequested'] = 'Requested';
 
 $labels['storepasswords'] = 'remember password';
 $labels['storepasswordsdesc'] = 'Stored passwords will be encrypted. Enable this if you do not want to be asked for the password on every login or you want this storage to be available via WebDAV.';
diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index dd61b9f5..30bed293 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -82,6 +82,10 @@
   text-shadow: 0 1px 1px #eee;
 }
 
+ul.toolbarmenu li span.saveas {
+  background: url(images/buttons.png) -5px -253px no-repeat;
+}
+
 #document-title {
   width: 200px;
 }
@@ -102,6 +106,15 @@
   margin-left: 5px;
 }
 
+#collaborators a.button.add {
+  background: url(../../../../skins/larry/images/buttons.png) -5px -357px no-repeat;
+  min-width: 16px;
+  width: 16px;
+  height: 16px;
+  padding: 2px;
+  margin-top: 10px;
+}
+
 #quicksearchbar #filesearchmenulink {
   position: absolute;
   top: 5px;
@@ -400,7 +413,8 @@
 #files-folder-mount-dialog,
 #files-folder-auth-dialog,
 #files-folder-create-dialog,
-#files-folder-edit-dialog {
+#files-folder-edit-dialog,
+#document-editors-dialog {
   display: none;
 }
 
@@ -489,10 +503,6 @@ a.filesaveall {
   width: 200px;
 }
 
-ul.toolbarmenu li span.saveas {
-  background: url(images/buttons.png) -5px -253px no-repeat;
-}
-
 table.propform td.source.selected {
   background-color: #c7e3ef;
 }
@@ -542,3 +552,43 @@ table.propform td.source table.propform td {
 .auth-options label {
   vertical-align: middle;
 }
+
+#document-editors-dialog textarea {
+  width: 98%
+}
+
+#document-editors-dialog label {
+  display: block;
+}
+
+#document-editors-dialog table {
+  margin-top: 0.5em;
+  margin-bottom: 1em;
+}
+
+#document-editors-dialog table th.status {
+  width: 9em;
+}
+
+#document-editors-dialog table th.options {
+  width: 40px
+}
+
+#document-editors-dialog table td {
+  padding-top: 4px;
+  padding-bottom: 4px;
+}
+
+#document-editors-dialog table td.name {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: auto;
+}
+
+#document-editors-dialog table tr:last-child td {
+  border-bottom: 0;
+}
+
+#document-editors-dialog table tr.organizer td {
+  color: #888;
+}
diff --git a/plugins/kolab_files/skins/larry/templates/docedit.html b/plugins/kolab_files/skins/larry/templates/docedit.html
index 4839d22a..cbcd3ef9 100644
--- a/plugins/kolab_files/skins/larry/templates/docedit.html
+++ b/plugins/kolab_files/skins/larry/templates/docedit.html
@@ -34,6 +34,7 @@
 
 <h2 id="aria-label-collaborators" class="voice"><roundcube:label name="kolab_files.arialabelcollaborators" /></h2>
 <div id="collaborators" class="toolbar" role="toolbar" aria-labelledby="aria-label-collaborators">
+    <roundcube:button command="document-editors" type="link" class="button add disabled" classAct="button add" classSel="button add pressed" content=" " title="kolab_files.manageeditors" />
     <div id="members"></div>
 </div>
 
@@ -49,11 +50,12 @@
     <h3 id="aria-label-exportmenu" class="voice"><roundcube:label name="kolab_files.arialabelexportoptions" /></h3>
     <ul id="exportmenu-menu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-exportmenu"></ul>
 </div>
-<!--
-<div id="editors-dialog" class="uidialog" data-editable="true" role="dialog" aria-labelledby="aria-label-doceditorsdialog" aria-hidden="true">
+
+<div id="document-editors-dialog" class="uidialog" data-editable="true" role="dialog" aria-labelledby="aria-label-doceditorsdialog" aria-hidden="true">
     <h3 id="aria-label-doceditorsdialog" class="voice"><roundcube:label name="kolab_files.arialabeldoceditorsdialog" /></h3>
+    <roundcube:object name="document-editors-dialog" />
 </div>
--->
+
 <roundcube:include file="/includes/footer.html" />
 
 <script type="text/javascript">

From 98cc54d67c0484de44de7438c3bc7011d3214854 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Fri, 20 Nov 2015 12:17:08 +0100
Subject: [PATCH 15/26] Fix #members floating

---
 plugins/kolab_files/skins/larry/style.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index 30bed293..a878d89d 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -96,6 +96,10 @@ ul.toolbarmenu li span.saveas {
   top: -6px;
 }
 
+#collaborators #members {
+  float: right;
+}
+
 #collaborators #members img.photo {
   width: 32px;
   height: 32px;

From 725ae222a43e2299d63c6ec0681e7ff99b89e157 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Fri, 20 Nov 2015 14:12:08 +0100
Subject: [PATCH 16/26] Warn about unsaved changes on session close (T845)

---
 plugins/kolab_files/kolab_files.js            | 21 +++++++++++++------
 .../kolab_files/lib/kolab_files_engine.php    |  2 +-
 plugins/kolab_files/localization/en_US.inc    |  1 +
 .../skins/larry/templates/docedit.html        |  2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 59f767fe..46df8799 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -113,13 +113,17 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
 
       if (rcmail.env.action == 'edit' && rcmail.env.file_data.viewer && rcmail.env.file_data.viewer.manticore)
         manticore = new manticore_api({
+          // UI elements
           iframe: $('#fileframe').get(0),
           export_menu: rcmail.gui_objects.exportmenu ? $('ul', rcmail.gui_objects.exportmenu).get(0) : null,
           title_input: $('#document-title').get(0),
           members_list: $('#members').get(0),
           photo_url: '?_task=addressbook&_action=photo&_email=%email',
           photo_default_url: rcmail.env.photo_placeholder,
+          // events
           ready: function(data) { manticore_init(); },
+          documentChanged: function(data) { rcmail.enable_command('document-save', true); },
+          // notifications/alerts
           set_busy: function(state, message) { return rcmail.set_busy(state, message ? 'kolab_files.' + message : ''); },
           hide_message: function(id) { return rcmail.hide_message(id); },
           display_message: function(label, type) { return rcmail.display_message('kolab_files.' + label, type); },
@@ -1124,15 +1128,17 @@ function manticore_init()
 {
   var info = rcmail.env.file_data;
 
-  rcmail.enable_command('document-save', 'document-export', true);
+  rcmail.enable_command('document-export', true);
 
   if (info && info.session && info.session.is_owner)
-    rcmail.enable_command('files-close', 'document-editors', true);
+    rcmail.enable_command('document-close', 'document-editors', true);
 };
 
 rcube_webmail.prototype.document_save = function()
 {
-  manticore.save();
+  manticore.save(function(data) {
+    rcmail.enable_command('document-save', false);
+  });
 };
 
 rcube_webmail.prototype.document_export = function(type)
@@ -1151,10 +1157,13 @@ rcube_webmail.prototype.document_editors = function()
 };
 
 // close editing session
-rcube_webmail.prototype.files_close = function()
+rcube_webmail.prototype.document_close = function()
 {
-    // @todo: check document "unsaved changes" state and display a warning
-    file_api.document_delete(this.env.file_data.session.id);
+  // check document "unsaved changes" state and display a warning
+  if (this.commands['document-save'] && !confirm(this.gettext('kolab_files.unsavedchanges')))
+    return;
+
+  file_api.document_delete(this.env.file_data.session.id);
 };
 
 // document editors management dialog
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index efa70769..fda250ce 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -950,7 +950,7 @@ class kolab_files_engine
      */
     protected function action_edit()
     {
-        $this->plugin->add_label('sessionterminating');
+        $this->plugin->add_label('sessionterminating', 'unsavedchanges');
 
         $this->file_opener(intval($_GET['_viewer']));
     }
diff --git a/plugins/kolab_files/localization/en_US.inc b/plugins/kolab_files/localization/en_US.inc
index a2812d2b..88ba16c6 100644
--- a/plugins/kolab_files/localization/en_US.inc
+++ b/plugins/kolab_files/localization/en_US.inc
@@ -105,6 +105,7 @@ $labels['select'] = 'Select';
 $labels['terminatesession'] = 'Terminate the session';
 $labels['terminate'] = 'Terminate';
 $labels['sessionterminating'] = 'Terminating the session...';
+$labels['unsavedchanges'] = 'There are unsaved changes in the document that will be lost. Do you want to terminate the session anyway?';
 $labels['manageeditors'] = 'Invite to document';
 $labels['participant'] = 'Participant';
 $labels['status'] = 'Status';
diff --git a/plugins/kolab_files/skins/larry/templates/docedit.html b/plugins/kolab_files/skins/larry/templates/docedit.html
index cbcd3ef9..90629786 100644
--- a/plugins/kolab_files/skins/larry/templates/docedit.html
+++ b/plugins/kolab_files/skins/larry/templates/docedit.html
@@ -18,7 +18,7 @@
 <!--
     <roundcube:button command="files-delete" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="delete" title="kolab_files.deletefile" />
 -->
-    <roundcube:button command="files-close" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="kolab_files.terminate" title="kolab_files.terminatesession" />
+    <roundcube:button command="document-close" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="kolab_files.terminate" title="kolab_files.terminatesession" />
     <span class="dropbutton">
         <roundcube:button command="document-export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="kolab_files.get" title="kolab_files.getfile" />
         <a href="#export" class="dropbuttontip" id="exportmenulink" onclick="UI.toggle_popup('exportmenu',event);return false" aria-haspopup="true" aria-expanded="false" aria-owns="exportmenu-menu" tabindex="0">Export options</a>

From e2123344549af12f39bad396ce2d38b55272e217 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Fri, 20 Nov 2015 15:25:26 +0100
Subject: [PATCH 17/26] Some fixes in invitations dialog

---
 plugins/kolab_files/kolab_files.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 46df8799..b5efc7f3 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -713,7 +713,6 @@ function kolab_dialog_show(content, params, onopen)
   params = $.extend({
     modal: true,
     resizable: true,
-    closeOnEscape: (!bw.ie6 && !bw.ie7),  // disabled for performance reasons
     minWidth: 400,
     minHeight: 300,
     width: 500,
@@ -736,6 +735,8 @@ function kolab_dialog_show(content, params, onopen)
     }
 
     (elem && elem.length ? elem : window).focus();
+
+    rcmail.ksearch_blur();
   };
 
   // display it as popup
@@ -1228,7 +1229,7 @@ function kolab_files_editors_dialog(session)
 // add the given list of participants
 function kolab_files_add_attendees(names)
 {
-  var i, item, email, name, attendees = {}, counter = 0;
+  var i, item, success, email, name, attendees = {}, counter = 0;
 
   names = file_api.explode_quoted_string(names.replace(/,\s*$/, ''), ',');
 
@@ -1260,6 +1261,8 @@ function kolab_files_add_attendees(names)
     }
   }
 
+  success = counter > 0;
+
   // remove already existing entries
   if (counter) {
     if (attendees[rcmail.env.file_data.session.owner]) {
@@ -1276,6 +1279,8 @@ function kolab_files_add_attendees(names)
 
   if (counter)
     file_api.document_invite(rcmail.env.file_data.session.id, attendees);
+
+  return success;
 };
 
 function kolab_files_attendee_record(user, status)
@@ -3095,16 +3100,16 @@ function kolab_files_ui()
   // document invite response handler
   this.document_invite_response = function(response)
   {
-    if (!this.response(response))
+    if (!this.response(response) || !response.result)
       return;
 
     var info = rcmail.env.file_data,
       table = $('#document-editors-dialog table > tbody');
 
-    $.each(response.list || {}, function() {
-      table.appned(kolab_files_attendee_record(this.user, this.status));
+    $.each(response.result.list || {}, function() {
+      table.append(kolab_files_attendee_record(this.user, this.status));
       if (info.session && info.session.invitations)
-        info.session.invitations.push($.merge({status: 'invited'}, this));
+        info.session.invitations.push($.extend({status: 'invited'}, this));
     });
   };
 

From 24c8ac75077d142b58ace9ed38b6d3a4c78a103c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Fri, 20 Nov 2015 17:49:56 +0100
Subject: [PATCH 18/26] Removing session participants

---
 plugins/kolab_files/kolab_files.js            | 71 +++++++++++++++----
 .../kolab_files/lib/kolab_files_engine.php    |  3 +-
 plugins/kolab_files/localization/en_US.inc    |  3 +
 plugins/kolab_files/skins/larry/style.css     |  7 ++
 4 files changed, 69 insertions(+), 15 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index b5efc7f3..04370570 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -1149,12 +1149,7 @@ rcube_webmail.prototype.document_export = function(type)
 
 rcube_webmail.prototype.document_editors = function()
 {
-  var info = rcmail.env.file_data;
-
-  if (!info || !info.session || !info.session.is_owner)
-    return;
-
-  kolab_files_editors_dialog(info.session);
+  kolab_files_editors_dialog();
 };
 
 // close editing session
@@ -1171,13 +1166,19 @@ rcube_webmail.prototype.document_close = function()
 function kolab_files_editors_dialog(session)
 {
   var ac_props, items = [], buttons = {},
+    info = rcmail.env.file_data,
     dialog = $('#document-editors-dialog');
 
-  // always add the session organizer
-  items.push(kolab_files_attendee_record(session.owner, 'organizer'));
+  if (!info || !info.session || !info.session.is_owner)
+    return;
 
-  $.each(session.invitations || [], function() {
-    items.push(kolab_files_attendee_record(this.user, this.status));
+  // always add the session organizer
+  items.push(kolab_files_attendee_record(info.session.owner, 'organizer'));
+
+  $.each(info.session.invitations || [], function(i, u) {
+    var record = kolab_files_attendee_record(u.user, u.status);
+    items.push(record);
+    info.session.invitations[i].record = record;
   });
 
   $('table > tbody', dialog).html(items);
@@ -1285,11 +1286,23 @@ function kolab_files_add_attendees(names)
 
 function kolab_files_attendee_record(user, status)
 {
+  var buttons = $('<td class="options">');
+
+  // @todo: accept invitation request button
+
+  // delete button
+  if (status != 'organizer') {
+    $('<a>').attr({'class': 'delete', href: '#', title: rcmail.gettext('kolab_files.removeparticipant')})
+      .click(function() {
+        file_api.document_remove(rcmail.env.file_data.session.id, [user]);
+      })
+      .appendTo(buttons);
+  }
+
   return $('<tr>').attr('class', 'invitation' + (status ? ' ' + status : ''))
       .append($('<td class="name">').text(user))
       .append($('<td class="status">').text(rcmail.gettext('kolab_files.status' + status)))
-      .append($('<td class="options">'));
-      // @todo: delete and accept button
+      .append(buttons);
 };
 
 
@@ -3107,9 +3120,39 @@ function kolab_files_ui()
       table = $('#document-editors-dialog table > tbody');
 
     $.each(response.result.list || {}, function() {
-      table.append(kolab_files_attendee_record(this.user, this.status));
+      var record = kolab_files_attendee_record(this.user, this.status);
+      table.append(record);
       if (info.session && info.session.invitations)
-        info.session.invitations.push($.extend({status: 'invited'}, this));
+        info.session.invitations.push($.extend({status: 'invited', record: record}, this));
+    });
+  };
+
+  // Remove document session participants
+  this.document_remove = function(id, attendees)
+  {
+    if (attendees.length) {
+      this.req = this.set_busy(true, 'kolab_files.documentremoving');
+      this.request('document_remove', {id: id, users: attendees}, 'document_remove_response');
+    }
+  };
+
+  // document remove response handler
+  this.document_remove_response = function(response)
+  {
+    if (!this.response(response) || !response.result)
+      return;
+
+    var info = rcmail.env.file_data;
+
+    $.each(response.result.list || {}, function(i, user) {
+      var invitations = [];
+      $.each(info.session.invitations, function(i, u) {
+        if (u.user == user && u.record)
+          u.record.remove();
+        else
+          invitations.push(u);
+      });
+      info.session.invitations = invitations;
     });
   };
 
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index fda250ce..1bd0d728 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -950,7 +950,8 @@ class kolab_files_engine
      */
     protected function action_edit()
     {
-        $this->plugin->add_label('sessionterminating', 'unsavedchanges');
+        $this->plugin->add_label('sessionterminating', 'unsavedchanges', 'documentinviting',
+            'documentremoving', 'removeparticipant');
 
         $this->file_opener(intval($_GET['_viewer']));
     }
diff --git a/plugins/kolab_files/localization/en_US.inc b/plugins/kolab_files/localization/en_US.inc
index 88ba16c6..b0c0f368 100644
--- a/plugins/kolab_files/localization/en_US.inc
+++ b/plugins/kolab_files/localization/en_US.inc
@@ -118,6 +118,9 @@ $labels['statusinvited'] = 'Invited';
 $labels['statusaccepted'] = 'Accepted';
 $labels['statusdeclined'] = 'Declined';
 $labels['statusrequested'] = 'Requested';
+$labels['documentinviting'] = 'Inviting participant(s)...';
+$labels['documentremoving'] = 'Removing participant(s)...';
+$labels['removeparticipant'] = 'Remove';
 
 $labels['storepasswords'] = 'remember password';
 $labels['storepasswordsdesc'] = 'Stored passwords will be encrypted. Enable this if you do not want to be asked for the password on every login or you want this storage to be available via WebDAV.';
diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index a878d89d..7f1b6cfa 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -596,3 +596,10 @@ table.propform td.source table.propform td {
 #document-editors-dialog table tr.organizer td {
   color: #888;
 }
+
+#document-editors-dialog table td.options a.delete {
+  background: url(../../../../skins/larry/images/buttons.png) -7px -379px no-repeat;
+  height: 16px;
+  width: 16px;
+  display: block;
+}

From eb0fdf3765f8e1421c660ac46f53cb1bfc142d8d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Tue, 24 Nov 2015 16:54:07 +0100
Subject: [PATCH 19/26] Partial invitations and notifications support

---
 plugins/kolab_files/kolab_files.js            | 244 ++++++++++++++----
 .../kolab_files/lib/kolab_files_engine.php    |  27 +-
 plugins/kolab_files/localization/en_US.inc    |  19 +-
 plugins/kolab_files/skins/larry/style.css     |  13 +-
 4 files changed, 241 insertions(+), 62 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 04370570..0ce75993 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -60,20 +60,16 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
           kolab_files_from_cloud_widget($('#calendar-attachment-form > div.buttons'));
       });
     }
-
-    kolab_files_init();
   }
   else if (rcmail.task == 'calendar') {
     // add "attach from cloud" button for event dialog
     if (!rcmail.env.action)
       kolab_files_from_cloud_widget($('#calendar-attachment-form > div.buttons'));
-    kolab_files_init();
   }
   else if (rcmail.task == 'tasks') {
     // add "attach from cloud" button for task dialog
     if (!rcmail.env.action)
       kolab_files_from_cloud_widget($('#taskedit-attachment-form > div.buttons'));
-    kolab_files_init();
   }
   else if (rcmail.task == 'files') {
     if (rcmail.gui_objects.filelist) {
@@ -106,44 +102,15 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
     // "one or more file" commands
     rcmail.env.file_commands_all = ['files-delete', 'files-move', 'files-copy'];
 
-    kolab_files_init();
-
     if (rcmail.env.action == 'open' || rcmail.env.action == 'edit') {
       rcmail.enable_command('files-get', 'files-delete', rcmail.env.file);
-
-      if (rcmail.env.action == 'edit' && rcmail.env.file_data.viewer && rcmail.env.file_data.viewer.manticore)
-        manticore = new manticore_api({
-          // UI elements
-          iframe: $('#fileframe').get(0),
-          export_menu: rcmail.gui_objects.exportmenu ? $('ul', rcmail.gui_objects.exportmenu).get(0) : null,
-          title_input: $('#document-title').get(0),
-          members_list: $('#members').get(0),
-          photo_url: '?_task=addressbook&_action=photo&_email=%email',
-          photo_default_url: rcmail.env.photo_placeholder,
-          // events
-          ready: function(data) { manticore_init(); },
-          documentChanged: function(data) { rcmail.enable_command('document-save', true); },
-          // notifications/alerts
-          set_busy: function(state, message) { return rcmail.set_busy(state, message ? 'kolab_files.' + message : ''); },
-          hide_message: function(id) { return rcmail.hide_message(id); },
-          display_message: function(label, type) { return rcmail.display_message('kolab_files.' + label, type); },
-          gettext: function(label) { return rcmail.get_label('kolab_files.' + label); }
-        });
-
-      if (rcmail.env.action == 'open') {
-        // initialize folders list (for dialogs)
-        file_api.folder_list();
-
-        // get ongoing sessions
-        file_api.request('folder_info', {folder: file_api.file_path(rcmail.env.file), sessions: 1}, 'folder_info_response');
-      }
     }
     else {
-      file_api.folder_list();
-      file_api.browser_capabilities_check();
       rcmail.enable_command('folder-mount', rcmail.env.external_sources);
     }
   }
+
+  kolab_files_init();
 });
 
 
@@ -157,6 +124,8 @@ function kolab_files_init()
   if (window.file_api)
     return;
 
+  var manticore_config = {};
+
   // Initialize application object (don't change var name!)
   file_api = $.extend(new files_api(), new kolab_files_ui());
 
@@ -172,6 +141,59 @@ function kolab_files_init()
   });
 
   file_api.translations = rcmail.labels;
+
+  if (rcmail.task == 'files') {
+    if (rcmail.env.action == 'edit' && rcmail.env.file_data.viewer && rcmail.env.file_data.viewer.manticore) {
+      manticore_config = {
+        // UI elements
+        iframe: $('#fileframe').get(0),
+        export_menu: rcmail.gui_objects.exportmenu ? $('ul', rcmail.gui_objects.exportmenu).get(0) : null,
+        title_input: $('#document-title').get(0),
+        members_list: $('#members').get(0),
+        photo_url: '?_task=addressbook&_action=photo&_email=%email',
+        photo_default_url: rcmail.env.photo_placeholder,
+        // events
+        ready: function(data) { manticore_init(); },
+        documentChanged: function(data) { rcmail.enable_command('document-save', true); },
+      };
+    }
+    else if (rcmail.env.action == 'open') {
+      // initialize folders list (for dialogs)
+      file_api.folder_list();
+
+      // get ongoing sessions
+      file_api.request('folder_info', {folder: file_api.file_path(rcmail.env.file), sessions: 1}, 'folder_info_response');
+    }
+    else {
+      file_api.folder_list();
+      file_api.browser_capabilities_check();
+    }
+  }
+
+  if (rcmail.env.files_caps && rcmail.env.files_caps.MANTICORE)
+    $.extend(manticore_config, {
+      // invitation notifications
+      api: file_api,
+      owner: rcmail.env.files_user,
+      interval: rcmail.env.files_interval || 60,
+      invitationMore: true,
+      invitationChange: manticore_invitation_handler,
+      invitationSaved: manticore_invitation_save_handler,
+    });
+
+  $.extend(manticore_config, {
+    // notifications/alerts
+    gettext: function(label) { return rcmail.get_label('kolab_files.' + label); },
+    set_busy: function(state, message) { return rcmail.set_busy(state, message ? 'kolab_files.' + message : ''); },
+    hide_message: function(id) { return rcmail.hide_message(id); },
+    display_message: function(label, type, is_txt) {
+        if (!is_txt)
+            label = 'kolab_files.' + label;
+        return rcmail.display_message(label, type);
+    }
+  });
+
+  manticore = new manticore_api(manticore_config);
 };
 
 // returns API authorization token
@@ -519,7 +541,7 @@ function kolab_files_folder_mount_dialog()
 // file edit dialog
 function kolab_files_file_edit_dialog(file, sessions, readonly)
 {
-  var content = [], items = [], height = 300;
+  var content = [], items = [], height = 300,
     dialog = $('#files-file-edit-dialog'),
     buttons = {}, name = file_api.file_name(file),
     title = rcmail.gettext('kolab_files.editfiledialog'),
@@ -529,15 +551,19 @@ function kolab_files_file_edit_dialog(file, sessions, readonly)
           .append($('<input>').attr({name: 'opt', value: id, type: 'radio'})).append($('<span>').text(txt));
       },
     select_fn = function(dlg) {
-      var input = $('input:checked', dialog), id = input.val();
+      var session, input = $('input:checked', dialog), id = input.val();
 
       if (dlg)
         kolab_dialog_close(dlg);
 
+      if (id && input.parent().is('.session.request')) {
+        manticore.invitation_request({session_id: id});
+        return;
+      }
+
       if (readonly && (id == 0 || !input.length))
         return kolab_files_file_create_dialog(file);
 
-      // @todo: invitations
       rcmail.files_edit(id ? id : true);
     };
 
@@ -566,7 +592,7 @@ function kolab_files_file_edit_dialog(file, sessions, readonly)
     $.each(sessions, function() {
       if (!this.is_owner && !this.is_invited) {
         var txt = rcmail.gettext('kolab_files.joinsession').replace('$user', this.owner);
-        items.push(item_fn(this.id, txt));
+        items.push(item_fn(this.id, txt, 'request'));
       }
     });
 
@@ -1286,25 +1312,143 @@ function kolab_files_add_attendees(names)
 
 function kolab_files_attendee_record(user, status)
 {
-  var buttons = $('<td class="options">');
+  var buttons = $('<td class="options">'),
+    type = status ? status.replace(/-.*$/, '') : '';
 
-  // @todo: accept invitation request button
+  // @todo: accept/decline invitation request
 
   // delete button
   if (status != 'organizer') {
     $('<a>').attr({'class': 'delete', href: '#', title: rcmail.gettext('kolab_files.removeparticipant')})
       .click(function() {
-        file_api.document_remove(rcmail.env.file_data.session.id, [user]);
+        file_api.document_cancel(rcmail.env.file_data.session.id, [user]);
       })
       .appendTo(buttons);
   }
 
-  return $('<tr>').attr('class', 'invitation' + (status ? ' ' + status : ''))
+  return $('<tr>').attr('class', 'invitation' + (type ? ' ' + type : ''))
       .append($('<td class="name">').text(user))
-      .append($('<td class="status">').text(rcmail.gettext('kolab_files.status' + status)))
+      .append($('<td class="status">').text(rcmail.gettext('kolab_files.status' + type)))
       .append(buttons);
 };
 
+function manticore_invitation_handler(invitation)
+{
+  // make the "More" link clickable
+  $('#' + invitation.id).click(function() { kolab_files_invitation_dialog(invitation); });
+
+  // @todo: update session icon state on files list
+};
+
+function manticore_invitation_save_handler(invitation)
+{
+  // @todo: update session icon state on files list
+};
+
+function kolab_files_invitation_dialog(invitation)
+{
+  var text, records = [], content = [], buttons = {},
+    dialog = $('#document-invitation-dialog'),
+    data_map = {status: 'status', 'changed': 'when', filename: 'file', comment: 'comment'},
+    record_fn = function(type, label, value) {
+        records.push($('<tr>').attr('class', type)
+          .append($('<td class="label">').text(rcmail.gettext('kolab_files.'+ label)))
+          .append($('<td>').text(value))
+        );
+      };
+/*
+    join_session = function() {
+        var viewer = file_api.file_type_supported('application//vnd.oasis.opendocument.text', rcmail.env.files_caps);
+          params = {action: 'edit', session: invitation.session_id};
+
+        file_api.file_open(invitation.file, viewer, params);
+      };
+*/
+  if (!dialog.length)
+    dialog = $('<div>').attr({id: 'document-invitation-dialog', role: 'dialog', 'aria-hidden': 'true'})
+      .append($('<div>'))
+      .appendTo(document.body);
+
+  if (!invitation.is_session_owner) {
+    if (invitation.status == 'invited') {
+      text = manticore.invitation_msg(invitation);
+/*
+      buttons[rcmail.gettext('kolab_files.join')] = function() {
+        join_session();
+        kolab_dialog_close(this);
+      };
+*/
+      buttons[rcmail.gettext('kolab_files.accept')] = function() {
+        manticore.invitation_accept(invitation);
+        kolab_dialog_close(this);
+      };
+      buttons[rcmail.gettext('kolab_files.decline')] = function() {
+        manticore.invitation_decline(invitation);
+        kolab_dialog_close(this);
+      };
+    }
+    else if (invitation.status == 'declined-owner') {
+      // @todo: add option to request for an invitation again?
+      text = manticore.invitation_msg(invitation);
+    }
+    else if (invitation.status == 'accepted-owner') {
+      text = manticore.invitation_msg(invitation);
+/*
+      buttons[rcmail.gettext('kolab_files.join')] = function() {
+        join_session();
+        kolab_dialog_close(this);
+      };
+*/
+    }
+  }
+  else {
+    if (invitation.status == 'accepted') {
+      text = manticore.invitation_msg(invitation);
+    }
+    else if (invitation.status == 'declined') {
+      // @todo: add option to invite the user again?
+      text = manticore.invitation_msg(invitation);
+    }
+    else if (invitation.status == 'requested') {
+      text = manticore.invitation_msg(invitation);
+      buttons[rcmail.gettext('kolab_files.accept')] = function() {
+        manticore.invitation_accept(invitation);
+        kolab_dialog_close(this);
+      };
+      buttons[rcmail.gettext('kolab_files.decline')] = function() {
+        manticore.invitation_decline(invitation);
+        kolab_dialog_close(this);
+      };
+    }
+  }
+
+  if (text) {
+    $.each(data_map, function(i, label) {
+      var value = invitation[i];
+      if (value) {
+        if (i == 'status')
+          value = rcmail.gettext('kolab_files.status' + value.replace(/-.*$/, ''));
+
+        record_fn(i, label, value);
+      }
+    });
+
+    content.push($('<div>').text(text));
+    content.push($('<table class="propform">').html(records));
+  }
+
+  buttons[rcmail.gettext('kolab_files.close')] = function() {
+    kolab_dialog_close(this);
+  };
+
+  $('div', dialog).html(content);
+
+  // show dialog window
+  kolab_dialog_show(dialog, {
+    title: rcmail.gettext('kolab_files.invitationtitle').replace('$file', invitation.filename),
+    buttons: buttons
+  });
+};
 
 /***********************************************************/
 /**********              Commands                 **********/
@@ -3127,17 +3271,17 @@ function kolab_files_ui()
     });
   };
 
-  // Remove document session participants
-  this.document_remove = function(id, attendees)
+  // Cancel invitations to an editing session
+  this.document_cancel = function(id, attendees)
   {
     if (attendees.length) {
-      this.req = this.set_busy(true, 'kolab_files.documentremoving');
-      this.request('document_remove', {id: id, users: attendees}, 'document_remove_response');
+      this.req = this.set_busy(true, 'kolab_files.documentcancelling');
+      this.request('document_cancel', {id: id, users: attendees}, 'document_cancel_response');
     }
   };
 
-  // document remove response handler
-  this.document_remove_response = function(response)
+  // document_cancel response handler
+  this.document_cancel_response = function(response)
   {
     if (!this.response(response) || !response.result)
       return;
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index 1bd0d728..e19818b0 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -124,15 +124,27 @@ class kolab_files_engine
         }
 
         $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/style.css');
+        $this->plugin->include_script($this->url . '/js/files_api.js');
+        $this->plugin->include_script('kolab_files.js');
+
+        $this->rc->output->set_env('files_token', $this->get_api_token());
+        $this->rc->output->set_env('files_caps', $_SESSION['kolab_files_caps']);
+        $this->rc->output->set_env('files_user', $this->rc->get_user_name());
+
+        if ($_SESSION['kolab_files_caps']['MANTICORE']) {
+            $this->plugin->add_label('declinednotice', 'invitednotice', 'acceptedownernotice',
+                'declinedownernotice', 'requestednotice', 'acceptednotice', 'declinednotice',
+                'more', 'accept', 'decline', 'join', 'status', 'when', 'file', 'comment',
+                'statusaccepted', 'statusinvited', 'statusdeclined', 'statusrequested',
+                'invitationaccepting', 'invitationdeclining', 'invitationrequesting',
+                'close', 'invitationtitle');
+        }
 
         if (!empty($templates)) {
             $collapsed_folders = (string) $this->rc->config->get('kolab_files_collapsed_folders');
 
-            $this->plugin->include_script($this->url . '/js/files_api.js');
-            $this->plugin->include_script('kolab_files.js');
             $this->rc->output->include_script('treelist.js');
             $this->rc->output->set_env('files_url', $this->url . '/api/');
-            $this->rc->output->set_env('files_token', $this->get_api_token());
             $this->rc->output->set_env('kolab_files_collapsed_folders', $collapsed_folders);
 
             // register template objects for dialogs (and main interface)
@@ -359,9 +371,7 @@ class kolab_files_engine
             'rows' => 4, 'cols' => 55, 'title' => $this->plugin->gettext('invitationtexttitle')));
         $button   = new html_inputfield(array('type' => 'button', 'class' => 'button', 'id' => 'invitation-editor-add', 'value' => $this->plugin->gettext('addparticipant')));
 
-        $this->plugin->add_label('close', 'manageeditors', 'statusorganizer', 'statusaccepted',
-            'statusinvited', 'statusdeclined', 'statusrequested'
-        );
+        $this->plugin->add_label('manageeditors', 'statusorganizer');
 
         // initialize attendees autocompletion
         $this->rc->autocomplete_init();
@@ -939,7 +949,6 @@ class kolab_files_engine
      */
     protected function action_open()
     {
-        $this->rc->output->set_env('files_caps', $_SESSION['kolab_files_caps']);
         $this->rc->output->set_env('file_mimetypes', $this->get_mimetypes());
 
         $this->file_opener(intval($_GET['_viewer']) & ~4);
@@ -951,7 +960,7 @@ class kolab_files_engine
     protected function action_edit()
     {
         $this->plugin->add_label('sessionterminating', 'unsavedchanges', 'documentinviting',
-            'documentremoving', 'removeparticipant');
+            'documentcancelling', 'removeparticipant');
 
         $this->file_opener(intval($_GET['_viewer']));
     }
@@ -1371,7 +1380,5 @@ class kolab_files_engine
         $this->rc->output->add_label('foldersubscribing', 'foldersubscribed',
             'folderunsubscribing', 'folderunsubscribed', 'searching'
         );
-
-        $this->rc->output->set_env('files_caps', $_SESSION['kolab_files_caps']);
     }
 }
diff --git a/plugins/kolab_files/localization/en_US.inc b/plugins/kolab_files/localization/en_US.inc
index b0c0f368..3e242c07 100644
--- a/plugins/kolab_files/localization/en_US.inc
+++ b/plugins/kolab_files/localization/en_US.inc
@@ -119,8 +119,25 @@ $labels['statusaccepted'] = 'Accepted';
 $labels['statusdeclined'] = 'Declined';
 $labels['statusrequested'] = 'Requested';
 $labels['documentinviting'] = 'Inviting participant(s)...';
-$labels['documentremoving'] = 'Removing participant(s)...';
+$labels['documentcancelling'] = 'Removing participant(s)...';
 $labels['removeparticipant'] = 'Remove';
+$labels['invitednotice'] = 'You have been invited to the editing session by $owner.';
+$labels['acceptedownernotice'] = '$owner accepted your request to join the editing session.';
+$labels['declinedownernotice'] = '$owner declined your request to join the editing session.';
+$labels['acceptednotice'] = '$user accepted your invitation to the editing session.';
+$labels['declinednotice'] = '$user declined your invitation to the editing session.';
+$labels['requestednotice'] = '$user requested to join the editing session.';
+$labels['more'] = 'More.';
+$labels['accept'] = 'Accept';
+$labels['join'] = 'Join the session';
+$labels['decline'] = 'Decline';
+$labels['when'] = 'When';
+$labels['file'] = 'File';
+$labels['comment'] = 'Comment';
+$labels['invitationtitle'] = 'Invitation for $file';
+$labels['ivitationaccepting'] = 'Accepting an invitation...';
+$labels['ivitationdeclining'] = 'Declining an invitation...';
+$labels['ivitationrequesting'] = 'Requesting an invitation...';
 
 $labels['storepasswords'] = 'remember password';
 $labels['storepasswordsdesc'] = 'Stored passwords will be encrypted. Enable this if you do not want to be asked for the password on every login or you want this storage to be available via WebDAV.';
diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index 7f1b6cfa..a008795e 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -418,6 +418,7 @@ ul.toolbarmenu li span.saveas {
 #files-folder-auth-dialog,
 #files-folder-create-dialog,
 #files-folder-edit-dialog,
+#document-invitation-dialog,
 #document-editors-dialog {
   display: none;
 }
@@ -575,7 +576,7 @@ table.propform td.source table.propform td {
 }
 
 #document-editors-dialog table th.options {
-  width: 40px
+  width: 16px
 }
 
 #document-editors-dialog table td {
@@ -603,3 +604,13 @@ table.propform td.source table.propform td {
   width: 16px;
   display: block;
 }
+
+#document-invitation-dialog table {
+  margin-top: 15px;
+}
+
+#document-invitation-dialog table td.label {
+  width: 1%;
+  white-space: nowrap;
+  font-weight: bold;
+}

From 5b796290d6bcc3fe9d5ddf2522dabaebe444a16e Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Wed, 25 Nov 2015 13:02:41 +0100
Subject: [PATCH 20/26] Add button to join the session immediately on
 invitation level, add option to accept/decline invitations in document
 editors dialog

---
 plugins/kolab_files/kolab_files.js            | 37 +++++++++++++------
 .../kolab_files/lib/kolab_files_engine.php    |  4 ++
 plugins/kolab_files/skins/larry/style.css     |  4 ++
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 0ce75993..726ae44e 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -1312,10 +1312,27 @@ function kolab_files_add_attendees(names)
 
 function kolab_files_attendee_record(user, status)
 {
-  var buttons = $('<td class="options">'),
-    type = status ? status.replace(/-.*$/, '') : '';
+  var options = [], select,
+    type = status ? status.replace(/-.*$/, '') : '',
+    buttons = $('<td class="options">'),
+    state = $('<td class="status">').text(rcmail.gettext('kolab_files.status' + type));
 
   // @todo: accept/decline invitation request
+  if (type == 'requested' || status == 'accepted-owner' || status == 'declined-owner') {
+    select = $('<select>').change(function() {
+        var val = $(this).val(), map = {accepted: 'invitation_accept', declined: 'invitation_decline'};
+        if (map[val])
+          manticore[map[val]]({user: user, session_id: rcmail.env.file_data.session.id});
+      });
+
+    if (type == 'requested')
+      options.push($('<option>').text(rcmail.gettext('kolab_files.statusrequested')).attr('value', 'requested'));
+
+    options.push($('<option>').text(rcmail.gettext('kolab_files.statusaccepted')).attr('value', 'accepted'));
+    options.push($('<option>').text(rcmail.gettext('kolab_files.statusdeclined')).attr('value', 'declined'));
+
+    state.html(select.html(options).val(type));
+  }
 
   // delete button
   if (status != 'organizer') {
@@ -1328,7 +1345,7 @@ function kolab_files_attendee_record(user, status)
 
   return $('<tr>').attr('class', 'invitation' + (type ? ' ' + type : ''))
       .append($('<td class="name">').text(user))
-      .append($('<td class="status">').text(rcmail.gettext('kolab_files.status' + type)))
+      .append(state)
       .append(buttons);
 };
 
@@ -1356,14 +1373,13 @@ function kolab_files_invitation_dialog(invitation)
           .append($('<td>').text(value))
         );
       };
-/*
     join_session = function() {
-        var viewer = file_api.file_type_supported('application//vnd.oasis.opendocument.text', rcmail.env.files_caps);
+        var viewer = file_api.file_type_supported('application/vnd.oasis.opendocument.text', rcmail.env.files_caps);
           params = {action: 'edit', session: invitation.session_id};
 
-        file_api.file_open(invitation.file, viewer, params);
+        file_api.file_open('', viewer, params);
       };
-*/
+
   if (!dialog.length)
     dialog = $('<div>').attr({id: 'document-invitation-dialog', role: 'dialog', 'aria-hidden': 'true'})
       .append($('<div>'))
@@ -1372,12 +1388,11 @@ function kolab_files_invitation_dialog(invitation)
   if (!invitation.is_session_owner) {
     if (invitation.status == 'invited') {
       text = manticore.invitation_msg(invitation);
-/*
+
       buttons[rcmail.gettext('kolab_files.join')] = function() {
         join_session();
         kolab_dialog_close(this);
       };
-*/
       buttons[rcmail.gettext('kolab_files.accept')] = function() {
         manticore.invitation_accept(invitation);
         kolab_dialog_close(this);
@@ -1393,12 +1408,11 @@ function kolab_files_invitation_dialog(invitation)
     }
     else if (invitation.status == 'accepted-owner') {
       text = manticore.invitation_msg(invitation);
-/*
+
       buttons[rcmail.gettext('kolab_files.join')] = function() {
         join_session();
         kolab_dialog_close(this);
       };
-*/
     }
   }
   else {
@@ -1411,6 +1425,7 @@ function kolab_files_invitation_dialog(invitation)
     }
     else if (invitation.status == 'requested') {
       text = manticore.invitation_msg(invitation);
+
       buttons[rcmail.gettext('kolab_files.accept')] = function() {
         manticore.invitation_accept(invitation);
         kolab_dialog_close(this);
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index e19818b0..42f9f0f4 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -1284,6 +1284,10 @@ class kolab_files_engine
                 true, true);
         }
 
+        if ($file === null || $file === '') {
+            $file = $this->file_data['file'];
+        }
+
         $this->file_data['filename'] = $file;
 
         $this->plugin->add_label('filedeleteconfirm', 'filedeleting', 'filedeletenotice');
diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index a008795e..edf19df1 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -579,6 +579,10 @@ table.propform td.source table.propform td {
   width: 16px
 }
 
+#document-editors-dialog table td.status select {
+  width: 100%;
+}
+
 #document-editors-dialog table td {
   padding-top: 4px;
   padding-bottom: 4px;

From c9c5b19b522fd56e02fee78574b429ef4d07a1a8 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Thu, 26 Nov 2015 13:55:53 +0100
Subject: [PATCH 21/26] Support user names and comment for invitations (T859)

---
 plugins/kolab_files/kolab_files.js            | 45 +++++++++++--------
 .../kolab_files/lib/kolab_files_engine.php    |  2 +-
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 726ae44e..13e30451 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -170,7 +170,7 @@ function kolab_files_init()
     }
   }
 
-  if (rcmail.env.files_caps && rcmail.env.files_caps.MANTICORE)
+  if (rcmail.env.files_caps && rcmail.env.files_caps.MANTICORE && !rcmail.env.framed)
     $.extend(manticore_config, {
       // invitation notifications
       api: file_api,
@@ -186,10 +186,10 @@ function kolab_files_init()
     gettext: function(label) { return rcmail.get_label('kolab_files.' + label); },
     set_busy: function(state, message) { return rcmail.set_busy(state, message ? 'kolab_files.' + message : ''); },
     hide_message: function(id) { return rcmail.hide_message(id); },
-    display_message: function(label, type, is_txt) {
+    display_message: function(label, type, is_txt, timeout) {
         if (!is_txt)
             label = 'kolab_files.' + label;
-        return rcmail.display_message(label, type);
+        return rcmail.display_message(label, type, timeout * 1000);
     }
   });
 
@@ -584,14 +584,16 @@ function kolab_files_file_edit_dialog(file, sessions, readonly)
 
     $.each(sessions, function() {
       if (this.is_invited) {
-        var txt = rcmail.gettext('kolab_files.invitedsession').replace('$user', this.owner);
+        var txt = rcmail.gettext('kolab_files.invitedsession')
+          .replace('$user', this.owner_name ? this.owner_name : this.owner);
         items.push(item_fn(this.id, txt, 'invited'));
       }
     });
 
     $.each(sessions, function() {
       if (!this.is_owner && !this.is_invited) {
-        var txt = rcmail.gettext('kolab_files.joinsession').replace('$user', this.owner);
+        var txt = rcmail.gettext('kolab_files.joinsession')
+          .replace('$user', this.owner_name ? this.owner_name : this.owner);
         items.push(item_fn(this.id, txt, 'request'));
       }
     });
@@ -1193,7 +1195,8 @@ function kolab_files_editors_dialog(session)
 {
   var ac_props, items = [], buttons = {},
     info = rcmail.env.file_data,
-    dialog = $('#document-editors-dialog');
+    dialog = $('#document-editors-dialog'),
+    comment = $('#invitation-comment');
 
   if (!info || !info.session || !info.session.is_owner)
     return;
@@ -1202,7 +1205,7 @@ function kolab_files_editors_dialog(session)
   items.push(kolab_files_attendee_record(info.session.owner, 'organizer'));
 
   $.each(info.session.invitations || [], function(i, u) {
-    var record = kolab_files_attendee_record(u.user, u.status);
+    var record = kolab_files_attendee_record(u.user, u.status, u.user_name);
     items.push(record);
     info.session.invitations[i].record = record;
   });
@@ -1236,7 +1239,8 @@ function kolab_files_editors_dialog(session)
     rcmail.addEventListener('autocomplete_insert', function(e) {
       var success = false;
       if (e.field.name == 'participant') {
-        success = kolab_files_add_attendees(e.insert, 'invited', e.data && e.data.type == 'group' ? 'GROUP' : 'INDIVIDUAL');
+        // e.data && e.data.type == 'group' ? 'GROUP' : 'INDIVIDUAL'
+        success = kolab_files_add_attendees(e.insert, comment.val());
       }
       if (e.field && success) {
         e.field.value = '';
@@ -1246,7 +1250,7 @@ function kolab_files_editors_dialog(session)
     $('#invitation-editor-add').click(function() {
       var input = $('#invitation-editor-name');
       rcmail.ksearch_blur();
-      if (kolab_files_add_attendees(input.val(), 'invited', 'INDIVIDUAL')) {
+      if (kolab_files_add_attendees(input.val(), comment.val())) {
         input.val('');
       }
     });
@@ -1254,7 +1258,7 @@ function kolab_files_editors_dialog(session)
 };
 
 // add the given list of participants
-function kolab_files_add_attendees(names)
+function kolab_files_add_attendees(names, comment)
 {
   var i, item, success, email, name, attendees = {}, counter = 0;
 
@@ -1305,15 +1309,16 @@ function kolab_files_add_attendees(names)
   }
 
   if (counter)
-    file_api.document_invite(rcmail.env.file_data.session.id, attendees);
+    file_api.document_invite(rcmail.env.file_data.session.id, attendees, comment);
 
   return success;
 };
 
-function kolab_files_attendee_record(user, status)
+function kolab_files_attendee_record(user, status, username)
 {
   var options = [], select,
     type = status ? status.replace(/-.*$/, '') : '',
+    name = $('<td class="name">').text(user),
     buttons = $('<td class="options">'),
     state = $('<td class="status">').text(rcmail.gettext('kolab_files.status' + type));
 
@@ -1343,16 +1348,18 @@ function kolab_files_attendee_record(user, status)
       .appendTo(buttons);
   }
 
+  if (username && status != 'organizer')
+    name.html($('<a>').attr({href: 'mailto:' + user, 'class': 'mailtolink'}).text(username))
+      .click(function(e) { rcmail.command('compose', user, e.target, e); return false; });
+
   return $('<tr>').attr('class', 'invitation' + (type ? ' ' + type : ''))
-      .append($('<td class="name">').text(user))
-      .append(state)
-      .append(buttons);
+      .append(name).append(state).append(buttons);
 };
 
 function manticore_invitation_handler(invitation)
 {
   // make the "More" link clickable
-  $('#' + invitation.id).click(function() { kolab_files_invitation_dialog(invitation); });
+  $('#' + invitation.id).parent('div').click(function() { kolab_files_invitation_dialog(invitation); });
 
   // @todo: update session icon state on files list
 };
@@ -3256,7 +3263,7 @@ function kolab_files_ui()
   };
 
   // Invite document session participants
-  this.document_invite = function(id, attendees)
+  this.document_invite = function(id, attendees, comment)
   {
     var list = [];
 
@@ -3265,7 +3272,7 @@ function kolab_files_ui()
 
     if (list.length) {
       this.req = this.set_busy(true, 'kolab_files.documentinviting');
-      this.request('document_invite', {id: id, users: list}, 'document_invite_response');
+      this.request('document_invite', {id: id, users: list, comment: comment || ''}, 'document_invite_response');
     }
   };
 
@@ -3279,7 +3286,7 @@ function kolab_files_ui()
       table = $('#document-editors-dialog table > tbody');
 
     $.each(response.result.list || {}, function() {
-      var record = kolab_files_attendee_record(this.user, this.status);
+      var record = kolab_files_attendee_record(this.user, this.status, this.user_name);
       table.append(record);
       if (info.session && info.session.invitations)
         info.session.invitations.push($.extend({status: 'invited', record: record}, this));
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index 42f9f0f4..f405118e 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -127,6 +127,7 @@ class kolab_files_engine
         $this->plugin->include_script($this->url . '/js/files_api.js');
         $this->plugin->include_script('kolab_files.js');
 
+        $this->rc->output->set_env('files_url', $this->url . '/api/');
         $this->rc->output->set_env('files_token', $this->get_api_token());
         $this->rc->output->set_env('files_caps', $_SESSION['kolab_files_caps']);
         $this->rc->output->set_env('files_user', $this->rc->get_user_name());
@@ -144,7 +145,6 @@ class kolab_files_engine
             $collapsed_folders = (string) $this->rc->config->get('kolab_files_collapsed_folders');
 
             $this->rc->output->include_script('treelist.js');
-            $this->rc->output->set_env('files_url', $this->url . '/api/');
             $this->rc->output->set_env('kolab_files_collapsed_folders', $collapsed_folders);
 
             // register template objects for dialogs (and main interface)

From df5e84f05277aca2dc228548d280a04a7e37d536 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Tue, 1 Dec 2015 15:55:36 +0100
Subject: [PATCH 22/26] Update session indicators periodically (T848)

---
 plugins/kolab_files/kolab_files.js            | 51 ++++++++++++-------
 .../kolab_files/lib/kolab_files_engine.php    |  2 +-
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 13e30451..5a01ea02 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -177,8 +177,7 @@ function kolab_files_init()
       owner: rcmail.env.files_user,
       interval: rcmail.env.files_interval || 60,
       invitationMore: true,
-      invitationChange: manticore_invitation_handler,
-      invitationSaved: manticore_invitation_save_handler,
+      invitationChange: manticore_invitation_handler
     });
 
   $.extend(manticore_config, {
@@ -187,9 +186,9 @@ function kolab_files_init()
     set_busy: function(state, message) { return rcmail.set_busy(state, message ? 'kolab_files.' + message : ''); },
     hide_message: function(id) { return rcmail.hide_message(id); },
     display_message: function(label, type, is_txt, timeout) {
-        if (!is_txt)
-            label = 'kolab_files.' + label;
-        return rcmail.display_message(label, type, timeout * 1000);
+      if (!is_txt)
+        label = 'kolab_files.' + label;
+      return rcmail.display_message(label, type, timeout * 1000);
     }
   });
 
@@ -1360,13 +1359,6 @@ function manticore_invitation_handler(invitation)
 {
   // make the "More" link clickable
   $('#' + invitation.id).parent('div').click(function() { kolab_files_invitation_dialog(invitation); });
-
-  // @todo: update session icon state on files list
-};
-
-function manticore_invitation_save_handler(invitation)
-{
-  // @todo: update session icon state on files list
 };
 
 function kolab_files_invitation_dialog(invitation)
@@ -1556,7 +1548,6 @@ rcube_webmail.prototype.files_list_update = function(head)
 {
   var list = this.file_list;
 
-  list.clear();
   $('thead', list.fixed_header ? list.fixed_header : list.list).html(head);
   kolab_files_list_coltypes();
   file_api.file_list();
@@ -1718,6 +1709,7 @@ function kolab_files_ui()
 {
   this.requests = {};
   this.uploads = [];
+  this.workers = {};
 
 /*
   // Called on "session expired" session
@@ -2389,11 +2381,18 @@ function kolab_files_ui()
       params = {};
 
     // reset all pending list requests
-    for (i in this.requests) {
-      this.requests[i].abort();
+    $.each(this.requests, function(i, v) {
+      v.abort();
       rcmail.hide_message(i);
-      delete this.requests[i];
-    }
+    });
+
+    // reset folder_info workers
+    $.each(this.workers, function(i, v) {
+      clearTimeout(v);
+    });
+
+    this.workers = {};
+    this.requests = {};
 
     if (params.all_folders) {
       params.collection = null;
@@ -2658,13 +2657,23 @@ function kolab_files_ui()
     if (!this.response(response) || !response.result)
       return;
 
+    var folder = response.result.folder,
+      prefix = folder + file_api.env.directory_separator;
+
     if (response.result.sessions)
-      this.sessions[response.result.folder] = response.result.sessions;
+      this.sessions[folder] = response.result.sessions;
 
     // update files list with document session info
     $.each(file_api.env.file_list || [], function(i, file) {
+      // skip files from a different folder (in multi-folder listing)
+      if (file.filename.indexOf(prefix) !== 0)
+        return;
+
       var classes = [];
 
+      if ($(file.row).is('.selected'))
+        classes.push('selected');
+
       $.each(response.result.sessions || [], function(session_id, session) {
         if (file.filename == session.file) {
           if ($.inArray('session', classes) < 0)
@@ -2679,6 +2688,12 @@ function kolab_files_ui()
 
       $(file.row).attr('class', classes.join(' '));
     });
+
+    // refresh sessions info in time intervals
+    if (rcmail.env.files_caps && rcmail.env.files_caps.MANTICORE && (rcmail.file_list || rcmail.env.file))
+      this.workers[folder] = setTimeout(function() {
+        file_api.request('folder_info', {folder: folder, sessions: 1}, 'folder_info_response');
+      }, (rcmail.env.files_interval || 60) * 1000);
   };
 
   this.file_get = function(file, params)
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index f405118e..ee71f2d2 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -658,7 +658,7 @@ class kolab_files_engine
         $head        = '';
 
         foreach ($this->file_list_head($attrib, $a_show_cols) as $cell) {
-            $head .= html::tag('td', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);
+            $head .= html::tag('th', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);
         }
 
         $head = html::tag('tr', null, $head);

From 94eff6b1e7631b2a1abff869ab98288b6563b832 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Wed, 2 Dec 2015 12:41:57 +0100
Subject: [PATCH 23/26] Implement users autocompletion in kolab_files - use
 users from LDAP not from addressbook(s)

---
 plugins/kolab_files/config.inc.php.dist       |  11 +-
 plugins/kolab_files/kolab_files.js            |  13 +-
 plugins/kolab_files/kolab_files.php           |  15 +-
 .../lib/kolab_files_autocomplete.php          | 168 ++++++++++++++++++
 .../kolab_files/lib/kolab_files_engine.php    |   1 -
 5 files changed, 194 insertions(+), 14 deletions(-)
 create mode 100644 plugins/kolab_files/lib/kolab_files_autocomplete.php

diff --git a/plugins/kolab_files/config.inc.php.dist b/plugins/kolab_files/config.inc.php.dist
index c05ed1de..7e6d1ce3 100644
--- a/plugins/kolab_files/config.inc.php.dist
+++ b/plugins/kolab_files/config.inc.php.dist
@@ -15,4 +15,13 @@ $config['kolab_files_sort_order'] = 'asc';
 // Number of concurent requests for searching and collections listing. Default: 1
 $config['kolab_files_search_threads'] = 1;
 
-?>
+// LDAP addressbook that would be searched for user names autocomplete.
+// That should be an array refering to the $config['ldap_public'] array key
+// or complete addressbook configuration array.
+$config['kolab_files_users_source'] = '';
+
+// The LDAP attribute which will be used as ACL user identifier
+$config['kolab_files_users_field'] = 'mail';
+
+// The LDAP search filter will be &'d with search queries
+$config['kolab_files_users_filter'] = '';
diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 5a01ea02..76d8c8ce 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -1192,7 +1192,7 @@ rcube_webmail.prototype.document_close = function()
 // document editors management dialog
 function kolab_files_editors_dialog(session)
 {
-  var ac_props, items = [], buttons = {},
+  var items = [], buttons = {},
     info = rcmail.env.file_data,
     dialog = $('#document-editors-dialog'),
     comment = $('#invitation-comment');
@@ -1224,16 +1224,7 @@ function kolab_files_editors_dialog(session)
 
   if (!rcmail.env.editors_dialog) {
     rcmail.env.editors_dialog = dialog;
-
-    // init attendees autocompletion
-    if (rcmail.env.autocomplete_threads > 0) {
-      ac_props = {
-        threads: rcmail.env.autocomplete_threads,
-        sources: rcmail.env.autocomplete_sources
-      };
-    }
-
-    rcmail.init_address_input_events($('#invitation-editor-name'), ac_props);
+    rcmail.init_address_input_events($('#invitation-editor-name'), {action: 'files/autocomplete'});
 
     rcmail.addEventListener('autocomplete_insert', function(e) {
       var success = false;
diff --git a/plugins/kolab_files/kolab_files.php b/plugins/kolab_files/kolab_files.php
index 8efad587..acbf9f8b 100644
--- a/plugins/kolab_files/kolab_files.php
+++ b/plugins/kolab_files/kolab_files.php
@@ -50,6 +50,7 @@ class kolab_files extends rcube_plugin
         $this->register_action('prefs', array($this, 'actions'));
         $this->register_action('open',  array($this, 'actions'));
         $this->register_action('edit',  array($this, 'actions'));
+        $this->register_action('autocomplete', array($this, 'autocomplete'));
 
         // we use libkolab::http_request() from libkolab with its configuration
         $this->require_plugin('libkolab');
@@ -77,7 +78,7 @@ class kolab_files extends rcube_plugin
                 return $this->engine = false;
             }
 
-            require_once $this->home . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'kolab_files_engine.php';
+            require_once $this->home . '/lib/kolab_files_engine.php';
 
             $this->engine = new kolab_files_engine($this, $url);
         }
@@ -132,4 +133,16 @@ class kolab_files extends rcube_plugin
             $engine->actions();
         }
     }
+
+    /**
+     * Handler for user autocomplete request
+     */
+    function autocomplete()
+    {
+        $this->load_config();
+
+        require_once $this->home . '/lib/kolab_files_autocomplete.php';
+
+        new kolab_files_autocomplete($this);
+    }
 }
diff --git a/plugins/kolab_files/lib/kolab_files_autocomplete.php b/plugins/kolab_files/lib/kolab_files_autocomplete.php
new file mode 100644
index 00000000..b9213a8d
--- /dev/null
+++ b/plugins/kolab_files/lib/kolab_files_autocomplete.php
@@ -0,0 +1,168 @@
+<?php
+
+/**
+ * Kolab files collaborators autocompletion
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2013-2015, 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
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class kolab_files_autocomplete
+{
+    private $plugin;
+    private $rc;
+
+
+    /**
+     * Class constructor
+     */
+    public function __construct($plugin)
+    {
+        $this->plugin = $plugin;
+        $this->rc     = rcube::get_instance();
+
+        $search = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC, true);
+        $reqid  = rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC);
+        $users  = array();
+        $keys   = array();
+
+        if ($this->init_ldap()) {
+            $max  = (int) $this->rc->config->get('autocomplete_max', 15);
+            $mode = (int) $this->rc->config->get('addressbook_search_mode');
+            $me   = $this->rc->get_user_name();
+
+            $this->ldap->set_pagesize($max);
+            $result = $this->ldap->search('*', $search, $mode);
+
+            foreach ($result->records as $record) {
+                $user = $record['uid'];
+
+                if (is_array($user)) {
+                    $user = array_filter($user);
+                    $user = $user[0];
+                }
+
+                if (in_array($me, rcube_addressbook::get_col_values('email', $record, true))) {
+                    continue;
+                }
+
+                if ($user) {
+                    $display = rcube_addressbook::compose_search_name($record);
+                    $user    = array('name' => $user, 'display' => $display);
+                    $users[] = $user;
+                    $keys[]  = $display ?: $user['name'];
+                }
+            }
+/*
+            if ($this->rc->config->get('kolab_files_groups')) {
+                $prefix      = $this->rc->config->get('kolab_files_group_prefix');
+                $group_field = $this->rc->config->get('kolab_files_group_field', 'name');
+                $result      = $this->ldap->list_groups($search, $mode);
+
+                foreach ($result as $record) {
+                    $group    = $record['name'];
+                    $group_id = is_array($record[$group_field]) ? $record[$group_field][0] : $record[$group_field];
+
+                    if ($group) {
+                        $users[] = array('name' => ($prefix ? $prefix : '') . $group_id, 'display' => $group, 'type' => 'group');
+                        $keys[]  = $group;
+                    }
+                }
+            }
+*/
+        }
+
+        if (count($users)) {
+            // sort users index
+            asort($keys, SORT_LOCALE_STRING);
+            // re-sort users according to index
+            foreach ($keys as $idx => $val) {
+                $keys[$idx] = $users[$idx];
+            }
+            $users = array_values($keys);
+        }
+
+        $this->rc->output->command('ksearch_query_results', $users, $search, $reqid);
+        $this->rc->output->send();
+    }
+
+    /**
+     * Initializes autocomplete LDAP backend
+     */
+    private function init_ldap()
+    {
+        if ($this->ldap) {
+            return $this->ldap->ready;
+        }
+
+        // get LDAP config
+        $config = $this->rc->config->get('kolab_files_users_source');
+
+        if (empty($config)) {
+            return false;
+        }
+
+        // not an array, use configured ldap_public source
+        if (!is_array($config)) {
+            $ldap_config = (array) $this->rc->config->get('ldap_public');
+            $config      = $ldap_config[$config];
+        }
+
+        $uid_field = $this->rc->config->get('kolab_files_users_field', 'mail');
+        $filter    = $this->rc->config->get('kolab_files_users_filter');
+        $debug     = $this->rc->config->get('ldap_debug');
+        $domain    = $this->rc->config->mail_domain($_SESSION['imap_host']);
+
+        if (empty($uid_field) || empty($config)) {
+            return false;
+        }
+
+        // get name attribute
+        if (!empty($config['fieldmap'])) {
+            $name_field = $config['fieldmap']['name'];
+        }
+        // ... no fieldmap, use the old method
+        if (empty($name_field)) {
+            $name_field = $config['name_field'];
+        }
+
+        // add UID field to fieldmap, so it will be returned in a record with name
+        $config['fieldmap']['name'] = $name_field;
+        $config['fieldmap']['uid']  = $uid_field;
+
+        // search in UID and name fields
+        // $name_field can be in a form of <field>:<modifier> (#1490591)
+        $name_field = preg_replace('/:.*$/', '', $name_field);
+        $search     = array_unique(array($name_field, $uid_field));
+
+        $config['search_fields']   = $search;
+        $config['required_fields'] = array($uid_field);
+
+        // set search filter
+        if ($filter) {
+            $config['filter'] = $filter;
+        }
+
+        // disable vlv
+        $config['vlv'] = false;
+
+        // Initialize LDAP connection
+        $this->ldap = new rcube_ldap($config, $debug, $domain);
+
+        return $this->ldap->ready;
+    }
+}
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index ee71f2d2..9476d73d 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -3,7 +3,6 @@
 /**
  * Kolab files storage engine
  *
- * @version @package_version@
  * @author Aleksander Machniak <machniak@kolabsys.com>
  *
  * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>

From 580904174e5162c5169a701a300fd74a1b6f0312 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Wed, 2 Dec 2015 14:23:00 +0100
Subject: [PATCH 24/26] Various fixes

---
 plugins/kolab_files/kolab_files.js                   | 9 +++++++--
 plugins/kolab_files/lib/kolab_files_autocomplete.php | 1 +
 plugins/kolab_files/lib/kolab_files_engine.php       | 6 ++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 76d8c8ce..cb5520bf 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -103,7 +103,8 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
     rcmail.env.file_commands_all = ['files-delete', 'files-move', 'files-copy'];
 
     if (rcmail.env.action == 'open' || rcmail.env.action == 'edit') {
-      rcmail.enable_command('files-get', 'files-delete', rcmail.env.file);
+      rcmail.enable_command('files-get', true);
+      rcmail.enable_command('files-delete', rcmail.env.file_data.writable);
     }
     else {
       rcmail.enable_command('folder-mount', rcmail.env.external_sources);
@@ -1570,13 +1571,17 @@ rcube_webmail.prototype.files_edit = function(session)
     files = kolab_files_selected();
     if (files.length == 1)
       file = files[0];
+    readonly = !file_api.is_writable(file_api.file_path(file));
+  }
+  else {
+    readonly = !this.env.file_data.writable;
   }
 
   // check if the folder is read-only or there are ongoing sessions
   // in such cases display dialog for the user to decide what to do
   if (!session) {
     sessions = file_api.file_sessions(file);
-    if (sessions.length || (readonly = !file_api.is_writable(file_api.file_path(file)))) {
+    if (sessions.length || readonly) {
       kolab_files_file_edit_dialog(file, sessions, readonly);
       return;
     }
diff --git a/plugins/kolab_files/lib/kolab_files_autocomplete.php b/plugins/kolab_files/lib/kolab_files_autocomplete.php
index b9213a8d..5b2b8be3 100644
--- a/plugins/kolab_files/lib/kolab_files_autocomplete.php
+++ b/plugins/kolab_files/lib/kolab_files_autocomplete.php
@@ -3,6 +3,7 @@
 /**
  * Kolab files collaborators autocompletion
  *
+ * @version @package_version@
  * @author Aleksander Machniak <machniak@kolabsys.com>
  *
  * Copyright (C) 2013-2015, Kolab Systems AG <contact@kolabsys.com>
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index 9476d73d..1982a05e 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -3,9 +3,10 @@
 /**
  * Kolab files storage engine
  *
+ * @version @package_version@
  * @author Aleksander Machniak <machniak@kolabsys.com>
  *
- * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2013-2015, 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
@@ -1298,6 +1299,7 @@ class kolab_files_engine
         ));
 
         $placeholder = $this->rc->output->asset_url('program/resources/blank.gif');
+        $manticore = ($viewer & 4) && $this->file_data['viewer']['manticore'];
 
         // this one is for styling purpose
         $this->rc->output->set_env('extwin', true);
@@ -1305,7 +1307,7 @@ class kolab_files_engine
         $this->rc->output->set_env('file_data', $this->file_data);
         $this->rc->output->set_env('photo_placeholder', $placeholder);
         $this->rc->output->set_pagetitle(rcube::Q($file));
-        $this->rc->output->send('kolab_files.' . ($viewer & 4 ? 'docedit' : 'filepreview'));
+        $this->rc->output->send('kolab_files.' . ($manticore ? 'docedit' : 'filepreview'));
     }
 
     /**

From 9e5d6fe1c1e27f911ed59063a7d0b671de1e3cc0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Thu, 3 Dec 2015 14:59:05 +0100
Subject: [PATCH 25/26] Disable Save button in manticore session when the
 file/folder is not writable

---
 plugins/kolab_files/kolab_files.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index cb5520bf..62404bed 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -154,9 +154,11 @@ function kolab_files_init()
         photo_url: '?_task=addressbook&_action=photo&_email=%email',
         photo_default_url: rcmail.env.photo_placeholder,
         // events
-        ready: function(data) { manticore_init(); },
-        documentChanged: function(data) { rcmail.enable_command('document-save', true); },
+        ready: function(data) { manticore_init(); }
       };
+
+      if (rcmail.env.file_data.writable)
+        manticore_config.documentChanged = function(data) { rcmail.enable_command('document-save', true); };
     }
     else if (rcmail.env.action == 'open') {
       // initialize folders list (for dialogs)

From da5038ef62d2a8431b519460f8c7b521f68aeddd Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Mon, 7 Dec 2015 16:08:28 +0100
Subject: [PATCH 26/26] Add sessionClosed event handling (T846)

---
 plugins/kolab_files/kolab_files.js            | 24 +++++++++++++++++--
 .../kolab_files/lib/kolab_files_engine.php    |  2 +-
 plugins/kolab_files/localization/en_US.inc    |  2 ++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 62404bed..4ecdb2b4 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -151,10 +151,11 @@ function kolab_files_init()
         export_menu: rcmail.gui_objects.exportmenu ? $('ul', rcmail.gui_objects.exportmenu).get(0) : null,
         title_input: $('#document-title').get(0),
         members_list: $('#members').get(0),
-        photo_url: '?_task=addressbook&_action=photo&_email=%email',
+        photo_url: '?_task=addressbook&_action=photo&_error=1&_email=%email',
         photo_default_url: rcmail.env.photo_placeholder,
         // events
-        ready: function(data) { manticore_init(); }
+        ready: function(data) { manticore_init(); },
+        sessionClosed: function(data) { return manticore_close(); }
       };
 
       if (rcmail.env.file_data.writable)
@@ -1165,6 +1166,25 @@ function manticore_init()
     rcmail.enable_command('document-close', 'document-editors', true);
 };
 
+// executed on editing session termination
+function manticore_close()
+{
+  $('<div>').addClass('popupdialog').attr('role', 'alertdialog')
+    .html($('<span>').text(rcmail.gettext('kolab_files.sessionterminated')))
+    .dialog({
+      resizable: false,
+      closeOnEscape: true,
+      dialogClass: 'popupmessage error',
+      title: rcmail.gettext('kolab_files.sessionterminatedtitle'),
+      close: function() { window.close(); },
+      position: ['center', 'center'],
+      width: 420,
+      minHeight: 90
+    }).show();
+
+  return false; // skip Chwala's error message
+};
+
 rcube_webmail.prototype.document_save = function()
 {
   manticore.save(function(data) {
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index 1982a05e..2118a6d1 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -960,7 +960,7 @@ class kolab_files_engine
     protected function action_edit()
     {
         $this->plugin->add_label('sessionterminating', 'unsavedchanges', 'documentinviting',
-            'documentcancelling', 'removeparticipant');
+            'documentcancelling', 'removeparticipant', 'sessionterminated', 'sessionterminatedtitle');
 
         $this->file_opener(intval($_GET['_viewer']));
     }
diff --git a/plugins/kolab_files/localization/en_US.inc b/plugins/kolab_files/localization/en_US.inc
index 3e242c07..5c187d48 100644
--- a/plugins/kolab_files/localization/en_US.inc
+++ b/plugins/kolab_files/localization/en_US.inc
@@ -103,6 +103,8 @@ $labels['editfilero'] = 'This file is read-only. Do you want to create and edit
 $labels['editfilerotitle'] = 'Read-only file';
 $labels['select'] = 'Select';
 $labels['terminatesession'] = 'Terminate the session';
+$labels['sessionterminatedtitle'] = 'Session terminated';
+$labels['sessionterminated'] = 'The session has been terminated. The window will be closed.';
 $labels['terminate'] = 'Terminate';
 $labels['sessionterminating'] = 'Terminating the session...';
 $labels['unsavedchanges'] = 'There are unsaved changes in the document that will be lost. Do you want to terminate the session anyway?';