make form definition structure the same for setup script and user preferences

libraries/config/setup.forms.php

@@ -4,12 +4,12 @@
  * Fields MUST have their counterparts in the $cfg array.
  *
  * There are two possible notations:
- * $forms['Form name'] = array('Servers' => array(1 => array('host')));
+ * $forms['Form group']['Form name'] = array('Servers' => array(1 => array('host')));
  * can be written as
- * $forms['Form name'] = array('Servers/1/host');
+ * $forms['Form group']['Form name'] = array('Servers/1/host');
  *
  * You can assign default values set by special button ("set value: ..."), eg.:
- * $forms['Server_pmadb'] = array('Servers' => array(1 => array(
+ * $forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array(
  *  'pmadb' => 'phpmyadmin')));
  *
  * @package    phpMyAdmin-setup
@@ -21,7 +21,7 @@ $forms = array();
 $forms['_config.php'] = array(
     'DefaultLang',
     'ServerDefault');
-$forms['Server'] = array('Servers' => array(1 => array(
+$forms['Servers']['Server'] = array('Servers' => array(1 => array(
     'verbose',
     'host',
     'port',
@@ -36,11 +36,11 @@ $forms['Server'] = array('Servers' => array(1 => array(
     'password',
     'nopassword',
     'auth_swekey_config' => './swekey.conf')));
-$forms['Server_login_options'] = array('Servers' => array(1 => array(
+$forms['Servers']['Server_login_options'] = array('Servers' => array(1 => array(
     'SignonSession',
     'SignonURL',
     'LogoutURL')));
-$forms['Server_config'] = array('Servers' => array(1 => array(
+$forms['Servers']['Server_config'] = array('Servers' => array(1 => array(
     'only_db',
     'hide_db',
     'AllowRoot',
@@ -50,7 +50,7 @@ $forms['Server_config'] = array('Servers' => array(1 => array(
     'AllowDeny/rules',
     'ShowDatabasesCommand',
     'CountTables')));
-$forms['Server_pmadb'] = array('Servers' => array(1 => array(
+$forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array(
     'pmadb' => 'phpmyadmin',
     'controluser',
     'controlpass',
@@ -65,14 +65,14 @@ $forms['Server_pmadb'] = array('Servers' => array(1 => array(
     'table_coords' => 'pma_table_coords',
     'pdf_pages' => 'pma_pdf_pages',
     'designer_coords' => 'pma_designer_coords')));
-$forms['Server_tracking'] = array('Servers' => array(1 => array(
+$forms['Servers']['Server_tracking'] = array('Servers' => array(1 => array(
     'tracking_version_auto_create',
     'tracking_default_statements',
     'tracking_add_drop_view',
     'tracking_add_drop_table',
     'tracking_add_drop_database',
 )));
-$forms['Import_export'] = array(
+$forms['Features']['Import_export'] = array(
     'UploadDir',
     'SaveDir',
     'AllowAnywhereRecoding',
@@ -83,7 +83,7 @@ $forms['Import_export'] = array(
     'GZipDump',
     'BZipDump',
     'CompressOnFly');
-$forms['Security'] = array(
+$forms['Features']['Security'] = array(
     'blowfish_secret',
     'ForceSSL',
     'CheckConfigurationPermissions',
@@ -94,7 +94,7 @@ $forms['Security'] = array(
     'LoginCookieValidity',
     'LoginCookieStore',
     'LoginCookieDeleteAll');
-$forms['Sql_queries'] = array(
+$forms['Features']['Sql_queries'] = array(
     'ShowSQL',
     'Confirm',
     'QueryHistoryDB',
@@ -106,12 +106,12 @@ $forms['Sql_queries'] = array(
     //'QueryWindowWidth', // overridden in theme
     //'QueryWindowHeight',
     'QueryWindowDefTab');
-$forms['Page_titles'] = array(
+$forms['Features']['Page_titles'] = array(
     'TitleDefault',
     'TitleTable',
     'TitleDatabase',
     'TitleServer');
-$forms['Other_core_settings'] = array(
+$forms['Features']['Other_core_settings'] = array(
     'NaturalOrder',
     'InitialSlidersState',
     'ErrorIconic',
@@ -125,21 +125,21 @@ $forms['Other_core_settings'] = array(
     'MemoryLimit',
     'SkipLockedTables',
     'UseDbSearch');
-$forms['Left_frame'] = array(
+$forms['Left_frame']['Left_frame'] = array(
     'LeftFrameLight',
     'LeftDisplayLogo',
     'LeftLogoLink',
     'LeftLogoLinkWindow',
     'LeftPointerEnable');
-$forms['Left_servers'] = array(
+$forms['Left_frame']['Left_servers'] = array(
     'LeftDisplayServers',
     'DisplayServersList');
-$forms['Left_databases'] = array(
+$forms['Left_frame']['Left_databases'] = array(
     'DisplayDatabasesList',
     'LeftFrameDBTree',
     'LeftFrameDBSeparator',
     'ShowTooltipAliasDB');
-$forms['Left_tables'] = array(
+$forms['Left_frame']['Left_tables'] = array(
     'LeftDefaultTabTable',
     'LeftFrameTableSeparator',
     'LeftFrameTableLevel',
@@ -153,7 +153,7 @@ $forms['Startup'] = array(
     'ShowChgPassword',
     'ShowCreateDb',
     'SuggestDBName');
-$forms['Browse'] = array(
+$forms['Main_frame']['Browse'] = array(
     'NavigationBarIconic',
     'ShowAll',
     'MaxRows',
@@ -165,7 +165,7 @@ $forms['Browse'] = array(
     'ModifyDeleteAtLeft',
     'ModifyDeleteAtRight',
     'DefaultDisplay');
-$forms['Edit'] = array(
+$forms['Main_frame']['Edit'] = array(
     'ProtectBinary',
     'ShowFunctionFields',
     'ShowFieldTypesInDataEditView',
@@ -179,24 +179,24 @@ $forms['Edit'] = array(
     'ForeignKeyDropdownOrder',
     'ForeignKeyMaxLimit',
     'DefaultPropDisplay');
-$forms['Tabs'] = array(
+$forms['Main_frame']['Tabs'] = array(
     'LightTabs',
     'PropertiesIconic',
     'DefaultTabServer',
     'DefaultTabDatabase',
     'DefaultTabTable',
 	'QueryWindowDefTab');
-$forms['Sql_box'] = array('SQLQuery' => array(
+$forms['Main_frame']['Sql_box'] = array('SQLQuery' => array(
     'Edit',
     'Explain',
     'ShowAsPHP',
     'Validate',
     'Refresh'));
-$forms['Import_defaults'] = array('Import' => array(
+$forms['Import']['Import_defaults'] = array('Import' => array(
     'format',
     'allow_interrupt',
     'skip_queries'));
-$forms['Export_defaults'] = array('Export' => array(
+$forms['Export']['Export_defaults'] = array('Export' => array(
     'format',
     'compression',
     'asfile',