Projects
Kolab:3.4
chwala
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 42
View file
chwala.spec
Changed
@@ -42,6 +42,7 @@ Source2: chwala.logrotate Patch1: chwala-0.2-suhosin.session.encrypt-php_flag.patch +Patch2: 0002-Use-folder-state-check-and-set-type-when-using-kolab.patch BuildArch: noarch @@ -70,6 +71,7 @@ %setup -q %patch1 -p1 +%patch2 -p1 %build @@ -133,6 +135,9 @@ %attr(0750,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name} %changelog +* Sat Feb 14 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.3.0-2 +- Use filder state check when accessing file folder (#4478) + * Sun Jan 11 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.3.0-1 - Release of version 0.3.0
View file
0002-Use-folder-state-check-and-set-type-when-using-kolab.patch
Added
@@ -0,0 +1,29 @@ +From a59b96e270d533cceb0884016e199fa862fc27c1 Mon Sep 17 00:00:00 2001 +From: Aleksander Machniak <machniak@kolabsys.com> +Date: Wed, 4 Feb 2015 06:24:17 -0500 +Subject: [PATCH 2/2] Use folder state check and set type when using + kolab_storage::get_folder() (#4478) + +--- + lib/drivers/kolab/kolab_file_storage.php | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/drivers/kolab/kolab_file_storage.php b/lib/drivers/kolab/kolab_file_storage.php +index f29e74e..9edc65b 100644 +--- a/lib/drivers/kolab/kolab_file_storage.php ++++ b/lib/drivers/kolab/kolab_file_storage.php +@@ -1070,9 +1070,9 @@ class kolab_file_storage implements file_storage + $separator = $storage->get_hierarchy_delimiter(); + $folder_name = str_replace(file_storage::SEPARATOR, $separator, $folder_name); + $imap_name = rcube_charset::convert($folder_name, RCUBE_CHARSET, 'UTF7-IMAP'); +- $folder = kolab_storage::get_folder($imap_name); ++ $folder = kolab_storage::get_folder($imap_name, 'file'); + +- if (!$folder) { ++ if (!$folder || !$folder->valid) { + throw new Exception("Storage error. Folder not found.", file_storage::ERROR); + } + +-- +2.1.0 +
View file
chwala.dsc
Changed
@@ -2,7 +2,7 @@ Source: chwala Binary: chwala Architecture: all -Version: 0.3.0-0~kolab2 +Version: 0.3.0-0~kolab3 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl> Homepage: http://kolab.org/about/chwala/
View file
debian.changelog
Changed
@@ -1,3 +1,9 @@ +chwala (0.3.0-0~kolab3) unstable; urgency=low + + * Use folder state check when accessing files folder (#4478) + + -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Sat, 14 Feb 2015 12:12:12 +0100 + chwala (0.3.0-0~kolab2) unstable; urgency=low * fix prerm script for Debian to make clean removal of package possible
View file
debian.series
Changed
@@ -1,1 +1,2 @@ chwala-0.2-suhosin.session.encrypt-php_flag.patch -p1 +0002-Use-folder-state-check-and-set-type-when-using-kolab.patch -p1
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.