Bump to 3.1.1nb2 to address recent XSS issue (patches from Horde CVS)

10 files changed, 1728 insertions, 397 deletions

diff --git a/www/horde/DESCR b/www/horde/DESCR
index 4145b236f8a..84ae7f1ba3b 100644
--- a/www/horde/DESCR
+++ b/www/horde/DESCR
@@ -1,4 +1,4 @@
-The Horde Application Framework provides classes for dealing with preferences,
-compression, browser detection, connection tracking, MIME, and more.
-This is the previous stable branch of Horde.  A version of Horde using the
-current stable branch is available as www/horde3.
+The Horde Application Framework is a modular, general-purpose web application
+framework written in PHP.  It provides an extensive array of classes that are
+targeted at the common problems and tasks involved in developing modern web
+applications.
diff --git a/www/horde/MESSAGE b/www/horde/MESSAGE
index ea57b1fccdf..76907763be9 100644
--- a/www/horde/MESSAGE
+++ b/www/horde/MESSAGE
@@ -1,30 +1,18 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.7 2005/05/15 21:39:07 salo Exp $
+$NetBSD: MESSAGE,v 1.8 2006/06/16 09:23:21 adrianp Exp $
 
 Please refer to the file:
 
 	${PREFIX}/share/doc/horde/INSTALL
 
-to setup Horde to access its database properly.  The short summary is to
-edit:
-
-	${HORDEDIR}/config/horde.php
-
-to specify the correct backend database, and run the appropriate scripts
-in:
+to setup Horde to access its user preferences store properly.  The short
+summary is to run the appropriate scripts in:
 
 	${HORDEDIR}/scripts/db
 
-to setup the horde database.  You will also need to install the appropriate
-php module, such as databases/php4-mysql or databases/php4-pgsql.  Horde is
-setup by default to access MySQL.  It's recommended that you change the
-password of the 'hordemgr' user used to connect to the horde database.  For
-localhost security, the file
-
-	${HORDEDIR}/config/horde.php
-
-should be accessible only to the webserver process as it contains the
-horde database password.
+to setup the horde preferences store.  Horde is setup by default to access
+MySQL.  It's recommended that you change the password of the 'horde' user used
+to connect to the horde database.
 
 You will also need to make Horde accessible through your HTTP server.  If
 you are running Apache and ap-php, then you can add the following line
diff --git a/www/horde/Makefile b/www/horde/Makefile
index 9e6ba1f8bde..b4274dfabe6 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,74 +1,133 @@
-# $NetBSD: Makefile,v 1.44 2006/06/02 18:28:00 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2006/06/16 09:23:21 adrianp Exp $
 
-DISTNAME=	horde-2.2.9
+DISTNAME=	horde-3.1.1
 PKGREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
+MASTER_SITES=	http://ftp.horde.org/pub/horde/ \
+		ftp://ftp.horde.org/pub/horde/
 
 MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://www.horde.org/
 COMMENT=	PHP application framework
 
+CONFLICTS+=	horde-2.*
+
 .include "../../lang/php/phpversion.mk"
 
 DEPENDS+=	${PHP_PKG_PREFIX}-gettext>=4.3.3:../../devel/php-gettext
