Request 2452 (accepted)

This request supersedes: request 2450 (Show diff)

Overview

Request 2452 (accepted)

Ship the default config in a manner that roundcubemail may elect to digest

Created by vanmeeuwen about 5 years ago
In state accepted
Supersedes 2450

Submit kolab-syncroton

Submit package Kolab:Winterfell / kolab-syncroton to package Kolab:16 / kolab-syncroton

kolab-syncroton.spec Changed

@@ -37,7 +37,7 @@
 
 Name:           kolab-syncroton
 Version:        2.3.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ActiveSync for Kolab Groupware
 
 Group:          Applications/Internet
@@ -47,6 +47,8 @@
 Source0:        https://mirror.kolabenterprise.com/pub/releases/%{name}-%{version}.tar.gz
 Source1:        kolab-syncroton.logrotate
 
+Patch1:         defaults.patch
+
 BuildArch:      noarch
 
 # Use this build requirement to make sure we are using
@@ -94,6 +96,8 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch1 -p1
+
 %build
 
 %install
@@ -102,7 +106,7 @@
 %if 0%{?plesk} < 1
     %{buildroot}/%{_ap_sysconfdir}/conf.d/ \
 %endif
-    %{buildroot}/%{_sysconfdir}/%{name} \
+    %{buildroot}/%{_sysconfdir}/roundcubemail/ \
     %{buildroot}/%{_var}/log/%{name}
 
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
@@ -114,6 +118,7 @@
 
 cp -a lib %{buildroot}/%{_datadir}/%{name}/.
 cp -a index.php %{buildroot}/%{_datadir}/%{name}/.
+cp -a config/config.inc.php.dist %{buildroot}/%{_sysconfdir}/roundcubemail/kolab_syncroton.inc.php
 
 pushd %{buildroot}/%{_datadir}/%{name}
 ln -s ../../..%{_sysconfdir}/roundcubemail config
@@ -191,10 +196,14 @@
 %config(noreplace) %{_ap_sysconfdir}/conf.d/kolab-syncroton.conf
 %endif
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/roundcubemail/kolab_syncroton.inc.php
 %{_datadir}/%{name}
 %attr(0770,%{httpd_user},%{httpd_group}) %{_var}/log/%{name}
 
 %changelog
+* Thu Apr 11 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.15-2
+- Update defaults
+
 * Fri Feb  1 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.15-1
 - Release 2.3.15

defaults.patch Added

@@ -0,0 +1,86 @@
+diff --git a/config/config.inc.php.dist b/config/config.inc.php.dist
+index daf1d39..c010e3a 100644
+--- a/config/config.inc.php.dist
++++ b/config/config.inc.php.dist
+@@ -67,7 +67,10 @@ $config['activesync_gal_cache_ttl'] = '1d';
+ 
+ // List of Roundcube plugins
+ // WARNING: Not all plugins used in Roundcube can be listed here
+-$config['activesync_plugins'] = array();
++$config['activesync_plugins'] = array(
++    'libcalendaring',
++    'libkolab'
++);
+ 
+ // Defines for how many seconds we'll sleep between every
+ // action for detecting changes in folders. Default: 60
+@@ -97,13 +100,13 @@ $config['activesync_max_folders'] = 100;
+ //     8 - all folders in other users namespace
+ //    16 - all subscribed folders in shared namespace
+ //    32 - all folders in shared namespace
+-$config['activesync_init_subscriptions'] = 0;
++$config['activesync_init_subscriptions'] = 21;
+ 
+ // Defines blacklist of devices (device type strings) that do not support folder hierarchies.
+ // When set to an array folder hierarchies are used on all devices not listed here.
+ // When set to null an old whitelist approach will be used where we do opposite
+ // action and enable folder hierarchies only on device types known to support it.
+-$config['activesync_multifolder_blacklist'] = null;
++$config['activesync_multifolder_blacklist'] = array();
+ 
+ // Blacklist overwrites for specified object type. If set to an array
+ // it will have a precedence over 'activesync_multifolder_blacklist' list only for that type.
+@@ -111,7 +114,7 @@ $config['activesync_multifolder_blacklist'] = null;
+ //       in that case use $config['activesync_multifolder_blacklist_contact'] = array('windowsoutlook');
+ $config['activesync_multifolder_blacklist_mail'] = null;
+ $config['activesync_multifolder_blacklist_event'] = null;
+-$config['activesync_multifolder_blacklist_contact'] = null;
++$config['activesync_multifolder_blacklist_contact'] = array('windowsoutlook');
+ $config['activesync_multifolder_blacklist_note'] = null;
+ $config['activesync_multifolder_blacklist_task'] = null;
+ 
+diff --git a/lib/kolab_sync_data.php b/lib/kolab_sync_data.php
+index 6ee7eb0..f1912a2 100644
+--- a/lib/kolab_sync_data.php
++++ b/lib/kolab_sync_data.php
+@@ -428,6 +428,11 @@ abstract class kolab_sync_data implements Syncroton_Data_IData
+             // Remove subfolders
+             if (!empty($options['deleteSubFolders'])) {
+                 $list = $this->listFolders($folderid);
++
++                if (!is_array($list)) {
++                    throw new Syncroton_Exception_Status_ItemOperations(Syncroton_Exception_Status_ItemOperations::ITEM_SERVER_ERROR);
++                }
++
+                 foreach ($list as $folderid => $folder) {
+                     $foldername = $this->backend->folder_id2name($folderid, $this->device->deviceid);
+                     $folder     = $this->getFolderObject($foldername);
+@@ -508,7 +513,7 @@ abstract class kolab_sync_data implements Syncroton_Data_IData
+         $oldEntry = $this->getObject($folderId, $serverId);
+ 
+         if (empty($oldEntry)) {
+-            throw new Syncroton_Exception_NotFound('id not found');
++            throw new Syncroton_Exception_NotFound('entry not found');
+         }
+ 
+         $entry = $this->toKolab($entry, $folderId, $oldEntry);
+@@ -947,6 +952,10 @@ abstract class kolab_sync_data implements Syncroton_Data_IData
+     {
+         $folders = $this->extractFolders($folderid);
+ 
++        if (empty($folders)) {
++            return null;
++        }
++
+         foreach ($folders as $folderid) {
+             $foldername = $this->backend->folder_id2name($folderid, $this->device->deviceid);
+             $folder     = $this->getFolderObject($foldername);
+@@ -1125,7 +1134,7 @@ abstract class kolab_sync_data implements Syncroton_Data_IData
+                 $this->device->deviceid, $this->modelName, $this->isMultiFolder());
+         }
+ 
+-        if ($parentid === null) {
++        if ($parentid === null || !is_array($this->imap_folders)) {
+             return $this->imap_folders;
+         }
+

debian.changelog Changed

debian.rules Changed

debian.series Changed

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2452 0

Request History

vanmeeuwen created request about 5 years ago

Ship the default config in a manner that roundcubemail may elect to digest

vanmeeuwen accepted review about 5 years ago

vanmeeuwen approved review about 5 years ago

vanmeeuwen accepted request about 5 years ago