Request 1984 (accepted)

roundcubemail.spec Changed

@@ -26,10 +26,16 @@
 %global httpd_name apache2
 %global httpd_user wwwrun
 %else
+%if 0%{?plesk}
+%global httpd_group roundcube_sysgroup
+%global httpd_name httpd
+%global httpd_user roundcube_sysuser
+%else
 %global httpd_group apache
 %global httpd_name httpd
 %global httpd_user apache
 %endif
+%endif
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
@@ -41,7 +47,7 @@
 %global tmpdir /var/lib/roundcubemail
 
 Name:           roundcubemail
-Version:        1.2.3
+Version:        1.2.4
 
 Release:        1%{?dist}
 
@@ -57,12 +63,24 @@
 Source20:       roundcubemail.conf
 Source21:       roundcubemail.logrotate
 
+Source100:      plesk.config.inc.php
+Source101:      plesk.password.inc.php
+
+Patch0001:      0001-Fix-so-settings-upload.inc-could-not-be-used-by-plug.patch
+Patch0002:      0002-Update-changelog.patch
+Patch0003:      0003-Remove-redundant-spaces-from-generated-contact-names.patch
+Patch0004:      0004-Fix-regression-in-LDAP-fuzzy-search-where-it-always-.patch
+Patch0005:      0005-Fix-bug-where-namespace-prefix-could-not-be-truncate.patch
+Patch0006:      0006-Fix-re-positioning-of-the-fixed-header-of-messages-l.patch
+
 Patch201:       default-configuration.patch
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 
 BuildRequires:  composer
+
+%if 0%{?plesk} < 1
 BuildRequires:  php-gd
 BuildRequires:  php-mbstring
 BuildRequires:  php-mcrypt
@@ -84,6 +102,7 @@
 BuildRequires:  php-pear(Net_Sieve)
 BuildRequires:  php-pear(Net_SMTP)
 BuildRequires:  php-pear(Net_Socket)
+%endif
 
 %if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le" && 0%{?suse_version} < 1
 BuildRequires:  python-cssmin
@@ -95,15 +114,19 @@
 #BuildRequires:  firefox
 BuildRequires:  python
 BuildRequires:  python-nose
-BuildRequires:  python-selenium
+#BuildRequires:  python-selenium
 
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 
+%if 0%{?plesk}
+Requires:       %{name}-skin-plesk
+%else
 %if 0%{?kolab_enterprise}
 Requires:       %{name}-skin-enterprise
 %else
 Requires:       %{name}-skin-chameleon
 %endif
+%endif
 
 # Archive and Zipdownload plugins required through
 # being listed in config.inc.php.sample.
@@ -145,12 +168,15 @@
 Requires:       php-pear(MDB2) >= 2.5.0
 Requires:       php-pear(MDB2_Driver_mysqli)
 Requires:       php-pear(Net_IDNA2)
-Requires:       php-pear(Net_LDAP2)
-Requires:       php-pear(Net_LDAP3)
 Requires:       php-pear(Net_Sieve)
 Requires:       php-pear(Net_SMTP)
 Requires:       php-pear(Net_Socket)
 
+%if 0%{?plesk} < 1
+Requires:       php-pear(Net_LDAP2)
+Requires:       php-pear(Net_LDAP3)
+%endif
+
 Requires:       %{name}(core-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -792,18 +818,6 @@
 %description plugin-acl-skin-larry
 Plugin acl / Skin larry
 
-%package plugin-acl-skin-classic
-Summary:        Plugin acl / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-acl) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-acl-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-acl-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-acl-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-acl-skin-classic
-Plugin acl / Skin classic
-
 %package plugin-archive-skin-larry
 Summary:        Plugin archive / Skin larry
 Group:          Applications/Internet
@@ -816,18 +830,6 @@
 %description plugin-archive-skin-larry
 Plugin archive / Skin larry
 
-%package plugin-archive-skin-classic
-Summary:        Plugin archive / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-archive) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-archive-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-archive-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-archive-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-archive-skin-classic
-Plugin archive / Skin classic
-
 %package plugin-enigma-skin-larry
 Summary:        Plugin enigma / Skin larry
 Group:          Applications/Internet
@@ -840,18 +842,6 @@
 %description plugin-enigma-skin-larry
 Plugin enigma / Skin larry
 
-%package plugin-enigma-skin-classic
-Summary:        Plugin enigma / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-enigma) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-enigma-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-enigma-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-enigma-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-enigma-skin-classic
-Plugin enigma / Skin classic
-
 %package plugin-help-skin-larry
 Summary:        Plugin help / Skin larry
 Group:          Applications/Internet
@@ -864,18 +854,6 @@
 %description plugin-help-skin-larry
 Plugin help / Skin larry
 
-%package plugin-help-skin-classic
-Summary:        Plugin help / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-help) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-help-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-help-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-help-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-help-skin-classic
-Plugin help / Skin classic
-
 %package plugin-hide_blockquote-skin-larry
 Summary:        Plugin hide_blockquote / Skin larry
 Group:          Applications/Internet
@@ -900,18 +878,6 @@
 %description plugin-jqueryui-skin-larry
 Plugin jqueryui / Skin larry
 
-%package plugin-jqueryui-skin-classic
-Summary:        Plugin jqueryui / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-jqueryui) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-jqueryui-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-jqueryui-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-jqueryui-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-jqueryui-skin-classic
-Plugin jqueryui / Skin classic
-
 %package plugin-legacy_browser-skin-larry
 Summary:        Plugin legacy_browser / Skin larry
 Group:          Applications/Internet
@@ -924,18 +890,6 @@
 %description plugin-legacy_browser-skin-larry
 Plugin legacy_browser / Skin larry
 
-%package plugin-legacy_browser-skin-classic
-Summary:        Plugin legacy_browser / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-legacy_browser) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-legacy_browser-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-legacy_browser-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-legacy_browser-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-legacy_browser-skin-classic
-Plugin legacy_browser / Skin classic
-
 %package plugin-managesieve-skin-larry
 Summary:        Plugin managesieve / Skin larry
 Group:          Applications/Internet
@@ -948,18 +902,6 @@
 %description plugin-managesieve-skin-larry
 Plugin managesieve / Skin larry
 
-%package plugin-managesieve-skin-classic
-Summary:        Plugin managesieve / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-managesieve) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-managesieve-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-managesieve-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-managesieve-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-managesieve-skin-classic
-Plugin managesieve / Skin classic
-
 %package plugin-markasjunk-skin-larry
 Summary:        Plugin markasjunk / Skin larry
 Group:          Applications/Internet
@@ -972,18 +914,6 @@
 %description plugin-markasjunk-skin-larry
 Plugin markasjunk / Skin larry
 
-%package plugin-markasjunk-skin-classic
-Summary:        Plugin markasjunk / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-markasjunk) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-markasjunk-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-markasjunk-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-markasjunk-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-markasjunk-skin-classic
-Plugin markasjunk / Skin classic
-
 %package plugin-vcard_attachments-skin-larry
 Summary:        Plugin vcard_attachments / Skin larry
 Group:          Applications/Internet
@@ -996,18 +926,6 @@
 %description plugin-vcard_attachments-skin-larry
 Plugin vcard_attachments / Skin larry
 
-%package plugin-vcard_attachments-skin-classic
-Summary:        Plugin vcard_attachments / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-vcard_attachments) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-vcard_attachments-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-vcard_attachments-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-vcard_attachments-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-vcard_attachments-skin-classic
-Plugin vcard_attachments / Skin classic
-
 %package plugin-zipdownload-skin-larry
 Summary:        Plugin zipdownload / Skin larry
 Group:          Applications/Internet
@@ -1020,18 +938,6 @@
 %description plugin-zipdownload-skin-larry
 Plugin zipdownload / Skin larry
 
-%package plugin-zipdownload-skin-classic
-Summary:        Plugin zipdownload / Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-zipdownload) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-zipdownload-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-zipdownload-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-zipdownload-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-zipdownload-skin-classic
-Plugin zipdownload / Skin classic
-
 %package plugin-acl-skin-larry-assets
 Summary:        Plugin acl / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1042,16 +948,6 @@
 %description plugin-acl-skin-larry-assets
 Plugin acl / Skin larry (Assets Package)
 
-%package plugin-acl-skin-classic-assets
-Summary:        Plugin acl / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-acl-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-acl-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-acl-skin-classic-assets
-Plugin acl / Skin classic (Assets Package)
-
 %package plugin-archive-skin-larry-assets
 Summary:        Plugin archive / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1062,16 +958,6 @@
 %description plugin-archive-skin-larry-assets
 Plugin archive / Skin larry (Assets Package)
 
-%package plugin-archive-skin-classic-assets
-Summary:        Plugin archive / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-archive-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-archive-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-archive-skin-classic-assets
-Plugin archive / Skin classic (Assets Package)
-
 %package plugin-enigma-skin-larry-assets
 Summary:        Plugin enigma / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1082,16 +968,6 @@
 %description plugin-enigma-skin-larry-assets
 Plugin enigma / Skin larry (Assets Package)
 
-%package plugin-enigma-skin-classic-assets
-Summary:        Plugin enigma / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-enigma-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-enigma-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-enigma-skin-classic-assets
-Plugin enigma / Skin classic (Assets Package)
-
 %package plugin-help-skin-larry-assets
 Summary:        Plugin help / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1102,16 +978,6 @@
 %description plugin-help-skin-larry-assets
 Plugin help / Skin larry (Assets Package)
 
-%package plugin-help-skin-classic-assets
-Summary:        Plugin help / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-help-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-help-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-help-skin-classic-assets
-Plugin help / Skin classic (Assets Package)
-
 %package plugin-hide_blockquote-skin-larry-assets
 Summary:        Plugin hide_blockquote / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1132,16 +998,6 @@
 %description plugin-jqueryui-skin-larry-assets
 Plugin jqueryui / Skin larry (Assets Package)
 
-%package plugin-jqueryui-skin-classic-assets
-Summary:        Plugin jqueryui / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-jqueryui-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-jqueryui-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-jqueryui-skin-classic-assets
-Plugin jqueryui / Skin classic (Assets Package)
-
 %package plugin-legacy_browser-skin-larry-assets
 Summary:        Plugin legacy_browser / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1152,16 +1008,6 @@
 %description plugin-legacy_browser-skin-larry-assets
 Plugin legacy_browser / Skin larry (Assets Package)
 
