Update phpldapadmin pacakge to 1.2.1.1.

This is latest release which running on PHP 5.2 and later.
Changes are too many please refer HOMEPAGE in detail.

3 files changed, 333 insertions, 192 deletions

diff --git a/databases/phpldapadmin/Makefile b/databases/phpldapadmin/Makefile
index fd56b0422fc..b3c7384b4b9 100644
--- a/databases/phpldapadmin/Makefile
+++ b/databases/phpldapadmin/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.30 2010/02/19 20:38:40 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2011/06/17 15:40:33 taca Exp $
 
 DISTNAME=	phpldapadmin-${VERSION}
 CATEGORIES=	databases www
-PKGREVISION=	6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=phpldapadmin/}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://phpldapadmin.sourceforge.net/
 COMMENT=	Set of PHP-scripts to administer an LDAP directory over the WWW
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -21,41 +22,37 @@ DEPENDS+=	${PHP_PKG_PREFIX}-gettext>=4.1.2:../../devel/php-gettext
 
 USE_TOOLS+=	pax
 
-VERSION=	0.9.8.3
+VERSION=	1.2.1.1
 NO_BUILD=	YES
 
 CONF_FILES+=  ${PREFIX}/share/examples/phpldapadmin/config.php.example \
 		${PREFIX}/share/phpldapadmin/config/config.php
 CONF_FILES+=	${PREFIX}/share/examples/phpldapadmin/phpldapadmin.conf \
 		${PKG_SYSCONFDIR}/phpldapadmin.conf
-PAX_DIRS=	config doc htdocs lib locale templates tools
+PAX_DIRS=	config doc hooks htdocs lib locale queries templates tools
+
+INSTALLATION_DIRS+= \
+	share/doc/phpldapadmin share/examples/phpldapadmin \
+	share/phpldapadmin/config
 
 do-configure:
 	${SED} -e "s|@LDAPADMINDIR@|${PREFIX}/share/phpldapadmin/htdocs|g" \
 		${FILESDIR}/phpldapadmin.conf > ${WRKDIR}/phpldapadmin.conf
+	${RM} -f ${WRKSRC}/.gitignore
+	${FIND} ${WRKSRC} -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+	${FIND} ${WRKSRC} -type f | ${XARGS} ${CHMOD} ${NONBINMODE}
 
 do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/phpldapadmin
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/phpldapadmin
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/phpldapadmin
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/phpldapadmin/config
-
 	${INSTALL_DATA} ${WRKSRC}/config/config.php.example \
 		${DESTDIR}${PREFIX}/share/examples/phpldapadmin/config.php.example
 	${INSTALL_DATA} ${WRKDIR}/phpldapadmin.conf \
 		${DESTDIR}${PREFIX}/share/examples/phpldapadmin/phpldapadmin.conf
-
-	${RM} ${WRKSRC}/.cvsignore
-	${RM} ${WRKSRC}/config/.cvsignore
-
 	${INSTALL_DATA} ${WRKSRC}/index.php \
 		${DESTDIR}${PREFIX}/share/phpldapadmin
-
 .for i in ${PAX_DIRS}
 	cd ${WRKSRC}/${i:Q} && pax \
 		-rwppm . ${DESTDIR}${PREFIX}/share/phpldapadmin/${i:Q}
 .endfor
-
 	${INSTALL_DATA} ${WRKSRC}/INSTALL \
 		${DESTDIR}${PREFIX}/share/doc/phpldapadmin
 	${INSTALL_DATA} ${WRKSRC}/LICENSE \
@@ -63,7 +60,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/VERSION \
 		${DESTDIR}${PREFIX}/share/phpldapadmin
 
-	${FIND} ${DESTDIR}${PREFIX}/share/phpldapadmin -type d | \
-		${XARGS} ${CHMOD} ${PKGDIRMODE}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/phpldapadmin/PLIST b/databases/phpldapadmin/PLIST
index 8c53911cc31..e2fbfb83c2e 100644
--- a/databases/phpldapadmin/PLIST
+++ b/databases/phpldapadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:36:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2011/06/17 15:40:33 taca Exp $
 share/doc/phpldapadmin/INSTALL
 share/doc/phpldapadmin/LICENSE
 share/examples/phpldapadmin/config.php.example
@@ -6,13 +6,24 @@ share/examples/phpldapadmin/phpldapadmin.conf
 share/phpldapadmin/VERSION
 share/phpldapadmin/config/config.php.example
 share/phpldapadmin/doc/README-translation.txt