+DEPENDS+=	${PHP_PKG_PREFIX}-mcrypt>=4.3.3:../../security/php-mcrypt
+DEPENDS+=	${PHP_PKG_PREFIX}-iconv>=4.3.3:../../converters/php-iconv
+DEPENDS+=	${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Log-[0-9]*:../../sysutils/pear-Log
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Mail_Mime-[0-9]*:../../mail/pear-Mail_Mime
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-DB-[0-9]*:../../databases/pear-DB
+DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php
+.if ${PKG_PHP_VERSION} == "4"
+DEPENDS+=	${PHP_PKG_PREFIX}-domxml>=4.3.3:../../textproc/php4-domxml
+.elif ${PKG_PHP_VERSION} == "5"
+DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom
+.endif
+DEPENDS+=	${PHP_PKG_PREFIX}-zlib>=4.3.3:../../archivers/php-zlib
 
-CONFLICTS+=	horde-3.*
+.include "../../mk/bsd.prefs.mk"
 
 DOCDIR=		${PREFIX}/share/doc/horde
 EGDIR=		${PREFIX}/share/examples/horde
 HORDEDIR=	${PREFIX}/share/horde
+PAXDIRS=	js lib locale po scripts services templates themes util admin
+SENDMAIL?=	/usr/sbin/sendmail
 
-MESSAGE_SUBST+=	HORDEDIR=${HORDEDIR}
+PKG_SYSCONFSUBDIR?=	httpd
+MESSAGE_SUBST+=		HORDEDIR=${HORDEDIR:Q}
 
-.include "../../mk/bsd.prefs.mk"
-.include "../../lang/php/phpversion.mk"
+CONF_FILES+=		${EGDIR}/horde.conf ${PKG_SYSCONFDIR}/horde.conf
+CONF_FILES_PERMS+=	${HORDEDIR}/config/conf.php.dist \
+			${HORDEDIR}/config/conf.php \
+			${APACHE_USER} ${ROOT_GROUP} 0640
+CONF_FILES_PERMS+=	${HORDEDIR}/config/conf.xml.dist \
+			${HORDEDIR}/config/conf.xml \
+			${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=	${HORDEDIR}/config/mime_drivers.php.dist \
+			${HORDEDIR}/config/mime_drivers.php \
+			${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=	${HORDEDIR}/config/motd.php.dist \
+			${HORDEDIR}/config/motd.php \
+			${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=	${HORDEDIR}/config/nls.php.dist \
+			${HORDEDIR}/config/nls.php \
+			${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=	${HORDEDIR}/config/prefs.php.dist \
+			${HORDEDIR}/config/prefs.php \
+			${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=	${HORDEDIR}/config/registry.php.dist \
+			${HORDEDIR}/config/registry.php \
+			${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=	${HORDEDIR}/config/hooks.php.dist \
+			${HORDEDIR}/config/hooks.php \
+			${APACHE_USER} ${ROOT_GROUP} 0440
 
-PKG_SYSCONFSUBDIR?=	httpd
-PHP_VERSIONS_ACCEPTED=	4
-
-CONF_FILES=	${EGDIR}/horde.conf ${PKG_SYSCONFDIR}/horde.conf
-CONF_FILES+=	${HORDEDIR}/config/horde.php.dist ${HORDEDIR}/config/horde.php
-CONF_FILES+=	${HORDEDIR}/config/html.php.dist ${HORDEDIR}/config/html.php
-CONF_FILES+=	${HORDEDIR}/config/lang.php.dist ${HORDEDIR}/config/lang.php
-CONF_FILES+=	${HORDEDIR}/config/mime_drivers.php.dist ${HORDEDIR}/config/mime_drivers.php
-CONF_FILES+=	${HORDEDIR}/config/mime_mapping.php.dist ${HORDEDIR}/config/mime_mapping.php
-CONF_FILES+=	${HORDEDIR}/config/motd.php.dist ${HORDEDIR}/config/motd.php
-CONF_FILES+=	${HORDEDIR}/config/prefs.php.dist ${HORDEDIR}/config/prefs.php
-CONF_FILES+=	${HORDEDIR}/config/registry.php.dist ${HORDEDIR}/config/registry.php
-
-post-patch:
-	cd ${WRKSRC}/scripts;						\
-	for FILE in mime_mapping/convert.pl; do		\
-		${MV} -f $${FILE} $${FILE}.orig;			\
-		${SED}	-e "s|/usr/bin/perl|${PERL5}|g"			\
-			$${FILE}.orig > $${FILE};			\
-	done
+# Empty directories installed by install target
+# that we need to create in the install script
+# to get the same layout from a binary package installation
+REQD_DIRS+=	share/horde/lib/data
+REQD_DIRS+=	share/horde/lib/XML/tests
+REQD_DIRS+=	share/horde/lib/XML/docs/examples
+REQD_DIRS+=	share/horde/lib/XML/docs
+REQD_DIRS+=	share/horde/lib/VFS/tests
+REQD_DIRS+=	share/horde/lib/Text/tests
+REQD_DIRS+=	share/horde/lib/Text/docs/examples
+REQD_DIRS+=	share/horde/lib/Text/docs
+REQD_DIRS+=	share/horde/lib/Horde/tests
+REQD_DIRS+=	share/horde/lib/Horde/docs/examples
+REQD_DIRS+=	share/horde/lib/Horde/docs
+REQD_DIRS+=	share/horde/lib/Horde/Text/tests
+REQD_DIRS+=	share/horde/lib/File/tests
 
-do-build:
-	${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;
-	${FIND} ${WRKSRC} -name .htaccess -exec ${RM} -f {} \;
-	${FIND} ${WRKSRC}/scripts -name "*.pl" -exec ${CHMOD} +x {} \;
-	${FIND} ${WRKSRC}/scripts -name "*.sh" -exec ${CHMOD} +x {} \;
+SUBST_CLASSES+=		files
+SUBST_STAGE.files=	post-build
+SUBST_FILES.files=	horde.conf.dist config/conf.xml config/conf.xml.dist \
+			scripts/set_perms.sh
+SUBST_SED.files=	-e "s|@HORDEDIR@|${HORDEDIR}|g"
+SUBST_SED.files+=	-e "s|/usr/lib/sendmail|${SENDMAIL}|g"
+SUBST_SED.files+=	-e "s|/bin/sh|${SH}|g"
+SUBST_MESSAGE.files=	Fixing configuration files.
+
+.include "options.mk"
+.include "../../mk/apache.mk"
 
-pre-install:
-	${SED}	-e "s|@HORDEDIR@|${HORDEDIR}|g"				\
-		${FILESDIR}/horde.conf.dist > ${WRKDIR}/horde.conf.dist
+do-build:
+	${RM} ${WRKSRC}/lib/Horde/Auth/login.php.orig
+	${RM} ${WRKSRC}/templates/problem/problem.inc.orig
+	${CP} ${FILESDIR}/horde.conf.dist ${WRKSRC}/horde.conf.dist
+	${CP} ${WRKSRC}/config/conf.xml ${WRKSRC}/config/conf.xml.dist
+	${FIND} ${WRKSRC} -name .htaccess -print | ${XARGS} ${RM} -f
+	${CHMOD} 0750 ${WRKSRC}/scripts/set_perms.sh
 
 do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA_DIR} ${HORDEDIR}
-	cd ${WRKDIR}; ${INSTALL_DATA} horde.conf.dist ${EGDIR}/horde.conf
-	cd ${WRKSRC}; ${INSTALL_DATA} COPYING README docs/* ${DOCDIR}
-	cd ${WRKSRC}; ${CP} -R graphics lib locale po scripts templates util ${HORDEDIR}
 	${INSTALL_DATA_DIR} ${HORDEDIR}/config
-	cd ${WRKSRC}/config; ${INSTALL_DATA} * ${HORDEDIR}/config
-	cd ${WRKSRC}; ${INSTALL_DATA} *.php ${HORDEDIR}
+	${INSTALL_DATA} ${WRKSRC}/horde.conf.dist ${EGDIR}/horde.conf
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCDIR}
+
+.	for d in ${PAXDIRS}
+		${INSTALL_DATA_DIR} ${HORDEDIR}/${d}
+.	endfor
+
+.	for d in ${PAXDIRS}
+		@cd ${WRKSRC}/${d} && ${PAX} -rwpam . ${HORDEDIR}/${d}
+.	endfor
+
+	${INSTALL_DATA} ${WRKSRC}/config/*.dist ${HORDEDIR}/config
+	${INSTALL_DATA} ${WRKSRC}/*.php ${HORDEDIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${HORDEDIR}
 	${FIND} ${HORDEDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 	${FIND} ${HORDEDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
+	${CHOWN} ${APACHE_USER}:${SHAREGRP} ${HORDEDIR}/config
+	${CHMOD} 0750 ${HORDEDIR}/config
 
+.include "../../mk/apachever.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/horde/PLIST b/www/horde/PLIST
index 86e45190059..46663c7f92f 100644
--- a/www/horde/PLIST
+++ b/www/horde/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/05/15 21:39:07 salo Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/06/16 09:23:21 adrianp Exp $
 share/doc/horde/CHANGES
 share/doc/horde/CODING_STANDARDS
 share/doc/horde/CONTRIBUTING
@@ -6,216 +6,526 @@ share/doc/horde/COPYING
 share/doc/horde/CREDITS
 share/doc/horde/HACKING
 share/doc/horde/INSTALL
+share/doc/horde/PERFORMANCE
 share/doc/horde/README
 share/doc/horde/RELEASE_NOTES
 share/doc/horde/SECURITY
+share/doc/horde/TODO
 share/doc/horde/TRANSLATIONS
+share/doc/horde/UPGRADING
 share/examples/horde/horde.conf
-share/horde/config/horde.php.dist
-share/horde/config/html.php.dist
-share/horde/config/lang.php.dist
+share/horde/admin/cmdshell.php
+share/horde/admin/datatree.php
+share/horde/admin/groups.php
+share/horde/admin/index.php
+share/horde/admin/locale/en_US/help.xml
+share/horde/admin/locale/fi_FI/help.xml
+share/horde/admin/locale/hu_HU/help.xml
+share/horde/admin/perms/addchild.php
+share/horde/admin/perms/delete.php
+share/horde/admin/perms/edit.php
+share/horde/admin/perms/index.php
+share/horde/admin/phpshell.php
+share/horde/admin/sessions.php
+share/horde/admin/setup/config.php
+share/horde/admin/setup/diff.php
+share/horde/admin/setup/index.php
+share/horde/admin/setup/scripts.php
+share/horde/admin/sqlshell.php
+share/horde/admin/templates.php
+share/horde/admin/user.php
+share/horde/config/conf.php.dist
+share/horde/config/conf.xml.dist
+share/horde/config/hooks.php.dist
 share/horde/config/mime_drivers.php.dist
-share/horde/config/mime_mapping.php.dist
 share/horde/config/motd.php.dist
+share/horde/config/nls.php.dist
 share/horde/config/prefs.php.dist
 share/horde/config/registry.php.dist
-share/horde/css.php
-share/horde/graphics/alerts/error.gif
-share/horde/graphics/alerts/message.gif
-share/horde/graphics/alerts/success.gif
-share/horde/graphics/alerts/warning.gif
-share/horde/graphics/data.gif
-share/horde/graphics/favicon.ico
-share/horde/graphics/help.gif
-share/horde/graphics/home.gif
-share/horde/graphics/keyboard.gif
-share/horde/graphics/login.gif
-share/horde/graphics/logout.gif
-share/horde/graphics/mime/audio.gif
-share/horde/graphics/mime/binary.gif
-share/horde/graphics/mime/compressed.gif
-share/horde/graphics/mime/csv.gif
-share/horde/graphics/mime/deb.gif
-share/horde/graphics/mime/encryption.gif
-share/horde/graphics/mime/executable.gif
-share/horde/graphics/mime/html.gif
-share/horde/graphics/mime/image.gif
-share/horde/graphics/mime/inf.gif
-share/horde/graphics/mime/mail.gif
-share/horde/graphics/mime/makefile.gif
-share/horde/graphics/mime/msexcel.gif
-share/horde/graphics/mime/msi.gif
-share/horde/graphics/mime/msp.gif
-share/horde/graphics/mime/mspowerpoint.gif
-share/horde/graphics/mime/msword.gif
-share/horde/graphics/mime/pdf.gif
-share/horde/graphics/mime/php.gif
-share/horde/graphics/mime/readme.gif
-share/horde/graphics/mime/rpm.gif
-share/horde/graphics/mime/script-asa.gif
-share/horde/graphics/mime/script-asp.gif
-share/horde/graphics/mime/script-js.gif
-share/horde/graphics/mime/setup.gif
-share/horde/graphics/mime/signed.gif
-share/horde/graphics/mime/source-c.gif
-share/horde/graphics/mime/source-h.gif
-share/horde/graphics/mime/source-java.gif
-share/horde/graphics/mime/text.gif
-share/horde/graphics/mime/unknown.gif
-share/horde/graphics/mime/vcard.gif
-share/horde/graphics/mime/video.gif
-share/horde/graphics/mime/xml.gif
-share/horde/graphics/prefs.gif
-share/horde/graphics/problem.gif
-share/horde/graphics/tree/blank.gif
-share/horde/graphics/tree/join.gif
-share/horde/graphics/tree/joinbottom.gif
-share/horde/graphics/tree/line.gif
-share/horde/graphics/tree/minus.gif
-share/horde/graphics/tree/minusbottom.gif
-share/horde/graphics/tree/minusonly.gif
-share/horde/graphics/tree/minustop.gif
-share/horde/graphics/tree/plus.gif
-share/horde/graphics/tree/plusbottom.gif
-share/horde/graphics/tree/plusonly.gif
-share/horde/graphics/tree/plustop.gif
-share/horde/help.php
 share/horde/index.php
-share/horde/javascript.php
-share/horde/lib/Auth.php
-share/horde/lib/Auth/auto.php
-share/horde/lib/Auth/ftp.php
-share/horde/lib/Auth/imap.php
-share/horde/lib/Auth/krb5.php
-share/horde/lib/Auth/ldap.php
-share/horde/lib/Auth/mcal.php
-share/horde/lib/Auth/radius.php
-share/horde/lib/Auth/smb.php
-share/horde/lib/Auth/sql.php
-share/horde/lib/Browser.php
-share/horde/lib/Cache.php
-share/horde/lib/Cache/file.php
-share/horde/lib/Category.php
-share/horde/lib/Category/sql.php
-share/horde/lib/CategoryTree.php
-share/horde/lib/Cipher.php
-share/horde/lib/Cipher/BlockMode.php
-share/horde/lib/Cipher/BlockMode/cbc.php
-share/horde/lib/Cipher/BlockMode/cfb64.php
-share/horde/lib/Cipher/BlockMode/ecb.php
-share/horde/lib/Cipher/BlockMode/ofb64.php
-share/horde/lib/Cipher/blowfish.php
-share/horde/lib/Cipher/cast128.php
-share/horde/lib/Cipher/rc2.php
-share/horde/lib/Data.php
-share/horde/lib/Group.php
-share/horde/lib/Help.php
+share/horde/js/addEvent.php
+share/horde/js/alphaImageLoader.php
+share/horde/js/enter_key_trap.js
+share/horde/js/form_assign.js
+share/horde/js/form_helpers.js
+share/horde/js/hideable.js
+share/horde/js/horde.ie.js
+share/horde/js/horde.js
+share/horde/js/httpclient.js
+share/horde/js/ieEscGuard.js
+share/horde/js/image.js
+share/horde/js/open_colorpicker.js
+share/horde/js/popup.js
+share/horde/js/sorter.js
+share/horde/js/stripe.js
+share/horde/js/tables.js
+share/horde/js/tooltip.js
+share/horde/lib/Block/account.php
+share/horde/lib/Block/color.php
+share/horde/lib/Block/fortune.php
+share/horde/lib/Block/google.php
+share/horde/lib/Block/iframe.php
+share/horde/lib/Block/metar.php
+share/horde/lib/Block/moon.php
+share/horde/lib/Block/sunrise.php
+share/horde/lib/Block/time.php
+share/horde/lib/Block/weatherdotcom.php
+share/horde/lib/Block/weatherdotcom_strings.php
+share/horde/lib/File/CSV.php
+share/horde/lib/File/PDF.php
+share/horde/lib/File/PDF/fonts/courier.php
+share/horde/lib/File/PDF/fonts/helvetica.php
+share/horde/lib/File/PDF/fonts/helveticab.php
+share/horde/lib/File/PDF/fonts/helveticabi.php
+share/horde/lib/File/PDF/fonts/helveticai.php
+share/horde/lib/File/PDF/fonts/symbol.php
+share/horde/lib/File/PDF/fonts/times.php
+share/horde/lib/File/PDF/fonts/timesb.php
+share/horde/lib/File/PDF/fonts/timesbi.php
+share/horde/lib/File/PDF/fonts/timesi.php
+share/horde/lib/File/PDF/fonts/zapfdingbats.php
 share/horde/lib/Horde.php
-share/horde/lib/Identity.php
-share/horde/lib/Image.php
-share/horde/lib/Lang.php
-share/horde/lib/MIME.php
-share/horde/lib/MIME/Magic.php
-share/horde/lib/MIME/Message.php
-share/horde/lib/MIME/Part.php
-share/horde/lib/MIME/Structure.php
-share/horde/lib/MIME/Viewer.php
-share/horde/lib/MIME/Viewer/deb.php
-share/horde/lib/MIME/Viewer/default.php
-share/horde/lib/MIME/Viewer/enriched.php
-share/horde/lib/MIME/Viewer/enscript.php
-share/horde/lib/MIME/Viewer/images.php
-share/horde/lib/MIME/Viewer/msexcel.php
-share/horde/lib/MIME/Viewer/mspowerpoint.php
-share/horde/lib/MIME/Viewer/msword.php
-share/horde/lib/MIME/Viewer/php.php
-share/horde/lib/MIME/Viewer/rar.php
-share/horde/lib/MIME/Viewer/rpm.php
-share/horde/lib/MIME/Viewer/tgz.php
-share/horde/lib/MIME/Viewer/vcard.php
-share/horde/lib/MIME/Viewer/zip.php
-share/horde/lib/Maintenance.php
-share/horde/lib/Menu.php
-share/horde/lib/Notification.php
-share/horde/lib/Notification/status.php
-share/horde/lib/Perms.php
-share/horde/lib/Prefs.php
-share/horde/lib/Prefs/UI.php
-share/horde/lib/Prefs/ldap.php
-share/horde/lib/Prefs/session.php
-share/horde/lib/Prefs/sql.php
-share/horde/lib/PrefsUI.php
-share/horde/lib/Registry.php
-share/horde/lib/SQL.php
-share/horde/lib/Secret.php
-share/horde/lib/Serialize.php
-share/horde/lib/SessionCache.php
-share/horde/lib/SessionHandler.php
-share/horde/lib/SessionHandler/dbm.php
-share/horde/lib/SessionHandler/mysql.php
-share/horde/lib/SessionHandler/pgsql.php
-share/horde/lib/SessionHandler/sapdb.php
-share/horde/lib/SessionHandler/sql.php
-share/horde/lib/Text.php
-share/horde/lib/Token.php
-share/horde/lib/Token/file.php
-share/horde/lib/Token/sql.php
+share/horde/lib/Horde/Array.php
+share/horde/lib/Horde/Auth.php
+share/horde/lib/Horde/Auth/Signup.php
+share/horde/lib/Horde/Auth/application.php
+share/horde/lib/Horde/Auth/auto.php
+share/horde/lib/Horde/Auth/composite.php
+share/horde/lib/Horde/Auth/customsql.php
+share/horde/lib/Horde/Auth/cyrsql.php
+share/horde/lib/Horde/Auth/cyrus.php
+share/horde/lib/Horde/Auth/ftp.php
+share/horde/lib/Horde/Auth/http.php
+share/horde/lib/Horde/Auth/imap.php
+share/horde/lib/Horde/Auth/imsp.php
+share/horde/lib/Horde/Auth/ipbasic.php
+share/horde/lib/Horde/Auth/ipmap.php
+share/horde/lib/Horde/Auth/kolab.php
+share/horde/lib/Horde/Auth/krb5.php
+share/horde/lib/Horde/Auth/ldap.php
+share/horde/lib/Horde/Auth/login.php
+share/horde/lib/Horde/Auth/mcal.php
+share/horde/lib/Horde/Auth/pam.php
+share/horde/lib/Horde/Auth/passwd.php
+share/horde/lib/Horde/Auth/radius.php
+share/horde/lib/Horde/Auth/sasl.php
+share/horde/lib/Horde/Auth/smb.php
+share/horde/lib/Horde/Auth/sql.php
+share/horde/lib/Horde/Auth/yahoo.php
+share/horde/lib/Horde/Block.php
+share/horde/lib/Horde/Block/Collection.php
+share/horde/lib/Horde/Block/Layout/Manager.php
+share/horde/lib/Horde/Block/Layout/View.php
+share/horde/lib/Horde/Block/UI.php
+share/horde/lib/Horde/Browser.php
+share/horde/lib/Horde/Browser/imode.php
+share/horde/lib/Horde/CLI.php
+share/horde/lib/Horde/Cache.php
+share/horde/lib/Horde/Cache/file.php
+share/horde/lib/Horde/Cache/zps4.php
+share/horde/lib/Horde/Cipher.php
+share/horde/lib/Horde/Cipher/BlockMode.php
+share/horde/lib/Horde/Cipher/BlockMode/cbc.php
+share/horde/lib/Horde/Cipher/BlockMode/cfb64.php
+share/horde/lib/Horde/Cipher/BlockMode/ecb.php
+share/horde/lib/Horde/Cipher/BlockMode/ofb64.php
+share/horde/lib/Horde/Cipher/blowfish.php
+share/horde/lib/Horde/Cipher/cast128.php
+share/horde/lib/Horde/Cipher/des.php
+share/horde/lib/Horde/Cipher/rc2.php
+share/horde/lib/Horde/Cipher/rc4.php
+share/horde/lib/Horde/Compress.php
+share/horde/lib/Horde/Compress/dbx.php
+share/horde/lib/Horde/Compress/gzip.php
+share/horde/lib/Horde/Compress/tar.php
+share/horde/lib/Horde/Compress/tnef.php
+share/horde/lib/Horde/Compress/zip.php
+share/horde/lib/Horde/Config.php
+share/horde/lib/Horde/Crypt.php
+share/horde/lib/Horde/Crypt/pgp.php
+share/horde/lib/Horde/Crypt/smime.php
+share/horde/lib/Horde/Data.php
+share/horde/lib/Horde/Data/csv.php
+share/horde/lib/Horde/Data/icalendar.php
+share/horde/lib/Horde/Data/imc.php
+share/horde/lib/Horde/Data/outlookcsv.php
+share/horde/lib/Horde/Data/tsv.php
+share/horde/lib/Horde/Data/vcard.php
+share/horde/lib/Horde/Data/vnote.php
+share/horde/lib/Horde/Data/vtodo.php
+share/horde/lib/Horde/DataTree.php
+share/horde/lib/Horde/DataTree/null.php
+share/horde/lib/Horde/DataTree/sql.php
+share/horde/lib/Horde/Date.php
+share/horde/lib/Horde/Editor.php
+share/horde/lib/Horde/Editor/htmlarea.php
+share/horde/lib/Horde/Form.php
+share/horde/lib/Horde/Form/Action.php
+share/horde/lib/Horde/Form/Action/conditional_enable.php
+share/horde/lib/Horde/Form/Action/conditional_setvalue.php
+share/horde/lib/Horde/Form/Action/reload.php
+share/horde/lib/Horde/Form/Action/submit.php
+share/horde/lib/Horde/Form/Action/sum_fields.php
+share/horde/lib/Horde/Form/Action/updatefield.php
+share/horde/lib/Horde/Form/Renderer.php
+share/horde/lib/Horde/Form/Type/tableset.php
+share/horde/lib/Horde/Graph.php
+share/horde/lib/Horde/Graph/Chart/pie.php
+share/horde/lib/Horde/Graph/Chart/pie3d.php
+share/horde/lib/Horde/Graph/Plot/bar.php
+share/horde/lib/Horde/Graph/Plot/bargrouped.php
+share/horde/lib/Horde/Graph/Plot/barstacked.php
+share/horde/lib/Horde/Graph/Plot/line.php
+share/horde/lib/Horde/Graph/Plot/scatter.php
+share/horde/lib/Horde/Group.php
+share/horde/lib/Horde/Group/hooks.php
+share/horde/lib/Horde/Group/ldap.php
+share/horde/lib/Horde/Help.php
+share/horde/lib/Horde/History.php
+share/horde/lib/Horde/IMAP/ACL.php
+share/horde/lib/Horde/IMAP/ACL/rfc2086.php
+share/horde/lib/Horde/IMAP/ACL/rfc4314.php
+share/horde/lib/Horde/IMAP/Admin.php
+share/horde/lib/Horde/IMAP/Cache.php
+share/horde/lib/Horde/IMAP/Search.php
+share/horde/lib/Horde/IMAP/Sort.php
+share/horde/lib/Horde/IMAP/Thread.php
+share/horde/lib/Horde/IMAP/Tree.php
+share/horde/lib/Horde/Identity.php
+share/horde/lib/Horde/Image.php
+share/horde/lib/Horde/Image/gd.php
+share/horde/lib/Horde/Image/im.php
+share/horde/lib/Horde/Image/png.php
+share/horde/lib/Horde/Image/rgb.php
+share/horde/lib/Horde/Image/svg.php
+share/horde/lib/Horde/Image/swf.php
+share/horde/lib/Horde/Kolab.php
+share/horde/lib/Horde/LDAP.php
+share/horde/lib/Horde/MIME.php
+share/horde/lib/Horde/MIME/Contents.php
+share/horde/lib/Horde/MIME/Headers.php
+share/horde/lib/Horde/MIME/MDN.php
+share/horde/lib/Horde/MIME/Magic.php
+share/horde/lib/Horde/MIME/Message.php
+share/horde/lib/Horde/MIME/Part.php
+share/horde/lib/Horde/MIME/Structure.php
+share/horde/lib/Horde/MIME/Viewer.php
+share/horde/lib/Horde/MIME/Viewer/css.php
+share/horde/lib/Horde/MIME/Viewer/deb.php
+share/horde/lib/Horde/MIME/Viewer/default.php
+share/horde/lib/Horde/MIME/Viewer/enriched.php
+share/horde/lib/Horde/MIME/Viewer/enscript.php
+share/horde/lib/Horde/MIME/Viewer/html.php
+share/horde/lib/Horde/MIME/Viewer/images.php
+share/horde/lib/Horde/MIME/Viewer/msexcel.php
+share/horde/lib/Horde/MIME/Viewer/mspowerpoint.php
+share/horde/lib/Horde/MIME/Viewer/msword.php
+share/horde/lib/Horde/MIME/Viewer/ooo.php
+share/horde/lib/Horde/MIME/Viewer/ooo/common.xsl
+share/horde/lib/Horde/MIME/Viewer/ooo/global_document.xsl
+share/horde/lib/Horde/MIME/Viewer/ooo/main_html.xsl
+share/horde/lib/Horde/MIME/Viewer/ooo/palm.xsl
+share/horde/lib/Horde/MIME/Viewer/ooo/style_header.xsl
+share/horde/lib/Horde/MIME/Viewer/ooo/style_inlined.xsl
+share/horde/lib/Horde/MIME/Viewer/ooo/style_mapping.xsl
+share/horde/lib/Horde/MIME/Viewer/ooo/table.xsl
+share/horde/lib/Horde/MIME/Viewer/ooo/table_cells.xsl
+share/horde/lib/Horde/MIME/Viewer/ooo/table_columns.xsl
+share/horde/lib/Horde/MIME/Viewer/ooo/table_rows.xsl
+share/horde/lib/Horde/MIME/Viewer/pdf.php
+share/horde/lib/Horde/MIME/Viewer/php.php
+share/horde/lib/Horde/MIME/Viewer/plain.php
+share/horde/lib/Horde/MIME/Viewer/rar.php
+share/horde/lib/Horde/MIME/Viewer/report.php
+share/horde/lib/Horde/MIME/Viewer/rfc822.php
+share/horde/lib/Horde/MIME/Viewer/richtext.php
+share/horde/lib/Horde/MIME/Viewer/rpm.php
+share/horde/lib/Horde/MIME/Viewer/security.php
+share/horde/lib/Horde/MIME/Viewer/simple.php
+share/horde/lib/Horde/MIME/Viewer/source.php
+share/horde/lib/Horde/MIME/Viewer/srchighlite.php
+share/horde/lib/Horde/MIME/Viewer/tgz.php
+share/horde/lib/Horde/MIME/Viewer/tnef.php
+share/horde/lib/Horde/MIME/Viewer/vcard.php
+share/horde/lib/Horde/MIME/Viewer/webcpp.php
+share/horde/lib/Horde/MIME/Viewer/zip.php
+share/horde/lib/Horde/MIME/mime.magic.php
+share/horde/lib/Horde/MIME/mime.mapping.php
+share/horde/lib/Horde/Maintenance.php
+share/horde/lib/Horde/Menu.php
+share/horde/lib/Horde/Mobile.php
+share/horde/lib/Horde/Mobile/Renderer.php
+share/horde/lib/Horde/Mobile/Renderer/html.php
+share/horde/lib/Horde/Mobile/Renderer/wml.php
+share/horde/lib/Horde/NLS.php
+share/horde/lib/Horde/NLS/GeoIP.php
+share/horde/lib/Horde/NLS/carsigns.php
+share/horde/lib/Horde/NLS/coordinates.php
+share/horde/lib/Horde/NLS/countries.php
+share/horde/lib/Horde/NLS/tld.php
+share/horde/lib/Horde/Notification.php
+share/horde/lib/Horde/Notification/Event.php
+share/horde/lib/Horde/Notification/Listener.php
+share/horde/lib/Horde/Notification/Listener/audio.php
+share/horde/lib/Horde/Notification/Listener/javascript.php
+share/horde/lib/Horde/Notification/Listener/mobile.php
+share/horde/lib/Horde/Notification/Listener/status.php
+share/horde/lib/Horde/Perms.php
+share/horde/lib/Horde/Perms/UI.php
+share/horde/lib/Horde/Perms/datatree.php
+share/horde/lib/Horde/Prefs.php
+share/horde/lib/Horde/Prefs/CategoryManager.php
+share/horde/lib/Horde/Prefs/UI.php
+share/horde/lib/Horde/Prefs/imsp.php
+share/horde/lib/Horde/Prefs/kolab.php
+share/horde/lib/Horde/Prefs/ldap.php
+share/horde/lib/Horde/Prefs/session.php
+share/horde/lib/Horde/Prefs/sql.php
+share/horde/lib/Horde/RDO.php
+share/horde/lib/Horde/RDO/Criteria.php
+share/horde/lib/Horde/RDO/Exception.php
+share/horde/lib/Horde/RDO/Mapper.php
+share/horde/lib/Horde/RDO/MetaData.php
+share/horde/lib/Horde/RDO/Results.php
+share/horde/lib/Horde/RDO/Storage.php
+share/horde/lib/Horde/RDO/Storage/mysql.php
+share/horde/lib/Horde/RDO/Storage/peardb.php
+share/horde/lib/Horde/RDO/Storage/pgsql.php
+share/horde/lib/Horde/RDO/Storage/sql.php
+share/horde/lib/Horde/RDO/Storage/sqlite.php
+share/horde/lib/Horde/RPC.php
+share/horde/lib/Horde/RPC/rest.php
+share/horde/lib/Horde/RPC/soap.php
+share/horde/lib/Horde/RPC/syncml.php
+share/horde/lib/Horde/RPC/syncml_wbxml.php
+share/horde/lib/Horde/RPC/webdav.php
+share/horde/lib/Horde/RPC/xmlrpc.php
+share/horde/lib/Horde/Rampage.php
+share/horde/lib/Horde/Registry.php
+share/horde/lib/Horde/SQL.php
+share/horde/lib/Horde/SQL/Attributes.php
+share/horde/lib/Horde/SQL/Keywords.php
+share/horde/lib/Horde/Scheduler.php
+share/horde/lib/Horde/Scheduler/cron.php
+share/horde/lib/Horde/Secret.php
+share/horde/lib/Horde/Serialize.php
+share/horde/lib/Horde/SessionHandler.php
+share/horde/lib/Horde/SessionHandler/dbm.php
+share/horde/lib/Horde/SessionHandler/ldap.php
+share/horde/lib/Horde/SessionHandler/memcached.php
+share/horde/lib/Horde/SessionHandler/mysql.php
+share/horde/lib/Horde/SessionHandler/none.php
+share/horde/lib/Horde/SessionHandler/oci8.php
+share/horde/lib/Horde/SessionHandler/pgsql.php
+share/horde/lib/Horde/SessionHandler/sapdb.php
+share/horde/lib/Horde/SessionHandler/sql.php
+share/horde/lib/Horde/SessionObjects.php
+share/horde/lib/Horde/Share.php
+share/horde/lib/Horde/String.php
+share/horde/lib/Horde/Template.php
+share/horde/lib/Horde/Text.php
+share/horde/lib/Horde/Text/Filter.php
+share/horde/lib/Horde/Text/Filter/bbcode.php
+share/horde/lib/Horde/Text/Filter/cleanascii.php
+share/horde/lib/Horde/Text/Filter/dimsignature.php
+share/horde/lib/Horde/Text/Filter/emails.php
+share/horde/lib/Horde/Text/Filter/emoticons.php
+share/horde/lib/Horde/Text/Filter/environment.php
+share/horde/lib/Horde/Text/Filter/highlightquotes.php
+share/horde/lib/Horde/Text/Filter/html2text.php
+share/horde/lib/Horde/Text/Filter/linkurls.php
+share/horde/lib/Horde/Text/Filter/rst.php
+share/horde/lib/Horde/Text/Filter/simplemarkup.php
+share/horde/lib/Horde/Text/Filter/space2html.php
+share/horde/lib/Horde/Text/Filter/tabs2spaces.php
+share/horde/lib/Horde/Text/Filter/text2html.php
+share/horde/lib/Horde/Text/Filter/words.php
+share/horde/lib/Horde/Text/Filter/xss.php
+share/horde/lib/Horde/Timer.php
+share/horde/lib/Horde/Token.php
+share/horde/lib/Horde/Token/file.php
+share/horde/lib/Horde/Token/sql.php
+share/horde/lib/Horde/Tree.php
+share/horde/lib/Horde/Tree/html.php
+share/horde/lib/Horde/Tree/javascript.php
+share/horde/lib/Horde/Tree/select.php
+share/horde/lib/Horde/UI/Language.php
+share/horde/lib/Horde/UI/Pager.php
+share/horde/lib/Horde/UI/Tabs.php
+share/horde/lib/Horde/UI/VarRenderer.php
+share/horde/lib/Horde/UI/VarRenderer/html.php
+share/horde/lib/Horde/UI/VarRenderer/tableset_html.php
+share/horde/lib/Horde/UI/Widget.php
+share/horde/lib/Horde/Util.php
+share/horde/lib/Horde/VC.php
+share/horde/lib/Horde/VC/cvs.php
+share/horde/lib/Horde/VC/rcs.php
+share/horde/lib/Horde/VC/svn.php
+share/horde/lib/Horde/Variables.php
+share/horde/lib/Horde/iCalendar.php
+share/horde/lib/Horde/iCalendar/valarm.php
+share/horde/lib/Horde/iCalendar/vcard.php
+share/horde/lib/Horde/iCalendar/vevent.php
+share/horde/lib/Horde/iCalendar/vfreebusy.php
+share/horde/lib/Horde/iCalendar/vjournal.php
+share/horde/lib/Horde/iCalendar/vnote.php
+share/horde/lib/Horde/iCalendar/vtimezone.php
+share/horde/lib/Horde/iCalendar/vtodo.php
+share/horde/lib/Net/IMSP.php
+share/horde/lib/Net/IMSP/Auth.php
+share/horde/lib/Net/IMSP/Auth/cram_md5.php
+share/horde/lib/Net/IMSP/Auth/imtest.php
+share/horde/lib/Net/IMSP/Auth/plaintext.php
+share/horde/lib/Net/IMSP/Book.php
+share/horde/lib/Net/IMSP/Options.php
+share/horde/lib/Net/IMSP/Utils.php
+share/horde/lib/Net/SMS.php
+share/horde/lib/Net/SMS/clickatell_http.php
+share/horde/lib/Net/SMS/generic_smtp.php
+share/horde/lib/Net/SMS/sms2email_http.php
+share/horde/lib/Net/SMS/vodafoneitaly_smtp.php
+share/horde/lib/Net/SMS/win_http.php
+share/horde/lib/SyncML.php
+share/horde/lib/SyncML/Backend.php
+share/horde/lib/SyncML/Command.php
+share/horde/lib/SyncML/Command/Alert.php
+share/horde/lib/SyncML/Command/Final.php
+share/horde/lib/SyncML/Command/Get.php
+share/horde/lib/SyncML/Command/Map.php
+share/horde/lib/SyncML/Command/Put.php
+share/horde/lib/SyncML/Command/Results.php
+share/horde/lib/SyncML/Command/Status.php
+share/horde/lib/SyncML/Command/Sync.php
+share/horde/lib/SyncML/Command/SyncElement.php
+share/horde/lib/SyncML/Constants.php
+share/horde/lib/SyncML/Device.php
+share/horde/lib/SyncML/Device/Nokia.php
+share/horde/lib/SyncML/Device/P800.php
+share/horde/lib/SyncML/Device/Sync4j.php
+share/horde/lib/SyncML/Device/Synthesis.php
+share/horde/lib/SyncML/DeviceInfo.php
+share/horde/lib/SyncML/State.php
+share/horde/lib/SyncML/Sync.php
+share/horde/lib/Test.php
+share/horde/lib/Text/Diff.php
+share/horde/lib/Text/Diff/Renderer.php
+share/horde/lib/Text/Diff/Renderer/inline.php
+share/horde/lib/Text/Diff/Renderer/unified.php
+share/horde/lib/Text/Diff3.php
+share/horde/lib/Text/Flowed.php
+share/horde/lib/Text/reST.php
+share/horde/lib/Text/reST/Formatter.php
+share/horde/lib/Text/reST/Formatter/html.php
+share/horde/lib/Text/reST/Parser.php
 share/horde/lib/VFS.php
+share/horde/lib/VFS/Browser.php
+share/horde/lib/VFS/GC.php
+share/horde/lib/VFS/ISOWriter.php
+share/horde/lib/VFS/ISOWriter/RealInputStrategy.php
+share/horde/lib/VFS/ISOWriter/RealInputStrategy/copy.php
+share/horde/lib/VFS/ISOWriter/RealInputStrategy/direct.php
+share/horde/lib/VFS/ISOWriter/RealOutputStrategy.php
+share/horde/lib/VFS/ISOWriter/RealOutputStrategy/copy.php
+share/horde/lib/VFS/ISOWriter/RealOutputStrategy/direct.php
+share/horde/lib/VFS/ISOWriter/mkisofs.php
 share/horde/lib/VFS/ListItem.php
 share/horde/lib/VFS/Object.php
 share/horde/lib/VFS/file.php
 share/horde/lib/VFS/ftp.php
 share/horde/lib/VFS/musql.php
+share/horde/lib/VFS/smb.php
 share/horde/lib/VFS/sql.php
 share/horde/lib/VFS/sql_file.php
+share/horde/lib/XML/SVG.php
+share/horde/lib/XML/WBXML.php
+share/horde/lib/XML/WBXML/ContentHandler.php
+share/horde/lib/XML/WBXML/DTD.php
+share/horde/lib/XML/WBXML/DTD/SyncML.php
+share/horde/lib/XML/WBXML/DTD/SyncMLDevInf.php
+share/horde/lib/XML/WBXML/DTD/SyncMLMetInf.php
+share/horde/lib/XML/WBXML/DTDManager.php
+share/horde/lib/XML/WBXML/Decoder.php
+share/horde/lib/XML/WBXML/Encoder.php
+share/horde/lib/api.php
 share/horde/lib/base.php
+share/horde/lib/core.php
+share/horde/lib/prefs.php
 share/horde/lib/version.php
 share/horde/locale/ar_SY/LC_MESSAGES/horde.mo
 share/horde/locale/bg_BG/LC_MESSAGES/horde.mo
+share/horde/locale/bg_BG/help.xml
+share/horde/locale/bs_BA/LC_MESSAGES/horde.mo
 share/horde/locale/ca_ES/LC_MESSAGES/horde.mo
 share/horde/locale/cs_CZ/LC_MESSAGES/horde.mo
+share/horde/locale/cs_CZ/help.xml
 share/horde/locale/da_DK/LC_MESSAGES/horde.mo
+share/horde/locale/da_DK/help.xml
 share/horde/locale/de_DE/LC_MESSAGES/horde.mo
+share/horde/locale/de_DE/help.xml
 share/horde/locale/el_GR/LC_MESSAGES/horde.mo
+share/horde/locale/el_GR/help.xml
 share/horde/locale/en_US/help.xml
 share/horde/locale/es_ES/LC_MESSAGES/horde.mo
+share/horde/locale/es_ES/help.xml
 share/horde/locale/et_EE/LC_MESSAGES/horde.mo
+share/horde/locale/et_EE/help.xml
+share/horde/locale/fa_IR/LC_MESSAGES/horde.mo
+share/horde/locale/fa_IR/help.xml
 share/horde/locale/fi_FI/LC_MESSAGES/horde.mo
 share/horde/locale/fi_FI/help.xml
 share/horde/locale/fr_FR/LC_MESSAGES/horde.mo
+share/horde/locale/fr_FR/help.xml
 share/horde/locale/gl_ES/LC_MESSAGES/horde.mo
+share/horde/locale/he_IL/LC_MESSAGES/horde.mo
 share/horde/locale/hu_HU/LC_MESSAGES/horde.mo
+share/horde/locale/hu_HU/help.xml
 share/horde/locale/id_ID/LC_MESSAGES/horde.mo
+share/horde/locale/is_IS/LC_MESSAGES/horde.mo
 share/horde/locale/it_IT/LC_MESSAGES/horde.mo
+share/horde/locale/it_IT/help.xml
 share/horde/locale/ja_JP/LC_MESSAGES/horde.mo
+share/horde/locale/ja_JP/help.xml
+share/horde/locale/km_KH/LC_MESSAGES/horde.mo
 share/horde/locale/ko_KR/LC_MESSAGES/horde.mo
+share/horde/locale/ko_KR/help.xml
 share/horde/locale/lt_LT/LC_MESSAGES/horde.mo
+share/horde/locale/lt_LT/help.xml
 share/horde/locale/lv_LV/LC_MESSAGES/horde.mo
 share/horde/locale/mk_MK/LC_MESSAGES/horde.mo
 share/horde/locale/nb_NO/LC_MESSAGES/horde.mo
+share/horde/locale/nb_NO/help.xml
 share/horde/locale/nl_NL/LC_MESSAGES/horde.mo
+share/horde/locale/nl_NL/help.xml
 share/horde/locale/nn_NO/LC_MESSAGES/horde.mo
+share/horde/locale/nn_NO/help.xml
 share/horde/locale/pl_PL/LC_MESSAGES/horde.mo
 share/horde/locale/pl_PL/help.xml
 share/horde/locale/pt_BR/LC_MESSAGES/horde.mo
+share/horde/locale/pt_BR/help.xml
 share/horde/locale/pt_PT/LC_MESSAGES/horde.mo
+share/horde/locale/pt_PT/help.xml
 share/horde/locale/ro_RO/LC_MESSAGES/horde.mo
-share/horde/locale/ru_RU.KOI8-R/LC_MESSAGES/horde.mo
 share/horde/locale/ru_RU/LC_MESSAGES/horde.mo
+share/horde/locale/ru_RU/help.xml
 share/horde/locale/sk_SK/LC_MESSAGES/horde.mo
+share/horde/locale/sk_SK/help.xml
 share/horde/locale/sl_SI/LC_MESSAGES/horde.mo
+share/horde/locale/sl_SI/help.xml
 share/horde/locale/sv_SE/LC_MESSAGES/horde.mo
+share/horde/locale/sv_SE/help.xml
+share/horde/locale/tr_TR/LC_MESSAGES/horde.mo
+share/horde/locale/tr_TR/help.xml
 share/horde/locale/uk_UA/LC_MESSAGES/horde.mo
+share/horde/locale/uk_UA/help.xml
 share/horde/locale/zh_CN/LC_MESSAGES/horde.mo
+share/horde/locale/zh_CN/help.xml
 share/horde/locale/zh_TW/LC_MESSAGES/horde.mo
+share/horde/locale/zh_TW/help.xml
 share/horde/login.php
-share/horde/maintenance.php
-share/horde/menu.php
-share/horde/navbar.php
-share/horde/po/Makefile
 share/horde/po/README
 share/horde/po/ar_SY.po
 share/horde/po/bg_BG.po
+share/horde/po/bs_BA.po
 share/horde/po/ca_ES.po
 share/horde/po/cs_CZ.po
 share/horde/po/da_DK.po
@@ -223,15 +533,18 @@ share/horde/po/de_DE.po
 share/horde/po/el_GR.po
 share/horde/po/es_ES.po
 share/horde/po/et_EE.po
-share/horde/po/extract.pl
+share/horde/po/fa_IR.po
 share/horde/po/fi_FI.po
 share/horde/po/fr_FR.po
 share/horde/po/gl_ES.po
+share/horde/po/he_IL.po
 share/horde/po/horde.pot
 share/horde/po/hu_HU.po
 share/horde/po/id_ID.po
+share/horde/po/is_IS.po
 share/horde/po/it_IT.po
 share/horde/po/ja_JP.po
+share/horde/po/km_KH.po
 share/horde/po/ko_KR.po
 share/horde/po/lt_LT.po
 share/horde/po/lv_LV.po
@@ -243,108 +556,994 @@ share/horde/po/pl_PL.po
 share/horde/po/pt_BR.po
 share/horde/po/pt_PT.po
 share/horde/po/ro_RO.po
-share/horde/po/ru_RU.KOI8-R.po
 share/horde/po/ru_RU.po
-share/horde/po/shtool
 share/horde/po/sk_SK.po
 share/horde/po/sl_SI.po
 share/horde/po/sv_SE.po
+share/horde/po/tr_TR.po
 share/horde/po/translation.php
 share/horde/po/uk_UA.po
-share/horde/po/wintokoi.pl
-share/horde/po/xgettext.sh
 share/horde/po/zh_CN.po
 share/horde/po/zh_TW.po
-share/horde/prefs.php
-share/horde/problem.php
+share/horde/rpc.php
 share/horde/scripts/SCRIPTS
-share/horde/scripts/db/README
-share/horde/scripts/db/auth.sql
-share/horde/scripts/db/category.sql
-share/horde/scripts/db/category_mysql.sql
-share/horde/scripts/db/mysql_create.sql
-share/horde/scripts/db/mysql_drop.sql
-share/horde/scripts/db/pgsql_create.sql
-share/horde/scripts/db/pgsql_drop.sql
-share/horde/scripts/db/prefs.sql
-share/horde/scripts/db/sessionhandler.sql
-share/horde/scripts/db/sessionhandler_oracle.sql
-share/horde/scripts/db/sessionhandler_pgsql.sql
-share/horde/scripts/db/sessionhandler_sapdb.sql
-share/horde/scripts/db/vfs.sql
-share/horde/scripts/horde-rsync.sh
+share/horde/scripts/cookie_login.php
+share/horde/scripts/count_sessions.php
+share/horde/scripts/create-symlinks.php
+share/horde/scripts/crond
+share/horde/scripts/get_login.php
+share/horde/scripts/http_login_refer.php
 share/horde/scripts/ldap/horde.schema
-share/horde/scripts/mime_mapping/Makefile
-share/horde/scripts/mime_mapping/convert.pl
-share/horde/scripts/mime_mapping/mime.types
-share/horde/scripts/mime_mapping/mime.types.horde
+share/horde/scripts/migrate_user_categories.php
+share/horde/scripts/remove_prefs.php
 share/horde/scripts/set_perms.sh
-share/horde/status.php
-share/horde/templates/categorytree/rowend.inc
-share/horde/templates/categorytree/rowstart.inc
-share/horde/templates/categorytree/tablefoot.inc
-share/horde/templates/categorytree/tablehead.inc
+share/horde/scripts/setup.php
+share/horde/scripts/sql/README
+share/horde/scripts/sql/README.OCI8
+share/horde/scripts/sql/create.msde.sql
+share/horde/scripts/sql/create.mysql.sql
+share/horde/scripts/sql/create.oci8.sql
+share/horde/scripts/sql/create.pgsql.sql
+share/horde/scripts/sql/create.sybase.sql
+share/horde/scripts/sql/horde_datatree.mssql.sql
+share/horde/scripts/sql/horde_datatree.mysql.sql
+share/horde/scripts/sql/horde_datatree.sql
+share/horde/scripts/sql/horde_histories.mssql.sql
+share/horde/scripts/sql/horde_histories.sql
+share/horde/scripts/sql/horde_log.mssql.sql
+share/horde/scripts/sql/horde_log.sql
+share/horde/scripts/sql/horde_muvfs.mssql.sql
+share/horde/scripts/sql/horde_muvfs.sql
+share/horde/scripts/sql/horde_prefs.mssql.sql
+share/horde/scripts/sql/horde_prefs.sql
+share/horde/scripts/sql/horde_sessionhandler.mssql.sql
+share/horde/scripts/sql/horde_sessionhandler.mysql.sql
+share/horde/scripts/sql/horde_sessionhandler.oci8.sql
+share/horde/scripts/sql/horde_sessionhandler.pgsql.sql
+share/horde/scripts/sql/horde_sessionhandler.sapdb.sql
+share/horde/scripts/sql/horde_sessionhandler.sql
+share/horde/scripts/sql/horde_tokens.sql
+share/horde/scripts/sql/horde_users.sql
+share/horde/scripts/sql/horde_vfs.mssql.sql
+share/horde/scripts/sql/horde_vfs.oci8.sql
+share/horde/scripts/sql/horde_vfs.pgsql.sql
+share/horde/scripts/sql/horde_vfs.sql
+share/horde/scripts/sql/script.initial_horde_user.sql
+share/horde/scripts/temp-cleanup.cron
+share/horde/scripts/themes_check.php
+share/horde/scripts/upgrades/2.2_to_3.0.mysql.sql
+share/horde/scripts/upgrades/2.2_to_3.0.pgsql.sql
+share/horde/scripts/upgrades/2005-09-22_horde_prefs_varchar2.oci8.sql
+share/horde/scripts/upgrades/3.0_to_3.1.mysql.sql
+share/horde/scripts/upgrades/move_history_out_of_datatree.php
+share/horde/services/cacheview.php
+share/horde/services/changepassword.php
+share/horde/services/download/index.php
+share/horde/services/editor/htmlarea/dialog.js
+share/horde/services/editor/htmlarea/htmlarea.css
+share/horde/services/editor/htmlarea/htmlarea.js
+share/horde/services/editor/htmlarea/images/ed_about.gif
+share/horde/services/editor/htmlarea/images/ed_align_center.gif
+share/horde/services/editor/htmlarea/images/ed_align_justify.gif
+share/horde/services/editor/htmlarea/images/ed_align_left.gif
+share/horde/services/editor/htmlarea/images/ed_align_right.gif
+share/horde/services/editor/htmlarea/images/ed_blank.gif
+share/horde/services/editor/htmlarea/images/ed_charmap.gif
+share/horde/services/editor/htmlarea/images/ed_color_bg.gif
+share/horde/services/editor/htmlarea/images/ed_color_fg.gif
+share/horde/services/editor/htmlarea/images/ed_copy.gif
+share/horde/services/editor/htmlarea/images/ed_custom.gif
+share/horde/services/editor/htmlarea/images/ed_cut.gif
+share/horde/services/editor/htmlarea/images/ed_delete.gif
+share/horde/services/editor/htmlarea/images/ed_format_bold.gif
+share/horde/services/editor/htmlarea/images/ed_format_italic.gif
+share/horde/services/editor/htmlarea/images/ed_format_strike.gif
+share/horde/services/editor/htmlarea/images/ed_format_sub.gif
+share/horde/services/editor/htmlarea/images/ed_format_sup.gif
+share/horde/services/editor/htmlarea/images/ed_format_underline.gif
+share/horde/services/editor/htmlarea/images/ed_help.gif
+share/horde/services/editor/htmlarea/images/ed_hr.gif
+share/horde/services/editor/htmlarea/images/ed_html.gif
+share/horde/services/editor/htmlarea/images/ed_image.gif
+share/horde/services/editor/htmlarea/images/ed_indent_less.gif
+share/horde/services/editor/htmlarea/images/ed_indent_more.gif
+share/horde/services/editor/htmlarea/images/ed_killword.gif
+share/horde/services/editor/htmlarea/images/ed_left_to_right.gif
+share/horde/services/editor/htmlarea/images/ed_link.gif
+share/horde/services/editor/htmlarea/images/ed_list_bullet.gif
+share/horde/services/editor/htmlarea/images/ed_list_num.gif
+share/horde/services/editor/htmlarea/images/ed_paste.gif
+share/horde/services/editor/htmlarea/images/ed_redo.gif
+share/horde/services/editor/htmlarea/images/ed_right_to_left.gif
+share/horde/services/editor/htmlarea/images/ed_rmformat.gif
+share/horde/services/editor/htmlarea/images/ed_save.gif
+share/horde/services/editor/htmlarea/images/ed_show_border.gif
+share/horde/services/editor/htmlarea/images/ed_splitcel.gif
+share/horde/services/editor/htmlarea/images/ed_undo.gif
+share/horde/services/editor/htmlarea/images/fullscreen_maximize.gif
+share/horde/services/editor/htmlarea/images/fullscreen_minimize.gif
+share/horde/services/editor/htmlarea/images/insert_table.gif
+share/horde/services/editor/htmlarea/lang/en.js
+share/horde/services/editor/htmlarea/plugins/AnselImage/ansel-image.js
+share/horde/services/editor/htmlarea/plugins/AnselImage/insert_image.php
+share/horde/services/editor/htmlarea/plugins/AnselImage/lang/en.js
+share/horde/services/editor/htmlarea/plugins/AnselImage/showimage.html
+share/horde/services/editor/htmlarea/plugins/ContextMenu/context-menu.js
+share/horde/services/editor/htmlarea/plugins/ContextMenu/lang/en.js
+share/horde/services/editor/htmlarea/plugins/ContextMenu/menu.css
+share/horde/services/editor/htmlarea/plugins/ListType/lang/en.js
+share/horde/services/editor/htmlarea/plugins/ListType/list-type.js
+share/horde/services/editor/htmlarea/plugins/TableOperations/img/cell-delete.gif
+share/horde/services/editor/htmlarea/plugins/TableOperations/img/cell-insert-after.gif
+share/horde/services/editor/htmlarea/plugins/TableOperations/img/cell-insert-before.gif
+share/horde/services/editor/htmlarea/plugins/TableOperations/img/cell-merge.gif
+share/horde/services/editor/htmlarea/plugins/TableOperations/img/cell-prop.gif
+share/horde/services/editor/htmlarea/plugins/TableOperations/img/cell-split.gif
+share/horde/services/editor/htmlarea/plugins/TableOperations/img/col-delete.gif
+share/horde/services/editor/htmlarea/plugins/TableOperations/img/col-insert-after.gif
+share/horde/services/editor/htmlarea/plugins/TableOperations/img/col-insert-before.gif
+share/horde/services/editor/htmlarea/plugins/TableOperations/img/col-split.gif
+share/horde/services/editor/htmlarea/plugins/TableOperations/img/row-delete.gif
+share/horde/services/editor/htmlarea/plugins/TableOperations/img/row-insert-above.gif
+share/horde/services/editor/htmlarea/plugins/TableOperations/img/row-insert-under.gif
+share/horde/services/editor/htmlarea/plugins/TableOperations/img/row-prop.gif
+share/horde/services/editor/htmlarea/plugins/TableOperations/img/row-split.gif
+share/horde/services/editor/htmlarea/plugins/TableOperations/img/table-prop.gif
+share/horde/services/editor/htmlarea/plugins/TableOperations/lang/en.js
+share/horde/services/editor/htmlarea/plugins/TableOperations/table-operations.js
+share/horde/services/editor/htmlarea/popupdiv.js
+share/horde/services/editor/htmlarea/popups/about.html
+share/horde/services/editor/htmlarea/popups/blank.html
+share/horde/services/editor/htmlarea/popups/fullscreen.html
+share/horde/services/editor/htmlarea/popups/insert_image.html
+share/horde/services/editor/htmlarea/popups/insert_table.html
+share/horde/services/editor/htmlarea/popups/link.html
+share/horde/services/editor/htmlarea/popups/popup.js
+share/horde/services/editor/htmlarea/popups/select_color.html
+share/horde/services/editor/htmlarea/popupwin.js
+share/horde/services/go.php
+share/horde/services/help/index.php
+share/horde/services/images/colorpicker.php
+share/horde/services/images/pixel.php
+share/horde/services/images/view.php
+share/horde/services/javascript.php
+share/horde/services/keyboard.php
+share/horde/services/language.php
+share/horde/services/maintenance.php
+share/horde/services/obrowser/index.php
+share/horde/services/portal/edit.php
+share/horde/services/portal/index.php
+share/horde/services/portal/mobile.php
+share/horde/services/portal/rpcsum.php
+share/horde/services/portal/sidebar.php
+share/horde/services/portal/syncml.php
+share/horde/services/prefs.php
+share/horde/services/problem.php
+share/horde/services/resetpassword.php
+share/horde/services/shares/edit.php
+share/horde/services/toggle_js.php
+share/horde/signup.php
+share/horde/templates/admin/common-header.inc
+share/horde/templates/admin/groups/addchild.inc
+share/horde/templates/admin/groups/delete.inc
+share/horde/templates/admin/groups/edit.inc
+share/horde/templates/admin/setup/config.html
+share/horde/templates/admin/setup/diff.html
+share/horde/templates/admin/setup/index.html
+share/horde/templates/admin/user/add.inc
+share/horde/templates/admin/user/approve.inc
+share/horde/templates/admin/user/clear.inc
+share/horde/templates/admin/user/list.inc
+share/horde/templates/admin/user/noadd.inc
+share/horde/templates/admin/user/nolist.inc
+share/horde/templates/admin/user/remove.inc
+share/horde/templates/admin/user/removequeued.inc
+share/horde/templates/admin/user/update.inc
 share/horde/templates/common-footer.inc
 share/horde/templates/common-header.inc
+share/horde/templates/contents/open_view_win.js
+share/horde/templates/data/csvinfo.inc
 share/horde/templates/data/csvmap.inc
+share/horde/templates/data/date.inc
 share/horde/templates/data/datemap.inc
-share/horde/templates/help/footer.inc
-share/horde/templates/help/header.inc
+share/horde/templates/data/datetime.inc
+share/horde/templates/data/time.inc
+share/horde/templates/data/tsvinfo.inc
+share/horde/templates/help/about.inc
 share/horde/templates/help/index.inc
 share/horde/templates/help/menu.inc
-share/horde/templates/horde/modules.inc
-share/horde/templates/index/css.inc
-share/horde/templates/index/floating_index.inc
 share/horde/templates/index/frames_index.inc
-share/horde/templates/index/notconfigured.inc
-share/horde/templates/index/wap.inc
-share/horde/templates/javascript/open_help_win.js
+share/horde/templates/javascript/form_sections.js
+share/horde/templates/javascript/htmlarea.js
+share/horde/templates/javascript/htmlarea_anselimage_lang.js
+share/horde/templates/javascript/htmlarea_context_lang.js
+share/horde/templates/javascript/htmlarea_lang.js
+share/horde/templates/javascript/htmlarea_listtype_lang.js
+share/horde/templates/javascript/htmlarea_table_lang.js
+share/horde/templates/javascript/keybindings.js
+share/horde/templates/javascript/open_calendar.js
+share/horde/templates/javascript/open_google_win.js
+share/horde/templates/javascript/open_html_helper.js
+share/horde/templates/javascript/print.js
+share/horde/templates/javascript/quoteBlocks.js
+share/horde/templates/javascript/test_javascript.js
+share/horde/templates/javascript/tree.js
 share/horde/templates/login/login.inc
-share/horde/templates/login/user.inc
-share/horde/templates/maintenance/confirm_bottom.inc
-share/horde/templates/maintenance/confirm_middle.inc
-share/horde/templates/maintenance/confirm_top.inc
-share/horde/templates/maintenance/javascript.inc
-share/horde/templates/navbar/menu.inc
+share/horde/templates/login/mobile.inc
+share/horde/templates/maintenance/maintenance.html
+share/horde/templates/menu/menu.inc
+share/horde/templates/portal/add.inc
+share/horde/templates/portal/block.inc
+share/horde/templates/portal/edit.inc
+share/horde/templates/portal/layout.inc
+share/horde/templates/portal/menu.inc
+share/horde/templates/portal/sidebar.inc
+share/horde/templates/prefs/app.inc
 share/horde/templates/prefs/begin.inc
+share/horde/templates/prefs/categorymanagement.inc
 share/horde/templates/prefs/checkbox.inc
+share/horde/templates/prefs/deleteidentity.inc
 share/horde/templates/prefs/end.inc
 share/horde/templates/prefs/enum.inc
+share/horde/templates/prefs/identityselect.inc
 share/horde/templates/prefs/link.inc
+share/horde/templates/prefs/multienum.inc
 share/horde/templates/prefs/number.inc
 share/horde/templates/prefs/overview.inc
+share/horde/templates/prefs/password.inc
 share/horde/templates/prefs/select.inc
 share/horde/templates/prefs/text.inc
 share/horde/templates/prefs/textarea.inc
-share/horde/templates/problem/javascript.inc
 share/horde/templates/problem/problem.inc
-share/horde/templates/wml/common-footer.inc
-share/horde/templates/wml/common-header.inc
-share/horde/templates/wml/doctype.inc
-share/horde/templates/wml/login/login.inc
-share/horde/templates/wml/login/user.inc
+share/horde/templates/rpcsum/rpcsum.inc
+share/horde/templates/shares/edit.inc
+share/horde/templates/test/extensions.inc
+share/horde/templates/test/footer.inc
+share/horde/templates/test/header.inc
+share/horde/templates/test/php_version.inc
+share/horde/templates/test/version.inc
 share/horde/test.php
-share/horde/util/css2horde.php
-share/horde/util/go.php
-share/horde/util/special_characters.php
+share/horde/themes/NeXTgrey/info.php
+share/horde/themes/NeXTgrey/screen.css
+share/horde/themes/azur/info.php
+share/horde/themes/azur/screen.css
+share/horde/themes/barbie/info.php
+share/horde/themes/barbie/screen.css
+share/horde/themes/bluemoon/info.php
+share/horde/themes/bluemoon/screen.css
+share/horde/themes/bluewhite/info.php
+share/horde/themes/bluewhite/screen.css
+share/horde/themes/brown/info.php
+share/horde/themes/brown/screen.css
+share/horde/themes/burntorange/info.php
+share/horde/themes/burntorange/screen.css
+share/horde/themes/camouflage/graphics/menu.png
+share/horde/themes/camouflage/info.php
+share/horde/themes/camouflage/screen.css
+share/horde/themes/cornflower/graphics/tab_bottom.gif
+share/horde/themes/cornflower/graphics/tab_left.gif
+share/horde/themes/cornflower/graphics/tab_right.gif
+share/horde/themes/cornflower/info.php
+share/horde/themes/cornflower/screen.css
+share/horde/themes/gennevilliers/info.php
+share/horde/themes/gennevilliers/screen.css
+share/horde/themes/graphics/administration.png
+share/horde/themes/graphics/alerts/error.png
+share/horde/themes/graphics/alerts/message.png
+share/horde/themes/graphics/alerts/success.png
+share/horde/themes/graphics/alerts/warning.png
+share/horde/themes/graphics/avatars/alien.jpg
+share/horde/themes/graphics/avatars/aly.jpg
+share/horde/themes/graphics/avatars/angryboy.gif
+share/horde/themes/graphics/avatars/ape.jpg
+share/horde/themes/graphics/avatars/au.jpg
+share/horde/themes/graphics/avatars/baby.gif
+share/horde/themes/graphics/avatars/barbarian.jpg
+share/horde/themes/graphics/avatars/bart.gif
+share/horde/themes/graphics/avatars/batman.gif
+share/horde/themes/graphics/avatars/bert.jpg
+share/horde/themes/graphics/avatars/bert2.jpg
+share/horde/themes/graphics/avatars/bobafett.gif
+share/horde/themes/graphics/avatars/boo.jpg
+share/horde/themes/graphics/avatars/boyandmower.gif
+share/horde/themes/graphics/avatars/boyandpc.gif
+share/horde/themes/graphics/avatars/bret.jpg
+share/horde/themes/graphics/avatars/bunny.gif
+share/horde/themes/graphics/avatars/charlie_brown.gif
+share/horde/themes/graphics/avatars/clown.jpg
+share/horde/themes/graphics/avatars/cocky.jpg
+share/horde/themes/graphics/avatars/devil.gif
+share/horde/themes/graphics/avatars/digimon.gif
+share/horde/themes/graphics/avatars/dilbert.gif
+share/horde/themes/graphics/avatars/dino.gif
+share/horde/themes/graphics/avatars/dog.gif
+share/horde/themes/graphics/avatars/duck.gif
+share/horde/themes/graphics/avatars/einstein.jpg
+share/horde/themes/graphics/avatars/elmerfudd.gif
+share/horde/themes/graphics/avatars/elmo.jpg
+share/horde/themes/graphics/avatars/evil.jpg
+share/horde/themes/graphics/avatars/female1.jpg
+share/horde/themes/graphics/avatars/female2.jpg
+share/horde/themes/graphics/avatars/franc.jpg
+share/horde/themes/graphics/avatars/fredflinstone.gif
+share/horde/themes/graphics/avatars/garfield.gif
+share/horde/themes/graphics/avatars/gopher.gif
+share/horde/themes/graphics/avatars/greenhead.gif
+share/horde/themes/graphics/avatars/gremlin.jpg
+share/horde/themes/graphics/avatars/grover.jpg
+share/horde/themes/graphics/avatars/homer.gif
+share/horde/themes/graphics/avatars/hump.jpg
+share/horde/themes/graphics/avatars/iceskatekid.gif
+share/horde/themes/graphics/avatars/jeri.jpg
+share/horde/themes/graphics/avatars/kid.gif
+share/horde/themes/graphics/avatars/kirk.jpg
+share/horde/themes/graphics/avatars/kryton.jpg
+share/horde/themes/graphics/avatars/linux.gif
+share/horde/themes/graphics/avatars/lisa.gif
+share/horde/themes/graphics/avatars/lovebird.gif
+share/horde/themes/graphics/avatars/male1.jpg
+share/horde/themes/graphics/avatars/male2.jpg
+share/horde/themes/graphics/avatars/man.jpg
+share/horde/themes/graphics/avatars/marge.gif
+share/horde/themes/graphics/avatars/maul.gif
+share/horde/themes/graphics/avatars/melon.jpg
+share/horde/themes/graphics/avatars/mib.gif
+share/horde/themes/graphics/avatars/monkey.jpg
+share/horde/themes/graphics/avatars/neo.jpg
+share/horde/themes/graphics/avatars/ninja.jpg
+share/horde/themes/graphics/avatars/paintingbird.gif
+share/horde/themes/graphics/avatars/picard.jpg
+share/horde/themes/graphics/avatars/puff.jpg
+share/horde/themes/graphics/avatars/redcreature.gif
+share/horde/themes/graphics/avatars/rei.jpg
+share/horde/themes/graphics/avatars/rei2.jpg
+share/horde/themes/graphics/avatars/ryu.gif
+share/horde/themes/graphics/avatars/sexy.gif
+share/horde/themes/graphics/avatars/smiley.gif
+share/horde/themes/graphics/avatars/smurfs.gif
+share/horde/themes/graphics/avatars/sonic.gif
+share/horde/themes/graphics/avatars/speedy.gif
+share/horde/themes/graphics/avatars/stan.jpg
+share/horde/themes/graphics/avatars/superman.gif
+share/horde/themes/graphics/avatars/sylvester.gif
+share/horde/themes/graphics/avatars/thomas.gif
+share/horde/themes/graphics/avatars/tigger.gif
+share/horde/themes/graphics/avatars/trin.jpg
+share/horde/themes/graphics/avatars/us.jpg
+share/horde/themes/graphics/avatars/vampire.jpg
+share/horde/themes/graphics/avatars/vampire2.jpg
+share/horde/themes/graphics/avatars/wacko.gif
+share/horde/themes/graphics/avatars/winnie.gif
+share/horde/themes/graphics/avatars/wizard.jpg
+share/horde/themes/graphics/avatars/wolverine.jpg
+share/horde/themes/graphics/avatars/woman.jpg
+share/horde/themes/graphics/avatars/woodie.jpg
+share/horde/themes/graphics/avatars/xena.gif
+share/horde/themes/graphics/az.png
+share/horde/themes/graphics/blank.gif
+share/horde/themes/graphics/block.png
+share/horde/themes/graphics/block/down.png
+share/horde/themes/graphics/block/large_down.png
+share/horde/themes/graphics/block/large_left.png
+share/horde/themes/graphics/block/large_right.png
+share/horde/themes/graphics/block/large_up.png
+share/horde/themes/graphics/block/left.png
+share/horde/themes/graphics/block/moon/firstquarter.png
+share/horde/themes/graphics/block/moon/fullmoon.png
+share/horde/themes/graphics/block/moon/lastquarter.png
+share/horde/themes/graphics/block/moon/newmoon.png
+share/horde/themes/graphics/block/right.png
+share/horde/themes/graphics/block/sunrise/sunrise.png
+share/horde/themes/graphics/block/sunrise/sunset.png
+share/horde/themes/graphics/block/up.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/0.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/1.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/10.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/11.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/12.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/13.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/14.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/15.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/16.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/17.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/18.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/19.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/2.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/20.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/21.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/22.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/23.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/24.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/25.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/26.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/27.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/28.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/29.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/3.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/30.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/31.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/32.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/33.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/34.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/35.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/36.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/37.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/38.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/39.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/4.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/40.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/41.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/42.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/43.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/44.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/45.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/46.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/47.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/5.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/6.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/7.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/8.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/9.png
+share/horde/themes/graphics/block/weatherdotcom/23x23/na.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/0.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/1.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/10.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/11.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/12.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/13.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/14.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/15.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/16.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/17.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/18.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/19.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/2.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/20.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/21.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/22.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/23.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/24.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/25.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/26.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/27.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/28.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/29.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/3.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/30.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/31.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/32.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/33.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/34.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/35.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/36.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/37.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/38.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/39.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/4.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/40.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/41.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/42.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/43.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/44.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/45.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/46.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/47.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/5.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/6.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/7.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/8.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/9.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/TWClogo_32px.png
+share/horde/themes/graphics/block/weatherdotcom/32x32/na.png
+share/horde/themes/graphics/calendar.png
+share/horde/themes/graphics/close.png
+share/horde/themes/graphics/colorpicker.png
+share/horde/themes/graphics/colorscale.png
+share/horde/themes/graphics/config.png
+share/horde/themes/graphics/data.png
+share/horde/themes/graphics/datatree.png
+share/horde/themes/graphics/delete-small.png
+share/horde/themes/graphics/delete.png
+share/horde/themes/graphics/devel.png
+share/horde/themes/graphics/download.png
+share/horde/themes/graphics/edit-small.png
+share/horde/themes/graphics/edit.png
+share/horde/themes/graphics/emoticons/angel.png
+share/horde/themes/graphics/emoticons/angelwink.png
+share/horde/themes/graphics/emoticons/angry.png
+share/horde/themes/graphics/emoticons/annoyed.png
+share/horde/themes/graphics/emoticons/asleep.png
+share/horde/themes/graphics/emoticons/bigfrown.png
+share/horde/themes/graphics/emoticons/biggrin.png
+share/horde/themes/graphics/emoticons/blush.png
+share/horde/themes/graphics/emoticons/clown.png
+share/horde/themes/graphics/emoticons/confused.png
+share/horde/themes/graphics/emoticons/cool.png
+share/horde/themes/graphics/emoticons/coolgrin.png
+share/horde/themes/graphics/emoticons/cooltongue.png
+share/horde/themes/graphics/emoticons/dazed.png
+share/horde/themes/graphics/emoticons/devil.png
+share/horde/themes/graphics/emoticons/deviltongue.png
+share/horde/themes/graphics/emoticons/disappointed.png
+share/horde/themes/graphics/emoticons/embarrassed.png
+share/horde/themes/graphics/emoticons/enraged.png
+share/horde/themes/graphics/emoticons/frown.png
+share/horde/themes/graphics/emoticons/frustrated.png
+share/horde/themes/graphics/emoticons/grin.png
+share/horde/themes/graphics/emoticons/hangover.png
+share/horde/themes/graphics/emoticons/hippie.png
+share/horde/themes/graphics/emoticons/hippiegrin.png
+share/horde/themes/graphics/emoticons/hippietongue.png
+share/horde/themes/graphics/emoticons/hurt.png
+share/horde/themes/graphics/emoticons/indifferent.png
+share/horde/themes/graphics/emoticons/love.png
+share/horde/themes/graphics/emoticons/mad.png
+share/horde/themes/graphics/emoticons/mrt.png
+share/horde/themes/graphics/emoticons/punk.png
+share/horde/themes/graphics/emoticons/punkmohawk.png
+share/horde/themes/graphics/emoticons/punktongue.png
+share/horde/themes/graphics/emoticons/raspberry.png
+share/horde/themes/graphics/emoticons/sad.png
+share/horde/themes/graphics/emoticons/shout.png
+share/horde/themes/graphics/emoticons/smile.png
+share/horde/themes/graphics/emoticons/tired.png
+share/horde/themes/graphics/emoticons/tongueout.png
+share/horde/themes/graphics/emoticons/vampire.png
+share/horde/themes/graphics/emoticons/wink.png
+share/horde/themes/graphics/emoticons/winkgrin.png
+share/horde/themes/graphics/emoticons/winktongue.png
+share/horde/themes/graphics/emoticons/winktongueout.png
+share/horde/themes/graphics/emoticons/worried.png
+share/horde/themes/graphics/favicon.ico
+share/horde/themes/graphics/flags/af.png
+share/horde/themes/graphics/flags/al.png
+share/horde/themes/graphics/flags/am.png
+share/horde/themes/graphics/flags/an.png
+share/horde/themes/graphics/flags/ao.png
+share/horde/themes/graphics/flags/ar.png
+share/horde/themes/graphics/flags/at.png
+share/horde/themes/graphics/flags/au.png
+share/horde/themes/graphics/flags/aw.png
+share/horde/themes/graphics/flags/az.png
+share/horde/themes/graphics/flags/ba.png
+share/horde/themes/graphics/flags/bb.png
+share/horde/themes/graphics/flags/bd.png
+share/horde/themes/graphics/flags/be.png
+share/horde/themes/graphics/flags/bf.png
+share/horde/themes/graphics/flags/bg.png
+share/horde/themes/graphics/flags/bh.png
+share/horde/themes/graphics/flags/bi.png
+share/horde/themes/graphics/flags/bj.png
+share/horde/themes/graphics/flags/bm.png
+share/horde/themes/graphics/flags/bn.png
+share/horde/themes/graphics/flags/bo.png
+share/horde/themes/graphics/flags/br.png
+share/horde/themes/graphics/flags/bs.png
+share/horde/themes/graphics/flags/bt.png
+share/horde/themes/graphics/flags/bw.png
+share/horde/themes/graphics/flags/by.png
+share/horde/themes/graphics/flags/bz.png
+share/horde/themes/graphics/flags/ca.png
+share/horde/themes/graphics/flags/cf.png
+share/horde/themes/graphics/flags/cg.png
+share/horde/themes/graphics/flags/ch.png
+share/horde/themes/graphics/flags/ci.png
+share/horde/themes/graphics/flags/ck.png
+share/horde/themes/graphics/flags/cl.png
+share/horde/themes/graphics/flags/cm.png
+share/horde/themes/graphics/flags/cn.png
+share/horde/themes/graphics/flags/co.png
+share/horde/themes/graphics/flags/cr.png
+share/horde/themes/graphics/flags/cu.png
+share/horde/themes/graphics/flags/cv.png
+share/horde/themes/graphics/flags/cy.png
+share/horde/themes/graphics/flags/cz.png
+share/horde/themes/graphics/flags/de.png
+share/horde/themes/graphics/flags/dk.png
+share/horde/themes/graphics/flags/dz.png
+share/horde/themes/graphics/flags/ec.png
+share/horde/themes/graphics/flags/ee.png
+share/horde/themes/graphics/flags/eg.png
+share/horde/themes/graphics/flags/er.png
+share/horde/themes/graphics/flags/es.png
+share/horde/themes/graphics/flags/et.png
+share/horde/themes/graphics/flags/fi.png
+share/horde/themes/graphics/flags/fj.png
+share/horde/themes/graphics/flags/fo.png
+share/horde/themes/graphics/flags/fr.png
+share/horde/themes/graphics/flags/ga.png
+share/horde/themes/graphics/flags/ge.png
+share/horde/themes/graphics/flags/gi.png
+share/horde/themes/graphics/flags/gl.png
+share/horde/themes/graphics/flags/gp.png
+share/horde/themes/graphics/flags/gr.png
+share/horde/themes/graphics/flags/gt.png
+share/horde/themes/graphics/flags/gu.png
+share/horde/themes/graphics/flags/gy.png
+share/horde/themes/graphics/flags/hk.png
+share/horde/themes/graphics/flags/hr.png
+share/horde/themes/graphics/flags/ht.png
+share/horde/themes/graphics/flags/hu.png
+share/horde/themes/graphics/flags/id.png
+share/horde/themes/graphics/flags/ie.png
+share/horde/themes/graphics/flags/il.png
+share/horde/themes/graphics/flags/in.png
+share/horde/themes/graphics/flags/iq.png
+share/horde/themes/graphics/flags/ir.png
+share/horde/themes/graphics/flags/is.png
+share/horde/themes/graphics/flags/it.png
+share/horde/themes/graphics/flags/jm.png
+share/horde/themes/graphics/flags/jo.png
+share/horde/themes/graphics/flags/jp.png
+share/horde/themes/graphics/flags/ke.png
+share/horde/themes/graphics/flags/kg.png
+share/horde/themes/graphics/flags/kh.png
+share/horde/themes/graphics/flags/ki.png
+share/horde/themes/graphics/flags/kp.png
+share/horde/themes/graphics/flags/kr.png
+share/horde/themes/graphics/flags/ky.png
+share/horde/themes/graphics/flags/kz.png
+share/horde/themes/graphics/flags/lb.png
+share/horde/themes/graphics/flags/lc.png
+share/horde/themes/graphics/flags/lk.png
+share/horde/themes/graphics/flags/lt.png
+share/horde/themes/graphics/flags/lu.png
+share/horde/themes/graphics/flags/lv.png
+share/horde/themes/graphics/flags/ly.png
+share/horde/themes/graphics/flags/ma.png
+share/horde/themes/graphics/flags/mc.png
+share/horde/themes/graphics/flags/md.png
+share/horde/themes/graphics/flags/mg.png
+share/horde/themes/graphics/flags/mn.png
+share/horde/themes/graphics/flags/mo.png
+share/horde/themes/graphics/flags/mp.png
+share/horde/themes/graphics/flags/ms.png
+share/horde/themes/graphics/flags/mt.png
+share/horde/themes/graphics/flags/mx.png
+share/horde/themes/graphics/flags/my.png
+share/horde/themes/graphics/flags/mz.png
+share/horde/themes/graphics/flags/na.png
+share/horde/themes/graphics/flags/nc.png
+share/horde/themes/graphics/flags/nf.png
+share/horde/themes/graphics/flags/nl.png
+share/horde/themes/graphics/flags/no.png
+share/horde/themes/graphics/flags/np.png
+share/horde/themes/graphics/flags/nr.png
+share/horde/themes/graphics/flags/nz.png
+share/horde/themes/graphics/flags/om.png
+share/horde/themes/graphics/flags/pa.png
+share/horde/themes/graphics/flags/pe.png
+share/horde/themes/graphics/flags/pf.png
+share/horde/themes/graphics/flags/ph.png
+share/horde/themes/graphics/flags/pk.png
+share/horde/themes/graphics/flags/pl.png
+share/horde/themes/graphics/flags/pm.png
+share/horde/themes/graphics/flags/pr.png
+share/horde/themes/graphics/flags/pt.png
+share/horde/themes/graphics/flags/py.png
+share/horde/themes/graphics/flags/qa.png
+share/horde/themes/graphics/flags/ro.png
+share/horde/themes/graphics/flags/ru.png
+share/horde/themes/graphics/flags/sa.png
+share/horde/themes/graphics/flags/sb.png
+share/horde/themes/graphics/flags/sd.png
+share/horde/themes/graphics/flags/se.png
+share/horde/themes/graphics/flags/sg.png
+share/horde/themes/graphics/flags/si.png
+share/horde/themes/graphics/flags/sk.png
+share/horde/themes/graphics/flags/sl.png
+share/horde/themes/graphics/flags/so.png
+share/horde/themes/graphics/flags/sr.png
+share/horde/themes/graphics/flags/sy.png
+share/horde/themes/graphics/flags/tc.png
+share/horde/themes/graphics/flags/tg.png
+share/horde/themes/graphics/flags/th.png
+share/horde/themes/graphics/flags/tn.png
+share/horde/themes/graphics/flags/to.png
+share/horde/themes/graphics/flags/tp.png
+share/horde/themes/graphics/flags/tr.png
+share/horde/themes/graphics/flags/tt.png
+share/horde/themes/graphics/flags/tv.png
+share/horde/themes/graphics/flags/tw.png
+share/horde/themes/graphics/flags/tz.png
+share/horde/themes/graphics/flags/ua.png
+share/horde/themes/graphics/flags/ug.png
+share/horde/themes/graphics/flags/uk.png
+share/horde/themes/graphics/flags/us.png
+share/horde/themes/graphics/flags/uy.png
+share/horde/themes/graphics/flags/va.png
+share/horde/themes/graphics/flags/ve.png
+share/horde/themes/graphics/flags/vg.png
+share/horde/themes/graphics/flags/vi.png
+share/horde/themes/graphics/flags/vn.png
+share/horde/themes/graphics/flags/ws.png
+share/horde/themes/graphics/flags/ye.png
+share/horde/themes/graphics/flags/yu.png
+share/horde/themes/graphics/flags/za.png
+share/horde/themes/graphics/flags/zw.png
+share/horde/themes/graphics/google.png
+share/horde/themes/graphics/group.png
+share/horde/themes/graphics/help.png
+share/horde/themes/graphics/help_index.png
+share/horde/themes/graphics/hide_panel.png
+share/horde/themes/graphics/horde-power1.png
+share/horde/themes/graphics/horde-power2.png
+share/horde/themes/graphics/horde-power3.png
+share/horde/themes/graphics/horde.png
+share/horde/themes/graphics/image/crop.png
+share/horde/themes/graphics/image/flip.png
+share/horde/themes/graphics/image/grayscale.png
+share/horde/themes/graphics/image/mirror.png
+share/horde/themes/graphics/image/ratio.png
+share/horde/themes/graphics/image/refresh.png
+share/horde/themes/graphics/image/rotate-180.png
+share/horde/themes/graphics/image/rotate-270.png
+share/horde/themes/graphics/image/rotate-90.png
+share/horde/themes/graphics/info.png
+share/horde/themes/graphics/info_icon.png
+share/horde/themes/graphics/keyboard.png
+share/horde/themes/graphics/layout.png
+share/horde/themes/graphics/lhand.png
+share/horde/themes/graphics/locked.png
+share/horde/themes/graphics/login.png
+share/horde/themes/graphics/logout.png
+share/horde/themes/graphics/map.png
+share/horde/themes/graphics/map_eu.png
+share/horde/themes/graphics/mime/audio.png
+share/horde/themes/graphics/mime/binary.png
+share/horde/themes/graphics/mime/compressed.png
+share/horde/themes/graphics/mime/deb.png
+share/horde/themes/graphics/mime/encryption.png
+share/horde/themes/graphics/mime/html.png
+share/horde/themes/graphics/mime/icalendar.png
+share/horde/themes/graphics/mime/image.png
+share/horde/themes/graphics/mime/mail.png
+share/horde/themes/graphics/mime/msexcel.png
+share/horde/themes/graphics/mime/mspowerpoint.png
+share/horde/themes/graphics/mime/msword.png
+share/horde/themes/graphics/mime/ooo_calc.png
+share/horde/themes/graphics/mime/ooo_draw.png
+share/horde/themes/graphics/mime/ooo_impress.png
+share/horde/themes/graphics/mime/ooo_math.png
+share/horde/themes/graphics/mime/ooo_writer.png
+share/horde/themes/graphics/mime/pdf.png
+share/horde/themes/graphics/mime/php.png
+share/horde/themes/graphics/mime/rpm.png
+share/horde/themes/graphics/mime/script-js.png
+share/horde/themes/graphics/mime/source-c.png
+share/horde/themes/graphics/mime/source-cpp.png
+share/horde/themes/graphics/mime/source-h.png
+share/horde/themes/graphics/mime/source-java.png
+share/horde/themes/graphics/mime/source-python.png
+share/horde/themes/graphics/mime/text.png
+share/horde/themes/graphics/mime/vcard.png
+share/horde/themes/graphics/mime/video.png
+share/horde/themes/graphics/mime/xml.png
+share/horde/themes/graphics/mobile/bottom.jpg
+share/horde/themes/graphics/mobile/display.jpg
+share/horde/themes/graphics/mobile/left.jpg
+share/horde/themes/graphics/mobile/right.jpg
+share/horde/themes/graphics/mobile/top.jpg
+share/horde/themes/graphics/myaccount.png
+share/horde/themes/graphics/nav/bottom-grey.png
+share/horde/themes/graphics/nav/bottom.png
+share/horde/themes/graphics/nav/down-grey.png
+share/horde/themes/graphics/nav/down.png
+share/horde/themes/graphics/nav/first-grey.png
+share/horde/themes/graphics/nav/first.png
+share/horde/themes/graphics/nav/last-grey.png
+share/horde/themes/graphics/nav/last.png
+share/horde/themes/graphics/nav/left-grey.png
+share/horde/themes/graphics/nav/left.png
+share/horde/themes/graphics/nav/right-grey.png
+share/horde/themes/graphics/nav/right.png
+share/horde/themes/graphics/nav/top-grey.png
+share/horde/themes/graphics/nav/top.png
+share/horde/themes/graphics/nav/up-grey.png
+share/horde/themes/graphics/nav/up.png
+share/horde/themes/graphics/office.png
+share/horde/themes/graphics/organizing.png
+share/horde/themes/graphics/perms.png
+share/horde/themes/graphics/prefs.png
+share/horde/themes/graphics/print.png
+share/horde/themes/graphics/problem.png
+share/horde/themes/graphics/reload.png
+share/horde/themes/graphics/required.png
+share/horde/themes/graphics/rhand.png
+share/horde/themes/graphics/save.png
+share/horde/themes/graphics/search.png
+share/horde/themes/graphics/shadow.gif
+share/horde/themes/graphics/shadow.png
+share/horde/themes/graphics/shell.png
+share/horde/themes/graphics/show_panel.png
+share/horde/themes/graphics/sql.png
+share/horde/themes/graphics/tab_bottom.gif
+share/horde/themes/graphics/tree/blank.png
+share/horde/themes/graphics/tree/folder.png
+share/horde/themes/graphics/tree/folderopen.png
+share/horde/themes/graphics/tree/join.png
+share/horde/themes/graphics/tree/joinbottom-down.png
+share/horde/themes/graphics/tree/joinbottom.png
+share/horde/themes/graphics/tree/leaf.png
+share/horde/themes/graphics/tree/line.png
+share/horde/themes/graphics/tree/minus.png
+share/horde/themes/graphics/tree/minusbottom.png
+share/horde/themes/graphics/tree/minusonly.png
+share/horde/themes/graphics/tree/minustop.png
+share/horde/themes/graphics/tree/nullonly.png
+share/horde/themes/graphics/tree/plus.png
+share/horde/themes/graphics/tree/plusbottom.png
+share/horde/themes/graphics/tree/plusonly.png
+share/horde/themes/graphics/tree/plustop.png
+share/horde/themes/graphics/tree/rev-join.png
+share/horde/themes/graphics/tree/rev-joinbottom-down.png
+share/horde/themes/graphics/tree/rev-joinbottom.png
+share/horde/themes/graphics/tree/rev-leaf.png
+share/horde/themes/graphics/tree/rev-line.png
+share/horde/themes/graphics/tree/rev-minus.png
+share/horde/themes/graphics/tree/rev-minusbottom.png
+share/horde/themes/graphics/tree/rev-minusonly.png
+share/horde/themes/graphics/tree/rev-minustop.png
+share/horde/themes/graphics/tree/rev-nullonly.png
+share/horde/themes/graphics/tree/rev-plus.png
+share/horde/themes/graphics/tree/rev-plusbottom.png
+share/horde/themes/graphics/tree/rev-plusonly.png
+share/horde/themes/graphics/tree/rev-plustop.png
+share/horde/themes/graphics/unlocked.png
+share/horde/themes/graphics/user.png
+share/horde/themes/graphics/website.png
+share/horde/themes/graphics/za.png
+share/horde/themes/green/info.php
+share/horde/themes/green/screen.css
+share/horde/themes/grey/info.php
+share/horde/themes/grey/screen.css
+share/horde/themes/hi-contrast/info.php
+share/horde/themes/hi-contrast/screen.css
+share/horde/themes/ideas/graphics/background.png
+share/horde/themes/ideas/graphics/left_menu_bottom.png
+share/horde/themes/ideas/graphics/left_menu_top.png
+share/horde/themes/ideas/graphics/menu_top.png
+share/horde/themes/ideas/info.php
+share/horde/themes/ideas/screen.css
+share/horde/themes/ie5mac.css
+share/horde/themes/ie6_or_less.css
+share/horde/themes/kolab/graphics/bg.png
+share/horde/themes/kolab/graphics/kolab.png
+share/horde/themes/kolab/graphics/kolablogo.png
+share/horde/themes/kolab/info.php
+share/horde/themes/kolab/screen.css
+share/horde/themes/lavander/info.php
+share/horde/themes/lavander/screen.css
+share/horde/themes/lightblue/graphics/menu.png
+share/horde/themes/lightblue/info.php
+share/horde/themes/lightblue/screen.css
+share/horde/themes/luc/graphics/currentTab_left.gif
+share/horde/themes/luc/graphics/currentTab_right.gif
+share/horde/themes/luc/graphics/tab_bottom.gif
+share/horde/themes/luc/graphics/tab_left.gif
+share/horde/themes/luc/graphics/tab_right.gif
+share/horde/themes/luc/info.php
+share/horde/themes/luc/screen.css
+share/horde/themes/lucblue/info.php
+share/horde/themes/lucblue/screen.css
+share/horde/themes/mobile/screen.css
+share/horde/themes/moz14.css
+share/horde/themes/mozilla/graphics/header.png
+share/horde/themes/mozilla/graphics/menu-active.png
+share/horde/themes/mozilla/graphics/menu.png
+share/horde/themes/mozilla/info.php
+share/horde/themes/mozilla/screen.css
+share/horde/themes/opera.css
+share/horde/themes/postnuke/info.php
+share/horde/themes/postnuke/screen.css
+share/horde/themes/print/screen.css
+share/horde/themes/purple/info.php
+share/horde/themes/purple/screen.css
+share/horde/themes/rtl.css
+share/horde/themes/safari.css
+share/horde/themes/screen.css
+share/horde/themes/simplex/graphics/background.png
+share/horde/themes/simplex/info.php
+share/horde/themes/simplex/screen.css
+share/horde/util/barcode.php
+share/horde/util/icon_browser.php
+share/horde/util/regex_test.php
 @dirrm share/horde/util
-@dirrm share/horde/templates/wml/login
-@dirrm share/horde/templates/wml
+@dirrm share/horde/themes/simplex/graphics
+@dirrm share/horde/themes/simplex
+@dirrm share/horde/themes/purple
+@dirrm share/horde/themes/print
+@dirrm share/horde/themes/postnuke
+@dirrm share/horde/themes/mozilla/graphics
+@dirrm share/horde/themes/mozilla
+@dirrm share/horde/themes/mobile
+@dirrm share/horde/themes/lucblue
+@dirrm share/horde/themes/luc/graphics
+@dirrm share/horde/themes/luc
+@dirrm share/horde/themes/lightblue/graphics
+@dirrm share/horde/themes/lightblue
+@dirrm share/horde/themes/lavander
+@dirrm share/horde/themes/kolab/graphics
+@dirrm share/horde/themes/kolab
+@dirrm share/horde/themes/hi-contrast
+@dirrm share/horde/themes/cornflower/graphics
+@dirrm share/horde/themes/cornflower
+@dirrm share/horde/themes/grey
+@dirrm share/horde/themes/green
+@dirrm share/horde/themes/graphics/tree
+@dirrm share/horde/themes/graphics/nav
+@dirrm share/horde/themes/graphics/mobile
+@dirrm share/horde/themes/graphics/mime
+@dirrm share/horde/themes/graphics/image
+@dirrm share/horde/themes/graphics/flags
+@dirrm share/horde/themes/graphics/emoticons
+@dirrm share/horde/themes/graphics/block/weatherdotcom/32x32
+@dirrm share/horde/themes/graphics/block/weatherdotcom/23x23
+@dirrm share/horde/themes/graphics/block/weatherdotcom
+@dirrm share/horde/themes/graphics/block/sunrise
+@dirrm share/horde/themes/graphics/block/moon
+@dirrm share/horde/themes/graphics/block
+@dirrm share/horde/themes/graphics/alerts
+@dirrm share/horde/themes/graphics/avatars
+@dirrm share/horde/themes/graphics
+@dirrm share/horde/themes/gennevilliers
+@dirrm share/horde/themes/cornflower
+@dirrm share/horde/themes/camouflage/graphics
+@dirrm share/horde/themes/camouflage
+@dirrm share/horde/themes/burntorange
+@dirrm share/horde/themes/brown
+@dirrm share/horde/themes/bluewhite
+@dirrm share/horde/themes/bluemoon
+@dirrm share/horde/themes/barbie
+@dirrm share/horde/themes/azur
+@dirrm share/horde/themes/ideas/graphics
+@dirrm share/horde/themes/ideas
+@dirrm share/horde/themes/NeXTgrey
+@dirrm share/horde/themes
+@dirrm share/horde/templates/test
+@dirrm share/horde/templates/shares
+@dirrm share/horde/templates/rpcsum
 @dirrm share/horde/templates/problem
 @dirrm share/horde/templates/prefs
-@dirrm share/horde/templates/navbar
+@dirrm share/horde/templates/portal
+@dirrm share/horde/templates/menu
 @dirrm share/horde/templates/maintenance
 @dirrm share/horde/templates/login
 @dirrm share/horde/templates/javascript
 @dirrm share/horde/templates/index
-@dirrm share/horde/templates/horde
 @dirrm share/horde/templates/help
 @dirrm share/horde/templates/data
-@dirrm share/horde/templates/categorytree
+@dirrm share/horde/templates/contents
+@dirrm share/horde/templates/admin/user
+@dirrm share/horde/templates/admin/setup
+@dirrm share/horde/templates/admin/groups
+@dirrm share/horde/templates/admin
 @dirrm share/horde/templates
-@dirrm share/horde/scripts/mime_mapping
+@dirrm share/horde/services/shares
+@dirrm share/horde/services/portal
+@dirrm share/horde/services/obrowser
+@dirrm share/horde/services/images
+@dirrm share/horde/services/help
+@dirrm share/horde/services/editor/htmlarea/popups
+@dirrm share/horde/services/editor/htmlarea/plugins/TableOperations/lang
+@dirrm share/horde/services/editor/htmlarea/plugins/TableOperations/img
+@dirrm share/horde/services/editor/htmlarea/plugins/TableOperations
+@dirrm share/horde/services/editor/htmlarea/plugins/ListType/lang
+@dirrm share/horde/services/editor/htmlarea/plugins/ListType
+@dirrm share/horde/services/editor/htmlarea/plugins/ContextMenu/lang
+@dirrm share/horde/services/editor/htmlarea/plugins/ContextMenu
+@dirrm share/horde/services/editor/htmlarea/plugins/AnselImage/lang
+@dirrm share/horde/services/editor/htmlarea/plugins/AnselImage
+@dirrm share/horde/services/editor/htmlarea/plugins
+@dirrm share/horde/services/editor/htmlarea/lang
+@dirrm share/horde/services/editor/htmlarea/images
+@dirrm share/horde/services/editor/htmlarea
+@dirrm share/horde/services/editor
+@dirrm share/horde/services/download
+@dirrm share/horde/services
+@dirrm share/horde/scripts/upgrades
+@dirrm share/horde/scripts/sql
 @dirrm share/horde/scripts/ldap
-@dirrm share/horde/scripts/db
 @dirrm share/horde/scripts
 @dirrm share/horde/po
 @dirrm share/horde/locale/zh_TW/LC_MESSAGES
@@ -353,6 +1552,8 @@ share/horde/util/special_characters.php
 @dirrm share/horde/locale/zh_CN
 @dirrm share/horde/locale/uk_UA/LC_MESSAGES
 @dirrm share/horde/locale/uk_UA
+@dirrm share/horde/locale/tr_TR/LC_MESSAGES
+@dirrm share/horde/locale/tr_TR
 @dirrm share/horde/locale/sv_SE/LC_MESSAGES
 @dirrm share/horde/locale/sv_SE
 @dirrm share/horde/locale/sl_SI/LC_MESSAGES
@@ -360,8 +1561,6 @@ share/horde/util/special_characters.php
 @dirrm share/horde/locale/sk_SK/LC_MESSAGES
 @dirrm share/horde/locale/sk_SK
 @dirrm share/horde/locale/ru_RU/LC_MESSAGES
-@dirrm share/horde/locale/ru_RU.KOI8-R/LC_MESSAGES
-@dirrm share/horde/locale/ru_RU.KOI8-R
 @dirrm share/horde/locale/ru_RU
 @dirrm share/horde/locale/ro_RO/LC_MESSAGES
 @dirrm share/horde/locale/ro_RO
@@ -399,6 +1598,8 @@ share/horde/util/special_characters.php
 @dirrm share/horde/locale/fr_FR
 @dirrm share/horde/locale/fi_FI/LC_MESSAGES
 @dirrm share/horde/locale/fi_FI
+@dirrm share/horde/locale/fa_IR/LC_MESSAGES
+@dirrm share/horde/locale/fa_IR
 @dirrm share/horde/locale/et_EE/LC_MESSAGES
 @dirrm share/horde/locale/et_EE
 @dirrm share/horde/locale/es_ES/LC_MESSAGES
@@ -414,29 +1615,113 @@ share/horde/util/special_characters.php
 @dirrm share/horde/locale/cs_CZ
 @dirrm share/horde/locale/ca_ES/LC_MESSAGES
 @dirrm share/horde/locale/ca_ES
+@dirrm share/horde/locale/bs_BA/LC_MESSAGES
+@dirrm share/horde/locale/bs_BA
 @dirrm share/horde/locale/bg_BG/LC_MESSAGES
 @dirrm share/horde/locale/bg_BG
 @dirrm share/horde/locale/ar_SY/LC_MESSAGES
 @dirrm share/horde/locale/ar_SY
+@dirrm share/horde/locale/km_KH/LC_MESSAGES
+@dirrm share/horde/locale/km_KH
+@dirrm share/horde/locale/is_IS/LC_MESSAGES
+@dirrm share/horde/locale/is_IS
+@dirrm share/horde/locale/he_IL/LC_MESSAGES
+@dirrm share/horde/locale/he_IL
 @dirrm share/horde/locale
+@dirrm share/horde/lib/docs
+@dirrm share/horde/lib/data
+@dirrm share/horde/lib/XML/tests
+@dirrm share/horde/lib/XML/docs/examples
+@dirrm share/horde/lib/XML/docs
+@dirrm share/horde/lib/XML/WBXML/DTD
+@dirrm share/horde/lib/XML/WBXML
+@dirrm share/horde/lib/XML
+@dirrm share/horde/lib/VFS/tests
+@dirrm share/horde/lib/VFS/ISOWriter/RealOutputStrategy
+@dirrm share/horde/lib/VFS/ISOWriter/RealInputStrategy
+@dirrm share/horde/lib/VFS/ISOWriter
 @dirrm share/horde/lib/VFS
-@dirrm share/horde/lib/Token
-@dirrm share/horde/lib/SessionHandler
-@dirrm share/horde/lib/Prefs
-@dirrm share/horde/lib/Notification
-@dirrm share/horde/lib/MIME/Viewer
-@dirrm share/horde/lib/MIME
-@dirrm share/horde/lib/Cipher/BlockMode
-@dirrm share/horde/lib/Cipher
-@dirrm share/horde/lib/Category
-@dirrm share/horde/lib/Cache
-@dirrm share/horde/lib/Auth
+@dirrm share/horde/lib/Text/tests
+@dirrm share/horde/lib/Text/reST/Formatter
+@dirrm share/horde/lib/Text/reST
+@dirrm share/horde/lib/Text/docs/examples
+@dirrm share/horde/lib/Text/docs
+@dirrm share/horde/lib/Text/Diff/Renderer
+@dirrm share/horde/lib/Text/Diff
+@dirrm share/horde/lib/Text
+@dirrm share/horde/lib/SyncML/Device
+@dirrm share/horde/lib/SyncML/Command
+@dirrm share/horde/lib/SyncML
+@dirrm share/horde/lib/Net/SMS
+@dirrm share/horde/lib/Net/IMSP/Auth
+@dirrm share/horde/lib/Net/IMSP
+@dirrm share/horde/lib/Net
+@dirrm share/horde/lib/Horde/tests
+@dirrm share/horde/lib/Horde/iCalendar
+@dirrm share/horde/lib/Horde/docs/examples
+@dirrm share/horde/lib/Horde/docs
+@dirrm share/horde/lib/Horde/VC
+@dirrm share/horde/lib/Horde/UI/VarRenderer
+@dirrm share/horde/lib/Horde/UI
+@dirrm share/horde/lib/Horde/Tree
+@dirrm share/horde/lib/Horde/Token
+@dirrm share/horde/lib/Horde/Text/tests
+@dirrm share/horde/lib/Horde/Text/Filter
+@dirrm share/horde/lib/Horde/Text
+@dirrm share/horde/lib/Horde/SessionHandler
+@dirrm share/horde/lib/Horde/Scheduler
+@dirrm share/horde/lib/Horde/SQL
+@dirrm share/horde/lib/Horde/RPC
+@dirrm share/horde/lib/Horde/RDO/Storage
+@dirrm share/horde/lib/Horde/RDO
+@dirrm share/horde/lib/Horde/Prefs
+@dirrm share/horde/lib/Horde/Perms
+@dirrm share/horde/lib/Horde/Notification/Listener
+@dirrm share/horde/lib/Horde/Notification
+@dirrm share/horde/lib/Horde/NLS
+@dirrm share/horde/lib/Horde/Mobile/Renderer
+@dirrm share/horde/lib/Horde/Mobile
+@dirrm share/horde/lib/Horde/MIME/Viewer/ooo
+@dirrm share/horde/lib/Horde/MIME/Viewer
+@dirrm share/horde/lib/Horde/MIME
+@dirrm share/horde/lib/Horde/Image
+@dirrm share/horde/lib/Horde/IMAP/ACL
+@dirrm share/horde/lib/Horde/IMAP
+@dirrm share/horde/lib/Horde/Group
+@dirrm share/horde/lib/Horde/Graph/Plot
+@dirrm share/horde/lib/Horde/Graph/Chart
+@dirrm share/horde/lib/Horde/Graph
+@dirrm share/horde/lib/Horde/Form/Action
+@dirrm share/horde/lib/Horde/Form/Type
+@dirrm share/horde/lib/Horde/Form
+@dirrm share/horde/lib/Horde/Editor
+@dirrm share/horde/lib/Horde/DataTree
+@dirrm share/horde/lib/Horde/Data
+@dirrm share/horde/lib/Horde/Crypt
+@dirrm share/horde/lib/Horde/Compress
+@dirrm share/horde/lib/Horde/Cipher/BlockMode
+@dirrm share/horde/lib/Horde/Cipher
+@dirrm share/horde/lib/Horde/Cache
+@dirrm share/horde/lib/Horde/Browser
+@dirrm share/horde/lib/Horde/Block/Layout
+@dirrm share/horde/lib/Horde/Block
+@dirrm share/horde/lib/Horde/Auth
+@dirrm share/horde/lib/Horde
+@dirrm share/horde/lib/File/tests
+@dirrm share/horde/lib/File/PDF/fonts
+@dirrm share/horde/lib/File/PDF
+@dirrm share/horde/lib/File
+@dirrm share/horde/lib/Block
 @dirrm share/horde/lib
-@dirrm share/horde/graphics/tree
-@dirrm share/horde/graphics/mime
-@dirrm share/horde/graphics/alerts
-@dirrm share/horde/graphics
-@dirrm share/horde/config
-@dirrm share/horde
+@dirrm share/horde/js
+@unexec ${RMDIR} %D/share/horde/config 2>/dev/null || ${TRUE}
+@dirrm share/horde/admin/setup
+@dirrm share/horde/admin/perms
+@dirrm share/horde/admin/locale/fi_FI
+@dirrm share/horde/admin/locale/en_US
+@dirrm share/horde/admin/locale/hu_HU
+@dirrm share/horde/admin/locale
+@dirrm share/horde/admin
+@unexec ${RMDIR} %D/share/horde 2>/dev/null || ${TRUE}
 @dirrm share/examples/horde
 @dirrm share/doc/horde
diff --git a/www/horde/distinfo b/www/horde/distinfo
index 0f7b0a55ed9..c4348b37fc7 100644
--- a/www/horde/distinfo
+++ b/www/horde/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.13 2005/11/25 21:21:04 adrianp Exp $
+$NetBSD: distinfo,v 1.14 2006/06/16 09:23:21 adrianp Exp $
 
-SHA1 (horde-2.2.9.tar.gz) = 48aed8aa02432622135e95184def93584301d209
-RMD160 (horde-2.2.9.tar.gz) = cfd4acad3afe5fd897d6b53c433bb91782fde1f9
-Size (horde-2.2.9.tar.gz) = 683026 bytes
-SHA1 (patch-aa) = b96dfde62079c89245588f5fe97fa2585210da0f
+SHA1 (horde-3.1.1.tar.gz) = 8735a11bc42f5aae7b70a555763d239614e4aca5
+RMD160 (horde-3.1.1.tar.gz) = bb98dbc34caa3410382dcf34afba20e257c62a8d
+Size (horde-3.1.1.tar.gz) = 5068434 bytes
+SHA1 (patch-aa) = 9edb110586805d5efd84541b9d3821889967e785
+SHA1 (patch-ab) = 3d248b02c59abb26e548f93b532fd1657fbb640d
+SHA1 (patch-ac) = da4ed065b39a30d459dfb9e1f00e38246ff3ab8f
diff --git a/www/horde/files/horde.conf.dist b/www/horde/files/horde.conf.dist
index 486d89f3320..9517f976aad 100644
--- a/www/horde/files/horde.conf.dist
+++ b/www/horde/files/horde.conf.dist
@@ -1,4 +1,4 @@
-# $NetBSD: horde.conf.dist,v 1.4 2002/03/29 20:48:53 bouyer Exp $
+# $NetBSD: horde.conf.dist,v 1.5 2006/06/16 09:23:21 adrianp Exp $
 #
 # Horde configuration file fragment for Apache
 
@@ -7,6 +7,7 @@
 </IfModule>
 
 <Directory "@HORDEDIR@">  
+    DirectoryIndex index.php
     Options Indexes FollowSymLinks
     AllowOverride None
     Order allow,deny
diff --git a/www/horde/options.mk b/www/horde/options.mk
new file mode 100644
index 00000000000..af52520399d
--- /dev/null
+++ b/www/horde/options.mk
@@ -0,0 +1,31 @@
+# $NetBSD: options.mk,v 1.1 2006/06/16 09:23:21 adrianp Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.horde
+PKG_SUPPORTED_OPTIONS=	ldap pgsql mysql
+PKG_SUGGESTED_OPTIONS=	mysql
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Use OpenLDAP for storing user details
+###
+.if !empty(PKG_OPTIONS:Mldap)
+.	include "../../databases/openldap-client/buildlink3.mk"
+DEPENDS+=	${PHP_PKG_PREFIX}-ldap>=4.3.3:../../databases/php-ldap
+.endif
+
+###
+### Use PostgreSQL for storing user details
+###
+.if !empty(PKG_OPTIONS:Mpgsql)
+.	include "../../mk/pgsql.buildlink3.mk"
+DEPENDS+=	${PHP_PKG_PREFIX}-pgsql>=4.3.3:../../databases/php-pgsql
+.endif
+
+###
+### Use MySQL for storing user details
+###
+.if !empty(PKG_OPTIONS:Mmysql)
+.	include "../../mk/mysql.buildlink3.mk"
+DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql
+.endif
diff --git a/www/horde/patches/patch-aa b/www/horde/patches/patch-aa
index f6a6b40ded9..dd2bbb06945 100644
--- a/www/horde/patches/patch-aa
+++ b/www/horde/patches/patch-aa
@@ -1,101 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2004/11/09 16:23:02 adam Exp $
+$NetBSD: patch-aa,v 1.6 2006/06/16 09:23:21 adrianp Exp $
 
---- config/horde.php.dist.orig	2003-10-14 16:52:31.000000000 +0000
-+++ config/horde.php.dist
-@@ -94,7 +94,7 @@ $conf['tmpdir'] = null;
- // What backend should we use for authenticating users to Horde? Valid
- // options are currently 'imap', 'ldap', 'mcal', 'sql', 'ftp', 'smb',
- // 'krb5' and 'radius'.
--$conf['auth']['driver'] = '';
-+$conf['auth']['driver'] = 'imap';
- 
- // An array holding any parameters that the Auth object will need to
- // function correctly.
-@@ -105,7 +105,7 @@ $conf['auth']['params'] = array();
- // c-client version 2000c or older), 'imap/ssl', or imap/ssl/novalidate-cert
- // (for a self-signed certificate).  Default ports are 143 for imap and
- // 993 for imap over ssl.
--// $conf['auth']['params']['dsn'] = '{imap.example.com:143/imap}INBOX';
-+$conf['auth']['params']['dsn'] = '{localhost:143/imap}INBOX';
- 
- // See $conf['prefs']['params'] further down for an example how to
- // setup a SQL backend. But you must use the horde_users SQL table for
-@@ -127,14 +127,14 @@ $conf['log']['enabled'] = true;
- 
- // What log driver should we use? Valid values are 'file', 'mcal',
- // 'sql', and 'syslog'.
--$conf['log']['type'] = 'file';
-+$conf['log']['type'] = 'syslog';
- 
- // What is the name of the log? For the 'file' driver, this is the
- // path to a text file; for mcal, it would be the name of a calendar,
- // and for sql it would be the table name to use. For the 'syslog'
- // driver it is the facility as a _constant_ (with no quotes), e.g.:
- // ... = LOG_LOCAL0;
--$conf['log']['name'] = '/tmp/horde.log';
-+$conf['log']['name'] = 'LOG_MAIL';
- 
- // What level of messages should we log? The values are LOG_EMERG,
- // LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO,
-@@ -159,7 +159,7 @@ $conf['log']['params'] = array();
- // (meaning use system defaults and don't save any user preferences),
- // 'session' (preferences only persist during the login), 'ldap',
- // and 'sql'.
--$conf['prefs']['driver'] = 'none';
-+$conf['prefs']['driver'] = 'sql';
- 
- // Any parameters that the preferences driver needs. This includes
- // database or ldap server, username/password to connect with, etc.
-@@ -168,12 +168,12 @@ $conf['prefs']['params'] = array();
- // This is an example configuration for a MySQL preference backend.
- // The SQL script to setup the preference database is placed in
- // horde/scripts/db/prefs.sql.
--// $conf['prefs']['params']['phptype'] = 'mysql';
--// $conf['prefs']['params']['hostspec'] = 'localhost';
--// $conf['prefs']['params']['username'] = 'horde';
--// $conf['prefs']['params']['password'] = '*****';
--// $conf['prefs']['params']['database'] = 'horde';
--// $conf['prefs']['params']['table'] = 'horde_prefs';
-+$conf['prefs']['params']['phptype'] = 'mysql';
-+$conf['prefs']['params']['hostspec'] = 'localhost';
-+$conf['prefs']['params']['username'] = 'hordemgr';
-+$conf['prefs']['params']['password'] = 'hordemgr';
-+$conf['prefs']['params']['database'] = 'horde';
-+$conf['prefs']['params']['table'] = 'horde_prefs';
- 
- // This is an example configuration for an LDAP preference backend.
- // The schemas needed for ldap are in horde/scripts/ldap.  For more
-@@ -219,15 +219,15 @@ $conf['mailer']['type'] = 'sendmail';
- 
- // An array holding any parameters that the Mail object will need to
- // function correctly.
--$conf['mailer']['params'] = array();
-+//$conf['mailer']['params'] = array();
- 
- // For sendmail, this is mainly the 'sendmail_path option. Additionally, we
- // want to use the '-oi' argument so that sendmail does not interpret a
- // single '.' in the body of a message as the end of input.
--// $conf['mailer']['params'] = array(
--//     'sendmail_path' => '/usr/lib/sendmail',
--//     'sendmail_args' => '-oi'
--// );
-+$conf['mailer']['params'] = array(
-+     'sendmail_path' => '/usr/sbin/sendmail',
-+     'sendmail_args' => '-oi'
-+);
- 
- // The 'smtp' driver normally will require a server name. Additional
- // parameters can also be defined - see below for more details.
-@@ -318,10 +318,10 @@ $conf['sessionhandler']['type'] = 'none'
- 
- // Should we display a problem reporting link in Horde application
- // menus?
--$conf['problems']['enabled'] = false;
-+$conf['problems']['enabled'] = true;
- 
- // If so, where should problem report emails be sent?
--$conf['problems']['email'] = 'webmaster@example.com';
-+$conf['problems']['email'] = 'postmaster';
- 
- 
- /**
+--- lib/Horde/Auth/login.php.orig	2005-03-29 02:59:56.000000000 -0800
++++ lib/Horde/Auth/login.php
+@@ -88,7 +88,7 @@ class Auth_login extends Auth {
+             Horde::fatal(_("No password provided for Login authentication."), __FILE__, __LINE__);
+         }
+ 
+-        $proc = popen($this->_location . ' -c /bin/true ' . $userId, 'w');
++        $proc = popen($this->_location . ' ' . $userId . ' -c exit 0', 'w');
+         if (!is_resource($proc)) {
+             return false;
+         }
diff --git a/www/horde/patches/patch-ab b/www/horde/patches/patch-ab
new file mode 100644
index 00000000000..aab309a74d5
--- /dev/null
+++ b/www/horde/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.3 2006/06/16 09:23:21 adrianp Exp $
+
+--- test.php.orig	2006-06-14 09:30:57.000000000 +0100
++++ test.php
+@@ -250,12 +250,12 @@ if (!empty($_GET['mode'])) {
+         exit;
+ 
+     case 'phpinfo':
+-        echo '<a href="' . $url . '?mode=test">&lt;&lt; Back to test.php</a>';
++        echo '<a href="' . htmlspecialchars($url) . '?mode=test">&lt;&lt; Back to test.php</a>';
+         phpinfo();
+         exit;
+ 
+     case 'filetest':
+-        echo '<a href="' . $url . '?mode=test">&lt;&lt; Back to test.php</a>';
++        echo '<a href="' . htmlspecialchars($url) . '?mode=test">&lt;&lt; Back to test.php</a>';
+         ?>
+         <html>
+         <body bgcolor="white" text="black">
diff --git a/www/horde/patches/patch-ac b/www/horde/patches/patch-ac
new file mode 100644
index 00000000000..00026b16c8d
--- /dev/null
+++ b/www/horde/patches/patch-ac
@@ -0,0 +1,34 @@
+$NetBSD: patch-ac,v 1.3 2006/06/16 09:23:21 adrianp Exp $
+
+--- templates/problem/problem.inc.orig	2005-10-18 12:34:09.000000000 +0100
++++ templates/problem/problem.inc
+@@ -31,17 +31,17 @@ function validate()
+ 
+ <tr>
+     <td class="light rightAlign"><?php echo _("Your Name") ?></td>
+-    <td><input type="text" tabindex="1" name="name" value="<?php echo $name ?>" size="70" /></td>
++    <td><input type="text" tabindex="1" name="name" value="<?php echo htmlspecialchars($name) ?>" size="70" /></td>
+ </tr>
+ 
+ <tr>
+     <td class="light rightAlign"><?php echo _("Your Email Address") ?></td>
+-    <td><input type="text" tabindex="2" name="email" value="<?php echo $email ?>" size="70" /></td>
++    <td><input type="text" tabindex="2" name="email" value="<?php echo htmlspecialchars($email) ?>" size="70" /></td>
+ </tr>
+ 
+ <tr>
+     <td class="light rightAlign"><?php echo _("Short Summary") ?></td>
+-    <td><input type="text" tabindex="3" name="subject" value="<?php echo $subject ?>" size="70" /></td>
++    <td><input type="text" tabindex="3" name="subject" value="<?php echo htmlspecialchars($subject) ?>" size="70" /></td>
+ </tr>
+ 
+ <tr>
+@@ -49,7 +49,7 @@ function validate()
+ </tr>
+ <tr>
+     <td></td>
+-    <td><textarea tabindex="4" name="message" rows="20" cols="80" wrap="hard"><?php echo $message ?></textarea></td>
++    <td><textarea tabindex="4" name="message" rows="20" cols="80" wrap="hard"><?php echo htmlspecialchars($message) ?></textarea></td>
+ </tr>
+ 
+ <tr>