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

Back button on export.php page

Browse Source
This commit is contained in:
lorilee
2010-08-10 22:11:57 -07:00
parent 90c0e573f7
commit 4482228f66
5 changed files with 135 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
db_export.php
View File

@@ -52,8 +52,19 @@ if (!empty($selected_tbl) && empty($table_select)) {
$table_select = $selected_tbl; $table_select = $selected_tbl;
} }
if(isset($_GET['table_select'])) {
$_GET['table_select'] = urldecode($_GET['table_select']);
$_GET['table_select'] = explode(",", $_GET['table_select']);
}
foreach ($tables as $each_table) { foreach ($tables as $each_table) {
if (! empty($unselectall) if(isset($_GET['table_select'])) {
if(in_array($each_table['Name'], $_GET['table_select'])) {
$is_selected = ' selected="selected"';
} else {
$is_selected = '';
}
} elseif (! empty($unselectall)
|| (! empty($table_select) && !in_array($each_table['Name'], $table_select))) { || (! empty($table_select) && !in_array($each_table['Name'], $table_select))) {
$is_selected = ''; $is_selected = '';
} else { } else {

25
export.php
View File

@@ -661,6 +661,31 @@ else {
//echo ' </pre>' . "\n"; //echo ' </pre>' . "\n";
echo '</textarea>' . "\n" echo '</textarea>' . "\n"
. ' </form>' . "\n"; . ' </form>' . "\n";
echo '<p>[ <a href="';
if ($export_type == 'server') {
echo 'server_export.php?' . PMA_generate_common_url();
} elseif ($export_type == 'database') {
echo 'db_export.php?' . PMA_generate_common_url($db);
} else {
echo 'tbl_export.php?' . PMA_generate_common_url($db, $table);
}
/**
* Displays a back button with all the $_REQUEST data in the URL
*/
// Convert the multiple select elements from an array to a string
if($export_type == 'server') {
$_REQUEST['db_select'] = implode(",", $_REQUEST['db_select']);
} elseif($export_type == 'database') {
$_REQUEST['table_select'] = implode(",", $_REQUEST['table_select']);
}
foreach($_REQUEST as $name => $value) {
echo '&' . urlencode($name) . '=' . urlencode($value);
}
echo '&repopulate=1">Back</a> ]</p>';
echo "\n";
echo '</div>' . "\n"; echo '</div>' . "\n";
echo "\n"; echo "\n";
?> ?>

110
libraries/display_export.lib.php
View File

@@ -35,6 +35,10 @@ if (empty($export_list)) {
PMA_Message::error( __('Could not load export plugins, please check your installation!'))->display(); PMA_Message::error( __('Could not load export plugins, please check your installation!'))->display();
require './libraries/footer.inc.php'; require './libraries/footer.inc.php';
} }
foreach($_GET as $name => $value) {
$_GET[urldecode($name)] = urldecode($value);
}
?> ?>
<form method="post" action="export.php" name="dump"> <form method="post" action="export.php" name="dump">
@@ -56,14 +60,18 @@ if (isset($single_table)) {
echo '<input type="hidden" name="export_type" value="' . $export_type . '" />' . "\n"; echo '<input type="hidden" name="export_type" value="' . $export_type . '" />' . "\n";
// If the export method was not set, the default is quick // If the export method was not set, the default is quick
if(!isset($cfg['Export']['method'])) { if(isset($_GET['export_method'])) {
$cfg['Export']['method'] = $_GET['export_method'];
} elseif(!isset($cfg['Export']['method'])) {
$cfg['Export']['method'] = 'quick'; $cfg['Export']['method'] = 'quick';
} }
// The export method (quick, custom or custom-no-form) // The export method (quick, custom or custom-no-form)
echo '<input type="hidden" name="export_method" value="' . $cfg['Export']['method'] . '" />'; echo '<input type="hidden" name="export_method" value="' . $cfg['Export']['method'] . '" />';
if (! empty($sql_query)) { if(isset($_GET['sql_query'])) {
echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars(urldecode($_GET['sql_query'])) . '" />' . "\n";
} elseif (! empty($sql_query)) {
echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />' . "\n"; echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />' . "\n";
} }
?> ?>
@@ -87,7 +95,14 @@ if (! empty($sql_query)) {
<ul> <ul>
<li> <li>
<?php echo '<input type="radio" name="quick_or_custom" value="quick" id="radio_quick_export"'; <?php echo '<input type="radio" name="quick_or_custom" value="quick" id="radio_quick_export"';
if($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') { if(isset($_GET['quick_or_custom'])) {
$export_method = $_GET['quick_or_custom'];
if($export_method == 'custom' || $export_method == 'custom_no_form') {
echo ' />';
} else {
echo ' checked="checked" />';
}
} elseif($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') {
echo ' />'; echo ' />';
} else { } else {
echo ' checked="checked" />'; echo ' checked="checked" />';
@@ -96,7 +111,14 @@ if (! empty($sql_query)) {
</li> </li>
<li> <li>
<?php echo '<input type="radio" name="quick_or_custom" value="custom" id="radio_custom_export"'; <?php echo '<input type="radio" name="quick_or_custom" value="custom" id="radio_custom_export"';
if($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') { if(isset($_GET['quick_or_custom'])) {
$export_method = $_GET['quick_or_custom'];
if($export_method == 'custom' || $export_method == 'custom_no_form') {
echo ' checked="checked" />';
} else {
echo ' />';
}
} elseif($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') {
echo ' checked="checked" />'; echo ' checked="checked" />';
} else { } else {
echo ' />'; echo ' />';
@@ -124,18 +146,27 @@ if (! empty($sql_query)) {
<h3><?php echo __('Rows:'); ?></h3> <h3><?php echo __('Rows:'); ?></h3>
<ul> <ul>
<li> <li>
<?php echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" checked="checked" />'; <?php if(isset($_GET['allrows']) && $_GET['allrows'] == 1) {
echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" />';
} else {
echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" checked="checked" />';
}
echo '<label for ="radio_allrows_0">' . __('Dump some row(s)') . '</label>'; ?> echo '<label for ="radio_allrows_0">' . __('Dump some row(s)') . '</label>'; ?>
<ul> <ul>
<li><label for="limit_to"><?php echo __('Number of rows:') . '</label> <input type="text" id="limit_to" name="limit_to" size="5" value="' <li><label for="limit_to"><?php echo __('Number of rows:') . '</label> <input type="text" id="limit_to" name="limit_to" size="5" value="'
. (isset($unlim_num_rows) ? $unlim_num_rows : PMA_Table::countRecords($db, $table)) . ((isset($_GET['limit_to'])) ? $_GET['limit_to'] : ((isset($unlim_num_rows) ? $unlim_num_rows : PMA_Table::countRecords($db, $table))))
. '" onfocus="this.select()" />' ?></li> . '" onfocus="this.select()" />' ?></li>
<li><label for="limit_from"><?php echo __('Row to begin at:') . '</label> <input type="text" id="limit_from" name="limit_from" value="0" size="5"' <li><label for="limit_from"><?php echo __('Row to begin at:') . '</label> <input type="text" id="limit_from" name="limit_from" value="'
.' onfocus="this.select()" />'; ?></li> . ((isset($_GET['limit_from'])) ? $_GET['limit_from'] : '0')
. '" size="5" onfocus="this.select()" />'; ?></li>
</ul> </ul>
</li> </li>
<li> <li>
<?php echo '<input type="radio" name="allrows" value="1" id="radio_allrows_1" />'; <?php if(isset($_GET['allrows']) && $_GET['allrows'] == 0) {
echo '<input type="radio" name="allrows" value="1" id="radio_allrows_1" />';
} else {
echo '<input type="radio" name="allrows" value="1" id="radio_allrows_1" checked="checked" />';
}
echo ' <label for="radio_allrows_1">' . __('Dump all rows') . '</label>';?> echo ' <label for="radio_allrows_1">' . __('Dump all rows') . '</label>';?>
</li> </li>
</ul> </ul>
@@ -149,7 +180,7 @@ if (! empty($sql_query)) {
<li> <li>
<input type="checkbox" name="quick_export_onserver" value="saveit" <input type="checkbox" name="quick_export_onserver" value="saveit"
id="checkbox_quick_dump_onserver" id="checkbox_quick_dump_onserver"
<?php PMA_exportCheckboxCheck('onserver'); ?> /> <?php PMA_exportCheckboxCheck('quick_export_onserver'); ?> />
<label for="checkbox_quick_dump_onserver"> <label for="checkbox_quick_dump_onserver">
<?php echo sprintf(__('Save on server in the directory <b>%s</b>'), htmlspecialchars(PMA_userDir($cfg['SaveDir']))); ?> <?php echo sprintf(__('Save on server in the directory <b>%s</b>'), htmlspecialchars(PMA_userDir($cfg['SaveDir']))); ?>
</label> </label>
@@ -157,7 +188,7 @@ if (! empty($sql_query)) {
<li> <li>
<input type="checkbox" name="quick_export_onserverover" value="saveitover" <input type="checkbox" name="quick_export_onserverover" value="saveitover"
id="checkbox_quick_dump_onserverover" id="checkbox_quick_dump_onserverover"
<?php PMA_exportCheckboxCheck('onserver_overwrite'); ?> /> <?php PMA_exportCheckboxCheck('quick_export_onserver_overwrite'); ?> />
<label for="checkbox_quick_dump_onserverover"><?php echo __('Overwrite existing file(s)'); ?></label> <label for="checkbox_quick_dump_onserverover"><?php echo __('Overwrite existing file(s)'); ?></label>
</li> </li>
</ul> </ul>
@@ -168,7 +199,7 @@ if (! empty($sql_query)) {
<h3><?php echo __('Output:'); ?></h3> <h3><?php echo __('Output:'); ?></h3>
<ul id="ul_output"> <ul id="ul_output">
<li> <li>
<input type="radio" name="output_format" value="sendit" id="radio_dump_asfile" <?php PMA_exportCheckboxCheck('asfile'); ?> /> <input type="radio" name="output_format" value="sendit" id="radio_dump_asfile" <?php isset($_GET['repopulate']) ? '' : PMA_exportCheckboxCheck('asfile'); ?> />
<label for="radio_dump_asfile"><?php echo __('Save output to a file'); ?></label> <label for="radio_dump_asfile"><?php echo __('Save output to a file'); ?></label>
<ul id="ul_save_asfile"> <ul id="ul_save_asfile">
<?php if (isset($cfg['SaveDir']) && !empty($cfg['SaveDir'])) { ?> <?php if (isset($cfg['SaveDir']) && !empty($cfg['SaveDir'])) { ?>
@@ -217,25 +248,29 @@ if (! empty($sql_query)) {
<input type="text" name="filename_template" id="filename_template" <input type="text" name="filename_template" id="filename_template"
<?php <?php
echo ' value="'; echo ' value="';
if ($export_type == 'database') { if(isset($_GET['filename_template'])) {
if (isset($_COOKIE) && !empty($_COOKIE['pma_db_filename_template'])) { echo $_GET['filename_template'];
echo htmlspecialchars($_COOKIE['pma_db_filename_template']);
} else {
echo $GLOBALS['cfg']['Export']['file_template_database'];
}
} elseif ($export_type == 'table') {
if (isset($_COOKIE) && !empty($_COOKIE['pma_table_filename_template'])) {
echo htmlspecialchars($_COOKIE['pma_table_filename_template']);
} else {
echo $GLOBALS['cfg']['Export']['file_template_table'];
}
} else { } else {
if (isset($_COOKIE) && !empty($_COOKIE['pma_server_filename_template'])) { if ($export_type == 'database') {
echo htmlspecialchars($_COOKIE['pma_server_filename_template']); if (isset($_COOKIE) && !empty($_COOKIE['pma_db_filename_template'])) {
echo htmlspecialchars($_COOKIE['pma_db_filename_template']);
} else {
echo $GLOBALS['cfg']['Export']['file_template_database'];
}
} elseif ($export_type == 'table') {
if (isset($_COOKIE) && !empty($_COOKIE['pma_table_filename_template'])) {
echo htmlspecialchars($_COOKIE['pma_table_filename_template']);
} else {
echo $GLOBALS['cfg']['Export']['file_template_table'];
}
} else { } else {
echo $GLOBALS['cfg']['Export']['file_template_server']; if (isset($_COOKIE) && !empty($_COOKIE['pma_server_filename_template'])) {
echo htmlspecialchars($_COOKIE['pma_server_filename_template']);
} else {
echo $GLOBALS['cfg']['Export']['file_template_server'];
}
} }
} }
echo '"'; echo '"';
?> ?>
/> />
@@ -254,7 +289,9 @@ if (! empty($sql_query)) {
echo '<select id="select_charset_of_file" name="charset_of_file" size="1">'; echo '<select id="select_charset_of_file" name="charset_of_file" size="1">';
foreach ($cfg['AvailableCharsets'] as $temp_charset) { foreach ($cfg['AvailableCharsets'] as $temp_charset) {
echo '<option value="' . $temp_charset . '"'; echo '<option value="' . $temp_charset . '"';
if ((empty($cfg['Export']['charset']) && $temp_charset == $charset) if(isset($_GET['charset_of_file']) && ($_GET['charset_of_file'] != $temp_charset)) {
echo '';
} elseif ((empty($cfg['Export']['charset']) && $temp_charset == $charset)
|| $temp_charset == $cfg['Export']['charset']) { || $temp_charset == $cfg['Export']['charset']) {
echo ' selected="selected"'; echo ' selected="selected"';
} }
@@ -264,6 +301,11 @@ if (! empty($sql_query)) {
} // end if } // end if
?> ?>
<?php <?php
if(isset($_GET['compression'])) {
$selected_compression = $_GET['compression'];
} else {
$selected_compression = "none";
}
// zip, gzip and bzip2 encode features // zip, gzip and bzip2 encode features
$is_zip = ($cfg['ZipDump'] && @function_exists('gzcompress')); $is_zip = ($cfg['ZipDump'] && @function_exists('gzcompress'));
$is_gzip = ($cfg['GZipDump'] && @function_exists('gzencode')); $is_gzip = ($cfg['GZipDump'] && @function_exists('gzencode'));
@@ -274,20 +316,20 @@ if (! empty($sql_query)) {
<select id="compression" name="compression"> <select id="compression" name="compression">
<option value="none"><?php echo __('None'); ?></option> <option value="none"><?php echo __('None'); ?></option>
<?php if ($is_zip) { ?> <?php if ($is_zip) { ?>
<option value="zip"><?php echo __('zipped'); ?></option> <option value="zip" <?php echo ($selected_compression == "zip") ? 'selected="selected"' : ''; ?>><?php echo __('zipped'); ?></option>
<?php } if ($is_gzip) { ?> <?php } if ($is_gzip) { ?>
<option value="gzip"><?php echo __('gzipped'); ?></option> <option value="gzip" <?php echo ($selected_compression == "gzip") ? 'selected="selected"' : ''; ?>><?php echo __('gzipped'); ?></option>
<?php } if ($is_bzip) { ?> <?php } if ($is_bzip) { ?>
<option value="bzip"><?php echo __('bzipped'); ?></option> <option value="bzip" <?php echo ($selected_compression == "bzip") ? 'selected="selected"' : ''; ?>><?php echo __('bzipped'); ?></option>
<?php } ?> <?php } ?>
</select> </select>
</li> </li>
<?php } else { ?> <?php } else { ?>
<input type="hidden" name="compression" value="none" /> <input type="hidden" name="compression" value="<?php echo $selected_compression; ?>" />
<?php } ?> <?php } ?>
</ul> </ul>
</li> </li>
<li><input type="radio" id="radio_view_as_text" name="output_format" value="astext" /><label for="radio_view_as_text">View output as text</label></li> <li><input type="radio" id="radio_view_as_text" name="output_format" value="astext" <?php echo isset($_GET['repopulate']) ? 'checked="checked"' : '' ?>/><label for="radio_view_as_text">View output as text</label></li>
</ul> </ul>
</div> </div>

14
libraries/plugin_interface.lib.php
View File

@@ -60,6 +60,7 @@ function PMA_getString($name)
* returns html input tag option 'checked' if plugin $opt should be set by config or request * returns html input tag option 'checked' if plugin $opt should be set by config or request
* *
* @uses $_REQUEST * @uses $_REQUEST
* @uses $_GET
* @uses $GLOBALS['cfg'] * @uses $GLOBALS['cfg']
* @uses $GLOBALS['timeout_passed'] * @uses $GLOBALS['timeout_passed']
* @param string $section name of config section in * @param string $section name of config section in
@@ -69,8 +70,9 @@ function PMA_getString($name)
*/ */
function PMA_pluginCheckboxCheck($section, $opt) function PMA_pluginCheckboxCheck($section, $opt)
{ {
if ((isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) || // If the form is being repopulated using $_GET data, that is priority
(isset($GLOBALS['cfg'][$section][$opt]) && $GLOBALS['cfg'][$section][$opt])) { if (isset($_GET[$opt]) || !isset($_GET['repopulate']) && ((isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) ||
(isset($GLOBALS['cfg'][$section][$opt]) && $GLOBALS['cfg'][$section][$opt]))) {
return ' checked="checked"'; return ' checked="checked"';
} }
return ''; return '';
@@ -83,6 +85,7 @@ function PMA_pluginCheckboxCheck($section, $opt)
* *
* @uses htmlspecialchars() * @uses htmlspecialchars()
* @uses $_REQUEST * @uses $_REQUEST
* @uses $_GET
* @uses $GLOBALS['cfg'] * @uses $GLOBALS['cfg']
* @uses $GLOBALS['timeout_passed'] * @uses $GLOBALS['timeout_passed']
* @param string $section name of config section in * @param string $section name of config section in
@@ -92,7 +95,9 @@ function PMA_pluginCheckboxCheck($section, $opt)
*/ */
function PMA_pluginGetDefault($section, $opt) function PMA_pluginGetDefault($section, $opt)
{ {
if (isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) { if(isset($_GET[$opt])) { // If the form is being repopulated using $_GET data, that is priority
return htmlspecialchars($_GET[$opt]);
} elseif (isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) {
return htmlspecialchars($_REQUEST[$opt]); return htmlspecialchars($_REQUEST[$opt]);
} elseif (isset($GLOBALS['cfg'][$section][$opt])) { } elseif (isset($GLOBALS['cfg'][$section][$opt])) {
$matches = array(); $matches = array();
@@ -162,7 +167,8 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL)
$default = PMA_pluginGetDefault($section, $cfgname); $default = PMA_pluginGetDefault($section, $cfgname);
foreach ($list as $plugin_name => $val) { foreach ($list as $plugin_name => $val) {
$ret .= '<option'; $ret .= '<option';
if($plugin_name == $default) { // If the form is being repopulated using $_GET data, that is priority
if(isset($_GET[$name]) && $plugin_name == $_GET[$name] || !isset($_GET[$name]) && $plugin_name == $default) {
$ret .= ' selected="selected"'; $ret .= ' selected="selected"';
} }
$ret .= ' value="' . $plugin_name . '">' . PMA_getString($val['text']) . '</option>' . "\n"; $ret .= ' value="' . $plugin_name . '">' . PMA_getString($val['text']) . '</option>' . "\n";

13
server_export.php
View File

@@ -30,8 +30,19 @@ $multi_values .= '<a href="' . $checkall_url . '&amp;selectall=1" onclick="setSe
$multi_values .= '<select name="db_select[]" id="db_select" size="10" multiple="multiple">'; $multi_values .= '<select name="db_select[]" id="db_select" size="10" multiple="multiple">';
$multi_values .= "\n"; $multi_values .= "\n";
if(isset($_GET['db_select'])) {
$_GET['db_select'] = urldecode($_GET['db_select']);
$_GET['db_select'] = explode(",", $_GET['db_select']);
}
foreach ($GLOBALS['pma']->databases as $current_db) { foreach ($GLOBALS['pma']->databases as $current_db) {
if (!empty($selectall) || (isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))) { if(isset($_GET['db_select'])) {
if(in_array($current_db, $_GET['db_select'])) {
$is_selected = ' selected="selected"';
} else {
$is_selected = '';
}
} elseif (!empty($selectall) || (isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))) {
$is_selected = ' selected="selected"'; $is_selected = ' selected="selected"';
} else { } else {
$is_selected = ''; $is_selected = '';