Update to phpPgAdmin 5.0.4

Version 5.0.4
-------------

Released: 22th March 2012

Bug fixes.

* Fix #3468882 "UPDATE single row with varchar key: empty where clause", reported by "Dirk Kraemer"
* Fix XSS in function.php, reported by Mateusz Goik
* Fix bug where renaming a tablespace was leading to an error
* Fix a bug where clicking to "Show all schemas" on schema privilege page leads back to the latest tab used in database level
* Fix a bug when executing a query from the history
* Fix bad confirmation message when droping an autovacuum table setup
* Fix bug #3429633 '"Back" link from "Browse" leads to error'
* Fix a PHP warning when Slony conf parameters are not set
* Show cancel/kill actions in process page only if role is a superuser
* Some more small code cleanup and fixes.

Version 5.0.3
-------------

Released: 3rd October 2011

Some bug fixes.

* Fix bug with enable/disable triggers on multiple triggers (Dawid 'DeyV' Polak)
* Fix bug #3353670: Error when executing a report with paging
* Fix bug with OpenBSD about where setting application_name using PGOPTIONS was raising an ERROR
* Two security fix about code injection, reported by Mateusz Goik, fixed by ioguix
* Fix character-encoding problem with autocomplete

3 files changed, 73 insertions, 17 deletions

diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index 13ad4181250..300be911b44 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2012/04/15 22:00:59 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2012/07/18 09:03:37 asau Exp $
 
-DISTNAME=	phpPgAdmin-5.0.2
+DISTNAME=	phpPgAdmin-5.0.4
 PKGNAME=	${DISTNAME:S/PgAdmin/pgadmin/}
-PKGREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=phppgadmin/}
 EXTRACT_SUFX=	.tar.bz2
@@ -20,10 +19,12 @@ MESSAGE_SUBST+=	EGDIR=${EGDIR}
 NO_BUILD=	YES
 
 PHPPGBASE=	${PREFIX}/share/phppgadmin
-PHPPGHIER=	conf help sql xloadtree \
-		libraries/adodb/drivers libraries/adodb/lang \
-		classes/database classes/plugins lang/recoded \
-		images/themes/default themes/default
+PHPPGHIER=	conf classes/database classes/plugins help \
+		images/themes/cappuccino images/themes/default \
+		js lang/recoded \
+		libraries/adodb/drivers libraries/adodb/lang libraries/js \
+		sql themes/cappuccino themes/default themes/gotar \
+		xloadtree
 
 EGDIR=		${PREFIX}/share/examples/phppgadmin
 DOCDIR=		${PREFIX}/share/doc/phppgadmin
