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

Allow xml to be also default export (bug #796706).

Browse Source
This commit is contained in:
Michal Čihař
2003-08-28 14:36:50 +00:00
parent 4c221e3de8
commit d745297bac
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-08-28 Michal Cihar <nijel@users.sourceforge.net>
* libraries/display_export.lib.php3: Allow xml to be also default export
(bug #796706).
2003-08-27 Marc Delisle <lem9@users.sourceforge.net> 2003-08-27 Marc Delisle <lem9@users.sourceforge.net>
* tbl_relation.php3: User forgot to define an index on the master table * tbl_relation.php3: User forgot to define an index on the master table
before adding a foreign key constraint: trap the error, warn the user before adding a foreign key constraint: trap the error, warn the user

9
libraries/display_export.lib.php3
View File

@@ -23,6 +23,7 @@ function PMA_exportIsActive($what, $val) {
<?php <?php
$hide_structure = false; $hide_structure = false;
$hide_sql = false; $hide_sql = false;
$hide_xml = empty($db);
if ($export_type == 'server') { if ($export_type == 'server') {
echo PMA_generate_common_hidden_inputs('', '', 1); echo PMA_generate_common_hidden_inputs('', '', 1);
} elseif ($export_type == 'database') { } elseif ($export_type == 'database') {
@@ -88,7 +89,9 @@ if (isset($sql_query)) {
<!-- General CSV --> <!-- General CSV -->
<input type="radio" name="what" value="csv" id="radio_dump_csv" onclick="if(this.checked) { hide_them_all(); getElement('csv_options').style.display = 'block'; }; return true" <?php PMA_exportIsActive('format', 'csv'); ?> /> <input type="radio" name="what" value="csv" id="radio_dump_csv" onclick="if(this.checked) { hide_them_all(); getElement('csv_options').style.display = 'block'; }; return true" <?php PMA_exportIsActive('format', 'csv'); ?> />
<label for="radio_dump_csv"><?php echo $strStrucCSV;?></label> <label for="radio_dump_csv"><?php echo $strStrucCSV;?></label>
<?php if (!empty($db)) { ?>
<?php if (!$hide_xml) { ?>
<br /><br /> <br /><br />
<!-- XML --> <!-- XML -->
@@ -370,6 +373,10 @@ if ($cfgRelation['mimework']) {
<?php if (!$hide_sql) { ?> <?php if (!$hide_sql) { ?>
} else if (getElement('radio_dump_sql').checked) { } else if (getElement('radio_dump_sql').checked) {
getElement('sql_options').style.display = 'block'; getElement('sql_options').style.display = 'block';
<?php } ?>
<?php if (!$hide_xml) { ?>
} else if (getElement('radio_dump_xml').checked) {
getElement('none_options').style.display = 'block';
<?php } ?> <?php } ?>
} else if (getElement('radio_dump_csv').checked) { } else if (getElement('radio_dump_csv').checked) {
getElement('csv_options').style.display = 'block'; getElement('csv_options').style.display = 'block';