Merge conflict resolved for Lori's tree merge to main
This commit is contained in:
@@ -10,6 +10,8 @@
|
||||
*/
|
||||
require_once './libraries/common.inc.php';
|
||||
|
||||
$GLOBALS['js_include'][] = 'export.js';
|
||||
|
||||
/**
|
||||
* Displays the links
|
||||
*/
|
||||
@@ -20,16 +22,28 @@ $checkall_url = 'server_export.php?'
|
||||
. PMA_generate_common_url()
|
||||
. '&goto=db_export.php';
|
||||
|
||||
$multi_values = '<div align="center">';
|
||||
$multi_values = '<div align="left">';
|
||||
$multi_values .= '<a href="' . $checkall_url . '&selectall=1" onclick="setSelectOptions(\'dump\', \'db_select[]\', true); return false;">' . __('Select All') . '</a>
|
||||
/
|
||||
<a href="' . $checkall_url . '" onclick="setSelectOptions(\'dump\', \'db_select[]\', false); return false;">' . __('Unselect All') . '</a><br />';
|
||||
|
||||
$multi_values .= '<select name="db_select[]" size="10" multiple="multiple">';
|
||||
$multi_values .= '<select name="db_select[]" id="db_select" size="10" multiple="multiple">';
|
||||
$multi_values .= "\n";
|
||||
|
||||
// Check if the selected databases are defined in $_GET (from clicking Back button on export.php)
|
||||
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) {
|
||||
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"';
|
||||
} else {
|
||||
$is_selected = '';
|
||||
@@ -38,7 +52,7 @@ foreach ($GLOBALS['pma']->databases as $current_db) {
|
||||
$multi_values .= ' <option value="' . $current_db . '"' . $is_selected . '>' . $current_db . '</option>' . "\n";
|
||||
} // end while
|
||||
$multi_values .= "\n";
|
||||
$multi_values .= '</select></div><br />';
|
||||
$multi_values .= '</select></div>';
|
||||
|
||||
$export_type = 'server';
|
||||
require_once './libraries/display_export.lib.php';
|
||||
|
Reference in New Issue
Block a user