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

Default charset for export is now configurable (RFE #1263772).

Browse Source
This commit is contained in:
Michal Čihař
2005-08-22 21:41:20 +00:00
parent 6164cb16ae
commit 39ea0b8557
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -9,6 +9,9 @@ $Source$
* error.php, libraries/common.lib.php, libraries/sanitizing.lib.php: * error.php, libraries/common.lib.php, libraries/sanitizing.lib.php:
Protect against possible XSS (bug #1265740), move input sanitizing to Protect against possible XSS (bug #1265740), move input sanitizing to
special file. special file.
* config.inc.php, libraries/common.lib.php,
libraries/config_import.lib.php, libraries/display_export.lib.php:
Default charset for export is now configurable (RFE #1263772).
2005-08-20 Marc Delisle <lem9@users.sourceforge.net> 2005-08-20 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php, new error.php: patch #1258978, move common * libraries/common.lib.php, new error.php: patch #1258978, move common

1
config.inc.php
View File

@@ -330,6 +330,7 @@ $cfg['Export']['format'] = 'sql'; // sql/latex/excel/csv/xml
$cfg['Export']['compression'] = 'none'; // none/zip/gzip/bzip2 $cfg['Export']['compression'] = 'none'; // none/zip/gzip/bzip2
$cfg['Export']['asfile'] = FALSE; $cfg['Export']['asfile'] = FALSE;
$cfg['Export']['charset'] = '';
$cfg['Export']['onserver'] = FALSE; $cfg['Export']['onserver'] = FALSE;
$cfg['Export']['onserver_overwrite'] = FALSE; $cfg['Export']['onserver_overwrite'] = FALSE;
$cfg['Export']['remember_file_template'] = TRUE; $cfg['Export']['remember_file_template'] = TRUE;

2
libraries/common.lib.php
View File

@@ -123,7 +123,7 @@ if (isset($cfg['FileRevision'])) {
} else { } else {
$cfg['FileRevision'] = array(1, 1); $cfg['FileRevision'] = array(1, 1);
} }
if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 62)) { if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 64)) {
require_once('./libraries/config_import.lib.php'); require_once('./libraries/config_import.lib.php');
} }

3
libraries/config_import.lib.php
View File

@@ -1145,6 +1145,9 @@ if (!isset($cfg['Export']['compression'])) {
if (!isset($cfg['Export']['asfile'])) { if (!isset($cfg['Export']['asfile'])) {
$cfg['Export']['asfile'] = FALSE; $cfg['Export']['asfile'] = FALSE;
} }
if (!isset($cfg['Export']['charset'])) {
$cfg['Export']['charset'] = '';
}
if (!isset($cfg['Export']['onserver'])) { if (!isset($cfg['Export']['onserver'])) {
$cfg['Export']['onserver'] = FALSE; $cfg['Export']['onserver'] = FALSE;
} }

13
libraries/display_export.lib.php
View File

@@ -687,19 +687,14 @@ if (isset($table) && !empty($table) && !isset($num_tables)) {
echo "\n"; echo "\n";
$temp_charset = reset($cfg['AvailableCharsets']); $temp_charset = reset($cfg['AvailableCharsets']);
echo '<select id="select_charset_of_file" name="charset_of_file" size="1">' . "\n" echo '<select id="select_charset_of_file" name="charset_of_file" size="1">' . "\n";
. ' <option value="' . $temp_charset . '"'; foreach($cfg['AvailableCharsets'] as $key => $temp_charset) {
if ($temp_charset == $charset) {
echo ' selected="selected"';
}
echo '>' . $temp_charset . '</option>' . "\n";
while ($temp_charset = next($cfg['AvailableCharsets'])) {
echo ' <option value="' . $temp_charset . '"'; echo ' <option value="' . $temp_charset . '"';
if ($temp_charset == $charset) { if ((empty($cfg['Export']['charset']) && $temp_charset == $charset) || $temp_charset == $cfg['Export']['charset']) {
echo ' selected="selected"'; echo ' selected="selected"';
} }
echo '>' . $temp_charset . '</option>' . "\n"; echo '>' . $temp_charset . '</option>' . "\n";
} // end while } // end foreach
echo ' </select>'; echo ' </select>';
} // end if } // end if
echo "\n"; echo "\n";