nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prepared language files for XML exports (feature does not work yet!)

Browse Source
This commit is contained in:
Alexander M. Turek
2002-04-28 12:23:31 +00:00
parent d24641640a
commit ced0a3e40b
3 changed files with 132 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
ChangeLog
View File

@@ -6,130 +6,132 @@ $Id$
$Source$ $Source$
2002-04-28 Marc Delisle <lem9@users.sourceforge.net> 2002-04-28 Marc Delisle <lem9@users.sourceforge.net>
* tbl_properties.php3, new tbl_properties_common.php3: * tbl_properties.php3, new tbl_properties_common.php3:
start the split start the split
* tbl_properties.php3, new tbl_properties_export.php3, * tbl_properties.php3, new tbl_properties_export.php3,
tbl_properties_links.php3, lang/*.php3: export is splitted tbl_properties_links.php3, lang/*.php3: export is splitted
* new tbl_properties_table_info.php3, to be able to display links * new tbl_properties_table_info.php3, to be able to display links
on the export page on the export page
* new tbl_properties_operations.php3 * new tbl_properties_operations.php3
2002-04-28 Alexander M. Turek <rabus@users.sourceforge.net> 2002-04-28 Alexander M. Turek <rabus@users.sourceforge.net>
* 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<4C>c Chapeaux <lolo@phpheaven.net> 2002-04-28 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* tbl_properties.php3, line 395: replaced a "require" by an include. * tbl_properties.php3, line 395: replaced a "require" by an include.
* tbl_properties_links.php3: beautified code. * tbl_properties_links.php3: beautified code.
* db_details.php3, tbl_change.php3, tbl_properties.php3, user_details.php3: * db_details.php3, tbl_change.php3, tbl_properties.php3, user_details.php3:
xhtml fixes. xhtml fixes.
* lang/slovak-win1250.inc.php3: updated thanks to Peter Svec. * lang/slovak-win1250.inc.php3: updated thanks to Peter Svec.
* tbl_qbe.php3, line 732: fixed again a warning. * tbl_qbe.php3, line 732: fixed again a warning.
* tbl_addfield.php3; tbl_alter.php3: fixed bug #548495 - Alter table not * tbl_addfield.php3; tbl_alter.php3: fixed bug #548495 - Alter table not
replicate. replicate.
2002-04-27 Marc Delisle <lem9@users.sourceforge.net> 2002-04-27 Marc Delisle <lem9@users.sourceforge.net>
* tbl_properties.php3, new tbl_properties_links.php3: * tbl_properties.php3, new tbl_properties_links.php3:
remove duplicate links code. remove duplicate links code.
2002-04-27 Alexander M. Turek <rabus@users.sourceforge.net> 2002-04-27 Alexander M. Turek <rabus@users.sourceforge.net>
* Recompressed old ChangeLog without saving its path in the archive. * Recompressed old ChangeLog without saving its path in the archive.
* header.inc.php3: * header.inc.php3:
- Patch #548696 (DB/Table titles should be links), thanks to - Patch #548696 (DB/Table titles should be links), thanks to
Ray Black <allah03@users.sourceforge.net>. Ray Black <allah03@users.sourceforge.net>.
- lines: 161-164: Undefined variable. - lines: 161-164: Undefined variable.
* common.lib.php3, lines 162, 163, 435-437: Fixed bug #549570 * common.lib.php3, lines 162, 163, 435-437: Fixed bug #549570
(Strange error if controluser is invalid). (Strange error if controluser is invalid).
2002-04-27 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2002-04-27 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* Documentation.html: * Documentation.html:
- xhtml fixes; - xhtml fixes;
- added a faq entry about bug #547064 (JS error with textareas under - added a faq entry about bug #547064 (JS error with textareas under
Mozilla). Mozilla).
* libraries/display_tbl.lib.php3; libraries/functions.js: better fix * libraries/display_tbl.lib.php3; libraries/functions.js: better fix
against bug #547384 (Marker Color can't equal Pointer Color). against bug #547384 (Marker Color can't equal Pointer Color).
* libraries/auth/config.auth.lib.php3, line 111: fixed a header problem. * 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. * scripts/create-release.sh: improved so a CVS branch tag may be used.
* lang/croatian-*; libraries/select_lang.lib.php3: new Croatian * lang/croatian-*; libraries/select_lang.lib.php3: new Croatian
translations thanks to Sime Essert <sime@nofrx.org>. translations thanks to Sime Essert <sime@nofrx.org>.
* tbl_properties.php3, lines 1238-1240: fix new fields names in the * tbl_properties.php3, lines 1238-1240: fix new fields names in the
relation table. relation table.
* tbl_printview.php3; tbl_qbe.php3: optimization, warnings and coding * tbl_printview.php3; tbl_qbe.php3: optimization, warnings and coding
standards. standards.
* header.inc.php3, lines 166-172: xhtml fixes. * header.inc.php3, lines 166-172: xhtml fixes.
* Compressed ChangeLog till the 2.2.6 release. * Compressed ChangeLog till the 2.2.6 release.
2002-04-26 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2002-04-26 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* ## created 2.2.7 branch into the CVS tree ## * ## created 2.2.7 branch into the CVS tree ##
* lang/nowegian.inc.php: updated thanks to Sven-Erik Andersen. * lang/nowegian.inc.php: updated thanks to Sven-Erik Andersen.
* lang/brazilian_portuguese.inc.php3: updated thanks to Renato Lins. * lang/brazilian_portuguese.inc.php3: updated thanks to Renato Lins.
* sql.php3; tbl_replace.php3: patch #547030 - file_exists $goto thanks to * sql.php3; tbl_replace.php3: patch #547030 - file_exists $goto thanks to
Melvyn Sopacua <nyvlem at users.sourceforge.net>. Melvyn Sopacua <nyvlem at users.sourceforge.net>.
* libraries/common.lib.php3, line 70: "invalid" path. * libraries/common.lib.php3, line 70: "invalid" path.
* tbl_printview.php3; tbl_qbe.php3: coding standards and warnings. * tbl_printview.php3; tbl_qbe.php3: coding standards and warnings.
2002-04-26 Marc Delisle <lem9@users.sourceforge.net> 2002-04-26 Marc Delisle <lem9@users.sourceforge.net>
* tbl_qbe.php3: automatic joints from Relation table, thanks * tbl_qbe.php3: automatic joints from Relation table, thanks
to Mike Beck (mike.beck at ibmiller.de) to Mike Beck (mike.beck at ibmiller.de)
(experimental: some things remain to be tested) (experimental: some things remain to be tested)
* Documentation.html: example for automatic joints * Documentation.html: example for automatic joints
* tbl_qbe.php3, tbl_printview.php3, libraries/display_tbl.lib.php3, * tbl_qbe.php3, tbl_printview.php3, libraries/display_tbl.lib.php3,
Documentation.html: rename fields in the relation table Documentation.html: rename fields in the relation table
2002-04-26 Alexander M. Turek <rabus@users.sourceforge.net> 2002-04-26 Alexander M. Turek <rabus@users.sourceforge.net>
* libraries/common.lib.php3: fixed a controluser bug. * libraries/common.lib.php3: fixed a controluser bug.
* libraries/display_tbl.lib.php3: fixed bug #547384 (Marker Color can't * libraries/display_tbl.lib.php3: fixed bug #547384 (Marker Color can't
equal Pointer Color) equal Pointer Color)
2002-04-25 Alexander M. Turek <rabus@users.sourceforge.net> 2002-04-25 Alexander M. Turek <rabus@users.sourceforge.net>
* 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 <lem9@users.sourceforge.net> 2002-04-24 Marc Delisle <lem9@users.sourceforge.net>
* tbl_*.php3: $cfg system changes * tbl_*.php3: $cfg system changes
2002-04-24 Alexander M. Turek <rabus@users.sourceforge.net> 2002-04-24 Alexander M. Turek <rabus@users.sourceforge.net>
* libraries/*, lang/*: $cfg system changes. * libraries/*, lang/*: $cfg system changes.
* libraries/common.lib.php3, libraries/select_lang.php3, * libraries/common.lib.php3, libraries/select_lang.php3,
libraries/config_import.lib.php3: Config file backwards compatibility. libraries/config_import.lib.php3: Config file backwards compatibility.
2002-04-24 Robin Johnson <robbat2@users.sourceforge.net> 2002-04-24 Robin Johnson <robbat2@users.sourceforge.net>
* *.php3 NOT tbl_*.php, Documentation.*: $cfg system changes. * *.php3 NOT tbl_*.php, Documentation.*: $cfg system changes.
* scripts/extchg.sh: Updated URL * scripts/extchg.sh: Updated URL
* scripts/convertcfg.pl: Conversion between old config files and new ones. * scripts/convertcfg.pl: Conversion between old config files and new ones.
* scripts/*: Updated comments somewhat * scripts/*: Updated comments somewhat
* tbl_dump.php3:121: renamed $cfgServer_backup to $backup_cfgServer * tbl_dump.php3:121: renamed $cfgServer_backup to $backup_cfgServer
* user_details.php3: forgot to change $GLOBALS['cfgXYZ'] to $GLOBALS['cfg']['XYZ'] * user_details.php3: forgot to change $GLOBALS['cfgXYZ'] to $GLOBALS['cfg']['XYZ']
* libraries/common.lib.php3: a single $cfgServer instance was forgotten * libraries/common.lib.php3: a single $cfgServer instance was forgotten
2002-04-23 Marc Delisle <lem9@users.sourceforge.net> 2002-04-23 Marc Delisle <lem9@users.sourceforge.net>
* tbl_printview.php3, lang/*.php3: Relation links in printview, * tbl_printview.php3, lang/*.php3: Relation links in printview,
thanks to Mike Beck (mike.beck at ibmiller.de) thanks to Mike Beck (mike.beck at ibmiller.de)
2002-04-23 Alexander M. Turek <rabus@users.sourceforge.net> 2002-04-23 Alexander M. Turek <rabus@users.sourceforge.net>
* libraries/common.lib.php3: fixed bug #547605 using Lo<4C>c's patch. * libraries/common.lib.php3: fixed bug #547605 using Lo<4C>c's patch.
* tbl_printview.php3: Fixed a small bug, some php and XHTML 1.0 errors and * tbl_printview.php3: Fixed a small bug, some php and XHTML 1.0 errors and
beautified the generated code. beautified the generated code.
* lang/german.inc.php3: Translated the new string. * lang/german.inc.php3: Translated the new string.
* Documentation.html: Changed notes concerning php 4.2.0. * Documentation.html: Changed notes concerning php 4.2.0.
2002-04-22 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2002-04-22 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* 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 <lem9@users.sourceforge.net> 2002-04-22 Marc Delisle <lem9@users.sourceforge.net>
* lang/japanese* updates, thanks to Yukihiro Kawada * lang/japanese* updates, thanks to Yukihiro Kawada
2002-04-22 Alexander M. Turek <rabus@users.sourceforge.net> 2002-04-22 Alexander M. Turek <rabus@users.sourceforge.net>
* lang/russian-koi8.inc.php3: fixed a typo (bug #546981). * lang/russian-koi8.inc.php3: fixed a typo (bug #546981).
* lang/german.inc.php3: better syntax. * lang/german.inc.php3: better syntax.
* db_details.php3, mult_submits.inx.php3, tbl_properties.php3: * db_details.php3, mult_submits.inx.php3, tbl_properties.php3:
Use TRUNCATE instead of DELETE when using MySQL 4. Use TRUNCATE instead of DELETE when using MySQL 4.
2002-04-21 Alexander M. Turek <rabus@users.sourceforge.net> 2002-04-21 Alexander M. Turek <rabus@users.sourceforge.net>
* main.php3: Restarted work on patch #538740 (get users priv. with * main.php3: Restarted work on patch #538740 (get users priv. with
SHOW GRANTS). SHOW GRANTS).
2002-04-21 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2002-04-21 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* libraries/auth/http.auth.lib.php3: tried a fix to allow the use of http * libraries/auth/http.auth.lib.php3: tried a fix to allow the use of http
authentication mode with IIS. authentication mode with IIS.
2002-04-21 Marc Delisle <lem9@users.sourceforge.net> 2002-04-21 Marc Delisle <lem9@users.sourceforge.net>
* ### 2.2.6 released ### * ### 2.2.6 released ###

6
db_details.php3
View File

@@ -646,7 +646,7 @@ if ($num_tables > 0) {
echo "\n"; echo "\n";
?> ?>
<td> <td>
<select name="table_select[]" size="5" multiple="multiple"> <select name="table_select[]" size="6" multiple="multiple">
<?php <?php
$i = 0; $i = 0;
echo "\n"; echo "\n";
@@ -670,7 +670,9 @@ if ($num_tables > 0) {
<input type="radio" name="what" id="radio_dump_data" value="data" /> <input type="radio" name="what" id="radio_dump_data" value="data" />
<label for="radio_dump_data"><?php echo $strStrucData; ?></label><br /> <label for="radio_dump_data"><?php echo $strStrucData; ?></label><br />
<input type="radio" name="what" id="radio_dump_dataonly" value="dataonly" /> <input type="radio" name="what" id="radio_dump_dataonly" value="dataonly" />
<label for="radio_dump_dataonly"><?php echo $strDataOnly; ?></label> <label for="radio_dump_dataonly"><?php echo $strDataOnly; ?></label><br />
<input type="radio" name="what" id="radio_dump_xml" value="xml" />
<label for="radio_dump_xml"><?php echo $strExportToXML; ?></label>
<?php <?php
if ($num_tables > 1) { if ($num_tables > 1) {
echo "\n"; echo "\n";

45
tbl_dump.php3
View File

@@ -146,6 +146,9 @@ else {
} else if ($what == 'csv' || $what == 'excel') { } else if ($what == 'csv' || $what == 'excel') {
$ext = 'csv'; $ext = 'csv';
$mime_type = 'text/x-csv'; $mime_type = 'text/x-csv';
} else if ($what == 'xml') {
$ext = 'xml';
$mime_type = 'text/xml';
} else { } else {
$ext = 'sql'; $ext = 'sql';
// loic1: 'application/octet-stream' is the registered IANA type but // 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 // At least on table -> do the work
else { else {
// No csv format -> add some comments at the top // No csv or xml format -> add some comments at the top
if ($what != 'csv' && $what != 'excel') { if ($what != 'csv' && $what != 'excel' && $what != 'xml') {
$dump_buffer .= '# phpMyAdmin MySQL-Dump' . $crlf $dump_buffer .= '# phpMyAdmin MySQL-Dump' . $crlf
. '# version ' . PMA_VERSION . $crlf . '# version ' . PMA_VERSION . $crlf
. '# http://phpwizard.net/phpMyAdmin/' . $crlf . '# http://phpwizard.net/phpMyAdmin/' . $crlf
@@ -265,8 +268,35 @@ else {
// staybyte: don't remove, it makes easier to select & copy from // staybyte: don't remove, it makes easier to select & copy from
// browser // browser
$dump_buffer .= $crlf; $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 .= '<?xml version="1.0" encoding="' . $charset . '"?>' . $crlf;
// some comments
$dump_buffer .= '<!--' . $crlf
. '-' . $crlf
. '- phpMyAdmin XML-Dump' . $crlf
. '- version ' . PMA_VERSION . $crlf
. '- http://phpwizard.net/phpMyAdmin/' . $crlf
. '- http://www.phpmyadmin.net/ (download page)' . $crlf
. '-' . $crlf
. '- ' . $strHost . ': ' . $cfg['Server']['host'];
if (!empty($cfg['Server']['port'])) {
$dump_buffer .= ':' . $cfg['Server']['port'];
}
$formatted_db_name = (isset($use_backquotes))
? PMA_backquote($db)
: '\'' . $db . '\'';
$dump_buffer .= $crlf
. '- ' . $strGenTime . ': ' . PMA_localisedDate() . $crlf
. '- ' . $strServerVersion . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . substr(PMA_MYSQL_INT_VERSION, 3) . $crlf
. '- ' . $strPHPVersion . ': ' . phpversion() . $crlf
. '- ' . $strDatabase . ': ' . $formatted_db_name . $crlf
. '-' . $crlf
. '-->' . $crlf;
}
// 'csv' case // 'csv' case
else { else {
// Handles the EOL character // Handles the EOL character
@@ -319,11 +349,14 @@ else if (isset($gzip) && $gzip == 'gzip') {
echo gzencode($dump_buffer); echo gzencode($dump_buffer);
} }
} }
// 4. on screen or as a text file // 4. as a text file
else { else if (!empty($asfile)) {
echo $dump_buffer; 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 * Close the html tags and add the footers in dump is displayed on screen