From cvs at kolab.org Fri Jan 2 12:47:12 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 2 Jan 2009 12:47:12 +0100 (CET) Subject: thomas: server install-kolab.sh, 1.49, 1.50 release-notes.txt, 1.350, 1.351 Message-ID: <20090102114712.386F1600935@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv25127 Modified Files: install-kolab.sh release-notes.txt Log Message: Repair option -E to not require an argument. This was introduced between 2.2-rc3 and 2.2.0 when removing -F/-H/-i Index: install-kolab.sh =================================================================== RCS file: /kolabrepository/server/install-kolab.sh,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- install-kolab.sh 12 Dec 2008 16:36:35 -0000 1.49 +++ install-kolab.sh 2 Jan 2009 11:47:09 -0000 1.50 @@ -100,7 +100,7 @@ echo "$newlist" } -while getopts hcBXE:V:p:I:u:t:O:x: ARGS; do +while getopts hcBXEV:p:I:u:t:O:x: ARGS; do case $ARGS in h) # Display help usage Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.350 retrieving revision 1.351 diff -u -d -r1.350 -r1.351 --- release-notes.txt 30 Dec 2008 14:18:34 -0000 1.350 +++ release-notes.txt 2 Jan 2009 11:47:10 -0000 1.351 @@ -45,6 +45,10 @@ Changes between 2.2.1-beta-1 and 2.2.1-beta-2 + - install-kolab.sh + + Repair option -E to not require an argument. + - kolabd-2.2.1-2009???? kolab/issue3322 (freebusy.conf.template: ldap server can be on another machine) @@ -52,6 +56,7 @@ - perl-kolab-2.2.1-2009???? kolab/issue3321 (slapd.replicas.template and slapd.access.template can be absent) + Changes between 2.2.0 and 2.2.1-beta-1 From cvs at kolab.org Fri Jan 2 15:31:29 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 2 Jan 2009 15:31:29 +0100 (CET) Subject: thomas: server release-notes.txt, 1.351, 1.352 install-kolab.sh, 1.50, 1.51 Message-ID: <20090102143129.9A090600936@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv31915 Modified Files: release-notes.txt install-kolab.sh Log Message: Abort cleanly on -c or -X if no OpenPKG environment is found. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.351 retrieving revision 1.352 diff -u -d -r1.351 -r1.352 --- release-notes.txt 2 Jan 2009 11:47:10 -0000 1.351 +++ release-notes.txt 2 Jan 2009 14:31:27 -0000 1.352 @@ -48,6 +48,7 @@ - install-kolab.sh Repair option -E to not require an argument. + Abort cleanly on -c or -X if no OpenPKG environment is found. - kolabd-2.2.1-2009???? Index: install-kolab.sh =================================================================== RCS file: /kolabrepository/server/install-kolab.sh,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- install-kolab.sh 2 Jan 2009 11:47:09 -0000 1.50 +++ install-kolab.sh 2 Jan 2009 14:31:27 -0000 1.51 @@ -183,10 +183,10 @@ echo "Generating 00INDEX.rdf for binary ($PLATTAG) distribution ..." exec "$PREFIX/bin/openpkg" index -r . -o 00INDEX.rdf -i -p $PLATTAG . fi - else - echo "\"$PREFIX\" seems to be no OpenPKG environment." - exit 1 fi + else + echo "\"$PREFIX\" seems to be no OpenPKG environment." + exit 1 fi fi From cvs at kolab.org Fri Jan 2 16:57:21 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 2 Jan 2009 16:57:21 +0100 (CET) Subject: thomas: server release-notes.txt,1.352,1.353 Message-ID: <20090102155721.D4CBD600936@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv3027 Modified Files: release-notes.txt Log Message: Mention martin.schulte at guug.de as the reporter of install-kolab.sh bugs. (after asking him) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.352 retrieving revision 1.353 diff -u -d -r1.352 -r1.353 --- release-notes.txt 2 Jan 2009 14:31:27 -0000 1.352 +++ release-notes.txt 2 Jan 2009 15:57:19 -0000 1.353 @@ -47,8 +47,9 @@ - install-kolab.sh - Repair option -E to not require an argument. - Abort cleanly on -c or -X if no OpenPKG environment is found. + Fixed two problems reported by martin.schulte at guug.de: + Repair option -E to not require an argument. + Abort cleanly on -c or -X if no OpenPKG environment is found. - kolabd-2.2.1-2009???? From cvs at kolab.org Tue Jan 6 23:20:30 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 6 Jan 2009 23:20:30 +0100 (CET) Subject: mathieu: server/kolabd/kolabd/dist_conf debian,1.22,1.23 Message-ID: <20090106222030.7CE3D60093F@lists.intevation.de> Author: mathieu Update of /kolabrepository/server/kolabd/kolabd/dist_conf In directory doto:/tmp/cvs-serv6748/dist_conf Modified Files: debian Log Message: dist_conf/debian: update to current debian dist_conf Index: debian =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- debian 18 Nov 2008 18:29:29 -0000 1.22 +++ debian 6 Jan 2009 22:20:28 -0000 1.23 @@ -143,22 +143,22 @@ resmgr_conffile_usr=kolab resmgr_conffile_grp=root #resmgr_tmpdir= -resmgr_scriptsdir=/usr/share/kolab/filter +resmgr_scriptsdir=${bindir} resmgr_usr=root resmgr_grp=www-data -resmgr_filterdir=${localstatedir}/lib/kolab/resmgr/filter +resmgr_filterdir=${kolab_statedir}/resmgr/filter -fbview_logfile=${localstatedir}/resmgr/fbview.log +fbview_logfile=${localstatedir}/log/fbview.log freebusy_logdir=${localstatedir}/log freebusy_confdir=${sysconfdir}/kolab/freebusy -freebusy_cachedir=${localstatedir}/lib/kolab/freebusy-cache +freebusy_cachedir=${kolab_statedir}/freebusy-cache freebusy_usr=root freebusy_grp=www-data -graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db -graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db +graveyard_uidcache=${kolab_statedir}/graveyard_uidcache.db +graveyard_tscache=${kolab_statedir}/graveyard_tscache.db -backupdir=${localstatedir}/backups/kolab +backupdir=${kolab_statedir}/backups pki_grp=${kolab_rgrp} From cvs at kolab.org Tue Jan 6 23:20:30 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 6 Jan 2009 23:20:30 +0100 (CET) Subject: mathieu: server/kolabd/kolabd ChangeLog,1.212,1.213 Message-ID: <20090106222030.7A91B600933@lists.intevation.de> Author: mathieu Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv6748 Modified Files: ChangeLog Log Message: dist_conf/debian: update to current debian dist_conf Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.212 retrieving revision 1.213 diff -u -d -r1.212 -r1.213 --- ChangeLog 30 Dec 2008 14:18:34 -0000 1.212 +++ ChangeLog 6 Jan 2009 22:20:28 -0000 1.213 @@ -1,3 +1,7 @@ +2008-01-06 Mathieu Parent + + * dist_conf/debian: update to current debian dist_conf + 2008-12-30 Mathieu Parent * templates/freebusy.conf.template.in: freebusy.conf.template: ldap server From cvs at kolab.org Wed Jan 7 10:18:56 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 7 Jan 2009 10:18:56 +0100 (CET) Subject: martin: server/kolabd/kolabd kolab2.schema,1.31,1.32 Message-ID: <20090107091856.E4A07600948@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv30452/kolabd/kolabd Modified Files: kolab2.schema Log Message: Martin Konold: Made postfix message size limit configurable via LDAP while remaining backwards compatible. Gunnar will do the final testing Index: kolab2.schema =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- kolab2.schema 11 Dec 2008 17:06:41 -0000 1.31 +++ kolab2.schema 7 Jan 2009 09:18:54 -0000 1.32 @@ -405,6 +405,11 @@ SUBSTR caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) +attributetype ( 1.3.6.1.4.1.19414.2.1.511 + NAME 'postfix-message_size_limit' + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 ) + ########################## # cyrus imapd attributes # ########################## From cvs at kolab.org Wed Jan 7 10:18:56 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 7 Jan 2009 10:18:56 +0100 (CET) Subject: martin: server/kolabd/kolabd/templates main.cf.template.in, 1.20, 1.21 Message-ID: <20090107091856.E940A60094A@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv30452/kolabd/kolabd/templates Modified Files: main.cf.template.in Log Message: Martin Konold: Made postfix message size limit configurable via LDAP while remaining backwards compatible. Gunnar will do the final testing Index: main.cf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- main.cf.template.in 6 Aug 2008 12:29:37 -0000 1.20 +++ main.cf.template.in 7 Jan 2009 09:18:54 -0000 1.21 @@ -14,10 +14,13 @@ # this file is automatically written by the Kolab config backend # manual additions are lost unless made to the template in the Kolab config directory - # postfix default is 10 240 000 Byte = 10.24 Megabyte, -# we use 20 Mebibyte = 20*2^20 Byte +# we use 20 Megabyte = 20*2^20 Byte as Kolab default +@@@if postfix-message_size_limit@@@ +message_size_limit = @@@postfix-message_size_limit@@@ +@@@else@@@ message_size_limit = 20971520 +@@@endif@@@ # paths command_directory = @sbindir@ From cvs at kolab.org Wed Jan 7 20:42:44 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 7 Jan 2009 20:42:44 +0100 (CET) Subject: gunnar: server/pear/PEAR-PHPUnit-Channel pear.phpunit.de.xml, NONE, 1.1 ChangeLog, 1.2, 1.3 PEAR-PHPUnit-Channel.spec, 1.4, 1.5 Message-ID: <20090107194244.EBB88600957@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-PHPUnit-Channel In directory doto:/tmp/cvs-serv21437/PEAR-PHPUnit-Channel Modified Files: ChangeLog PEAR-PHPUnit-Channel.spec Added Files: pear.phpunit.de.xml Log Message: kolab/issue3315 (PEAR-Horde-Channel-1.0 fails to compile on solaris 10) --- NEW FILE: pear.phpunit.de.xml --- pear.phpunit.de PHPUnit channel server phpunit http://pear.phpunit.de/Chiara_PEAR_Server_REST/ http://pear.phpunit.de/Chiara_PEAR_Server_REST/ Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/pear/PEAR-PHPUnit-Channel/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ChangeLog 18 Dec 2008 19:06:23 -0000 1.2 +++ ChangeLog 7 Jan 2009 19:42:42 -0000 1.3 @@ -1,3 +1,9 @@ +2009-01-07 Gunnar Wrobel

+ + * PEAR-PHPUnit-Channel.spec: + kolab/issue3315 (PEAR-Horde-Channel-1.0 fails to compile on + solaris 10) + 2008-12-18 Gunnar Wrobel

* PEAR-PHPUnit-Channel.spec: Index: PEAR-PHPUnit-Channel.spec =================================================================== RCS file: /kolabrepository/server/pear/PEAR-PHPUnit-Channel/PEAR-PHPUnit-Channel.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- PEAR-PHPUnit-Channel.spec 18 Dec 2008 19:06:23 -0000 1.4 +++ PEAR-PHPUnit-Channel.spec 7 Jan 2009 19:42:42 -0000 1.5 @@ -8,7 +8,7 @@ Group: Development/Languages License: N/A URL: http://pear.phpunit.de/ -Source0: http://pear.phpunit.de/channel.xml +Source0: pear.phpunit.de.xml # Build Info Prefix: %{l_prefix} @@ -30,7 +30,7 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{pear_xmldir} -install -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.phpunit.de.xml +install -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir} %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} %clean From cvs at kolab.org Wed Jan 7 20:42:44 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 7 Jan 2009 20:42:44 +0100 (CET) Subject: gunnar: server/pear/PEAR-Horde-Channel pear.horde.org.xml, NONE, 1.1 ChangeLog, 1.2, 1.3 PEAR-Horde-Channel.spec, 1.5, 1.6 Message-ID: <20090107194244.E8F6F600956@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Horde-Channel In directory doto:/tmp/cvs-serv21437/PEAR-Horde-Channel Modified Files: ChangeLog PEAR-Horde-Channel.spec Added Files: pear.horde.org.xml Log Message: kolab/issue3315 (PEAR-Horde-Channel-1.0 fails to compile on solaris 10) --- NEW FILE: pear.horde.org.xml --- pear.horde.org

