Updated phpldapadmin to 0.9.8.3

Thanks to Yoshito Komatsu for feedback and testing

A summary of changes include:
This release fixes some minor bugs and some security alerts.
Code syntax fixing tests
HTML Validation fixes
Added support for binary attrs in templates & HTML Validation fixes
Few minor bug fixes.
Changed default login attribute back to "dn".

6 files changed, 566 insertions, 452 deletions

diff --git a/databases/phpldapadmin/MESSAGE b/databases/phpldapadmin/MESSAGE
index 9f45ffd60e4..ed25101adc6 100644
--- a/databases/phpldapadmin/MESSAGE
+++ b/databases/phpldapadmin/MESSAGE
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2005/09/06 21:47:46 adrianp Exp $
+$NetBSD: MESSAGE,v 1.5 2006/05/18 22:13:46 adrianp Exp $
 
-You will need to edit ${PREFIX}/share/phpldapadmin/config.php to
+You will need to edit ${PREFIX}/share/phpldapadmin/config/config.php to
 initially setup your site.
 
 You will also need to make phpLDAPAdmin accessible through your HTTP server.
diff --git a/databases/phpldapadmin/Makefile b/databases/phpldapadmin/Makefile
index c4d4a309338..b2a2f4d3efd 100644
--- a/databases/phpldapadmin/Makefile
+++ b/databases/phpldapadmin/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2006/02/16 18:18:25 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2006/05/18 22:13:46 adrianp Exp $
 
 DISTNAME=	phpldapadmin-${VERSION}
-PKGREVISION=	8
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=phpldapadmin/}
 
@@ -9,20 +8,26 @@ MAINTAINER=	rasputnik@hellooperator.net
 HOMEPAGE=	http://phpldapadmin.sourceforge.net/
 COMMENT=	Set of PHP-scripts to administer an LDAP directory over the WWW
 
+.include "../../lang/php/phpversion.mk"
+
 DEPENDS+=	php-ldap>=4.1.2:../../databases/php-ldap
+.if ${PKG_PHP_VERSION} == "4"
+DEPENDS+=	php-domxml>=4.1.2:../../textproc/php4-domxml
+.elif ${PKG_PHP_VERSION} == "5"
+DEPENDS+=	php-dom-[0-9]*:../../textproc/php5-dom
+.endif
 
-VERSION=	0.9.6c
+VERSION=	0.9.8.3
 NO_BUILD=	YES
 BUILD_DEFS+=	WWW_USER
 
 CONF_FILES=	${PREFIX}/share/examples/phpldapadmin/config.php.example \
-		${PREFIX}/share/phpldapadmin/config.php
+		${PREFIX}/share/phpldapadmin/config/config.php
 CONF_FILES+=	${PREFIX}/share/examples/phpldapadmin/phpldapadmin.conf \
 		${PKG_SYSCONFDIR}/phpldapadmin.conf
-SPECIAL_PERMS=	${PREFIX}/share/phpldapadmin/config.php \
+SPECIAL_PERMS=	${PREFIX}/share/phpldapadmin/config/config.php \
 		${WWW_USER} ${ROOT_GROUP} 0600
-
-INSTALLATION_DIRS=	${PREFIX}/share/phpldapadmin
+PAX_DIRS=	config doc htdocs lib locale templates tools
 
 # NOTE: If you're running apache under an account other than www or
 # are running a different web server under a specific user account
@@ -33,23 +38,35 @@ WWW_USER=	${APACHE_USER}
 .endif
 
 do-configure:
-	@${SED} -e "s|@LDAPADMINDIR@|${PREFIX}/share/phpldapadmin|g" \
+	${SED} -e "s|@LDAPADMINDIR@|${PREFIX}/share/phpldapadmin/htdocs|g" \
 		${FILESDIR}/phpldapadmin.conf > ${WRKDIR}/phpldapadmin.conf
 
 do-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/phpldapadmin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/phpldapadmin
+	${INSTALL_DATA_DIR} ${PREFIX}/share/phpldapadmin
 
-	${INSTALL_DATA} ${WRKSRC}/config.php.example \
+	${INSTALL_DATA} ${WRKSRC}/config/config.php.example \
 		${PREFIX}/share/examples/phpldapadmin
 	${INSTALL_DATA} ${WRKDIR}/phpldapadmin.conf \
 		${PREFIX}/share/examples/phpldapadmin
 