-%package plugin-legacy_browser-skin-classic-assets
-Summary:        Plugin legacy_browser / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-legacy_browser-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-legacy_browser-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-legacy_browser-skin-classic-assets
-Plugin legacy_browser / Skin classic (Assets Package)
-
 %package plugin-managesieve-skin-larry-assets
 Summary:        Plugin managesieve / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1172,16 +1018,6 @@
 %description plugin-managesieve-skin-larry-assets
 Plugin managesieve / Skin larry (Assets Package)
 
-%package plugin-managesieve-skin-classic-assets
-Summary:        Plugin managesieve / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-managesieve-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-managesieve-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-managesieve-skin-classic-assets
-Plugin managesieve / Skin classic (Assets Package)
-
 %package plugin-markasjunk-skin-larry-assets
 Summary:        Plugin markasjunk / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1192,16 +1028,6 @@
 %description plugin-markasjunk-skin-larry-assets
 Plugin markasjunk / Skin larry (Assets Package)
 
-%package plugin-markasjunk-skin-classic-assets
-Summary:        Plugin markasjunk / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-markasjunk-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-markasjunk-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-markasjunk-skin-classic-assets
-Plugin markasjunk / Skin classic (Assets Package)
-
 %package plugin-vcard_attachments-skin-larry-assets
 Summary:        Plugin vcard_attachments / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1212,16 +1038,6 @@
 %description plugin-vcard_attachments-skin-larry-assets
 Plugin vcard_attachments / Skin larry (Assets Package)
 
-%package plugin-vcard_attachments-skin-classic-assets
-Summary:        Plugin vcard_attachments / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-vcard_attachments-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-vcard_attachments-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-vcard_attachments-skin-classic-assets
-Plugin vcard_attachments / Skin classic (Assets Package)
-
 %package plugin-zipdownload-skin-larry-assets
 Summary:        Plugin zipdownload / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1232,16 +1048,6 @@
 %description plugin-zipdownload-skin-larry-assets
 Plugin zipdownload / Skin larry (Assets Package)
 
-%package plugin-zipdownload-skin-classic-assets
-Summary:        Plugin zipdownload / Skin classic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-zipdownload-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-zipdownload-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-zipdownload-skin-classic-assets
-Plugin zipdownload / Skin classic (Assets Package)
-
 %package skin-larry
 Summary:        Skin larry
 Group:          Applications/Internet
@@ -1253,17 +1059,6 @@
 %description skin-larry
 Skin larry
 
-%package skin-classic
-Summary:        Skin classic
-Group:          Applications/Internet
-Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description skin-classic
-Skin classic
-
 %package skin-larry-assets
 Summary:        Skin larry (Assets)
 Group:          Applications/Internet
@@ -1273,27 +1068,37 @@
 %description skin-larry-assets
 Skin larry (Assets Package)
 
-%package skin-classic-assets
-Summary:        Skin classic (Assets)
-Group:          Applications/Internet
-Provides:       %{name}(skin-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description skin-classic-assets
-Skin classic (Assets Package)
-
 %prep
 %setup -q -c "%{name}-%{version}"
 
 pushd %{name}-%{version}
 
+find . -type d -name "classic" | while read dir; do
+    rm -rvf ${dir}
+done
+
+%if 0%{?plesk}
+cp -vf %{SOURCE100} config/config.inc.php.sample
+cp -vf %{SOURCE101} plugins/password/config.inc.php.dist
+%endif
+
+%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+%patch0004 -p1
+%patch0005 -p1
+%patch0006 -p1
+
 %patch201 -p1
 
 # Remove the results of patching when there's an incidental offset
 find . -type f -name "*.orig" -delete
 
-# Remove hidden files
+# Remove hidden files and directories
 find . -type f -name ".*" -delete
+find . -type d -name ".*" ! -name "." ! -name ".." | while read dir; do
+    rm -rvf ${dir}
+done
 
 # Remove file URI modifier
 sed -r -i -e 's/^(\s+)protected function file_mod(.*)$/\1protected function file_mod\2 { return $file; }\n\1protected function dummy\2/g' program/include/rcmail_output_html.php
@@ -1311,7 +1116,7 @@
 
 rm -rf %{name}-%{version}/plugins/jqueryui/themes/redmond
 
-for skin in larry classic; do
+for skin in larry; do
     # Template files and the like
     for sdir in $(find %{name}-%{version}/ -type d -name "${skin}" | sort); do
         target_dir=$(echo $sdir | %{__sed} -e "s|%{name}-%{version}|%{name}-skin-${skin}-%{version}|g")
@@ -1457,7 +1262,7 @@
         echo ""
     ) >> plugins-assets.files
 
-    for skin in larry classic; do
+    for skin in larry; do
         for dir in $(find $target_dir -type d -name "${skin}" | sort); do
             starget_dir=$(echo $dir | %{__sed} -e "s|%{name}-plugin-$(basename ${plugin})-%{version}|%{name}-plugin-$(basename ${plugin})-skin-${skin}-%{version}|g")
             %{__mkdir_p} $(dirname $starget_dir)
@@ -1565,7 +1370,9 @@
 %{__rm} -rf %{buildroot}
 
 %{__install} -d \
+%if 0%{?plesk} < 1
     %{buildroot}%{_ap_sysconfdir}/conf.d \
+%endif
     %{buildroot}%{_sysconfdir}/logrotate.d \
     %{buildroot}%{confdir} \
     %{buildroot}%{datadir}/public_html \
@@ -1576,7 +1383,9 @@
 # Move robots.txt to the correct place
 %{__install} -pm 644 robots.txt %{buildroot}%{datadir}/public_html/robots.txt
 
+%if 0%{?plesk} < 1
 %{__install} -pm 644 %SOURCE20 %{buildroot}%{_ap_sysconfdir}/conf.d
+%endif
 
 %{__install} -pm 644 %SOURCE21 %{buildroot}%{_sysconfdir}/logrotate.d/roundcubemail
 
@@ -1704,6 +1513,7 @@
         -name "*.svg" -o \
         -name "*.swf" -o \
         -name "*.tif" -o \
+        -name "*.tiff" -o \
         -name "*.ttf" -o \
         -name "*.wav" -o \
         -name "*.woff" | \
@@ -1716,9 +1526,9 @@
 
 new_files > core.files
 
-echo "== Files for core: =="
-cat core.files
-echo "==========================="
+#echo "== Files for core: =="
+#cat core.files
+#echo "==========================="
 
 for file in `find %{name}-assets-%{version}/ -type f`; do
     asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-assets-%{version}|%{buildroot}%{datadir}|g"))
@@ -1728,15 +1538,15 @@
 
 new_files > core-assets.files
 
-echo "== Files for core assets: =="
-cat core-assets.files
-echo "==========================="
+#echo "== Files for core assets: =="
+#cat core-assets.files
+#echo "==========================="
 
 echo "================================================================="
 echo "Dividing Skin Assets and Non-Assets"
 echo "================================================================="
 
-for skin in larry classic; do
+for skin in larry; do
     # Take the files from the original directory,
     # Find the ones that are assets,
     # Move those over to the assets-specific directory.
@@ -1784,6 +1594,7 @@
             -name "*.svg" -o \
             -name "*.swf" -o \
             -name "*.tif" -o \
+            -name "*.tiff" -o \
             -name "*.ttf" -o \
             -name "*.wav" -o \
             -name "*.woff"
@@ -1805,18 +1616,18 @@
 
     new_files > skin-${skin}.files
 