Horde PEAR Channel horde http://pear.horde.org/Chiara_PEAR_Server_REST/ http://pear.horde.org/Chiara_PEAR_Server_REST/ Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Horde-Channel/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ChangeLog 18 Dec 2008 19:06:23 -0000 1.2 +++ ChangeLog 7 Jan 2009 19:42:42 -0000 1.3 @@ -1,3 +1,9 @@ +2009-01-07 Gunnar Wrobel

+ + * PEAR-Horde-Channel.spec: + kolab/issue3315 (PEAR-Horde-Channel-1.0 fails to compile on + solaris 10) + 2008-12-18 Gunnar Wrobel

* PEAR-Horde-Channel.spec: kolab/issue3315 (PEAR-Horde-Channel-1.0 Index: PEAR-Horde-Channel.spec =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- PEAR-Horde-Channel.spec 18 Dec 2008 19:06:23 -0000 1.5 +++ PEAR-Horde-Channel.spec 7 Jan 2009 19:42:42 -0000 1.6 @@ -8,7 +8,7 @@ Group: Development/Languages License: N/A URL: http://pear.horde.org/ -Source0: http://pear.horde.org/channel.xml +Source0: pear.horde.org.xml # Build Info Prefix: %{l_prefix} @@ -32,7 +32,7 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{pear_xmldir} -install -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.horde.org.xml +install -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir} %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} %clean From cvs at kolab.org Thu Jan 8 10:56:47 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 8 Jan 2009 10:56:47 +0100 (CET) Subject: gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.19, 1.20 Message-ID: <20090108095647.3E14860093B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde-webmail/1.2.0 In directory doto:/tmp/cvs-serv26213/patches/horde-webmail/1.2.0 Modified Files: horde-webmail-1.2.0_kolab_openpkg.patch Log Message: kolab/issue2207 (Make it possible to enable and disable users to be able to use the webclient) Index: horde-webmail-1.2.0_kolab_openpkg.patch =================================================================== RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- horde-webmail-1.2.0_kolab_openpkg.patch 15 Dec 2008 20:55:31 -0000 1.19 +++ horde-webmail-1.2.0_kolab_openpkg.patch 8 Jan 2009 09:56:45 -0000 1.20 @@ -1,6 +1,6 @@ -diff -r 0a5153c325f0 config/conf.php +diff -r 9da66837e009 config/conf.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/config/conf.php Mon Dec 15 21:46:37 2008 +0100 ++++ b/config/conf.php Thu Jan 08 10:39:26 2009 +0100 @@ -0,0 +1,119 @@ +_driver->_deleteAll($sourceName); } -diff -r 0a5153c325f0 turba/lib/Object.php ---- a/turba/lib/Object.php Fri Nov 14 08:35:22 2008 +0100 -+++ b/turba/lib/Object.php Mon Dec 15 21:46:38 2008 +0100 +diff -r 9da66837e009 turba/lib/Object.php +--- a/turba/lib/Object.php Tue Dec 30 11:36:13 2008 +0100 ++++ b/turba/lib/Object.php Thu Jan 08 10:39:27 2009 +0100 @@ -249,7 +249,10 @@ */ function addFile($info) From cvs at kolab.org Thu Jan 8 10:56:47 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 8 Jan 2009 10:56:47 +0100 (CET) Subject: gunnar: server release-notes.txt,1.353,1.354 Message-ID: <20090108095647.3157760092C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv26213 Modified Files: release-notes.txt Log Message: kolab/issue2207 (Make it possible to enable and disable users to be able to use the webclient) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.353 retrieving revision 1.354 diff -u -d -r1.353 -r1.354 --- release-notes.txt 2 Jan 2009 15:57:19 -0000 1.353 +++ release-notes.txt 8 Jan 2009 09:56:44 -0000 1.354 @@ -55,6 +55,11 @@ kolab/issue3322 (freebusy.conf.template: ldap server can be on another machine) + - kolab-webclient-1.2.0-2009???? + + kolab/issue2207 (Make it possible to enable and disable users + to be able to use the webclient) + - perl-kolab-2.2.1-2009???? kolab/issue3321 (slapd.replicas.template and slapd.access.template can be absent) From cvs at kolab.org Thu Jan 8 10:56:47 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 8 Jan 2009 10:56:47 +0100 (CET) Subject: gunnar: server/kolab-webclient ChangeLog, 1.6, 1.7 kolab-webclient.spec, 1.17, 1.18 Message-ID: <20090108095647.3DA70600935@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient In directory doto:/tmp/cvs-serv26213/kolab-webclient Modified Files: ChangeLog kolab-webclient.spec Log Message: kolab/issue2207 (Make it possible to enable and disable users to be able to use the webclient) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChangeLog 27 Dec 2008 10:46:15 -0000 1.6 +++ ChangeLog 8 Jan 2009 09:56:45 -0000 1.7 @@ -1,3 +1,8 @@ +2009-01-08 Gunnar Wrobel

+ + * kolab-webclient.spec: kolab/issue2207 (Make it possible to + enable and disable users to be able to use the webclient) + 2008-12-27 Gunnar Wrobel

* kolab-webclient.spec: Index: kolab-webclient.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- kolab-webclient.spec 27 Dec 2008 10:46:15 -0000 1.17 +++ kolab-webclient.spec 8 Jan 2009 09:56:45 -0000 1.18 @@ -1,9 +1,9 @@ # Versions %define V_horde_name horde-webmail %define V_package kolab-webclient -%define V_year 2008 -%define V_month 12 -%define V_day 15 +%define V_year 2009 +%define V_month 01 +%define V_day 08 %define V_version 1.2.0 %define V_source_version 1.2 %define V_passwd_version 3.0.1 From cvs at kolab.org Thu Jan 8 21:22:49 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 8 Jan 2009 21:22:49 +0100 (CET) Subject: gunnar: server release-notes.txt,1.354,1.355 Message-ID: <20090108202249.A5085600930@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv17309 Modified Files: release-notes.txt Log Message: kolab/issue2738 (horde should allow a setting to suppress groupware folders) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.354 retrieving revision 1.355 diff -u -d -r1.354 -r1.355 --- release-notes.txt 8 Jan 2009 09:56:44 -0000 1.354 +++ release-notes.txt 8 Jan 2009 20:22:47 -0000 1.355 @@ -57,8 +57,11 @@ - kolab-webclient-1.2.0-2009???? - kolab/issue2207 (Make it possible to enable and disable users - to be able to use the webclient) + kolab/issue2207 (Make it possible to enable and disable users + to be able to use the webclient) + + kolab/issue2738 (horde should allow a setting to suppress + groupware folders) - perl-kolab-2.2.1-2009???? From cvs at kolab.org Thu Jan 8 21:22:49 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 8 Jan 2009 21:22:49 +0100 (CET) Subject: gunnar: server/kolab-webclient ChangeLog,1.7,1.8 Message-ID: <20090108202249.A3DBB60092F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient In directory doto:/tmp/cvs-serv17309/kolab-webclient Modified Files: ChangeLog Log Message: kolab/issue2738 (horde should allow a setting to suppress groupware folders) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChangeLog 8 Jan 2009 09:56:45 -0000 1.7 +++ ChangeLog 8 Jan 2009 20:22:47 -0000 1.8 @@ -3,6 +3,9 @@ * kolab-webclient.spec: kolab/issue2207 (Make it possible to enable and disable users to be able to use the webclient) + kolab/issue2738 (horde should allow a setting to suppress + groupware folders) + 2008-12-27 Gunnar Wrobel

* kolab-webclient.spec: From cvs at kolab.org Thu Jan 8 21:22:49 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 8 Jan 2009 21:22:49 +0100 (CET) Subject: gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.20, 1.21 Message-ID: <20090108202249.A65DE60094B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde-webmail/1.2.0 In directory doto:/tmp/cvs-serv17309/patches/horde-webmail/1.2.0 Modified Files: horde-webmail-1.2.0_kolab_openpkg.patch Log Message: kolab/issue2738 (horde should allow a setting to suppress groupware folders) Index: horde-webmail-1.2.0_kolab_openpkg.patch =================================================================== RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- horde-webmail-1.2.0_kolab_openpkg.patch 8 Jan 2009 09:56:45 -0000 1.20 +++ horde-webmail-1.2.0_kolab_openpkg.patch 8 Jan 2009 20:22:47 -0000 1.21 @@ -1,6 +1,6 @@ diff -r 9da66837e009 config/conf.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/config/conf.php Thu Jan 08 10:39:26 2009 +0100 ++++ b/config/conf.php Thu Jan 08 21:20:43 2009 +0100 @@ -0,0 +1,119 @@ +2000 false ++ false + + + +diff -r 9da66837e009 imp/config/hooks.php +--- a/imp/config/hooks.php Tue Dec 30 11:36:13 2008 +0100 ++++ b/imp/config/hooks.php Thu Jan 08 21:20:43 2009 +0100 +@@ -493,6 +493,13 @@ + return $icons; + } + } ++ if (!function_exists('_imp_hook_display_folder')) { ++ function _imp_hook_display_folder($mailbox) ++ { ++ $type = Kolab::getMailboxType($mailbox); ++ return empty($type) || $type == 'mail'; ++ } ++ } + } + + // Sample function for returning the quota. Uses the PECL ssh2 +diff -r 9da66837e009 imp/config/hooks.php.dist +--- a/imp/config/hooks.php.dist Tue Dec 30 11:36:13 2008 +0100 ++++ b/imp/config/hooks.php.dist Thu Jan 08 21:20:43 2009 +0100 +@@ -426,7 +426,7 @@ + case 'contact': + return $GLOBALS['registry']->get('webroot', 'turba'); + +- case 'prefs': ++ case 'h-prefs': + return $GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php?app=horde'; + + default: +@@ -480,7 +480,7 @@ + ); + break; + +- case 'prefs': ++ case 'h-prefs': + $icons[$name] = array( + 'icon' => 'prefs.png', + 'icondir' => $GLOBALS['registry']->getImageDir('horde'), +@@ -491,6 +491,13 @@ + } + + return $icons; ++ } ++ } ++ if (!function_exists('_imp_hook_display_folder')) { ++ function _imp_hook_display_folder($mailbox) ++ { ++ $type = Kolab::getMailboxType($mailbox); ++ return empty($type) || $type == 'mail'; + } + } + } diff -r 9da66837e009 imp/config/servers.php --- a/imp/config/servers.php Tue Dec 30 11:36:13 2008 +0100 -+++ b/imp/config/servers.php Thu Jan 08 10:39:26 2009 +0100 ++++ b/imp/config/servers.php Thu Jan 08 21:20:43 2009 +0100 @@ -226,10 +226,30 @@ /* Example configurations: */ @@ -557,9 +624,80 @@ + ), + ); +} +diff -r 9da66837e009 imp/lib/IMAP/Tree.php +--- a/imp/lib/IMAP/Tree.php Tue Dec 30 11:36:13 2008 +0100 ++++ b/imp/lib/IMAP/Tree.php Thu Jan 08 21:20:43 2009 +0100 +@@ -32,6 +32,7 @@ + define('IMPTREE_ELT_NEED_SORT', 64); + define('IMPTREE_ELT_VFOLDER', 128); + define('IMPTREE_ELT_NONIMAP', 256); ++define('IMPTREE_ELT_INVISIBLE', 512); + + /* The isOpen() expanded mode constants. */ + define('IMPTREE_OPEN_NONE', 0); +@@ -394,6 +395,13 @@ + + /* Convert 'INBOX' to localized name. */ + $elt['l'] = ($elt['v'] == 'INBOX') ? _("Inbox") : String::convertCharset($tmp[$elt['c']], 'UTF7-IMAP'); ++ ++ if (!empty($GLOBALS['conf']['hooks']['display_folder'])) { ++ if (!Horde::callHook('_imp_hook_display_folder', array($elt['v']), ++ 'imp')) { ++ $this->_setInvisible($elt, true); ++ } ++ } + + if ($_SESSION['imp']['base_protocol'] != 'pop3') { + if ($elt['c'] != 0) { +@@ -1274,6 +1282,31 @@ + } + + /** ++ * Set the invisible attribute for an element. ++ * ++ * @access private ++ * ++ * @param array &$elt A tree element. ++ * @param boolean $bool The setting. ++ */ ++ function _setInvisible(&$elt, $bool) ++ { ++ $this->_setAttribute($elt, IMPTREE_ELT_INVISIBLE, $bool); ++ } ++ ++ /** ++ * Is the element invisible? ++ * ++ * @param array $elt A tree element. ++ * ++ * @return integer True if the element is invisible. ++ */ ++ function isInvisible($elt) ++ { ++ return $elt['a'] & IMPTREE_ELT_INVISIBLE; ++ } ++ ++ /** + * Flag the element as needing its children to be sorted. + * + * @access private +@@ -1441,9 +1474,10 @@ + */ + function _activeElt($elt) + { +- return ($this->_showunsub || +- ($this->isSubscribed($elt) && !$this->isContainer($elt)) || +- $this->hasChildren($elt)); ++ return (!$this->isInvisible($elt) && ++ ($this->_showunsub || ++ ($this->isSubscribed($elt) && !$this->isContainer($elt)) || ++ $this->hasChildren($elt))); + } + + /** diff -r 9da66837e009 imp/lib/MIME/Viewer/itip.php --- a/imp/lib/MIME/Viewer/itip.php Tue Dec 30 11:36:13 2008 +0100 -+++ b/imp/lib/MIME/Viewer/itip.php Thu Jan 08 10:39:26 2009 +0100 ++++ b/imp/lib/MIME/Viewer/itip.php Thu Jan 08 21:20:43 2009 +0100 @@ -86,6 +86,29 @@ // Get the iCalendar file components. @@ -612,7 +750,7 @@ } else { diff -r 9da66837e009 ingo/config/backends.php --- a/ingo/config/backends.php Tue Dec 30 11:36:13 2008 +0100 -+++ b/ingo/config/backends.php Thu Jan 08 10:39:26 2009 +0100 ++++ b/ingo/config/backends.php Thu Jan 08 21:20:43 2009 +0100 @@ -40,6 +40,8 @@ * give them permissions to do so. If you want to enable this * feature, you need to set this parameter to true. @@ -633,7 +771,7 @@ require_once 'Horde/Kolab.php'; diff -r 9da66837e009 ingo/config/conf.php --- a/ingo/config/conf.php Tue Dec 30 11:36:13 2008 +0100 -+++ b/ingo/config/conf.php Thu Jan 08 10:39:26 2009 +0100 ++++ b/ingo/config/conf.php Thu Jan 08 21:20:43 2009 +0100 @@ -2,8 +2,7 @@ /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */ // $Horde: ingo/config/conf.xml,v 1.13.12.1 2007/12/20 14:05:46 jan Exp $ @@ -646,7 +784,7 @@ $conf['rules']['userheader'] = true; diff -r 9da66837e009 kronolith/attendees.php --- a/kronolith/attendees.php Tue Dec 30 11:36:13 2008 +0100 -+++ b/kronolith/attendees.php Thu Jan 08 10:39:26 2009 +0100 ++++ b/kronolith/attendees.php Thu Jan 08 21:20:43 2009 +0100 @@ -178,6 +178,16 @@ $attendees = array(); $_SESSION['kronolith']['attendees'] = $attendees; @@ -681,7 +819,7 @@ require $registry->get('templates', 'horde') . '/common-footer.inc'; diff -r 9da66837e009 kronolith/calendars/edit.php --- a/kronolith/calendars/edit.php Tue Dec 30 11:36:13 2008 +0100 -+++ b/kronolith/calendars/edit.php Thu Jan 08 10:39:26 2009 +0100 ++++ b/kronolith/calendars/edit.php Thu Jan 08 21:20:43 2009 +0100 @@ -53,6 +53,10 @@ $vars->set('name', $calendar->get('name')); @@ -695,7 +833,7 @@ require KRONOLITH_TEMPLATES . '/menu.inc'; diff -r 9da66837e009 kronolith/config/conf.php --- a/kronolith/config/conf.php Tue Dec 30 11:36:13 2008 +0100 -+++ b/kronolith/config/conf.php Thu Jan 08 10:39:26 2009 +0100 ++++ b/kronolith/config/conf.php Thu Jan 08 21:20:43 2009 +0100 @@ -1,16 +1,19 @@ @@ -740,7 +878,7 @@ addHidden('', 'c', 'text', true); $this->addVariable(_("Name"), 'name', 'text', true); @@ -938,7 +1076,7 @@ } diff -r 9da66837e009 kronolith/lib/FreeBusy.php --- a/kronolith/lib/FreeBusy.php Tue Dec 30 11:36:13 2008 +0100 -+++ b/kronolith/lib/FreeBusy.php Thu Jan 08 10:39:26 2009 +0100 ++++ b/kronolith/lib/FreeBusy.php Thu Jan 08 21:20:43 2009 +0100 @@ -187,6 +187,9 @@ require_once 'HTTP/Request.php'; @@ -951,7 +1089,7 @@ } diff -r 9da66837e009 kronolith/lib/Storage/kolab.php --- a/kronolith/lib/Storage/kolab.php Tue Dec 30 11:36:13 2008 +0100 -+++ b/kronolith/lib/Storage/kolab.php Thu Jan 08 10:39:26 2009 +0100 ++++ b/kronolith/lib/Storage/kolab.php Thu Jan 08 21:20:43 2009 +0100 @@ -29,17 +29,24 @@ { global $conf; @@ -987,7 +1125,7 @@ $options['timeout'] = 5; diff -r 9da66837e009 kronolith/lib/api.php --- a/kronolith/lib/api.php Tue Dec 30 11:36:13 2008 +0100 -+++ b/kronolith/lib/api.php Thu Jan 08 10:39:26 2009 +0100 ++++ b/kronolith/lib/api.php Thu Jan 08 21:20:43 2009 +0100 @@ -694,6 +694,7 @@ function _kronolith_listBy($action, $timestamp, $calendar = null) { @@ -1007,7 +1145,7 @@ $histories = $history->getByTimestamp('>', $timestamp, array(array('op' => '=', 'field' => 'action', 'value' => $action)), 'kronolith:' . $calendar); diff -r 9da66837e009 kronolith/perms.php --- a/kronolith/perms.php Tue Dec 30 11:36:13 2008 +0100 -+++ b/kronolith/perms.php Thu Jan 08 10:39:26 2009 +0100 ++++ b/kronolith/perms.php Thu Jan 08 21:20:43 2009 +0100 @@ -14,6 +14,34 @@ @define('KRONOLITH_BASE', dirname(__FILE__)); require_once KRONOLITH_BASE . '/lib/base.php'; @@ -1079,7 +1217,7 @@ $notification->push($result, 'horde.error'); diff -r 9da66837e009 kronolith/savedattlist.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/kronolith/savedattlist.php Thu Jan 08 10:39:26 2009 +0100 ++++ b/kronolith/savedattlist.php Thu Jan 08 21:20:43 2009 +0100 @@ -0,0 +1,77 @@ +get('templates', 'horde') . '/common-footer.inc'; diff -r 9da66837e009 kronolith/templates/attendees/attendees.inc --- a/kronolith/templates/attendees/attendees.inc Tue Dec 30 11:36:13 2008 +0100 -+++ b/kronolith/templates/attendees/attendees.inc Thu Jan 08 10:39:26 2009 +0100 ++++ b/kronolith/templates/attendees/attendees.inc Thu Jan 08 21:20:43 2009 +0100 @@ -92,6 +92,8 @@

