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

wrong charset information in XML exports

Browse Source
This commit is contained in:
Alexander M. Turek
2002-12-21 22:05:49 +00:00
parent 9b0249d30d
commit 1a54fa69f2
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-12-21 Alexander M. Turek <rabus@users.sourceforge.net>
* tbl_dump.php3:
- Fixed wrong charset information in XML exports.
- Beautified the output of the MySQL version number, e.g. '4.0.5' instead
of '4.00.05'.
2002-12-20 Alexander M. Turek <rabus@users.sourceforge.net> 2002-12-20 Alexander M. Turek <rabus@users.sourceforge.net>
* lang/italian-*.inc.php3: Updates, thanks again to Pietro Danesi (danone). * lang/italian-*.inc.php3: Updates, thanks again to Pietro Danesi (danone).

18
tbl_dump.php3
View File

@@ -120,7 +120,7 @@ else {
} else { } else {
$filename = PMA_convert_string($convcharset, 'iso-8859-1', $filename); $filename = PMA_convert_string($convcharset, 'iso-8859-1', $filename);
} }
// Generate basic dump extension // Generate basic dump extension
if ($what == 'csv' || $what == 'excel') { if ($what == 'csv' || $what == 'excel') {
$ext = 'csv'; $ext = 'csv';
@@ -129,7 +129,7 @@ else {
$ext = 'xml'; $ext = 'xml';
$mime_type = 'text/xml'; $mime_type = 'text/xml';
} else if ($what == 'latex') { } else if ($what == 'latex') {
$ext = 'tex'; $ext = 'tex';
$mime_type = 'application/x-tex'; $mime_type = 'application/x-tex';
} else { } else {
$ext = 'sql'; $ext = 'sql';
@@ -139,7 +139,7 @@ else {
? 'application/octetstream' ? 'application/octetstream'
: 'application/octet-stream'; : 'application/octet-stream';
} }
// If dump is going to be copressed, set correct mime_type and add // If dump is going to be copressed, set correct mime_type and add
// compression to extension // compression to extension
if (isset($bzip) && $bzip == 'bzip') { if (isset($bzip) && $bzip == 'bzip') {
@@ -191,7 +191,7 @@ else {
: '\'' . $db . '\''; : '\'' . $db . '\'';
$dump_buffer .= $crlf $dump_buffer .= $crlf
. '# ' . $strGenTime . ': ' . PMA_localisedDate() . $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 . '# ' . $strServerVersion . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3) . $crlf
. '# ' . $strPHPVersion . ': ' . phpversion() . $crlf . '# ' . $strPHPVersion . ': ' . phpversion() . $crlf
. '# ' . $strDatabase . ': ' . $formatted_db_name . $crlf; . '# ' . $strDatabase . ': ' . $formatted_db_name . $crlf;
@@ -251,7 +251,7 @@ else {
// 'xml' case // 'xml' case
else if ($GLOBALS['what'] == 'xml') { else if ($GLOBALS['what'] == 'xml') {
// first add the xml tag // first add the xml tag
$dump_buffer .= '<?xml version="1.0" encoding="' . $charset . '"?>' . $crlf . $crlf; $dump_buffer .= '<?xml version="1.0" encoding="' . $charset_of_file . '"?>' . $crlf . $crlf;
// some comments // some comments
$dump_buffer .= '<!--' . $crlf $dump_buffer .= '<!--' . $crlf
. '-' . $crlf . '-' . $crlf
@@ -265,7 +265,7 @@ else {
} }
$dump_buffer .= $crlf $dump_buffer .= $crlf
. '- ' . $strGenTime . ': ' . PMA_localisedDate() . $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 . '- ' . $strServerVersion . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3) . $crlf
. '- ' . $strPHPVersion . ': ' . phpversion() . $crlf . '- ' . $strPHPVersion . ': ' . phpversion() . $crlf
. '- ' . $strDatabase . ': \'' . $db . '\'' . $crlf . '- ' . $strDatabase . ': \'' . $db . '\'' . $crlf
. '-' . $crlf . '-' . $crlf
@@ -296,7 +296,7 @@ else {
// latex case // latex case
else if ($GLOBALS['what'] == 'latex') { else if ($GLOBALS['what'] == 'latex') {
$dump_buffer .= '% ' . $crlf $dump_buffer .= '% ' . $crlf
. '% phpMyAdmin LaTeX-Dump' . $crlf . '% phpMyAdmin LaTeX-Dump' . $crlf
@@ -322,13 +322,13 @@ else {
} }
if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $table . '|')) if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $table . '|'))
|| (!isset($tmp_select) && !empty($table))) { || (!isset($tmp_select) && !empty($table))) {
// to do: add option for the formatting ( c, l, r, p) // to do: add option for the formatting ( c, l, r, p)
$dump_buffer .= PMA_getTableLatex($db, $table, $environment, $limit_from, $limit_to, $crlf, $err_url); $dump_buffer .= PMA_getTableLatex($db, $table, $environment, $limit_from, $limit_to, $crlf, $err_url);
} }
$i++; $i++;
} }
} //end latex case } //end latex case
// 'csv' case // 'csv' case