+share/phpldapadmin/doc/certs/ca-bundle.crt
+share/phpldapadmin/doc/certs/slapd.crt
+share/phpldapadmin/doc/certs/slapd.key
+share/phpldapadmin/doc/demo-reset.sh
+share/phpldapadmin/doc/ldif-Flintstones
+share/phpldapadmin/doc/ldif-Simpsons
+share/phpldapadmin/doc/ldif-example-com
+share/phpldapadmin/doc/ldif-example.com
+share/phpldapadmin/doc/phpldapadmin-demo.conf
 share/phpldapadmin/doc/pla-test-i18n.ldif
-share/phpldapadmin/htdocs/add_attr.php
+share/phpldapadmin/doc/uidpool.schema
+share/phpldapadmin/hooks/classes/README
+share/phpldapadmin/hooks/functions/README
+share/phpldapadmin/hooks/functions/example.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/cmd.php
 share/phpldapadmin/htdocs/collapse.php
 share/phpldapadmin/htdocs/common.php
 share/phpldapadmin/htdocs/compare.php
@@ -20,24 +31,21 @@ 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/create_confirm.php
+share/phpldapadmin/htdocs/css/default/style.css
+share/phpldapadmin/htdocs/css/tango/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/draw_tree_node.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/INFO
+share/phpldapadmin/htdocs/images/ajax-progress.gif
+share/phpldapadmin/htdocs/images/ajax-spinner.gif
 share/phpldapadmin/htdocs/images/countries/af.png
 share/phpldapadmin/htdocs/images/countries/al.png
 share/phpldapadmin/htdocs/images/countries/am.png
