ports/64570: [patch]update databases/phpmyadmin to 2.5.6
Kang Liu
liukang at bjpu.edu.cn
Mon Mar 22 12:40:18 UTC 2004
>Number: 64570
>Category: ports
>Synopsis: [patch]update databases/phpmyadmin to 2.5.6
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 22 04:40:18 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Kang Liu
>Release: 4.9 & 5.2
>Organization:
Beijing University of Technology
>Environment:
FreeBSD ftp.bjpu.edu.cn 4.9-STABLE FreeBSD 4.9-STABLE #68: Wed Mar 3 11:04:00 CST 2004 root at ftp.bjpu.edu.cn:/usr/obj/usr/src/sys/FTP i386
>Description:
1. Update phpMyadmin to 2.5.6 to fix file disclosure problem.
2. Drop php3 support since the phpmyadmin developers do not want to support php3 any more.
3. Add SIZE in distinfo
4. Request to be maintainer.
It would be my pleasure if I could maintain this port. ^_^
>How-To-Repeat:
n/a
>Fix:
--- Makefile.orig Mon Mar 22 19:43:47 2004
+++ Makefile Mon Mar 22 20:10:37 2004
@@ -6,40 +6,25 @@
#
PORTNAME= phpMyAdmin
-PORTVERSION= 2.5.4
+PORTVERSION= 2.5.6
CATEGORIES= databases www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= phpmyadmin
-DISTFILES= ${DISTNAME}-${PHP_SUFX}${EXTRACT_SUFX}
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= liukang at bjpu.edu.cn
COMMENT= A set of PHP-scripts to adminstrate MySQL over the web
-FORBIDDEN= http://people.freebsd.org/~eik/portaudit/cc0fb686-6550-11d8-80e3-0020ed76ef5a.html
-
-.if defined(WITH_PHP3)
-RUN_DEPENDS+= ${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3
-.endif
-
USE_BZIP2= yes
NO_BUILD= yes
MYADMDIR?= www/data/phpMyAdmin
-.if defined(WITH_PHP3)
-PHP_SUFX= php3
-EXTRA_PATCHES= files/fix-libraries::display_tbl.lib.php3 files/fix-tbl_relation.php3
-.else
USE_PHP= yes
-PHP_SUFX= php
-EXTRA_PATCHES= files/fix-libraries::display_tbl.lib.php files/fix-tbl_relation.php
-.endif
-PLIST_SUB+= MYADMDIR=${MYADMDIR} PHP_SUFX=${PHP_SUFX}
+PLIST_SUB+= MYADMDIR=${MYADMDIR}
post-patch:
- @${MV} ${WRKSRC}/config.inc.${PHP_SUFX} ${WRKSRC}/config.inc.${PHP_SUFX}.sample
- @${RM} ${WRKSRC}/*.orig ${WRKSRC}/libraries/*.orig
+ @${MV} ${WRKSRC}/config.inc.php ${WRKSRC}/config.inc.php.sample
do-install:
@${MKDIR} ${PREFIX}/${MYADMDIR}
--- distinfo.orig Mon Mar 22 19:43:54 2004
+++ distinfo Mon Mar 22 19:51:57 2004
@@ -1,2 +1,2 @@
-MD5 (phpMyAdmin-2.5.4-php3.tar.bz2) = 7b6b5dcb9071ebfcd71f5db7785db865
-MD5 (phpMyAdmin-2.5.4-php.tar.bz2) = c3a8d771c9846dd95b7283c7ce0f20dd
+MD5 (phpMyAdmin-2.5.6.tar.bz2) = b62afe98600eacc2a3300c9856b349f7
+SIZE (phpMyAdmin-2.5.6.tar.bz2) = 1111512
--- pkg-plist.orig Mon Mar 22 19:44:04 2004
+++ pkg-plist Mon Mar 22 20:09:16 2004
@@ -1,4 +1,3 @@
-%%MYADMDIR%%/ANNOUNCE.txt
%%MYADMDIR%%/CREDITS
%%MYADMDIR%%/ChangeLog
%%MYADMDIR%%/Documentation.html
@@ -6,34 +5,34 @@
%%MYADMDIR%%/INSTALL
%%MYADMDIR%%/LICENSE
%%MYADMDIR%%/README
-%%MYADMDIR%%/RELEASE-DATE-2.5.4
+%%MYADMDIR%%/RELEASE-DATE-2.5.6
%%MYADMDIR%%/TODO
-%%MYADMDIR%%/badwords.txt
-%%MYADMDIR%%/browse_foreigners.%%PHP_SUFX%%
-%%MYADMDIR%%/chk_rel.%%PHP_SUFX%%
-%%MYADMDIR%%/config.inc.%%PHP_SUFX%%.sample
-%%MYADMDIR%%/css/phpmyadmin.css.%%PHP_SUFX%%
-%%MYADMDIR%%/db_create.%%PHP_SUFX%%
-%%MYADMDIR%%/db_datadict.%%PHP_SUFX%%
-%%MYADMDIR%%/db_details.%%PHP_SUFX%%
-%%MYADMDIR%%/db_details_common.%%PHP_SUFX%%
-%%MYADMDIR%%/db_details_db_info.%%PHP_SUFX%%
-%%MYADMDIR%%/db_details_export.%%PHP_SUFX%%
-%%MYADMDIR%%/db_details_importdocsql.%%PHP_SUFX%%
-%%MYADMDIR%%/db_details_links.%%PHP_SUFX%%
-%%MYADMDIR%%/db_details_qbe.%%PHP_SUFX%%
-%%MYADMDIR%%/db_details_structure.%%PHP_SUFX%%
-%%MYADMDIR%%/db_printview.%%PHP_SUFX%%
-%%MYADMDIR%%/db_search.%%PHP_SUFX%%
+%%MYADMDIR%%/browse_foreigners.php
+%%MYADMDIR%%/chk_rel.php
+%%MYADMDIR%%/config.inc.php.sample
+%%MYADMDIR%%/css/phpmyadmin.css.php
+%%MYADMDIR%%/db_create.php
+%%MYADMDIR%%/db_datadict.php
+%%MYADMDIR%%/db_details.php
+%%MYADMDIR%%/db_details_common.php
+%%MYADMDIR%%/db_details_db_info.php
+%%MYADMDIR%%/db_details_export.php
+%%MYADMDIR%%/db_details_importdocsql.php
+%%MYADMDIR%%/db_details_links.php
+%%MYADMDIR%%/db_details_qbe.php
+%%MYADMDIR%%/db_details_structure.php
+%%MYADMDIR%%/db_printview.php
+%%MYADMDIR%%/db_search.php
%%MYADMDIR%%/docs.css
-%%MYADMDIR%%/export.%%PHP_SUFX%%
-%%MYADMDIR%%/footer.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/header.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/header_printview.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/export.php
+%%MYADMDIR%%/footer.inc.php
+%%MYADMDIR%%/header.inc.php
+%%MYADMDIR%%/header_printview.inc.php
%%MYADMDIR%%/images/arrow_ltr.gif
%%MYADMDIR%%/images/arrow_rtl.gif
%%MYADMDIR%%/images/asc_order.png
%%MYADMDIR%%/images/browse.png
+%%MYADMDIR%%/images/button_bookmark.png
%%MYADMDIR%%/images/button_browse.png
%%MYADMDIR%%/images/button_drop.png
%%MYADMDIR%%/images/button_edit.png
@@ -64,248 +63,250 @@
%%MYADMDIR%%/images/pma_logo.png
%%MYADMDIR%%/images/spacer.gif
%%MYADMDIR%%/images/vertical_line.png
-%%MYADMDIR%%/index.%%PHP_SUFX%%
+%%MYADMDIR%%/index.php
%%MYADMDIR%%/lang/add_message.sh
%%MYADMDIR%%/lang/add_message_file.sh
-%%MYADMDIR%%/lang/afrikaans-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/afrikaans-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/albanian-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/albanian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/arabic-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/arabic-windows-1256.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/azerbaijani-iso-8859-9.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/azerbaijani-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/bosnian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/bosnian-windows-1250.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/brazilian_portuguese-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/brazilian_portuguese-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/bulgarian-koi8-r.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/bulgarian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/bulgarian-windows-1251.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/catalan-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/catalan-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/afrikaans-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/afrikaans-utf-8.inc.php
+%%MYADMDIR%%/lang/albanian-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/albanian-utf-8.inc.php
+%%MYADMDIR%%/lang/arabic-utf-8.inc.php
+%%MYADMDIR%%/lang/arabic-windows-1256.inc.php
+%%MYADMDIR%%/lang/azerbaijani-iso-8859-9.inc.php
+%%MYADMDIR%%/lang/azerbaijani-utf-8.inc.php
+%%MYADMDIR%%/lang/basque-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/basque-utf-8.inc.php
+%%MYADMDIR%%/lang/bosnian-utf-8.inc.php
+%%MYADMDIR%%/lang/bosnian-windows-1250.inc.php
+%%MYADMDIR%%/lang/brazilian_portuguese-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/brazilian_portuguese-utf-8.inc.php
+%%MYADMDIR%%/lang/bulgarian-koi8-r.inc.php
+%%MYADMDIR%%/lang/bulgarian-utf-8.inc.php
+%%MYADMDIR%%/lang/bulgarian-windows-1251.inc.php
+%%MYADMDIR%%/lang/catalan-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/catalan-utf-8.inc.php
%%MYADMDIR%%/lang/check_lang.sh
-%%MYADMDIR%%/lang/chinese_big5-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/chinese_big5.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/chinese_gb-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/chinese_gb.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/croatian-iso-8859-2.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/croatian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/croatian-windows-1250.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/czech-iso-8859-2.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/czech-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/czech-windows-1250.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/danish-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/danish-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/dutch-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/dutch-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/english-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/english-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/estonian-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/estonian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/finnish-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/finnish-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/french-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/french-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/galician-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/galician-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/georgian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/german-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/german-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/greek-iso-8859-7.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/greek-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/hebrew-iso-8859-8-i.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/hindi-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/hungarian-iso-8859-2.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/hungarian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/indonesian-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/indonesian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/italian-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/italian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/japanese-euc.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/japanese-sjis.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/japanese-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/korean-ks_c_5601-1987.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/latvian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/latvian-windows-1257.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/lithuanian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/lithuanian-windows-1257.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/malay-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/malay-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/norwegian-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/norwegian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/persian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/persian-windows-1256.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/polish-iso-8859-2.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/polish-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/portuguese-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/portuguese-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/chinese_big5-utf-8.inc.php
+%%MYADMDIR%%/lang/chinese_big5.inc.php
+%%MYADMDIR%%/lang/chinese_gb-utf-8.inc.php
+%%MYADMDIR%%/lang/chinese_gb.inc.php
+%%MYADMDIR%%/lang/croatian-iso-8859-2.inc.php
+%%MYADMDIR%%/lang/croatian-utf-8.inc.php
+%%MYADMDIR%%/lang/croatian-windows-1250.inc.php
+%%MYADMDIR%%/lang/czech-iso-8859-2.inc.php
+%%MYADMDIR%%/lang/czech-utf-8.inc.php
+%%MYADMDIR%%/lang/czech-windows-1250.inc.php
+%%MYADMDIR%%/lang/danish-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/danish-utf-8.inc.php
+%%MYADMDIR%%/lang/dutch-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/dutch-utf-8.inc.php
+%%MYADMDIR%%/lang/english-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/english-utf-8.inc.php
+%%MYADMDIR%%/lang/estonian-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/estonian-utf-8.inc.php
+%%MYADMDIR%%/lang/finnish-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/finnish-utf-8.inc.php
+%%MYADMDIR%%/lang/french-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/french-utf-8.inc.php
+%%MYADMDIR%%/lang/galician-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/galician-utf-8.inc.php
+%%MYADMDIR%%/lang/georgian-utf-8.inc.php
+%%MYADMDIR%%/lang/german-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/german-utf-8.inc.php
+%%MYADMDIR%%/lang/greek-iso-8859-7.inc.php
+%%MYADMDIR%%/lang/greek-utf-8.inc.php
+%%MYADMDIR%%/lang/hebrew-iso-8859-8-i.inc.php
+%%MYADMDIR%%/lang/hindi-utf-8.inc.php
+%%MYADMDIR%%/lang/hungarian-iso-8859-2.inc.php
+%%MYADMDIR%%/lang/hungarian-utf-8.inc.php
+%%MYADMDIR%%/lang/indonesian-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/indonesian-utf-8.inc.php
+%%MYADMDIR%%/lang/italian-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/italian-utf-8.inc.php
+%%MYADMDIR%%/lang/japanese-euc.inc.php
+%%MYADMDIR%%/lang/japanese-sjis.inc.php
+%%MYADMDIR%%/lang/japanese-utf-8.inc.php
+%%MYADMDIR%%/lang/korean-ks_c_5601-1987.inc.php
+%%MYADMDIR%%/lang/latvian-utf-8.inc.php
+%%MYADMDIR%%/lang/latvian-windows-1257.inc.php
+%%MYADMDIR%%/lang/lithuanian-utf-8.inc.php
+%%MYADMDIR%%/lang/lithuanian-windows-1257.inc.php
+%%MYADMDIR%%/lang/malay-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/malay-utf-8.inc.php
+%%MYADMDIR%%/lang/norwegian-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/norwegian-utf-8.inc.php
+%%MYADMDIR%%/lang/persian-utf-8.inc.php
+%%MYADMDIR%%/lang/persian-windows-1256.inc.php
+%%MYADMDIR%%/lang/polish-iso-8859-2.inc.php
+%%MYADMDIR%%/lang/polish-utf-8.inc.php
+%%MYADMDIR%%/lang/portuguese-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/portuguese-utf-8.inc.php
%%MYADMDIR%%/lang/remove_message.sh
-%%MYADMDIR%%/lang/romanian-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/romanian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/russian-dos-866.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/russian-koi8-r.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/russian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/russian-windows-1251.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/serbian_cyrillic-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/serbian_cyrillic-windows-1251.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/serbian_latin-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/serbian_latin-windows-1250.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/slovak-iso-8859-2.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/slovak-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/slovak-windows-1250.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/slovenian-iso-8859-2.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/slovenian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/slovenian-windows-1250.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/romanian-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/romanian-utf-8.inc.php
+%%MYADMDIR%%/lang/russian-dos-866.inc.php
+%%MYADMDIR%%/lang/russian-koi8-r.inc.php
+%%MYADMDIR%%/lang/russian-utf-8.inc.php
+%%MYADMDIR%%/lang/russian-windows-1251.inc.php
+%%MYADMDIR%%/lang/serbian_cyrillic-utf-8.inc.php
+%%MYADMDIR%%/lang/serbian_cyrillic-windows-1251.inc.php
+%%MYADMDIR%%/lang/serbian_latin-utf-8.inc.php
+%%MYADMDIR%%/lang/serbian_latin-windows-1250.inc.php
+%%MYADMDIR%%/lang/slovak-iso-8859-2.inc.php
+%%MYADMDIR%%/lang/slovak-utf-8.inc.php
+%%MYADMDIR%%/lang/slovak-windows-1250.inc.php
+%%MYADMDIR%%/lang/slovenian-iso-8859-2.inc.php
+%%MYADMDIR%%/lang/slovenian-utf-8.inc.php
+%%MYADMDIR%%/lang/slovenian-windows-1250.inc.php
%%MYADMDIR%%/lang/sort_lang.sh
-%%MYADMDIR%%/lang/spanish-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/spanish-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/swedish-iso-8859-1.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/swedish-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/spanish-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/spanish-utf-8.inc.php
+%%MYADMDIR%%/lang/swedish-iso-8859-1.inc.php
+%%MYADMDIR%%/lang/swedish-utf-8.inc.php
%%MYADMDIR%%/lang/sync_lang.sh
-%%MYADMDIR%%/lang/thai-tis-620.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/thai-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/thai-tis-620.inc.php
+%%MYADMDIR%%/lang/thai-utf-8.inc.php
%%MYADMDIR%%/lang/translatecount.sh
-%%MYADMDIR%%/lang/turkish-iso-8859-9.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/turkish-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/ukrainian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/ukrainian-windows-1251.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/ldi_check.%%PHP_SUFX%%
-%%MYADMDIR%%/ldi_table.%%PHP_SUFX%%
-%%MYADMDIR%%/left.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/auth/config.auth.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/auth/cookie.auth.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/auth/http.auth.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/blowfish.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/bookmark.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/charset_conversion.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/common.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/config_import.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/db_config.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/db_table_exists.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/dbg/profiling.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/dbg/setup.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/defines.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/defines_php.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/display_export.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/display_tbl.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/display_tbl_links.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/turkish-iso-8859-9.inc.php
+%%MYADMDIR%%/lang/turkish-utf-8.inc.php
+%%MYADMDIR%%/lang/ukrainian-utf-8.inc.php
+%%MYADMDIR%%/lang/ukrainian-windows-1251.inc.php
+%%MYADMDIR%%/ldi_check.php
+%%MYADMDIR%%/ldi_table.php
+%%MYADMDIR%%/left.php
+%%MYADMDIR%%/libraries/auth/config.auth.lib.php
+%%MYADMDIR%%/libraries/auth/cookie.auth.lib.php
+%%MYADMDIR%%/libraries/auth/http.auth.lib.php
+%%MYADMDIR%%/libraries/blowfish.php
+%%MYADMDIR%%/libraries/bookmark.lib.php
+%%MYADMDIR%%/libraries/charset_conversion.lib.php
+%%MYADMDIR%%/libraries/common.lib.php
+%%MYADMDIR%%/libraries/config_import.lib.php
+%%MYADMDIR%%/libraries/db_config.lib.php
+%%MYADMDIR%%/libraries/db_table_exists.lib.php
+%%MYADMDIR%%/libraries/dbg/profiling.php
+%%MYADMDIR%%/libraries/dbg/setup.php
+%%MYADMDIR%%/libraries/defines.lib.php
+%%MYADMDIR%%/libraries/defines_mysql.lib.php
+%%MYADMDIR%%/libraries/display_export.lib.php
+%%MYADMDIR%%/libraries/display_tbl.lib.php
+%%MYADMDIR%%/libraries/display_tbl_links.lib.php
%%MYADMDIR%%/libraries/dom-drag.js
-%%MYADMDIR%%/libraries/export/csv.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/export/latex.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/export/sql.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/export/xml.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/export/csv.php
+%%MYADMDIR%%/libraries/export/latex.php
+%%MYADMDIR%%/libraries/export/sql.php
+%%MYADMDIR%%/libraries/export/xml.php
%%MYADMDIR%%/libraries/fpdf/README
-%%MYADMDIR%%/libraries/fpdf/font/courier.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/fpdf/font/helvetica.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/fpdf/font/helveticab.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/fpdf/font/helveticabi.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/fpdf/font/helveticai.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/fpdf/font/symbol.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/fpdf/font/tahoma.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/fpdf/font/tahomab.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/fpdf/font/times.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/fpdf/font/timesb.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/fpdf/font/timesbi.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/fpdf/font/timesi.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/fpdf/font/zapfdingbats.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/fpdf/fpdf.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/fpdf/font/courier.php
+%%MYADMDIR%%/libraries/fpdf/font/helvetica.php
+%%MYADMDIR%%/libraries/fpdf/font/helveticab.php
+%%MYADMDIR%%/libraries/fpdf/font/helveticabi.php
+%%MYADMDIR%%/libraries/fpdf/font/helveticai.php
+%%MYADMDIR%%/libraries/fpdf/font/symbol.php
+%%MYADMDIR%%/libraries/fpdf/font/tahoma.php
+%%MYADMDIR%%/libraries/fpdf/font/tahomab.php
+%%MYADMDIR%%/libraries/fpdf/font/times.php
+%%MYADMDIR%%/libraries/fpdf/font/timesb.php
+%%MYADMDIR%%/libraries/fpdf/font/timesbi.php
+%%MYADMDIR%%/libraries/fpdf/font/timesi.php
+%%MYADMDIR%%/libraries/fpdf/font/zapfdingbats.php
+%%MYADMDIR%%/libraries/fpdf/fpdf.php
%%MYADMDIR%%/libraries/functions.js
-%%MYADMDIR%%/libraries/get_foreign.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/grab_globals.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/header_http.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/header_meta_style.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/get_foreign.lib.php
+%%MYADMDIR%%/libraries/grab_globals.lib.php
+%%MYADMDIR%%/libraries/header_http.inc.php
+%%MYADMDIR%%/libraries/header_meta_style.inc.php
%%MYADMDIR%%/libraries/indexes.js
-%%MYADMDIR%%/libraries/ip_allow_deny.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/kanji-encoding.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/ip_allow_deny.lib.php
+%%MYADMDIR%%/libraries/kanji-encoding.lib.php
%%MYADMDIR%%/libraries/left.js
-%%MYADMDIR%%/libraries/mysql_charsets.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/mysql_wrappers.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/ob.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/read_dump.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/relation.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/relation_cleanup.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/select_lang.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/mysql_charsets.lib.php
+%%MYADMDIR%%/libraries/mysql_wrappers.lib.php
+%%MYADMDIR%%/libraries/ob.lib.php
+%%MYADMDIR%%/libraries/read_dump.lib.php
+%%MYADMDIR%%/libraries/relation.lib.php
+%%MYADMDIR%%/libraries/relation_cleanup.lib.php
+%%MYADMDIR%%/libraries/select_lang.lib.php
%%MYADMDIR%%/libraries/server_privileges.js
-%%MYADMDIR%%/libraries/sqlparser.data.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/sqlparser.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/sqlvalidator.class.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/sqlvalidator.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/string.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/sqlparser.data.php
+%%MYADMDIR%%/libraries/sqlparser.lib.php
+%%MYADMDIR%%/libraries/sqlvalidator.class.php
+%%MYADMDIR%%/libraries/sqlvalidator.lib.php
+%%MYADMDIR%%/libraries/string.lib.php
%%MYADMDIR%%/libraries/tbl_change.js
-%%MYADMDIR%%/libraries/transformations.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/transformations.lib.php
%%MYADMDIR%%/libraries/transformations/README
%%MYADMDIR%%/libraries/transformations/TEMPLATE
%%MYADMDIR%%/libraries/transformations/TEMPLATE_MIMETYPE
+%%MYADMDIR%%/libraries/transformations/application_octetstream__download.inc.php
%%MYADMDIR%%/libraries/transformations/generator.sh
-%%MYADMDIR%%/libraries/transformations/global.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/transformations/image_jpeg__inline.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/transformations/image_jpeg__link.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/transformations/image_png__inline.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/transformations/overview.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/transformations/global.inc.php
+%%MYADMDIR%%/libraries/transformations/image_jpeg__inline.inc.php
+%%MYADMDIR%%/libraries/transformations/image_jpeg__link.inc.php
+%%MYADMDIR%%/libraries/transformations/image_png__inline.inc.php
+%%MYADMDIR%%/libraries/transformations/overview.php
%%MYADMDIR%%/libraries/transformations/template_generator.sh
%%MYADMDIR%%/libraries/transformations/template_generator_mimetype.sh
-%%MYADMDIR%%/libraries/transformations/text_plain__dateformat.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/transformations/text_plain__external.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/transformations/text_plain__formatted.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/transformations/text_plain__imagelink.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/transformations/text_plain__link.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/transformations/text_plain__substr.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/libraries/url_generating.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/transformations/text_plain__dateformat.inc.php
+%%MYADMDIR%%/libraries/transformations/text_plain__external.inc.php
+%%MYADMDIR%%/libraries/transformations/text_plain__formatted.inc.php
+%%MYADMDIR%%/libraries/transformations/text_plain__imagelink.inc.php
+%%MYADMDIR%%/libraries/transformations/text_plain__link.inc.php
+%%MYADMDIR%%/libraries/transformations/text_plain__substr.inc.php
+%%MYADMDIR%%/libraries/url_generating.lib.php
%%MYADMDIR%%/libraries/user_password.js
-%%MYADMDIR%%/libraries/zip.lib.%%PHP_SUFX%%
-%%MYADMDIR%%/main.%%PHP_SUFX%%
-%%MYADMDIR%%/mult_submits.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/pdf_pages.%%PHP_SUFX%%
-%%MYADMDIR%%/pdf_schema.%%PHP_SUFX%%
-%%MYADMDIR%%/phpinfo.%%PHP_SUFX%%
-%%MYADMDIR%%/queryframe.%%PHP_SUFX%%
-%%MYADMDIR%%/querywindow.%%PHP_SUFX%%
-%%MYADMDIR%%/read_dump.%%PHP_SUFX%%
-%%MYADMDIR%%/scripts/check_lang.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/zip.lib.php
+%%MYADMDIR%%/main.php
+%%MYADMDIR%%/mult_submits.inc.php
+%%MYADMDIR%%/pdf_pages.php
+%%MYADMDIR%%/pdf_schema.php
+%%MYADMDIR%%/phpinfo.php
+%%MYADMDIR%%/queryframe.php
+%%MYADMDIR%%/querywindow.php
+%%MYADMDIR%%/read_dump.php
+%%MYADMDIR%%/scripts/check_lang.php
%%MYADMDIR%%/scripts/convertcfg.pl
%%MYADMDIR%%/scripts/create-release.sh
%%MYADMDIR%%/scripts/create_tables.sql
-%%MYADMDIR%%/scripts/decode_bug.%%PHP_SUFX%%
+%%MYADMDIR%%/scripts/decode_bug.php
%%MYADMDIR%%/scripts/extchg.sh
%%MYADMDIR%%/scripts/inno2pma.sh
%%MYADMDIR%%/scripts/remove_control_m.sh
-%%MYADMDIR%%/scripts/updatedocs.sh
-%%MYADMDIR%%/server_collations.%%PHP_SUFX%%
-%%MYADMDIR%%/server_common.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/server_databases.%%PHP_SUFX%%
-%%MYADMDIR%%/server_export.%%PHP_SUFX%%
-%%MYADMDIR%%/server_links.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/server_privileges.%%PHP_SUFX%%
-%%MYADMDIR%%/server_processlist.%%PHP_SUFX%%
-%%MYADMDIR%%/server_status.%%PHP_SUFX%%
-%%MYADMDIR%%/server_variables.%%PHP_SUFX%%
-%%MYADMDIR%%/sql.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_addfield.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_alter.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_change.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_create.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_indexes.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_move_copy.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_printview.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_properties.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_properties.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_properties_common.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_properties_export.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_properties_links.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_properties_operations.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_properties_structure.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_properties_table_info.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_query_box.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_relation.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_rename.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_replace.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_replace_fields.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_row_delete.%%PHP_SUFX%%
-%%MYADMDIR%%/tbl_select.%%PHP_SUFX%%
-%%MYADMDIR%%/transformation_wrapper.%%PHP_SUFX%%
+%%MYADMDIR%%/server_collations.php
+%%MYADMDIR%%/server_common.inc.php
+%%MYADMDIR%%/server_databases.php
+%%MYADMDIR%%/server_export.php
+%%MYADMDIR%%/server_links.inc.php
+%%MYADMDIR%%/server_privileges.php
+%%MYADMDIR%%/server_processlist.php
+%%MYADMDIR%%/server_status.php
+%%MYADMDIR%%/server_variables.php
+%%MYADMDIR%%/sql.php
+%%MYADMDIR%%/tbl_addfield.php
+%%MYADMDIR%%/tbl_alter.php
+%%MYADMDIR%%/tbl_change.php
+%%MYADMDIR%%/tbl_create.php
+%%MYADMDIR%%/tbl_indexes.php
+%%MYADMDIR%%/tbl_move_copy.php
+%%MYADMDIR%%/tbl_printview.php
+%%MYADMDIR%%/tbl_properties.inc.php
+%%MYADMDIR%%/tbl_properties.php
+%%MYADMDIR%%/tbl_properties_common.php
+%%MYADMDIR%%/tbl_properties_export.php
+%%MYADMDIR%%/tbl_properties_links.php
+%%MYADMDIR%%/tbl_properties_operations.php
+%%MYADMDIR%%/tbl_properties_structure.php
+%%MYADMDIR%%/tbl_properties_table_info.php
+%%MYADMDIR%%/tbl_query_box.php
+%%MYADMDIR%%/tbl_relation.php
+%%MYADMDIR%%/tbl_rename.php
+%%MYADMDIR%%/tbl_replace.php
+%%MYADMDIR%%/tbl_replace_fields.php
+%%MYADMDIR%%/tbl_row_delete.php
+%%MYADMDIR%%/tbl_select.php
+%%MYADMDIR%%/transformation_wrapper.php
%%MYADMDIR%%/translators.html
-%%MYADMDIR%%/user_password.%%PHP_SUFX%%
+%%MYADMDIR%%/user_password.php
@dirrm %%MYADMDIR%%/scripts
@dirrm %%MYADMDIR%%/libraries/transformations
@dirrm %%MYADMDIR%%/libraries/fpdf/font
@@ -318,3 +319,4 @@
@dirrm %%MYADMDIR%%/images
@dirrm %%MYADMDIR%%/css
@dirrm %%MYADMDIR%%
+
--- files/fix-libraries::display_tbl.lib.php Sat Nov 22 03:44:24 2003
+++ /dev/null Mon Mar 22 20:18:02 2004
@@ -1,11 +0,0 @@
---- libraries/display_tbl.lib.php.orig Sat Oct 18 23:32:07 2003
-+++ libraries/display_tbl.lib.php Mon Nov 3 15:32:22 2003
-@@ -541,7 +541,7 @@
- echo '<input type="hidden" name="dontlimitchars" value="' . $dontlimitchars . '" />' . "\n";
- echo $GLOBALS['strSortByKey'] . ': <select name="sql_query"> ';
- $used_index = false;
-- $local_order = str_replace(' ', ' ', $sql_order);
-+ $local_order = (isset($sql_order) ? str_replace(' ', ' ', $sql_order) : '');
- while (list($key, $val) = each($indexes_data)) {
- $asc_sort = 'ORDER BY ';
- $desc_sort = 'ORDER BY ';
--- files/fix-libraries::display_tbl.lib.php3 Sat Nov 22 03:44:24 2003
+++ /dev/null Mon Mar 22 20:18:38 2004
@@ -1,11 +0,0 @@
---- libraries/display_tbl.lib.php.orig Sat Oct 18 23:32:07 2003
-+++ libraries/display_tbl.lib.php Mon Nov 3 15:32:22 2003
-@@ -541,7 +541,7 @@
- echo '<input type="hidden" name="dontlimitchars" value="' . $dontlimitchars . '" />' . "\n";
- echo $GLOBALS['strSortByKey'] . ': <select name="sql_query"> ';
- $used_index = false;
-- $local_order = str_replace(' ', ' ', $sql_order);
-+ $local_order = (isset($sql_order) ? str_replace(' ', ' ', $sql_order) : '');
- while (list($key, $val) = each($indexes_data)) {
- $asc_sort = 'ORDER BY ';
- $desc_sort = 'ORDER BY ';
--- files/fix-tbl_relation.php Sat Nov 22 03:44:24 2003
+++ /dev/null Mon Mar 22 20:20:04 2004
@@ -1,36 +0,0 @@
-retrieving revision 1.38
-retrieving revision 1.39
-diff -u -r1.38 -r1.39
---- tbl_relation.php.orig 2003/09/09 08:26:43 1.38
-+++ tbl_relation.php 2003/10/21 17:08:20 1.39
-@@ -1,5 +1,5 @@
- <?php
--/* $Id: tbl_relation.php,v 1.38 2003/09/09 08:26:43 nijel Exp $ */
-+/* $Id: tbl_relation.php,v 1.39 2003/10/21 17:08:20 lem9 Exp $ */
- // vim: expandtab sw=4 ts=4 sts=4:
-
- /**
-@@ -280,6 +280,9 @@
- $selectboxall[$field_full] = $field_v;
- // there could be more than one segment of the primary
- // so do not break
-+
-+ // Please watch here, tbl_type is INNODB but the
-+ // resulting value of SHOW KEYS is InnoDB
-
- if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
- $selectboxall_innodb[$field_full] = $field_v;
-@@ -295,6 +298,13 @@
- if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
- $selectboxall_innodb[$field_full] = $field_v;
- }
-+
-+ // for InnoDB, any index is allowed
-+ } else if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
-+ $field_full = $db . '.' . $curr_field['Table'] . '.' . $curr_field['Column_name'];
-+ $field_v = $curr_field['Table'] . '->' . $curr_field['Column_name'];
-+ $selectboxall_innodb[$field_full] = $field_v;
-+
- } // end if
- } // end while over keys
- } // end if (mysql_num_rows)
--- files/fix-tbl_relation.php3 Sat Nov 22 03:44:24 2003
+++ /dev/null Mon Mar 22 20:20:26 2004
@@ -1,36 +0,0 @@
-retrieving revision 1.38
-retrieving revision 1.39
-diff -u -r1.38 -r1.39
---- tbl_relation.php.orig 2003/09/09 08:26:43 1.38
-+++ tbl_relation.php 2003/10/21 17:08:20 1.39
-@@ -1,5 +1,5 @@
- <?php
--/* $Id: tbl_relation.php,v 1.38 2003/09/09 08:26:43 nijel Exp $ */
-+/* $Id: tbl_relation.php,v 1.39 2003/10/21 17:08:20 lem9 Exp $ */
- // vim: expandtab sw=4 ts=4 sts=4:
-
- /**
-@@ -280,6 +280,9 @@
- $selectboxall[$field_full] = $field_v;
- // there could be more than one segment of the primary
- // so do not break
-+
-+ // Please watch here, tbl_type is INNODB but the
-+ // resulting value of SHOW KEYS is InnoDB
-
- if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
- $selectboxall_innodb[$field_full] = $field_v;
-@@ -295,6 +298,13 @@
- if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
- $selectboxall_innodb[$field_full] = $field_v;
- }
-+
-+ // for InnoDB, any index is allowed
-+ } else if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
-+ $field_full = $db . '.' . $curr_field['Table'] . '.' . $curr_field['Column_name'];
-+ $field_v = $curr_field['Table'] . '->' . $curr_field['Column_name'];
-+ $selectboxall_innodb[$field_full] = $field_v;
-+
- } // end if
- } // end while over keys
- } // end if (mysql_num_rows)
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list