From ced0a3e40b5d341fd70ccb984a07cd4fe389e38a Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Sun, 28 Apr 2002 12:23:31 +0000 Subject: [PATCH] prepared language files for XML exports (feature does not work yet!) --- ChangeLog | 176 ++++++++++++++++++++++++------------------------ db_details.php3 | 6 +- tbl_dump.php3 | 45 +++++++++++-- 3 files changed, 132 insertions(+), 95 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74d112c30..f697f3821 100755 --- a/ChangeLog +++ b/ChangeLog @@ -6,130 +6,132 @@ $Id$ $Source$ 2002-04-28 Marc Delisle - * tbl_properties.php3, new tbl_properties_common.php3: - start the split - * tbl_properties.php3, new tbl_properties_export.php3, - tbl_properties_links.php3, lang/*.php3: export is splitted - * new tbl_properties_table_info.php3, to be able to display links - on the export page - * new tbl_properties_operations.php3 + * tbl_properties.php3, new tbl_properties_common.php3: + start the split + * tbl_properties.php3, new tbl_properties_export.php3, + tbl_properties_links.php3, lang/*.php3: export is splitted + * new tbl_properties_table_info.php3, to be able to display links + on the export page + * new tbl_properties_operations.php3 2002-04-28 Alexander M. Turek - * header.inc.php3, lines 162-170: Improved patch #548696. + * header.inc.php3, lines 162-170: Improved patch #548696. + * lang/*.php3, db_details.php3, tbl_dump.php3: + prepared files for XML exports. 2002-04-28 Loïc Chapeaux - * tbl_properties.php3, line 395: replaced a "require" by an include. - * tbl_properties_links.php3: beautified code. - * db_details.php3, tbl_change.php3, tbl_properties.php3, user_details.php3: - xhtml fixes. - * lang/slovak-win1250.inc.php3: updated thanks to Peter Svec. - * tbl_qbe.php3, line 732: fixed again a warning. - * tbl_addfield.php3; tbl_alter.php3: fixed bug #548495 - Alter table not - replicate. + * tbl_properties.php3, line 395: replaced a "require" by an include. + * tbl_properties_links.php3: beautified code. + * db_details.php3, tbl_change.php3, tbl_properties.php3, user_details.php3: + xhtml fixes. + * lang/slovak-win1250.inc.php3: updated thanks to Peter Svec. + * tbl_qbe.php3, line 732: fixed again a warning. + * tbl_addfield.php3; tbl_alter.php3: fixed bug #548495 - Alter table not + replicate. 2002-04-27 Marc Delisle - * tbl_properties.php3, new tbl_properties_links.php3: - remove duplicate links code. + * tbl_properties.php3, new tbl_properties_links.php3: + remove duplicate links code. 2002-04-27 Alexander M. Turek - * Recompressed old ChangeLog without saving its path in the archive. - * header.inc.php3: - - Patch #548696 (DB/Table titles should be links), thanks to - Ray Black . - - lines: 161-164: Undefined variable. - * common.lib.php3, lines 162, 163, 435-437: Fixed bug #549570 - (Strange error if controluser is invalid). + * Recompressed old ChangeLog without saving its path in the archive. + * header.inc.php3: + - Patch #548696 (DB/Table titles should be links), thanks to + Ray Black . + - lines: 161-164: Undefined variable. + * common.lib.php3, lines 162, 163, 435-437: Fixed bug #549570 + (Strange error if controluser is invalid). 2002-04-27 Loïc Chapeaux - * Documentation.html: - - xhtml fixes; - - added a faq entry about bug #547064 (JS error with textareas under - Mozilla). - * libraries/display_tbl.lib.php3; libraries/functions.js: better fix - against bug #547384 (Marker Color can't equal Pointer Color). - * libraries/auth/config.auth.lib.php3, line 111: fixed a header problem. - * scripts/create-release.sh: improved so a CVS branch tag may be used. - * lang/croatian-*; libraries/select_lang.lib.php3: new Croatian - translations thanks to Sime Essert . - * tbl_properties.php3, lines 1238-1240: fix new fields names in the - relation table. - * tbl_printview.php3; tbl_qbe.php3: optimization, warnings and coding - standards. - * header.inc.php3, lines 166-172: xhtml fixes. - * Compressed ChangeLog till the 2.2.6 release. + * Documentation.html: + - xhtml fixes; + - added a faq entry about bug #547064 (JS error with textareas under + Mozilla). + * libraries/display_tbl.lib.php3; libraries/functions.js: better fix + against bug #547384 (Marker Color can't equal Pointer Color). + * libraries/auth/config.auth.lib.php3, line 111: fixed a header problem. + * scripts/create-release.sh: improved so a CVS branch tag may be used. + * lang/croatian-*; libraries/select_lang.lib.php3: new Croatian + translations thanks to Sime Essert . + * tbl_properties.php3, lines 1238-1240: fix new fields names in the + relation table. + * tbl_printview.php3; tbl_qbe.php3: optimization, warnings and coding + standards. + * header.inc.php3, lines 166-172: xhtml fixes. + * Compressed ChangeLog till the 2.2.6 release. 2002-04-26 Loïc Chapeaux - * ## created 2.2.7 branch into the CVS tree ## - * lang/nowegian.inc.php: updated thanks to Sven-Erik Andersen. - * lang/brazilian_portuguese.inc.php3: updated thanks to Renato Lins. - * sql.php3; tbl_replace.php3: patch #547030 - file_exists $goto thanks to - Melvyn Sopacua . - * libraries/common.lib.php3, line 70: "invalid" path. - * tbl_printview.php3; tbl_qbe.php3: coding standards and warnings. + * ## created 2.2.7 branch into the CVS tree ## + * lang/nowegian.inc.php: updated thanks to Sven-Erik Andersen. + * lang/brazilian_portuguese.inc.php3: updated thanks to Renato Lins. + * sql.php3; tbl_replace.php3: patch #547030 - file_exists $goto thanks to + Melvyn Sopacua . + * libraries/common.lib.php3, line 70: "invalid" path. + * tbl_printview.php3; tbl_qbe.php3: coding standards and warnings. 2002-04-26 Marc Delisle - * tbl_qbe.php3: automatic joints from Relation table, thanks - to Mike Beck (mike.beck at ibmiller.de) - (experimental: some things remain to be tested) - * Documentation.html: example for automatic joints - * tbl_qbe.php3, tbl_printview.php3, libraries/display_tbl.lib.php3, - Documentation.html: rename fields in the relation table + * tbl_qbe.php3: automatic joints from Relation table, thanks + to Mike Beck (mike.beck at ibmiller.de) + (experimental: some things remain to be tested) + * Documentation.html: example for automatic joints + * tbl_qbe.php3, tbl_printview.php3, libraries/display_tbl.lib.php3, + Documentation.html: rename fields in the relation table 2002-04-26 Alexander M. Turek - * libraries/common.lib.php3: fixed a controluser bug. - * libraries/display_tbl.lib.php3: fixed bug #547384 (Marker Color can't - equal Pointer Color) + * libraries/common.lib.php3: fixed a controluser bug. + * libraries/display_tbl.lib.php3: fixed bug #547384 (Marker Color can't + equal Pointer Color) 2002-04-25 Alexander M. Turek - * lang/italian.inc.php3: updated, thanks again to Pietro Danesi. + * lang/italian.inc.php3: updated, thanks again to Pietro Danesi. 2002-04-24 Marc Delisle - * tbl_*.php3: $cfg system changes + * tbl_*.php3: $cfg system changes 2002-04-24 Alexander M. Turek - * libraries/*, lang/*: $cfg system changes. - * libraries/common.lib.php3, libraries/select_lang.php3, - libraries/config_import.lib.php3: Config file backwards compatibility. + * libraries/*, lang/*: $cfg system changes. + * libraries/common.lib.php3, libraries/select_lang.php3, + libraries/config_import.lib.php3: Config file backwards compatibility. 2002-04-24 Robin Johnson - * *.php3 NOT tbl_*.php, Documentation.*: $cfg system changes. - * scripts/extchg.sh: Updated URL - * scripts/convertcfg.pl: Conversion between old config files and new ones. - * scripts/*: Updated comments somewhat - * tbl_dump.php3:121: renamed $cfgServer_backup to $backup_cfgServer - * user_details.php3: forgot to change $GLOBALS['cfgXYZ'] to $GLOBALS['cfg']['XYZ'] - * libraries/common.lib.php3: a single $cfgServer instance was forgotten + * *.php3 NOT tbl_*.php, Documentation.*: $cfg system changes. + * scripts/extchg.sh: Updated URL + * scripts/convertcfg.pl: Conversion between old config files and new ones. + * scripts/*: Updated comments somewhat + * tbl_dump.php3:121: renamed $cfgServer_backup to $backup_cfgServer + * user_details.php3: forgot to change $GLOBALS['cfgXYZ'] to $GLOBALS['cfg']['XYZ'] + * libraries/common.lib.php3: a single $cfgServer instance was forgotten 2002-04-23 Marc Delisle - * tbl_printview.php3, lang/*.php3: Relation links in printview, - thanks to Mike Beck (mike.beck at ibmiller.de) + * tbl_printview.php3, lang/*.php3: Relation links in printview, + thanks to Mike Beck (mike.beck at ibmiller.de) 2002-04-23 Alexander M. Turek - * libraries/common.lib.php3: fixed bug #547605 using Loïc's patch. - * tbl_printview.php3: Fixed a small bug, some php and XHTML 1.0 errors and - beautified the generated code. - * lang/german.inc.php3: Translated the new string. - * Documentation.html: Changed notes concerning php 4.2.0. + * libraries/common.lib.php3: fixed bug #547605 using Loïc's patch. + * tbl_printview.php3: Fixed a small bug, some php and XHTML 1.0 errors and + beautified the generated code. + * lang/german.inc.php3: Translated the new string. + * Documentation.html: Changed notes concerning php 4.2.0. 2002-04-22 Loïc Chapeaux - * lang/slovak-win1250.inc.php3: completed, thanks to Peter Svec. + * lang/slovak-win1250.inc.php3: completed, thanks to Peter Svec. 2002-04-22 Marc Delisle - * lang/japanese* updates, thanks to Yukihiro Kawada + * lang/japanese* updates, thanks to Yukihiro Kawada 2002-04-22 Alexander M. Turek - * lang/russian-koi8.inc.php3: fixed a typo (bug #546981). - * lang/german.inc.php3: better syntax. - * db_details.php3, mult_submits.inx.php3, tbl_properties.php3: - Use TRUNCATE instead of DELETE when using MySQL 4. + * lang/russian-koi8.inc.php3: fixed a typo (bug #546981). + * lang/german.inc.php3: better syntax. + * db_details.php3, mult_submits.inx.php3, tbl_properties.php3: + Use TRUNCATE instead of DELETE when using MySQL 4. 2002-04-21 Alexander M. Turek - * main.php3: Restarted work on patch #538740 (get users priv. with - SHOW GRANTS). + * main.php3: Restarted work on patch #538740 (get users priv. with + SHOW GRANTS). 2002-04-21 Loïc Chapeaux - * libraries/auth/http.auth.lib.php3: tried a fix to allow the use of http - authentication mode with IIS. + * libraries/auth/http.auth.lib.php3: tried a fix to allow the use of http + authentication mode with IIS. 2002-04-21 Marc Delisle - * ### 2.2.6 released ### + * ### 2.2.6 released ### diff --git a/db_details.php3 b/db_details.php3 index e4e5220cf..6edafd249 100755 --- a/db_details.php3 +++ b/db_details.php3 @@ -646,7 +646,7 @@ if ($num_tables > 0) { echo "\n"; ?> - 0) {
- +
+ + 1) { echo "\n"; diff --git a/tbl_dump.php3 b/tbl_dump.php3 index 3a6946ddf..884d81917 100755 --- a/tbl_dump.php3 +++ b/tbl_dump.php3 @@ -146,6 +146,9 @@ else { } else if ($what == 'csv' || $what == 'excel') { $ext = 'csv'; $mime_type = 'text/x-csv'; + } else if ($what == 'xml') { + $ext = 'xml'; + $mime_type = 'text/xml'; } else { $ext = 'sql'; // loic1: 'application/octet-stream' is the registered IANA type but @@ -189,8 +192,8 @@ if ($num_tables == 0) { } // At least on table -> do the work else { - // No csv format -> add some comments at the top - if ($what != 'csv' && $what != 'excel') { + // No csv or xml format -> add some comments at the top + if ($what != 'csv' && $what != 'excel' && $what != 'xml') { $dump_buffer .= '# phpMyAdmin MySQL-Dump' . $crlf . '# version ' . PMA_VERSION . $crlf . '# http://phpwizard.net/phpMyAdmin/' . $crlf @@ -265,8 +268,35 @@ else { // staybyte: don't remove, it makes easier to select & copy from // browser $dump_buffer .= $crlf; - } // end 'no csv' case + } // end 'no csv or xml' case + // 'xml' case + else if ($GLOBALS['what'] == 'xml') { + // first add the xml tag + $dump_buffer .= '' . $crlf; + // some comments + $dump_buffer .= '' . $crlf; + } // 'csv' case else { // Handles the EOL character @@ -319,11 +349,14 @@ else if (isset($gzip) && $gzip == 'gzip') { echo gzencode($dump_buffer); } } -// 4. on screen or as a text file -else { +// 4. as a text file +else if (!empty($asfile)) { echo $dump_buffer; } - +// 5. on display +else { + echo htmlspecialchars($dump_buffer); +} /** * Close the html tags and add the footers in dump is displayed on screen