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

Disabled XML export for multiple databases because an XML file must not contain more than one database.

Browse Source
This commit is contained in:
Alexander M. Turek
2003-07-11 16:14:12 +00:00
parent eedbf30782
commit 1ce64c9f32
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -14,6 +14,8 @@ $Source$
- Display CREATE DATABASE query; - Display CREATE DATABASE query;
- Call user-defined default tab instead of hardcoded db_details.php3. - Call user-defined default tab instead of hardcoded db_details.php3.
* index.php3: Don't display scrollbars in queryframe (Opera fix). * index.php3: Don't display scrollbars in queryframe (Opera fix).
* libraries/display_export.lib.php3: Disabled XML export for multiple
databases because an XML file must not contain more than one database.
2003-07-10 Garvin Hicking <me@supergarv.de> 2003-07-10 Garvin Hicking <me@supergarv.de>
* libraries/display_tbl.lib.php3: Let the default function take * libraries/display_tbl.lib.php3: Let the default function take

46
libraries/display_export.lib.php3
View File

@@ -2,7 +2,7 @@
/* $Id$ */ /* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4: // vim: expandtab sw=4 ts=4 sts=4:
// Get relations & co. status // Get relations & co. status
require('./libraries/relation.lib.php3'); require('./libraries/relation.lib.php3');
$cfgRelation = PMA_getRelationsParam(); $cfgRelation = PMA_getRelationsParam();
@@ -20,7 +20,7 @@ function PMA_exportIsActive($what, $val) {
?> ?>
<form method="post" action="export.php3" name="dump"> <form method="post" action="export.php3" name="dump">
<?php <?php
$hide_structure = false; $hide_structure = false;
$hide_sql = false; $hide_sql = false;
if ($export_type == 'server') { if ($export_type == 'server') {
@@ -68,7 +68,7 @@ if (isset($sql_query)) {
echo $multi_values; echo $multi_values;
} }
?> ?>
<?php if (!$hide_sql) { ?> <?php if (!$hide_sql) { ?>
<!-- SQL --> <!-- SQL -->
<input type="radio" name="what" value="sql" id="radio_dump_sql" onclick="if(this.checked) { hide_them_all(); getElement('sql_options').style.display = 'block'; }; return true" <?php PMA_exportIsActive('format', 'sql'); ?> /> <input type="radio" name="what" value="sql" id="radio_dump_sql" onclick="if(this.checked) { hide_them_all(); getElement('sql_options').style.display = 'block'; }; return true" <?php PMA_exportIsActive('format', 'sql'); ?> />
@@ -88,16 +88,18 @@ 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)) { ?>
<br /><br /> <br /><br />
<!-- XML --> <!-- XML -->
<input type="radio" name="what" value="xml" id="radio_dump_xml" onclick="if(this.checked) { hide_them_all(); getElement('none_options').style.display = 'block'; }; return true" <?php PMA_exportIsActive('format', 'xml'); ?> /> <input type="radio" name="what" value="xml" id="radio_dump_xml" onclick="if(this.checked) { hide_them_all(); getElement('none_options').style.display = 'block'; }; return true" <?php PMA_exportIsActive('format', 'xml'); ?> />
<label for="radio_dump_xml"><?php echo $strXML; ?></label>&nbsp;&nbsp; <label for="radio_dump_xml"><?php echo $strXML; ?></label>&nbsp;&nbsp;
<?php } ?>
</fieldset> </fieldset>
</td> </td>
<!-- Options --> <!-- Options -->
<td valign="top" id="options_td" width="400"> <td valign="top" id="options_td" width="400">
<?php if (!$hide_sql) { ?> <?php if (!$hide_sql) { ?>
<!-- SQL options --> <!-- SQL options -->
<fieldset id="sql_options"> <fieldset id="sql_options">
@@ -139,21 +141,21 @@ if (PMA_MYSQL_INT_VERSION >= 32306) {
?> ?>
<fieldset> <fieldset>
<legend><?php echo $strAddIntoComments; ?></legend> <legend><?php echo $strAddIntoComments; ?></legend>
<?php <?php
if (!empty($cfgRelation['relation'])) { if (!empty($cfgRelation['relation'])) {
?> ?>
<input type="checkbox" name="sql_relation" value="yes" id="checkbox_sql_use_relation" <?php PMA_exportCheckboxCheck('sql_relation'); ?> /> <input type="checkbox" name="sql_relation" value="yes" id="checkbox_sql_use_relation" <?php PMA_exportCheckboxCheck('sql_relation'); ?> />
<label for="checkbox_sql_use_relation"><?php echo $strRelations; ?></label><br /> <label for="checkbox_sql_use_relation"><?php echo $strRelations; ?></label><br />
<?php <?php
} // end relation } // end relation
if ($cfgRelation['commwork']) { if ($cfgRelation['commwork']) {
?> ?>
<input type="checkbox" name="sql_comments" value="yes" id="checkbox_sql_use_comments" <?php PMA_exportCheckboxCheck('sql_comments'); ?> /> <input type="checkbox" name="sql_comments" value="yes" id="checkbox_sql_use_comments" <?php PMA_exportCheckboxCheck('sql_comments'); ?> />
<label for="checkbox_sql_use_comments"><?php echo $strComments; ?></label><br /> <label for="checkbox_sql_use_comments"><?php echo $strComments; ?></label><br />
<?php <?php
} // end comments } // end comments
if ($cfgRelation['mimework']) { if ($cfgRelation['mimework']) {
?> ?>
<input type="checkbox" name="sql_mime" value="yes" id="checkbox_sql_use_mime" <?php PMA_exportCheckboxCheck('sql_mime'); ?> /> <input type="checkbox" name="sql_mime" value="yes" id="checkbox_sql_use_mime" <?php PMA_exportCheckboxCheck('sql_mime'); ?> />
@@ -178,11 +180,11 @@ if ($cfgRelation['mimework']) {
</fieldset> </fieldset>
</fieldset> </fieldset>
<?php } ?> <?php } ?>
<!-- LaTeX options --> <!-- LaTeX options -->
<fieldset id="latex_options"> <fieldset id="latex_options">
<legend><?php echo $strLaTeXOptions; ?></legend> <legend><?php echo $strLaTeXOptions; ?></legend>
<?php if (!$hide_structure) { ?> <?php if (!$hide_structure) { ?>
<!-- For structure --> <!-- For structure -->
<fieldset> <fieldset>
@@ -197,14 +199,14 @@ if (!empty($cfgRelation['relation'])) {
<label for="checkbox_latex_use_relation"><?php echo $strRelations; ?></label><br /> <label for="checkbox_latex_use_relation"><?php echo $strRelations; ?></label><br />
<?php <?php
} // end relation } // end relation
if ($cfgRelation['commwork']) { if ($cfgRelation['commwork']) {
?> ?>
<input type="checkbox" name="latex_comments" value="yes" id="checkbox_latex_use_comments" <?php PMA_exportCheckboxCheck('latex_comments'); ?> /> <input type="checkbox" name="latex_comments" value="yes" id="checkbox_latex_use_comments" <?php PMA_exportCheckboxCheck('latex_comments'); ?> />
<label for="checkbox_latex_use_comments"><?php echo $strComments; ?></label><br /> <label for="checkbox_latex_use_comments"><?php echo $strComments; ?></label><br />
<?php <?php
} // end comments } // end comments
if ($cfgRelation['mimework']) { if ($cfgRelation['mimework']) {
?> ?>
<input type="checkbox" name="latex_mime" value="yes" id="checkbox_latex_use_mime" <?php PMA_exportCheckboxCheck('latex_mime'); ?> /> <input type="checkbox" name="latex_mime" value="yes" id="checkbox_latex_use_mime" <?php PMA_exportCheckboxCheck('latex_mime'); ?> />
@@ -214,7 +216,7 @@ if ($cfgRelation['mimework']) {
?> ?>
</fieldset> </fieldset>
<?php } ?> <?php } ?>
<!-- For data --> <!-- For data -->
<fieldset> <fieldset>
<legend> <legend>
@@ -235,7 +237,7 @@ if ($cfgRelation['mimework']) {
</table> </table>
</fieldset> </fieldset>
</fieldset> </fieldset>
<!-- CSV options --> <!-- CSV options -->
<fieldset id="csv_options"> <fieldset id="csv_options">
<legend><?php echo $strCSVOptions; ?></legend> <legend><?php echo $strCSVOptions; ?></legend>
@@ -285,7 +287,7 @@ if ($cfgRelation['mimework']) {
<input type="checkbox" name="showcsvnames" value="yes" id="checkbox_dump_showcsvnames" <?php PMA_exportCheckboxCheck('csv_columns'); ?> /> <input type="checkbox" name="showcsvnames" value="yes" id="checkbox_dump_showcsvnames" <?php PMA_exportCheckboxCheck('csv_columns'); ?> />
<label for="checkbox_dump_showcsvnames"><?php echo $strPutColNames; ?></label> <label for="checkbox_dump_showcsvnames"><?php echo $strPutColNames; ?></label>
</fieldset> </fieldset>
<!-- Excel options --> <!-- Excel options -->
<fieldset id="excel_options"> <fieldset id="excel_options">
<legend><?php echo $strExcelOptions; ?></legend> <legend><?php echo $strExcelOptions; ?></legend>
@@ -301,7 +303,7 @@ if ($cfgRelation['mimework']) {
</tr> </tr>
</table> </table>
</fieldset> </fieldset>
<fieldset id="none_options"> <fieldset id="none_options">
<legend><?php echo $strNoOptions; ?></legend> <legend><?php echo $strNoOptions; ?></legend>
<input type="hidden" name="xml_data" value="xml_data" /> <input type="hidden" name="xml_data" value="xml_data" />
@@ -358,7 +360,7 @@ if (isset($table) && !empty($table) && !isset($num_tables)) {
<input type="checkbox" name="asfile" value="sendit" id="checkbox_dump_asfile" <?php PMA_exportCheckboxCheck('asfile'); ?> /> <input type="checkbox" name="asfile" value="sendit" id="checkbox_dump_asfile" <?php PMA_exportCheckboxCheck('asfile'); ?> />
<label for="checkbox_dump_asfile"><?php echo $strSend; ?></label> <label for="checkbox_dump_asfile"><?php echo $strSend; ?></label>
</legend> </legend>
<?php if (isset($cfg['SaveDir']) && !empty($cfg['SaveDir'])) { ?> <?php if (isset($cfg['SaveDir']) && !empty($cfg['SaveDir'])) { ?>
<input type="checkbox" name="onserver" value="saveit" id="checkbox_dump_onserver" onclick="getElement('checkbox_dump_asfile').checked = true;" <?php PMA_exportCheckboxCheck('onserver'); ?> /> <input type="checkbox" name="onserver" value="saveit" id="checkbox_dump_onserver" onclick="getElement('checkbox_dump_asfile').checked = true;" <?php PMA_exportCheckboxCheck('onserver'); ?> />
<label for="checkbox_dump_onserver"><?php echo sprintf($strSaveOnServer, htmlspecialchars($cfg['SaveDir'])); ?></label>, <label for="checkbox_dump_onserver"><?php echo sprintf($strSaveOnServer, htmlspecialchars($cfg['SaveDir'])); ?></label>,
@@ -366,10 +368,10 @@ if (isset($table) && !empty($table) && !isset($num_tables)) {
<label for="checkbox_dump_onserverover"><?php echo $strOverwriteExisting; ?></label> <label for="checkbox_dump_onserverover"><?php echo $strOverwriteExisting; ?></label>
<br /> <br />
<?php } ?> <?php } ?>
<?php echo $strFileNameTemplate; ?>&nbsp;: <?php echo $strFileNameTemplate; ?>&nbsp;:
<input type="text" name="filename_template" <input type="text" name="filename_template"
<?php <?php
echo ' value="'; echo ' value="';
if ($export_type == 'database') { if ($export_type == 'database') {
if (isset($_COOKIE) && !empty($_COOKIE['pma_db_filename_template'])) { if (isset($_COOKIE) && !empty($_COOKIE['pma_db_filename_template'])) {
@@ -377,7 +379,7 @@ if (isset($table) && !empty($table) && !isset($num_tables)) {
} elseif (isset($HTTP_COOKIE_VARS) && !empty($HTTP_COOKIE_VARS['pma_db_filename_template'])) { } elseif (isset($HTTP_COOKIE_VARS) && !empty($HTTP_COOKIE_VARS['pma_db_filename_template'])) {
echo $HTTP_COOKIE_VARS['pma_db_filename_template']; echo $HTTP_COOKIE_VARS['pma_db_filename_template'];
} else { } else {
echo '__DB__'; echo '__DB__';
} }
} elseif ($export_type == 'table') { } elseif ($export_type == 'table') {
if (isset($_COOKIE) && !empty($_COOKIE['pma_table_filename_template'])) { if (isset($_COOKIE) && !empty($_COOKIE['pma_table_filename_template'])) {
@@ -385,7 +387,7 @@ if (isset($table) && !empty($table) && !isset($num_tables)) {
} elseif (isset($HTTP_COOKIE_VARS) && !empty($HTTP_COOKIE_VARS['pma_table_filename_template'])) { } elseif (isset($HTTP_COOKIE_VARS) && !empty($HTTP_COOKIE_VARS['pma_table_filename_template'])) {
echo $HTTP_COOKIE_VARS['pma_table_filename_template']; echo $HTTP_COOKIE_VARS['pma_table_filename_template'];
} else { } else {
echo '__TABLE__'; echo '__TABLE__';
} }
} else { } else {
if (isset($_COOKIE) && !empty($_COOKIE['pma_server_filename_template'])) { if (isset($_COOKIE) && !empty($_COOKIE['pma_server_filename_template'])) {
@@ -393,7 +395,7 @@ if (isset($table) && !empty($table) && !isset($num_tables)) {
} elseif (isset($HTTP_COOKIE_VARS) && !empty($HTTP_COOKIE_VARS['pma_server_filename_template'])) { } elseif (isset($HTTP_COOKIE_VARS) && !empty($HTTP_COOKIE_VARS['pma_server_filename_template'])) {
echo $HTTP_COOKIE_VARS['pma_server_filename_template']; echo $HTTP_COOKIE_VARS['pma_server_filename_template'];
} else { } else {
echo '__SERVER__'; echo '__SERVER__';
} }
} }
echo '" '; echo '" ';
@@ -499,7 +501,7 @@ echo "\n";
<td valign="top">*&nbsp;</td> <td valign="top">*&nbsp;</td>
<td> <td>
<?php echo sprintf($strFileNameTemplateHelp, '<a href="http://www.php.net/manual/function.strftime.php" target="documentation">', '</a>') . "\n"; ?> <?php echo sprintf($strFileNameTemplateHelp, '<a href="http://www.php.net/manual/function.strftime.php" target="documentation">', '</a>') . "\n"; ?>
</td> </td>
</tr> </tr>
</table> </table>