@@ -204,89 +212,226 @@ 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/images/default/add.png
+share/phpldapadmin/htdocs/images/default/address-book.png
+share/phpldapadmin/htdocs/images/default/bug-big.png
+share/phpldapadmin/htdocs/images/default/bug.png
+share/phpldapadmin/htdocs/images/default/calendar.png
+share/phpldapadmin/htdocs/images/default/catalog.png
+share/phpldapadmin/htdocs/images/default/children.png
+share/phpldapadmin/htdocs/images/default/compare.png
+share/phpldapadmin/htdocs/images/default/country.png
+share/phpldapadmin/htdocs/images/default/create.png
+share/phpldapadmin/htdocs/images/default/cut.png
+share/phpldapadmin/htdocs/images/default/debug-cache.png
+share/phpldapadmin/htdocs/images/default/device.png
+share/phpldapadmin/htdocs/images/default/disabled.png
+share/phpldapadmin/htdocs/images/default/document.png
+share/phpldapadmin/htdocs/images/default/door.png
+share/phpldapadmin/htdocs/images/default/error-big.png
+share/phpldapadmin/htdocs/images/default/error.png
+share/phpldapadmin/htdocs/images/default/export-big.png
+share/phpldapadmin/htdocs/images/default/export.png
+share/phpldapadmin/htdocs/images/default/files.png
+share/phpldapadmin/htdocs/images/default/find.png
+share/phpldapadmin/htdocs/images/default/folder.png
+share/phpldapadmin/htdocs/images/default/forum-big.png
+share/phpldapadmin/htdocs/images/default/hard-drive.png
+share/phpldapadmin/htdocs/images/default/help-big.png
+share/phpldapadmin/htdocs/images/default/help.png
+share/phpldapadmin/htdocs/images/default/home-big.png
+share/phpldapadmin/htdocs/images/default/home.png
+share/phpldapadmin/htdocs/images/default/host.png
+share/phpldapadmin/htdocs/images/default/import-big.png
+share/phpldapadmin/htdocs/images/default/index.php
+share/phpldapadmin/htdocs/images/default/info-big.png
+share/phpldapadmin/htdocs/images/default/info.png
+share/phpldapadmin/htdocs/images/default/invalid.png
+share/phpldapadmin/htdocs/images/default/key.png
+share/phpldapadmin/htdocs/images/default/ldap-alias.png
+share/phpldapadmin/htdocs/images/default/ldap-dc.png
+share/phpldapadmin/htdocs/images/default/ldap-default.png
+share/phpldapadmin/htdocs/images/default/ldap-o.png
+share/phpldapadmin/htdocs/images/default/ldap-ou.png
+share/phpldapadmin/htdocs/images/default/ldap-server.png
+share/phpldapadmin/htdocs/images/default/ldap-uid.png
+share/phpldapadmin/htdocs/images/default/ldap-uniquegroup.png
+share/phpldapadmin/htdocs/images/default/ldap-user.png
+share/phpldapadmin/htdocs/images/default/light-big.png
+share/phpldapadmin/htdocs/images/default/light.png
+share/phpldapadmin/htdocs/images/default/locality.png
+share/phpldapadmin/htdocs/images/default/lock.png
+share/phpldapadmin/htdocs/images/default/login.png
+share/phpldapadmin/htdocs/images/default/logo-small.png
+share/phpldapadmin/htdocs/images/default/logo.png
+share/phpldapadmin/htdocs/images/default/logout-big.png
+share/phpldapadmin/htdocs/images/default/mail.png
+share/phpldapadmin/htdocs/images/default/mail_account.png
+share/phpldapadmin/htdocs/images/default/mail_alias.png
+share/phpldapadmin/htdocs/images/default/minus.png
+share/phpldapadmin/htdocs/images/default/monitorserver-big.png
+share/phpldapadmin/htdocs/images/default/move.png
+share/phpldapadmin/htdocs/images/default/n.png
+share/phpldapadmin/htdocs/images/default/network.png
+share/phpldapadmin/htdocs/images/default/nogo.png
+share/phpldapadmin/htdocs/images/default/nt_machine.png
+share/phpldapadmin/htdocs/images/default/nt_user.png
+share/phpldapadmin/htdocs/images/default/paypal-donate.png
+share/phpldapadmin/htdocs/images/default/phone.png
+share/phpldapadmin/htdocs/images/default/photo.png
+share/phpldapadmin/htdocs/images/default/plus.png
+share/phpldapadmin/htdocs/images/default/process.png
+share/phpldapadmin/htdocs/images/default/refresh-big.png
+share/phpldapadmin/htdocs/images/default/refresh.png
+share/phpldapadmin/htdocs/images/default/rename.png
+share/phpldapadmin/htdocs/images/default/request-feature-big.png
+share/phpldapadmin/htdocs/images/default/rfc.png
+share/phpldapadmin/htdocs/images/default/save.png
+share/phpldapadmin/htdocs/images/default/schema-big.png
+share/phpldapadmin/htdocs/images/default/search-big.png
+share/phpldapadmin/htdocs/images/default/server-settings.png
+share/phpldapadmin/htdocs/images/default/server-small.png
+share/phpldapadmin/htdocs/images/default/server.png
+share/phpldapadmin/htdocs/images/default/smile-big.png
+share/phpldapadmin/htdocs/images/default/smile.png
+share/phpldapadmin/htdocs/images/default/switch.png
+share/phpldapadmin/htdocs/images/default/terminal.png
+share/phpldapadmin/htdocs/images/default/timeout.png
+share/phpldapadmin/htdocs/images/default/tools-no.png
+share/phpldapadmin/htdocs/images/default/tools.png
+share/phpldapadmin/htdocs/images/default/trash-big.png
+share/phpldapadmin/htdocs/images/default/trash.png
+share/phpldapadmin/htdocs/images/default/tree_collapse.png
+share/phpldapadmin/htdocs/images/default/tree_collapse_corner.png
+share/phpldapadmin/htdocs/images/default/tree_collapse_corner_first.png
+share/phpldapadmin/htdocs/images/default/tree_collapse_first.png
+share/phpldapadmin/htdocs/images/default/tree_corner.png
+share/phpldapadmin/htdocs/images/default/tree_expand.png
+share/phpldapadmin/htdocs/images/default/tree_expand_corner.png
+share/phpldapadmin/htdocs/images/default/tree_expand_corner_first.png
+share/phpldapadmin/htdocs/images/default/tree_expand_first.png
+share/phpldapadmin/htdocs/images/default/tree_folder_closed.png
+share/phpldapadmin/htdocs/images/default/tree_folder_open.png
+share/phpldapadmin/htdocs/images/default/tree_leaf.png
+share/phpldapadmin/htdocs/images/default/tree_space.png
+share/phpldapadmin/htdocs/images/default/tree_split.png
+share/phpldapadmin/htdocs/images/default/tree_split_first.png
+share/phpldapadmin/htdocs/images/default/tree_vertline.png
+share/phpldapadmin/htdocs/images/default/unknown.png
+share/phpldapadmin/htdocs/images/default/up.png
+share/phpldapadmin/htdocs/images/default/warn-big.png
+share/phpldapadmin/htdocs/images/favicon.ico
+share/phpldapadmin/htdocs/images/tango/INFO
+share/phpldapadmin/htdocs/images/tango/add-big.png
+share/phpldapadmin/htdocs/images/tango/add.png
+share/phpldapadmin/htdocs/images/tango/address-book.png
+share/phpldapadmin/htdocs/images/tango/bug-big.png
+share/phpldapadmin/htdocs/images/tango/bug.png
+share/phpldapadmin/htdocs/images/tango/children-big.png
+share/phpldapadmin/htdocs/images/tango/children.png
+share/phpldapadmin/htdocs/images/tango/compare-big.png
+share/phpldapadmin/htdocs/images/tango/compare.png
+share/phpldapadmin/htdocs/images/tango/create-big.png
+share/phpldapadmin/htdocs/images/tango/create.png
+share/phpldapadmin/htdocs/images/tango/cut-big.png
+share/phpldapadmin/htdocs/images/tango/cut.png
+share/phpldapadmin/htdocs/images/tango/disabled-big.png
+share/phpldapadmin/htdocs/images/tango/disabled.png
+share/phpldapadmin/htdocs/images/tango/error-big.png
+share/phpldapadmin/htdocs/images/tango/error.png
+share/phpldapadmin/htdocs/images/tango/export-big.png
+share/phpldapadmin/htdocs/images/tango/export.png
+share/phpldapadmin/htdocs/images/tango/forum-big.png
+share/phpldapadmin/htdocs/images/tango/forum.png
+share/phpldapadmin/htdocs/images/tango/help-big.png
+share/phpldapadmin/htdocs/images/tango/help.png
+share/phpldapadmin/htdocs/images/tango/import-big.png
+share/phpldapadmin/htdocs/images/tango/import.png
+share/phpldapadmin/htdocs/images/tango/index.php
+share/phpldapadmin/htdocs/images/tango/info-big.png
+share/phpldapadmin/htdocs/images/tango/info.png
+share/phpldapadmin/htdocs/images/tango/key.png
+share/phpldapadmin/htdocs/images/tango/ldap-alias-big.png
+share/phpldapadmin/htdocs/images/tango/ldap-alias.png
+share/phpldapadmin/htdocs/images/tango/ldap-dc.png
+share/phpldapadmin/htdocs/images/tango/ldap-default.png
+share/phpldapadmin/htdocs/images/tango/ldap-o.png
+share/phpldapadmin/htdocs/images/tango/ldap-ou.png
+share/phpldapadmin/htdocs/images/tango/ldap-uid.png
+share/phpldapadmin/htdocs/images/tango/ldap-uniquegroup.png
+share/phpldapadmin/htdocs/images/tango/ldap-user.png
+share/phpldapadmin/htdocs/images/tango/light-big.png
+share/phpldapadmin/htdocs/images/tango/light.png
+share/phpldapadmin/htdocs/images/tango/login-big.png
+share/phpldapadmin/htdocs/images/tango/login.png
+share/phpldapadmin/htdocs/images/tango/logo-small.png
+share/phpldapadmin/htdocs/images/tango/logo.png
+share/phpldapadmin/htdocs/images/tango/logout-big.png
+share/phpldapadmin/htdocs/images/tango/logout.png
+share/phpldapadmin/htdocs/images/tango/mail-big.png
+share/phpldapadmin/htdocs/images/tango/mail.png
+share/phpldapadmin/htdocs/images/tango/minus.png
+share/phpldapadmin/htdocs/images/tango/monitorserver-big.png
+share/phpldapadmin/htdocs/images/tango/monitorserver.png
+share/phpldapadmin/htdocs/images/tango/plus.png
+share/phpldapadmin/htdocs/images/tango/refresh-big.png
+share/phpldapadmin/htdocs/images/tango/refresh.png
+share/phpldapadmin/htdocs/images/tango/remove-big.png
+share/phpldapadmin/htdocs/images/tango/remove.png
+share/phpldapadmin/htdocs/images/tango/rename-big.png
+share/phpldapadmin/htdocs/images/tango/rename.png
+share/phpldapadmin/htdocs/images/tango/request-feature-big.png
+share/phpldapadmin/htdocs/images/tango/request-feature.png
+share/phpldapadmin/htdocs/images/tango/save-big.png
+share/phpldapadmin/htdocs/images/tango/save.png
+share/phpldapadmin/htdocs/images/tango/schema-big.png
+share/phpldapadmin/htdocs/images/tango/schema.png
+share/phpldapadmin/htdocs/images/tango/search-big.png
+share/phpldapadmin/htdocs/images/tango/search.png
+share/phpldapadmin/htdocs/images/tango/server-big.png
+share/phpldapadmin/htdocs/images/tango/server.png
+share/phpldapadmin/htdocs/images/tango/smile-big.png
+share/phpldapadmin/htdocs/images/tango/smile.png
+share/phpldapadmin/htdocs/images/tango/switch-big.png
+share/phpldapadmin/htdocs/images/tango/switch.png
+share/phpldapadmin/htdocs/images/tango/timeout-big.png
+share/phpldapadmin/htdocs/images/tango/timeout.png
+share/phpldapadmin/htdocs/images/tango/tools-big.png
+share/phpldapadmin/htdocs/images/tango/tools.png
+share/phpldapadmin/htdocs/images/tango/trash-big.png
+share/phpldapadmin/htdocs/images/tango/trash.png
+share/phpldapadmin/htdocs/images/tango/tree_collapse.png
+share/phpldapadmin/htdocs/images/tango/tree_collapse_corner.png
+share/phpldapadmin/htdocs/images/tango/tree_collapse_corner_first.png
+share/phpldapadmin/htdocs/images/tango/tree_collapse_first.png
+share/phpldapadmin/htdocs/images/tango/tree_corner.png
+share/phpldapadmin/htdocs/images/tango/tree_expand.png
+share/phpldapadmin/htdocs/images/tango/tree_expand_corner.png
+share/phpldapadmin/htdocs/images/tango/tree_expand_corner_first.png
+share/phpldapadmin/htdocs/images/tango/tree_expand_first.png
+share/phpldapadmin/htdocs/images/tango/tree_folder_closed.png
+share/phpldapadmin/htdocs/images/tango/tree_folder_open.png
+share/phpldapadmin/htdocs/images/tango/tree_leaf.png
+share/phpldapadmin/htdocs/images/tango/tree_space.png
+share/phpldapadmin/htdocs/images/tango/tree_split.png
+share/phpldapadmin/htdocs/images/tango/tree_split_first.png
+share/phpldapadmin/htdocs/images/tango/tree_vertline.png
+share/phpldapadmin/htdocs/images/tango/warn-big.png
+share/phpldapadmin/htdocs/images/tango/warn.png
+share/phpldapadmin/htdocs/import.php
+share/phpldapadmin/htdocs/import_form.php
 share/phpldapadmin/htdocs/index.php
