Kolab Groupware OBS

roundcubemail-plugins-kolab.spec Changed

debian.changelog Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/lib/kolab_storage_cache_mongodb.php Deleted

@@ -1,561 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class providing a local caching layer for Kolab groupware objects.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, 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_storage_cache_mongodb
-{
-    private $db;
-    private $imap;
-    private $folder;
-    private $uid2msg;
-    private $objects;
-    private $index = array();
-    private $resource_uri;
-    private $enabled = true;
-    private $synched = false;
-    private $synclock = false;
-    private $ready = false;
-    private $max_sql_packet = 1046576;  // 1 MB - 2000 bytes
-    private $binary_cols = array('photo','pgppublickey','pkcs7publickey');
-
-
-    /**
-     * Default constructor
-     */
-    public function __construct(kolab_storage_folder $storage_folder = null)
-    {
-        $rcmail = rcube::get_instance();
-        $mongo = new Mongo();
-        $this->db = $mongo->kolab_cache;
-        $this->imap = $rcmail->get_storage();
-        $this->enabled = $rcmail->config->get('kolab_cache', false);
-
-        if ($this->enabled) {
-            // remove sync-lock on script termination
-            $rcmail->add_shutdown_function(array($this, '_sync_unlock'));
-        }
-
-        if ($storage_folder)
-            $this->set_folder($storage_folder);
-    }
-
-
-    /**
-     * Connect cache with a storage folder
-     *
-     * @param kolab_storage_folder The storage folder instance to connect with
-     */
-    public function set_folder(kolab_storage_folder $storage_folder)
-    {
-        $this->folder = $storage_folder;
-
-        if (empty($this->folder->name)) {
-            $this->ready = false;
-            return;
-        }
-
-        // compose fully qualified ressource uri for this instance
-        $this->resource_uri = $this->folder->get_resource_uri();
-        $this->ready = $this->enabled;
-    }
-
-
-    /**
-     * Synchronize local cache data with remote
-     */
-    public function synchronize()
-    {
-        // only sync once per request cycle
-        if ($this->synched)
-            return;
-
-        // increase time limit
-        @set_time_limit(500);
-
-        // lock synchronization for this folder or wait if locked
-        $this->_sync_lock();
-
-        // synchronize IMAP mailbox cache
-        $this->imap->folder_sync($this->folder->name);
-
-        // compare IMAP index with object cache index
-        $imap_index = $this->imap->index($this->folder->name);
-        $this->index = $imap_index->get();
-
-        // determine objects to fetch or to invalidate
-        if ($this->ready) {
-            // read cache index
-            $old_index = array();
-            $cursor = $this->db->cache->find(array('resource' => $this->resource_uri), array('msguid' => 1, 'uid' => 1));
-            foreach ($cursor as $doc) {
-                $old_index = $doc'msguid';
-                $this->uid2msg$doc'uid' = $doc'msguid';
-            }
-
-            // fetch new objects from imap
-            foreach (array_diff($this->index, $old_index) as $msguid) {
-                if ($object = $this->folder->read_object($msguid, '*')) {
-                    try {
-                        $this->db->cache->insert($this->_serialize($object, $msguid));
-                    }
-                    catch (Exception $e) {
-                        rcmail::raise_error(array(
-                            'code' => 900, 'type' => 'php',
-                            'message' => "Failed to write to mongodb cache: " . $e->getMessage(),
-                        ), true);
-                    }
-                }
-            }
-
-            // delete invalid entries from local DB
-            $del_index = array_diff($old_index, $this->index);
-            if (!empty($del_index)) {
-                $this->db->cache->remove(array('resource' => $this->resource_uri, 'msguid' => array('$in' => $del_index)));
-            }
-        }
-
-        // remove lock
-        $this->_sync_unlock();
-
-        $this->synched = time();
-    }
-
-
-    /**
-     * Read a single entry from cache or from IMAP directly
-     *
-     * @param string Related IMAP message UID
-     * @param string Object type to read
-     * @param string IMAP folder name the entry relates to
-     * @param array  Hash array with object properties or null if not found
-     */
-    public function get($msguid, $type = null, $foldername = null)
-    {
-        // delegate to another cache instance
-        if ($foldername && $foldername != $this->folder->name) {
-            return kolab_storage::get_folder($foldername)->cache->get($msguid, $object);
-        }
-
-        // load object if not in memory
-        if (!isset($this->objects$msguid)) {
-            if ($this->ready && ($doc = $this->db->cache->findOne(array('resource' => $this->resource_uri, 'msguid' => $msguid))))
-                $this->objects$msguid = $this->_unserialize($doc);
-
-            // fetch from IMAP if not present in cache
-            if (empty($this->objects$msguid)) {
-                $result = $this->_fetch(array($msguid), $type, $foldername);
-                $this->objects$msguid = $result0;
-            }
-        }
-
-        return $this->objects$msguid;
-    }
-
-
-    /**
-     * Insert/Update a cache entry
-     *
-     * @param string Related IMAP message UID
-     * @param mixed  Hash array with object properties to save or false to delete the cache entry
-     * @param string IMAP folder name the entry relates to
-     */
-    public function set($msguid, $object, $foldername = null)
-    {
-        // delegate to another cache instance
-        if ($foldername && $foldername != $this->folder->name) {
-            kolab_storage::get_folder($foldername)->cache->set($msguid, $object);
-            return;
-        }
-
-        // write to cache
-        if ($this->ready) {
-            // remove old entry
-            $this->db->cache->remove(array('resource' => $this->resource_uri, 'msguid' => $msguid));
-
-            // write new object data if not false (wich means deleted)
-            if ($object) {
-                try {
-                    $this->db->cache->insert($this->_serialize($object, $msguid));
-                }

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/calendar/calendar_ui.js -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/calendar/calendar_ui.js Changed

@@ -3096,9 +3096,10 @@
         $('#event-export-calendar').val(calendar.id);
 
       $('#event-export-range').change(function(e){
-        var custom = $('option:selected', this).val() == 'custom',
-          input = $('#event-export-startdate')
-        input.parent()(custom?'show':'hide')();
+        var custom = $(this).val() == 'custom', input = $('#event-export-startdate');
+
+        $(this)custom ? 'removeClass' : 'addClass'('rounded-right'); // Elastic/Bootstrap
+        inputcustom ? 'show' : 'hide'();
         if (custom)
           input.select();
       })
@@ -3109,8 +3110,8 @@
           'class': 'mainaction export',
           click: function() {
             if (form) {
-              var start = 0, range = $('#event-export-range option:selected', this).val(),
-                source = $('#event-export-calendar option:selected').val(),
+              var start = 0, range = $('#event-export-range', this).val(),
+                source = $('#event-export-calendar').val(),
                 attachmt = $('#event-export-attachments').get(0).checked;
 
               if (range == 'custom')

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/calendar/composer.json -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/calendar/composer.json Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/calendar/lib/calendar_ui.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/calendar/lib/calendar_ui.php Changed

@@ -571,7 +571,7 @@
       html::label(array('for' => 'event-export-calendar', 'class' => 'col-sm-4 col-form-label'), $this->cal->gettext('calendar'))
         . html::div('col-sm-8', $this->calendar_select(array('name' => 'calendar', 'id' => 'event-export-calendar', 'class' => 'form-control custom-select'))));
 
-    $select = new html_select(array('name' => 'range', 'id' => 'event-export-range', 'class' => 'form-control custom-select'));
+    $select = new html_select(array('name' => 'range', 'id' => 'event-export-range', 'class' => 'form-control custom-select rounded-right'));
     $select->add(array(
         $this->cal->gettext('all'),
         $this->cal->gettext('onemonthback'),
@@ -583,11 +583,11 @@
       ),
       array(0,'1','2','3','6','12','custom'));
 
-    $startdate = new html_inputfield(array('name' => 'start', 'size' => 11, 'id' => 'event-export-startdate'));
+    $startdate = new html_inputfield(array('name' => 'start', 'size' => 11, 'id' => 'event-export-startdate', 'style' => 'display:none'));
 
     $html .= html::div('form-section form-group row',
       html::label(array('for' => 'event-export-range', 'class' => 'col-sm-4 col-form-label'), $this->cal->gettext('exportrange'))
-        . html::div('col-sm-8', $select->show(0) . html::span(array('style'=>'display:none'), $startdate->show())));
+        . html::div('col-sm-8 input-group', $select->show(0) . $startdate->show()));
 
     $checkbox = new html_checkbox(array('name' => 'attachments', 'id' => 'event-export-attachments', 'value' => 1, 'class' => 'form-check-input pretty-checkbox'));
     $html .= html::div('form-section form-check row',

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/kolab_2fa/composer.json -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_2fa/composer.json Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/kolab_activesync/composer.json -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_activesync/composer.json Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/kolab_activesync/kolab_activesync.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_activesync/kolab_activesync.php Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/kolab_activesync/kolab_activesync_ui.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_activesync/kolab_activesync_ui.php Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php Changed

@@ -325,7 +325,9 @@
     public function list_records($cols = null, $subset = 0, $nocount = false)
     {
         $this->result = new rcube_result_set(0, ($this->list_page-1) * $this->page_size);
+
         $fetch_all = false;
+        $fast_mode = !empty($cols) && is_array($cols);
 
         // list member of the selected group
         if ($this->gid) {
@@ -355,7 +357,7 @@
 
             // get members by UID
             if (!empty($uids)) {
-                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), $fetch_all ? false : count($uids));
+                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), $fetch_all ? false : count($uids), $fast_mode);
                 $this->sortindex = array_merge($this->sortindex, $local_sortindex);
             }
         }
@@ -363,11 +365,11 @@
             $ids = $this->filter'ids';
             if (count($ids)) {
                 $uids = array_map(array($this, 'id2uid'), $this->filter'ids');
-                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), count($ids));
+                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), count($ids), $fast_mode);
             }
         }
         else {
-            $this->_fetch_contacts($query = 'contact', true);
+            $this->_fetch_contacts($query = 'contact', true, $fast_mode);
         }
 
         if ($fetch_all) {
@@ -1062,7 +1064,7 @@
     /**
      * Query storage layer and store records in private member var
      */
-    private function _fetch_contacts($query = array(), $limit = false)
+    private function _fetch_contacts($query = array(), $limit = false, $fast_mode = false)
     {
         if (!isset($this->dataset) || !empty($query)) {
             if ($limit) {
@@ -1071,7 +1073,7 @@
             }
 
             $this->sortindex = array();
-            $this->dataset   = $this->storagefolder->select($query);
+            $this->dataset   = $this->storagefolder->select($query, $fast_mode);
 
             foreach ($this->dataset as $idx => $record) {
                 $contact = $this->_to_rcube_contact($record);
@@ -1137,7 +1139,7 @@
     {
         if (!isset($this->distlists)) {
             $this->distlists = $this->groupmembers = array();
-            foreach ($this->storagefolder->select('distribution-list') as $record) {
+            foreach ($this->storagefolder->select('distribution-list', true) as $record) {
                 $record'ID' = $this->uid2id($record'uid');
                 foreach ((array)$record'member' as $i => $member) {
                     $mid = $this->uid2id($member'uid' ? $member'uid' : 'mailto:' . $member'email');
@@ -1145,8 +1147,9 @@
                     $record'member'$i'readonly' = empty($member'uid');
                     $this->groupmembers$mid = $record'ID';
 
-                    if ($with_contacts && empty($member'uid'))
+                    if ($with_contacts && empty($member'uid')) {
                         $this->contacts$mid = $record'member'$i;
+                    }
                 }
                 $this->distlists$record'ID' = $record;
             }

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/kolab_delegation/composer.json -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_delegation/composer.json Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/kolab_delegation/kolab_delegation.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_delegation/kolab_delegation.php Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/kolab_files/composer.json -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_files/composer.json Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/kolab_files/kolab_files.js -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_files/kolab_files.js Changed

@@ -245,7 +245,7 @@
 
   $.extend(editor_config, {
     // notifications/alerts
-    gettext: function(label) { return rcmail.get_label('kolab_files.' + label); },
+    gettext: function(label) { return rcmail.get_label(label, 'kolab_files'); },
     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) {
@@ -1487,11 +1487,28 @@
 // close editing session
 rcube_webmail.prototype.document_close = function()
 {
+  var delete_fn = function() {
+    document_editor.terminate(function() {
+      var win = window.opener || window.parent;
+
+      if (win && win.rcmail && win.file_api)
+        win.file_api.document_delete(rcmail.env.file_data.session.id);
+
+      // For Elastic: hide the parent dialog
+      if (rcmail.is_framed()) {
+        parent.$('.ui-dialog:visible button.cancel').click();
+      }
+
+      window.close();
+    });
+  };
+
   // check document "unsaved changes" state and display a warning
-  if (this.commands'document-save')
-    this.confirm_dialog(this.gettext('kolab_files.unsavedchanges'), 'kolab_files.terminate', function() {
-      file_api.document_delete(rcmail.env.file_data.session.id);
-    }, {button_class: 'delete'});
+  // skip the warning for WOPI, Collabora will save the document anyway on session close
+  if (this.commands'document-save' && (!this.env.file_data.viewer || !this.env.file_data.viewer.wopi))
+    this.confirm_dialog(this.gettext('kolab_files.unsavedchanges'), 'kolab_files.terminate', delete_fn, {button_class: 'delete'});
+  else
+    delete_fn();
 };
 
 // document editors management dialog
@@ -2264,6 +2281,9 @@
     list.append(rows).appendTo(elem)
       .on('click', 'a.subscription', function(e) {
         return file_api.folder_list_subscription_button_click(this);
+      })
+      .on('mouseover', 'a.name', function() {
+        rcube_webmail.long_subject_title_ex(this);
       });
 
     if (rcmail.env.contextmenu)
@@ -2926,7 +2946,10 @@
         .on('click', function() { file_api.sharing_delete(post.folder, $(this).closest('tr'), post.mode); });
 
     if (form_info.list_column) {
-      row.append($('<td>').append($('<span class="name">').text(postform_info.list_column)));
+      row.append($('<td>').append($('<span class="name">')
+        .text(response.result.display || postform_info.list_column)
+        .attr('title', response.result.title))
+      );
     }
     else {
       $.each(form_info.form || , function(i, v) {
@@ -2942,7 +2965,7 @@
           content.append(opts).val(posti);
         }
         else {
-          content = $('<span class="name">').text(posti);
+          content = $('<span class="name">').text(response.result.display || posti).attr('title', response.result.title);
           hidden.push($('<input>').attr({type: 'hidden', name: i, value: posti || ''}));
         }
 
@@ -4083,43 +4106,25 @@
   this.document_delete = function(id)
   {
     this.req = this.set_busy(true, 'kolab_files.sessionterminating');
-    this.deleted_session = id;
     this.request('document_delete', {id: id}, 'document_delete_response');
   };
 
   // document session delete response handler
-  this.document_delete_response = function(response)
+  this.document_delete_response = function(response, params)
   {
     if (!this.response(response))
       return;
 
-    if (rcmail.task == 'files' && rcmail.env.action == 'edit') {
-      if (document_editor && document_editor.terminate)
-        document_editor.terminate();
-      // use timeout to have a chance to properly propagate termination request
-      setTimeout(function() { window.close(); }, 500);
-    }
-
-    // @todo: force sessions info update
-
-    var win = window, list = rcmail.sessionslist;
-
-    if (!list) {
-      win = window.opener || window.parent;
-      if (win && win.rcmail && win.file_api)
-        list = win.rcmail.sessionslist;
-    }
+    var list = rcmail.sessionslist;
 
     // remove session from the list (if sessions list exist)
     if (list)
-      list.remove_row(this.deleted_session);
-    if (win && win.file_api && win.file_api.env.sessions_list)
-      delete win.file_api.env.sessions_listthis.deleted_session;
-
-    // For Elastic: hide the parent dialog
-    if (rcmail.is_framed()) {
-      parent.$('.ui-dialog:visible button.cancel').click();
-    }
+      list.remove_row(params.id);
+
+    if (this.env.sessions_list)
+      delete this.env.sessions_listparams.id;
+
+    // @todo: force sessions info update, update files list
   };
 
   // Invite document session participants

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/kolab_files/lib/kolab_files_engine.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_files/lib/kolab_files_engine.php Changed

@@ -106,7 +106,7 @@
             $this->get_external_storage_drivers();
 
             // these labels may be needed even if fetching ext sources failed
-            $this->plugin->add_label('folderauthtitle', 'authenticating', 'foldershare');
+            $this->plugin->add_label('folderauthtitle', 'authenticating', 'foldershare', 'saving');
         }
 
         if ($list_widget) {
@@ -149,7 +149,7 @@
                 'more', 'accept', 'decline', 'join', 'status', 'when', 'file', 'comment',
                 'statusaccepted', 'statusinvited', 'statusdeclined', 'statusrequested',
                 'invitationaccepting', 'invitationdeclining', 'invitationrequesting',
-                'close', 'invitationtitle', 'sessions');
+                'close', 'invitationtitle', 'sessions', 'saving');
         }
 
         if (!empty($templates)) {
@@ -450,7 +450,7 @@
             foreach ((array) $info'rights' as $entry) {
                 if ($entry'mode' == $mode) {
                     if (!empty($tab'list_column')) {
-                        $table->add(null, html::span('name', rcube::Q($entry$tab'list_column')));
+                        $table->add(null, html::span(array('title' => $entry'title', 'class' => 'name'), rcube::Q($entry$tab'list_column')));
                     }
                     else {
                         foreach ($tab'form' as $index => $field) {
@@ -458,7 +458,7 @@
                                 $table->add(null, $fields$index->show($entry$index));
                             }
                             else if ($fields$index instanceof html_inputfield) {
-                                $table->add(null, html::span('name', rcube::Q($entry$index)));
+                                $table->add(null, html::span(array('title' => $entry'title', 'class' => 'name'), rcube::Q($entry$index)));
                             }
                         }
                     }

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/kolab_files/localization/en_US.inc -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_files/localization/en_US.inc Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/kolab_files/skins/elastic/ui.js -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_files/skins/elastic/ui.js Changed

@@ -124,12 +124,20 @@
 }
 else {
     rcmail.addEventListener('files-folder-select', function(p) {
-        var is_sess = p.folder == 'folder-collection-sessions';
+        var fname, is_sess = p.folder == 'folder-collection-sessions';
+
         $('#fileslistmenu-link, #layout-content > .pagenav, #layout-content .searchbar')is_sess ? 'hide' : 'show'();
         $('#sessionslistmenu-link')is_sess ? 'removeClass' : 'addClass'('hidden');
 
-        // set list header title for mobile
-        // $('#layout-content > .header > .header-title').text($('#files-folder-list li.selected a.name:first').text());
+        if (is_sess)
+            fname = rcmail.gettext('kolab_files.sessions');
+        else if (p.folder.match(/^folder-collection-(a-z+)$/))
+            fname = rcmail.gettext('kolab_files.collection_' + RegExp.$1);
+        else
+            fname = p.folder.split(file_api.env.directory_separator).pop();
+
+        // jump to files list and set list header title for mobile
+        rcmail.triggerEvent('show-content', {title: fname});
     });
 }

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/kolab_folders/composer.json -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_folders/composer.json Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/kolab_folders/kolab_folders.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_folders/kolab_folders.php Changed

@@ -72,6 +72,11 @@
         // ACL plugin hooks
         $this->add_hook('acl_rights_simple', array($this, 'acl_rights_simple'));
         $this->add_hook('acl_rights_supported', array($this, 'acl_rights_supported'));
+
+        // Resolving other user folder names
+        $this->add_hook('render_mailboxlist', array($this, 'render_folderlist'));
+        $this->add_hook('render_folder_selector', array($this, 'render_folderlist'));
+        $this->add_hook('folders_list', array($this, 'render_folderlist'));
     }
 
     /**
@@ -709,6 +714,7 @@
      * Static getter for default folder of the given type
      *
      * @param string $type Folder type
+     *
      * @return string Folder name
      */
     public static function default_folder($type)
@@ -781,4 +787,65 @@
             );
         }
     }
+
+    /**
+     * Handler for various folders list widgets (hooks)
+     *
+     * @param array $args Hash array with hook parameters
+     *
+     * @return array Hash array with modified hook parameters
+     */
+    public function render_folderlist($args)
+    {
+        $storage  = $this->rc->get_storage();
+        $ns_other = $storage->get_namespace('other');
+        $is_fl    = $this->rc->plugins->is_processing('folders_list');
+
+        foreach ((array) $ns_other as $root) {
+            $delim  = $root1;
+            $prefix = rtrim($root0, $delim);
+            $length = strlen($prefix);
+
+            if (!$length) {
+                continue;
+            }
+
+            // folders_list hook mode
+            if ($is_fl) {
+                foreach ((array) $args'list' as $folder_name => $folder) {
+                    if (strpos($folder_name, $root0) === 0 && !substr_count($folder_name, $root1, $length+1)) {
+                        if ($name = kolab_storage::folder_id2user(substr($folder_name, $length+1), true)) {
+                            $old     = $args'list'$folder_name'display';
+                            $content = $args'list'$folder_name'content';
+
+                            $name    = rcube::Q($name);
+                            $content = str_replace(">$old<", ">$name<", $content);
+
+                            $args'list'$folder_name'display' = $name;
+                            $args'list'$folder_name'content' = $content;
+                        }
+                    }
+                }
+
+                // TODO: Re-sort the list
+            }
+            // render_* hooks mode
+            else if (!empty($args'list'$prefix) && !empty($args'list'$prefix'folders')) {
+                $map = array();
+                foreach ($args'list'$prefix'folders' as $folder_name => $folder) {
+                    if ($name = kolab_storage::folder_id2user($folder_name, true)) {
+                        $args'list'$prefix'folders'$folder_name'name' = $name;
+                    }
+
+                    $map$folder_name = $name ?: $args'list'$prefix'folders'$folder_name'name';
+                }
+
+                // Re-sort the list
+                uasort($map, 'strcoll');
+                $args'list'$prefix'folders' = array_replace($map, $args'list'$prefix'folders');
+            }
+        }
+
+        return $args;
+    }
 }

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/kolab_notes/composer.json -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_notes/composer.json Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/kolab_notes/kolab_notes.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_notes/kolab_notes.php Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libcalendaring/composer.json -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libcalendaring/composer.json Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/SQL/mysql.initial.sql -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/SQL/mysql.initial.sql Changed

@@ -33,7 +33,6 @@
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
   `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
@@ -57,7 +56,6 @@
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
   `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `dtstart` DATETIME,
@@ -77,7 +75,6 @@
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
   `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `dtstart` DATETIME,
@@ -97,7 +94,6 @@
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
   `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `dtstart` DATETIME,
@@ -117,7 +113,6 @@
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
   `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   CONSTRAINT `fk_kolab_cache_note_folder` FOREIGN KEY (`folder_id`)
@@ -135,7 +130,6 @@
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
   `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `filename` varchar(255) DEFAULT NULL,
@@ -155,7 +149,6 @@
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
   `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
@@ -175,7 +168,6 @@
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
   `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `dtstart` DATETIME,
@@ -188,4 +180,4 @@
 
 /*!40014  SET FOREIGN_KEY_CHECKS=1 */;
 
-REPLACE INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2018021300');
+REPLACE INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2018122700');

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/SQL/mysql/2018122700.sql Added

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/SQL/oracle.initial.sql -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/SQL/oracle.initial.sql Changed

@@ -37,7 +37,6 @@
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
-    "xml" clob NOT NULL,
     "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "type" varchar(32) NOT NULL,
@@ -60,7 +59,6 @@
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
-    "xml" clob NOT NULL,
     "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "dtstart" timestamp DEFAULT NULL,
@@ -79,7 +77,6 @@
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
-    "xml" clob NOT NULL,
     "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "dtstart" timestamp DEFAULT NULL,
@@ -98,7 +95,6 @@
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
-    "xml" clob NOT NULL,
     "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "dtstart" timestamp DEFAULT NULL,
@@ -117,7 +113,6 @@
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
-    "xml" clob NOT NULL,
     "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     PRIMARY KEY ("folder_id", "msguid")
@@ -134,7 +129,6 @@
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
-    "xml" clob NOT NULL,
     "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "filename" varchar(255) DEFAULT NULL,
@@ -153,7 +147,6 @@
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
-    "xml" clob NOT NULL,
     "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "type" varchar(32) NOT NULL,
@@ -172,7 +165,6 @@
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
-    "xml" clob NOT NULL,
     "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "dtstart" timestamp DEFAULT NULL,
@@ -183,4 +175,4 @@
 CREATE INDEX "kolab_cache_fb_uid2msguid" ON "kolab_cache_freebusy" ("folder_id", "uid", "msguid");
 
 
-INSERT INTO "system" ("name", "value") VALUES ('libkolab-version', '2018021300');
+INSERT INTO "system" ("name", "value") VALUES ('libkolab-version', '2018122700');

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/SQL/oracle/2018122700.sql Added

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/SQL/sqlite.initial.sql -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/SQL/sqlite.initial.sql Changed

@@ -25,7 +25,6 @@
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
-  xml TEXT NOT NULL,
   tags TEXT NOT NULL,
   words TEXT NOT NULL,
   type VARCHAR(32) NOT NULL,
@@ -46,7 +45,6 @@
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
-  xml TEXT NOT NULL,
   tags TEXT NOT NULL,
   words TEXT NOT NULL,
   dtstart DATETIME,
@@ -63,7 +61,6 @@
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
-  xml TEXT NOT NULL,
   tags TEXT NOT NULL,
   words TEXT NOT NULL,
   dtstart DATETIME,
@@ -80,7 +77,6 @@
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
-  xml TEXT NOT NULL,
   tags TEXT NOT NULL,
   words TEXT NOT NULL,
   dtstart DATETIME,
@@ -97,7 +93,6 @@
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
-  xml TEXT NOT NULL,
   tags TEXT NOT NULL,
   words TEXT NOT NULL,
   PRIMARY KEY(folder_id,msguid)
@@ -112,7 +107,6 @@
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
-  xml TEXT NOT NULL,
   tags TEXT NOT NULL,
   words TEXT NOT NULL,
   filename varchar(255) DEFAULT NULL,
@@ -129,7 +123,6 @@
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
-  xml TEXT NOT NULL,
   tags TEXT NOT NULL,
   words TEXT NOT NULL,
   type VARCHAR(32) NOT NULL,
@@ -146,7 +139,6 @@
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
-  xml TEXT NOT NULL,
   tags TEXT NOT NULL,
   words TEXT NOT NULL,
   dtstart DATETIME,
@@ -156,4 +148,4 @@
 
 CREATE INDEX ix_freebusy_uid2msguid ON kolab_cache_freebusy(folder_id,uid,msguid);
 
-INSERT INTO system (name, value) VALUES ('libkolab-version', '2018021300');
+INSERT INTO system (name, value) VALUES ('libkolab-version', '2018122700');

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/SQL/sqlite/2018122700.sql Added

@@ -0,0 +1,137 @@
+DROP TABLE kolab_cache_contact;
+CREATE TABLE kolab_cache_contact (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  type VARCHAR(32) NOT NULL,
+  name VARCHAR(255) NOT NULL,
+  firstname VARCHAR(255) NOT NULL,
+  surname VARCHAR(255) NOT NULL,
+  email VARCHAR(255) NOT NULL,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_contact_type ON kolab_cache_contact(folder_id,type);
+CREATE INDEX ix_contact_uid2msguid ON kolab_cache_contact(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_event;
+CREATE TABLE kolab_cache_event (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  dtstart DATETIME,
+  dtend DATETIME,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_event_uid2msguid ON kolab_cache_event(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_task;
+CREATE TABLE kolab_cache_task (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  dtstart DATETIME,
+  dtend DATETIME,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_task_uid2msguid ON kolab_cache_task(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_journal;
+CREATE TABLE kolab_cache_journal (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  dtstart DATETIME,
+  dtend DATETIME,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_journal_uid2msguid ON kolab_cache_journal(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_note;
+CREATE TABLE kolab_cache_note (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_note_uid2msguid ON kolab_cache_note(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_file;
+CREATE TABLE kolab_cache_file (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  filename varchar(255) DEFAULT NULL,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_folder_filename ON kolab_cache_file(folder_id,filename);
+CREATE INDEX ix_file_uid2msguid ON kolab_cache_file(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_configuration;
+CREATE TABLE kolab_cache_configuration (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  type VARCHAR(32) NOT NULL,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_configuration_type ON kolab_cache_configuration(folder_id,type);
+CREATE INDEX ix_configuration_uid2msguid ON kolab_cache_configuration(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_freebusy;
+CREATE TABLE kolab_cache_freebusy (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  dtstart DATETIME,
+  dtend DATETIME,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_freebusy_uid2msguid ON kolab_cache_freebusy(folder_id,uid,msguid);

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/composer.json -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/composer.json Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/config.inc.php.dist -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/config.inc.php.dist Changed

@@ -35,7 +35,8 @@
 
 // When kolab_cache is enabled Roundcube's messages cache will be redundant
 // when working on kolab folders. Here we can:
-// 2 - bypass messages/indexes cache completely
+// 3 - bypass only indexes, but use messages cache
+// 2 - bypass both messages and indexes cache
 // 1 - bypass only messages, but use index cache
 $config'kolab_messages_cache_bypass' = 0;
 
@@ -64,6 +65,18 @@
 // Use these attributes when searching users in LDAP
 $config'kolab_users_search_attrib' = array('cn','mail','alias');
 
+// Which property of the LDAP user record to use as a display name.
+// Defaults to the 'kolab_auth_name' configuration option.
+$config'kolab_users_name_field' = null;
+
+// Type of cache for uid-to-user map. Supported: 'db', 'apc', 'memcache' and 'memcached'.
+// Note: This stores only other user folder identifier to user attributes map.
+$config'kolab_users_cache' = null;
+
+// lifetime of shared folder mapping cache
+// possible units: s, m, h, d, w
+$config'kolab_users_cache_ttl' = '10d';
+
 // JSON-RPC endpoint configuration of the Bonnie web service providing historic data for groupware objects
 $config'kolab_bonnie_api' = array(
     'uri'    => 'https://<kolab-hostname>:8080/api/rpc',

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/lib/kolab_storage.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/lib/kolab_storage.php Changed

@@ -46,12 +46,14 @@
     private static $ready = false;
     private static $with_tempsubs = true;
     private static $subscriptions;
+    private static $ldapcache = array();
     private static $typedata = array();
     private static $states;
     private static $config;
     private static $imap;
     private static $ldap;
 
+
     // Default folder names
     private static $default_folders = array(
         'event'         => 'Calendar',
@@ -354,7 +356,6 @@
         return '';
     }
 
-
     /**
      * Deletes IMAP folder
      *
@@ -421,7 +422,6 @@
         return false;
     }
 
-
     /**
      * Renames IMAP folder
      *
@@ -457,7 +457,6 @@
         return $success;
     }
 
-
     /**
      * Rename or Create a new IMAP folder.
      *
@@ -552,7 +551,6 @@
         return $result ? $folder : false;
     }
 
-
     /**
      * Getter for human-readable name of Kolab object (folder)
      * with kolab_custom_display_names support.
@@ -637,20 +635,18 @@
         if (!$found && !empty($namespace'other')) {
             foreach ($namespace'other' as $ns) {
                 if (strlen($ns0) && strpos($folder, $ns0) === 0) {
-                    // remove namespace prefix
+                    // remove namespace prefix and extract username
                     $folder = substr($folder, strlen($ns0));
                     $delim  = $ns1;
-                    // get username
-                    $pos    = strpos($folder, $delim);
-                    if ($pos) {
-                        $prefix = '('.substr($folder, 0, $pos).')';
-                        $folder = substr($folder, $pos+1);
-                    }
-                    else {
-                        $prefix = '('.$folder.')';
-                        $folder = '';
-                    }
 
+                    // get username part and map it to user name
+                    $pos = strpos($folder, $delim);
+                    $fid = $pos ? substr($folder, 0, $pos) : $folder;
+                    $fid = self::folder_id2user($fid, true);
+                    $fid = str_replace($delim, '', $fid);
+
+                    $prefix = "($fid)";
+                    $folder = $pos ? substr($folder, $pos + 1) : '';
                     $found  = true;
                     $folder_ns = 'other';
                     break;
@@ -729,7 +725,6 @@
         return $name;
     }
 
-
     /**
      * Creates a SELECT field with folders list
      *
@@ -812,7 +807,6 @@
         return $select;
     }
 
-
     /**
      * Returns a list of folder names
      *
@@ -976,7 +970,6 @@
         return $folders;
     }
 
-
     /**
      * Sort the given list of kolab folders by namespace/name
      *
@@ -1006,7 +999,6 @@
         return $out;
     }
 
-
     /**
      * Check the folder tree and add the missing parents as virtual folders
      *
@@ -1082,7 +1074,6 @@
         return $_folders;
     }
 
-
     /**
      * Returns folder types indexed by folder name
      *
@@ -1149,7 +1140,6 @@
         return self::$typedata$prefix;
     }
 
-
     /**
      * Callback for array_map to select the correct annotation value
      */
@@ -1165,7 +1155,6 @@
         return null;
     }
 
-
     /**
      * Returns type of IMAP folder
      *
@@ -1197,7 +1186,6 @@
         return 'mail';
     }
 
-
     /**
      * Sets folder content-type.
      *
@@ -1220,7 +1208,6 @@
         return $success;
     }
 
-
     /**
      * Check subscription status of this folder
      *
@@ -1242,7 +1229,6 @@
             ($temp && in_array($folder, (array)$_SESSION'kolab_subscribed_folders'));
     }
 
-
     /**
      * Change subscription status of this folder
      *
@@ -1273,7 +1259,6 @@
         return false;
     }
 
-
     /**
      * Change subscription status of this folder
      *
@@ -1301,7 +1286,6 @@
         return false;
     }
 
-
     /**
      * Check activation status of this folder
      *
@@ -1316,7 +1300,6 @@
         return in_array($folder, $active_folders);
     }
 
-
     /**
      * Change activation status of this folder
      *
@@ -1331,7 +1314,6 @@
         return self::set_state($folder, true);
     }
 
-
     /**
      * Change activation status of this folder
      *
@@ -1347,7 +1329,6 @@
         return self::set_state($folder, false);
     }
 
-
     /**
      * Return list of active folders
      */
@@ -1379,7 +1360,6 @@
         return self::$states;
     }

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/lib/kolab_storage_cache.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/lib/kolab_storage_cache.php Changed

@@ -46,8 +46,8 @@
     protected $folders_table;
     protected $max_sql_packet;
     protected $max_sync_lock_time = 600;
-    protected $binary_items = array();
     protected $extra_cols = array();
+    protected $data_props = array();
     protected $order_by = null;
     protected $limit = null;
     protected $error = 0;
@@ -201,7 +201,7 @@
                   $this->metadata'changed' < date(self::DB_DATE_FORMAT, time() - $this->cache_refresh) ||
                   $this->metadata'ctag' != $this->folder->get_ctag() ||
                   intval($this->metadata'objectcount') !== $this->count()
-                ) {
+            ) {
                 // lock synchronization for this folder or wait if locked
                 $this->_sync_lock();
 
@@ -242,7 +242,9 @@
                     // fetch new objects from imap
                     $i = 0;
                     foreach (array_diff($imap_index, $old_index) as $msguid) {
-                        if ($object = $this->folder->read_object($msguid, '*')) {
+                        // Note: We'll store only objects matching the folder type
+                        // anything else will be silently ignored
+                        if ($object = $this->folder->read_object($msguid)) {
                             // Deduplication: remove older objects with the same UID
                             // Here we do not resolve conflicts, we just make sure
                             // the most recent version of the object will be used
@@ -447,7 +449,7 @@
             $sql_data'uid'       = $object'uid';
 
             $args = array();
-            $cols = array('folder_id', 'msguid', 'uid', 'changed', 'data', 'xml', 'tags', 'words');
+            $cols = array('folder_id', 'msguid', 'uid', 'changed', 'data', 'tags', 'words');
             $cols = array_merge($cols, $this->extra_cols);
 
             foreach ($cols as $idx => $col) {
@@ -585,9 +587,12 @@
      * @param array Pseudo-SQL query as list of filter parameter triplets
      *   triplet: array('<colname>', '<comparator>', '<value>')
      * @param boolean Set true to only return UIDs instead of complete objects
+     * @param boolean Use fast mode to fetch only minimal set of information
+     *                (no xml fetching and parsing, etc.)
+     *
      * @return array List of Kolab data objects (each represented as hash array) or UIDs
      */
-    public function select($query = array(), $uids = false)
+    public function select($query = array(), $uids = false, $fast = false)
     {
         $result = $uids ? array() : new kolab_storage_dataset($this);
 
@@ -621,6 +626,9 @@
             }
 
             while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+                if ($fast) {
+                    $sql_arr'fast-mode' = true;
+                }
                 if ($uids) {
                     $this->uid2msg$sql_arr'uid' = $sql_arr'_msguid';
                     $result = $sql_arr'uid';
@@ -679,7 +687,6 @@
         return $result;
     }
 
-
     /**
      * Get number of objects mathing the given query
      *
@@ -851,43 +858,36 @@
      */
     protected function _serialize($object)
     {
-        $sql_data = array('changed' => null, 'xml' => '', 'tags' => '', 'words' => '');
+        $data     = array();
+        $sql_data = array('changed' => null, 'tags' => '', 'words' => '');
 
         if ($object'changed') {
             $sql_data'changed' = date(self::DB_DATE_FORMAT, is_object($object'changed') ? $object'changed'->format('U') : $object'changed');
         }
 
         if ($object'_formatobj') {
-            $sql_data'xml'   = preg_replace('!(</?a-z0-9:-+>)\n\r\t\s+!ms', '$1', (string)$object'_formatobj'->write(3.0));
+            $xml = (string) $object'_formatobj'->write(3.0);
+
+            $data'_size'     = strlen($xml);
             $sql_data'tags'  = ' ' . join(' ', $object'_formatobj'->get_tags()) . ' ';  // pad with spaces for strict/prefix search
             $sql_data'words' = ' ' . join(' ', $object'_formatobj'->get_words()) . ' ';
         }
 
-        // extract object data
-        $data = array();
-        foreach ($object as $key => $val) {
-            // skip empty properties
-            if ($val === "" || $val === null) {
-                continue;
-            }
-            // mark binary data to be extracted from xml on unserialize()
-            if (isset($this->binary_items$key)) {
-                $data$key = true;
-            }
-            else if ($key0 != '_') {
-                $data$key = $val;
-            }
-            else if ($key == '_attachments') {
-                foreach ($val as $k => $att) {
-                    unset($att'content', $att'path');
-                    if ($att'id')
-                        $data$key$k = $att;
+        // Store only minimal set of object properties
+        foreach ($this->data_props as $prop) {
+            if (isset($object$prop)) {
+                $data$prop = $object$prop;
+                if ($data$prop instanceof DateTime) {
+                    $data$prop = array(
+                        'cl' => 'DateTime',
+                        'dt' => $data$prop->format('Y-m-d H:i:s'),
+                        'tz' => $data$prop->getTimezone()->getName(),
+                    );
                 }
             }
         }
 
-        // use base64 encoding (Bug #1912, #2662)
-        $sql_data'data' = base64_encode(serialize($data));
+        $sql_data'data' = json_encode(rcube_charset::clean($data));
 
         return $sql_data;
     }
@@ -897,44 +897,38 @@
      */
     protected function _unserialize($sql_arr)
     {
-        // check if data is a base64-encoded string, for backward compat.
-        if (strpos(substr($sql_arr'data', 0, 64), ':') === false) {
-            $sql_arr'data' = base64_decode($sql_arr'data');
-        }
-
-        $object = unserialize($sql_arr'data');
-
-        // de-serialization failed
-        if ($object === false) {
-            rcube::raise_error(array(
-                'code' => 900, 'type' => 'php',
-                'message' => "Malformed data for {$this->resource_uri}/{$sql_arr'msguid'} object."
-            ), true);
-
-            return null;
-        }
+        if ($sql_arr'fast-mode' && !empty($sql_arr'data') && ($object = json_decode($sql_arr'data', true))) {
+            $object'uid' = $sql_arr'uid';
 
-        // decode binary properties
-        foreach ($this->binary_items as $key => $regexp) {
-            if (!empty($object$key) && preg_match($regexp, $sql_arr'xml', $m)) {
-                $object$key = base64_decode($m1);
+            foreach ($this->data_props as $prop) {
+                if (isset($object$prop) && is_array($object$prop) && $object$prop'cl' == 'DateTime') {
+                    $object$prop = new DateTime($object$prop'dt', new DateTimeZone($object$prop'tz'));
+                }
+                else if (!isset($object$prop) && isset($sql_arr$prop)) {
+                    $object$prop = $sql_arr$prop;
+                }
             }
-        }
 
-        $object_type = $sql_arr'type' ?: $this->folder->type;
-        $format_type = $this->folder->type == 'configuration' ? 'configuration' : $object_type;
+            if ($sql_arr'created' && empty($object'created')) {
+                $object'created' = new DateTime($sql_arr'created');
+            }
 
-        // add meta data
-        $object'_type'      = $object_type;
-        $object'_msguid'    = $sql_arr'msguid';
-        $object'_mailbox'   = $this->folder->name;
-        $object'_size'      = strlen($sql_arr'xml');
-        $object'_formatobj' = kolab_format::factory($format_type, 3.0, $sql_arr'xml');
+            if ($sql_arr'changed' && empty($object'changed')) {
+                $object'changed' = new DateTime($sql_arr'changed');
+            }
 
-        // Fix old broken objects with missing creation date
-        if (empty($object'created') && method_exists($object'_formatobj', 'to_array')) {
-            $new_object        = $object'_formatobj'->to_array();
-            $object'created' = $new_object'created';
+            $object'_type'     = $sql_arr'type' ?: $this->folder->type;
+            $object'_msguid'   = $sql_arr'msguid';
+            $object'_mailbox'  = $this->folder->name;
+        }
+        // Fetch object xml
+        else {
+            // FIXME: Because old cache solution allowed storing objects that
+            // do not match folder type we may end up with invalid objects.
+            // 2nd argument of read_object() here makes sure they are still
+            // usable. However, not allowing them here might be also an intended
+            // solution in future.
+            $object = $this->folder->read_object($sql_arr'msguid', '*');

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/lib/kolab_storage_cache_configuration.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/lib/kolab_storage_cache_configuration.php Changed

@@ -32,6 +32,8 @@
      */
     protected function _serialize($object)
     {
+        $this->set_data_props($object'type');
+
         $sql_data = parent::_serialize($object);
         $sql_data'type' = $object'type';
 
@@ -39,13 +41,28 @@
     }
 
     /**
+     * Helper method to convert database record to the given Kolab object
+     *
+     * @override
+     */
+    protected function _unserialize($sql_arr)
+    {
+        $this->set_data_props($sql_arr'type');
+
+        return parent::_unserialize($sql_arr);
+    }
+
+    /**
      * Select Kolab objects filtered by the given query
      *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
+     * @param array   Pseudo-SQL query as list of filter parameter triplets
      * @param boolean Set true to only return UIDs instead of complete objects
+     * @param boolean Use fast mode to fetch only minimal set of information
+     *                (no xml fetching and parsing, etc.)
+     *
      * @return array List of Kolab data objects (each represented as hash array) or UIDs
      */
-    public function select($query = array(), $uids = false)
+    public function select($query = array(), $uids = false, $fast = false)
     {
         // modify query for IMAP search: query param 'type' is actually a subtype
         if (!$this->ready) {
@@ -57,7 +74,7 @@
             }
         }
 
-        return parent::select($query, $uids);
+        return parent::select($query, $uids, $fast);
     }
 
     /**
@@ -85,4 +102,35 @@
 
         return parent::_sql_where($query);
     }
+
+    /**
+     * Set $data_props property depending on object type
+     */
+    protected function set_data_props($type)
+    {
+        switch ($type) {
+        case 'dictionary':
+            $this->data_props = array('language', 'e');
+            break;
+
+        case 'file_driver':
+            $this->data_props = array('driver', 'title', 'enabled', 'host', 'port', 'username', 'password');
+            break;
+
+        case 'relation':
+            // Note: Because relations are heavily used, for performance reasons
+            // we store all properties for them
+            $this->data_props = array('name', 'category', 'color', 'parent', 'iconName', 'priority', 'members');
+            break;
+
+        case 'snippet':
+            $this->data_props = array('name');
+            break;
+
+        case 'category':
+        default:
+            // TODO: implement this
+            $this->data_props = array();
+        }
+    }
 }

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/lib/kolab_storage_cache_contact.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/lib/kolab_storage_cache_contact.php Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/lib/kolab_storage_cache_event.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/lib/kolab_storage_cache_event.php Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/lib/kolab_storage_cache_file.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/lib/kolab_storage_cache_file.php Changed

@@ -24,6 +24,7 @@
 class kolab_storage_cache_file extends kolab_storage_cache
 {
     protected $extra_cols = array('filename');
+    protected $data_props = array('type', 'size', 'filename', 'fileid');
 
     /**
      * Helper method to convert the given Kolab object into a dataset to be written to cache
@@ -32,13 +33,45 @@
      */
     protected function _serialize($object)
     {
-        $sql_data = parent::_serialize($object);
-
         if (!empty($object'_attachments')) {
             reset($object'_attachments');
-            $sql_data'filename' = $object'_attachments'key($object'_attachments')'name';
+
+            $file = $object'_attachments'key($object'_attachments');
+
+            $object'type'   = $file'mimetype';
+            $object'size'   = $file'size';
+            $object'fileid' = $file'id';
+        }
+
+        $sql_data = parent::_serialize($object);
+
+        if (!empty($file)) {
+            $sql_data'filename' = $file'name';
         }
 
         return $sql_data;
     }
-}
\ No newline at end of file
+
+    /**
+     * Helper method to turn stored cache data into a valid storage object
+     *
+     * @override
+     */
+    protected function _unserialize($sql_arr)
+    {
+        $object = parent::_unserialize($sql_arr);
+
+        if ($object && $sql_arr'fast-mode') {
+            if (!empty($object'_attachments')) {
+                $file = $object'_attachments'key($object'_attachments');
+
+                $object'type'     = $file'mimetype';
+                $object'size'     = $file'size';
+                $object'fileid'   = $file'id';
+                $object'filename' = $file'name';
+            }
+        }
+
+        return $object;
+    }
+}

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/lib/kolab_storage_cache_journal.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/lib/kolab_storage_cache_journal.php Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/lib/kolab_storage_cache_note.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/lib/kolab_storage_cache_note.php Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/lib/kolab_storage_cache_task.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/lib/kolab_storage_cache_task.php Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/lib/kolab_storage_config.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/lib/kolab_storage_config.php Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/lib/kolab_storage_folder.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/lib/kolab_storage_folder.php Changed

@@ -281,12 +281,14 @@
     /**
      * Select Kolab objects matching the given query
      *
-     * @param mixed Pseudo-SQL query as list of filter parameter triplets
-     *    or string with object type (e.g. contact, event, todo, journal, note, configuration)
+     * @param mixed   Pseudo-SQL query as list of filter parameter triplets
+     *                or string with object type (e.g. contact, event, todo, journal, note, configuration)
+     * @param boolean Use fast mode to fetch only minimal set of information
+     *                (no xml fetching and parsing, etc.)
      *
      * @return array List of Kolab data objects (each represented as hash array)
      */
-    public function select($query = array())
+    public function select($query = array(), $fast = false)
     {
         if (!$this->valid) {
             return array();
@@ -296,7 +298,7 @@
         $this->cache->synchronize();
 
         // fetch objects from cache
-        return $this->cache->select($this->_prepare_query($query));
+        return $this->cache->select($this->_prepare_query($query), false, $fast);
     }
 
     /**
@@ -419,6 +421,8 @@
             }
             else {
                 // return message part from IMAP directly
+                // TODO: We could improve performance if we cache part's encoding
+                //       without 3rd argument get_message_part() will request BODYSTRUCTURE from IMAP
                 return $this->imap->get_message_part($msguid, $part, null, $print, $fp, $skip_charset_conv);
             }
         }
@@ -486,8 +490,9 @@
         $content_type = kolab_format::KTYPE_PREFIX . $object_type;
 
         // check object type header and abort on mismatch
-        if ($type != '*' && $object_type != $type)
+        if ($type != '*' && strpos($object_type, $type) !== 0 && !($object_type == 'distribution-list' && $type == 'contact')) {
             return false;
+        }
 
         $attachments = array();
 
@@ -557,6 +562,7 @@
             $object'_msguid'    = $msguid;
             $object'_mailbox'   = $this->name;
             $object'_formatobj' = $format;
+            $object'_size'      = strlen($xml);
 
             return $object;
         }

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/lib/kolab_storage_folder_user.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/lib/kolab_storage_folder_user.php Changed

@@ -23,8 +23,6 @@
  */
 class kolab_storage_folder_user extends kolab_storage_folder_virtual
 {
-    protected static $ldapcache = array();
-
     public $ldaprec;
     public $type;
 
@@ -36,21 +34,13 @@
         parent::__construct($name, kolab_storage::object_prettyname($name), 'other', $parent);
 
         if (!empty($ldaprec)) {
-            self::$ldapcache$name = $this->ldaprec = $ldaprec;
-        }
-        // use value cached in memory for repeated lookups
-        else if (array_key_exists($name, self::$ldapcache)) {
-            $this->ldaprec = self::$ldapcache$name;
+            $this->ldaprec = $ldaprec;
         }
-        // lookup user in LDAP and set $this->ldaprec
-        else if ($ldap = kolab_storage::ldap()) {
-            // get domain from current user
-            list(,$domain) = explode('@', rcube::get_instance()->get_user_name());
-            $this->ldaprec = $ldap->get_user_record(parent::get_foldername($this->name) . '@' . $domain, $_SESSION'imap_host');
+        else {
+            $this->ldaprec = kolab_storage::folder_id2user(parent::get_foldername($this->name));
             if (!empty($this->ldaprec)) {
                 $this->ldaprec'kolabtargetfolder' = $name;
             }
-            self::$ldapcache$name = $this->ldaprec;
         }
     }

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/libkolab.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/libkolab.php Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/skins/elastic/include/calendar.less -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/skins/elastic/include/calendar.less Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/skins/elastic/include/kolab_files.less -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/skins/elastic/include/kolab_files.less Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/skins/elastic/include/tasklist.less -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/skins/elastic/include/tasklist.less Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/libkolab/skins/elastic/libkolab.less -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/skins/elastic/libkolab.less Changed

@@ -51,15 +51,6 @@
                 position: relative;
                 flex-grow: 1;
 
-                &:after {
-                    color: #ccc;
-                    position: absolute;
-                    top: 0;
-                    right: 0;
-                    height: @listing-line-height !important;
-                    font-size: 1.1em !important;
-                }
-
                 & + input {
                     position: initial;
                 }
@@ -96,6 +87,13 @@
                         display: none;
                     }
                 }
+
+                html.touch & {
+                    margin-left: .2rem;
+                    a {
+                        margin-right: .5rem;
+                    }
+                }
             }
 
             a.quickview {
@@ -152,11 +150,25 @@
 
         & > div.readonly a:first-child,
         &.readonly:not(.virtual) > div a:first-child {
-            padding-right: 1.6em;
-
             &:after {
                 &:extend(.font-icon-class);
                 content: @fa-var-lock;
+                position: absolute;
+                left: 2.25rem;
+                top: @listing-line-height / 2;
+                font-size: .9em !important;
+                width: .9em;
+                line-height: 1;
+                height: 1em !important;
+                background-color: #fff;
+                border-radius: 50% 50% 0 0;
+                color: @color-font;
+                opacity: .9;
+
+                html.touch & {
+                    top: @listing-touch-line-height / 2;
+                    left: 2.7rem;
+                }
             }
         }
 
@@ -222,21 +234,51 @@
     }
 }
 
-html.touch .listing {
-    li {
-        & > div {
-            a:after {
-                height: @listing-touch-line-height !important;
+@treelist-readonly-icon-margin: 1.7em;
+.treelist {
+    ul {
+        li {
+            a:first-child:after {
+                margin-left: 1 * @treelist-readonly-icon-margin !important;
             }
-        }
 
-        .actions {
-            margin-left: .2rem;
-            a {
-                margin-right: .5rem;
+            li {
+                a:first-child:after {
+                    margin-left: 2 * @treelist-readonly-icon-margin !important;
+                }
+
+                li {
+                    a:first-child:after {
+                        margin-left: 3 * @treelist-readonly-icon-margin !important;
+                    }
+
+                    li {
+                        a:first-child:after {
+                            margin-left: 4 * @treelist-readonly-icon-margin !important;
+                        }
+
+                        li {
+                            a:first-child:after {
+                                margin-left: 5 * @treelist-readonly-icon-margin !important;
+                            }
+
+                            li {
+                                a:first-child:after {
+                                    margin-left: 6 * @treelist-readonly-icon-margin !important;
+                                }
+                            }
+                        }
+                    }
+                }
             }
         }
     }
+
+    &.notree {
+        li a:first-child:after {
+            left: 1.3rem !important;
+        }
+    }
 }
 
 .searchresults {
@@ -282,17 +324,6 @@
 .menu {
     li.search {
         padding: .25rem .5rem;
-        .input-group {
-
-            i.icon {
-                font-size: 80%;
-                padding: .5rem;
-            }
-
-            input {
-                font-size: 100%;
-            }
-        }
     }
 
     a.history:before {
@@ -459,6 +490,15 @@
         position: relative; // for absolute positioning of searchbar
         overflow: hidden;
         white-space: nowrap;
+
+        a.button {
+            color: @color-toolbar-button;
+            margin: 0 .3rem;
+
+            &:before {
+                margin: 0;
+            }
+        }
     }
 
     .header-title {
@@ -502,15 +542,16 @@
             padding: 0 !important;
         }
 
-        .selection-list {
-            border: 0;
-        }
-
         .ui-dialog-titlebar {
             display: none;
             margin: 0;
         }
 
+        .selection-list {
+            border: 0;
+        }
+
+        .selection-list,
         .selection-content {
             .header-title {
                 margin-left: 0;

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/loginfail/LICENSE Added

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/loginfail/composer.json Added

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/loginfail/loginfail.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/loginfail/loginfail.php Changed

@@ -1,20 +1,23 @@
 <?php
-    class loginfail extends rcube_plugin {
-        public $task = 'login';
 
-        function init() {
-            $this->add_hook('login_failed', array($this, 'login_failed'));
-        }
+class loginfail extends rcube_plugin
+{
+    public $task = 'login';
+
+    function init()
+    {
+        $this->add_hook('login_failed', array($this, 'login_failed'));
+    }
 
-        public function login_failed($args) {
-            $rcmail = rcmail::get_instance();
+    public function login_failed($args)
+    {
+        $rcmail = rcmail::get_instance();
 
-            $filename = $this->home . '/loginfail.html';
+        $filename = $this->home . '/loginfail.html';
 
-            if (file_exists($filename)) {
-                $html = file_get_contents($filename);
-                $rcmail->output->add_footer($html);
-            }
+        if (file_exists($filename)) {
+            $html = file_get_contents($filename);
+            $rcmail->output->add_footer($html);
         }
     }
-?>
+}

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/tasklist/composer.json -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/tasklist/composer.json Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php Changed

roundcubemail-plugins-kolab-3.4.6.tar.gz/plugins/tasklist/tasklist.php -> roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/tasklist/tasklist.php Changed

roundcubemail-plugins-kolab.dsc Changed

Changes of Revision 62