" /> @@ -1172,13 +1310,13 @@ diff -r 9da66837e009 kronolith/templates/fbview/busyblock.html --- a/kronolith/templates/fbview/busyblock.html Tue Dec 30 11:36:13 2008 +0100 -+++ b/kronolith/templates/fbview/busyblock.html Thu Jan 08 10:39:26 2009 +0100 ++++ b/kronolith/templates/fbview/busyblock.html Thu Jan 08 21:20:43 2009 +0100 @@ -1,1 +1,1 @@ -
 
+
 
diff -r 9da66837e009 kronolith/templates/javascript/open_savedattlist_win.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/kronolith/templates/javascript/open_savedattlist_win.js Thu Jan 08 10:39:26 2009 +0100 ++++ b/kronolith/templates/javascript/open_savedattlist_win.js Thu Jan 08 21:20:43 2009 +0100 @@ -0,0 +1,36 @@ + + diff --git a/horde-webmail/kronolith/templates/savedattlist/savedattlist.inc b/horde-webmail/kronolith/templates/savedattlist/savedattlist.inc new file mode 100644 index 0000000..2489f25 --- /dev/null +++ b/horde-webmail/kronolith/templates/savedattlist/savedattlist.inc @@ -0,0 +1,68 @@ + + + +
+ + + + +
+ + + + + + + + + + + + + + + + + + $list): ?> + + ', Horde::link("javascript:updateMessage('" . addslashes(implode(', ', $list)) . "')", _("Load this list")), $loadimg, ""; + ?> + ', Horde::link("javascript:performAction('remove', '" . $index . "')", _("Remove this list")), $delimg, ""; + ?> + + + +
+
+
-- tg: (c56a73f..) t/kronolith/HK/SB/SaveEventAttendees (depends on: master) --- NEW FILE: t_nag_H_MR_Bug__7400.diff --- From: Gunnar Wrobel