+share/phpldapadmin/htdocs/js/CheckAll.js
+share/phpldapadmin/htdocs/js/TemplateRender.js
+share/phpldapadmin/htdocs/js/ajax_functions.js
+share/phpldapadmin/htdocs/js/ajax_tree.js
 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/dnChooserPopup.js
+share/phpldapadmin/htdocs/js/form_field_toggle_enable.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
@@ -331,7 +476,6 @@ 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
@@ -342,86 +486,92 @@ 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/js/layersmenu-browser_detection.js
+share/phpldapadmin/htdocs/js/modify_member.js
+share/phpldapadmin/htdocs/js/toAscii.js
 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/mass_edit.php
+share/phpldapadmin/htdocs/mass_update.php
+share/phpldapadmin/htdocs/modify_member_form.php
+share/phpldapadmin/htdocs/monitor.php
 share/phpldapadmin/htdocs/password_checker.php
 share/phpldapadmin/htdocs/purge_cache.php
+share/phpldapadmin/htdocs/query_engine.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/show_cache.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/lib/AJAXTree.php
+share/phpldapadmin/lib/Attribute.php
+share/phpldapadmin/lib/AttributeFactory.php
+share/phpldapadmin/lib/BinaryAttribute.php
+share/phpldapadmin/lib/DateAttribute.php
+share/phpldapadmin/lib/DnAttribute.php
+share/phpldapadmin/lib/GidAttribute.php
+share/phpldapadmin/lib/HTMLTree.php
+share/phpldapadmin/lib/JpegAttribute.php
+share/phpldapadmin/lib/MassRender.php
+share/phpldapadmin/lib/MultiLineAttribute.php
+share/phpldapadmin/lib/ObjectClassAttribute.php
+share/phpldapadmin/lib/PageRender.php
+share/phpldapadmin/lib/PasswordAttribute.php
+share/phpldapadmin/lib/Query.php
+share/phpldapadmin/lib/QueryRender.php
+share/phpldapadmin/lib/RandomPasswordAttribute.php
+share/phpldapadmin/lib/SambaPasswordAttribute.php
+share/phpldapadmin/lib/SelectionAttribute.php
+share/phpldapadmin/lib/ShadowAttribute.php
+share/phpldapadmin/lib/Template.php
+share/phpldapadmin/lib/TemplateRender.php
+share/phpldapadmin/lib/Tree.php
+share/phpldapadmin/lib/TreeItem.php
+share/phpldapadmin/lib/Visitor.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/ds.php
+share/phpldapadmin/lib/ds_ldap.php
+share/phpldapadmin/lib/ds_ldap_pla.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/import_functions.php
 share/phpldapadmin/lib/ldap_error_codes.txt
 share/phpldapadmin/lib/ldap_supported_oids.txt
