Kolab Groupware OBS

roundcubemail-plugins-kolab.spec Changed

@@ -41,7 +41,7 @@
 %global dash_rel_suffix %{?rc_rel_suffix:-%{rc_rel_suffix}}
 
 Name:           roundcubemail-plugins-kolab
-Version:        3.5.0
+Version:        3.5.1
 
 Release:        1%{?dot_rel_suffix}%{?dist}
 
@@ -62,7 +62,6 @@
 Source104:      plesk.libkolab.inc.php
 
 Patch0000:      roundcubemail-plugins-kolab-3.4-kolab-files-manticore-api.patch
-Patch0001:      0001-Fix-setting-fileid-on-file-objects-Bifrost-T227815.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
@@ -1407,7 +1406,6 @@
 %endif
 
 %patch0000 -p1
-%patch0001 -p1
 
 find -type d -name "helpdocs" -exec rm -rvf {} \; 2>/dev/null || :
 
@@ -2794,6 +2792,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Oct  7 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.5.1-1
+- Release of version 3.5.1
+
 * Fri Aug 16 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.5.0-2
 - Fix setting 'fileid' on file objects (Bifrost#T227815)

0001-Fix-setting-fileid-on-file-objects-Bifrost-T227815.patch Deleted

@@ -1,37 +0,0 @@
-From 6ba98384670aafbe0895b81aea7bb9bf32d7ced1 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <machniak@kolabsys.com>
-Date: Mon, 15 Jul 2019 11:21:30 +0000
-Subject: [PATCH 1/3] Fix setting 'fileid' on file objects (Bifrost#T227815)
-
----
- plugins/libkolab/lib/kolab_storage_cache_file.php | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/plugins/libkolab/lib/kolab_storage_cache_file.php b/plugins/libkolab/lib/kolab_storage_cache_file.php
-index 1f3d4d92..b62c0f7a 100644
---- a/plugins/libkolab/lib/kolab_storage_cache_file.php
-+++ b/plugins/libkolab/lib/kolab_storage_cache_file.php
-@@ -61,15 +61,12 @@ class kolab_storage_cache_file extends kolab_storage_cache
-     {
-         $object = parent::_unserialize($sql_arr);
- 
--        if ($object && $sql_arr['fast-mode']) {
--            if (!empty($object['_attachments'])) {
--                $file = $object['_attachments'][key($object['_attachments'])];
-+        if ($object && !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'];
--            }
-+            $object['type']   = $file['mimetype'];
-+            $object['size']   = $file['size'];
-+            $object['fileid'] = $file['id'];
-         }
- 
-         return $object;
--- 
-2.21.0
-

debian.changelog Changed

debian.series Changed

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_auth/kolab_auth_ldap.php Deleted

@@ -1,480 +0,0 @@
-<?php
-
-/**
- * Kolab Authentication
- *
- * @version @package_version@
- * @author Aleksander Machniak <machniak@kolabsys.com>
- *
- * Copyright (C) 2011-2013, 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/>.
- */
-
-/**
- * Wrapper class for rcube_ldap_generic
- */
-class kolab_auth_ldap extends rcube_ldap_generic
-{
-    private $conf     = array();
-    private $fieldmap = array();
-
-
-    function __construct($p)
-    {
-        $rcmail = rcube::get_instance();
-
-        $this->conf = $p;
-        $this->conf['kolab_auth_user_displayname'] = $rcmail->config->get('kolab_auth_user_displayname', '{name}');
-
-        $this->fieldmap = $p['fieldmap'];
-        $this->fieldmap['uid'] = 'uid';
-
-        $p['attributes'] = array_values($this->fieldmap);
-        $p['debug']      = (bool) $rcmail->config->get('ldap_debug');
-
-        // Connect to the server (with bind)
-        parent::__construct($p);
-        $this->_connect();
-
-        $rcmail->add_shutdown_function(array($this, 'close'));
-    }
-
-    /**
-    * Establish a connection to the LDAP server
-    */
-    private function _connect()
-    {
-        // try to connect + bind for every host configured
-        // with OpenLDAP 2.x ldap_connect() always succeeds but ldap_bind will fail if host isn't reachable
-        // see http://www.php.net/manual/en/function.ldap-connect.php
-        foreach ((array)$this->config['hosts'] as $host) {
-            // skip host if connection failed
-            if (!$this->connect($host)) {
-                continue;
-            }
-
-            $bind_pass = $this->config['bind_pass'];
-            $bind_user = $this->config['bind_user'];
-            $bind_dn   = $this->config['bind_dn'];
-
-            if (empty($bind_pass)) {
-                $this->ready = true;
-            }
-            else {
-                if (!empty($bind_dn)) {
-                    $this->ready = $this->bind($bind_dn, $bind_pass);
-                }
-                else if (!empty($this->config['auth_cid'])) {
-                    $this->ready = $this->sasl_bind($this->config['auth_cid'], $bind_pass, $bind_user);
-                }
-                else {
-                    $this->ready = $this->sasl_bind($bind_user, $bind_pass);
-                }
-            }
-
-            // connection established, we're done here
-            if ($this->ready) {
-                break;
-            }
-
-        }  // end foreach hosts
-
-        if (!is_resource($this->conn)) {
-            rcube::raise_error(array('code' => 100, 'type' => 'ldap',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Could not connect to any LDAP server, last tried $host"), true);
-
-            $this->ready = false;
-        }
-
-        return $this->ready;
-    }
-
-    /**
-     * Fetches user data from LDAP addressbook
-     */
-    function get_user_record($user, $host)
-    {
-        $rcmail  = rcube::get_instance();
-        $filter  = $rcmail->config->get('kolab_auth_filter');
-        $filter  = $this->parse_vars($filter, $user, $host);
-        $base_dn = $this->parse_vars($this->config['base_dn'], $user, $host);
-        $scope   = $this->config['scope'];
-
-        // @TODO: print error if filter is empty
-
-        // get record
-        if ($result = parent::search($base_dn, $filter, $scope, $this->attributes)) {
-            if ($result->count() == 1) {
-                $entries = $result->entries(true);
-                $dn      = key($entries);
-                $entry   = array_pop($entries);
-                $entry   = $this->field_mapping($dn, $entry);
-
-                return $entry;
-            }
-        }
-    }
-
-    /**
-     * Fetches user data from LDAP addressbook
-     */
-    function get_user_groups($dn, $user, $host)
-    {
-        if (empty($dn) || empty($this->config['groups'])) {
-            return array();
-        }
-
-        $base_dn     = $this->parse_vars($this->config['groups']['base_dn'], $user, $host);
-        $name_attr   = $this->config['groups']['name_attr'] ? $this->config['groups']['name_attr'] : 'cn';
-        $member_attr = $this->get_group_member_attr();
-        $filter      = "(member=$dn)(uniqueMember=$dn)";
-
-        if ($member_attr != 'member' && $member_attr != 'uniqueMember')
-            $filter .= "($member_attr=$dn)";
-        $filter = strtr("(|$filter)", array("\\" => "\\\\"));
-
-        $result = parent::search($base_dn, $filter, 'sub', array('dn', $name_attr));
-
-        if (!$result) {
-            return array();
-        }
-
-        $groups = array();
-        foreach ($result as $entry) {
-            $dn    = $entry['dn'];
-            $entry = rcube_ldap_generic::normalize_entry($entry);
-
-            $groups[$dn] = $entry[$name_attr];
-        }
-
-        return $groups;
-    }
-
-    /**
-     * Get a specific LDAP record
-     *
-     * @param string DN
-     *
-     * @return array Record data
-     */
-    function get_record($dn)
-    {
-        if (!$this->ready) {
-            return;
-        }
-
-        if ($rec = $this->get_entry($dn, $this->attributes)) {
-            $rec = rcube_ldap_generic::normalize_entry($rec);
-            $rec = $this->field_mapping($dn, $rec);
-        }
-
-        return $rec;
-    }
-
-    /**
-     * Replace LDAP record data items
-     *
-     * @param string $dn    DN
-     * @param array  $entry LDAP entry
-     *
-     * return bool True on success, False on failure
-     */
-    function replace($dn, $entry)
-    {
-        // fields mapping
-        foreach ($this->fieldmap as $field => $attr) {
-            if (array_key_exists($field, $entry)) {

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libcalendaring/tests/resources/invalid-event.ics Deleted

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/calendar/README -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/calendar/README Changed

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/calendar/calendar.php -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/calendar/calendar.php Changed

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

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/calendar/drivers/calendar_driver.php -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/calendar/drivers/calendar_driver.php Changed

@@ -592,14 +592,16 @@
    */
   public function calendar_form($action, $calendar, $formfields)
   {
-    $html = '';
-    foreach ($formfields as $field) {
-      $html .= html::div('form-section',
-        html::label($field['id'], $field['label']) .
-        $field['value']);
+    $table = new html_table(array('cols' => 2, 'class' => 'propform'));
+
+    foreach ($formfields as $col => $colprop) {
+      $label = !empty($colprop['label']) ? $colprop['label'] : $rcmail->gettext("$domain.$col");
+
+      $table->add('title', html::label($colprop['id'], rcube::Q($label)));
+      $table->add(null, $colprop['value']);
     }
 
-    return $html;
+    return $table->show();
   }
 
   /**
@@ -729,7 +731,7 @@
 
     $rcmail = rcmail::get_instance();
 
-    if ($source && $contact_id && ($abook = $rcmail->get_address_book($source))) {
+    if (strlen($source) && $contact_id && ($abook = $rcmail->get_address_book($source))) {
       if ($contact = $abook->get_record($contact_id, true)) {
         return self::parse_contact($contact, $source);
       }

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/calendar/drivers/database/database_driver.php -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/calendar/drivers/database/database_driver.php Changed

@@ -26,1471 +26,1504 @@
 
 class database_driver extends calendar_driver
 {
-  const DB_DATE_FORMAT = 'Y-m-d H:i:s';
-
-  public static $scheduling_properties = array('start', 'end', 'allday', 'recurrence', 'location', 'cancelled');
-
-  // features this backend supports
-  public $alarms = true;
-  public $attendees = true;
-  public $freebusy = false;
-  public $attachments = true;
-  public $alarm_types = array('DISPLAY');
-
-  private $rc;
-  private $cal;
-  private $cache = array();
-  private $calendars = array();
-  private $calendar_ids = '';
-  private $free_busy_map = array('free' => 0, 'busy' => 1, 'out-of-office' => 2, 'outofoffice' => 2, 'tentative' => 3);
-  private $sensitivity_map = array('public' => 0, 'private' => 1, 'confidential' => 2);
-  private $server_timezone;
-  
-  private $db_events = 'events';
-  private $db_calendars = 'calendars';
-  private $db_attachments = 'attachments';
-
-
-  /**
-   * Default constructor
-   */
-  public function __construct($cal)
-  {
-    $this->cal = $cal;
-    $this->rc = $cal->rc;
-    $this->server_timezone = new DateTimeZone(date_default_timezone_get());
-    
-    // read database config
-    $db = $this->rc->get_dbh();
-    $this->db_events = $this->rc->config->get('db_table_events', $db->table_name($this->db_events));
-    $this->db_calendars = $this->rc->config->get('db_table_calendars', $db->table_name($this->db_calendars));
-    $this->db_attachments = $this->rc->config->get('db_table_attachments', $db->table_name($this->db_attachments));
-    
-    $this->_read_calendars();
-  }
-
-  /**
-   * Read available calendars for the current user and store them internally
-   */
-  private function _read_calendars()
-  {
-    $hidden = array_filter(explode(',', $this->rc->config->get('hidden_calendars', '')));
-    
-    if (!empty($this->rc->user->ID)) {
-      $calendar_ids = array();
-      $result = $this->rc->db->query(
-        "SELECT *, calendar_id AS id FROM " . $this->db_calendars . "
-         WHERE user_id=?
-         ORDER BY name",
-         $this->rc->user->ID
-      );
-      while ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
-        $arr['showalarms'] = intval($arr['showalarms']);
-        $arr['active']     = !in_array($arr['id'], $hidden);
-        $arr['name']       = html::quote($arr['name']);
-        $arr['listname']   = html::quote($arr['name']);
-        $arr['rights']     = 'lrswikxteav';
-        $arr['editable']  = true;
-        $this->calendars[$arr['calendar_id']] = $arr;
-        $calendar_ids[] = $this->rc->db->quote($arr['calendar_id']);
-      }
-      $this->calendar_ids = join(',', $calendar_ids);
-    }
-  }
-
-  /**
-   * Get a list of available calendars from this source
-   *
-   * @param integer Bitmask defining filter criterias
-   *
-   * @return array List of calendars
-   */
-  public function list_calendars($filter = 0)
-  {
-    // attempt to create a default calendar for this user
-    if (empty($this->calendars)) {
-      if ($this->create_calendar(array('name' => 'Default', 'color' => 'cc0000', 'showalarms' => true)))
+    const DB_DATE_FORMAT = 'Y-m-d H:i:s';
+
+    public static $scheduling_properties = array('start', 'end', 'allday', 'recurrence', 'location', 'cancelled');
+
+    // features this backend supports
+    public $alarms      = true;
+    public $attendees   = true;
+    public $freebusy    = false;
+    public $attachments = true;
+    public $alarm_types = array('DISPLAY');
+
+    private $rc;
+    private $cal;
+    private $cache           = array();
+    private $calendars       = array();
+    private $calendar_ids    = '';
+    private $free_busy_map   = array('free' => 0, 'busy' => 1, 'out-of-office' => 2, 'outofoffice' => 2, 'tentative' => 3);
+    private $sensitivity_map = array('public' => 0, 'private' => 1, 'confidential' => 2);
+    private $server_timezone;
+
+    private $db_events      = 'events';
+    private $db_calendars   = 'calendars';
+    private $db_attachments = 'attachments';
+
+
+    /**
+     * Default constructor
+     */
+    public function __construct($cal)
+    {
+        $this->cal             = $cal;
+        $this->rc              = $cal->rc;
+        $this->server_timezone = new DateTimeZone(date_default_timezone_get());
+
+        // read database config
+        $db = $this->rc->get_dbh();
+        $this->db_events      = $db->table_name($this->rc->config->get('db_table_events', $this->db_events));
+        $this->db_calendars   = $db->table_name($this->rc->config->get('db_table_calendars', $this->db_calendars));
+        $this->db_attachments = $db->table_name($this->rc->config->get('db_table_attachments', $this->db_attachments));
+
         $this->_read_calendars();
     }
 
-    $calendars = $this->calendars;
+    /**
+     * Read available calendars for the current user and store them internally
+     */
+    private function _read_calendars()
+    {
+        $hidden = array_filter(explode(',', $this->rc->config->get('hidden_calendars', '')));
+
+        if (!empty($this->rc->user->ID)) {
+            $calendar_ids = array();
+            $result = $this->rc->db->query(
+                "SELECT *, `calendar_id` AS id FROM `{$this->db_calendars}`"
+                . " WHERE `user_id` = ?"
+                . " ORDER BY `name`",
+                $this->rc->user->ID
+            );
+
+            while ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
+                $arr['showalarms'] = intval($arr['showalarms']);
+                $arr['active']     = !in_array($arr['id'], $hidden);
+                $arr['name']       = html::quote($arr['name']);
+                $arr['listname']   = html::quote($arr['name']);
+                $arr['rights']     = 'lrswikxteav';
+                $arr['editable']  = true;
+
+                $this->calendars[$arr['calendar_id']] = $arr;
+                $calendar_ids[] = $this->rc->db->quote($arr['calendar_id']);
+            }
+
+            $this->calendar_ids = join(',', $calendar_ids);
+        }
+    }
+
+    /**
+     * Get a list of available calendars from this source
+     *
+     * @param integer Bitmask defining filter criterias
+     *
+     * @return array List of calendars
+     */
+    public function list_calendars($filter = 0)
+    {
+        // attempt to create a default calendar for this user
+        if (empty($this->calendars)) {
+            if ($this->create_calendar(array('name' => 'Default', 'color' => 'cc0000', 'showalarms' => true))) {
+                $this->_read_calendars();
+            }
+        }
+
+        $calendars = $this->calendars;
+
+        // filter active calendars
+        if ($filter & self::FILTER_ACTIVE) {
+            foreach ($calendars as $idx => $cal) {
+                if (!$cal['active']) {
+                    unset($calendars[$idx]);
+                }
+            }
+        }
+
+        // 'personal' is unsupported in this driver
+
+        // append the virtual birthdays calendar
+        if ($this->rc->config->get('calendar_contact_birthdays', false)) {
+            $prefs  = $this->rc->config->get('birthday_calendar', array('color' => '87CEFA'));
+            $hidden = array_filter(explode(',', $this->rc->config->get('hidden_calendars', '')));
+            $id     = self::BIRTHDAY_CALENDAR_ID;
+
+            if (!$active || !in_array($id, $hidden)) {

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/calendar/drivers/kolab/kolab_calendar.php -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/calendar/drivers/kolab/kolab_calendar.php Changed

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_addressbook/composer.json -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/kolab_addressbook/composer.json Changed

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_addressbook/kolab_addressbook.php -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/kolab_addressbook/kolab_addressbook.php Changed

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_auth/composer.json -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/kolab_auth/composer.json Changed

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_auth/kolab_auth.php -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/kolab_auth/kolab_auth.php Changed

@@ -39,6 +39,7 @@
         $rcmail = rcube::get_instance();
 
         $this->load_config();
+        $this->require_plugin('libkolab');
 
         $this->add_hook('authenticate', array($this, 'authenticate'));
         $this->add_hook('startup', array($this, 'startup'));
@@ -796,28 +797,12 @@
      */
     public static function ldap()
     {
-        if (self::$ldap) {
-            return self::$ldap;
-        }
-
-        $rcmail      = rcube::get_instance();
-        $addressbook = $rcmail->config->get('kolab_auth_addressbook');
-
-        if (!is_array($addressbook)) {
-            $ldap_config = (array)$rcmail->config->get('ldap_public');
-            $addressbook = $ldap_config[$addressbook];
-        }
+        self::$ldap = kolab_storage::ldap('kolab_auth_addressbook');
 
-        if (empty($addressbook)) {
-            return null;
+        if (self::$ldap) {
+            self::$ldap->extend_fieldmap(array('uniqueid' => 'nsuniqueid'));
         }
 
-        $addressbook['fieldmap']['uniqueid'] = 'nsuniqueid';
-
-        require_once __DIR__ . '/kolab_auth_ldap.php';
-
-        self::$ldap = new kolab_auth_ldap($addressbook);
-
         return self::$ldap;
     }
 
@@ -834,7 +819,7 @@
 
     /**
      * Parses LDAP DN string with replacing supported variables.
-     * See kolab_auth_ldap::parse_vars()
+     * See kolab_ldap::parse_vars()
      *
      * @param string $str LDAP DN string
      *

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

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

@@ -79,7 +79,7 @@
 
         // add delegate to the list
         $list[] = $dn;
-        $list   = array_map(array('kolab_auth_ldap', 'dn_decode'), $list);
+        $list   = array_map(array('kolab_ldap', 'dn_decode'), $list);
 
         // update user record
         $result = $this->user_update_delegates($list);
@@ -149,7 +149,7 @@
         // remove delegate from the list
         unset($list[$dn]);
         $list = array_keys($list);
-        $list = array_map(array('kolab_auth_ldap', 'dn_decode'), $list);
+        $list = array_map(array('kolab_ldap', 'dn_decode'), $list);
         $user[$this->ldap_delegate_field] = $list;
 
         // update user record
@@ -181,7 +181,7 @@
             }
 
             // Get delegate
-            $user = $ldap->get_record(kolab_auth_ldap::dn_decode($dn));
+            $user = $ldap->get_record(kolab_ldap::dn_decode($dn));
 
             if (empty($user)) {
                 return array();
@@ -230,27 +230,9 @@
             return $this->ldap;
         }
 
-        if ($addressbook = $this->rc->config->get('kolab_delegation_addressbook')) {
-            if (!is_array($addressbook)) {
-                $ldap_config = (array) $this->rc->config->get('ldap_public');
-                $addressbook = $ldap_config[$addressbook];
-            }
-
-            if (!empty($addressbook)) {
-                require_once __DIR__ . '/../kolab_auth/kolab_auth_ldap.php';
-
-                $ldap = new kolab_auth_ldap($addressbook);
-            }
-        }
-
-        // Fallback to kolab_auth plugin's addressbook
-        if (!$ldap) {
-            $ldap = kolab_auth::ldap();
-        }
-
-        $this->ldap = $ldap;
+        $this->ldap = kolab_storage::ldap('kolab_delegation_addressbook');
 
-        if (!$ldap || !$ldap->ready) {
+        if (!$this->ldap || !$this->ldap->ready) {
             return null;
         }
 
@@ -270,10 +252,10 @@
         // Name of the LDAP field with organization name for identities
         $this->ldap_org_field = $this->rc->config->get('kolab_delegation_organization_field', $this->rc->config->get('kolab_auth_organization'));
 
-        $ldap->set_filter($this->ldap_filter);
-        $ldap->extend_fieldmap(array($this->ldap_delegate_field => $this->ldap_delegate_field));
+        $this->ldap->set_filter($this->ldap_filter);
+        $this->ldap->extend_fieldmap(array($this->ldap_delegate_field => $this->ldap_delegate_field));
 
-        return $ldap;
+        return $this->ldap;
     }
 
     /**
@@ -540,7 +522,7 @@
         }
 
         return array(
-            'ID'       => kolab_auth_ldap::dn_encode($dn),
+            'ID'       => kolab_ldap::dn_encode($dn),
             'uid'      => $uid,
             'name'     => $name,
             'realname' => $realname,

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

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

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_files/skins/elastic/templates/files.html -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/kolab_files/skins/elastic/templates/files.html Changed

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

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_notes/notes.js -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/kolab_notes/notes.js Changed

@@ -770,9 +770,13 @@
             is_html = false;
 
         // tag-edit line
+        var tagline = $('.tagline', titlecontainer);
         if (window.kolab_tags_input) {
-            $('.tagline', titlecontainer).parent('.form-group').show();
-            taglist = kolab_tags_input($('.tagline', titlecontainer), data.tags, readonly);
+            tagline.parent('.form-group').show();
+            taglist = kolab_tags_input(tagline, data.tags, readonly);
+        }
+        else {
+            tagline.parent('.form-group').hide();
         }
 
         $('.notetitle', titlecontainer).val(data.title).prop('disabled', readonly).show();
@@ -788,7 +792,7 @@
                     .addClass('message eml')
                     .append($('<a>')
                         .attr('href', link.mailurl)
-                        .addClass('messagelink')
+                        .addClass('messagelink filename')
                         .text(link.subject || link.uri)
                     )
                     .appendTo(attachmentslist);

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_notes/skins/elastic/templates/dialogview.html -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/kolab_notes/skins/elastic/templates/dialogview.html Changed

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/kolab_notes/skins/elastic/templates/notes.html -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/kolab_notes/skins/elastic/templates/notes.html Changed

@@ -26,7 +26,7 @@
 		<a class="button icon back-sidebar-button folders" href="#sidebar"><span class="inner"><roundcube:label name="kolab_notes.notebooks" /></span></a>
 		<span id="aria-label-noteslist" class="header-title"><roundcube:label name="kolab_notes.notes" /></span>
 		<div id="listcontrols" class="toolbar menu" role="toolbar">
-			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button settings active"
+			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button options active"
 				label="options" innerClass="inner" onclick="return kolab_notes_options_menu()" />
 		</div>
 		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
@@ -76,7 +76,7 @@
 			<roundcube:object name="plugin.detailview" id="notedetails" class="notedetails" />
 			<h3 id="aria-label-messagereferences" class="voice"><roundcube:label name="kolab_notes.arialabelmessagereferences" /></h3>
 			<div id="notereferences" class="notereferences" role="region" aria-labelledby="aria-label-messagereferences">
-				<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" />
+				<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist linkslist" />
 			</div>
 			<roundcube:container name="notedetailview" id="notedetailsbox" />
 		</div>

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

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libcalendaring/libcalendaring.js -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/libcalendaring/libcalendaring.js Changed

@@ -49,7 +49,7 @@
     this.datepicker_settings = {
         // translate from fullcalendar (MomentJS) format to datepicker format
         dateFormat: settings.date_format.replace(/M/g, 'm').replace(/mmmm/, 'MM').replace(/mmm/, 'M')
-            .replace(/dddd/, 'DD').replace(/ddd/, 'D').replace(/DD/, 'dd')
+            .replace(/dddd/, 'DD').replace(/ddd/, 'D').replace(/DD/, 'dd').replace(/D/, 'd')
             .replace(/Y/g, 'y').replace(/yyyy/, 'yy'),
         firstDay : settings.first_day,
         dayNamesMin: settings.days_short,
@@ -1106,7 +1106,7 @@
     // Render message reference links to the given container
     this.render_message_links = function(links, container, edit, plugin)
     {
-        var ul = $('<ul>').addClass('attachmentslist');
+        var ul = $('<ul>').addClass('attachmentslist linkslist');
 
         $.each(links, function(i, link) {
             if (!link.mailurl)
@@ -1115,7 +1115,7 @@
             var li = $('<li>').addClass('link')
                 .addClass('message eml')
                 .append($('<a>')
-                    .attr({href: link.mailurl, 'class': 'messagelink'})
+                    .attr({href: link.mailurl, 'class': 'messagelink filename'})
                     .text(link.subject || link.uri)
                 )
                 .appendTo(ul);
@@ -1242,8 +1242,7 @@
             '<input type="text" id="itip-delegate-to" class="text" size="40" value="" />' +
         '</div>' +
         '<div class="form-section form-group form-check">' +
-            '<label for="itip-delegate-rsvp">' + rcmail.gettext('itip.delegatersvpme') + '</label>' +
-            '<input type="checkbox" id="itip-delegate-rsvp" value="1" />' +
+            '<label><input type="checkbox" id="itip-delegate-rsvp" value="1" />' + rcmail.gettext('itip.delegatersvpme') + '</label>' +
         '</div>' +
         '<div class="form-section form-group">' +
             '<textarea id="itip-delegate-comment" class="itip-comment" cols="40" rows="8" placeholder="' +

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libcalendaring/libcalendaring.php -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/libcalendaring/libcalendaring.php Changed

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libcalendaring/libvcalendar.php -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/libcalendaring/libvcalendar.php Changed

@@ -1309,12 +1309,15 @@
      * @param string Timezone ID as used in PHP's Date functions
      * @param integer Unix timestamp with first date/time in this timezone
      * @param integer Unix timestap with last date/time in this timezone
+     * @param VObject\Component\VCalendar Optional VCalendar component
      *
      * @return mixed A Sabre\VObject\Component object representing a VTIMEZONE definition
      *               or false if no timezone information is available
      */
     public static function get_vtimezone($tzid, $from = 0, $to = 0, $cal = null)
     {
+        // TODO: Consider using tzurl.org database for better interoperability e.g. with Outlook
+
         if (!$from) $from = time();
         if (!$to)   $to = $from;
         if (!$cal)  $cal = new VObject\Component\VCalendar();
@@ -1338,6 +1341,17 @@
         $year = 86400 * 360;
         $transitions = $tz->getTransitions($from - $year, $to + $year);
 
+        // Make sure VTIMEZONE contains at least one STANDARD/DAYLIGHT component
+        // when there's only one transition in specified time period (T5626)
+        if (count($transitions) == 1) {
+            // Get more transitions and use OFFSET from the previous to last
+            $more_transitions = $tz->getTransitions(0, $to + $year);
+            if (count($more_transitions) > 1) {
+                $index  = count($more_transitions) - 2;
+                $tzfrom = $more_transitions[$index]['offset'] / 3600;
+            }
+        }
+
         $vt = $cal->createComponent('VTIMEZONE');
         $vt->TZID = $tz->getName();
 
@@ -1345,7 +1359,7 @@
         foreach ($transitions as $i => $trans) {
             $cmp = null;
 
-            if ($i == 0) {
+            if (!isset($tzfrom)) {
                 $tzfrom = $trans['offset'] / 3600;
                 continue;
             }

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libcalendaring/tests/libvcalendar.php -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/libcalendaring/tests/libvcalendar.php Changed

@@ -102,14 +102,6 @@
         $this->assertFalse(array_key_exists('changed', $event), "No changed date field");
     }
 
-    function test_invalid_vevent()
-    {
-        $this->setExpectedException('\Sabre\VObject\ParseException');
-
-        $ical = new libvcalendar();
-        $events = $ical->import_from_file(__DIR__ . '/resources/invalid-event.ics', 'UTF-8', true);
-    }
-
     /**
      * Test some extended ical properties such as attendees, recurrence rules, alarms and attachments
      */
@@ -589,6 +581,25 @@
         $this->assertInstanceOf('\Sabre\VObject\Component', $vtz);
         $this->assertContains('TZOFFSETFROM:+1245', $vtz->serialize());
         $this->assertContains('TZOFFSETTO:+1345', $vtz->serialize());
+
+        // Making sure VTIMEZOONE contains at least one STANDARD/DAYLIGHT component
+        // when there's only one transition in specified time period (T5626)
+        $vtz = libvcalendar::get_vtimezone('Europe/Istanbul', strtotime('2019-10-04T15:00:00'));
+
+        $this->assertInstanceOf('\Sabre\VObject\Component', $vtz);
+
+        $dst = $vtz->select('DAYLIGHT');
+        $std = $vtz->select('STANDARD');
+
+        $this->assertEmpty($dst);
+        $this->assertCount(1, $std);
+
+        $std = end($std);
+        $this->assertEquals('STANDARD', $std->name);
+        $this->assertEquals('20181009T150000', $std->DTSTART);
+        $this->assertEquals('+0300', $std->TZOFFSETFROM);
+        $this->assertEquals('+0300', $std->TZOFFSETTO);
+        $this->assertEquals('+03', $std->TZNAME);
     }
 
     function get_attachment_data($id, $event)
@@ -596,4 +607,3 @@
         return $this->attachment_data;
     }
 }
-

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/README -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/libkolab/README Changed

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

roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/libkolab/SQL/mysql/2019092900.sql Added

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

roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/libkolab/SQL/oracle/2019092900.sql Added

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

roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/libkolab/SQL/sqlite/2019092900.sql Added

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

roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/libkolab/lib/kolab_ldap.php Added

@@ -0,0 +1,611 @@
+<?php
+
+/**
+ * Kolab Authentication and User Base
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2011-2019, 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/>.
+ */
+
+/**
+ * Wrapper class for rcube_ldap_generic
+ */
+class kolab_ldap extends rcube_ldap_generic
+{
+    private $conf     = array();
+    private $fieldmap = array();
+    private $rcache;
+
+
+    function __construct($p)
+    {
+        $rcmail = rcube::get_instance();
+
+        $this->conf = $p;
+        $this->conf['kolab_auth_user_displayname'] = $rcmail->config->get('kolab_auth_user_displayname', '{name}');
+
+        $this->fieldmap = $p['fieldmap'];
+        $this->fieldmap['uid'] = 'uid';
+
+        $p['attributes'] = array_values($this->fieldmap);
+        $p['debug']      = (bool) $rcmail->config->get('ldap_debug');
+
+        if ($cache_type = $rcmail->config->get('ldap_cache', 'db')) {
+            $cache_ttl   = $rcmail->config->get('ldap_cache_ttl', '10m');
+            $this->cache = $rcmail->get_cache('LDAP.kolab_cache', $cache_type, $cache_ttl);
+        }
+
+        // Connect to the server (with bind)
+        parent::__construct($p);
+        $this->_connect();
+
+        $rcmail->add_shutdown_function(array($this, 'close'));
+    }
+
+    /**
+    * Establish a connection to the LDAP server
+    */
+    private function _connect()
+    {
+        // try to connect + bind for every host configured
+        // with OpenLDAP 2.x ldap_connect() always succeeds but ldap_bind will fail if host isn't reachable
+        // see http://www.php.net/manual/en/function.ldap-connect.php
+        foreach ((array)$this->config['hosts'] as $host) {
+            // skip host if connection failed
+            if (!$this->connect($host)) {
+                continue;
+            }
+
+            $bind_pass      = $this->config['bind_pass'];
+            $bind_user      = $this->config['bind_user'];
+            $bind_dn        = $this->config['bind_dn'];
+            $base_dn        = $this->config['base_dn'];
+            $groups_base_dn = $this->config['groups']['base_dn'] ?: $base_dn;
+
+            // User specific access, generate the proper values to use.
+            if ($this->config['user_specific']) {
+                $rcube = rcube::get_instance();
+
+                // No password set, use the session password
+                if (empty($bind_pass)) {
+                    $bind_pass = $rcube->get_user_password();
+                }
+
+                // Get the pieces needed for variable replacement.
+                if ($fu = ($rcube->get_user_email() ?: $this->config['username'])) {
+                    list($u, $d) = explode('@', $fu);
+                }
+                else {
+                    $d = $this->config['mail_domain'];
+                }
+
+                $dc = 'dc=' . strtr($d, array('.' => ',dc=')); // hierarchal domain string
+
+                // resolve $dc through LDAP
+                if (!empty($this->config['domain_filter']) && !empty($this->config['search_bind_dn'])) {
+                    $this->bind($this->config['search_bind_dn'], $this->config['search_bind_pw']);
+                    $dc = $this->domain_root_dn($d);
+                }
+
+                $replaces = array('%dn' => '', '%dc' => $dc, '%d' => $d, '%fu' => $fu, '%u' => $u);
+
+                // Search for the dn to use to authenticate
+                if ($this->config['search_base_dn'] && $this->config['search_filter']
+                    && (strstr($bind_dn, '%dn') || strstr($base_dn, '%dn') || strstr($groups_base_dn, '%dn'))
+                ) {
+                    $search_attribs = array('uid');
+                    if ($search_bind_attrib = (array) $this->config['search_bind_attrib']) {
+                        foreach ($search_bind_attrib as $r => $attr) {
+                            $search_attribs[] = $attr;
+                            $replaces[$r] = '';
+                        }
+                    }
+
+                    $search_bind_dn = strtr($this->config['search_bind_dn'], $replaces);
+                    $search_base_dn = strtr($this->config['search_base_dn'], $replaces);
+                    $search_filter  = strtr($this->config['search_filter'], $replaces);
+
+                    $cache_key = 'DN.' . md5("$host:$search_bind_dn:$search_base_dn:$search_filter:" . $this->config['search_bind_pw']);
+
+                    if ($this->cache && ($dn = $this->cache->get($cache_key))) {
+                        $replaces['%dn'] = $dn;
+                    }
+                    else {
+                        $ldap = $this;
+                        if (!empty($search_bind_dn) && !empty($this->config['search_bind_pw'])) {
+                            // To protect from "Critical extension is unavailable" error
+                            // we need to use a separate LDAP connection
+                            if (!empty($this->config['vlv'])) {
+                                $ldap = new rcube_ldap_generic($this->config);
+                                $ldap->config_set(array('cache' => $this->cache, 'debug' => $this->debug));
+                                if (!$ldap->connect($host)) {
+                                    continue;
+                                }
+                            }
+
+                            if (!$ldap->bind($search_bind_dn, $this->config['search_bind_pw'])) {
+                                continue;  // bind failed, try next host
+                            }
+                        }
+
+                        $res = $ldap->search($search_base_dn, $search_filter, 'sub', $search_attribs);
+                        if ($res) {
+                            $res->rewind();
+                            $replaces['%dn'] = key($res->entries(true));
+
+                            // add more replacements from 'search_bind_attrib' config
+                            if ($search_bind_attrib) {
+                                $res = $res->current();
+                                foreach ($search_bind_attrib as $r => $attr) {
+                                    $replaces[$r] = $res[$attr][0];
+                                }
+                            }
+                        }
+
+                        if ($ldap != $this) {
+                            $ldap->close();
+                        }
+                    }
+
+                    // DN not found
+                    if (empty($replaces['%dn'])) {
+                        if (!empty($this->config['search_dn_default']))
+                            $replaces['%dn'] = $this->config['search_dn_default'];
+                        else {
+                            rcube::raise_error(array(
+                                'code' => 100, 'type' => 'ldap',
+                                'file' => __FILE__, 'line' => __LINE__,
+                                'message' => "DN not found using LDAP search."), true);
+                            continue;
+                        }
+                    }
+
+                    if ($this->cache && !empty($replaces['%dn'])) {
+                        $this->cache->set($cache_key, $replaces['%dn']);
+                    }
+                }
+
+                // Replace the bind_dn and base_dn variables.
+                $bind_dn        = strtr($bind_dn, $replaces);
+                $base_dn        = strtr($base_dn, $replaces);
+                $groups_base_dn = strtr($groups_base_dn, $replaces);
+
+                // replace placeholders in filter settings
+                if (!empty($this->config['filter'])) {
+                    $this->config['filter'] = strtr($this->config['filter'], $replaces);
+                }
+
+                foreach (array('base_dn', 'filter', 'member_filter') as $k) {
+                    if (!empty($this->config['groups'][$k])) {
+                        $this->config['groups'][$k] = strtr($this->config['groups'][$k], $replaces);
+                    }
+                }
+
+                if (empty($bind_user)) {
+                    $bind_user = $u;

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

@@ -48,10 +48,10 @@
     private static $subscriptions;
     private static $ldapcache = array();
     private static $typedata = array();
+    private static $ldap = array();
     private static $states;
     private static $config;
     private static $imap;
-    private static $ldap;
 
 
     // Default folder names
@@ -96,7 +96,7 @@
                 'message' => "required kolabformat module not found"
             ), true);
         }
-        else {
+        else if (self::$imap->get_error_code()) {
             rcube::raise_error(array(
                 'code' => 900, 'type' => 'php', 'message' => "IMAP error"
             ), true);
@@ -116,16 +116,23 @@
 
     /**
      * Initializes LDAP object to resolve Kolab users
+     *
+     * @param string $name Name of the configuration option with LDAP config
      */
-    public static function ldap()
+    public static function ldap($name = 'kolab_users_directory')
     {
-        if (self::$ldap) {
-            return self::$ldap;
-        }
-
         self::setup();
 
-        $config = self::$config->get('kolab_users_directory', self::$config->get('kolab_auth_addressbook'));
+        $config = self::$config->get($name);
+
+        if (empty($config)) {
+            $name   = 'kolab_auth_addressbook';
+            $config = self::$config->get($name);
+        }
+
+        if (self::$ldap[$name]) {
+            return self::$ldap[$name];
+        }
 
         if (!is_array($config)) {
             $ldap_config = (array)self::$config->get('ldap_public');
@@ -136,17 +143,21 @@
             return null;
         }
 
+        $ldap = new kolab_ldap($config);
+
         // overwrite filter option
         if ($filter = self::$config->get('kolab_users_filter')) {
             self::$config->set('kolab_auth_filter', $filter);
         }
 
-        // re-use the LDAP wrapper class from kolab_auth plugin
-        require_once rtrim(RCUBE_PLUGINS_DIR, '/') . '/kolab_auth/kolab_auth_ldap.php';
+        $user_attrib = self::$config->get('kolab_users_id_attrib', self::$config->get('kolab_auth_login', 'mail'));
+
+        //$ldap->set_filter($this->ldap_filter);
+        $ldap->extend_fieldmap(array($user_attrib => $user_attrib));
 
-        self::$ldap = new kolab_auth_ldap($config);
+        self::$ldap[$name] = $ldap;
 
-        return self::$ldap;
+        return $ldap;
     }
 
     /**
@@ -1485,6 +1496,7 @@
     }
 
     /**
+     * Search users in Kolab LDAP storage
      *
      * @param mixed   $query    Search value (or array of field => value pairs)
      * @param int     $mode     Matching mode: 0 - partial (*abc*), 1 - strict (=), 2 - prefix (abc*)
@@ -1492,19 +1504,23 @@
      * @param int     $limit    Maximum number of records
      * @param int     $count    Returns the number of records found
      *
-     * @return array List or false on error
+     * @return array List of users
      */
     public static function search_users($query, $mode = 1, $required = array(), $limit = 0, &$count = 0)
     {
         $query = str_replace('*', '', $query);
 
         // requires a working LDAP setup
-        if (!self::ldap() || strlen($query) == 0) {
+        if (!strlen($query) || !($ldap = self::ldap())) {
             return array();
         }
 
+        $root          = self::namespace_root('other');
+        $user_attrib   = self::$config->get('kolab_users_id_attrib', self::$config->get('kolab_auth_login', 'mail'));
+        $search_attrib = self::$config->get('kolab_users_search_attrib', array('cn','mail','alias'));
+
         // search users using the configured attributes
-        $results = self::$ldap->dosearch(self::$config->get('kolab_users_search_attrib', array('cn','mail','alias')), $query, $mode, $required, $limit, $count);
+        $results = $ldap->dosearch($search_attrib, $query, $mode, $required, $limit, $count);
 
         // exclude myself
         if ($_SESSION['kolab_dn']) {
@@ -1512,9 +1528,6 @@
         }
 
         // resolve to IMAP folder name
-        $root = self::namespace_root('other');
-        $user_attrib = self::$config->get('kolab_users_id_attrib', self::$config->get('kolab_auth_login', 'mail'));
-
         array_walk($results, function(&$user, $dn) use ($root, $user_attrib) {
             list($localpart, ) = explode('@', $user[$user_attrib]);
             $user['kolabtargetfolder'] = $root . $localpart;
@@ -1652,7 +1665,6 @@
 
     /**
      * Get user attributes for specified other user (imap) folder identifier.
-     * Note: This uses LDAP config/code from kolab_auth.
      *
      * @param string $folder_id Folder name w/o path (imap user identifier)
      * @param bool   $as_string Return configured display name attribute value
@@ -1692,7 +1704,7 @@
             $user = $cache->get($token);
         }
 
-        if (empty($user) && ($ldap = kolab_storage::ldap())) {
+        if (empty($user) && ($ldap = self::ldap())) {
             $user = $ldap->get_user_record($token, $_SESSION['imap_host']);
 
             if (!empty($user)) {

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

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

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

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

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

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

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/tests/kolab_date_recurrence.php -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/libkolab/tests/kolab_date_recurrence.php Changed

@@ -36,6 +36,10 @@
      */
     function test_first_occurrence($recurrence_data, $start, $expected)
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $start = new DateTime($start);
         if (!empty($recurrence_data['UNTIL'])) {
             $recurrence_data['UNTIL'] = new DateTime($recurrence_data['UNTIL']);
@@ -216,6 +220,10 @@
      */
     function test_first_occurrence_allday($recurrence_data, $start, $expected)
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $start = new DateTime($start);
         if (!empty($recurrence_data['UNTIL'])) {
             $recurrence_data['UNTIL'] = new DateTime($recurrence_data['UNTIL']);
@@ -236,6 +244,10 @@
      */
     function test_next_instance()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         date_default_timezone_set('America/New_York');
 
         $start = new DateTime('2017-08-31 11:00:00', new DateTimeZone('Europe/Berlin'));

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/tests/kolab_storage_config.php -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/libkolab/tests/kolab_storage_config.php Changed

@@ -34,6 +34,10 @@
         $rcube = rcmail::get_instance();
         $rcube->plugins->load_plugin('libkolab', true, true);
 
+        if (!kolab_format::supports(3)) {
+            return;
+        }
+
         if ($rcube->config->get('tests_username')) {
             $authenticated = $rcube->login(
                 $rcube->config->get('tests_username'),
@@ -70,6 +74,10 @@
 
     function test_001_build_member_url()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $rcube    = rcube::get_instance();
         $email    = $rcube->get_user_email();
         $personal = str_replace('$user', urlencode($email), $this->url_personal);
@@ -89,6 +97,10 @@
 
     function test_002_parse_member_url()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $rcube    = rcube::get_instance();
         $email    = $rcube->get_user_email();
         $personal = str_replace('$user', urlencode($email), $this->url_personal);
@@ -113,6 +125,10 @@
 
     function test_003_build_parse_member_url()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         // personal namespace
         $params = $this->params_personal;
         $params_ = kolab_storage_config::parse_member_url(kolab_storage_config::build_member_url($params));
@@ -138,6 +154,10 @@
      */
     function test_save()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $config = kolab_storage_config::get_instance();
         $tags   = array(
             array(
@@ -171,6 +191,10 @@
      */
     function test_T133()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $config = kolab_storage_config::get_instance();
 
         // get tags
@@ -206,5 +230,9 @@
         // get tags again, make sure it contains the new tag
         $tags = $config->get_tags();
         $this->assertCount(4, $tags);
+
+        foreach ($tags as $_tag) {
+            $this->assertTrue($_tag['uid'] != $tag['uid']);
+        }
     }
 }

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/libkolab/tests/kolab_storage_folder.php -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/libkolab/tests/kolab_storage_folder.php Changed

@@ -29,6 +29,10 @@
         $rcmail = rcmail::get_instance();
         $rcmail->plugins->load_plugin('libkolab', true, true);
 
+        if (!kolab_format::supports(3)) {
+            return;
+        }
+
         if ($rcmail->config->get('tests_username')) {
             $authenticated = $rcmail->login(
                 $rcmail->config->get('tests_username'),
@@ -65,6 +69,10 @@
 
     function test_001_folder_type_check()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $folder = new kolab_storage_folder('Calendar', 'event', 'event.default');
         $this->assertTrue($folder->valid);
         $this->assertEquals($folder->get_error(), 0);
@@ -80,6 +88,10 @@
 
     function test_002_get_owner()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $rcmail = rcmail::get_instance();
         $folder = new kolab_storage_folder('Calendar', 'event', 'event');
         $this->assertEquals($folder->get_owner(), $rcmail->config->get('tests_username'));
@@ -97,6 +109,10 @@
 
     function test_003_get_resource_uri()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $rcmail     = rcmail::get_instance();
         $foldername = 'Calendar';
         $uri        = parse_url($rcmail->config->get('default_host'));
@@ -112,6 +128,10 @@
 
     function test_004_get_uid()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $rcmail = rcmail::get_instance();
         $folder = new kolab_storage_folder('Doesnt-Exist', 'event', 'event');
 
@@ -123,6 +143,10 @@
 
     function test_005_subscribe()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $folder = new kolab_storage_folder('Contacts', 'contact');
         $this->assertTrue($folder->subscribe(true));
         $this->assertTrue($folder->is_subscribed());
@@ -135,6 +159,10 @@
 
     function test_006_activate()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $folder = new kolab_storage_folder('Calendar', 'event');
         $this->assertTrue($folder->activate(true));
         $this->assertTrue($folder->is_active());
@@ -145,16 +173,25 @@
 
     function test_010_write_contacts()
     {
-        $contacts = array(
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
+        $folder = new kolab_storage_folder('Contacts', 'contact');
+
+        $saved = $folder->save(null, 'contact');
+        $this->assertFalse($saved);
+
+        $contact = array(
             'name' => 'FN',
             'surname' => 'Last',
             'firstname' => 'First',
             'email' => array(
                 array('type' => 'home', 'address' => 'first.last@example.org'),
             ),
+            'organization' => 'Company A.G.'
         );
 
-        $folder = new kolab_storage_folder('Contacts', 'contact');
         $saved = $folder->save($contact, 'contact');
         $this->assertTrue((bool)$saved);
     }
@@ -164,12 +201,20 @@
      */
     function test_011_list_contacts()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $folder = new kolab_storage_folder('Contacts', 'contact');
         $this->assertEquals($folder->count(), 1);
     }
 
     function test_T491_get_uid()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $rcmail = rcmail::get_instance();
         $imap   = $rcmail->get_storage();
         $db     = $rcmail->get_dbh();

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/tasklist/README -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/tasklist/README Changed

@@ -4,17 +4,60 @@
 This plugin currently supports a local database as well as a Kolab groupware
 server as backends for tasklists and todo items storage.
 
+
+REQUIREMENTS
+------------
+
+Some functions are shared with other plugins and therefore being moved to
+library plugins. Thus in order to run the tasklist plugin, you also need the
+following plugins installed:
+
+* libcalendaring [1]
+* libkolab [1]
+
+
 INSTALLATION
 ------------
 
-When usigng the database driver, some initialization of the local database is
-necessary. To do so, execute the SQL commands in
-drivers/database/SQL/<yourdatabase>.initial.sql
+For a manual installation of the plugin (and its dependencies),
+execute the following steps. This will set it up with the database backend
+driver.
+
+1. Get the source from git
+
+  $ cd /tmp
+  $ git clone https://git.kolab.org/diffusion/RPK/roundcubemail-plugins-kolab.git
+  $ cd /<path-to-roundcube>/plugins
+  $ cp -r /tmp/roundcubemail-plugins-kolab/plugins/tasklist .
+  $ cp -r /tmp/roundcubemail-plugins-kolab/plugins/libcalendaring .
+  $ cp -r /tmp/roundcubemail-plugins-kolab/plugins/libkolab .
+
+2. Create tasklist plugin configuration
+
+  $ cd tasklist/
+  $ cp config.inc.php.dist config.inc.php
+  $ edit config.inc.php
+
+3. Initialize the tasklist database tables
+
+  $ cd ../../
+  $ bin/initdb.sh --dir=plugins/tasklist/drivers/database/SQL
+
+4. Build css styles for the Elastic skin
+
+  $ lessc --relative-urls -x plugins/libkolab/skins/elastic/libkolab.less > plugins/libkolab/skins/elastic/libkolab.min.css
+
+5. Enable the tasklist plugin
+
+  $ edit config/config.inc.php
+
+Add 'tasklist' to the list of active plugins:
+
+  $config['plugins'] = array(
+    (...)
+    'tasklist',
+  );
 
-For some general calendar-based operations such as alarms handling, this
-plugin requires the `libcalendaring` plugin, as well as libkolab plugin
-for more skins support, which are also part of the Kolab Roundcube Plugins
-repository. Make sure these plugins are installed and configured correctly.
 
 IMPORTANT
 ---------

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

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/tasklist/drivers/database/tasklist_database_driver.php -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/tasklist/drivers/database/tasklist_database_driver.php Changed

@@ -24,18 +24,17 @@
 
 class tasklist_database_driver extends tasklist_driver
 {
-    const IS_COMPLETE_SQL = "(status='COMPLETED' OR (complete=1 AND status=''))";
+    const IS_COMPLETE_SQL = "(`status` = 'COMPLETED' OR (`complete` = 1 AND `status` = ''))";
 
-    public $undelete = true; // yes, we can
-    public $sortable = false;
+    public $undelete    = true; // yes, we can
+    public $sortable    = false;
     public $alarm_types = array('DISPLAY');
 
     private $rc;
     private $plugin;
-    private $lists = array();
+    private $lists    = array();
+    private $tags     = array();
     private $list_ids = '';
-    private $tags = array();
-
     private $db_tasks = 'tasks';
     private $db_lists = 'tasklists';
 
@@ -45,7 +44,7 @@
      */
     public function __construct($plugin)
     {
-        $this->rc = $plugin->rc;
+        $this->rc     = $plugin->rc;
         $this->plugin = $plugin;
 
         // read database config
@@ -61,29 +60,31 @@
      */
     private function _read_lists()
     {
-      $hidden = array_filter(explode(',', $this->rc->config->get('hidden_tasklists', '')));
+        $hidden = array_filter(explode(',', $this->rc->config->get('hidden_tasklists', '')));
+
+        if (!empty($this->rc->user->ID)) {
+            $list_ids = array();
+            $result = $this->rc->db->query(
+                "SELECT *, `tasklist_id` AS id FROM " . $this->db_lists
+                . " WHERE `user_id` = ?"
+                . " ORDER BY CASE WHEN `name` = 'INBOX' THEN 0 ELSE 1 END, `name`",
+                $this->rc->user->ID
+            );
 
-      if (!empty($this->rc->user->ID)) {
-        $list_ids = array();
-        $result = $this->rc->db->query(
-          "SELECT *, tasklist_id AS id FROM " . $this->db_lists . "
-           WHERE user_id=?
-           ORDER BY CASE WHEN name='INBOX' THEN 0 ELSE 1 END, name",
-           $this->rc->user->ID
-        );
+            while ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
+                $arr['showalarms'] = intval($arr['showalarms']);
+                $arr['active']     = !in_array($arr['id'], $hidden);
+                $arr['name']       = html::quote($arr['name']);
+                $arr['listname']   = html::quote($arr['name']);
+                $arr['editable']   = true;
+                $arr['rights']     = 'lrswikxtea';
 
-        while ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
-          $arr['showalarms'] = intval($arr['showalarms']);
-          $arr['active'] = !in_array($arr['id'], $hidden);
-          $arr['name'] = html::quote($arr['name']);
-          $arr['listname'] = html::quote($arr['name']);
-          $arr['editable'] = true;
-          $arr['rights'] = 'lrswikxtea';
-          $this->lists[$arr['id']] = $arr;
-          $list_ids[] = $this->rc->db->quote($arr['id']);
-        }
-        $this->list_ids = join(',', $list_ids);
-      }
+                $this->lists[$arr['id']] = $arr;
+                $list_ids[] = $this->rc->db->quote($arr['id']);
+            }
+
+            $this->list_ids = join(',', $list_ids);
+        }
     }
 
     /**
@@ -91,14 +92,15 @@
      */
     public function get_lists($filter = 0)
     {
-      // attempt to create a default list for this user
-      if (empty($this->lists)) {
-        $prop = array('name' => 'Default', 'color' => '000000');
-        if ($this->create_list($prop))
-          $this->_read_lists();
-      }
-
-      return $this->lists;
+        // attempt to create a default list for this user
+        if (empty($this->lists)) {
+            $prop = array('name' => 'Default', 'color' => '000000');
+            if ($this->create_list($prop)) {
+                $this->_read_lists();
+            }
+        }
+
+        return $this->lists;
     }
 
     /**
@@ -111,17 +113,19 @@
     public function create_list(&$prop)
     {
         $result = $this->rc->db->query(
-            "INSERT INTO " . $this->db_lists . "
-             (user_id, name, color, showalarms)
-             VALUES (?, ?, ?, ?)",
+            "INSERT INTO " . $this->db_lists
+             . " (`user_id`, `name`, `color`, `showalarms`)"
+             . " VALUES (?, ?, ?, ?)",
             $this->rc->user->ID,
             strval($prop['name']),
             strval($prop['color']),
-            $prop['showalarms']?1:0
+            $prop['showalarms'] ? 1 : 0
         );
 
-        if ($result)
+        if ($result) {
+            $prop['rights'] = 'lrswikxtea';
             return $this->rc->db->insert_id($this->db_lists);
+        }
 
         return false;
     }
@@ -136,13 +140,11 @@
     public function edit_list(&$prop)
     {
         $query = $this->rc->db->query(
-            "UPDATE " . $this->db_lists . "
-             SET   name=?, color=?, showalarms=?
-             WHERE tasklist_id=?
-             AND   user_id=?",
-            $prop['name'],
-            $prop['color'],
-            $prop['showalarms']?1:0,
+            "UPDATE " . $this->db_lists . " SET `name` = ?, `color` = ?, `showalarms` = ?"
+             . " WHERE `tasklist_id` = ? AND `user_id` = ?",
+            strval($prop['name']),
+            strval($prop['color']),
+            $prop['showalarms'] ? 1 : 0,
             $prop['id'],
             $this->rc->user->ID
         );
@@ -161,10 +163,12 @@
     {
         $hidden = array_flip(explode(',', $this->rc->config->get('hidden_tasklists', '')));
 
-        if ($prop['active'])
+        if ($prop['active']) {
             unset($hidden[$prop['id']]);
-        else
+        }
+        else {
             $hidden[$prop['id']] = 1;
+        }
 
         return $this->rc->user->save_prefs(array('hidden_tasklists' => join(',', array_keys($hidden))));
     }
@@ -181,18 +185,8 @@
         $list_id = $prop['id'];
 
         if ($this->lists[$list_id]) {
-            // delete all tasks linked with this list
-            $this->rc->db->query(
-                "DELETE FROM " . $this->db_tasks . "
-                 WHERE tasklist_id=?",
-                $list_id
-            );
-
-            // delete list record
             $query = $this->rc->db->query(
-                "DELETE FROM " . $this->db_lists . "
-                 WHERE tasklist_id=?
-                 AND user_id=?",
+                "DELETE FROM " . $this->db_lists . " WHERE `tasklist_id` = ? AND `user_id` = ?",
                 $list_id,
                 $this->rc->user->ID
             );
@@ -208,6 +202,7 @@
      *
      * @param string Search string
      * @param string Section/source to search
+     *
      * @return array List of tasklists
      */
     public function search_lists($query, $source)
@@ -234,23 +229,24 @@
      */
     function count_tasks($lists = null)

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/tasklist/drivers/tasklist_driver.php -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/tasklist/drivers/tasklist_driver.php Changed

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/tasklist/skins/elastic/templates/mainview.html -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/tasklist/skins/elastic/templates/mainview.html Changed

roundcubemail-plugins-kolab-3.5.0.tar.gz/plugins/tasklist/tasklist.js -> roundcubemail-plugins-kolab-3.5.1.tar.gz/plugins/tasklist/tasklist.js Changed

@@ -2398,8 +2398,8 @@
     function task_edit_dialog(id, action, presets)
     {
         var elastic = false, infodialog = $('#taskshow');
-        if (infodialog.data('nodialog') || $('#taskedit').data('nodialog')) {
 
+        if (infodialog.data('nodialog') || $('#taskedit').data('nodialog')) {
             elastic = true;
             infodialog.addClass('hidden').parent().addClass('watermark'); // Elastic
         }
@@ -2479,9 +2479,13 @@
         tasklist.val(rec.list || me.selected_list || selected_list);
 
         // tag-edit line
+        var tagline = $('#taskedit-tagline');
         if (window.kolab_tags_input) {
-            $('#taskedit-tagline').parent('.form-group').show();
-            taglist = kolab_tags_input($('#taskedit-tagline'), rec.tags, readonly);
+            tagline.parent().show();
+            taglist = kolab_tags_input(tagline, rec.tags, readonly);
+        }
+        else {
+            tagline.parent().hide();
         }
 
         // set alarm(s)
@@ -3143,13 +3147,18 @@
         }, prop.parent || null, prop.group);
 
         // flag as tasklist for drag & drop
-        $(tasklists_widget.get_item(prop.id)).data('type', 'tasklist');
+        var li = $(tasklists_widget.get_item(prop.id)).data('type', 'tasklist');
 
         delete prop.html;
         me.tasklists[prop.id] = prop;
 
         // append to list selector in task edit dialog, too (#2985)
         $('<option>').attr('value', prop.id).html(Q(prop.name)).appendTo('#taskedit-tasklist');
+
+        // Elastic skin
+        if (window.UI && UI.pretty_checkbox) {
+            UI.pretty_checkbox($(li).find('input'));
+        }
     }
 
     /**

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

roundcubemail-plugins-kolab-3.5.1.tar.gz/run-tests.sh Added

roundcubemail-plugins-kolab.dsc Changed

Changes of Revision 67