make form definition structure the same for setup script and user preferences
This commit is contained in:
@@ -20,33 +20,18 @@ require_once './setup/lib/form_processing.lib.php';
|
||||
|
||||
require './libraries/config/setup.forms.php';
|
||||
|
||||
$formsets = array(
|
||||
'features' => array(
|
||||
'forms' => array('Import_export', 'Security', 'Sql_queries', 'Page_titles',
|
||||
'Other_core_settings')),
|
||||
'left_frame' => array(
|
||||
'forms' => array('Left_frame', 'Left_servers', 'Left_databases', 'Left_tables')),
|
||||
'main_frame' => array(
|
||||
'forms' => array('Startup', 'Browse', 'Edit', 'Tabs', 'Sql_box')),
|
||||
'import' => array(
|
||||
'forms' => array('Import_defaults')),
|
||||
'export' => array(
|
||||
'forms' => array('Export_defaults'))
|
||||
);
|
||||
|
||||
$formset_id = filter_input(INPUT_GET, 'formset');
|
||||
$mode = filter_input(INPUT_GET, 'mode');
|
||||
if (!isset($formsets[$formset_id])) {
|
||||
if (!isset($forms[$formset_id])) {
|
||||
die('Incorrect formset, check $formsets array in setup/frames/form.inc.php');
|
||||
}
|
||||
|
||||
$formset = $formsets[$formset_id];
|
||||
if (isset($GLOBALS['strSetupFormset_' . $formset_id])) {
|
||||
echo '<h2>' . $GLOBALS['strSetupFormset_' . $formset_id] . '</h2>';
|
||||
}
|
||||
$form_display = new FormDisplay();
|
||||
foreach ($formset['forms'] as $form_name) {
|
||||
$form_display->registerForm($form_name, $forms[$form_name]);
|
||||
foreach ($forms[$formset_id] as $form_name => $form) {
|
||||
$form_display->registerForm($form_name, $form);
|
||||
}
|
||||
process_formset($form_display);
|
||||
?>
|
||||
?>
|
@@ -15,9 +15,9 @@ $separator = PMA_get_arg_separator('html');
|
||||
?>
|
||||
<ul>
|
||||
<li><a href="index.php"><?php echo __('Overview') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=features"><?php echo __('Features') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=left_frame"><?php echo __('Navigation frame') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=main_frame"><?php echo __('Main frame') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=import"><?php echo __('Import') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=export"><?php echo __('Export') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Features"><?php echo __('Features') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Left_frame"><?php echo __('Navigation frame') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Main_frame"><?php echo __('Main frame') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Import"><?php echo __('Import') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Export"><?php echo __('Export') ?></a></li>
|
||||
</ul>
|
||||
|
@@ -43,10 +43,8 @@ if (isset($page_title)) {
|
||||
echo '<h2>' . $page_title . '</h2>';
|
||||
}
|
||||
$form_display = new FormDisplay();
|
||||
$form_display->registerForm('Server', $forms['Server'], $id);
|
||||
$form_display->registerForm('Server_login_options', $forms['Server_login_options'], $id);
|
||||
$form_display->registerForm('Server_config', $forms['Server_config'], $id);
|
||||
$form_display->registerForm('Server_pmadb', $forms['Server_pmadb'], $id);
|
||||
$form_display->registerForm('Server_tracking', $forms['Server_tracking'], $id);
|
||||
foreach ($forms['Servers'] as $form_name => $form) {
|
||||
$form_display->registerForm($form_name, $form, $id);
|
||||
}
|
||||
process_formset($form_display);
|
||||
?>
|
||||
?>
|
Reference in New Issue
Block a user