@@ -57,10 +58,15 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/classes/*.* ${DESTDIR}${PHPPGBASE}/classes
 	${INSTALL_SCRIPT} ${WRKSRC}/classes/database/* \
 		${DESTDIR}${PHPPGBASE}/classes/database
+	${INSTALL_SCRIPT} ${WRKSRC}/classes/plugins/* \
+		${DESTDIR}${PHPPGBASE}/classes/plugins
 	${INSTALL_SCRIPT} ${WRKSRC}/help/* ${DESTDIR}${PHPPGBASE}/help
-	${INSTALL_SCRIPT} ${WRKSRC}/sql/* ${DESTDIR}${PHPPGBASE}/sql
+	${INSTALL_DATA} ${WRKSRC}/images/themes/cappuccino/*.png \
+		${DESTDIR}${PHPPGBASE}/images/themes/cappuccino
 	${INSTALL_DATA} ${WRKSRC}/images/themes/default/*.png \
 		${DESTDIR}${PHPPGBASE}/images/themes/default
+	${INSTALL_DATA} ${WRKSRC}/js/*.js \
+		${DESTDIR}${PHPPGBASE}/js
 	${INSTALL_SCRIPT} ${WRKSRC}/lang/*.* ${DESTDIR}${PHPPGBASE}/lang
 	${INSTALL_SCRIPT} ${WRKSRC}/lang/recoded/*.* ${DESTDIR}${PHPPGBASE}/lang/recoded
 	${INSTALL_SCRIPT} ${WRKSRC}/libraries/*.php ${DESTDIR}${PHPPGBASE}/libraries
@@ -70,10 +76,22 @@ do-install:
 		${DESTDIR}${PHPPGBASE}/libraries/adodb
 	${INSTALL_SCRIPT} ${WRKSRC}/libraries/adodb/drivers/* \
 		${DESTDIR}${PHPPGBASE}/libraries/adodb/drivers
-	${INSTALL_DATA} ${WRKSRC}/themes/default/global.css \
-		${DESTDIR}${PHPPGBASE}/themes/default
+	${INSTALL_SCRIPT} ${WRKSRC}/libraries/adodb/lang/* \
+		${DESTDIR}${PHPPGBASE}/libraries/adodb/lang
+	${INSTALL_DATA} ${WRKSRC}/libraries/js/*.js \
+		${DESTDIR}${PHPPGBASE}/libraries/js
+	${INSTALL_DATA} ${WRKSRC}/sql/* ${DESTDIR}${PHPPGBASE}/sql
+
+	${INSTALL_DATA} ${WRKSRC}/themes/global.css \
+		${DESTDIR}${PHPPGBASE}/themes
+	${INSTALL_SCRIPT} ${WRKSRC}/themes/*.php \
+		${DESTDIR}${PHPPGBASE}/themes
+	for theme in cappuccino default gotar; do \
+		${INSTALL_DATA} ${WRKSRC}/themes/$$theme/global.css \
+			${DESTDIR}${PHPPGBASE}/themes/$$theme; done
 	${INSTALL_DATA} ${WRKSRC}/xloadtree/*.* \
 		${DESTDIR}${PHPPGBASE}/xloadtree
+
 	${INSTALL_DATA} ${WRKSRC}/conf/config.inc.php-dist ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKDIR}/apache.conf ${DESTDIR}${EGDIR}
 
diff --git a/databases/phppgadmin/PLIST b/databases/phppgadmin/PLIST
index 1e2675c159d..263dd4bc059 100644
--- a/databases/phppgadmin/PLIST
+++ b/databases/phppgadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2011/02/08 23:09:17 asau Exp $
+@comment $NetBSD: PLIST,v 1.15 2012/07/18 09:03:37 asau Exp $
 share/doc/phppgadmin/CREDITS
 share/doc/phppgadmin/DEVELOPERS
 share/doc/phppgadmin/FAQ
@@ -30,6 +30,8 @@ share/phppgadmin/classes/database/Postgres81.php
 share/phppgadmin/classes/database/Postgres82.php
 share/phppgadmin/classes/database/Postgres83.php
 share/phppgadmin/classes/database/Postgres84.php
+share/phppgadmin/classes/plugins/Plugin.php
+share/phppgadmin/classes/plugins/Slony.php
 share/phppgadmin/colproperties.php
 share/phppgadmin/constraints.php
 share/phppgadmin/conversions.php
@@ -52,6 +54,13 @@ share/phppgadmin/help/PostgresDoc83.php
 share/phppgadmin/help/PostgresDoc84.php
 share/phppgadmin/help/PostgresDoc90.php
 share/phppgadmin/history.php
+share/phppgadmin/images/themes/cappuccino/Lminus.png
+share/phppgadmin/images/themes/cappuccino/Lplus.png
+share/phppgadmin/images/themes/cappuccino/Tminus.png
+share/phppgadmin/images/themes/cappuccino/Tplus.png
+share/phppgadmin/images/themes/cappuccino/inputbckg.png
+share/phppgadmin/images/themes/cappuccino/openListe.png
+share/phppgadmin/images/themes/cappuccino/title.png
 share/phppgadmin/images/themes/default/AddArguments.png
 share/phppgadmin/images/themes/default/Admin.png
 share/phppgadmin/images/themes/default/Aggregate.png
@@ -191,6 +200,9 @@ share/phppgadmin/indexes.js
 share/phppgadmin/indexes.php
 share/phppgadmin/info.php
 share/phppgadmin/intro.php
+share/phppgadmin/js/ac_insert_row.js
+share/phppgadmin/js/database.js
+share/phppgadmin/js/display.js
 share/phppgadmin/lang/afrikaans.php
 share/phppgadmin/lang/arabic.php
 share/phppgadmin/lang/catalan.php
@@ -267,6 +279,29 @@ share/phppgadmin/libraries/adodb/drivers/adodb-postgres.inc.php
 share/phppgadmin/libraries/adodb/drivers/adodb-postgres64.inc.php
 share/phppgadmin/libraries/adodb/drivers/adodb-postgres7.inc.php
 share/phppgadmin/libraries/adodb/drivers/adodb-postgres8.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-ar.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-bg.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-bgutf8.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-ca.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-cn.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-cz.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-da.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-de.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-en.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-es.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-esperanto.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-fa.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-fr.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-hu.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-it.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-nl.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-pl.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-pt-br.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-ro.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-ru1251.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-sv.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb-uk1251.inc.php
+share/phppgadmin/libraries/adodb/lang/adodb_th.inc.php
 share/phppgadmin/libraries/adodb/license.txt
 share/phppgadmin/libraries/adodb/readme.txt
 share/phppgadmin/libraries/adodb/toexport.inc.php
@@ -274,6 +309,7 @@ share/phppgadmin/libraries/adodb/tohtml.inc.php
 share/phppgadmin/libraries/decorator.inc.php
 share/phppgadmin/libraries/errorhandler.inc.php
 share/phppgadmin/libraries/highlight.php
+share/phppgadmin/libraries/js/jquery.js
 share/phppgadmin/libraries/lib.inc.php
 share/phppgadmin/links.js
 share/phppgadmin/login.php
@@ -298,7 +334,11 @@ share/phppgadmin/tables.js
 share/phppgadmin/tables.php
 share/phppgadmin/tablespaces.php
 share/phppgadmin/tblproperties.php
+share/phppgadmin/themes/cappuccino/global.css
 share/phppgadmin/themes/default/global.css
+share/phppgadmin/themes/global.css
+share/phppgadmin/themes/gotar/global.css
+share/phppgadmin/themes/themes.php
 share/phppgadmin/triggers.php
 share/phppgadmin/types.php
 share/phppgadmin/users.php
@@ -306,6 +346,4 @@ share/phppgadmin/viewproperties.php
 share/phppgadmin/views.php
 share/phppgadmin/xloadtree/xloadtree2.js
 share/phppgadmin/xloadtree/xtree2.js
-@pkgdir share/phppgadmin/libraries/adodb/lang
 @pkgdir share/phppgadmin/conf
-@pkgdir share/phppgadmin/classes/plugins
diff --git a/databases/phppgadmin/distinfo b/databases/phppgadmin/distinfo
index 72ee9539133..776506fd99b 100644
--- a/databases/phppgadmin/distinfo
+++ b/databases/phppgadmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2011/02/08 23:09:17 asau Exp $
+$NetBSD: distinfo,v 1.12 2012/07/18 09:03:37 asau Exp $
 
-SHA1 (phpPgAdmin-5.0.2.tar.bz2) = 14fc59074e23ea57697ccd9c031936f853838bba
-RMD160 (phpPgAdmin-5.0.2.tar.bz2) = 13373330d2d118dff6243db49edc8ab3eef31ab8
-Size (phpPgAdmin-5.0.2.tar.bz2) = 776276 bytes
+SHA1 (phpPgAdmin-5.0.4.tar.bz2) = fb8cad25b33de7c777f1c69287e7f264a9e22b5f
+RMD160 (phpPgAdmin-5.0.4.tar.bz2) = d3cad1238e9c89b7e20b5032cf932cd6e15a9b8d
+Size (phpPgAdmin-5.0.4.tar.bz2) = 778547 bytes