-    echo "== Files for skin ${skin}: =="
-    cat skin-${skin}.files
-    echo "==========================="
+    #echo "== Files for skin ${skin}: =="
+    #cat skin-${skin}.files
+    #echo "==========================="
 
     %{__mkdir_p} %{buildroot}%{datadir}/public_html/assets/skins/
     cp -a %{name}-skin-${skin}-assets-%{version}/public_html/assets/skins/* %{buildroot}%{datadir}/public_html/assets/skins/.
 
     new_files > skin-${skin}-assets.files
 
-    echo "== Files for skin assets ${skin}: =="
-    cat skin-${skin}-assets.files
-    echo "==========================="
+    #echo "== Files for skin assets ${skin}: =="
+    #cat skin-${skin}-assets.files
+    #echo "==========================="
 done
 
 echo "================================================================="
@@ -1824,7 +1635,7 @@
 echo "================================================================="
 
 for plugin in $(find %{name}-%{version}/plugins/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | sort); do
-    for skin in larry classic; do
+    for skin in larry; do
         orig_dir="%{name}-plugin-${plugin}-skin-${skin}-%{version}"
 
         # No skin, no assets
@@ -1871,6 +1682,7 @@
                 -name "*.svg" -o \
                 -name "*.swf" -o \
                 -name "*.tif" -o \
+                -name "*.tiff" -o \
                 -name "*.ttf" -o \
                 -name "*.wav" -o \
                 -name "*.woff"
@@ -1896,9 +1708,9 @@
 
     new_files > plugin-${plugin}.files
 
-    echo "== Files for plugin ${plugin}: =="
-    cat plugin-${plugin}.files
-    echo "==========================="
+    #echo "== Files for plugin ${plugin}: =="
+    #cat plugin-${plugin}.files
+    #echo "==========================="
 
     # Skin-independent assets
     orig_dir="%{name}-plugin-${plugin}-%{version}"
@@ -1941,6 +1753,7 @@
             -name "*.svg" -o \
             -name "*.swf" -o \
             -name "*.tif" -o \
+            -name "*.tiff" -o \
             -name "*.ttf" -o \
             -name "*.wav" -o \
             -name "*.woff"
@@ -1967,13 +1780,13 @@
 
     new_files > plugin-${plugin}-assets.files
 
-    echo "== Files for plugin ${plugin}: =="
-    cat plugin-${plugin}-assets.files
-    echo "==========================="
+    #echo "== Files for plugin ${plugin}: =="
+    #cat plugin-${plugin}-assets.files
+    #echo "==========================="
 done
 
 for plugin in $(find %{name}-%{version}/plugins/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | sort); do
-    for skin in larry classic; do
+    for skin in larry; do
         touch plugin-${plugin}-skin-${skin}.files
         touch plugin-${plugin}-skin-${skin}-assets.files
 
@@ -1991,9 +1804,9 @@
             echo "%doc README.md" > plugin-${plugin}-skin-${skin}.files
         fi
 
-        echo "== Files for skin ${plugin}-${skin}: =="
-        cat plugin-${plugin}-skin-${skin}.files
-        echo "==========================="
+        #echo "== Files for skin ${plugin}-${skin}: =="
+        #cat plugin-${plugin}-skin-${skin}.files
+        #echo "==========================="
 
         # Install the assets
         for file in `find %{name}-plugin-${plugin}-skin-${skin}-assets-%{version} -type f`; do
@@ -2007,9 +1820,9 @@
             echo "%doc README.md" > plugin-${plugin}-skin-${skin}-assets.files
         fi
 
-        echo "== Files for skin ${plugin}-${skin}: =="
-        cat plugin-${plugin}-skin-${skin}-assets.files
-        echo "==========================="
+        #echo "== Files for skin ${plugin}-${skin}: =="
+        #cat plugin-${plugin}-skin-${skin}-assets.files
+        #echo "==========================="
 
     done
 done
@@ -2242,7 +2055,7 @@
 fi
 
 /usr/share/roundcubemail/bin/updatedb.sh \
-    --dir /usr/share/doc/roundcubemail-%{version}/SQL/ \
+    --dir /usr/share/doc/roundcubemail-core-%{version}/SQL/ \
     --package roundcube || : \
     >/dev/null 2>&1
 
@@ -2751,13 +2564,16 @@
 
 %files core -f core.files
 %defattr(-,root,root,-)
+%doc %{name}-%{version}/SQL
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %if 0%{?suse_version}
 %dir %{_ap_sysconfdir}/
 %dir %{_ap_sysconfdir}/conf.d/
 %attr(0755,root,%{httpd_group}) %dir %{confdir}
 %endif
+%if 0%{?plesk} < 1
 %config(noreplace) %{_ap_sysconfdir}/conf.d/%{name}.conf
+%endif
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/config.inc.php
 %attr(0640,root,%{httpd_group}) %{confdir}/defaults.inc.php
 %attr(0640,root,%{httpd_group}) %{confdir}/mimetypes.php
@@ -2986,142 +2802,79 @@
 %files plugin-acl-skin-larry -f plugin-acl-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-acl-skin-classic -f plugin-acl-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-archive-skin-larry -f plugin-archive-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-archive-skin-classic -f plugin-archive-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-enigma-skin-larry -f plugin-enigma-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-enigma-skin-classic -f plugin-enigma-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-help-skin-larry -f plugin-help-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-help-skin-classic -f plugin-help-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-hide_blockquote-skin-larry -f plugin-hide_blockquote-skin-larry.files
 %defattr(-,root,root,-)
 
 %files plugin-jqueryui-skin-larry -f plugin-jqueryui-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-jqueryui-skin-classic -f plugin-jqueryui-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-legacy_browser-skin-larry -f plugin-legacy_browser-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-legacy_browser-skin-classic -f plugin-legacy_browser-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-managesieve-skin-larry -f plugin-managesieve-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-managesieve-skin-classic -f plugin-managesieve-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-markasjunk-skin-larry -f plugin-markasjunk-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-markasjunk-skin-classic -f plugin-markasjunk-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-vcard_attachments-skin-larry -f plugin-vcard_attachments-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-vcard_attachments-skin-classic -f plugin-vcard_attachments-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-zipdownload-skin-larry -f plugin-zipdownload-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-zipdownload-skin-classic -f plugin-zipdownload-skin-classic.files
-%defattr(-,root,root,-)
-
 %files plugin-acl-skin-larry-assets -f plugin-acl-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-acl-skin-classic-assets -f plugin-acl-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-archive-skin-larry-assets -f plugin-archive-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-archive-skin-classic-assets -f plugin-archive-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-enigma-skin-larry-assets -f plugin-enigma-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-enigma-skin-classic-assets -f plugin-enigma-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-help-skin-larry-assets -f plugin-help-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-help-skin-classic-assets -f plugin-help-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-hide_blockquote-skin-larry-assets -f plugin-hide_blockquote-skin-larry-assets.files
 %defattr(-,root,root,-)
 
 %files plugin-jqueryui-skin-larry-assets -f plugin-jqueryui-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-jqueryui-skin-classic-assets -f plugin-jqueryui-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-legacy_browser-skin-larry-assets -f plugin-legacy_browser-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-legacy_browser-skin-classic-assets -f plugin-legacy_browser-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-managesieve-skin-larry-assets -f plugin-managesieve-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-managesieve-skin-classic-assets -f plugin-managesieve-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-markasjunk-skin-larry-assets -f plugin-markasjunk-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-markasjunk-skin-classic-assets -f plugin-markasjunk-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-vcard_attachments-skin-larry-assets -f plugin-vcard_attachments-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-vcard_attachments-skin-classic-assets -f plugin-vcard_attachments-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-zipdownload-skin-larry-assets -f plugin-zipdownload-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-zipdownload-skin-classic-assets -f plugin-zipdownload-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files skin-larry -f skin-larry.files
 %defattr(-,root,root,-)
 
-%files skin-classic -f skin-classic.files
-%defattr(-,root,root,-)
-
 %files skin-larry-assets -f skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files skin-classic-assets -f skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %changelog
+* Wed Mar 15 2017 Timotheus Pokorra <tp@tbits.net> - 1.2.4-1
+- Check in upstream 1.2.4 release
+
 * Wed Nov 30 2016 Timotheus Pokorra <tp@tbits.net> - 1.2.3-1
 - Check in upstream 1.2.3 release

0001-Fix-so-settings-upload.inc-could-not-be-used-by-plug.patch Added

@@ -0,0 +1,42 @@
+From fa62496107d69198b70820d914abd3148d68e602 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <alec@alec.pl>
+Date: Fri, 17 Mar 2017 10:49:13 +0100
+Subject: [PATCH 1/6] Fix so settings/upload.inc could not be used by plugins
+ (#5694)
+
+---
+ CHANGELOG                         | 1 +
+ program/steps/settings/upload.inc | 5 +++++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/CHANGELOG b/CHANGELOG
+index 360242a..7ce0291 100644
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -25,6 +25,7 @@ RELEASE 1.2.4
+ - Add rewrite rule to disable access to /vendor/bin folder in .htaccess (#5630)
+ - Fix bug where it was too easy accidentally move a folder when using the subscription checkbox (#5655)
+ - Fix XSS issue in handling of a style tag inside of an svg element
++- Fix so settings/upload.inc could not be used by plugins (#5694)
+ 
+ RELEASE 1.2.3
+ -------------
+diff --git a/program/steps/settings/upload.inc b/program/steps/settings/upload.inc
+index 0cf7ae6..5e91f1d 100644
+--- a/program/steps/settings/upload.inc
++++ b/program/steps/settings/upload.inc
+@@ -27,6 +27,11 @@ if (!empty($_GET['_progress'])) {
+ $from = rcube_utils::get_input_value('_from', rcube_utils::INPUT_GET);
+ $type = preg_replace('/(add|edit)-/', '', $from);
+ 
++// Plugins in Settings may use this file for some uploads (#5694)
++// Make sure it does not contain a dot, which is a special character
++// when using rcube_session::append() below
++$type = str_replace('.', '-', $type);
++
+ if ($RCMAIL->action == 'upload-display') {
+     $id = 'undefined';
+ 
+-- 
+2.9.3
+

0002-Update-changelog.patch Added

@@ -0,0 +1,33 @@
+From d5be34ad17faeb520d958a868784c49d58c015a2 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <alec@alec.pl>
+Date: Fri, 17 Mar 2017 10:50:33 +0100
+Subject: [PATCH 2/6] Update changelog
+
+---
+ CHANGELOG | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CHANGELOG b/CHANGELOG
+index 7ce0291..e345387 100644
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -1,6 +1,8 @@
+ CHANGELOG Roundcube Webmail
+ ===========================
+ 
++- Fix so settings/upload.inc could not be used by plugins (#5694)
++
+ RELEASE 1.2.4
+ -------------
+ - Managesieve: Fix handling of scripts with nested rules (#5540)
+@@ -25,7 +27,6 @@ RELEASE 1.2.4
+ - Add rewrite rule to disable access to /vendor/bin folder in .htaccess (#5630)
+ - Fix bug where it was too easy accidentally move a folder when using the subscription checkbox (#5655)
+ - Fix XSS issue in handling of a style tag inside of an svg element
+-- Fix so settings/upload.inc could not be used by plugins (#5694)
+ 
+ RELEASE 1.2.3
+ -------------
+-- 
+2.9.3
+

0003-Remove-redundant-spaces-from-generated-contact-names.patch Added

@@ -0,0 +1,60 @@
+From 6a178b3a7f0331feab65727c5e2ddefbd08367ee Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <alec@alec.pl>
+Date: Mon, 20 Mar 2017 09:15:50 +0100
+Subject: [PATCH 3/6] Remove redundant spaces from generated contact names
+
+---
+ config/defaults.inc.php                     | 10 +++++-----
+ program/lib/Roundcube/rcube_addressbook.php |  8 ++++++--
+ 2 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/config/defaults.inc.php b/config/defaults.inc.php
+index 6bf250b..2a2e550 100644
+--- a/config/defaults.inc.php
++++ b/config/defaults.inc.php
+@@ -1032,11 +1032,11 @@ $config['addressbook_pagesize'] = 50;
+ // sort contacts by this col (preferably either one of name, firstname, surname)
+ $config['addressbook_sort_col'] = 'surname';
+ 
+-// the way how contact names are displayed in the list
+-// 0: display name
+-// 1: (prefix) firstname middlename surname (suffix)
+-// 2: (prefix) surname firstname middlename (suffix)
+-// 3: (prefix) surname, firstname middlename (suffix)
++// The way how contact names are displayed in the list.
++// 0: prefix firstname middlename surname suffix (only if display name is not set)
++// 1: firstname middlename surname
++// 2: surname firstname middlename
++// 3: surname, firstname middlename
+ $config['addressbook_name_listing'] = 0;
+ 
+ // use this timezone to display date/time
+diff --git a/program/lib/Roundcube/rcube_addressbook.php b/program/lib/Roundcube/rcube_addressbook.php
+index 3943fcf..1db4c30 100644
+--- a/program/lib/Roundcube/rcube_addressbook.php
++++ b/program/lib/Roundcube/rcube_addressbook.php
+@@ -497,8 +497,11 @@ abstract class rcube_addressbook
+         $contact = rcube::get_instance()->plugins->exec_hook('contact_displayname', $contact);
+         $fn = $contact['name'];
+ 
+-        if (!$fn)  // default display name composition according to vcard standard
+-            $fn = trim(join(' ', array_filter(array($contact['prefix'], $contact['firstname'], $contact['middlename'], $contact['surname'], $contact['suffix']))));
++        // default display name composition according to vcard standard
++        if (!$fn) {
++            $fn = join(' ', array_filter(array($contact['prefix'], $contact['firstname'], $contact['middlename'], $contact['surname'], $contact['suffix'])));
++            $fn = trim(preg_replace('/\s+/', ' ', $fn));
++        }
+ 
+         // use email address part for name
+         $email = self::get_col_values('email', $contact, true);
+@@ -547,6 +550,7 @@ abstract class rcube_addressbook
+         }
+ 
+         $fn = trim($fn, ', ');
++        $fn = preg_replace('/\s+/', ' ', $fn);
+ 
+         // fallbacks...
+         if ($fn === '') {
+-- 
+2.9.3
+

0004-Fix-regression-in-LDAP-fuzzy-search-where-it-always-.patch Added

@@ -0,0 +1,39 @@
+From 0fffea28c14e435ac63dc34c2d864dd17ac58b5d Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <alec@alec.pl>
+Date: Fri, 31 Mar 2017 09:45:21 +0200
+Subject: [PATCH 4/6] Fix regression in LDAP fuzzy search where it always used
+ prefix search instead (#5713)
+
+---
+ CHANGELOG                            | 1 +
+ program/lib/Roundcube/rcube_ldap.php | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CHANGELOG b/CHANGELOG
+index e345387..fb04e76 100644
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail
+ ===========================
+ 
+ - Fix so settings/upload.inc could not be used by plugins (#5694)
++- Fix regression in LDAP fuzzy search where it always used prefix search instead (#5713)
+ 
+ RELEASE 1.2.4
+ -------------
+diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
+index 6778d9b..441a6a3 100644
+--- a/program/lib/Roundcube/rcube_ldap.php
++++ b/program/lib/Roundcube/rcube_ldap.php
+@@ -840,7 +840,7 @@ class rcube_ldap extends rcube_addressbook
+             }
+ 
+             // compose a full-text-like search filter
+-            $filter = rcube_ldap_generic::fulltext_search_filter($value, $attributes, $mode);
++            $filter = rcube_ldap_generic::fulltext_search_filter($value, $attributes, $mode & ~rcube_addressbook::SEARCH_GROUPS);
+         }
+ 
+         // add required (non empty) fields filter
+-- 
+2.9.3
+

0005-Fix-bug-where-namespace-prefix-could-not-be-truncate.patch Added

@@ -0,0 +1,112 @@
+From 2f6ca6d6729603e227a7b041204bed8ea61edd5f Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <alec@alec.pl>
+Date: Sat, 1 Apr 2017 09:45:07 +0200
+Subject: [PATCH 5/6] Fix bug where namespace prefix could not be truncated on
+ folders list if show_real_foldernames=true (#5695)
+
+---
+ program/include/rcmail.php             | 25 +++++++++++++++++--------
+ program/steps/settings/edit_folder.inc |  9 +++++----
+ program/steps/settings/folders.inc     |  5 +++--
+ 4 files changed, 26 insertions(+), 14 deletions(-)
+
+diff --git a/program/include/rcmail.php b/program/include/rcmail.php
+index 68e0d6b..5dc7415 100644
+--- a/program/include/rcmail.php
++++ b/program/include/rcmail.php
+@@ -1674,12 +1674,13 @@ class rcmail extends rcube
+      * Try to localize the given IMAP folder name.
+      * UTF-7 decode it in case no localized text was found
+      *
+-     * @param string $name      Folder name
+-     * @param bool   $with_path Enable path localization
++     * @param string $name        Folder name
++     * @param bool   $with_path   Enable path localization
++     * @param bool   $path_remove Remove the path
+      *
+      * @return string Localized folder name in UTF-8 encoding
+      */
+-    public function localize_foldername($name, $with_path = false)
++    public function localize_foldername($name, $with_path = false, $path_remove = false)
+     {
+         $realnames = $this->config->get('show_real_foldernames');
+ 
+@@ -1687,12 +1688,20 @@ class rcmail extends rcube
+             return $this->gettext($folder_class);
+         }
+ 
++        $storage   = $this->get_storage();
++        $delimiter = $storage->get_hierarchy_delimiter();
++
++        // Remove the path
++        if ($path_remove) {
++            if (strpos($name, $delimiter)) {
++                $path = explode($delimiter, $name);
++                $name = array_pop($path);
++            }
++        }
+         // try to localize path of the folder
+-        if ($with_path && !$realnames) {
+-            $storage   = $this->get_storage();
+-            $delimiter = $storage->get_hierarchy_delimiter();
+-            $path      = explode($delimiter, $name);
+-            $count     = count($path);
++        else if ($with_path && !$realnames) {
++            $path  = explode($delimiter, $name);
++            $count = count($path);
+ 
+             if ($count > 1) {
+                 for ($i = 1; $i < $count; $i++) {
+diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
+index 8ddc17e..c16f2ca 100644
+--- a/program/steps/settings/edit_folder.inc
++++ b/program/steps/settings/edit_folder.inc
+@@ -86,20 +86,21 @@ function rcmail_folder_form($attrib)
+ 
+     // Location (name)
+     if ($options['protected']) {
+-        $foldername = str_replace($delimiter, ' &raquo; ', rcube::Q($RCMAIL->localize_folderpath($mbox)));
++        $foldername = str_replace($delimiter, ' &raquo; ', rcube::Q($RCMAIL->localize_foldername($mbox, false, true)));
+     }
+     else if ($options['norename']) {
+         $foldername = rcube::Q($folder);
+     }
+     else {
+-        if (isset($_POST['_name']))
++        if (isset($_POST['_name'])) {
+             $folder = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true));
++        }
+ 
+         $foldername = new html_inputfield(array('name' => '_name', 'id' => '_name', 'size' => 30));
+         $foldername = $foldername->show($folder);
+ 
+-        if ($options['special']) {
+-            $foldername .= '&nbsp;(' . rcube::Q($RCMAIL->localize_foldername($mbox)) .')';
++        if ($options['special'] && ($sname = $RCMAIL->localize_foldername($mbox, false, true)) != $folder) {
++            $foldername .= '&nbsp;(' . rcube::Q($sname) .')';
+         }
+     }
+ 
+diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc
+index 345eb47..a7fab76 100644
+--- a/program/steps/settings/folders.inc
++++ b/program/steps/settings/folders.inc
+@@ -277,12 +277,13 @@ function rcmail_subscription_form($attrib)
+     foreach ($list_folders as $i => $folder) {
+         $sub_key    = array_search($folder['id'], $a_subscribed);
+         $subscribed = $sub_key !== false;
+-        $protected  = $folder['id'] == 'INBOX' || ($protect_default && isset($special_folders[$folder['id']]));
++        $special    = $folder['id'] == 'INBOX' || isset($special_folders[$folder['id']]);
++        $protected  = $folder['id'] == 'INBOX' || ($protect_default && $special);
+         $noselect   = false;
+         $classes    = array();
+ 
+         $folder_utf8    = rcube_charset::convert($folder['id'], 'UTF7-IMAP');
+-        $display_folder = rcube::Q($protected ? $RCMAIL->localize_foldername($folder['id']) : $folder['name']);
++        $display_folder = rcube::Q($special ? $RCMAIL->localize_foldername($folder['id'], false, true) : $folder['name']);
+ 
+         if ($folder['virtual']) {
+             $classes[] = 'virtual';
+-- 
+2.9.3
+

0006-Fix-re-positioning-of-the-fixed-header-of-messages-l.patch Added

debian.changelog Changed

debian.control Changed

@@ -1,9 +1,9 @@
 Source: roundcubemail
 Section: web
 Priority: extra
-Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth.debian.org>
-Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>, Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
-Build-Depends: composer, debhelper (>= 8)
+Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
+Uploaders: Paul Klos <kolab@klos2day.nl>
+Build-Depends: composer, cssmin, node-uglify, debhelper (>= 8), psa | bash
 Homepage: http://www.roundcube.net/
 Standards-Version: 3.9.3
 Vcs-Git: git://git.kolabsys.com/git/apt/roundcubemail/
@@ -11,12 +11,27 @@
 
 Package: roundcubemail
 Architecture: all
+Depends:    php-net-ldap3,
+            roundcubemail-core,
+            ${misc:Depends}
+Replaces: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
+Conflicts: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
+Provides: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
+Description: skinnable AJAX based webmail solution for IMAP servers
+ RoundCube Webmail is a browser-based multilingual IMAP client with an
+ application-like user interface. It provides full functionality
+ expected from an e-mail client, including MIME support, address book,
+ folder manipulation and message filters.
+ .
+ The user interface is fully skinnable using XHTML and CSS 2.
+
+Package: roundcubemail-core
+Architecture: all
 Depends:    apache2 | httpd,
             libmagic1,
             php-auth-sasl,
             php-mail-mime (>= 1.8.0),
             php-mdb2 (>= 2.5.0),
-            php-net-ldap3,
             php-net-smtp,
             php-net-socket,
             php-net-sieve,
@@ -28,12 +43,13 @@
             php5-ldap | php-ldap,
             php5-mcrypt | php-mcrypt,
             php5-pspell | php-pspell,
+            roundcubemail-plugin-filesystem-attachments,
+            roundcubemail-plugin-jqueryui,
+            roundcubemail-plugin-zipdownload,
+            roundcubemail-plugin-managesieve,
             ucf,
             ${misc:Depends}
-Replaces: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
-Conflicts: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
-Provides: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
-Description: skinnable AJAX based webmail solution for IMAP servers
+Description: Core framework package for Roundcube
  RoundCube Webmail is a browser-based multilingual IMAP client with an
  application-like user interface. It provides full functionality
  expected from an e-mail client, including MIME support, address book,
@@ -43,3 +59,4 @@
  .
  This package provides the core code for roundcube. You should install
  it along with one of the roundcube database metapackages.
+

debian.rules Changed

@@ -6,56 +6,53 @@
 override_dh_auto_build:
 	mkdir -p $HOME/.composer
 	echo '{}' > $HOME/.composer/composer.json
-	patch -p1 < debian/patches/add-composer-autoloader.diff
+	patch -p1 < debian/patches/add-composer-autoloader.diff || :
 	composer.sh -vvv dumpautoload --optimize
 	sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_psr4.php
 	sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_namespaces.php
 	sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_classmap.php
-	dh_auto_build
-
-override_dh_install:
-	mkdir -p $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
-	cp -a \
-		bin \
-		composer.json-dist \
-		plugins \
-		program \
-		public_html \
-		skins \
-		vendor \
-		$(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
 
-	rm -rf $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/public_html/.htaccess
-
-	install -pm 644 index.php $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
-	install -pm 644 README.md $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
-	install -pm 644 robots.txt $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
+	rm -rvf tests/
 
 	# Compress the CSS
-	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.css"`; do \
-		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
-		install -pm 755 -d $$asset_loc ; \
-		cat $$file > $$asset_loc/$$(basename $$file) && rm -rf $$file || \
-		mv -v $$file $$asset_loc/$$(basename $$file); \
+	for file in `find $(CURDIR) -type f -name "*.css"`; do \
+		asset_loc=$$(dirname $$(echo $${file} | sed \
+				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
+				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
+				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
+			) ; \
+		mkdir -p $${asset_loc} ; \
+		echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \
+		cat $${file} | cssmin > $${asset_loc}/$$(basename $${file}) || \
+			cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
 	done
 
 	# Compress the JS, but not the already minified
-	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.js" ! -name "*.min.js"`; do \
-		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
-		install -pm 755 -d $$asset_loc ; \
-		cat $$file > $$asset_loc/$$(basename $$file) && rm -rf $$file || \
-		mv -v $$file $$asset_loc/$$(basename $$file); \
+	for file in `find $(CURDIR)/ -type f -name "*.js" ! -name "*.min.js"`; do \
+		asset_loc=$$(dirname $$(echo $${file} | sed \
+				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
+				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
+				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
+			) ; \
+		mkdir -p $${asset_loc} ; \
+		echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \
+		uglifyjs $${file} > $${asset_loc}/$$(basename $${file}) || \
+			cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
 	done
 
-	# The already minified JS can just be copied over to the assets location
-	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.min.js"`; do \
-		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
-		install -pm 755 -d $$asset_loc ; \
-		mv -v $$file $$asset_loc/$$(basename $$file); \
+	# The already minied JS can just be copied over to the assets location
+	for file in `find $(CURDIR)/ -type f -name "*.min.js"`; do \
+		asset_loc=$$(dirname $$(echo $${file} | sed \
+				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
+				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
+				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
+			) ; \
+		mkdir -p $${asset_loc} ; \
+		cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
 	done
 
 	# Other assets
-	for file in $$(find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f \
+	for file in $$(find $(CURDIR)/plugins/ $(CURDIR)/program/ $(CURDIR)/skins/ -type f \
 			-name "*.eot" -o \
 			-name "*.gif" -o \
 			-name "*.ico" -o \
@@ -66,50 +63,60 @@
 			-name "*.svg" -o \
 			-name "*.swf" -o \
 			-name "*.tif" -o \
+			-name "*.tiff" -o \
 			-name "*.ttf" -o \
 			-name "*.wav" -o \
 			-name "*.woff" \
 		); do \
-		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
-		install -pm 755 -d $$asset_loc ; \
-		mv -f $$file $$asset_loc/$$(basename $$file); \
+		asset_loc=$$(dirname $$(echo $${file} | sed \
+				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
+				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
+				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
+			) ; \
+		mkdir -p $${asset_loc} ; \
+		mv -vf $${file} $${asset_loc}/$$(basename $${file}); \
 	done
 
-	# The watermark.html is an asset, too
-	for file in $$(find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "watermark.html" ); do \
-		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
-		install -pm 755 -d $$asset_loc ; \
-		mv -f $$file $$asset_loc/$$(basename $$file); \
+	for plugin in `find $(CURDIR)/plugins/ -type d -mindepth 1 -maxdepth 1 -exec basename {} \;)`; do \
+		pkgname=$$(echo $${plugin} | sed -e 's/_/-/g') ; \
+		if [ -f "$(CURDIR)/plugins/$${plugin}/config.inc.php.dist" ]; then \
+			mv $(CURDIR)/plugins/$${plugin}/config.inc.php.dist $(CURDIR)/config/$${plugin}.inc.php ; \
+			echo "etc/roundcubemail/$${plugin}.inc.php usr/share/roundcubemail/plugins/$${plugin}/config.inc.php" >> debian/roundcubemail-plugin-$${pkgname}.links ; \
+			echo "config/$${plugin}.inc.php etc/roundcubemail/" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
+		fi ; \
+		if [ -d "$(CURDIR)/public_html/assets/plugins/$${plugin}" ]; then \
+			echo "public_html/assets/plugins/$${plugin} usr/share/roundcubemail/public_html/assets/plugins" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
+		fi ; \
+		echo "usr/share/roundcubemail/plugins/$${plugin}" >> debian/roundcubemail-plugin-$${pkgname}.dirs ; \
+		echo "plugins/$${plugin} usr/share/roundcubemail/plugins/" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
+		if [ -d "$(CURDIR)/plugins/$${plugin}/lib/Roundcube" ]; then \
+			mv $(CURDIR)/plugins/$${plugin}/lib $(CURDIR) ; \
+			echo "usr/share/roundcubemail/plugins/$${plugin}/lib/Roundcube" >> debian/roundcubemail-plugin-$${pkgname}.dirs ; \
+			echo "plugins/$${plugin}/lib/Roundcube usr/share/roundcubemail/plugins/$${plugin}/lib/" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
+		fi ; \
+		echo "" >> debian/control ; \
+		echo "Package: roundcubemail-plugin-$${pkgname}" >> debian/control ; \
+		echo "Architecture: all" >> debian/control ; \
+		echo "Depends: roundcubemail-core" >> debian/control ; \
+		echo "Description: $${plugin}} plugin for Roundcube" >> debian/control ; \
+		echo "" >> debian/control ; \
+		sed -i -e "/Files:/ i\
+ roundcubemail-plugin-$${plugin} deb web extra" debian/control ; \
 	done
 
-	mv $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/assets/ \
-		$(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/public_html/assets/ 
-
-	mkdir -p $(CURDIR)/debian/roundcubemail/etc/roundcubemail/
-	cp -a config/config.inc.php.sample $(CURDIR)/debian/roundcubemail/etc/roundcubemail/config.inc.php
-	cp -a config/defaults.inc.php $(CURDIR)/debian/roundcubemail/etc/roundcubemail/defaults.inc.php
-	cp -a config/mimetypes.php $(CURDIR)/debian/roundcubemail/etc/roundcubemail/mimetypes.php
-
-	ln -s ../../../etc/roundcubemail $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/config
+	if [ -f "/etc/plesk-release" ]; then \
+		cp -v ../SOURCES/plesk.config.inc.php config/config.inc.php ; \
+		cp -v ../SOURCES/plesk.password.inc.php config/password.inc.php ; \
+	else \
+		mv config/config.inc.php.sample config/config.inc.php ; \
+	fi
 
-	# Fix file permission
-	find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -exec chmod ugo-x {} \;
-	find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/bin/ -type f -exec chmod ugo+x {} \;
-
-	# Copy plugin configuration files to the correct location
-	for conffile in $$(find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/plugins -type f -name "config.inc.php.dist"); do \
-		plugin=$$(basename $$(dirname $$conffile)); \
-		mv $$conffile $(CURDIR)/debian/roundcubemail/etc/roundcubemail/$$plugin.inc.php; \
-		ln -s ../../../../../etc/roundcubemail/$$plugin.inc.php $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/plugins/$$plugin/config.inc.php; \
-	done
-
-	# Create the symbolic links for logs/ and temp/
-	ln -s ../../../var/lib/roundcubemail/ $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/temp
-	ln -s ../../../var/log/roundcubemail/ $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/logs
+	dh_auto_build
 
+override_dh_install:
 	# Install apache2 configuration
 	mkdir -p $(CURDIR)/debian/roundcubemail/etc/apache2/sites-available
 	install -pm 644 $(CURDIR)/debian/conf/roundcubemail.conf $(CURDIR)/debian/roundcubemail/etc/apache2/sites-available/roundcubemail.conf
 
 override_dh_compress:
-	dh_compress -Xsql   
+	dh_compress -Xsql

debian.series Changed

debian.tar.gz/dirs Deleted

debian.tar.gz/docs Deleted

debian.tar.gz/install Deleted

debian.tar.gz/postinst Deleted

@@ -1,51 +0,0 @@
-#!/bin/sh
-
-#EXTRA#
-#DEBHELPER#
-
-set -e
-
-fixperms() {
-    chown -R www-data:adm \
-        /var/lib/roundcubemail \
-        /var/log/roundcubemail
-    chmod 750 \
-        /var/lib/roundcubemail \
-        /var/log/roundcubemail
-	chown -R root:www-data /etc/roundcubemail
-	find /etc/roundcubemail -type d -exec chmod u+rwx,g+rx,g-w,o-rwx {} \;
-	find /etc/roundcubemail -type f -exec chmod u+rw,u-x,g+r,g-wx,o-rwx {} \;
-}
-
-reload_apache()
-{
-    if apache2ctl configtest 2>/dev/null; then
-        invoke-rc.d apache2 $1 || true
-    else
-        echo "Your apache2 configuration is broken, so we're not restarting it for you."
-    fi
-}
-
-update_database() {
-    /usr/share/roundcubemail/bin/updatedb.sh \
-        --dir /usr/share/doc/roundcubemail/SQL/ \
-        --package roundcube \
-        >/dev/null 2>&1 || :
-}
-
-
-
-case "$1" in
-    configure)
-        fixperms
-        update_database
-        a2enmod rewrite
-        if [ -e "/etc/apache2/sites-available/roundcubemail.conf" -a ! -e "/etc/apache2/sites-enabled/roundcubemail.conf" ]; then
-            a2ensite roundcubemail.conf
-            reload_apache reload
-        fi
-    ;;
-esac
-
-exit 0
-

debian.tar.gz/prerm Deleted

debian.tar.gz/roundcubemail-core.dirs Added

debian.tar.gz/roundcubemail-core.docs Added

debian.tar.gz/roundcubemail-core.install Added

debian.tar.gz/roundcubemail-core.links Added

debian.tar.gz/roundcubemail-core.postinst Added

@@ -0,0 +1,62 @@
+#!/bin/sh
+
+#EXTRA#
+#DEBHELPER#
+
+set -e
+
+fixperms() {
+    group=$(getent group roundcube_sysgroup >/dev/null 2>&1 && echo "roundcube_sysgroup" || echo "adm")
+    user=$(getent passwd roundcube_sysuser >/dev/null 2>&1 && echo "roundcube_sysuser" || echo "www-data")
+    chown -R ${user}:${group} \
+        /var/lib/roundcubemail \
+        /var/log/roundcubemail
+
+    chmod 750 \
+        /var/lib/roundcubemail \
+        /var/log/roundcubemail
+
+	chown -R root:${group} /etc/roundcubemail
+
+	find /etc/roundcubemail -type d -exec chmod u+rwx,g+rx,g-w,o-rwx {} \;
+	find /etc/roundcubemail -type f -exec chmod u+rw,u-x,g+r,g-wx,o-rwx {} \;
+}
+
+reload_apache()
+{
+    if apache2ctl configtest 2>/dev/null; then
+        invoke-rc.d apache2 $1 || true
+    else
+        echo "Your apache2 configuration is broken, so we're not restarting it for you."
+    fi
+}
+
+update_database() {
+    /usr/share/roundcubemail/bin/updatedb.sh \
+        --dir /usr/share/doc/roundcubemail/SQL/ \
+        --package roundcube \
+        >/dev/null 2>&1 || :
+}
+
+case "$1" in
+    configure)
+        fixperms
+        update_database
+        a2enmod rewrite
+
+        sed -i "s/rcmail-\!24ByteDESkey\*Str/`head -c 200 /dev/urandom | tr -dc _A-Z-a-z-0-9 | head -c24`/" \
+            /etc/roundcubemail/defaults.inc.php || : &> /dev/null
+
+        if [ -f "/etc/plesk-release" ]; then
+            exit 0
+        fi
+
+        if [ -e "/etc/apache2/sites-available/roundcubemail.conf" -a ! -e "/etc/apache2/sites-enabled/roundcubemail.conf" ]; then
+            a2ensite roundcubemail.conf
+        fi
+        reload_apache reload
+    ;;
+esac
+
+exit 0
+

debian.tar.gz/roundcubemail-core.postrm Changed

debian.tar.gz/roundcubemail-core.preinst Changed

debian.tar.gz/roundcubemail-core.prerm Added

debian.tar.gz/roundcubemail.dirs Added

debian.tar.gz/roundcubemail.docs Added

debian.tar.gz/roundcubemail.install Added

plesk.config.inc.php Added

@@ -0,0 +1,168 @@
+<?php
+    include_once("/usr/share/psa-roundcube/config/config.inc.php");
+
+/*  Incompatible with the stock installation
+
+    $components = explode('.', $_SERVER["HTTP_HOST"]);
+
+    if (count($components) > 2) {
+        array_shift($components);
+    }
+
+    $domain = implode('.', $components);
+    $config['session_domain'] = $domain;
+*/
+    $config['support_url'] = "https://kolabenterprise.com/support";
+
+    $config['product_name'] = "Kolab 16";
+
+    $config['use_secure_urls'] = true;
+
+    $config['assets_path'] = "/assets/";
+
+    $config['assets_dir'] = "/usr/share/roundcubemail/public_html/assets/";
+
+    $config['imap_cache'] = "db";
+    $config['imap_cache_ttl'] = "10d";
+
+    $config['message_cache'] = null;
+
+    $config['session_storage'] = "db";
+
+    $config['skin'] = "plesk";
+
+    $config['auto_create_user'] = true;
+
+    $config['enable_installer'] = false;
+
+    $config['plugins'] = Array(
+            'acl',
+            'archive',
+            'calendar',
+            'jqueryui',
+            'kolab_activesync',
+            'kolab_addressbook',
+            'kolab_config',
+            //'kolab_delegation',
+            'kolab_files',
+            'kolab_folders',
+            'kolab_notes',
+            'kolab_tags',
+            'libkolab',
+            'libcalendaring',
+            'managesieve',
+            'markasjunk',
+            'newmail_notifier',
+            'odfviewer',
+            'password',
+            'pdfviewer',
+            'tasklist',
+            'contextmenu',
+        );
+
+    $config['activesync_plugins'] = Array(
+            'libcalendaring',
+            'libkolab'
+        );
+
+    $config['kolabdav_plugins'] = Array(
+            'libcalendaring',
+            'libkolab'
+        );
+
+    $config['skip_deleted'] = true;
+
+    $config['read_when_deleted'] = true;
+    $config['flag_for_deletion'] = true;
+    $config['delete_always'] = true;
+
+    $config['session_lifetime'] = 180;
+    $config['password_charset'] = 'UTF-8';
+    $config['useragent'] = 'Kolab 16/Roundcube ' . RCUBE_VERSION;
+    $config['refresh_interval'] = 300;
+    $config['check_all_folders'] = false;
+    $config['dont_override'] = Array(
+            'check_all_folders',
+            'refresh_interval',
+            'skin'
+        );
+
+    $config['message_sort_col'] = 'date';
+    $config['default_list_mode'] = 'threads';
+    $config['autoexpand_threads'] = 2;
+
+    $config['message_sort_col'] = 'date';
+    $config['default_list_mode'] = 'threads';
+    $config['autoexpand_threads'] = 2;
+
+    $config['spellcheck_engine'] = 'pspell';
+    $config['spellcheck_dictionary'] = true;
+    $config['spellcheck_ignore_caps'] = true;
+    $config['spellcheck_ignore_nums'] = true;
+    $config['spellcheck_ignore_syms'] = true;
+    $config['spellcheck_languages'] = array(
+            'da' => 'Dansk',
+            'de' => 'Deutsch',
+            'en' => 'English',
+            'es' => 'Español',
+            'fr' => 'Français',
+            'it' => 'Italiano',
+            'nl' => 'Nederlands',
+            'pl' => 'Polski',
+            'pt' => 'Português',
+            'ru' => 'Русский',
+            'fi' => 'Suomi',
+            'sv' => 'Svenska'
+        );
+
+    $config['undo_timeout'] = 10;
+    $config['upload_progress'] = 2;
+    $config['address_template'] = '{street}<br/>{locality} {zipcode}<br/>{country} {region}';
+    $config['preview_pane'] = true;
+    $config['preview_pane_mark_read'] = 0;
+
+    // Bottom posting for reply mode
+    $config['reply_mode'] = 0;
+    $config['sig_above'] = false;
+    $config['mdn_requests'] = 0;
+    $config['mdn_default'] = false;
+    $config['dsn_default'] = false;
+    $config['reply_same_folder'] = false;
+
+    $config['performance_stats'] = true;
+
+    $config['drafts_mbox'] = 'Drafts';
+    $config['junk_mbox'] = 'Spam';
+    $config['sent_mbox'] = 'Sent';
+    $config['trash_mbox'] = 'Trash';
+
+    $config['skin_include_php'] = false;
+    $config['mime_magic'] = null;
+    $config['im_identify_path'] = '/usr/bin/identify';
+    $config['im_convert_path'] = '/usr/bin/convert';
+    $config['log_dir'] = 'logs/';
+    $config['temp_dir'] = '/var/lib/roundcubemail/';
+
+    $config['archive_mbox'] = 'Archive';
+    $config['junk_mbox'] = 'Spam';
+    $config['default_folders'] = array('INBOX', 'Archive', 'Drafts', 'Sent', 'Spam', 'Trash');
+
+    $config['log_driver'] = 'file';
+    $config['log_date_format'] = 'Y-M-d H:i:s O';
+    $config['syslog_id'] = 'roundcube';
+    $config['syslog_facility'] = LOG_USER;
+    $config['smtp_log'] = true;
+    $config['log_logins'] = true;
+    $config['log_session'] = true;
+    $config['debug_level'] = 1;
+    $config['devel_mode'] = false;
+    $config['sql_debug'] = false;
+    $config['memcache_debug'] = false;
+    $config['imap_debug'] = false;
+    $config['ldap_debug'] = false;
+    $config['smtp_debug'] = false;
+
+    $config['fileapi_backend'] = "kolab";
+    $config['fileapi_plugins'] = Array('kolab_folders');
+    $config['fileapi_manticore'] = false;
+    $config['fileapi_wopi_office'] = false;

plesk.password.inc.php Added

roundcubemail-1.2.3.tar.gz/.htaccess -> roundcubemail-1.2.4.tar.gz/.htaccess Changed

roundcubemail-1.2.3.tar.gz/CHANGELOG -> roundcubemail-1.2.4.tar.gz/CHANGELOG Changed

@@ -1,6 +1,31 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+RELEASE 1.2.4
+-------------
+- Managesieve: Fix handling of scripts with nested rules (#5540)
+- Managesieve: Fix parser issue with empty lines between comments (#5657)
+- Managesieve: Fix possible defect in handling \r\n in scripts (#5685)
+- Enigma: Fix handling of messages with nested PGP encrypted parts (#5634)
+- Enigma: Fix PHP fatal error when decrypting a message with invalid signature (#5555)
+- Enigma: Fix missing require statement for Crypt_GPG_KeyGenerator (#5641)
+- Fix variable substitution in ldap host for some use-cases, e.g. new_user_identity (#5544)
+- Fix adding images to new identity signatures
+- Fix rsync error handling in installto.sh script (#5562)
+- Fix some advanced search issues with multiple addressbooks (#5572)
+- Fix so group/addressbook selection is retained on page refresh
+- Fix bug where image data URIs in css style were treated as evil/remote in mail preview (#5580)
+- Fix bug where external content in src attribute of input/video tags was not secured (#5583)
+- Fix PHP error on update of a contact with multiple email addresses when using PHP 7.1 (#5587)
+- Fix bug where mail content frame couldn't be reset in some corner cases (#5608)
+- Fix bug where some classic skin images were not displayed in IE/Edge (#5614)
+- Fix bug where signature couldn't be added above the quote in Firefox 51 (#5628)
+- Fix regression where groups with email address were resolved to its members' addresses
+- Fix update of group name in the contacts list header on group rename (#5648)
+- Add rewrite rule to disable access to /vendor/bin folder in .htaccess (#5630)
+- Fix bug where it was too easy accidentally move a folder when using the subscription checkbox (#5655)
+- Fix XSS issue in handling of a style tag inside of an svg element
+
 RELEASE 1.2.3
 -------------
 - Searching in both contacts and groups when LDAP addressbook with group_filters option is used

roundcubemail-1.2.3.tar.gz/bin/installto.sh -> roundcubemail-1.2.4.tar.gz/bin/installto.sh Changed

@@ -42,7 +42,6 @@
 $input = trim(fgets(STDIN));
 
 if (strtolower($input) == 'y') {
-  $err = false;
   echo "Copying files to target location...";
 
   // Save a copy of original .htaccess file (#1490623)
@@ -56,16 +55,16 @@
   }
   foreach ($dirs as $dir) {
     // @FIXME: should we use --delete for all directories?
-    $delete = in_array($dir, array('program', 'installer')) ? '--delete ' : '';
-    if (!system("rsync -avC " . $delete . INSTALL_PATH . "$dir/* $target_dir/$dir/")) {
-      $err = true;
-      break;
+    $delete  = in_array($dir, array('program', 'installer')) ? '--delete ' : '';
+    $command = "rsync -aC --out-format \"%n\" " . $delete . INSTALL_PATH . "$dir/* $target_dir/$dir/";
+    if (!system($command, $ret) || $ret > 0) {
+      rcube::raise_error("Failed to execute command: $command", false, true);
     }
   }
   foreach (array('index.php','.htaccess','config/defaults.inc.php','composer.json-dist','CHANGELOG','README.md','UPGRADING','LICENSE','INSTALL') as $file) {
-    if (!system("rsync -av " . INSTALL_PATH . "$file $target_dir/$file")) {
-      $err = true;
-      break;
+    $command = "rsync -a --out-format \"%n\" " . INSTALL_PATH . "$file $target_dir/$file";
+    if (file_exists(INSTALL_PATH . $file) && (!system($command, $ret) || $ret > 0)) {
+      rcube::raise_error("Failed to execute command: $command", false, true);
     }
   }
 
@@ -96,13 +95,12 @@
       echo "done.\n\n";
   }
 
-  if (!$err) {
-    echo "Running update script at target...\n";
-    system("cd $target_dir && php bin/update.sh --version=$oldversion");
-    echo "All done.\n";
-  }
+  echo "Running update script at target...\n";
+  system("cd $target_dir && php bin/update.sh --version=$oldversion");
+  echo "All done.\n";
 }
-else
+else {
   echo "Update cancelled. See ya!\n";
+}
 
 ?>

roundcubemail-1.2.3.tar.gz/index.php -> roundcubemail-1.2.4.tar.gz/index.php Changed

roundcubemail-1.2.3.tar.gz/installer/index.php -> roundcubemail-1.2.4.tar.gz/installer/index.php Changed

roundcubemail-1.2.3.tar.gz/plugins/enigma/README -> roundcubemail-1.2.4.tar.gz/plugins/enigma/README Changed

roundcubemail-1.2.3.tar.gz/plugins/enigma/lib/enigma_driver_gnupg.php -> roundcubemail-1.2.4.tar.gz/plugins/enigma/lib/enigma_driver_gnupg.php Changed

@@ -281,6 +281,8 @@
      */
     public function gen_key($data)
     {
+        require_once 'Crypt/GPG/KeyGenerator.php';
+
         try {
             $debug  = $this->rc->config->get('enigma_debug');
             $keygen = new Crypt_GPG_KeyGenerator(array(
@@ -409,17 +411,20 @@
      */
     protected function parse_signature($sig)
     {
-        $user = $sig->getUserId();
-
         $data = new enigma_signature();
+
         $data->id          = $sig->getId();
         $data->valid       = $sig->isValid();
         $data->fingerprint = $sig->getKeyFingerprint();
         $data->created     = $sig->getCreationDate();
         $data->expires     = $sig->getExpirationDate();
-        $data->name        = $user->getName();
-        $data->comment     = $user->getComment();
-        $data->email       = $user->getEmail();
+
+        // In case of ERRSIG user may not be set
+        if ($user = $sig->getUserId()) {
+            $data->name    = $user->getName();
+            $data->comment = $user->getComment();
+            $data->email   = $user->getEmail();
+        }
 
         return $data;
     }

roundcubemail-1.2.3.tar.gz/plugins/enigma/lib/enigma_engine.php -> roundcubemail-1.2.4.tar.gz/plugins/enigma/lib/enigma_engine.php Changed

roundcubemail-1.2.3.tar.gz/plugins/managesieve/Changelog -> roundcubemail-1.2.4.tar.gz/plugins/managesieve/Changelog Changed

roundcubemail-1.2.3.tar.gz/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php -> roundcubemail-1.2.4.tar.gz/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php Changed

@@ -562,7 +562,8 @@
                     $prefix .= $line . "\n";
                 }
 
-                $position = $endl + 1;
+                // skip empty lines after the comment (#5657)
+                $position = self::ltrim_position($script, $endl + 1);
             }
 
             // handle script header
@@ -805,6 +806,11 @@
             $token     = !empty($tokens) ? array_shift($tokens) : $separator;
 
             switch ($token) {
+            case 'if':
+                // nested 'if' conditions, ignore the whole rule (#5540)
+                $this->_parse_actions($content, $position);
+                continue 2;
+
             case 'discard':
             case 'keep':
             case 'stop':
@@ -890,8 +896,9 @@
                 break;
             }
 
-            if ($separator == $end)
+            if ($separator == $end) {
                 break;
+            }
         }
 
         return $result;
@@ -1208,7 +1215,7 @@
                         if ($str[$position] == "\n") {
                             $position++;
                         }
-                        else if ($str[$position] == "\r" && $str[$position] == "\n") {
+                        else if ($str[$position] == "\r" && $str[$position + 1] == "\n") {
                             $position += 2;
                         }

roundcubemail-1.2.4.tar.gz/plugins/managesieve/tests/src/parser_nesting Added

@@ -0,0 +1,25 @@
+# Sieve Filter
+# Erzeugt von Ingo (http://www.horde.org/ingo/) (30.09.2016, 16:02)
+
+# Nested rules aren't supported and will be ignored (#5540)
+
+require ["vacation", "regex"];
+
+# Abwesenheit
+if allof ( not exists ["list-help", "list-unsubscribe", "list-subscribe", "list-owner", "list-post", "list-archive", "list-id", "Mailing-List"],
+  not header :is "Precedence" ["list", "bulk", "junk"],
+  not header :matches "To" "Multiple recipients of*") {
+    if header :regex "Received" "^.*(2016) (\$.*\$ )?..:..:.. (\$.*\$ )?(\\+|\\-)....( \$.*\$)?$" {
+    if header :regex "Received" "^.*(Oct) (\$.*\$ )?.... (\$.*\$ )?..:..:.. (\$.*\$ )?(\\+|\\-)....( \$.*\$)?$" {
+    if header :regex "Received" "^.*([0 ]4|[0 ]5|[0 ]6|[0 ]7) (\$.*\$ )?... (\$.*\$ )?.... (\$.*\$ )?..:..:.. (\$.*\$ )?(\\+|\\-)....( \$.*\$)?$" {
+    vacation :days 7 :addresses "test@company.com" :subject "vacation" "blablabla";
+}
+}
+}
+}
+
+# Ausgeschlossene Adressen
+if address :is ["From", "Sender", "Resent-From"] "noreply@example.org"  {
+    discard;
+    stop;
+}

roundcubemail-1.2.4.tar.gz/plugins/managesieve/tests/src/parser_nesting.out Added

roundcubemail-1.2.3.tar.gz/program/include/iniset.php -> roundcubemail-1.2.4.tar.gz/program/include/iniset.php Changed

roundcubemail-1.2.3.tar.gz/program/js/app.js -> roundcubemail-1.2.4.tar.gz/program/js/app.js Changed

@@ -339,8 +339,21 @@
           // init message compose form
           this.init_messageform();
         }
-        else if (this.env.action == 'get')
-          this.enable_command('download', 'print', true);
+        else if (this.env.action == 'get') {
+          this.enable_command('download', true);
+
+          // Mozilla's PDF.js viewer does not allow printing from host page (#5125)
+          // to minimize user confusion we disable the Print button
+          if (bw.mz && this.env.mimetype == 'application/pdf') {
+            n = 0; // there will be two onload events, first for the preload page
+            $(this.gui_objects.messagepartframe).on('load', function() {
+              if (n++) try { this.contentWindow.document; ref.enable_command('print', true); }
+                catch (e) {/* ignore */}
+            });
+          }
+          else
+            this.enable_command('print', true);
+        }
         // show printing dialog
         else if (this.env.action == 'print' && this.env.uid
           && !this.env.is_pgp_content && !this.env.pgp_mime_part
@@ -3228,7 +3241,8 @@
     var r_uids = [],
       post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: 'delete'}),
       lock = this.display_message(this.get_label('markingmessage'), 'loading'),
-      rows = this.message_list ? this.message_list.rows : {},
+      list = this.message_list,
+      rows = list ? list.rows : {},
       count = 0;
 
     for (var i=0, len=a_uids.length; i<len; i++) {
@@ -3239,7 +3253,7 @@
 
         if (this.env.skip_deleted) {
           count += this.update_thread(uid);
-          this.message_list.remove_row(uid, (this.env.display_next && i == this.message_list.selection.length-1));
+          list.remove_row(uid, (this.env.display_next && i == list.selection.length-1));
         }
         else
           this.set_message(uid, 'deleted', true);
@@ -3247,9 +3261,9 @@
     }
 
     // make sure there are no selected rows
-    if (this.env.skip_deleted && this.message_list) {
-      if (!this.env.display_next)
-        this.message_list.clear_selection();
+    if (this.env.skip_deleted && list) {
+      if (!this.env.display_next || !list.rowcount)
+        list.clear_selection();
       if (count < 0)
         post_data._count = (count*-1);
       else if (count > 0)
@@ -3987,6 +4001,8 @@
       // add signature according to selected identity
       // if we have HTML editor, signature is added in a callback
       if (input_from.prop('type') == 'select-one') {
+        // for some reason the caret initially is not at pos=0 in Firefox 51 (#5628)
+        this.set_caret_pos(input_message, 0);
         this.change_identity(input_from[0]);
       }
 
@@ -5572,6 +5588,9 @@
       url._search = this.env.search_request;
 
     this.http_request(this.env.task == 'mail' ? 'list-contacts' : 'list', url, lock);
+
+    if (this.env.task != 'mail')
+      this.update_state({_source: src, _page: page && page > 1 ? page : null, _gid: group});
   };
 
   this.list_contacts_clear = function()
@@ -5602,9 +5621,6 @@
 
       boxtitle.append($('<span>').text(prop ? prop.name : this.get_label('contacts')));
     }
-
-    if (prop)
-      this.triggerEvent('groupupdate', prop);
   };
 
   // load contact record
@@ -6030,6 +6046,7 @@
     else {
       $(this.treelist.get_item(key)).children().first().html(prop.name);
       this.env.contactfolders[key].name = this.env.contactgroups[key].name = prop.name;
+      this.set_group_prop(prop);
     }
 
     // update list node and re-sort it
@@ -6502,7 +6519,7 @@
       .addEventListener('collapse', function(node) { ref.folder_collapsed(node) })
       .addEventListener('expand', function(node) { ref.folder_collapsed(node) })
       .addEventListener('search', function(p) { if (p.query) ref.subscription_select(); })
-      .draggable({cancel: 'li.mailbox.root'})
+      .draggable({cancel: 'li.mailbox.root,input,div.treetoggle'})
       .droppable({
         // @todo: find better way, accept callback is executed for every folder
         // on the list when dragging starts (and stops), this is slow, but

roundcubemail-1.2.3.tar.gz/program/lib/Roundcube/bootstrap.php -> roundcubemail-1.2.4.tar.gz/program/lib/Roundcube/bootstrap.php Changed

roundcubemail-1.2.3.tar.gz/program/lib/Roundcube/rcube_ldap.php -> roundcubemail-1.2.4.tar.gz/program/lib/Roundcube/rcube_ldap.php Changed

roundcubemail-1.2.3.tar.gz/program/lib/Roundcube/rcube_ldap_generic.php -> roundcubemail-1.2.4.tar.gz/program/lib/Roundcube/rcube_ldap_generic.php Changed

roundcubemail-1.2.3.tar.gz/program/lib/Roundcube/rcube_utils.php -> roundcubemail-1.2.4.tar.gz/program/lib/Roundcube/rcube_utils.php Changed

roundcubemail-1.2.3.tar.gz/program/lib/Roundcube/rcube_washtml.php -> roundcubemail-1.2.4.tar.gz/program/lib/Roundcube/rcube_washtml.php Changed

roundcubemail-1.2.3.tar.gz/program/steps/addressbook/func.inc -> roundcubemail-1.2.4.tar.gz/program/steps/addressbook/func.inc Changed

@@ -152,14 +152,18 @@
     else
         $CONTACTS->set_page(isset($_SESSION['page']) ? $_SESSION['page'] : 1);
 
-    if (!empty($_REQUEST['_gid']))
-        $CONTACTS->set_group(rcube_utils::get_input_value('_gid', rcube_utils::INPUT_GPC));
+    if (!empty($_REQUEST['_gid'])) {
+        $group = rcube_utils::get_input_value('_gid', rcube_utils::INPUT_GPC);
+        $CONTACTS->set_group($group);
+    }
 
-    if (!$init_env)
+    if (!$init_env) {
         return $CONTACTS;
+    }
 
     $OUTPUT->set_env('readonly', $CONTACTS->readonly);
     $OUTPUT->set_env('source', (string) $source);
+    $OUTPUT->set_env('group', $group);
 
     // reduce/extend $CONTACT_COLTYPES with specification from the current $CONTACT object
     if (is_array($CONTACTS->coltypes)) {
@@ -666,8 +670,9 @@
                 }
 
                 // hack: create empty values array to force this field to be displayed
-                if (empty($values) && $colprop['visible'])
-                    $values[] = '';
+                if (empty($values) && $colprop['visible']) {
+                    $values = array('');
+                }
 
                 if (!is_array($values)) {
                     // $values can be an object, don't use (array)$values syntax
@@ -676,8 +681,9 @@
 
                 $rows = '';
                 foreach ($values as $i => $val) {
-                    if ($subtypes[$i])
+                    if ($subtypes[$i]) {
                         $subtype = $subtypes[$i];
+                    }
 
                     $colprop['id'] = 'ff_' . $col . intval($coltypes[$field]['count']);

roundcubemail-1.2.3.tar.gz/program/steps/addressbook/search.inc -> roundcubemail-1.2.4.tar.gz/program/steps/addressbook/search.inc Changed

roundcubemail-1.2.3.tar.gz/program/steps/mail/autocomplete.inc -> roundcubemail-1.2.4.tar.gz/program/steps/mail/autocomplete.inc Changed

@@ -30,10 +30,10 @@
         $result    = $abook->list_records($RCMAIL->config->get('contactlist_fields'));
         $members   = array();
 
-        while ($result && ($sql_arr = $result->iterate())) {
-            $emails = (array) $abook->get_col_values('email', $sql_arr, true);
+        while ($result && ($record = $result->iterate())) {
+            $emails = (array) $abook->get_col_values('email', $record, true);
             if (!empty($emails) && ($email = array_shift($emails))) {
-                $members[] = format_email_recipient($email, rcube_addressbook::compose_list_name($sql_arr));
+                $members[] = format_email_recipient($email, rcube_addressbook::compose_list_name($record));
             }
         }
 
@@ -70,9 +70,9 @@
         $abook->set_pagesize($MAXNUM);
 
         if ($result = $abook->search($RCMAIL->config->get('contactlist_fields'), $search, $mode, true, true, 'email')) {
-            while ($sql_arr = $result->iterate()) {
+            while ($record = $result->iterate()) {
                 // Contact can have more than one e-mail address
-                $email_arr = (array)$abook->get_col_values('email', $sql_arr, true);
+                $email_arr = (array)$abook->get_col_values('email', $record, true);
                 $email_cnt = count($email_arr);
                 $idx       = 0;
 
@@ -81,7 +81,7 @@
                         continue;
                     }
 
-                    $name    = rcube_addressbook::compose_list_name($sql_arr);
+                    $name    = rcube_addressbook::compose_list_name($record);
                     $contact = format_email_recipient($email, $name);
 
                     // skip entries that don't match
@@ -93,12 +93,17 @@
 
                     // skip duplicates
                     if (empty($contacts[$index])) {
-                        $contact = array('name' => $contact, 'type' => $sql_arr['_type']);
+                        $contact = array('name' => $contact, 'type' => $record['_type']);
 
-                        if (($display = rcube_addressbook::compose_search_name($sql_arr, $email, $name)) && $display != $contact['name']) {
+                        if (($display = rcube_addressbook::compose_search_name($record, $email, $name)) && $display != $contact['name']) {
                             $contact['display'] = $display;
                         }
 
+                        // groups with defined email address will not be expanded to its members' addresses
+                        if ($record['_type'] == 'group') {
+                            $contact['email'] = $email;
+                        }
+
                         $contacts[$index]  = $contact;
                         $sort_keys[$index] = sprintf('%s %03d', $contact['display'] ?: $name, $idx++);

roundcubemail-1.2.3.tar.gz/program/steps/mail/func.inc -> roundcubemail-1.2.4.tar.gz/program/steps/mail/func.inc Changed

roundcubemail-1.2.3.tar.gz/program/steps/mail/get.inc -> roundcubemail-1.2.4.tar.gz/program/steps/mail/get.inc Changed

roundcubemail-1.2.3.tar.gz/program/steps/settings/func.inc -> roundcubemail-1.2.4.tar.gz/program/steps/settings/func.inc Changed

roundcubemail-1.2.3.tar.gz/program/steps/settings/save_identity.inc -> roundcubemail-1.2.4.tar.gz/program/steps/settings/save_identity.inc Changed

roundcubemail-1.2.3.tar.gz/program/steps/settings/upload.inc -> roundcubemail-1.2.4.tar.gz/program/steps/settings/upload.inc Changed

roundcubemail-1.2.3.tar.gz/skins/classic/images/buttons/bg.gif -> roundcubemail-1.2.4.tar.gz/skins/classic/images/buttons/bg.gif Changed

roundcubemail-1.2.3.tar.gz/skins/classic/images/pagenav.gif -> roundcubemail-1.2.4.tar.gz/skins/classic/images/pagenav.gif Changed

roundcubemail-1.2.3.tar.gz/skins/classic/images/searchfield.gif -> roundcubemail-1.2.4.tar.gz/skins/classic/images/searchfield.gif Changed

roundcubemail-1.2.3.tar.gz/skins/classic/images/tabs-left.gif -> roundcubemail-1.2.4.tar.gz/skins/classic/images/tabs-left.gif Changed

roundcubemail-1.2.3.tar.gz/skins/classic/images/tabs-right.gif -> roundcubemail-1.2.4.tar.gz/skins/classic/images/tabs-right.gif Changed

roundcubemail-1.2.3.tar.gz/skins/classic/images/taskicons.gif -> roundcubemail-1.2.4.tar.gz/skins/classic/images/taskicons.gif Changed

roundcubemail-1.2.3.tar.gz/skins/classic/images/watermark.gif -> roundcubemail-1.2.4.tar.gz/skins/classic/images/watermark.gif Changed

roundcubemail-1.2.3.tar.gz/tests/Framework/Utils.php -> roundcubemail-1.2.4.tar.gz/tests/Framework/Utils.php Changed

roundcubemail-1.2.3.tar.gz/tests/Framework/Washtml.php -> roundcubemail-1.2.4.tar.gz/tests/Framework/Washtml.php Changed

roundcubemail.dsc Changed

@@ -2,16 +2,17 @@
 Source: roundcubemail
 Binary: roundcubemail
 Architecture: all
-Version: 1:1.2.3-0~kolab3
-Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth.debian.org>
-Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>, Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
+Version: 1:1.2.4-0~kolab1.16
+Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
+Uploaders: Paul Klos <kolab@klos2day.nl>
 Homepage: http://www.roundcube.net/
 Standards-Version: 3.9.3
 Vcs-Browser: http://git.kolabsys.com/apt/roundcubemail/
 Vcs-Git: git://git.kolabsys.com/git/apt/roundcubemail/
-Build-Depends: composer, debhelper (>= 8)
-Package-List: 
+Build-Depends: composer, cssmin, node-uglify, debhelper (>= 8), psa | bash
+Package-List:
  roundcubemail deb web extra
-Files: 
- 00000000000000000000000000000000 0 roundcubemail-1.2.3.tar.gz
+ roundcubemail-core deb web extra
+Files:
+ 00000000000000000000000000000000 0 roundcubemail-1.2.4.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

Overview

Request 1984 (accepted)

Request History