-share/phpldapadmin/lib/ldif_functions.php
+share/phpldapadmin/lib/page.php
+share/phpldapadmin/lib/query_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/lib/xml2array.php
+share/phpldapadmin/lib/xmlTemplates.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/da_DK/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/da_DK/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/fi_FI/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/fi_FI/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
@@ -432,54 +582,51 @@ 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/oc_FR/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/oc_FR/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/sk_SK/LC_MESSAGES/messages.mo
+share/phpldapadmin/locale/sk_SK/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.mo
 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/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/queries/SambaUsers.xml
+share/phpldapadmin/queries/UserList.xml
+share/phpldapadmin/queries/query.dtd
+share/phpldapadmin/templates/creation/alias.xml
+share/phpldapadmin/templates/creation/courierMailAccount.xml
+share/phpldapadmin/templates/creation/courierMailAlias.xml
+share/phpldapadmin/templates/creation/dNSDomain.xml
+share/phpldapadmin/templates/creation/example.xml
+share/phpldapadmin/templates/creation/inetOrgPerson.xml
+share/phpldapadmin/templates/creation/kolabPerson.xml
+share/phpldapadmin/templates/creation/mozillaOrgPerson.xml
+share/phpldapadmin/templates/creation/organizationalRole.xml
+share/phpldapadmin/templates/creation/ou.xml
+share/phpldapadmin/templates/creation/posixAccount.xml
+share/phpldapadmin/templates/creation/posixGroup.xml
+share/phpldapadmin/templates/creation/sambaDomain.xml
+share/phpldapadmin/templates/creation/sambaGroupMapping.xml
+share/phpldapadmin/templates/creation/sambaMachine.xml
+share/phpldapadmin/templates/creation/sambaSamAccount.xml
+share/phpldapadmin/templates/creation/sendmailMTAAliasObject.xml
+share/phpldapadmin/templates/creation/sendmailMTAClass.xml
+share/phpldapadmin/templates/creation/sendmailMTACluster.xml
+share/phpldapadmin/templates/creation/sendmailMTAMapObject.xml
+share/phpldapadmin/templates/creation/sendmailVirtualDomain.xml
+share/phpldapadmin/templates/creation/sendmailVirtualUser.xml
+share/phpldapadmin/templates/creation/simpleSecurityObject.xml
+share/phpldapadmin/templates/modification/inetOrgPerson.xml
+share/phpldapadmin/templates/modification/posixGroup.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/Makefile
 share/phpldapadmin/tools/po/messages.header
-share/phpldapadmin/tools/unit_test.php
+share/phpldapadmin/tools/unserialize.php
diff --git a/databases/phpldapadmin/distinfo b/databases/phpldapadmin/distinfo
index 63637e315b2..249ca234ae3 100644
--- a/databases/phpldapadmin/distinfo
+++ b/databases/phpldapadmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2006/05/21 11:58:25 adrianp Exp $
+$NetBSD: distinfo,v 1.10 2011/06/17 15:40:33 taca Exp $
 
-SHA1 (phpldapadmin-0.9.8.3.tar.gz) = 73564d9d56cd7baa2fc607531f17a1659d0a5bce
-RMD160 (phpldapadmin-0.9.8.3.tar.gz) = cdc5fecb341da9a62bedc71f4456ce57d3215f10
-Size (phpldapadmin-0.9.8.3.tar.gz) = 754593 bytes
+SHA1 (phpldapadmin-1.2.1.1.tgz) = f30d76205891fbd01fab468af1f8430597983787
+RMD160 (phpldapadmin-1.2.1.1.tgz) = c78bd0f056f7f5f8b150360e6ee0ef3f37d6560c
+Size (phpldapadmin-1.2.1.1.tgz) = 1468961 bytes