-	${INSTALL_DATA_DIR} ${PREFIX}/share/phpldapadmin
-	cd ${WRKSRC} && ${PAX}		\
-		-s /\.#//		\
-		-s /\.cvsignore//	\
-		-s /\.\*.orig//		\
-		-s /\.\*.example//	\
-		-rwppm . ${PREFIX}/share/phpldapadmin
+	${RM} ${WRKSRC}/.cvsignore
+	${RM} ${WRKSRC}/config/.cvsignore
+	${RM} ${WRKSRC}/config/config.php.example
+
+	${INSTALL_DATA} ${WRKSRC}/index.php ${PREFIX}/share/phpldapadmin
+
+.for i in ${PAX_DIRS}
+		@cd ${WRKSRC}/${i:Q} && ${PAX} \
+			-rwppm . ${PREFIX}/share/phpldapadmin/${i:Q}
+.endfor
+
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/phpldapadmin
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/phpldapadmin
+	${INSTALL_DATA} ${WRKSRC}/VERSION ${PREFIX}/share/phpldapadmin
+
+	${FIND} ${PREFIX}/share/doc/phpldapadmin -type d | \
+		${XARGS} ${CHMOD} ${PKGDIRMODE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/phpldapadmin/PLIST b/databases/phpldapadmin/PLIST
index 394365e1eda..065f1350945 100644
--- a/databases/phpldapadmin/PLIST
+++ b/databases/phpldapadmin/PLIST
@@ -1,399 +1,538 @@
-@comment $NetBSD: PLIST,v 1.5 2006/02/16 18:18:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/05/18 22:13:46 adrianp Exp $
+share/doc/phpldapadmin/INSTALL
+share/doc/phpldapadmin/LICENSE
 share/examples/phpldapadmin/config.php.example
 share/examples/phpldapadmin/phpldapadmin.conf
-share/phpldapadmin/INSTALL
-share/phpldapadmin/LICENSE
 share/phpldapadmin/VERSION
-share/phpldapadmin/add_attr.php
-share/phpldapadmin/add_attr_form.php
-share/phpldapadmin/add_oclass.php
-share/phpldapadmin/add_oclass_form.php
-share/phpldapadmin/add_value.php
-share/phpldapadmin/add_value_form.php
-share/phpldapadmin/blowfish.php
-share/phpldapadmin/check_lang_files.php
-share/phpldapadmin/collapse.php
-share/phpldapadmin/common.php
-share/phpldapadmin/compare.php
-share/phpldapadmin/compare_form.php
-share/phpldapadmin/copy.php
-share/phpldapadmin/copy_form.php
-share/phpldapadmin/create.php
-share/phpldapadmin/create_form.php
-share/phpldapadmin/creation_template.php
-share/phpldapadmin/custom_functions.php
-share/phpldapadmin/delete.php
-share/phpldapadmin/delete_attr.php
-share/phpldapadmin/delete_form.php
-share/phpldapadmin/doc/CREDITS
-share/phpldapadmin/doc/ChangeLog
-share/phpldapadmin/doc/INSTALL-de.txt
-share/phpldapadmin/doc/INSTALL-es.txt
-share/phpldapadmin/doc/INSTALL-fr.txt
 share/phpldapadmin/doc/README-translation.txt
-share/phpldapadmin/doc/hooks.sgml
 share/phpldapadmin/doc/pla-test-i18n.ldif
-share/phpldapadmin/doc/test_encoding.sh
-share/phpldapadmin/documentation.php
-share/phpldapadmin/donate.php
-share/phpldapadmin/download_binary_attr.php
-share/phpldapadmin/edit.php
-share/phpldapadmin/emuhash_functions.php
-share/phpldapadmin/entry_chooser.js
-share/phpldapadmin/entry_chooser.php
-share/phpldapadmin/expand.php
-share/phpldapadmin/export.php
-share/phpldapadmin/export_form.php
-share/phpldapadmin/export_functions.php
-share/phpldapadmin/functions.php
-share/phpldapadmin/generic_utils.js
-share/phpldapadmin/header.php
-share/phpldapadmin/help.php
-share/phpldapadmin/hooks.php
-share/phpldapadmin/ie_png_work_around.js
-share/phpldapadmin/images/add.png
-share/phpldapadmin/images/bug.png
-share/phpldapadmin/images/catalog.png
-share/phpldapadmin/images/children.png
-share/phpldapadmin/images/compare.png
-share/phpldapadmin/images/countries/af.png
-share/phpldapadmin/images/countries/al.png
-share/phpldapadmin/images/countries/am.png
-share/phpldapadmin/images/countries/an.png
-share/phpldapadmin/images/countries/ao.png
-share/phpldapadmin/images/countries/ar.png
-share/phpldapadmin/images/countries/at.png
-share/phpldapadmin/images/countries/au.png
-share/phpldapadmin/images/countries/aw.png
-share/phpldapadmin/images/countries/az.png
-share/phpldapadmin/images/countries/ba.png
-share/phpldapadmin/images/countries/bb.png
-share/phpldapadmin/images/countries/bd.png
-share/phpldapadmin/images/countries/be.png
-share/phpldapadmin/images/countries/bf.png
-share/phpldapadmin/images/countries/bg.png
-share/phpldapadmin/images/countries/bh.png
-share/phpldapadmin/images/countries/bi.png
-share/phpldapadmin/images/countries/bj.png
-share/phpldapadmin/images/countries/bm.png
-share/phpldapadmin/images/countries/bn.png
-share/phpldapadmin/images/countries/bo.png
-share/phpldapadmin/images/countries/br.png
-share/phpldapadmin/images/countries/bs.png
-share/phpldapadmin/images/countries/bt.png
-share/phpldapadmin/images/countries/bw.png
-share/phpldapadmin/images/countries/by.png
-share/phpldapadmin/images/countries/bz.png
-share/phpldapadmin/images/countries/ca.png
-share/phpldapadmin/images/countries/cf.png
-share/phpldapadmin/images/countries/cg.png
-share/phpldapadmin/images/countries/ch.png
-share/phpldapadmin/images/countries/ci.png
-share/phpldapadmin/images/countries/ck.png
-share/phpldapadmin/images/countries/cl.png
-share/phpldapadmin/images/countries/cm.png
-share/phpldapadmin/images/countries/cn.png
-share/phpldapadmin/images/countries/co.png
-share/phpldapadmin/images/countries/cr.png
-share/phpldapadmin/images/countries/cu.png
-share/phpldapadmin/images/countries/cv.png
-share/phpldapadmin/images/countries/cy.png
-share/phpldapadmin/images/countries/cz.png
-share/phpldapadmin/images/countries/de.png
-share/phpldapadmin/images/countries/dk.png
-share/phpldapadmin/images/countries/dz.png
-share/phpldapadmin/images/countries/ec.png
-share/phpldapadmin/images/countries/ee.png
-share/phpldapadmin/images/countries/eg.png
-share/phpldapadmin/images/countries/er.png
-share/phpldapadmin/images/countries/es.png
-share/phpldapadmin/images/countries/et.png
-share/phpldapadmin/images/countries/fi.png
-share/phpldapadmin/images/countries/fj.png
-share/phpldapadmin/images/countries/fo.png
-share/phpldapadmin/images/countries/fr.png
-share/phpldapadmin/images/countries/ga.png
-share/phpldapadmin/images/countries/gb.png
-share/phpldapadmin/images/countries/ge.png
-share/phpldapadmin/images/countries/gi.png
-share/phpldapadmin/images/countries/gl.png
-share/phpldapadmin/images/countries/gp.png
-share/phpldapadmin/images/countries/gr.png
-share/phpldapadmin/images/countries/gt.png
-share/phpldapadmin/images/countries/gu.png
-share/phpldapadmin/images/countries/gy.png
-share/phpldapadmin/images/countries/hk.png
-share/phpldapadmin/images/countries/hr.png
-share/phpldapadmin/images/countries/ht.png
-share/phpldapadmin/images/countries/hu.png
-share/phpldapadmin/images/countries/id.png
-share/phpldapadmin/images/countries/ie.png
-share/phpldapadmin/images/countries/il.png
-share/phpldapadmin/images/countries/in.png
-share/phpldapadmin/images/countries/iq.png
-share/phpldapadmin/images/countries/ir.png
-share/phpldapadmin/images/countries/is.png
-share/phpldapadmin/images/countries/it.png
-share/phpldapadmin/images/countries/jm.png
-share/phpldapadmin/images/countries/jo.png
-share/phpldapadmin/images/countries/jp.png
-share/phpldapadmin/images/countries/ke.png
-share/phpldapadmin/images/countries/kg.png
-share/phpldapadmin/images/countries/kh.png
-share/phpldapadmin/images/countries/ki.png
-share/phpldapadmin/images/countries/kp.png
-share/phpldapadmin/images/countries/kr.png
-share/phpldapadmin/images/countries/ky.png
-share/phpldapadmin/images/countries/kz.png
-share/phpldapadmin/images/countries/lb.png
-share/phpldapadmin/images/countries/lc.png
-share/phpldapadmin/images/countries/lk.png
-share/phpldapadmin/images/countries/lt.png
-share/phpldapadmin/images/countries/lu.png
-share/phpldapadmin/images/countries/lv.png
-share/phpldapadmin/images/countries/ly.png
-share/phpldapadmin/images/countries/ma.png
-share/phpldapadmin/images/countries/mc.png
-share/phpldapadmin/images/countries/md.png
-share/phpldapadmin/images/countries/mg.png
-share/phpldapadmin/images/countries/mn.png
-share/phpldapadmin/images/countries/mo.png
-share/phpldapadmin/images/countries/mp.png
-share/phpldapadmin/images/countries/ms.png
-share/phpldapadmin/images/countries/mt.png
-share/phpldapadmin/images/countries/mx.png
-share/phpldapadmin/images/countries/my.png
-share/phpldapadmin/images/countries/mz.png
-share/phpldapadmin/images/countries/na.png
-share/phpldapadmin/images/countries/nc.png
-share/phpldapadmin/images/countries/nf.png
-share/phpldapadmin/images/countries/nl.png
-share/phpldapadmin/images/countries/no.png
-share/phpldapadmin/images/countries/np.png
-share/phpldapadmin/images/countries/nr.png
-share/phpldapadmin/images/countries/nz.png
-share/phpldapadmin/images/countries/om.png
-share/phpldapadmin/images/countries/pa.png
-share/phpldapadmin/images/countries/pe.png
-share/phpldapadmin/images/countries/pf.png
-share/phpldapadmin/images/countries/ph.png
-share/phpldapadmin/images/countries/pk.png
-share/phpldapadmin/images/countries/pl.png
-share/phpldapadmin/images/countries/pm.png
-share/phpldapadmin/images/countries/pr.png
-share/phpldapadmin/images/countries/pt.png
-share/phpldapadmin/images/countries/py.png
-share/phpldapadmin/images/countries/qa.png
-share/phpldapadmin/images/countries/ro.png
-share/phpldapadmin/images/countries/ru.png
-share/phpldapadmin/images/countries/sa.png
-share/phpldapadmin/images/countries/sb.png
-share/phpldapadmin/images/countries/sd.png
-share/phpldapadmin/images/countries/se.png
-share/phpldapadmin/images/countries/sg.png
-share/phpldapadmin/images/countries/si.png
-share/phpldapadmin/images/countries/sk.png
-share/phpldapadmin/images/countries/sl.png
-share/phpldapadmin/images/countries/so.png
-share/phpldapadmin/images/countries/sr.png
-share/phpldapadmin/images/countries/sy.png
-share/phpldapadmin/images/countries/tc.png
-share/phpldapadmin/images/countries/tg.png
-share/phpldapadmin/images/countries/th.png
-share/phpldapadmin/images/countries/tn.png
-share/phpldapadmin/images/countries/to.png
-share/phpldapadmin/images/countries/tp.png
-share/phpldapadmin/images/countries/tr.png
-share/phpldapadmin/images/countries/tt.png
-share/phpldapadmin/images/countries/tv.png
-share/phpldapadmin/images/countries/tw.png
-share/phpldapadmin/images/countries/tz.png
-share/phpldapadmin/images/countries/ua.png
-share/phpldapadmin/images/countries/ug.png
-share/phpldapadmin/images/countries/us.png
-share/phpldapadmin/images/countries/uy.png
-share/phpldapadmin/images/countries/va.png
-share/phpldapadmin/images/countries/ve.png
-share/phpldapadmin/images/countries/vg.png
-share/phpldapadmin/images/countries/vi.png
-share/phpldapadmin/images/countries/vn.png
-share/phpldapadmin/images/countries/ws.png
-share/phpldapadmin/images/countries/ye.png
-share/phpldapadmin/images/countries/yu.png
-share/phpldapadmin/images/countries/za.png
-share/phpldapadmin/images/countries/zw.png
-share/phpldapadmin/images/country.png
-share/phpldapadmin/images/cut.png
-share/phpldapadmin/images/dc.png
-share/phpldapadmin/images/device.png
-share/phpldapadmin/images/document.png
-share/phpldapadmin/images/door.png
-share/phpldapadmin/images/files.png
-share/phpldapadmin/images/find.png
-share/phpldapadmin/images/folder.png
-share/phpldapadmin/images/go.png
-share/phpldapadmin/images/hard-drive.png
-share/phpldapadmin/images/help.png
-share/phpldapadmin/images/home.png
-share/phpldapadmin/images/host.png
-share/phpldapadmin/images/index.php
-share/phpldapadmin/images/info.png
-share/phpldapadmin/images/ldap-server.png
-share/phpldapadmin/images/light.png
-share/phpldapadmin/images/locality.png
-share/phpldapadmin/images/lock.png
-share/phpldapadmin/images/logo.jpg
-share/phpldapadmin/images/mail.png
-share/phpldapadmin/images/mail_account.png
-share/phpldapadmin/images/mail_alias.png
-share/phpldapadmin/images/minus.png
-share/phpldapadmin/images/move.png
-share/phpldapadmin/images/n.png
-share/phpldapadmin/images/network.png
-share/phpldapadmin/images/nt_machine.png
-share/phpldapadmin/images/nt_user.png
-share/phpldapadmin/images/o.png
-share/phpldapadmin/images/object.png
-share/phpldapadmin/images/ou.png
-share/phpldapadmin/images/paypal-donate.png
-share/phpldapadmin/images/phone.png
-share/phpldapadmin/images/photo.png
-share/phpldapadmin/images/plus.png
-share/phpldapadmin/images/process.png
-share/phpldapadmin/images/refresh.png
-share/phpldapadmin/images/rename.png
-share/phpldapadmin/images/save.png
-share/phpldapadmin/images/server-settings.png
-share/phpldapadmin/images/server-small.png
-share/phpldapadmin/images/server.png
-share/phpldapadmin/images/smile.png
-share/phpldapadmin/images/star.png
-share/phpldapadmin/images/terminal.png
-share/phpldapadmin/images/timeout.png
-share/phpldapadmin/images/tools-no.png
-share/phpldapadmin/images/tools.png
-share/phpldapadmin/images/trash.png
-share/phpldapadmin/images/uid.png
-share/phpldapadmin/images/uniquegroup.png
-share/phpldapadmin/images/unknown.png
-share/phpldapadmin/images/up.png
-share/phpldapadmin/images/user.png
-share/phpldapadmin/images/warning.png
-share/phpldapadmin/images/warning_small.png
+share/phpldapadmin/htdocs/add_attr.php
+share/phpldapadmin/htdocs/add_attr_form.php
+share/phpldapadmin/htdocs/add_oclass.php
+share/phpldapadmin/htdocs/add_oclass_form.php
+share/phpldapadmin/htdocs/add_value.php
+share/phpldapadmin/htdocs/add_value_form.php
+share/phpldapadmin/htdocs/collapse.php
+share/phpldapadmin/htdocs/common.php
+share/phpldapadmin/htdocs/compare.php
+share/phpldapadmin/htdocs/compare_form.php
+share/phpldapadmin/htdocs/copy.php
+share/phpldapadmin/htdocs/copy_form.php
+share/phpldapadmin/htdocs/create.php
+share/phpldapadmin/htdocs/create_form.php
+share/phpldapadmin/htdocs/css/style.css
+share/phpldapadmin/htdocs/delete.php
+share/phpldapadmin/htdocs/delete_attr.php
+share/phpldapadmin/htdocs/delete_form.php
+share/phpldapadmin/htdocs/download_binary_attr.php
+share/phpldapadmin/htdocs/entry_chooser.php
+share/phpldapadmin/htdocs/expand.php
+share/phpldapadmin/htdocs/export.php
+share/phpldapadmin/htdocs/export_form.php
+share/phpldapadmin/htdocs/header.php
+share/phpldapadmin/htdocs/help.php
+share/phpldapadmin/htdocs/images/add.png
+share/phpldapadmin/htdocs/images/bug.png
+share/phpldapadmin/htdocs/images/calendar.png
+share/phpldapadmin/htdocs/images/catalog.png
+share/phpldapadmin/htdocs/images/children.png
+share/phpldapadmin/htdocs/images/compare.png
+share/phpldapadmin/htdocs/images/countries/af.png
+share/phpldapadmin/htdocs/images/countries/al.png
+share/phpldapadmin/htdocs/images/countries/am.png
+share/phpldapadmin/htdocs/images/countries/an.png
+share/phpldapadmin/htdocs/images/countries/ao.png
+share/phpldapadmin/htdocs/images/countries/ar.png
+share/phpldapadmin/htdocs/images/countries/at.png
+share/phpldapadmin/htdocs/images/countries/au.png
+share/phpldapadmin/htdocs/images/countries/aw.png
+share/phpldapadmin/htdocs/images/countries/az.png
+share/phpldapadmin/htdocs/images/countries/ba.png
+share/phpldapadmin/htdocs/images/countries/bb.png
+share/phpldapadmin/htdocs/images/countries/bd.png
+share/phpldapadmin/htdocs/images/countries/be.png
+share/phpldapadmin/htdocs/images/countries/bf.png
+share/phpldapadmin/htdocs/images/countries/bg.png
+share/phpldapadmin/htdocs/images/countries/bh.png
+share/phpldapadmin/htdocs/images/countries/bi.png
+share/phpldapadmin/htdocs/images/countries/bj.png
+share/phpldapadmin/htdocs/images/countries/bm.png
+share/phpldapadmin/htdocs/images/countries/bn.png
+share/phpldapadmin/htdocs/images/countries/bo.png
+share/phpldapadmin/htdocs/images/countries/br.png
+share/phpldapadmin/htdocs/images/countries/bs.png
+share/phpldapadmin/htdocs/images/countries/bt.png
+share/phpldapadmin/htdocs/images/countries/bw.png
+share/phpldapadmin/htdocs/images/countries/by.png
+share/phpldapadmin/htdocs/images/countries/bz.png
+share/phpldapadmin/htdocs/images/countries/ca.png
+share/phpldapadmin/htdocs/images/countries/cf.png
+share/phpldapadmin/htdocs/images/countries/cg.png
+share/phpldapadmin/htdocs/images/countries/ch.png
+share/phpldapadmin/htdocs/images/countries/ci.png
+share/phpldapadmin/htdocs/images/countries/ck.png
+share/phpldapadmin/htdocs/images/countries/cl.png
+share/phpldapadmin/htdocs/images/countries/cm.png
+share/phpldapadmin/htdocs/images/countries/cn.png
+share/phpldapadmin/htdocs/images/countries/co.png
+share/phpldapadmin/htdocs/images/countries/cr.png
+share/phpldapadmin/htdocs/images/countries/cu.png
+share/phpldapadmin/htdocs/images/countries/cv.png
+share/phpldapadmin/htdocs/images/countries/cy.png
+share/phpldapadmin/htdocs/images/countries/cz.png
+share/phpldapadmin/htdocs/images/countries/de.png
+share/phpldapadmin/htdocs/images/countries/dk.png
+share/phpldapadmin/htdocs/images/countries/dz.png
+share/phpldapadmin/htdocs/images/countries/ec.png
+share/phpldapadmin/htdocs/images/countries/ee.png
+share/phpldapadmin/htdocs/images/countries/eg.png
+share/phpldapadmin/htdocs/images/countries/er.png
+share/phpldapadmin/htdocs/images/countries/es.png
+share/phpldapadmin/htdocs/images/countries/et.png
+share/phpldapadmin/htdocs/images/countries/fi.png
+share/phpldapadmin/htdocs/images/countries/fj.png
+share/phpldapadmin/htdocs/images/countries/fo.png
+share/phpldapadmin/htdocs/images/countries/fr.png
+share/phpldapadmin/htdocs/images/countries/ga.png
+share/phpldapadmin/htdocs/images/countries/gb.png
+share/phpldapadmin/htdocs/images/countries/ge.png
+share/phpldapadmin/htdocs/images/countries/gi.png
+share/phpldapadmin/htdocs/images/countries/gl.png
+share/phpldapadmin/htdocs/images/countries/gp.png
+share/phpldapadmin/htdocs/images/countries/gr.png
+share/phpldapadmin/htdocs/images/countries/gt.png
+share/phpldapadmin/htdocs/images/countries/gu.png
+share/phpldapadmin/htdocs/images/countries/gy.png
+share/phpldapadmin/htdocs/images/countries/hk.png
+share/phpldapadmin/htdocs/images/countries/hr.png
+share/phpldapadmin/htdocs/images/countries/ht.png
+share/phpldapadmin/htdocs/images/countries/hu.png
+share/phpldapadmin/htdocs/images/countries/id.png
+share/phpldapadmin/htdocs/images/countries/ie.png
+share/phpldapadmin/htdocs/images/countries/il.png
+share/phpldapadmin/htdocs/images/countries/in.png
+share/phpldapadmin/htdocs/images/countries/iq.png
+share/phpldapadmin/htdocs/images/countries/ir.png
+share/phpldapadmin/htdocs/images/countries/is.png
+share/phpldapadmin/htdocs/images/countries/it.png
+share/phpldapadmin/htdocs/images/countries/jm.png
+share/phpldapadmin/htdocs/images/countries/jo.png
+share/phpldapadmin/htdocs/images/countries/jp.png
+share/phpldapadmin/htdocs/images/countries/ke.png
+share/phpldapadmin/htdocs/images/countries/kg.png
+share/phpldapadmin/htdocs/images/countries/kh.png
+share/phpldapadmin/htdocs/images/countries/ki.png
+share/phpldapadmin/htdocs/images/countries/kp.png
+share/phpldapadmin/htdocs/images/countries/kr.png
+share/phpldapadmin/htdocs/images/countries/ky.png
+share/phpldapadmin/htdocs/images/countries/kz.png
+share/phpldapadmin/htdocs/images/countries/lb.png
+share/phpldapadmin/htdocs/images/countries/lc.png
+share/phpldapadmin/htdocs/images/countries/lk.png
+share/phpldapadmin/htdocs/images/countries/lt.png
+share/phpldapadmin/htdocs/images/countries/lu.png
+share/phpldapadmin/htdocs/images/countries/lv.png
+share/phpldapadmin/htdocs/images/countries/ly.png
+share/phpldapadmin/htdocs/images/countries/ma.png
+share/phpldapadmin/htdocs/images/countries/mc.png
+share/phpldapadmin/htdocs/images/countries/md.png
+share/phpldapadmin/htdocs/images/countries/mg.png
+share/phpldapadmin/htdocs/images/countries/mn.png
+share/phpldapadmin/htdocs/images/countries/mo.png
+share/phpldapadmin/htdocs/images/countries/mp.png
+share/phpldapadmin/htdocs/images/countries/ms.png
+share/phpldapadmin/htdocs/images/countries/mt.png
+share/phpldapadmin/htdocs/images/countries/mx.png
+share/phpldapadmin/htdocs/images/countries/my.png
+share/phpldapadmin/htdocs/images/countries/mz.png
+share/phpldapadmin/htdocs/images/countries/na.png
+share/phpldapadmin/htdocs/images/countries/nc.png
+share/phpldapadmin/htdocs/images/countries/nf.png
+share/phpldapadmin/htdocs/images/countries/nl.png
+share/phpldapadmin/htdocs/images/countries/no.png
+share/phpldapadmin/htdocs/images/countries/np.png
+share/phpldapadmin/htdocs/images/countries/nr.png
+share/phpldapadmin/htdocs/images/countries/nz.png
+share/phpldapadmin/htdocs/images/countries/om.png
+share/phpldapadmin/htdocs/images/countries/pa.png
+share/phpldapadmin/htdocs/images/countries/pe.png
+share/phpldapadmin/htdocs/images/countries/pf.png
+share/phpldapadmin/htdocs/images/countries/ph.png
+share/phpldapadmin/htdocs/images/countries/pk.png
+share/phpldapadmin/htdocs/images/countries/pl.png
+share/phpldapadmin/htdocs/images/countries/pm.png
+share/phpldapadmin/htdocs/images/countries/pr.png
+share/phpldapadmin/htdocs/images/countries/pt.png
+share/phpldapadmin/htdocs/images/countries/py.png
+share/phpldapadmin/htdocs/images/countries/qa.png
+share/phpldapadmin/htdocs/images/countries/ro.png
+share/phpldapadmin/htdocs/images/countries/ru.png
+share/phpldapadmin/htdocs/images/countries/sa.png
+share/phpldapadmin/htdocs/images/countries/sb.png
+share/phpldapadmin/htdocs/images/countries/sd.png
+share/phpldapadmin/htdocs/images/countries/se.png
+share/phpldapadmin/htdocs/images/countries/sg.png
+share/phpldapadmin/htdocs/images/countries/si.png
+share/phpldapadmin/htdocs/images/countries/sk.png
+share/phpldapadmin/htdocs/images/countries/sl.png
+share/phpldapadmin/htdocs/images/countries/so.png
+share/phpldapadmin/htdocs/images/countries/sr.png
+share/phpldapadmin/htdocs/images/countries/sy.png
+share/phpldapadmin/htdocs/images/countries/tc.png
+share/phpldapadmin/htdocs/images/countries/tg.png
+share/phpldapadmin/htdocs/images/countries/th.png
+share/phpldapadmin/htdocs/images/countries/tn.png
+share/phpldapadmin/htdocs/images/countries/to.png
+share/phpldapadmin/htdocs/images/countries/tp.png
+share/phpldapadmin/htdocs/images/countries/tr.png
+share/phpldapadmin/htdocs/images/countries/tt.png
+share/phpldapadmin/htdocs/images/countries/tv.png
+share/phpldapadmin/htdocs/images/countries/tw.png
+share/phpldapadmin/htdocs/images/countries/tz.png
+share/phpldapadmin/htdocs/images/countries/ua.png
+share/phpldapadmin/htdocs/images/countries/ug.png
+share/phpldapadmin/htdocs/images/countries/us.png
+share/phpldapadmin/htdocs/images/countries/uy.png
+share/phpldapadmin/htdocs/images/countries/va.png
+share/phpldapadmin/htdocs/images/countries/ve.png
+share/phpldapadmin/htdocs/images/countries/vg.png
+share/phpldapadmin/htdocs/images/countries/vi.png
+share/phpldapadmin/htdocs/images/countries/vn.png
+share/phpldapadmin/htdocs/images/countries/ws.png
+share/phpldapadmin/htdocs/images/countries/ye.png
+share/phpldapadmin/htdocs/images/countries/yu.png
+share/phpldapadmin/htdocs/images/countries/za.png
+share/phpldapadmin/htdocs/images/countries/zw.png
+share/phpldapadmin/htdocs/images/country.png
+share/phpldapadmin/htdocs/images/cut.png
+share/phpldapadmin/htdocs/images/dc.png
+share/phpldapadmin/htdocs/images/device.png
+share/phpldapadmin/htdocs/images/document.png
+share/phpldapadmin/htdocs/images/door.png
+share/phpldapadmin/htdocs/images/error.png
+share/phpldapadmin/htdocs/images/files.png
+share/phpldapadmin/htdocs/images/find.png
+share/phpldapadmin/htdocs/images/folder.png
+share/phpldapadmin/htdocs/images/go.png
+share/phpldapadmin/htdocs/images/hard-drive.png
+share/phpldapadmin/htdocs/images/help.png
+share/phpldapadmin/htdocs/images/home.png
+share/phpldapadmin/htdocs/images/host.png
+share/phpldapadmin/htdocs/images/index.php
+share/phpldapadmin/htdocs/images/info.png
+share/phpldapadmin/htdocs/images/ldap-server.png
+share/phpldapadmin/htdocs/images/light.png
+share/phpldapadmin/htdocs/images/locality.png
+share/phpldapadmin/htdocs/images/lock.png
+share/phpldapadmin/htdocs/images/logo.jpg
+share/phpldapadmin/htdocs/images/logo_small.jpg
+share/phpldapadmin/htdocs/images/mail.png
+share/phpldapadmin/htdocs/images/mail_account.png
+share/phpldapadmin/htdocs/images/mail_alias.png
+share/phpldapadmin/htdocs/images/minus.png
+share/phpldapadmin/htdocs/images/move.png
+share/phpldapadmin/htdocs/images/n.png
+share/phpldapadmin/htdocs/images/network.png
+share/phpldapadmin/htdocs/images/nogo.png
+share/phpldapadmin/htdocs/images/nt_machine.png
+share/phpldapadmin/htdocs/images/nt_user.png
+share/phpldapadmin/htdocs/images/o.png
+share/phpldapadmin/htdocs/images/object.png
+share/phpldapadmin/htdocs/images/ou.png
+share/phpldapadmin/htdocs/images/paypal-donate.png
+share/phpldapadmin/htdocs/images/phone.png
+share/phpldapadmin/htdocs/images/photo.png
+share/phpldapadmin/htdocs/images/plus.png
+share/phpldapadmin/htdocs/images/process.png
+share/phpldapadmin/htdocs/images/refresh.png
+share/phpldapadmin/htdocs/images/rename.png
+share/phpldapadmin/htdocs/images/rfc.png
+share/phpldapadmin/htdocs/images/save.png
+share/phpldapadmin/htdocs/images/server-settings.png
+share/phpldapadmin/htdocs/images/server-small.png
+share/phpldapadmin/htdocs/images/server.png
+share/phpldapadmin/htdocs/images/smile.png
+share/phpldapadmin/htdocs/images/star.png
+share/phpldapadmin/htdocs/images/terminal.png
+share/phpldapadmin/htdocs/images/timeout.png
+share/phpldapadmin/htdocs/images/tools-no.png
+share/phpldapadmin/htdocs/images/tools.png
+share/phpldapadmin/htdocs/images/trash.png
+share/phpldapadmin/htdocs/images/uid.png
+share/phpldapadmin/htdocs/images/uniquegroup.png
+share/phpldapadmin/htdocs/images/unknown.png
+share/phpldapadmin/htdocs/images/up.png
+share/phpldapadmin/htdocs/images/user.png
+share/phpldapadmin/htdocs/images/warning.png
+share/phpldapadmin/htdocs/images/warning_small.png
+share/phpldapadmin/htdocs/index.php
+share/phpldapadmin/htdocs/js/date_selector.js
+share/phpldapadmin/htdocs/js/entry_chooser.js
+share/phpldapadmin/htdocs/js/generic_utils.js
+share/phpldapadmin/htdocs/js/ie_png_work_around.js
+share/phpldapadmin/htdocs/js/jscalendar/README
+share/phpldapadmin/htdocs/js/jscalendar/calendar-blue.css
+share/phpldapadmin/htdocs/js/jscalendar/calendar-blue2.css
+share/phpldapadmin/htdocs/js/jscalendar/calendar-brown.css
+share/phpldapadmin/htdocs/js/jscalendar/calendar-green.css
+share/phpldapadmin/htdocs/js/jscalendar/calendar-setup.js
+share/phpldapadmin/htdocs/js/jscalendar/calendar-setup_stripped.js
+share/phpldapadmin/htdocs/js/jscalendar/calendar-system.css
+share/phpldapadmin/htdocs/js/jscalendar/calendar-tas.css
+share/phpldapadmin/htdocs/js/jscalendar/calendar-win2k-1.css
+share/phpldapadmin/htdocs/js/jscalendar/calendar-win2k-2.css
+share/phpldapadmin/htdocs/js/jscalendar/calendar-win2k-cold-1.css
+share/phpldapadmin/htdocs/js/jscalendar/calendar-win2k-cold-2.css
+share/phpldapadmin/htdocs/js/jscalendar/calendar.js
+share/phpldapadmin/htdocs/js/jscalendar/calendar.php
+share/phpldapadmin/htdocs/js/jscalendar/calendar_stripped.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-af.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-al.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-bg.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-big5-utf8.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-big5.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-br.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-ca.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-cs-utf8.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-cs-win.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-da.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-de.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-du.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-el.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-en.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-es.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-fi.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-fr.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-he-utf8.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-hr-utf8.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-hr.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-hu.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-it.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-jp.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-ko-utf8.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-ko.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-lt-utf8.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-lt.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-lv.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-nl.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-no.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-pl-utf8.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-pl.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-pt.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-ro.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-ru.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-ru_win_.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-si.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-sk.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-sp.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-sv.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-tr.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/calendar-zh.js
+share/phpldapadmin/htdocs/js/jscalendar/lang/cn_utf8.js
+share/phpldapadmin/htdocs/js/jscalendar/menuarrow.gif
+share/phpldapadmin/htdocs/js/jscalendar/menuarrow2.gif
+share/phpldapadmin/htdocs/js/jscalendar/skins/aqua/active-bg.gif
+share/phpldapadmin/htdocs/js/jscalendar/skins/aqua/dark-bg.gif
+share/phpldapadmin/htdocs/js/jscalendar/skins/aqua/hover-bg.gif
+share/phpldapadmin/htdocs/js/jscalendar/skins/aqua/menuarrow.gif
+share/phpldapadmin/htdocs/js/jscalendar/skins/aqua/normal-bg.gif
+share/phpldapadmin/htdocs/js/jscalendar/skins/aqua/rowhover-bg.gif
+share/phpldapadmin/htdocs/js/jscalendar/skins/aqua/status-bg.gif
+share/phpldapadmin/htdocs/js/jscalendar/skins/aqua/theme.css
+share/phpldapadmin/htdocs/js/jscalendar/skins/aqua/title-bg.gif
+share/phpldapadmin/htdocs/js/jscalendar/skins/aqua/today-bg.gif
+share/phpldapadmin/htdocs/js/phplayersmenu/COPYING
+share/phpldapadmin/htdocs/js/phplayersmenu/LICENSE
+share/phpldapadmin/htdocs/js/phplayersmenu/layerstreemenu.css
+share/phpldapadmin/htdocs/js/phplayersmenu/lib/PHPLIB.php
+share/phpldapadmin/htdocs/js/phplayersmenu/lib/layersmenu-common.inc.php
+share/phpldapadmin/htdocs/js/phplayersmenu/lib/treemenu.inc.php
+share/phpldapadmin/htdocs/js/phplayersmenu/libjs/layersmenu-browser_detection.js
+share/phpldapadmin/htdocs/js/phplayersmenu/libjs/layerstreemenu-cookies.js
+share/phpldapadmin/htdocs/js/phplayersmenu/libjs/layerstreemenu.ijs
+share/phpldapadmin/htdocs/js/phplayersmenu/menuimages/tree_collapse.png
+share/phpldapadmin/htdocs/js/phplayersmenu/menuimages/tree_collapse_corner.png
+share/phpldapadmin/htdocs/js/phplayersmenu/menuimages/tree_collapse_corner_first.png
+share/phpldapadmin/htdocs/js/phplayersmenu/menuimages/tree_collapse_first.png
+share/phpldapadmin/htdocs/js/phplayersmenu/menuimages/tree_corner.png
+share/phpldapadmin/htdocs/js/phplayersmenu/menuimages/tree_expand.png
+share/phpldapadmin/htdocs/js/phplayersmenu/menuimages/tree_expand_corner.png
+share/phpldapadmin/htdocs/js/phplayersmenu/menuimages/tree_expand_corner_first.png
+share/phpldapadmin/htdocs/js/phplayersmenu/menuimages/tree_expand_first.png
+share/phpldapadmin/htdocs/js/phplayersmenu/menuimages/tree_folder_closed.png
+share/phpldapadmin/htdocs/js/phplayersmenu/menuimages/tree_folder_open.png
+share/phpldapadmin/htdocs/js/phplayersmenu/menuimages/tree_leaf.png
+share/phpldapadmin/htdocs/js/phplayersmenu/menuimages/tree_space.png
+share/phpldapadmin/htdocs/js/phplayersmenu/menuimages/tree_split.png
+share/phpldapadmin/htdocs/js/phplayersmenu/menuimages/tree_split_first.png
+share/phpldapadmin/htdocs/js/phplayersmenu/menuimages/tree_vertline.png
+share/phpldapadmin/htdocs/js/search_util.js
+share/phpldapadmin/htdocs/ldif_import.php
+share/phpldapadmin/htdocs/ldif_import_form.php
+share/phpldapadmin/htdocs/login.php
+share/phpldapadmin/htdocs/login_form.php
+share/phpldapadmin/htdocs/logout.php
+share/phpldapadmin/htdocs/mass_delete.php
+share/phpldapadmin/htdocs/password_checker.php
+share/phpldapadmin/htdocs/purge_cache.php
+share/phpldapadmin/htdocs/rdelete.php
+share/phpldapadmin/htdocs/refresh.php
+share/phpldapadmin/htdocs/rename.php
+share/phpldapadmin/htdocs/rename_form.php
+share/phpldapadmin/htdocs/schema.php
+share/phpldapadmin/htdocs/search.php
+share/phpldapadmin/htdocs/server_info.php
+share/phpldapadmin/htdocs/template_engine.php
+share/phpldapadmin/htdocs/timeout.php
+share/phpldapadmin/htdocs/tree.php
+share/phpldapadmin/htdocs/update.php
+share/phpldapadmin/htdocs/update_confirm.php
+share/phpldapadmin/htdocs/view_jpeg_photo.php
+share/phpldapadmin/htdocs/welcome.php
 share/phpldapadmin/index.php
-share/phpldapadmin/lang/Makefile
-share/phpldapadmin/lang/auto.php
-share/phpldapadmin/lang/ca.php
-share/phpldapadmin/lang/cz.php
-share/phpldapadmin/lang/de.php
-share/phpldapadmin/lang/en.php
-share/phpldapadmin/lang/es.php
-share/phpldapadmin/lang/fr.php
-share/phpldapadmin/lang/hu.php
-share/phpldapadmin/lang/it.php
-share/phpldapadmin/lang/ja.php
-share/phpldapadmin/lang/nl.php
-share/phpldapadmin/lang/pl.php
-share/phpldapadmin/lang/pt-br.php
-share/phpldapadmin/lang/recoded/auto.php
-share/phpldapadmin/lang/recoded/ca.php
-share/phpldapadmin/lang/recoded/cz.php
-share/phpldapadmin/lang/recoded/de.php
-share/phpldapadmin/lang/recoded/en.php
-share/phpldapadmin/lang/recoded/es.php
-share/phpldapadmin/lang/recoded/fr.php
-share/phpldapadmin/lang/recoded/hu.php
-share/phpldapadmin/lang/recoded/it.php
-share/phpldapadmin/lang/recoded/ja.php
-share/phpldapadmin/lang/recoded/nl.php
-share/phpldapadmin/lang/recoded/pl.php
-share/phpldapadmin/lang/recoded/pt-br.php
-share/phpldapadmin/lang/recoded/ru.php
-share/phpldapadmin/lang/recoded/sv.php
-share/phpldapadmin/lang/recoded/zh-cn.php
-share/phpldapadmin/lang/recoded/zh-tw.php
-share/phpldapadmin/lang/recoded/zz.php
-share/phpldapadmin/lang/recoded/zzz.php
-share/phpldapadmin/lang/ru.php
-share/phpldapadmin/lang/sv.php
-share/phpldapadmin/lang/zh-cn.php
-share/phpldapadmin/lang/zh-tw.php
-share/phpldapadmin/lang/zz.php
-share/phpldapadmin/lang/zzz.php
-share/phpldapadmin/ldap_error_codes.txt
-share/phpldapadmin/ldap_supported_oids.txt
-share/phpldapadmin/ldif_functions.php
-share/phpldapadmin/ldif_import.php
-share/phpldapadmin/ldif_import_form.php
-share/phpldapadmin/login.php
-share/phpldapadmin/login_form.php
-share/phpldapadmin/logout.php
-share/phpldapadmin/mass_delete.php
-share/phpldapadmin/password_checker.php
-share/phpldapadmin/purge_cache.php
-share/phpldapadmin/rdelete.php
-share/phpldapadmin/refresh.php
-share/phpldapadmin/rename.php
-share/phpldapadmin/rename_form.php
-share/phpldapadmin/schema.php
-share/phpldapadmin/schema_functions.php
-share/phpldapadmin/search.php
-share/phpldapadmin/search_form_advanced.php
-share/phpldapadmin/search_form_predefined.php
-share/phpldapadmin/search_form_simple.php
-share/phpldapadmin/search_results_list.php
-share/phpldapadmin/search_results_table.php
-share/phpldapadmin/search_util.js
-share/phpldapadmin/server_functions.php
-share/phpldapadmin/server_info.php
-share/phpldapadmin/session_functions.php
-share/phpldapadmin/style.css
-share/phpldapadmin/syslog.php
+share/phpldapadmin/lib/blowfish.php
+share/phpldapadmin/lib/common.php
+share/phpldapadmin/lib/config_default.php
+share/phpldapadmin/lib/createlm.php
+share/phpldapadmin/lib/emuhash_functions.php
+share/phpldapadmin/lib/export_functions.php
+share/phpldapadmin/lib/functions.php
+share/phpldapadmin/lib/hooks.php
+share/phpldapadmin/lib/ldap_error_codes.txt
+share/phpldapadmin/lib/ldap_supported_oids.txt
+share/phpldapadmin/lib/ldif_functions.php
+share/phpldapadmin/lib/schema_functions.php
+share/phpldapadmin/lib/search_form_advanced.php
+share/phpldapadmin/lib/search_form_predefined.php
+share/phpldapadmin/lib/search_form_simple.php
+share/phpldapadmin/lib/search_results_list.php
+share/phpldapadmin/lib/search_results_table.php
+share/phpldapadmin/lib/server_functions.php
+share/phpldapadmin/lib/session_functions.php
+share/phpldapadmin/lib/syslog.php
+share/phpldapadmin/lib/template_functions.php
+share/phpldapadmin/lib/timeout_functions.php
+share/phpldapadmin/lib/tree_functions.php
+share/phpldapadmin/locale/ca_ES/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/ca_ES/LC_MESSAGES/messages.po
+share/phpldapadmin/locale/cs_CZ/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/cs_CZ/LC_MESSAGES/messages.po
+share/phpldapadmin/locale/de_DE/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/de_DE/LC_MESSAGES/messages.po
+share/phpldapadmin/locale/es_ES/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/es_ES/LC_MESSAGES/messages.po
+share/phpldapadmin/locale/fr_FR/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/fr_FR/LC_MESSAGES/messages.po
+share/phpldapadmin/locale/hu_HU/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/hu_HU/LC_MESSAGES/messages.po
+share/phpldapadmin/locale/it_IT/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/it_IT/LC_MESSAGES/messages.po
+share/phpldapadmin/locale/ja_JP/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/ja_JP/LC_MESSAGES/messages.po
+share/phpldapadmin/locale/nl_BE/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/nl_BE/LC_MESSAGES/messages.po
+share/phpldapadmin/locale/pl_PL/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/pl_PL/LC_MESSAGES/messages.po
+share/phpldapadmin/locale/pt_BR/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/pt_BR/LC_MESSAGES/messages.po
+share/phpldapadmin/locale/ru_RU/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/ru_RU/LC_MESSAGES/messages.po
+share/phpldapadmin/locale/sv_FI/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/sv_FI/LC_MESSAGES/messages.po
+share/phpldapadmin/locale/zh_CN/LC_MESSAGES/messages.po
+share/phpldapadmin/locale/zh_TW/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/zh_TW/LC_MESSAGES/messages.po
+share/phpldapadmin/templates/SUSE-posixGroup.xml
+share/phpldapadmin/templates/SUSE-sambaGroupMapping.xml
+share/phpldapadmin/templates/alias.xml
+share/phpldapadmin/templates/courierMailAccount.xml
+share/phpldapadmin/templates/courierMailAlias.xml
 share/phpldapadmin/templates/creation/custom.php
-share/phpldapadmin/templates/creation/new_address_template.php
-share/phpldapadmin/templates/creation/new_alias_template.php
-share/phpldapadmin/templates/creation/new_dns_entry.php
-share/phpldapadmin/templates/creation/new_kolab_template.php
-share/phpldapadmin/templates/creation/new_mozillaOrgPerson_template.php
-share/phpldapadmin/templates/creation/new_nt_machine.php
-share/phpldapadmin/templates/creation/new_organizationalRole.php
-share/phpldapadmin/templates/creation/new_ou_template.php
-share/phpldapadmin/templates/creation/new_posix_group_template.php
-share/phpldapadmin/templates/creation/new_postfix_account_template.php
-share/phpldapadmin/templates/creation/new_postfix_alias_template.php
-share/phpldapadmin/templates/creation/new_security_object_template.php
-share/phpldapadmin/templates/creation/new_sendmail_alias_template.php
-share/phpldapadmin/templates/creation/new_sendmail_cluster_template.php
-share/phpldapadmin/templates/creation/new_sendmail_domain_template.php
-share/phpldapadmin/templates/creation/new_sendmail_relay_template.php
-share/phpldapadmin/templates/creation/new_sendmail_virthost_template.php
-share/phpldapadmin/templates/creation/new_sendmail_virtuser_template.php
-share/phpldapadmin/templates/creation/new_smb3_nt_machine.php
-share/phpldapadmin/templates/creation/new_smb3_user_template.php
-share/phpldapadmin/templates/creation/new_smbgroup_template.php
-share/phpldapadmin/templates/creation/new_smbuser_template.php
-share/phpldapadmin/templates/creation/new_user_template.php
-share/phpldapadmin/templates/modification/default.php
-share/phpldapadmin/templates/modification/group_of_names.php
-share/phpldapadmin/templates/modification/samba_account.php
-share/phpldapadmin/templates/modification/user.php
-share/phpldapadmin/templates/template_config.php
-share/phpldapadmin/timeout.php
-share/phpldapadmin/timeout_functions.php
-share/phpldapadmin/tree.php
-share/phpldapadmin/tree_functions.php
-share/phpldapadmin/unit_test.php
-share/phpldapadmin/update.php
-share/phpldapadmin/update_confirm.php
-share/phpldapadmin/view_jpeg_photo.php
-share/phpldapadmin/welcome.php
-@dirrm share/phpldapadmin/templates/modification
+share/phpldapadmin/templates/dNSDomain.xml
+share/phpldapadmin/templates/example.xml
+share/phpldapadmin/templates/inetOrgPerson.xml
+share/phpldapadmin/templates/kolabPerson.xml
+share/phpldapadmin/templates/mozillaOrgPerson.xml
+share/phpldapadmin/templates/organizationalRole.xml
+share/phpldapadmin/templates/ou.xml
+share/phpldapadmin/templates/posixAccount.xml
+share/phpldapadmin/templates/posixGroup.xml
+share/phpldapadmin/templates/sambaDomain.xml
+share/phpldapadmin/templates/sambaGroupMapping.xml
+share/phpldapadmin/templates/sambaMachine.xml
+share/phpldapadmin/templates/sambaSamAccount.xml
+share/phpldapadmin/templates/sendmailMTAAliasObject.xml
+share/phpldapadmin/templates/sendmailMTAClass.xml
+share/phpldapadmin/templates/sendmailMTACluster.xml
+share/phpldapadmin/templates/sendmailMTAMapObject.xml
+share/phpldapadmin/templates/sendmailVirtualDomain.xml
+share/phpldapadmin/templates/sendmailVirtualUser.xml
+share/phpldapadmin/templates/simpleSecurityObject.xml
+share/phpldapadmin/templates/template.dtd
+share/phpldapadmin/templates/template_header.php
+share/phpldapadmin/tools/po/make_all
+share/phpldapadmin/tools/po/make_mo
+share/phpldapadmin/tools/po/make_po
+share/phpldapadmin/tools/po/make_po_ca
+share/phpldapadmin/tools/po/make_po_de
+share/phpldapadmin/tools/po/make_po_es
+share/phpldapadmin/tools/po/make_po_fr
+share/phpldapadmin/tools/po/make_po_hu
+share/phpldapadmin/tools/po/make_po_it
+share/phpldapadmin/tools/po/make_po_ja
+share/phpldapadmin/tools/po/messages.header
+share/phpldapadmin/tools/unit_test.php
+@dirrm share/phpldapadmin/tools/po
+@dirrm share/phpldapadmin/tools
 @dirrm share/phpldapadmin/templates/creation
 @dirrm share/phpldapadmin/templates
-@dirrm share/phpldapadmin/lang/recoded
-@dirrm share/phpldapadmin/lang
-@dirrm share/phpldapadmin/images/countries
-@dirrm share/phpldapadmin/images
+@dirrm share/phpldapadmin/locale/zh_TW/LC_MESSAGES
+@dirrm share/phpldapadmin/locale/zh_TW
+@dirrm share/phpldapadmin/locale/zh_CN/LC_MESSAGES
+@dirrm share/phpldapadmin/locale/zh_CN
+@dirrm share/phpldapadmin/locale/sv_FI/LC_MESSAGES
+@dirrm share/phpldapadmin/locale/sv_FI
+@dirrm share/phpldapadmin/locale/ru_RU/LC_MESSAGES
+@dirrm share/phpldapadmin/locale/ru_RU
+@dirrm share/phpldapadmin/locale/pt_BR/LC_MESSAGES
+@dirrm share/phpldapadmin/locale/pt_BR
+@dirrm share/phpldapadmin/locale/pl_PL/LC_MESSAGES
+@dirrm share/phpldapadmin/locale/pl_PL
+@dirrm share/phpldapadmin/locale/nl_BE/LC_MESSAGES
+@dirrm share/phpldapadmin/locale/nl_BE
+@dirrm share/phpldapadmin/locale/ja_JP/LC_MESSAGES
+@dirrm share/phpldapadmin/locale/ja_JP
+@dirrm share/phpldapadmin/locale/it_IT/LC_MESSAGES
+@dirrm share/phpldapadmin/locale/it_IT
+@dirrm share/phpldapadmin/locale/hu_HU/LC_MESSAGES
+@dirrm share/phpldapadmin/locale/hu_HU
+@dirrm share/phpldapadmin/locale/fr_FR/LC_MESSAGES
+@dirrm share/phpldapadmin/locale/fr_FR
+@dirrm share/phpldapadmin/locale/es_ES/LC_MESSAGES
+@dirrm share/phpldapadmin/locale/es_ES
+@dirrm share/phpldapadmin/locale/de_DE/LC_MESSAGES
+@dirrm share/phpldapadmin/locale/de_DE
+@dirrm share/phpldapadmin/locale/cs_CZ/LC_MESSAGES
+@dirrm share/phpldapadmin/locale/cs_CZ
+@dirrm share/phpldapadmin/locale/ca_ES/LC_MESSAGES
+@dirrm share/phpldapadmin/locale/ca_ES
+@dirrm share/phpldapadmin/locale
+@dirrm share/phpldapadmin/lib
+@dirrm share/phpldapadmin/htdocs/js/phplayersmenu/menuimages
+@dirrm share/phpldapadmin/htdocs/js/phplayersmenu/libjs
+@dirrm share/phpldapadmin/htdocs/js/phplayersmenu/lib
+@dirrm share/phpldapadmin/htdocs/js/phplayersmenu
+@dirrm share/phpldapadmin/htdocs/js/jscalendar/skins/aqua
+@dirrm share/phpldapadmin/htdocs/js/jscalendar/skins
+@dirrm share/phpldapadmin/htdocs/js/jscalendar/lang
+@dirrm share/phpldapadmin/htdocs/js/jscalendar
+@dirrm share/phpldapadmin/htdocs/js
+@dirrm share/phpldapadmin/htdocs/images/countries
+@dirrm share/phpldapadmin/htdocs/images
+@dirrm share/phpldapadmin/htdocs/css
+@dirrm share/phpldapadmin/htdocs
 @dirrm share/phpldapadmin/doc
-@dirrm share/phpldapadmin
+@dirrm share/phpldapadmin/config
+@unexec ${RMDIR} %D/share/phpldapadmin 2>/dev/null || ${TRUE}
 @dirrm share/examples/phpldapadmin
+@dirrm share/doc/phpldapadmin
diff --git a/databases/phpldapadmin/distinfo b/databases/phpldapadmin/distinfo
index f8db37619a3..1f01ce8e882 100644
--- a/databases/phpldapadmin/distinfo
+++ b/databases/phpldapadmin/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/09/03 17:00:07 adrianp Exp $
+$NetBSD: distinfo,v 1.8 2006/05/18 22:13:46 adrianp Exp $
 
-SHA1 (phpldapadmin-0.9.6c.tar.gz) = 52d094ec62892409d766629c42a32e076076bd97
-RMD160 (phpldapadmin-0.9.6c.tar.gz) = 29280777527af4531119ecfa5365cce7d899cd50
-Size (phpldapadmin-0.9.6c.tar.gz) = 707109 bytes
-SHA1 (patch-aa) = fa37fe2172ec3d068fe3280fe1ecefa5a68d2dcf
-SHA1 (patch-ab) = f4981f2e8cb6858e9ff8a407667509c177a35b47
+SHA1 (phpldapadmin-0.9.8.2.tar.gz) = 1c78c2e0ada604e4e66bc9a932f2047b53ccacc3
+RMD160 (phpldapadmin-0.9.8.2.tar.gz) = 332a4d6d308c3fbba7a35c4d02a137f215311a51
+Size (phpldapadmin-0.9.8.2.tar.gz) = 754341 bytes
diff --git a/databases/phpldapadmin/patches/patch-aa b/databases/phpldapadmin/patches/patch-aa
deleted file mode 100644
index 56096cd0b79..00000000000
--- a/databases/phpldapadmin/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/09/03 17:00:07 adrianp Exp $
-
---- login.php.orig	2005-04-15 14:16:59.000000000 +0100
-+++ login.php
-@@ -30,7 +30,9 @@ $ldapserver = new LDAPServer($server_id)
- $dn = isset( $_POST['login_dn'] ) ? $_POST['login_dn'] : null;
- $uid = isset( $_POST['uid'] ) ? $_POST['uid'] : null;
- $pass = isset( $_POST['login_pass'] ) ? $_POST['login_pass'] : null;
--$anon_bind = isset( $_POST['anonymous_bind'] ) && $_POST['anonymous_bind'] == 'on' ? true : false;
-+$anon_bind = isset( $_POST['anonymous_bind'] ) && 
-+                    $_POST['anonymous_bind'] == 'on' && 
-+                    $ldapserver->isAnonBindAllowed() ? true : false;
- 
- if( ! $anon_bind )
- 	strlen($pass) or pla_error( $lang['password_blank'] );
-@@ -149,9 +151,6 @@ include realpath( 'header.php' );
- 		parent.left_frame.location.reload();
- 	<?php } ?>
- 
--	<?php if ( isset($custom_welcome_page) and $custom_welcome_page ) { ?>
--		parent.right_frame.location.href='welcome.php';
--	<?php } ?>
- </script>
- 
- <center>
diff --git a/databases/phpldapadmin/patches/patch-ab b/databases/phpldapadmin/patches/patch-ab
deleted file mode 100644
index c68c92b8615..00000000000
--- a/databases/phpldapadmin/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/09/03 16:14:18 adrianp Exp $
-
---- welcome.php.orig	2005-09-03 16:53:02.000000000 +0100
-+++ welcome.php
-@@ -10,10 +10,6 @@
- 	include './header.php'; 
- //	include './config.php'; 
-     
--if ( isset($custom_welcome_page) && $custom_welcome_page ) {
--    include_once $custom_welcome_page;
--
--} else {
-     // Close the session for faster page loading
-     pla_session_close();
- ?>