Subject: [PATCH] t/nag/H/MR/Bug_7400 Fixes Horde bug [#7400] Error when marking task "completed" Signed-off-by: Gunnar Wrobel

--- horde-webmail/nag/lib/Driver.php | 55 +++++++++++++++++++++---------------- 1 files changed, 31 insertions(+), 24 deletions(-) diff --git a/horde-webmail/nag/lib/Driver.php b/horde-webmail/nag/lib/Driver.php index 2cd926a..c8fd4ee 100644 --- a/horde-webmail/nag/lib/Driver.php +++ b/horde-webmail/nag/lib/Driver.php @@ -319,33 +319,40 @@ class Nag_Driver { $new_task = $this->get($task->id); $log_tasklist = $this->_tasklist; - if ($task->tasklist != $tasklist) { + if (!is_null($tasklist) && $task->tasklist != $tasklist) { /* Moving the task to another tasklist. */ $share = $GLOBALS['nag_shares']->getShare($task->tasklist); - if (!is_a($share, 'PEAR_Error') && - $share->hasPermission(Auth::getAuth(), PERMS_DELETE)) { - $share = $GLOBALS['nag_shares']->getShare($tasklist); - if (!is_a($share, 'PEAR_Error') && - $share->hasPermission(Auth::getAuth(), PERMS_EDIT)) { - $moved = $this->_move($task->id, $tasklist); - if (is_a($moved, 'PEAR_Error')) { - return $moved; - } - $new_storage = &Nag_Driver::singleton($tasklist); - $new_task = $new_storage->get($task->id); - - /* Log the moving of this item in the history log. */ - if (!empty($task->uid)) { - $history = &Horde_History::singleton(); - $history->log('nag:' . $task->tasklist . ':' . $task->uid, array('action' => 'delete'), true); - $history->log('nag:' . $tasklist . ':' . $task->uid, array('action' => 'add'), true); - $log_tasklist = $tasklist; - } - } else { - $GLOBALS['notification']->push(sprintf(_("Access denied moving the task to %s."), $share->get('name')), 'horde.error'); - } - } else { + if (is_a($share, 'PEAR_Error')) { + return $share; + } + + if (!$share->hasPermission(Auth::getAuth(), PERMS_DELETE)) { $GLOBALS['notification']->push(sprintf(_("Access denied removing task from %s."), $share->get('name')), 'horde.error'); + return false; + } + + $share = $GLOBALS['nag_shares']->getShare($tasklist); + if (is_a($share, 'PEAR_Error')) { + return $share; + } + + if (!$share->hasPermission(Auth::getAuth(), PERMS_EDIT)) { + $GLOBALS['notification']->push(sprintf(_("Access denied moving the task to %s."), $share->get('name')), 'horde.error'); + } + + $moved = $this->_move($task->id, $tasklist); + if (is_a($moved, 'PEAR_Error')) { + return $moved; + } + $new_storage = &Nag_Driver::singleton($tasklist); + $new_task = $new_storage->get($task->id); + + /* Log the moving of this item in the history log. */ + if (!empty($task->uid)) { + $history = &Horde_History::singleton(); + $history->log('nag:' . $task->tasklist . ':' . $task->uid, array('action' => 'delete'), true); + $history->log('nag:' . $tasklist . ':' . $task->uid, array('action' => 'add'), true); + $log_tasklist = $tasklist; } } -- tg: (c56a73f..) t/nag/H/MR/Bug_7400 (depends on: master) --- NEW FILE: t_turba_HK_GW_AutomaticFreeBusyUrl.diff --- From: Gunnar Wrobel

Subject: [PATCH] t/turba/HK/GW/AutomaticFreeBusyUrl Determine the free/busy URL of Kolab users automatically. Signed-off-by: Gunnar Wrobel

--- horde-webmail/turba/config/attributes.php | 6 ++++++ horde-webmail/turba/config/attributes.php.dist | 6 ++++++ horde-webmail/turba/config/sources.php.dist | 4 +++- 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/horde-webmail/turba/config/attributes.php b/horde-webmail/turba/config/attributes.php index ce124f0..5a127d8 100644 --- a/horde-webmail/turba/config/attributes.php +++ b/horde-webmail/turba/config/attributes.php @@ -356,6 +356,12 @@ $attributes['category'] = array( ); /* Additional attributes supported by Kolab */ +$attributes['kolabHomeServer'] = array( + 'label' => _("Kolab Home Server"), + 'type' => 'text', + 'required' => false, + 'params' => array('regex' => '', 'size' => 40, 'maxlength' => 255) +); $attributes['initials'] = array( 'label' => _("Initials"), 'type' => 'text', diff --git a/horde-webmail/turba/config/attributes.php.dist b/horde-webmail/turba/config/attributes.php.dist index 0332682..3afb76f 100644 --- a/horde-webmail/turba/config/attributes.php.dist +++ b/horde-webmail/turba/config/attributes.php.dist @@ -402,6 +402,12 @@ $attributes['category'] = array( // ); /* Additional attributes supported by Kolab */ +$attributes['kolabHomeServer'] = array( + 'label' => _("Kolab Home Server"), + 'type' => 'text', + 'required' => false, + 'params' => array('regex' => '', 'size' => 40, 'maxlength' => 255) +); $attributes['initials'] = array( 'label' => _("Initials"), 'type' => 'text', diff --git a/horde-webmail/turba/config/sources.php.dist b/horde-webmail/turba/config/sources.php.dist index 3d5adf4..fd6eb7a 100644 --- a/horde-webmail/turba/config/sources.php.dist +++ b/horde-webmail/turba/config/sources.php.dist @@ -825,7 +825,9 @@ if (!empty($GLOBALS['conf']['kolab']['enabled'])) { 'cellPhone' => 'mobile', 'fax' => 'fax', 'notes' => 'description', - 'freebusyUrl' => 'kolabHomeServer', + 'kolabHomeServer' => 'kolabHomeServer', + 'freebusyUrl' => array('fields' => array('kolabHomeServer', 'email'), + 'format' => 'https://%s/freebusy/%s.ifb'), ), 'search' => array( 'name', -- tg: (90e5634..) t/turba/HK/GW/AutomaticFreeBusyUrl (depends on: t/framework/HK/GW/Kolab_Storgae/FixedUpdateTriggering) --- NEW FILE: t_turba_HK_GW_FixAddressbookDeletion.diff --- From: Gunnar Wrobel

Subject: [PATCH] t/turba/HK/GW/FixAddressbookDeletion Fixes a Kolab specific problem with addressbook deletion. The fix is considered a hack by upstream and needs to be fixed at some point. Signed-off-by: Gunnar Wrobel

--- horde-webmail/turba/lib/Driver/share.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/horde-webmail/turba/lib/Driver/share.php b/horde-webmail/turba/lib/Driver/share.php index 57222a4..2776a8f 100644 --- a/horde-webmail/turba/lib/Driver/share.php +++ b/horde-webmail/turba/lib/Driver/share.php @@ -145,7 +145,7 @@ class Turba_Driver_share extends Turba_Driver { function _deleteAll($sourceName = null) { if (is_null($sourceName)) { - $sourceName = $this->getContactOwner(); + $sourceName = $this->getName(); } return $this->_driver->_deleteAll($sourceName); } -- tg: (c56a73f..) t/turba/HK/GW/FixAddressbookDeletion (depends on: master) --- NEW FILE: t_turba_HK_GW_FixSyncMLAttributeDeletion.diff --- From: Gunnar Wrobel

Subject: [PATCH] t/turba/HK/GW/FixSyncMLAttributeDeletion Fix the deletion of contact attributes when using SyncML. Signed-off-by: Gunnar Wrobel

--- horde-webmail/turba/lib/Driver.php | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/horde-webmail/turba/lib/Driver.php b/horde-webmail/turba/lib/Driver.php index 248e5d3..efc61f8 100644 --- a/horde-webmail/turba/lib/Driver.php +++ b/horde-webmail/turba/lib/Driver.php @@ -1466,9 +1466,6 @@ class Turba_Driver { $hash = array(); $attr = $vcard->getAllAttributes(); foreach ($attr as $item) { - if (empty($item['value'])) { - continue; - } switch ($item['name']) { case 'FN': -- tg: (c56a73f..) t/turba/HK/GW/FixSyncMLAttributeDeletion (depends on: master) --- NEW FILE: t_turba_HK_GW_PhotoSupport.diff --- From: Gunnar Wrobel

Subject: [PATCH] t/turba/HK/GW/PhotoSupport Support photos in turba. Signed-off-by: Gunnar Wrobel

--- horde-webmail/turba/config/sources.php.dist | 4 +- horde-webmail/turba/lib/Driver/kolab.php | 54 +++++++++++++++----------- horde-webmail/turba/lib/Object.php | 5 ++- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/horde-webmail/turba/config/sources.php.dist b/horde-webmail/turba/config/sources.php.dist index eae2039..3d5adf4 100644 --- a/horde-webmail/turba/config/sources.php.dist +++ b/horde-webmail/turba/config/sources.php.dist @@ -893,6 +893,8 @@ if (!empty($GLOBALS['conf']['kolab']['enabled'])) { 'nameSuffix' => 'suffix', 'initials' => 'initials', 'nickname' => 'nick-name', + 'photo' => 'photo', + 'phototype' => 'phototype', 'gender' => 'gender', 'birthday' => 'birthday', 'spouse' => 'spouse-name', @@ -939,7 +941,7 @@ if (!empty($GLOBALS['conf']['kolab']['enabled'])) { 'tabs' => array( _("Personal") => array('name', 'firstname', 'lastname', 'middlenames', 'namePrefix', 'nameSuffix', 'initials', 'nickname', - 'gender', 'birthday', 'spouse', 'anniversary', + 'photo', 'gender', 'birthday', 'spouse', 'anniversary', 'children'), _("Location") => array('homeStreet', 'homeCity', 'homeProvince', 'homePostalCode', 'homeCountry', 'workStreet', diff --git a/horde-webmail/turba/lib/Driver/kolab.php b/horde-webmail/turba/lib/Driver/kolab.php index f97f75a..a585950 100644 --- a/horde-webmail/turba/lib/Driver/kolab.php +++ b/horde-webmail/turba/lib/Driver/kolab.php @@ -751,6 +751,14 @@ class Turba_Driver_kolab_wrapper_new extends Turba_Driver_kolab_wrapper { if (isset($contact['email'])) { unset($contact['email']); } + if (isset($contact['picture'])) { + $name = $contact['picture']; + if (isset($contact['_attachments'][$name])) { + $contact['photo'] = $this->_store->_data->getAttachment($contact['_attachments'][$name]['key']); + $contact['phototype'] = $contact['_attachments'][$name]['type']; + } + } + $contacts[$id] = $contact; } @@ -1088,29 +1096,11 @@ class Turba_Driver_kolab_wrapper_new extends Turba_Driver_kolab_wrapper { $attributes['full-name'] = $attributes['given-name'] . ' ' . $attributes['full-name']; } - $group = false; - if (isset($attributes['__type']) && $attributes['__type'] == 'Group') { - $group = true; - $result = $this->_store->setObjectType('distribution-list'); - if (is_a($result, 'PEAR_Error')) { - return $result; - } - $this->_convertMembers($attributes); - } - - $object_id = $this->_store->save($attributes, null); - if (is_a($object_id, 'PEAR_Error')) { - return $object_id; - } - - if ($group) { - $result = $this->_store->setObjectType('contact'); - if (is_a($result, 'PEAR_Error')) { - return $result; - } + $result = $this->_store($attributes); + if (is_a($result, 'PEAR_Error')) { + return $result; } - - return $object_id; + return true; } /** @@ -1126,9 +1116,19 @@ class Turba_Driver_kolab_wrapper_new extends Turba_Driver_kolab_wrapper { } if ($object_key != 'uid') { - return PEAR::raiseError(sprintf(_("Key for saving must be a UID not %s!"), $object_key)); + return PEAR::raiseError(sprintf(_("Key for saving must be \'uid\' not %s!"), $object_key)); } + return $this->_store($attributes, $object_id); + } + + /** + * Stores an object in the Kolab message store. + * + * @return string The object id, possibly updated. + */ + function _store($attributes, $object_id = null) + { $group = false; if (isset($attributes['__type']) && $attributes['__type'] == 'Group') { $group = true; @@ -1139,6 +1139,14 @@ class Turba_Driver_kolab_wrapper_new extends Turba_Driver_kolab_wrapper { $this->_convertMembers($attributes); } + if (isset($attributes['photo']) && isset($attributes['phototype'])) { + $attributes['_attachments']['photo.attachment'] = array('type' => $attributes['phototype'], + 'content' => $attributes['photo']); + $attributes['picture'] = 'photo.attachment'; + unset($attributes['photo']); + unset($attributes['phototype']); + } + $result = $this->_store->save($attributes, $object_id); if (is_a($result, 'PEAR_Error')) { return $result; diff --git a/horde-webmail/turba/lib/Object.php b/horde-webmail/turba/lib/Object.php index ed7f65f..57c9368 100644 --- a/horde-webmail/turba/lib/Object.php +++ b/horde-webmail/turba/lib/Object.php @@ -249,7 +249,10 @@ class Turba_Object { */ function addFile($info) { - $this->_vfsInit(); + $result = $this->_vfsInit(); + if (is_a($result, 'PEAR_Error')) { + return $result; + } $dir = TURBA_VFS_PATH . '/' . $this->getValue('__uid'); $file = $info['name']; -- tg: (8a9adcf..) t/turba/HK/GW/PhotoSupport (depends on: t/framework/HK/GW/Vfs/KolabDriver) --- NEW FILE: t_turba_HK_GW_SyncMLrefresh.diff --- From: Gunnar Wrobel

Subject: [PATCH] t/turba/HK/GW/SyncMLrefresh Refresh addressbooks before running a synchronization. Signed-off-by: Gunnar Wrobel

--- horde-webmail/turba/lib/Driver/kolab.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/horde-webmail/turba/lib/Driver/kolab.php b/horde-webmail/turba/lib/Driver/kolab.php index f97f75a..786f2e2 100644 --- a/horde-webmail/turba/lib/Driver/kolab.php +++ b/horde-webmail/turba/lib/Driver/kolab.php @@ -56,6 +56,7 @@ class Turba_Driver_kolab extends Turba_Driver { } $this->_wrapper = &new $wrapper($this->name, $this->_kolab); + $this->_wrapper->connect(); } /** -- tg: (f86048d..) t/turba/HK/GW/SyncMLrefresh (depends on: t/turba/HK/GW/FixSyncMLAttributeDeletion) From cvs at kolab.org Fri Feb 6 17:16:35 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 6 Feb 2009 17:16:35 +0100 (CET) Subject: thomas: server/imapd Makefile, 1.39, 1.40 KOLAB_cyrus-imapd-2.3.12_UID.patch, 1.1, NONE imapd.patch.group, 1.1, NONE timsieved-starttls-sendcaps.patch, 1.1, NONE Message-ID: <20090206161635.EC4DB600949@lists.intevation.de> Author: thomas Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv9777 Modified Files: Makefile Removed Files: KOLAB_cyrus-imapd-2.3.12_UID.patch imapd.patch.group timsieved-starttls-sendcaps.patch Log Message: Removed patches (now in ../patches/cyrus-imapd/) and adjust KOLABPKGURI Index: Makefile =================================================================== RCS file: /kolabrepository/server/imapd/Makefile,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- Makefile 25 Jan 2009 22:11:11 -0000 1.39 +++ Makefile 6 Feb 2009 16:16:33 -0000 1.40 @@ -1,6 +1,5 @@ ifeq "x$(KOLABPKGURI)" "x" - KOLABPKGURI = http://files.pardus.de/ -# KOLABPKGURI = http://ftp.gwdg.de/pub/linux/kolab/server/development-2.2/openpkg-orig-srpms/ + KOLABPKGURI = http://ftp.gwdg.de/pub/linux/kolab/server/development-2.2/openpkg-orig-srpms/ endif ifeq "x$(KOLABRPMSRC)" "x" KOLABRPMSRC = $(HOME)/RPM/SRC --- KOLAB_cyrus-imapd-2.3.12_UID.patch DELETED --- --- imapd.patch.group DELETED --- --- timsieved-starttls-sendcaps.patch DELETED --- From cvs at kolab.org Fri Feb 6 17:27:30 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 6 Feb 2009 17:27:30 +0100 (CET) Subject: martin: doc/kolab-formats folders.sgml,1.10,1.11 Message-ID: <20090206162730.4F36F600949@lists.intevation.de> Author: martin Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv10225 Modified Files: folders.sgml Log Message: Martin Konold: Added two new mail folder subtypes "outbox" and "wastebasket". Most offline capable Kolab clients will never use these but for others clients these can be useful in order to remain language neutral. Index: folders.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/folders.sgml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- folders.sgml 14 Nov 2007 11:59:03 -0000 1.10 +++ folders.sgml 6 Feb 2009 16:27:28 -0000 1.11 @@ -33,9 +33,11 @@ The <type> can be: mail, event, journal, task, note, or contact. -The <subtype> for a mail folder can be inbox, drafts, sentitems, -or junkemail (this one holds spam mails). For the other <type>s, it +The <subtype> for a mail folder can be inbox, drafts, sentitems, outbox, wastebasket +or junkemail (this one holds spam mails). For the other <type>s the <subtype> can only be default, or not set. + +Note: Most offline capable Kolab clients will not synchronize outbox or wastebasket. There MUST NOT be two folders of a single type having the default subtype. E.g. it is forbidden to have two folders of the type calendar with the subtype default within one Kolab From cvs at kolab.org Fri Feb 6 17:42:26 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 6 Feb 2009 17:42:26 +0100 (CET) Subject: martin: doc/kolab-formats kolabformat.sgml,1.28,1.29 Message-ID: <20090206164226.4B7D3600949@lists.intevation.de> Author: martin Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv10802 Modified Files: kolabformat.sgml Log Message: Martin Konold: Increased version number to rc8 Index: kolabformat.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- kolabformat.sgml 9 Jul 2008 09:02:22 -0000 1.28 +++ kolabformat.sgml 6 Feb 2009 16:42:24 -0000 1.29 @@ -15,7 +15,7 @@ The Kolab Storage Format - + Draft CVS From cvs at kolab.org Sat Feb 7 16:51:29 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 7 Feb 2009 16:51:29 +0100 (CET) Subject: mathieu: server release-notes.txt,1.363,1.364 Message-ID: <20090207155129.86F93600938@lists.intevation.de> Author: mathieu Update of /kolabrepository/server In directory doto:/tmp/cvs-serv5025 Modified Files: release-notes.txt Log Message: kolab/issue3387 (dist_conf configuration in kolab webclient templates) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.363 retrieving revision 1.364 diff -u -d -r1.363 -r1.364 --- release-notes.txt 30 Jan 2009 12:00:49 -0000 1.363 +++ release-notes.txt 7 Feb 2009 15:51:27 -0000 1.364 @@ -76,6 +76,7 @@ kolab/issue3331 (kolabfilter uses incorrect delivery backend) kolab/issue3322 (freebusy.conf.template: ldap server can be on another machine) + kolab/issue3387 (dist_conf configuration in kolab webclient templates) - kolab-webclient-1.2.0-2009???? @@ -88,6 +89,7 @@ kolab/issue2738 (horde should allow a setting to suppress groupware folders) kolab/issue3309 (Can not login directly in to dimp) + kolab/issue3387 (dist_conf configuration in kolab webclient templates) - PEAR-Horde-Channel-1.0-20090119 From cvs at kolab.org Sat Feb 7 16:51:29 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 7 Feb 2009 16:51:29 +0100 (CET) Subject: mathieu: server/kolabd/kolabd ChangeLog, 1.215, 1.216 kolab.globals.in, 1.18, 1.19 Message-ID: <20090207155129.8E10A600941@lists.intevation.de> Author: mathieu Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv5025/kolabd/kolabd Modified Files: ChangeLog kolab.globals.in Log Message: kolab/issue3387 (dist_conf configuration in kolab webclient templates) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.215 retrieving revision 1.216 diff -u -d -r1.215 -r1.216 --- ChangeLog 30 Jan 2009 12:00:49 -0000 1.215 +++ ChangeLog 7 Feb 2009 15:51:27 -0000 1.216 @@ -1,3 +1,10 @@ +2008-02-07 Mathieu Parent + + * kolab.globals.in, dist_conf/centos-clarkconnect, dist_conf/common, + dist_conf/debian, dist_conf/kolab, dist_conf/mandriva, dist_conf/suse, + dist_conf/debian: dist_conf configuration in kolab webclient templates + (kolab/issue3387) + 2009-01-30 Thomas Arendsen Hein * kolab2.schema, templates/main.cf.template.in: Renamed LDAP attribute Index: kolab.globals.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- kolab.globals.in 18 Nov 2008 17:50:58 -0000 1.18 +++ kolab.globals.in 7 Feb 2009 15:51:27 -0000 1.19 @@ -46,6 +46,9 @@ sbindir: @sbindir@ webserver_logdir: @webserver_logdir@ webserver_document_root: @webserver_document_root@ +horde_cookie_path: @horde_cookie_path@ +horde_confdir: @horde_confdir@ +kronolith_confdir: @kronolith_confdir@ kolab_statedir: @kolab_statedir@ kolab_pidfile: @kolab_pidfile@ kolab_mailboxuiddb: @kolab_mailboxuiddb@ From cvs at kolab.org Sat Feb 7 16:51:29 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 7 Feb 2009 16:51:29 +0100 (CET) Subject: mathieu: server/kolab-webclient ChangeLog, 1.9, 1.10 webclient-kolab-conf.template, 1.1, 1.2 webclient-kronolith-kolab-conf.template, 1.1, 1.2 Message-ID: <20090207155129.8839F600940@lists.intevation.de> Author: mathieu Update of /kolabrepository/server/kolab-webclient In directory doto:/tmp/cvs-serv5025/kolab-webclient Modified Files: ChangeLog webclient-kolab-conf.template webclient-kronolith-kolab-conf.template Log Message: kolab/issue3387 (dist_conf configuration in kolab webclient templates) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ChangeLog 8 Jan 2009 21:10:05 -0000 1.9 +++ ChangeLog 7 Feb 2009 15:51:27 -0000 1.10 @@ -1,3 +1,8 @@ +2008-02-07 Mathieu Parent + + * webclient-kolab-conf.template, webclient-kronolith-kolab-conf.template: + dist_conf configuration in kolab webclient templates (kolab/issue3387) + 2009-01-08 Gunnar Wrobel

* kolab-webclient.spec: kolab/issue2207 (Make it possible to Index: webclient-kolab-conf.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/webclient-kolab-conf.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-kolab-conf.template 18 Aug 2008 08:28:21 -0000 1.1 +++ webclient-kolab-conf.template 7 Feb 2009 15:51:27 -0000 1.2 @@ -1,14 +1,14 @@ KOLAB_META_START -TARGET=@@@webserver_document_root@@@/client/config/kolab.php -PERMISSIONS=0600 -OWNERSHIP=@@@kolab_usr@@@:@@@kolab_grp@@@ +TARGET=@@@horde_confdir@@@/kolab.php +PERMISSIONS=0400 +OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Author: mathieu Update of /kolabrepository/server/kolabd/kolabd/dist_conf In directory doto:/tmp/cvs-serv5025/kolabd/kolabd/dist_conf Modified Files: centos-clarkconnect common debian kolab mandriva suse Log Message: kolab/issue3387 (dist_conf configuration in kolab webclient templates) Index: centos-clarkconnect =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- centos-clarkconnect 18 Nov 2008 17:50:58 -0000 1.13 +++ centos-clarkconnect 7 Feb 2009 15:51:27 -0000 1.14 @@ -202,6 +202,12 @@ webserver_confdir=/usr/webconfig/etc webserver_sslmutex=${webserver_logdir}/ssl_mutex webserver_sslscache=/var/cache/mod_ssl/scache + +#webclient +horde_cookie_path=/client +horde_confdir=${webserver_document_root}/client/config +kronolith_confdir=${webserver_document_root}/client/kronolith/config + phplibdir=/usr/webconfig/include phplibdir2=/usr/webconfig/include phppeardir=/usr/webconfig/pear Index: common =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- common 12 Dec 2008 10:28:56 -0000 1.51 +++ common 7 Feb 2009 15:51:27 -0000 1.52 @@ -142,4 +142,7 @@ -e 's,[@]webserver_sslscache[@],$(webserver_sslscache),g' \ -e 's,[@]webserver_tmpdir[@],$(webserver_tmpdir),g' \ -e 's,[@]webserver_usr[@],$(webserver_usr),g' \ - -e 's,[@]webserver_web_prefix[@],$(webserver_web_prefix),g' + -e 's,[@]webserver_web_prefix[@],$(webserver_web_prefix),g' \ + -e 's,[@]horde_cookie_path[@],$(horde_cookie_path),g' \ + -e 's,[@]horde_confdir[@],$(horde_confdir),g' \ + -e 's,[@]kronolith_confdir[@],$(kronolith_confdir),g' Index: debian =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- debian 6 Jan 2009 22:20:28 -0000 1.23 +++ debian 7 Feb 2009 15:51:27 -0000 1.24 @@ -127,6 +127,11 @@ webserver_usr=www-data webserver_grp=www-data +#webclient +horde_cookie_path=/horde3 +horde_confdir=${sysconfdir}/kolab-webclient/horde3 +kronolith_confdir=${sysconfdir}/kolab-webclient/kronolith2 + phpini_dir=${sysconfdir}/kolab phplibdir=${datadir}/php phplibdir2=${datadir}/php Index: kolab =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- kolab 12 Dec 2008 11:24:57 -0000 1.68 +++ kolab 7 Feb 2009 15:51:27 -0000 1.69 @@ -147,6 +147,11 @@ webserver_usr=${kolab_usr} webserver_grp=${kolab_grp} +#webclient +horde_cookie_path=/client +horde_confdir=${webserver_document_root}/client/config +kronolith_confdir=${webserver_document_root}/client/kronolith/config + phpini_dir=${sysconfdir}/apache phplibdir=${libdir}/php phplibdir2=${kolab_statedir}/php Index: mandriva =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- mandriva 18 Nov 2008 17:50:58 -0000 1.13 +++ mandriva 7 Feb 2009 15:51:27 -0000 1.14 @@ -63,6 +63,11 @@ webserver_usr=apache webserver_grp=apache +#webclient +horde_cookie_path=/client +horde_confdir=${webserver_document_root}/client/config +kronolith_confdir=${webserver_document_root}/client/kronolith/config + sysrundir = /var/run resmgr_scriptsdir=${resmgr_confdir} Index: suse =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- suse 12 Dec 2008 10:28:56 -0000 1.81 +++ suse 7 Feb 2009 15:51:27 -0000 1.82 @@ -131,6 +131,11 @@ webserver_usr=wwwrun webserver_grp=www +#webclient +horde_cookie_path=/client +horde_confdir=${webserver_document_root}/client/config +kronolith_confdir=${webserver_document_root}/client/kronolith/config + phpini_dir=${sysconfdir}/php5/cli phplibdir=${datadir}/php5 phplibdir2=${datadir}/php5 From cvs at kolab.org Sat Feb 7 17:40:56 2009 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 7 Feb 2009 17:40:56 +0100 (CET) Subject: gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.23, 1.24 Message-ID: <20090207164056.1138F600168@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde-webmail/1.2.0 In directory doto:/tmp/cvs-serv8107 Modified Files: horde-webmail-1.2.0_kolab_openpkg.patch Log Message: Add security fixes for horde and update a patch to close kolab/issue2546. Index: horde-webmail-1.2.0_kolab_openpkg.patch =================================================================== RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- horde-webmail-1.2.0_kolab_openpkg.patch 5 Feb 2009 23:27:20 -0000 1.23 +++ horde-webmail-1.2.0_kolab_openpkg.patch 7 Feb 2009 16:40:53 -0000 1.24 @@ -262,7 +262,7 @@ + } +} -- -tg: (c56a73f..) t/framework/HK/GW/Kolab_Server/Session (depends on: master) +tg: (5bcbb67..) t/framework/HK/GW/Kolab_Server/Session (depends on: master) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Auth/UseSession @@ -455,7 +455,7 @@ return parent::setAuth($userId, $credentials, $realm, $changeRequested); -- -tg: (9823c9c..) t/framework/HK/GW/Auth/UseSession (depends on: t/framework/HK/GW/Kolab_Server/Session) +tg: (a25ecee..) t/framework/HK/GW/Auth/UseSession (depends on: t/framework/HK/GW/Kolab_Server/Session) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Server/getFreebusyServer @@ -544,7 +544,7 @@ $home = $this->get(KOLAB_ATTR_HOMESERVER); return $home; -- -tg: (c56a73f..) t/framework/HK/GW/Kolab_Server/getFreebusyServer (depends on: master) +tg: (5bcbb67..) t/framework/HK/GW/Kolab_Server/getFreebusyServer (depends on: master) From: Gunnar Wrobel

Subject: [PATCH] t/kronolith/HK/GW/getFreebusyServer @@ -594,7 +594,7 @@ $options['method'] = 'GET'; $options['timeout'] = 5; -- -tg: (ad3e393..) t/kronolith/HK/GW/getFreebusyServer (depends on: t/framework/HK/GW/Kolab_Server/getFreebusyServer) +tg: (eb8858b..) t/kronolith/HK/GW/getFreebusyServer (depends on: t/framework/HK/GW/Kolab_Server/getFreebusyServer) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Storage/Foreign_owner.patch @@ -620,7 +620,7 @@ } -- -tg: (c56a73f..) t/framework/HK/GW/Kolab_Storage/Foreign_owner.patch (depends on: master) +tg: (5bcbb67..) t/framework/HK/GW/Kolab_Storage/Foreign_owner.patch (depends on: master) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Storage/Trigger @@ -947,7 +947,7 @@ $this->_getAnnotationData(); } -- -tg: (db327a6..) t/framework/HK/GW/Kolab_Storage/Trigger (depends on: t/framework/HK/GW/Kolab_Storage/Foreign_owner.patch) +tg: (269811f..) t/framework/HK/GW/Kolab_Storage/Trigger (depends on: t/framework/HK/GW/Kolab_Storage/Foreign_owner.patch) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/framework/Kolab/MoveSessionHandler @@ -1347,7 +1347,7 @@ - } -} -- -tg: (aa5ae9d..) t/framework/HK/GW/framework/Kolab/MoveSessionHandler (depends on: t/framework/HK/GW/Auth/UseSession t/kronolith/HK/GW/getFreebusyServer t/framework/HK/GW/Kolab_Storage/Trigger) +tg: (b89bccc..) t/framework/HK/GW/framework/Kolab/MoveSessionHandler (depends on: t/framework/HK/GW/Auth/UseSession t/kronolith/HK/GW/getFreebusyServer t/framework/HK/GW/Kolab_Storage/Trigger) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/framework/Kolab/DeprecatedGetServer @@ -1395,7 +1395,7 @@ } } -- -tg: (a85415d..) t/framework/HK/GW/framework/Kolab/DeprecatedGetServer (depends on: t/framework/HK/GW/framework/Kolab/MoveSessionHandler) +tg: (f335a7b..) t/framework/HK/GW/framework/Kolab/DeprecatedGetServer (depends on: t/framework/HK/GW/framework/Kolab/MoveSessionHandler) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Storage/Restructuring_Fixes @@ -1477,7 +1477,7 @@ } -- -tg: (8322653..) t/framework/HK/GW/Kolab_Storage/Restructuring_Fixes (depends on: t/framework/HK/GW/framework/Kolab/DeprecatedGetServer) +tg: (0387a07..) t/framework/HK/GW/Kolab_Storage/Restructuring_Fixes (depends on: t/framework/HK/GW/framework/Kolab/DeprecatedGetServer) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Server/ListObjects @@ -2060,7 +2060,7 @@ * * @return int The current LDAP error number. -- -tg: (0d4a9cc..) t/framework/HK/GW/Kolab_Server/ListObjects (depends on: t/framework/HK/GW/Kolab_Storage/Restructuring_Fixes) +tg: (f150a3d..) t/framework/HK/GW/Kolab_Server/ListObjects (depends on: t/framework/HK/GW/Kolab_Storage/Restructuring_Fixes) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Auth/ListUsers @@ -2122,7 +2122,7 @@ + } } -- -tg: (69e74c3..) t/framework/HK/GW/Auth/ListUsers (depends on: t/framework/HK/GW/Kolab_Server/ListObjects) +tg: (d3b3a10..) t/framework/HK/GW/Auth/ListUsers (depends on: t/framework/HK/GW/Kolab_Server/ListObjects) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Server/RewriteExtend @@ -5949,7 +5949,7 @@ + } -- -tg: (0d7caa9..) t/framework/HK/GW/Kolab_Server/RewriteExtend (depends on: t/framework/HK/GW/Auth/ListUsers) +tg: (e8b6ec7..) t/framework/HK/GW/Kolab_Server/RewriteExtend (depends on: t/framework/HK/GW/Auth/ListUsers) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Storage/CatchPossibleError @@ -5983,7 +5983,7 @@ if ($this->tainted) { -- -tg: (3b5ef86..) t/framework/HK/GW/Kolab_Storage/CatchPossibleError (depends on: t/framework/HK/GW/Kolab_Server/RewriteExtend) +tg: (a264c44..) t/framework/HK/GW/Kolab_Storage/CatchPossibleError (depends on: t/framework/HK/GW/Kolab_Server/RewriteExtend) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Auth/UseKolabServer @@ -6212,7 +6212,7 @@ && $user != $session->user_id)) { $session = new Horde_Kolab_Session($user, $credentials); -- -tg: (44ae6f8..) t/framework/HK/GW/Auth/UseKolabServer (depends on: t/framework/HK/GW/Kolab_Storage/CatchPossibleError) +tg: (4de8436..) t/framework/HK/GW/Auth/UseKolabServer (depends on: t/framework/HK/GW/Kolab_Storage/CatchPossibleError) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Server/SafetyCheck @@ -6238,7 +6238,7 @@ if (empty($instances[$signature])) { $instances[$signature] = &Horde_Kolab_Server::factory($driver, -- -tg: (1db5f87..) t/framework/HK/GW/Kolab_Server/SafetyCheck (depends on: t/framework/HK/GW/Auth/UseKolabServer) +tg: (4808648..) t/framework/HK/GW/Kolab_Server/SafetyCheck (depends on: t/framework/HK/GW/Auth/UseKolabServer) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab/MoveIMAP @@ -10493,7 +10493,7 @@ return $result; } -- -tg: (5e92aed..) t/framework/HK/GW/Kolab/MoveIMAP (depends on: t/framework/HK/GW/Kolab_Server/SafetyCheck) +tg: (8c62e15..) t/framework/HK/GW/Kolab/MoveIMAP (depends on: t/framework/HK/GW/Kolab_Server/SafetyCheck) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Auth/SafetyCheck @@ -10519,7 +10519,7 @@ return $session->auth; } -- -tg: (6435616..) t/framework/HK/GW/Auth/SafetyCheck (depends on: t/framework/HK/GW/Kolab/MoveIMAP) +tg: (2ca0818..) t/framework/HK/GW/Auth/SafetyCheck (depends on: t/framework/HK/GW/Kolab/MoveIMAP) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Server/RequireIMAP @@ -10591,7 +10591,7 @@ $params['port'], true, false); if (is_a($imap, 'PEAR_Error')) { -- -tg: (97aa080..) t/framework/HK/GW/Kolab_Server/RequireIMAP (depends on: t/framework/HK/GW/Auth/SafetyCheck) +tg: (9fc3ac7..) t/framework/HK/GW/Kolab_Server/RequireIMAP (depends on: t/framework/HK/GW/Auth/SafetyCheck) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Auth/InvalidCheck @@ -10617,7 +10617,7 @@ $entry = array(); $entry[ 'timestamp' ] = time(); -- -tg: (fd49bbe..) t/framework/HK/GW/Auth/InvalidCheck (depends on: t/framework/HK/GW/Kolab_Server/RequireIMAP) +tg: (f09c951..) t/framework/HK/GW/Auth/InvalidCheck (depends on: t/framework/HK/GW/Kolab_Server/RequireIMAP) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab/AttachmentSupport @@ -11240,7 +11240,7 @@ __FILE__, __LINE__, PEAR_LOG_ERR); $data = array(); -- -tg: (b29d766..) t/framework/HK/GW/Kolab/AttachmentSupport (depends on: t/framework/HK/GW/Auth/InvalidCheck) +tg: (b266ebd..) t/framework/HK/GW/Kolab/AttachmentSupport (depends on: t/framework/HK/GW/Auth/InvalidCheck) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Vfs/KolabDriver @@ -11890,7 +11890,7 @@ + } +} -- -tg: (7383a08..) t/framework/HK/GW/Vfs/KolabDriver (depends on: t/framework/HK/GW/Kolab/AttachmentSupport) +tg: (3d7f002..) t/framework/HK/GW/Vfs/KolabDriver (depends on: t/framework/HK/GW/Kolab/AttachmentSupport) From: Gunnar Wrobel

Subject: [PATCH] t/turba/HK/GW/PhotoSupport @@ -12032,7 +12032,7 @@ $dir = TURBA_VFS_PATH . '/' . $this->getValue('__uid'); $file = $info['name']; -- -tg: (8a9adcf..) t/turba/HK/GW/PhotoSupport (depends on: t/framework/HK/GW/Vfs/KolabDriver) +tg: (237e3a0..) t/turba/HK/GW/PhotoSupport (depends on: t/framework/HK/GW/Vfs/KolabDriver) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Server/ImprovedFreebusyServerFallback @@ -12058,7 +12058,7 @@ } } -- -tg: (464c516..) t/framework/HK/GW/Kolab_Server/ImprovedFreebusyServerFallback (depends on: t/turba/HK/GW/PhotoSupport) +tg: (1a436dd..) t/framework/HK/GW/Kolab_Server/ImprovedFreebusyServerFallback (depends on: t/turba/HK/GW/PhotoSupport) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Server/ImprovedServerFallbacks @@ -12115,7 +12115,7 @@ } -- -tg: (b67227b..) t/framework/HK/GW/Kolab_Server/ImprovedServerFallbacks (depends on: t/framework/HK/GW/Kolab_Server/ImprovedFreebusyServerFallback) +tg: (2e85f5c..) t/framework/HK/GW/Kolab_Server/ImprovedServerFallbacks (depends on: t/framework/HK/GW/Kolab_Server/ImprovedFreebusyServerFallback) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Storgae/FixedUpdateTriggering @@ -12402,7 +12402,7 @@ $this->_annotation_data = $this->getData('annotation'); } -- -tg: (9575d2f..) t/framework/HK/GW/Kolab_Storgae/FixedUpdateTriggering (depends on: t/framework/HK/GW/Kolab_Server/ImprovedServerFallbacks) +tg: (bfee56e..) t/framework/HK/GW/Kolab_Storgae/FixedUpdateTriggering (depends on: t/framework/HK/GW/Kolab_Server/ImprovedServerFallbacks) From: Gunnar Wrobel

Subject: [PATCH] t/turba/HK/GW/AutomaticFreeBusyUrl @@ -12466,7 +12466,7 @@ 'search' => array( 'name', -- -tg: (90e5634..) t/turba/HK/GW/AutomaticFreeBusyUrl (depends on: t/framework/HK/GW/Kolab_Storgae/FixedUpdateTriggering) +tg: (98f183d..) t/turba/HK/GW/AutomaticFreeBusyUrl (depends on: t/framework/HK/GW/Kolab_Storgae/FixedUpdateTriggering) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Server/FixGetGroups @@ -12492,7 +12492,7 @@ /** -- -tg: (32043bc..) t/framework/HK/GW/Kolab_Server/FixGetGroups (depends on: t/turba/HK/GW/AutomaticFreeBusyUrl) +tg: (c2f404e..) t/framework/HK/GW/Kolab_Server/FixGetGroups (depends on: t/turba/HK/GW/AutomaticFreeBusyUrl) From: Gunnar Wrobel

Subject: [PATCH] t/kronolith/HK/GW/CalendarRenaming @@ -12565,7 +12565,7 @@ $this->name = $this->new_name; $this->new_name = null; -- -tg: (0251b34..) t/kronolith/HK/GW/CalendarRenaming (depends on: t/framework/HK/GW/Kolab_Server/FixGetGroups) +tg: (3c4d2c4..) t/kronolith/HK/GW/CalendarRenaming (depends on: t/framework/HK/GW/Kolab_Server/FixGetGroups) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderRename @@ -12617,7 +12617,7 @@ $this->name = $this->new_name; $this->new_name = null; -- -tg: (b393e2b..) t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderRename (depends on: t/kronolith/HK/GW/CalendarRenaming) +tg: (4e45499..) t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderRename (depends on: t/kronolith/HK/GW/CalendarRenaming) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderCreation @@ -12766,7 +12766,7 @@ if (!isset($this->_annotation_data)) { -- -tg: (2134872..) t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderCreation (depends on: t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderRename) +tg: (156cfca..) t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderCreation (depends on: t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderRename) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Server/AdditionalGetFeeBusyServerFixes @@ -12813,7 +12813,7 @@ /** -- -tg: (2a42a9e..) t/framework/HK/GW/Kolab_Server/AdditionalGetFeeBusyServerFixes (depends on: t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderCreation) +tg: (028c582..) t/framework/HK/GW/Kolab_Server/AdditionalGetFeeBusyServerFixes (depends on: t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderCreation) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Server/FixAddressObjectIdentification @@ -12848,7 +12848,7 @@ case KOLAB_OBJECT_ADMINISTRATOR: case KOLAB_OBJECT_MAINTAINER: -- -tg: (bf81ddd..) t/framework/HK/GW/Kolab_Server/FixAddressObjectIdentification (depends on: t/framework/HK/GW/Kolab_Server/AdditionalGetFeeBusyServerFixes) +tg: (17622c9..) t/framework/HK/GW/Kolab_Server/FixAddressObjectIdentification (depends on: t/framework/HK/GW/Kolab_Server/AdditionalGetFeeBusyServerFixes) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Fbview/XfbConcept @@ -12984,7 +12984,7 @@ $params = $default; } -- -tg: (ee3a00d..) t/framework/HK/GW/Kolab_Fbview/XfbConcept (depends on: t/framework/HK/GW/Kolab_Server/FixAddressObjectIdentification) +tg: (914f60a..) t/framework/HK/GW/Kolab_Fbview/XfbConcept (depends on: t/framework/HK/GW/Kolab_Server/FixAddressObjectIdentification) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab/XfbFixes @@ -13064,7 +13064,7 @@ default: $this->_data[$attribute] = $value; -- -tg: (dd67889..) t/framework/HK/GW/Kolab/XfbFixes (depends on: t/framework/HK/GW/Kolab_Fbview/XfbConcept) +tg: (c79c667..) t/framework/HK/GW/Kolab/XfbFixes (depends on: t/framework/HK/GW/Kolab_Fbview/XfbConcept) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/DB/SqliteErrorChecking @@ -13090,7 +13090,7 @@ if (!isset($error_regexps)) { $error_regexps = array( -- -tg: (046d71f..) t/framework/HK/GW/DB/SqliteErrorChecking (depends on: t/framework/HK/GW/Kolab/XfbFixes) +tg: (a3c75a8..) t/framework/HK/GW/DB/SqliteErrorChecking (depends on: t/framework/HK/GW/Kolab/XfbFixes) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Storage/ShareIdFix @@ -13119,7 +13119,7 @@ return rawurlencode($this->name); } -- -tg: (3a7655a..) t/framework/HK/GW/Kolab_Storage/ShareIdFix (depends on: t/framework/HK/GW/DB/SqliteErrorChecking) +tg: (302cf96..) t/framework/HK/GW/Kolab_Storage/ShareIdFix (depends on: t/framework/HK/GW/DB/SqliteErrorChecking) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/iCalendar/QuotedParameters @@ -13182,7 +13182,7 @@ } } -- -tg: (463d36b..) t/framework/HK/GW/iCalendar/QuotedParameters (depends on: t/framework/HK/GW/Kolab_Storage/ShareIdFix) +tg: (556bc82..) t/framework/HK/GW/iCalendar/QuotedParameters (depends on: t/framework/HK/GW/Kolab_Storage/ShareIdFix) From: Gunnar Wrobel

Subject: [PATCH] t/Kolab_Server/HK/GW/DenyLogin @@ -13349,7 +13349,7 @@ if (!empty($result) && !is_a($result, 'PEAR_Error')) { $this->user_mail = $result; -- -tg: (a8fff25..) t/Kolab_Server/HK/GW/DenyLogin (depends on: t/framework/HK/GW/iCalendar/QuotedParameters) +tg: (379ee4a..) t/Kolab_Server/HK/GW/DenyLogin (depends on: t/framework/HK/GW/iCalendar/QuotedParameters) From: Gunnar Wrobel

Subject: [PATCH] t/Kolab_Server/HK/GW/UserMailAndFullname @@ -13360,11 +13360,11 @@ Signed-off-by: Gunnar Wrobel

--- - horde-webmail/lib/Horde/Kolab/Server/Object.php | 5 +++++ - .../lib/Horde/Kolab/Server/Object/address.php | 10 ++++++++++ - .../lib/Horde/Kolab/Server/Object/user.php | 2 ++ - horde-webmail/lib/Horde/Kolab/Session.php | 19 +++++++++++++++++-- - 4 files changed, 34 insertions(+), 2 deletions(-) + horde-webmail/lib/Horde/Kolab/Server/Object.php | 5 ++++ + .../lib/Horde/Kolab/Server/Object/address.php | 10 +++++++++ + .../lib/Horde/Kolab/Server/Object/user.php | 2 + + horde-webmail/lib/Horde/Kolab/Session.php | 21 ++++++++++++++++++- + 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object.php b/horde-webmail/lib/Horde/Kolab/Server/Object.php index 663281e..e3b38e0 100644 @@ -13424,7 +13424,7 @@ /** diff --git a/horde-webmail/lib/Horde/Kolab/Session.php b/horde-webmail/lib/Horde/Kolab/Session.php -index d47f8b0..486b67e 100644 +index d47f8b0..bcbda7e 100644 --- a/horde-webmail/lib/Horde/Kolab/Session.php +++ b/horde-webmail/lib/Horde/Kolab/Session.php @@ -55,6 +55,13 @@ class Horde_Kolab_Session { @@ -13453,7 +13453,16 @@ $result = $user_object->getServer('imap'); if (!empty($result) && !is_a($result, 'PEAR_Error')) { $server = explode(':', $result, 2); -@@ -332,9 +344,12 @@ class Horde_Kolab_Session { +@@ -249,6 +261,8 @@ class Horde_Kolab_Session { + $params['user'] = $user; + if (isset($credentials['password'])) { + $params['pass'] = $credentials['password']; ++ } else { ++ $params['pass'] = Auth::getCredential('password'); + } + } + return Horde_Kolab_Server::singleton($params); +@@ -332,9 +346,12 @@ class Horde_Kolab_Session { $session = $hs->query('kolab_session'); } @@ -13469,7 +13478,7 @@ } -- -tg: (5dcea93..) t/Kolab_Server/HK/GW/UserMailAndFullname (depends on: t/Kolab_Server/HK/GW/DenyLogin) +tg: (7281ae6..) t/Kolab_Server/HK/GW/UserMailAndFullname (depends on: t/Kolab_Server/HK/GW/DenyLogin) From: Gunnar Wrobel

Subject: [PATCH] t/imp/HK/GW/AuthForInvitations @@ -13538,7 +13547,7 @@ $this->_msgs[$key][] = array('error', sprintf(_("Error sending reply: %s."), $status->getMessage())); } else { -- -tg: (cfbcbec..) t/imp/HK/GW/AuthForInvitations (depends on: t/Kolab_Server/HK/GW/UserMailAndFullname) +tg: (926ddad..) t/imp/HK/GW/AuthForInvitations (depends on: t/Kolab_Server/HK/GW/UserMailAndFullname) From: Gunnar Wrobel

Subject: [PATCH] t/SyncML/HK/GW/CombinedFixes @@ -13906,7 +13915,7 @@ $backend->logMessage($suid->message, __FILE__, __LINE__, PEAR_LOG_DEBUG); -- -tg: (c56a73f..) t/SyncML/HK/GW/CombinedFixes (depends on: master) +tg: (5bcbb67..) t/SyncML/HK/GW/CombinedFixes (depends on: master) From: Gunnar Wrobel

Subject: [PATCH] t/Prefs/HK/GW/FixLDAPAuthForIngo @@ -13944,7 +13953,7 @@ } -- -tg: (20a6a9e..) t/Prefs/HK/GW/FixLDAPAuthForIngo (depends on: t/SyncML/HK/GW/CombinedFixes) +tg: (6acdc34..) t/Prefs/HK/GW/FixLDAPAuthForIngo (depends on: t/SyncML/HK/GW/CombinedFixes) From: Gunnar Wrobel

Subject: [PATCH] t/Text/Filter/SC/CH/Xss @@ -13970,7 +13979,7 @@ $patterns['|]*>(?:\s*<\!--)*|i'] = '\s*)*|i'] = '-->'; -- -tg: (c56a73f..) t/Text/Filter/SC/CH/Xss (depends on: master) +tg: (5bcbb67..) t/Text/Filter/SC/CH/Xss (depends on: master) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/framework/Kolab_Format/WS @@ -13996,7 +14005,7 @@ $primary_category = ''; -- -tg: (c56a73f..) t/framework/HK/GW/framework/Kolab_Format/WS (depends on: master) +tg: (5bcbb67..) t/framework/HK/GW/framework/Kolab_Format/WS (depends on: master) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Kolab_Format/ImprovedPreferencesHandling @@ -14032,7 +14041,7 @@ $horde_categories = $cManager->get(); } else { -- -tg: (8d833cb..) t/framework/HK/GW/Kolab_Format/ImprovedPreferencesHandling (depends on: t/framework/HK/GW/framework/Kolab_Format/WS) +tg: (fff6d82..) t/framework/HK/GW/Kolab_Format/ImprovedPreferencesHandling (depends on: t/framework/HK/GW/framework/Kolab_Format/WS) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/Prefs_KolabImapApplicationTag @@ -14133,7 +14142,7 @@ $result = $this->_connection->_storage->save($object, $old_uid); -- -tg: (c56a73f..) t/framework/HK/GW/Prefs_KolabImapApplicationTag (depends on: master) +tg: (5bcbb67..) t/framework/HK/GW/Prefs_KolabImapApplicationTag (depends on: master) From: Gunnar Wrobel

Subject: [PATCH] t/framework/HK/GW/horde/conf_xmlUpdates @@ -14185,7 +14194,7 @@ -- -tg: (c56a73f..) t/framework/HK/GW/horde/conf_xmlUpdates (depends on: master) +tg: (5bcbb67..) t/framework/HK/GW/horde/conf_xmlUpdates (depends on: master) From: Gunnar Wrobel

Subject: [PATCH] t/kronolith/HK/GW/AuthenticatedFreeBusy @@ -14232,7 +14241,7 @@ return PEAR::raiseError(sprintf(_("The free/busy url for %s cannot be retrieved."), $email)); } -- -tg: (c56a73f..) t/kronolith/HK/GW/AuthenticatedFreeBusy (depends on: master) +tg: (5bcbb67..) t/kronolith/HK/GW/AuthenticatedFreeBusy (depends on: master) From: Gunnar Wrobel

Subject: [PATCH] t/kronolith/HK/SB/SaveEventAttendees @@ -14516,7 +14525,7 @@ +

+ -- -tg: (c56a73f..) t/kronolith/HK/SB/SaveEventAttendees (depends on: master) +tg: (5bcbb67..) t/kronolith/HK/SB/SaveEventAttendees (depends on: master) From: Gunnar Wrobel

Subject: [PATCH] t/kronolith/HK/SB/ExtraParameters @@ -14610,7 +14619,7 @@ -

 
+
 
-- -tg: (50d5619..) t/kronolith/HK/SB/ExtraParameters (depends on: t/kronolith/HK/SB/SaveEventAttendees) +tg: (083b765..) t/kronolith/HK/SB/ExtraParameters (depends on: t/kronolith/HK/SB/SaveEventAttendees) From: Gunnar Wrobel

Subject: [PATCH] t/kronolith/HK/GW/FbviewRelevance @@ -14684,7 +14693,7 @@ if ($original_name != $this->_vars->get('name')) { $result = $GLOBALS['kronolith_driver']->rename($original_name, $this->_vars->get('name')); -- -tg: (fffea19..) t/kronolith/HK/GW/FbviewRelevance (depends on: t/kronolith/HK/SB/ExtraParameters) +tg: (2685978..) t/kronolith/HK/GW/FbviewRelevance (depends on: t/kronolith/HK/SB/ExtraParameters) From: Gunnar Wrobel

Subject: [PATCH] t/kronolith/HK/GW/XfbAccess @@ -14837,7 +14846,7 @@   -- -tg: (0cc44ec..) t/kronolith/HK/GW/XfbAccess (depends on: t/kronolith/HK/GW/FbviewRelevance) +tg: (54021ca..) t/kronolith/HK/GW/XfbAccess (depends on: t/kronolith/HK/GW/FbviewRelevance) From: Gunnar Wrobel

Subject: [PATCH] t/nag/H/MR/Bug_7400 @@ -14919,7 +14928,7 @@ } -- -tg: (c56a73f..) t/nag/H/MR/Bug_7400 (depends on: master) +tg: (5bcbb67..) t/nag/H/MR/Bug_7400 (depends on: master) From: Gunnar Wrobel

Subject: [PATCH] t/GLOBAL/HK/GW/Config @@ -16015,7 +16024,7 @@ * An address book based on message recipients. This will always be private and * read-only. The address book content is provided by the -- -tg: (c56a73f..) t/GLOBAL/HK/GW/Config (depends on: master) +tg: (5bcbb67..) t/GLOBAL/HK/GW/Config (depends on: master) From: Gunnar Wrobel

Subject: [PATCH] t/GLOBAL/HK/GW/ConfigOpenPKG @@ -16042,7 +16051,7 @@ $conf['alarms']['params']['ttl'] = 300; $conf['alarms']['driver'] = 'sql'; -- -tg: (05da78c..) t/GLOBAL/HK/GW/ConfigOpenPKG (depends on: t/GLOBAL/HK/GW/Config) +tg: (7baa33d..) t/GLOBAL/HK/GW/ConfigOpenPKG (depends on: t/GLOBAL/HK/GW/Config) From: Gunnar Wrobel

Subject: [PATCH] t/kronolith/HK/GW/SyncMLrefresh @@ -16112,7 +16121,7 @@ $histories = $history->getByTimestamp('>', $timestamp, array(array('op' => '=', 'field' => 'action', 'value' => $action)), 'kronolith:' . $calendar); if (is_a($histories, 'PEAR_Error')) { -- -tg: (c56a73f..) t/kronolith/HK/GW/SyncMLrefresh (depends on: master) +tg: (5bcbb67..) t/kronolith/HK/GW/SyncMLrefresh (depends on: master) From: Gunnar Wrobel

Subject: [PATCH] t/turba/HK/GW/FixAddressbookDeletion @@ -16138,7 +16147,7 @@ return $this->_driver->_deleteAll($sourceName); } -- -tg: (c56a73f..) t/turba/HK/GW/FixAddressbookDeletion (depends on: master) +tg: (5bcbb67..) t/turba/HK/GW/FixAddressbookDeletion (depends on: master) From: Gunnar Wrobel

Subject: [PATCH] t/turba/HK/GW/FixSyncMLAttributeDeletion @@ -16165,7 +16174,7 @@ switch ($item['name']) { case 'FN': -- -tg: (c56a73f..) t/turba/HK/GW/FixSyncMLAttributeDeletion (depends on: master) +tg: (5bcbb67..) t/turba/HK/GW/FixSyncMLAttributeDeletion (depends on: master) From: Gunnar Wrobel

Subject: [PATCH] t/turba/HK/GW/SyncMLrefresh @@ -16190,7 +16199,7 @@ /** -- -tg: (f86048d..) t/turba/HK/GW/SyncMLrefresh (depends on: t/turba/HK/GW/FixSyncMLAttributeDeletion) +tg: (a490d6b..) t/turba/HK/GW/SyncMLrefresh (depends on: t/turba/HK/GW/FixSyncMLAttributeDeletion) From: Gunnar Wrobel

Subject: [PATCH] t/imp/HideGroupwareFolders @@ -16328,4 +16337,141 @@ /** -- -tg: (c56a73f..) t/imp/HideGroupwareFolders (depends on: master) +tg: (5bcbb67..) t/imp/HideGroupwareFolders (depends on: master) +From: Gunnar Wrobel

+Subject: [PATCH] t/imp/SC/CH/SecIssues20090128 + +Security issues patched on 20090128 + +Signed-off-by: Gunnar Wrobel

+ +--- + horde-webmail/imp/message.php | 10 +++++----- + horde-webmail/imp/pgp.php | 4 ++-- + horde-webmail/imp/smime.php | 4 ++-- + 3 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/horde-webmail/imp/message.php b/horde-webmail/imp/message.php +index c822e0b..0488af7 100644 +--- a/horde-webmail/imp/message.php ++++ b/horde-webmail/imp/message.php +@@ -444,7 +444,7 @@ if (!$printer_friendly && !empty($conf['maillog']['use_maillog'])) { + + /* Do MDN processing now. */ + if ($imp_ui->MDNCheck($ob->header, Util::getFormData('mdn_confirm'))) { +- $confirm_link = Horde::link(Util::addParameter($selfURL, 'mdn_confirm', 1)) . _("HERE") . ''; ++ $confirm_link = Horde::link(htmlspecialchars(Util::addParameter($selfURL, 'mdn_confirm', 1))) . _("HERE") . ''; + $notification->push(sprintf(_("The sender of this message is requesting a Message Disposition Notification from you when you have read this message. Please click %s to send the notification message."), $confirm_link), 'horde.message', array('content.raw')); + } + } +@@ -617,13 +617,13 @@ if (!$printer_friendly) { + + $a_template->set('headers', Horde::widget('#', _("Headers"), 'widget hasmenu', '', '', _("Headers"), true)); + if ($all_headers || $list_headers) { +- $a_template->set('common_headers', Horde::widget($headersURL, _("Show Common Headers"), 'widget', '', '', _("Show Common Headers"), true)); ++ $a_template->set('common_headers', Horde::widget(htmlspecialchars($headersURL), _("Show Common Headers"), 'widget', '', '', _("Show Common Headers"), true)); + } + if (!$all_headers) { +- $a_template->set('all_headers', Horde::widget(Util::addParameter($headersURL, 'show_all_headers', 1), _("Show All Headers"), 'widget', '', '', _("Show All Headers"), true)); ++ $a_template->set('all_headers', Horde::widget(htmlspecialchars(Util::addParameter($headersURL, 'show_all_headers', 1)), _("Show All Headers"), 'widget', '', '', _("Show All Headers"), true)); + } + if ($list_info['exists'] && !$list_headers) { +- $a_template->set('list_headers', Horde::widget(Util::addParameter($headersURL, 'show_list_headers', 1), _("Show Mailing List Information"), 'widget', '', '', _("Show Mailing List Information"), true)); ++ $a_template->set('list_headers', Horde::widget(htmlspecialchars(Util::addParameter($headersURL, 'show_list_headers', 1)), _("Show Mailing List Information"), 'widget', '', '', _("Show Mailing List Information"), true)); + } + + echo $a_template->fetch(IMP_TEMPLATES . '/message/navbar_actions.html'); +@@ -681,7 +681,7 @@ if ($show_parts || ($downloadall_link && !$printer_friendly)) { + $url = Horde::selfUrl(true); + $url = Util::removeParameter($url, array('actionID')); + $url = Util::addParameter($url, array('actionID' => 'strip_all', 'message_token' => $message_token)); +- $val .= '
' . Horde::link($url, _("Strip All Attachments"), null, null, "return window.confirm('" . addslashes(_("Are you sure you wish to PERMANENTLY delete all attachments?")) . "');") . _("Strip All Attachments") . ' ' . Horde::img('delete.png', _("Strip Attachments"), null, $registry->getImageDir('horde')) . ''; ++ $val .= '
' . Horde::link(htmlspecialchars($url), _("Strip All Attachments"), null, null, "return window.confirm('" . addslashes(_("Are you sure you wish to PERMANENTLY delete all attachments?")) . "');") . _("Strip All Attachments") . ' ' . Horde::img('delete.png', _("Strip Attachments"), null, $registry->getImageDir('horde')) . ''; + } + } + $hdrs[] = array('name' => _("Part(s)"), 'val' => $val, 'i' => (++$i % 2)); +diff --git a/horde-webmail/imp/pgp.php b/horde-webmail/imp/pgp.php +index 35c733c..e88e910 100644 +--- a/horde-webmail/imp/pgp.php ++++ b/horde-webmail/imp/pgp.php +@@ -40,7 +40,7 @@ function _outputPassphraseDialog($secure_check, $symmetric = false) + $t->set('symmetric', $symmetric); + $t->set('submit_url', Util::addParameter(Horde::applicationUrl('pgp.php'), 'actionID', $symmetric ? 'process_symmetric_passphrase_dialog' : 'process_passphrase_dialog')); + $t->set('reload', htmlspecialchars(Util::getFormData('reload'))); +- $t->set('action', Util::getFormData('passphrase_action')); ++ $t->set('action', htmlspecialchars(Util::getFormData('passphrase_action'))); + $t->set('locked_img', Horde::img('locked.png', _("PGP"), null, $GLOBALS['registry']->getImageDir('horde'))); + echo $t->fetch(IMP_TEMPLATES . '/pgp/passphrase.html'); + } +@@ -66,7 +66,7 @@ function _importKeyDialog($target) + + function _reloadWindow() + { +- Util::closeWindowJS('opener.focus();opener.location.href="' . Util::getFormData('reload') . '";'); ++ Util::closeWindowJS('opener.focus();opener.location.href="' . htmlspecialchars(Util::getFormData('reload')) . '";'); + } + + function _getImportKey() +diff --git a/horde-webmail/imp/smime.php b/horde-webmail/imp/smime.php +index 6ba24c6..d05c454 100644 +--- a/horde-webmail/imp/smime.php ++++ b/horde-webmail/imp/smime.php +@@ -63,7 +63,7 @@ function _outputPassphraseDialog($secure_check) + $t->setOption('gettext', true); + $t->set('submit_url', Util::addParameter(Horde::applicationUrl('smime.php'), 'actionID', 'process_passphrase_dialog')); + $t->set('reload', htmlspecialchars(html_entity_decode(Util::getFormData('reload')))); +- $t->set('action', Util::getFormData('passphrase_action')); ++ $t->set('action', htmlspecialchars(Util::getFormData('passphrase_action'))); + $t->set('locked_img', Horde::img('locked.png', _("S/MIME"), null, $GLOBALS['registry']->getImageDir('horde'))); + echo $t->fetch(IMP_TEMPLATES . '/smime/passphrase.html'); + } +@@ -79,7 +79,7 @@ function _actionWindow() + + function _reloadWindow() + { +- Util::closeWindowJS('opener.focus();opener.location.href="' . Util::getFormData('reload') . '";'); ++ Util::closeWindowJS('opener.focus();opener.location.href="' . htmlspecialchars(Util::getFormData('reload')) . '";'); + } + + function _textWindowOutput($filename, $msg, $html = false) +-- +tg: (5bcbb67..) t/imp/SC/CH/SecIssues20090128 (depends on: master) +From: Gunnar Wrobel

+Subject: [PATCH] t/horde/SC/CH/SecIssues20090128 + +Security issues that were patched on 20090128. + +Signed-off-by: Gunnar Wrobel

+ +--- + horde-webmail/lib/Horde/Image.php | 1 + + horde-webmail/services/portal/cloud_search.php | 2 +- + 2 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/horde-webmail/lib/Horde/Image.php b/horde-webmail/lib/Horde/Image.php +index 2d48777..1288ef5 100644 +--- a/horde-webmail/lib/Horde/Image.php ++++ b/horde-webmail/lib/Horde/Image.php +@@ -551,6 +551,7 @@ class Horde_Image { + list($app, $driver) = $driver; + } + ++ $driver = basename($driver); + $class = 'Horde_Image_' . $driver; + if (!class_exists($class)) { + if (!empty($app)) { +diff --git a/horde-webmail/services/portal/cloud_search.php b/horde-webmail/services/portal/cloud_search.php +index 0d0bc53..7e22aa6 100644 +--- a/horde-webmail/services/portal/cloud_search.php ++++ b/horde-webmail/services/portal/cloud_search.php +@@ -28,7 +28,7 @@ $results = $registry->call('images/searchTags', array(array($tag))); + $results = array_merge($results, $registry->call('news/searchTags', + array(array($tag)))); + echo '

' +- . sprintf(_("Results for %s"), '' . $tag . '') ++ . sprintf(_("Results for %s"), '' . htmlspecialchars($tag) . '') + . '' + . Horde::link('#', '', '', '', '$(\'cloudsearch\').hide();', '', '', array('style' => 'font-size:75%;')) + . '(' . _("Hide Results") . ')