From 7661627a76c721ab2ab39f6a4ca03227b41841b8 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 1 Jun 2010 14:24:15 +0200
Subject: [PATCH 001/106] doc fix

---
 Documentation.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation.html b/Documentation.html
index 659cd68c7..b2b5f085a 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -3528,7 +3528,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
 <h4 id="faq3_15">
     <a href="#faq3_15">3.15 When I import an Excel spreadsheet, some cells with calculations do not display correctly.</a></h4>
 <p>
-    phpMyAdmin uses the <a href="http://www.codeplex.com/PHPExcel/" target="_blank">PHPExcel</a> library to parse Excel XLS and XLSX spreadsheets. 
+    phpMyAdmin uses the <a href="http://www.codeplex.com/PHPExcel/">PHPExcel</a> library to parse Excel XLS and XLSX spreadsheets. 
     Therefore, any limitations that are listed on their page regarding Excel calculations will also apply here.
     <br /><br />
     PHPExcel will be kept up to date so as to make all improvements available to phpMyAdmin users.

From 0f540aca0404a43094f552ccbc576db21749c9b2 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 1 Jun 2010 14:31:11 +0200
Subject: [PATCH 002/106] Setup script: moved LeftDefaultTabTable, added
 MainPageIconic

---
 setup/lib/forms.inc.php    | 3 ++-
 setup/lib/messages.inc.php | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup/lib/forms.inc.php b/setup/lib/forms.inc.php
index ea0c87edc..6eb0e7193 100644
--- a/setup/lib/forms.inc.php
+++ b/setup/lib/forms.inc.php
@@ -115,7 +115,6 @@ $forms['Left_frame'] = array(
     'LeftDisplayLogo',
     'LeftLogoLink',
     'LeftLogoLinkWindow',
-    'LeftDefaultTabTable',
     'LeftPointerEnable');
 $forms['Left_servers'] = array(
     'LeftDisplayServers',
@@ -126,11 +125,13 @@ $forms['Left_databases'] = array(
     'LeftFrameDBSeparator',
     'ShowTooltipAliasDB');
 $forms['Left_tables'] = array(
+    'LeftDefaultTabTable',
     'LeftFrameTableSeparator',
     'LeftFrameTableLevel',
     'ShowTooltip',
     'ShowTooltipAliasTB');
 $forms['Startup'] = array(
+    'MainPageIconic',
     'ShowStats',
     'ShowPhpInfo',
     'ShowServerInfo',
diff --git a/setup/lib/messages.inc.php b/setup/lib/messages.inc.php
index 1defa2d82..7b58193aa 100644
--- a/setup/lib/messages.inc.php
+++ b/setup/lib/messages.inc.php
@@ -197,6 +197,7 @@ $strSetupLoginCookieStore_name = __('Login cookie store');
 $strSetupLoginCookieValidity_desc = __('Define how long (in seconds) a login cookie is valid');
 $strSetupLoginCookieValidityMsg = __('[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.');
 $strSetupLoginCookieValidity_name = __('Login cookie validity');
+$strSetupMainPageIconic_name = __('Use icons on main page');
 $strSetupMaxCharactersInDisplayedSQL_desc = __('Maximum number of characters used when a SQL query is displayed');
 $strSetupMaxCharactersInDisplayedSQL_name = __('Maximum displayed SQL length');
 $strSetupMaxDbList_desc = __('Maximum number of databases displayed in left frame and database list');

From 101bbeefb60f8eb4bee5a9a692cab305ecc8336f Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 1 Jun 2010 14:32:10 +0200
Subject: [PATCH 003/106] link to user preferences on main page (not working
 yet)

---
 main.php                                | 8 ++++++++
 phpmyadmin.css.php                      | 2 +-
 themes/original/css/theme_right.css.php | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/main.php b/main.php
index 360e98881..1b385dd52 100644
--- a/main.php
+++ b/main.php
@@ -171,6 +171,14 @@ echo PMA_Config::getFontsizeForm();
 echo '</li>';
 
 echo '</ul>';
+
+// User preferences
+
+echo '<ul>';
+echo PMA_printListItem(__('More settings'), 'li_user_preferences',
+                    './user_preferences.php?' . $common_url_query);
+echo '<ul>';
+
 echo '</div>';
 
 
diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php
index ebf48bb36..c6408de4e 100644
--- a/phpmyadmin.css.php
+++ b/phpmyadmin.css.php
@@ -36,7 +36,7 @@ header('Content-Type: text/css; charset=UTF-8');
 
 // Cache output in client - the nocache query parameter makes sure that this
 // file is reloaded when config changes
-header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
+//header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
 
 $_SESSION['PMA_Theme_Manager']->printCss(PMA_FRAME);
 ?>
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index b3c510154..36e689a2a 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1066,6 +1066,10 @@ li#li_switch_dbstats {
 li#li_flush_privileges {
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_reload.png);
 }
+
+li#li_user_preferences {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_tblops.png);
+}
 /* END iconic view for ul items */
 <?php } /* end if $GLOBALS['cfg']['MainPageIconic'] */ ?>
 

From 65863ae2292b6a6cb16d82516a3922f2b00e9dfe Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 1 Jun 2010 14:33:02 +0200
Subject: [PATCH 004/106] List of fields to add, divided into categories

---
 .gsoc/options.txt | 114 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 .gsoc/options.txt

diff --git a/.gsoc/options.txt b/.gsoc/options.txt
new file mode 100644
index 000000000..60701209e
--- /dev/null
+++ b/.gsoc/options.txt
@@ -0,0 +1,114 @@
+Features
+General
+    DefaultLang (just persist main page settings?)
+    DefaultConnectionCollation (just persist main page settings?)
+    ThemeDefault (if ThemeManager == true)
+    NaturalOrder
+    InitialSlidersState
+    ErrorIconic
+    ReplaceHelpImg
+Text fields
+    CharEditing [s]
+    CharTextareaCols [s]
+    CharTextareaRows [s]
+    TextareaCols [s-]
+    TextareaRows [s-]
+    LongtextDoubleTextarea [s-]
+
+SQL Queries
+    ShowSQL [s]
+    Confirm [s]
+    IgnoreMultiSubmitErrors [s]
+    VerboseMultiSubmit [s]
+    MaxCharactersInDisplayedSQL [s-]
+    SQLQuery/Edit [s-]
+    SQLQuery/Explain [s-]
+    SQLQuery/ShowAsPHP [s-]
+    SQLQuery/Validate [false or no override]
+    SQLQuery/Refresh [s-]
+    EditInWindow [s-]
+    QueryWindowWidth [s-]
+    QueryWindowHeight [s-]
+    QueryWindowDefTab [s-]
+Page titles
+    TitleTable [s-]
+    TitleDatabase[s-]
+    TitleServer [s-]
+    TitleDefault [s-]
+
+LEFT FRAME
+Navigation frame
+    LeftFrameLight [s]
+    LeftDisplayLogo [s]
+    LeftLogoLink [s]
+    LeftLogoLinkWindow [s]
+    LeftPointerEnable [s]
+Servers
+    LeftDisplayServers [s]
+    DisplayServersList [s]
+Databases
+    DisplayDatabasesList [s]
+    LeftFrameDBTree [s]
+    LeftFrameDBSeparator [s]
+    LeftFrameTableLevel [s]
+    ShowTooltipAliasDB [s]
+Tables
+    LeftDefaultTabTable [s]
+    LeftFrameTableSeparator [s]
+    LeftFrameTableLevel [s]
+    ShowTooltip [s]
+    ShowTooltipAliasTB [s]
+
+MAIN FRAME
+AT STARTUP
+    MainPageIconic [s]
+    -ShowStats [false or no override]
+    -ShowPhpInfo [false or no override]
+    -ShowServerInfo [false or no override]
+    -ShowChgPassword [false or no override]
+    -ShowCreateDb [false or no override]
+    SuggestDBName [s]
+In browse mode...
+    NavigationBarIconic [s]
+    ShowAll [s]
+    MaxRows [s]
+    Order [s]
+    DisplayBinaryAsHex [s]
+    BrowsePointerEnable [s]
+    BrowseMarkerEnable [s]
+    RepeatCells [s-]
+    LimitChars [s-]
+    ModifyDeleteAtLeft [s-]
+    ModifyDeleteAtRight [s-]
+    DefaultDisplay [s-]
+In edit mode...
+    ProtectBinary [s]
+    ShowFunctionFields [s]
+    ShowFieldTypesInDataEditView [s-]
+    InsertRows [s]
+    ForeignKeyDropdownOrder [s, ? custom text value]
+    ForeignKeyMaxLimit [s]
+    CtrlArrowsMoving [s]
+    DefaultPropDisplay [s-]
+
+
+Tabs display settings
+    LightTabs [s]
+    PropertiesIconic [s]
+    DefaultTabServer [s]
+    DefaultTabDatabase [s]
+    DefaultTabTable [s]
+SQL Query Box
+    Edit [s]
+    Explain [s]
+    ShowAsPHP [s]
+    Validate (false or no override)
+    Refresh [s]
+
+Export
+    PDFDefaultPageSize [s-]
+    WYSIWYG-PDF [s-]
+    all export defaults [s:some]
+
+Import
+    all import defaults [s:some]

From 6b2f774ba83a856eb39040059a1d2ed78645aa4b Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 5 Jun 2010 15:42:55 +0200
Subject: [PATCH 005/106] Add category tabs to preferences page Setup script
 refactoring

---
 .gitignore                                    |   1 +
 .gsoc/options.txt                             |  12 +-
 libraries/common.lib.php                      |   4 +-
 libraries/config.values.php                   |  85 ++++++++
 .../lib => libraries/config}/Form.class.php   |   3 +-
 .../lib => libraries/config}/messages.inc.php |   0
 libraries/user_preferences.lib.php            | 105 ++++++++++
 setup/config.php                              |   2 +-
 setup/frames/form.inc.php                     |   2 +-
 setup/frames/servers.inc.php                  |   2 +-
 setup/lib/ConfigFile.class.php                |  23 +-
 setup/lib/common.inc.php                      | 196 +-----------------
 setup/lib/config_info.inc.php                 |  82 +-------
 user_preferences.php                          |  45 ++++
 14 files changed, 266 insertions(+), 296 deletions(-)
 create mode 100644 libraries/config.values.php
 rename {setup/lib => libraries/config}/Form.class.php (98%)
 rename {setup/lib => libraries/config}/messages.inc.php (100%)
 create mode 100644 libraries/user_preferences.lib.php
 create mode 100644 user_preferences.php

diff --git a/.gitignore b/.gitignore
index 3e12f7d6f..a773f8e3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ phpmyadmin.wpj
 .settings
 .buildpath
 .cache
+.idea
 *.sw[op]
 # Locales
 locale
diff --git a/.gsoc/options.txt b/.gsoc/options.txt
index 60701209e..e4bb56b94 100644
--- a/.gsoc/options.txt
+++ b/.gsoc/options.txt
@@ -3,10 +3,10 @@ General
     DefaultLang (just persist main page settings?)
     DefaultConnectionCollation (just persist main page settings?)
     ThemeDefault (if ThemeManager == true)
-    NaturalOrder
-    InitialSlidersState
-    ErrorIconic
-    ReplaceHelpImg
+    NaturalOrder [s-]
+    InitialSlidersState [s-]
+    ErrorIconic [s-]
+    ReplaceHelpImg [s-]
 Text fields
     CharEditing [s]
     CharTextareaCols [s]
@@ -14,7 +14,6 @@ Text fields
     TextareaCols [s-]
     TextareaRows [s-]
     LongtextDoubleTextarea [s-]
-
 SQL Queries
     ShowSQL [s]
     Confirm [s]
@@ -90,14 +89,13 @@ In edit mode...
     ForeignKeyMaxLimit [s]
     CtrlArrowsMoving [s]
     DefaultPropDisplay [s-]
-
-
 Tabs display settings
     LightTabs [s]
     PropertiesIconic [s]
     DefaultTabServer [s]
     DefaultTabDatabase [s]
     DefaultTabTable [s]
+
 SQL Query Box
     Edit [s]
     Explain [s]
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index ec2f8eb67..8a7e9e541 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1637,7 +1637,7 @@ function PMA_generate_html_tab($tab, $url_params = array())
     $defaults = array(
         'text'      => '',
         'class'     => '',
-        'active'    => false,
+        'active'    => null,
         'link'      => '',
         'sep'       => '?',
         'attr'      => '',
@@ -1656,7 +1656,7 @@ function PMA_generate_html_tab($tab, $url_params = array())
         } elseif (! empty($tab['active'])
          || PMA_isValid($GLOBALS['active_page'], 'identical', $tab['link'])) {
             $tab['class'] = 'active';
-        } elseif (empty($GLOBALS['active_page'])
+        } elseif (is_null($tab['active']) && empty($GLOBALS['active_page'])
           && basename($GLOBALS['PMA_PHP_SELF']) == $tab['link']
           && empty($tab['warning'])) {
             $tab['class'] = 'active';
diff --git a/libraries/config.values.php b/libraries/config.values.php
new file mode 100644
index 000000000..4d645cb64
--- /dev/null
+++ b/libraries/config.values.php
@@ -0,0 +1,85 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Database with allowed values for configuration stored in the $cfg array,
+ * used by setup script and user preferences to generate forms.
+ *
+ * @package phpMyAdmin
+ */
+
+/**
+ * Value meaning:
+ * o array - select field, array contains allowed values
+ * o string - type override
+ *
+ * Use normal array, paths won't be expanded
+ */
+$cfg_db = array();
+
+$cfg_db['Servers'] = array(1 => array(
+    'port'         => 'integer',
+    'connect_type' => array('tcp', 'socket'),
+    'extension'    => array('mysql', 'mysqli'),
+    'auth_type'    => array('config', 'http', 'signon', 'cookie'),
+    'AllowDeny'    => array(
+        'order'    => array('', 'deny,allow', 'allow,deny', 'explicit')),
+    'only_db'      => 'array'));
+$cfg_db['RecodingEngine'] = array('auto', 'iconv', 'recode');
+$cfg_db['DefaultCharset'] = $GLOBALS['cfg']['AvailableCharsets'];
+$cfg_db['OBGzip'] = array('auto', true, false);
+$cfg_db['ShowTooltipAliasTB'] = array('nested', true, false);
+$cfg_db['DisplayDatabasesList'] = array('auto', true, false);
+$cfg_db['LeftLogoLinkWindow'] = array('main', 'new');
+$cfg_db['LeftDefaultTabTable'] = array(
+    'tbl_structure.php', // fields list
+    'tbl_sql.php',       // SQL form
+    'tbl_select.php',    // search page
+    'tbl_change.php',    // insert row page
+    'sql.php');          // browse page
+$cfg_db['NavigationBarIconic'] = array(true, false, 'both');
+$cfg_db['Order'] = array('ASC', 'DESC', 'SMART');
+$cfg_db['ProtectBinary'] = array(false, 'blob', 'all');
+$cfg_db['CharEditing'] = array('input', 'textarea');
+$cfg_db['PropertiesIconic'] = array(true, false, 'both');
+$cfg_db['DefaultTabServer'] = array(
+    'main.php',                // the welcome page (recommended for multiuser setups)
+    'server_databases.php',    // list of databases
+    'server_status.php',       // runtime information
+    'server_variables.php',    // MySQL server variables
+    'server_privileges.php',   // user management
+    'server_processlist.php'); // process list
+$cfg_db['DefaultTabDatabase'] = array(
+    'db_structure.php',   // tables list
+    'db_sql.php',         // SQL form
+    'db_search.php',      // search query
+    'db_operations.php'); // operations on database
+$cfg_db['DefaultTabTable'] = array(
+    'tbl_structure.php', // fields list
+    'tbl_sql.php',       // SQL form
+    'tbl_select.php',    // search page
+    'tbl_change.php',    // insert row page
+    'sql.php');          // browse page
+$cfg_db['QueryWindowDefTab'] = array(
+	'sql',     // SQL
+	'files',   // Import files
+	'history', // SQL history
+	'full');   // All (SQL and SQL history)
+$cfg_db['Import']['format'] = array(
+    'csv',    // CSV
+    'docsql', // DocSQL
+    'ldi',    // CSV using LOAD DATA
+    'sql');   // SQL
+$cfg_db['Import']['sql_compatibility'] = array(
+    'NONE', 'ANSI', 'DB2', 'MAXDB', 'MYSQL323', 'MYSQL40', 'MSSQL', 'ORACLE',
+    // removed; in MySQL 5.0.33, this produces exports that
+    // can't be read by POSTGRESQL (see our bug #1596328)
+    //'POSTGRESQL',
+    'TRADITIONAL');
+$cfg_db['Import']['ldi_local_option'] = array('auto', true, false);
+$cfg_db['Export']['format'] = array('codegen', 'csv', 'excel', 'htmlexcel',
+    'htmlword', 'latex', 'ods', 'odt', 'pdf', 'sql', 'texytext', 'xls', 'xml',
+    'yaml');
+$cfg_db['Export']['compression'] = array('none', 'zip', 'gzip', 'bzip2');
+$cfg_db['Export']['charset'] = array_merge(array(''), $GLOBALS['cfg']['AvailableCharsets']);
+
+?>
\ No newline at end of file
diff --git a/setup/lib/Form.class.php b/libraries/config/Form.class.php
similarity index 98%
rename from setup/lib/Form.class.php
rename to libraries/config/Form.class.php
index 1e1fad4a4..f543e1fa6 100644
--- a/setup/lib/Form.class.php
+++ b/libraries/config/Form.class.php
@@ -2,9 +2,8 @@
 /**
  * Form handling code.
  *
- * @package    phpMyAdmin-setup
+ * @package    phpMyAdmin
  * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
  */
 
 /**
diff --git a/setup/lib/messages.inc.php b/libraries/config/messages.inc.php
similarity index 100%
rename from setup/lib/messages.inc.php
rename to libraries/config/messages.inc.php
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
new file mode 100644
index 000000000..c53c3dd75
--- /dev/null
+++ b/libraries/user_preferences.lib.php
@@ -0,0 +1,105 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Functions for displaying user preferences pages
+ *
+ * @package phpMyAdmin
+ */
+
+$forms = array();
+$forms['Features']['General'] = array(
+    'DefaultLang',
+    'DefaultConnectionCollation',
+    'ThemeDefault',
+    'NaturalOrder',
+    'InitialSlidersState',
+    'ErrorIconic',
+    'ReplaceHelpImg');
+$forms['Features']['Text_fields'] = array(
+    'CharEditing',
+    'CharTextareaCols',
+    'CharTextareaRows',
+    'TextareaCols',// [s-]
+    'TextareaRows',// [s-]
+    'LongtextDoubleTextarea');// [s-]
+$forms['Sql_queries']['Sql_queries'] = array(
+    'ShowSQL',
+    'Confirm',
+    'IgnoreMultiSubmitErrors',
+    'VerboseMultiSubmit',
+    'MaxCharactersInDisplayedSQL',// [s-]
+    'SQLQuery/Edit',// [s-]
+    'SQLQuery/Explain',// [s-]
+    'SQLQuery/ShowAsPHP',// [s-]
+    'SQLQuery/Validate',// [false or no override]
+    'SQLQuery/Refresh',// [s-]
+    'EditInWindow',// [s-]
+    'QueryWindowWidth',// [s-]
+    'QueryWindowHeight',// [s-]
+    'QueryWindowDefTab');// [s-]
+$forms['Sql_queries']['Sql_box'] = array(
+    'Edit',
+    'Explain',
+    'ShowAsPHP',
+    'Validate',// (false or no override)
+    'Refresh');
+$forms['Features']['Page_titles'] = array(
+    'TitleTable',// [s-]
+    'TitleDatabase',// [s-]
+    'TitleServer',// [s-]
+    'TitleDefault');// [s-]
+$forms['Left_frame']['Left_frame'] = array(
+    'LeftFrameLight',
+    'LeftDisplayLogo',
+    'LeftLogoLink',
+    'LeftLogoLinkWindow',
+    'LeftPointerEnable');
+$forms['Left_frame']['Left_servers'] = array(
+    'LeftDisplayServers',
+    'DisplayServersList');
+$forms['Left_frame']['Left_databases'] = array(
+    'DisplayDatabasesList',
+    'LeftFrameDBTree',
+    'LeftFrameDBSeparator',
+    'LeftFrameTableLevel',
+    'ShowTooltipAliasDB');
+$forms['Left_frame']['Left_tables'] = array(
+    'LeftDefaultTabTable',
+    'LeftFrameTableSeparator',
+    'LeftFrameTableLevel',
+    'ShowTooltip',
+    'ShowTooltipAliasTB');
+$forms['Main_frame']['Startup'] = array(
+    'MainPageIconic',
+    'SuggestDBName');
+$forms['Main_frame']['Browse'] = array(
+    'NavigationBarIconic',
+    'ShowAll',
+    'MaxRows',
+    'Order',
+    'DisplayBinaryAsHex',
+    'BrowsePointerEnable',
+    'BrowseMarkerEnable',
+    'RepeatCells',// [s-]
+    'LimitChars',// [s-]
+    'ModifyDeleteAtLeft',// [s-]
+    'ModifyDeleteAtRight',// [s-]
+    'DefaultDisplay');// [s-]
+$forms['Main_frame']['Edit'] = array(
+    'ProtectBinary',
+    'ShowFunctionFields',
+    'ShowFieldTypesInDataEditView',// [s-]
+    'InsertRows',
+    'ForeignKeyDropdownOrder',// [s, ? custom text value]
+    'ForeignKeyMaxLimit',
+    'CtrlArrowsMoving',
+    'DefaultPropDisplay');// [s-]
+$forms['Main_frame']['Tabs'] = array(
+    'LightTabs',
+    'PropertiesIconic',
+    'DefaultTabServer',
+    'DefaultTabDatabase',
+    'DefaultTabTable');
+$forms['Import']['Import_defaults'] = array();
+$forms['Export']['Export_defaults'] = array();
+?>
\ No newline at end of file
diff --git a/setup/config.php b/setup/config.php
index e2bd13214..0aec5cc24 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -11,7 +11,7 @@
  * Core libraries.
  */
 require './lib/common.inc.php';
-require_once './setup/lib/Form.class.php';
+require_once './libraries/config/Form.class.php';
 require_once './setup/lib/FormDisplay.class.php';
 
 $form_display = new FormDisplay();
diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php
index 019b110be..03e3970d9 100644
--- a/setup/frames/form.inc.php
+++ b/setup/frames/form.inc.php
@@ -14,7 +14,7 @@ if (!defined('PHPMYADMIN')) {
 /**
  * Core libraries.
  */
-require_once './setup/lib/Form.class.php';
+require_once './libraries/config/Form.class.php';
 require_once './setup/lib/FormDisplay.class.php';
 require_once './setup/lib/form_processing.lib.php';
 
diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php
index 17ff2f9e4..b5fa11b36 100644
--- a/setup/frames/servers.inc.php
+++ b/setup/frames/servers.inc.php
@@ -14,7 +14,7 @@ if (!defined('PHPMYADMIN')) {
 /**
  * Core libraries.
  */
-require_once './setup/lib/Form.class.php';
+require_once './libraries/config/Form.class.php';
 require_once './setup/lib/FormDisplay.class.php';
 require_once './setup/lib/form_processing.lib.php';
 
diff --git a/setup/lib/ConfigFile.class.php b/setup/lib/ConfigFile.class.php
index e7e7b288f..9ba3ef524 100644
--- a/setup/lib/ConfigFile.class.php
+++ b/setup/lib/ConfigFile.class.php
@@ -55,7 +55,7 @@ class ConfigFile
         // apply default values overrides
         if (count($cfg_db['_overrides'])) {
             foreach ($cfg_db['_overrides'] as $path => $value) {
-                array_write($path, $cfg, $value);
+                PMA_array_write($path, $cfg, $value);
             }
         }
 
@@ -92,9 +92,9 @@ class ConfigFile
         $default_value = $this->getDefault($canonical_path);
         if (!isset($this->persistKeys[$canonical_path])
             && (($value == $default_value) || (empty($value) && empty($default_value)))) {
-            array_remove($path, $_SESSION['ConfigFile']);
+            PMA_array_remove($path, $_SESSION['ConfigFile']);
         } else {
-            array_write($path, $_SESSION['ConfigFile'], $value);
+            PMA_array_write($path, $_SESSION['ConfigFile'], $value);
         }
     }
 
@@ -107,7 +107,7 @@ class ConfigFile
      */
     public function get($path, $default = null)
     {
-        return array_read($path, $_SESSION['ConfigFile'], $default);
+        return PMA_array_read($path, $_SESSION['ConfigFile'], $default);
     }
 
     /**
@@ -121,7 +121,7 @@ class ConfigFile
      */
     public function getDefault($canonical_path, $default = null)
     {
-        return array_read($canonical_path, $this->cfg, $default);
+        return PMA_array_read($canonical_path, $this->cfg, $default);
     }
 
     /**
@@ -134,7 +134,7 @@ class ConfigFile
      */
     public function getValue($path, $default = null)
     {
-        $v = array_read($path, $_SESSION['ConfigFile'], null);
+        $v = PMA_array_read($path, $_SESSION['ConfigFile'], null);
         if ($v !== null) {
             return $v;
         }
@@ -161,7 +161,7 @@ class ConfigFile
      */
     public function getDbEntry($path, $default = null)
     {
-        return array_read($path, $this->cfgDb, $default);
+        return PMA_array_read($path, $this->cfgDb, $default);
     }
 
     /**
@@ -252,13 +252,18 @@ class ConfigFile
     }
 
     /**
-     * Returns config file path
+     * Returns config file path, relative to phpMyAdmin's root path
      *
      * @return unknown
      */
     public function getFilePath()
     {
-        return $this->getDbEntry('_config_file_path');
+        // Load paths
+        if (!defined('SETUP_CONFIG_FILE')) {
+            require_once './libraries/vendor_config.php';
+        }
+
+        return SETUP_CONFIG_FILE;
     }
 
     /**
diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php
index 2d1f1f691..4e15aac96 100644
--- a/setup/lib/common.inc.php
+++ b/setup/lib/common.inc.php
@@ -4,7 +4,6 @@
  *
  * @package    phpMyAdmin-setup
  * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
  */
 
 /**
@@ -20,8 +19,9 @@ if (!file_exists('./libraries/common.inc.php')) {
 }
 
 require_once './libraries/common.inc.php';
+require_once './libraries/config/config_functions.lib.php';
+require_once './libraries/config/messages.inc.php';
 require_once './libraries/url_generating.lib.php';
-require_once './setup/lib/messages.inc.php';
 require_once './setup/lib/ConfigFile.class.php';
 
 // use default error handler
@@ -37,194 +37,4 @@ if (!isset($_SESSION['ConfigFile'])) {
 // allows for redirection even after sending some data
 ob_start();
 
-/**
- * Returns value of an element in $array given by $path.
- * $path is a string describing position of an element in an associative array,
- * eg. Servers/1/host refers to $array[Servers][1][host]
- *
- * @param  string   $path
- * @param  array    $array
- * @param  mixed    $default
- * @return mixed    array element or $default
- */
-function array_read($path, $array, $default = null)
-{
-    $keys = explode('/', $path);
-    $value =& $array;
-    foreach ($keys as $key) {
-        if (!isset($value[$key])) {
-            return $default;
-        }
-        $value =& $value[$key];
-    }
-    return $value;
-}
-
-/**
- * Stores value in an array
- *
- * @param  string   $path
- * @param  array    &$array
- * @param  mixed    $value
- */
-function array_write($path, &$array, $value)
-{
-    $keys = explode('/', $path);
-    $last_key = array_pop($keys);
-    $a =& $array;
-    foreach ($keys as $key) {
-        if (!isset($a[$key])) {
-            $a[$key] = array();
-        }
-        $a =& $a[$key];
-    }
-    $a[$last_key] = $value;
-}
-
-/**
- * Removes value from an array
- *
- * @param  string   $path
- * @param  array    &$array
- * @param  mixed    $value
- */
-function array_remove($path, &$array)
-{
-    $keys = explode('/', $path);
-    $keys_last = array_pop($keys);
-    $path = array();
-    $depth = 0;
-
-    $path[0] =& $array;
-    $found = true;
-    // go as deep as required or possible
-    foreach ($keys as $key) {
-        if (!isset($path[$depth][$key])) {
-            $found = false;
-            break;
-        }
-        $depth++;
-        $path[$depth] =& $path[$depth-1][$key];
-    }
-    // if element found, remove it
-    if ($found) {
-        unset($path[$depth][$keys_last]);
-        $depth--;
-    }
-
-    // remove empty nested arrays
-    for (; $depth >= 0; $depth--) {
-        if (!isset($path[$depth+1]) || count($path[$depth+1]) == 0) {
-            unset($path[$depth][$keys[$depth]]);
-        } else {
-            break;
-        }
-    }
-}
-
-/**
- * Returns sanitized language string, taking into account our special codes
- * for formatting. Takes variable number of arguments.
- * Based on PMA_sanitize from sanitize.lib.php.
- *
- * @param  string  $lang_key key in $GLOBALS WITHOUT 'strSetup' prefix
- * @param  mixed   $args     arguments for sprintf
- * @return string
- */
-function PMA_lang($lang_key)
-{
-    static $search, $replace;
-
-    // some quick cache'ing
-    if ($search === null) {
-        $replace_pairs = array(
-            '<'         => '&lt;',
-            '>'         => '&gt;',
-            '[em]'      => '<em>',
-            '[/em]'     => '</em>',
-            '[strong]'  => '<strong>',
-            '[/strong]' => '</strong>',
-            '[code]'    => '<code>',
-            '[/code]'   => '</code>',
-            '[kbd]'     => '<kbd>',
-            '[/kbd]'    => '</kbd>',
-            '[br]'      => '<br />',
-            '[sup]'     => '<sup>',
-            '[/sup]'    => '</sup>');
-        $search = array_keys($replace_pairs);
-        $replace = array_values($replace_pairs);
-    }
-    if (!isset($GLOBALS["strSetup$lang_key"])) {
-        return $lang_key;
-    }
-    $message = str_replace($search, $replace, $GLOBALS["strSetup$lang_key"]);
-    // replace [a@"$1"]$2[/a] with <a href="$1">$2</a>
-    $message = preg_replace('#\[a@("?)([^\]]+)\1\]([^\[]+)\[/a\]#e',
-        "PMA_lang_link_replace('$2', '$3')", $message);
-
-    if (func_num_args() == 1) {
-        return $message;
-    } else {
-        $args = func_get_args();
-        array_shift($args);
-        return vsprintf($message, $args);
-    }
-}
-
-/**
- * Returns translated field name
- *
- * @param string $canonical_path
- * @return string
- */
-function PMA_lang_name($canonical_path)
-{
-    $lang_key = str_replace(
-    	array('Servers/1/', '/'),
-    	array('Servers/', '_'),
-    	$canonical_path) . '_name';
-    return isset($GLOBALS["strSetup$lang_key"])
-        ? $GLOBALS["strSetup$lang_key"]
-        : $lang_key;
-}
-
-/**
- * Returns translated field description
- *
- * @param string $canonical_path
- * @return string
- */
-function PMA_lang_desc($canonical_path)
-{
-    $lang_key = str_replace(
-    	array('Servers/1/', '/'),
-    	array('Servers/', '_'),
-    	$canonical_path) . '_desc';
-    return isset($GLOBALS["strSetup$lang_key"])
-        ? PMA_lang($lang_key)
-        : '';
-}
-
-/**
- * Wraps link in &lt;a&gt; tags and replaces argument separator in internal links
- * to the one returned by PMA_get_arg_separator()
- *
- * @param string $link
- * @param string $text
- * @return string
- */
-function PMA_lang_link_replace($link, $text)
-{
-    static $separator;
-
-    if (!isset($separator)) {
-        $separator = PMA_get_arg_separator('html');
-    }
-
-    if (!preg_match('#^http://#', $link)) {
-        $link = str_replace('&amp;', $separator, $link);
-    }
-
-    return '<a href="' . $link . '">' . $text . '</a>';
-}
-?>
+?>
\ No newline at end of file
diff --git a/setup/lib/config_info.inc.php b/setup/lib/config_info.inc.php
index 71a6bc503..3b9f25e7b 100644
--- a/setup/lib/config_info.inc.php
+++ b/setup/lib/config_info.inc.php
@@ -16,87 +16,9 @@ if (!defined('PHPMYADMIN')) {
 }
 
 /**
- * Load paths.
+ * Load config value database ($cfg_db)
  */
-require_once('./libraries/vendor_config.php');
-
-$cfg_db = array();
-
-// path to config file, relative to phpMyAdmin's root path
-$cfg_db['_config_file_path'] = SETUP_CONFIG_FILE;
-
-/**
- * Value meaning:
- * o array - select field, array contains allowed values
- * o string - type override
- *
- * Use normal array, paths won't be expanded
- */
-$cfg_db['Servers'] = array(1 => array(
-    'port'         => 'integer',
-    'connect_type' => array('tcp', 'socket'),
-    'extension'    => array('mysql', 'mysqli'),
-    'auth_type'    => array('config', 'http', 'signon', 'cookie'),
-    'AllowDeny'    => array(
-        'order'    => array('', 'deny,allow', 'allow,deny', 'explicit')),
-    'only_db'      => 'array'));
-$cfg_db['RecodingEngine'] = array('auto', 'iconv', 'recode');
-$cfg_db['DefaultCharset'] = $GLOBALS['cfg']['AvailableCharsets'];
-$cfg_db['OBGzip'] = array('auto', true, false);
-$cfg_db['ShowTooltipAliasTB'] = array('nested', true, false);
-$cfg_db['DisplayDatabasesList'] = array('auto', true, false);
-$cfg_db['LeftLogoLinkWindow'] = array('main', 'new');
-$cfg_db['LeftDefaultTabTable'] = array(
-    'tbl_structure.php', // fields list
-    'tbl_sql.php',       // SQL form
-    'tbl_select.php',    // search page
-    'tbl_change.php',    // insert row page
-    'sql.php');          // browse page
-$cfg_db['NavigationBarIconic'] = array(true, false, 'both');
-$cfg_db['Order'] = array('ASC', 'DESC', 'SMART');
-$cfg_db['ProtectBinary'] = array(false, 'blob', 'all');
-$cfg_db['CharEditing'] = array('input', 'textarea');
-$cfg_db['PropertiesIconic'] = array(true, false, 'both');
-$cfg_db['DefaultTabServer'] = array(
-    'main.php',                // the welcome page (recommended for multiuser setups)
-    'server_databases.php',    // list of databases
-    'server_status.php',       // runtime information
-    'server_variables.php',    // MySQL server variables
-    'server_privileges.php',   // user management
-    'server_processlist.php'); // process list
-$cfg_db['DefaultTabDatabase'] = array(
-    'db_structure.php',   // tables list
-    'db_sql.php',         // SQL form
-    'db_search.php',      // search query
-    'db_operations.php'); // operations on database
-$cfg_db['DefaultTabTable'] = array(
-    'tbl_structure.php', // fields list
-    'tbl_sql.php',       // SQL form
-    'tbl_select.php',    // search page
-    'tbl_change.php',    // insert row page
-    'sql.php');          // browse page
-$cfg_db['QueryWindowDefTab'] = array(
-	'sql',     // SQL
-	'files',   // Import files
-	'history', // SQL history
-	'full');   // All (SQL and SQL history)
-$cfg_db['Import']['format'] = array(
-    'csv',    // CSV
-    'docsql', // DocSQL
-    'ldi',    // CSV using LOAD DATA
-    'sql');   // SQL
-$cfg_db['Import']['sql_compatibility'] = array(
-    'NONE', 'ANSI', 'DB2', 'MAXDB', 'MYSQL323', 'MYSQL40', 'MSSQL', 'ORACLE',
-    // removed; in MySQL 5.0.33, this produces exports that
-    // can't be read by POSTGRESQL (see our bug #1596328)
-    //'POSTGRESQL',
-    'TRADITIONAL');
-$cfg_db['Import']['ldi_local_option'] = array('auto', true, false);
-$cfg_db['Export']['format'] = array('codegen', 'csv', 'excel', 'htmlexcel',
-    'htmlword', 'latex', 'ods', 'odt', 'pdf', 'sql', 'texytext', 'xls', 'xml',
-    'yaml');
-$cfg_db['Export']['compression'] = array('none', 'zip', 'gzip', 'bzip2');
-$cfg_db['Export']['charset'] = array_merge(array(''), $GLOBALS['cfg']['AvailableCharsets']);
+require './libraries/config.values.php';
 
 /**
  * Config options which will be placed in config file even if they are set
diff --git a/user_preferences.php b/user_preferences.php
new file mode 100644
index 000000000..e9ada9fc6
--- /dev/null
+++ b/user_preferences.php
@@ -0,0 +1,45 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * User preferences page
+ *
+ * @package phpMyAdmin
+ */
+
+/**
+ * Gets some core libraries and displays a top message if required
+ */
+require_once './libraries/common.inc.php';
+require_once './libraries/user_preferences.lib.php';
+require_once './libraries/config/messages.inc.php';
+
+$GLOBALS['js_include'][] = 'js/settings_forms.js';
+
+require_once './libraries/header.inc.php';
+
+// Any message to display?
+if (! empty($message)) {
+    PMA_showMessage($message);
+    unset($message);
+}
+
+$common_url_query =  PMA_generate_common_url('', '');
+
+$tabs = array();
+foreach (array_keys($forms) as $form) {
+    $tabs[] = array(
+        'link' => 'user_preferences.php',
+        'text' => PMA_ifSetOr($GLOBALS['strSetupForm_' . $form], $form), // TODO: remove ifSetOr
+        'active' => $form == PMA_ifSetOr($_GET['form'], ''),
+        'url_params' => array('form' => $form)
+    );
+}
+
+echo PMA_generate_html_tabs($tabs, array());
+
+
+/**
+ * Displays the footer
+ */
+require_once './libraries/footer.inc.php';
+?>
\ No newline at end of file

From 3ed35399589e18a6b3bec155d4f7bd74047a9c7a Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 5 Jun 2010 19:25:54 +0200
Subject: [PATCH 006/106] Setup script refactoring: moved ConfigFile, Form,
 FormDisplay Config db overrides and validation info stored in
 config.values.php

---
 libraries/config.values.php                   | 29 ++++++++
 .../config}/ConfigFile.class.php              | 29 +++++---
 libraries/config/Form.class.php               | 33 +++------
 .../config}/FormDisplay.class.php             |  7 +-
 setup/config.php                              |  6 +-
 setup/frames/config.inc.php                   |  2 +-
 setup/frames/form.inc.php                     |  6 +-
 setup/frames/index.inc.php                    |  2 +-
 setup/frames/servers.inc.php                  | 14 ++--
 setup/lib/common.inc.php                      | 16 ++++-
 setup/lib/config_info.inc.php                 | 71 -------------------
 setup/lib/validate.lib.php                    |  4 +-
 user_preferences.php                          | 11 ++-
 13 files changed, 107 insertions(+), 123 deletions(-)
 rename {setup/lib => libraries/config}/ConfigFile.class.php (94%)
 rename {setup/lib => libraries/config}/FormDisplay.class.php (98%)
 delete mode 100644 setup/lib/config_info.inc.php

diff --git a/libraries/config.values.php b/libraries/config.values.php
index 4d645cb64..188335477 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -82,4 +82,33 @@ $cfg_db['Export']['format'] = array('codegen', 'csv', 'excel', 'htmlexcel',
 $cfg_db['Export']['compression'] = array('none', 'zip', 'gzip', 'bzip2');
 $cfg_db['Export']['charset'] = array_merge(array(''), $GLOBALS['cfg']['AvailableCharsets']);
 
+/**
+ * Default values overrides
+ * Use only full paths
+ */
+$cfg_db['_overrides'] = array();
+$cfg_db['_overrides']['Servers/1/extension'] = extension_loaded('mysqli')
+    ? 'mysqli' : 'mysql';
+
+/**
+ * Validator assignments (functions from setup/validate.lib.php and 'validators'
+ * object in setup/scripts.js)
+ * Use only full paths and form ids
+ */
+$cfg_db['_validators'] = array(
+    'Server' => 'validate_server',
+    'Server_pmadb' => 'validate_pmadb',
+    'Servers/1/port' => 'validate_port_number',
+    'Servers/1/hide_db' => 'validate_regex',
+    'TrustedProxies' => 'validate_trusted_proxies',
+    'LoginCookieValidity' => 'validate_positive_number',
+    'LoginCookieStore' => 'validate_non_negative_number',
+    'QueryHistoryMax' => 'validate_positive_number',
+    'LeftFrameTableLevel' => 'validate_positive_number',
+    'MaxRows' => 'validate_positive_number',
+    'CharTextareaCols' => 'validate_positive_number',
+    'CharTextareaRows' => 'validate_positive_number',
+    'InsertRows' => 'validate_positive_number',
+    'ForeignKeyMaxLimit' => 'validate_positive_number',
+    'Import/skip_queries' => 'validate_non_negative_number');
 ?>
\ No newline at end of file
diff --git a/setup/lib/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
similarity index 94%
rename from setup/lib/ConfigFile.class.php
rename to libraries/config/ConfigFile.class.php
index 9ba3ef524..bcb1e8ac2 100644
--- a/setup/lib/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -3,14 +3,13 @@
  * Config file management and generation
  *
  * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
- * @package    phpMyAdmin-setup
+ * @package    phpMyAdmin
  */
 
 /**
  * Config file management and generation class
  *
- * @package    phpMyAdmin-setup
+ * @package    phpMyAdmin
  */
 class ConfigFile
 {
@@ -49,8 +48,7 @@ class ConfigFile
 
         // load additionsl config information
         $cfg_db = &$this->cfgDb;
-        $persist_keys = array();
-        require './setup/lib/config_info.inc.php';
+        require './libraries/config.values.php';
 
         // apply default values overrides
         if (count($cfg_db['_overrides'])) {
@@ -58,9 +56,6 @@ class ConfigFile
                 PMA_array_write($path, $cfg, $value);
             }
         }
-
-        // checking key presence is much faster than searching so move values to keys
-        $this->persistKeys = array_flip($persist_keys);
     }
 
     /**
@@ -76,6 +71,18 @@ class ConfigFile
         return self::$_instance;
     }
 
+    /**
+     * Sets names of config options which will be placed in config file even if they are set
+     * to their default values (use only full paths)
+     *
+     * @param array $keys
+     */
+    public function setPersistKeys($keys)
+    {
+        // checking key presence is much faster than searching so move values to keys
+        $this->persistKeys = array_flip($keys);
+    }
+
     /**
      * Sets config value
      *
@@ -112,7 +119,7 @@ class ConfigFile
 
     /**
      * Returns default config value or $default it it's not set ie. it doesn't
-     * exist in config.default.php ($cfg) and config_info.inc.php
+     * exist in config.default.php ($cfg) and config.values.php
      * ($_cfg_db['_overrides'])
      *
      * @param  string $canonical_path
@@ -312,7 +319,7 @@ class ConfigFile
                 unset($persistKeys[$k]);
             }
         }
-        // keep 1d array keys which are present in $persist_keys (config_info.inc.php)
+        // keep 1d array keys which are present in $persist_keys (config.values.php)
         foreach (array_keys($persistKeys) as $k) {
             if (strpos($k, '/') === false) {
                 $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
@@ -324,4 +331,4 @@ class ConfigFile
         return $ret;
     }
 }
-?>
+?>
\ No newline at end of file
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
index f543e1fa6..13ceee8b7 100644
--- a/libraries/config/Form.class.php
+++ b/libraries/config/Form.class.php
@@ -44,22 +44,17 @@ class Form
      */
     private $fieldsTypes;
 
-    /**
-     * Cached forms
-     * @var array
-     */
-    private static $_forms;
-
     /**
      * Constructor, reads default config values
      *
      * @param string  $form_name
+     * @param array   $form
      * @param int     $index      arbitrary index, stored in Form::$index
      */
-    public function __construct($form_name, $index = null)
+    public function __construct($form_name, array $form, $index = null)
     {
         $this->index = $index;
-        $this->loadForm($form_name);
+        $this->loadForm($form_name, $form);
     }
 
     /**
@@ -120,21 +115,14 @@ class Form
 
     /**
      * Reads form paths to {@link $fields}
+     *
+     * @param array $form
      */
-    protected function readFormPaths()
+    protected function readFormPaths($form)
     {
-        if (is_null(self::$_forms)) {
-            $forms =& self::$_forms;
-            require './setup/lib/forms.inc.php';
-        }
-
-        if (!isset(self::$_forms[$this->name])) {
-            return;
-        }
-
         // flatten form fields' paths and save them to $fields
         $this->fields = array();
-        array_walk(self::$_forms[$this->name], array($this, '_readFormPathsCallback'), '');
+        array_walk($form, array($this, '_readFormPathsCallback'), '');
 
         // $this->fields is an array of the form: [0..n] => 'field path'
         // change numeric indexes to contain field names (last part of the path)
@@ -170,12 +158,13 @@ class Form
      * config file
      *
      * @param string $form_name
+     * @param array  $form
      */
-    public function loadForm($form_name)
+    public function loadForm($form_name, $form)
     {
         $this->name = $form_name;
-        $this->readFormPaths();
+        $this->readFormPaths($form);
         $this->readTypes();
     }
 }
-?>
+?>
\ No newline at end of file
diff --git a/setup/lib/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
similarity index 98%
rename from setup/lib/FormDisplay.class.php
rename to libraries/config/FormDisplay.class.php
index 7b6bfebb4..62d21a1fd 100644
--- a/setup/lib/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -71,11 +71,12 @@ class FormDisplay
      * Registers form in form manager
      *
      * @param string $form_name
+     * @param array  $form
      * @param int    $server_id 0 if new server, validation; >= 1 if editing a server
      */
-    public function registerForm($form_name, $server_id = null)
+    public function registerForm($form_name, array $form, $server_id = null)
     {
-        $this->forms[$form_name] = new Form($form_name, $server_id);
+        $this->forms[$form_name] = new Form($form_name, $form, $server_id);
         $this->is_valdiated = false;
         foreach ($this->forms[$form_name]->fields as $path) {
             $work_path = $server_id === null
@@ -162,7 +163,7 @@ class FormDisplay
         $js = array();
         $js_default = array();
         $tabbed_form = $tabbed_form && (count($this->forms) > 1);
-        $validators = ConfigFile::getInstance()->getDbEntry('_validators');
+        $validators = ConfigFile::getInstance()->getDbEntry('_validators', array());
 
         display_form_top();
 
diff --git a/setup/config.php b/setup/config.php
index 0aec5cc24..8b514d27c 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -12,10 +12,12 @@
  */
 require './lib/common.inc.php';
 require_once './libraries/config/Form.class.php';
-require_once './setup/lib/FormDisplay.class.php';
+require_once './libraries/config/FormDisplay.class.php';
+
+require './setup/lib/forms.inc.php';
 
 $form_display = new FormDisplay();
-$form_display->registerForm('_config.php');
+$form_display->registerForm('_config.php', $forms['_config.php']);
 $form_display->save('_config.php');
 $config_file_path = ConfigFile::getInstance()->getFilePath();
 
diff --git a/setup/frames/config.inc.php b/setup/frames/config.inc.php
index 4e925d912..5bb5785da 100644
--- a/setup/frames/config.inc.php
+++ b/setup/frames/config.inc.php
@@ -14,7 +14,7 @@ if (!defined('PHPMYADMIN')) {
 /**
  * Core libraries.
  */
-require_once './setup/lib/FormDisplay.class.php';
+require_once './libraries/config/FormDisplay.class.php';
 require_once './setup/lib/index.lib.php';
 
 $config_readable = false;
diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php
index 03e3970d9..cc36aa6b7 100644
--- a/setup/frames/form.inc.php
+++ b/setup/frames/form.inc.php
@@ -15,9 +15,11 @@ if (!defined('PHPMYADMIN')) {
  * Core libraries.
  */
 require_once './libraries/config/Form.class.php';
-require_once './setup/lib/FormDisplay.class.php';
+require_once './libraries/config/FormDisplay.class.php';
 require_once './setup/lib/form_processing.lib.php';
 
+require './setup/lib/forms.inc.php';
+
 $formsets = array(
     'features' => array(
         'forms' => array('Import_export', 'Security', 'Sql_queries', 'Other_core_settings')),
@@ -43,7 +45,7 @@ if (isset($GLOBALS['strSetupFormset_' . $formset_id])) {
 }
 $form_display = new FormDisplay();
 foreach ($formset['forms'] as $form_name) {
-    $form_display->registerForm($form_name);
+    $form_display->registerForm($form_name, $forms[$form_name]);
 }
 process_formset($form_display);
 ?>
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 43b657466..0bab3d632 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -15,7 +15,7 @@ if (!defined('PHPMYADMIN')) {
  * Core libraries.
  */
 require_once './libraries/display_select_lang.lib.php';
-require_once './setup/lib/FormDisplay.class.php';
+require_once './libraries/config/FormDisplay.class.php';
 require_once './setup/lib/index.lib.php';
 
 // prepare unfiltered language list
diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php
index b5fa11b36..12d0a4656 100644
--- a/setup/frames/servers.inc.php
+++ b/setup/frames/servers.inc.php
@@ -15,9 +15,11 @@ if (!defined('PHPMYADMIN')) {
  * Core libraries.
  */
 require_once './libraries/config/Form.class.php';
-require_once './setup/lib/FormDisplay.class.php';
+require_once './libraries/config/FormDisplay.class.php';
 require_once './setup/lib/form_processing.lib.php';
 
+require './setup/lib/forms.inc.php';
+
 $mode = filter_input(INPUT_GET, 'mode');
 $id = filter_input(INPUT_GET, 'id', FILTER_VALIDATE_INT);
 
@@ -41,10 +43,10 @@ if (isset($page_title)) {
     echo '<h2>' . $page_title . '</h2>';
 }
 $form_display = new FormDisplay();
-$form_display->registerForm('Server', $id);
-$form_display->registerForm('Server_login_options', $id);
-$form_display->registerForm('Server_config', $id);
-$form_display->registerForm('Server_pmadb', $id);
-$form_display->registerForm('Server_tracking', $id);
+$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);
 process_formset($form_display);
 ?>
diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php
index 4e15aac96..bc85e7b0b 100644
--- a/setup/lib/common.inc.php
+++ b/setup/lib/common.inc.php
@@ -21,8 +21,8 @@ if (!file_exists('./libraries/common.inc.php')) {
 require_once './libraries/common.inc.php';
 require_once './libraries/config/config_functions.lib.php';
 require_once './libraries/config/messages.inc.php';
+require_once './libraries/config/ConfigFile.class.php';
 require_once './libraries/url_generating.lib.php';
-require_once './setup/lib/ConfigFile.class.php';
 
 // use default error handler
 restore_error_handler();
@@ -33,6 +33,20 @@ $GLOBALS['PMA_Config']->setCookie('pma_lang', $GLOBALS['lang']);
 if (!isset($_SESSION['ConfigFile'])) {
     $_SESSION['ConfigFile'] = array();
 }
+ConfigFile::getInstance()->setPersistKeys(array(
+    'DefaultLang',
+    'ServerDefault',
+    'UploadDir',
+    'SaveDir',
+    'Servers/1/verbose',
+    'Servers/1/host',
+    'Servers/1/port',
+    'Servers/1/socket',
+    'Servers/1/extension',
+    'Servers/1/connect_type',
+    'Servers/1/auth_type',
+    'Servers/1/user',
+    'Servers/1/password'));
 
 // allows for redirection even after sending some data
 ob_start();
diff --git a/setup/lib/config_info.inc.php b/setup/lib/config_info.inc.php
deleted file mode 100644
index 3b9f25e7b..000000000
--- a/setup/lib/config_info.inc.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Description of options with non-standard values, list of persistent options
- * and validator assignments.
- *
- * By default data types are taken from config.default.php, here we define
- * only allowed values for select fields and type overrides.
- *
- * @package    phpMyAdmin-setup
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
- */
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Load config value database ($cfg_db)
- */
-require './libraries/config.values.php';
-
-/**
- * Config options which will be placed in config file even if they are set
- * to their default values (use only full paths)
- */
-$persist_keys = array(
-    'DefaultLang',
-    'ServerDefault',
-    'UploadDir',
-    'SaveDir',
-    'Servers/1/verbose',
-    'Servers/1/host',
-    'Servers/1/port',
-    'Servers/1/socket',
-    'Servers/1/extension',
-    'Servers/1/connect_type',
-    'Servers/1/auth_type',
-    'Servers/1/user',
-    'Servers/1/password');
-
-/**
- * Default values overrides
- * Use only full paths
- */
-$cfg_db['_overrides'] = array();
-$cfg_db['_overrides']['Servers/1/extension'] = extension_loaded('mysqli')
-    ? 'mysqli' : 'mysql';
-
-/**
- * Validator assignments (functions from validate.lib.php and 'validators'
- * object in scripts.js)
- * Use only full paths and form ids
- */
-$cfg_db['_validators'] = array(
-    'Server' => 'validate_server',
-    'Server_pmadb' => 'validate_pmadb',
-    'Servers/1/port' => 'validate_port_number',
-    'Servers/1/hide_db' => 'validate_regex',
-    'TrustedProxies' => 'validate_trusted_proxies',
-    'LoginCookieValidity' => 'validate_positive_number',
-    'LoginCookieStore' => 'validate_non_negative_number',
-    'QueryHistoryMax' => 'validate_positive_number',
-    'LeftFrameTableLevel' => 'validate_positive_number',
-    'MaxRows' => 'validate_positive_number',
-    'CharTextareaCols' => 'validate_positive_number',
-    'CharTextareaRows' => 'validate_positive_number',
-    'InsertRows' => 'validate_positive_number',
-    'ForeignKeyMaxLimit' => 'validate_positive_number',
-    'Import/skip_queries' => 'validate_non_negative_number');
-?>
diff --git a/setup/lib/validate.lib.php b/setup/lib/validate.lib.php
index c69b9f42c..05b09783c 100644
--- a/setup/lib/validate.lib.php
+++ b/setup/lib/validate.lib.php
@@ -9,7 +9,7 @@
  * assigned to a form element (formset name or field path). Even if there are
  * no errors, key must be set with an empty value.
  *
- * Valdiation functions are assigned in $cfg_db['_validators'] (config_info.inc.php).
+ * Valdiation functions are assigned in $cfg_db['_validators'] (config.values.php).
  *
  * @package    phpMyAdmin-setup
  * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
@@ -193,7 +193,7 @@ function validate_server($path, $values)
  */
 function validate_pmadb($path, $values)
 {
-    $tables = array('Servers/1/bookmarktable', 'Servers/1/relation', 'Servers/1/table_info', 'Servers/1/table_coords', 'Servers/1/pdf_pages', 'Servers/1/column_info', 'Servers/1/history', 'Servers/1/designer_coords');
+    //$tables = array('Servers/1/bookmarktable', 'Servers/1/relation', 'Servers/1/table_info', 'Servers/1/table_coords', 'Servers/1/pdf_pages', 'Servers/1/column_info', 'Servers/1/history', 'Servers/1/designer_coords');
     $result = array('Server_pmadb' => '', 'Servers/1/controluser' => '', 'Servers/1/controlpass' => '');
     $error = false;
 
diff --git a/user_preferences.php b/user_preferences.php
index e9ada9fc6..82ad5bccd 100644
--- a/user_preferences.php
+++ b/user_preferences.php
@@ -12,6 +12,7 @@
 require_once './libraries/common.inc.php';
 require_once './libraries/user_preferences.lib.php';
 require_once './libraries/config/messages.inc.php';
+require_once './libraries/config/FormDisplay.class.php';
 
 $GLOBALS['js_include'][] = 'js/settings_forms.js';
 
@@ -26,17 +27,25 @@ if (! empty($message)) {
 $common_url_query =  PMA_generate_common_url('', '');
 
 $tabs = array();
+$active_formset = filter_input(INPUT_GET, 'form');
+if (!isset($forms[$active_formset])) {
+    $active_formset = array_shift(array_keys($forms));
+}
 foreach (array_keys($forms) as $form) {
     $tabs[] = array(
         'link' => 'user_preferences.php',
         'text' => PMA_ifSetOr($GLOBALS['strSetupForm_' . $form], $form), // TODO: remove ifSetOr
-        'active' => $form == PMA_ifSetOr($_GET['form'], ''),
+        'active' => $form == $active_formset,
         'url_params' => array('form' => $form)
     );
 }
 
 echo PMA_generate_html_tabs($tabs, array());
 
+$form_display = new FormDisplay();
+foreach ($forms[$active_formset] as $form_name => $form) {
+    $form_display->registerForm($form_name, $form);
+}
 
 /**
  * Displays the footer

From 03e66cd0d419947f3fcd617e4412e2e53179472b Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 11 Jun 2010 17:11:15 +0200
Subject: [PATCH 007/106] Display forms

---
 user_preferences.php | 52 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 7 deletions(-)

diff --git a/user_preferences.php b/user_preferences.php
index 82ad5bccd..3021a74ca 100644
--- a/user_preferences.php
+++ b/user_preferences.php
@@ -11,7 +11,10 @@
  */
 require_once './libraries/common.inc.php';
 require_once './libraries/user_preferences.lib.php';
+require_once './libraries/config/config_functions.lib.php';
 require_once './libraries/config/messages.inc.php';
+require_once './libraries/config/ConfigFile.class.php';
+require_once './libraries/config/Form.class.php';
 require_once './libraries/config/FormDisplay.class.php';
 
 $GLOBALS['js_include'][] = 'js/settings_forms.js';
@@ -24,18 +27,16 @@ if (! empty($message)) {
     unset($message);
 }
 
-$common_url_query =  PMA_generate_common_url('', '');
-
 $tabs = array();
-$active_formset = filter_input(INPUT_GET, 'form');
-if (!isset($forms[$active_formset])) {
-    $active_formset = array_shift(array_keys($forms));
+$form_param = filter_input(INPUT_GET, 'form');
+if (!isset($forms[$form_param])) {
+    $form_param = array_shift(array_keys($forms));
 }
 foreach (array_keys($forms) as $form) {
     $tabs[] = array(
         'link' => 'user_preferences.php',
         'text' => PMA_ifSetOr($GLOBALS['strSetupForm_' . $form], $form), // TODO: remove ifSetOr
-        'active' => $form == $active_formset,
+        'active' => $form == $form_param,
         'url_params' => array('form' => $form)
     );
 }
@@ -43,10 +44,47 @@ foreach (array_keys($forms) as $form) {
 echo PMA_generate_html_tabs($tabs, array());
 
 $form_display = new FormDisplay();
-foreach ($forms[$active_formset] as $form_name => $form) {
+foreach ($forms[$form_param] as $form_name => $form) {
     $form_display->registerForm($form_name, $form);
 }
 
+if (filter_input(INPUT_GET, 'mode') == 'revert') {
+    // revert erroneous fields to their default values
+    $form_display->fixErrors();
+    // redirect
+    $url_params = array('form' => $form_param);
+    PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'user_preferences.php'
+            . PMA_generate_common_url($url_params, '&'));
+    exit;
+}
+if (!$form_display->process(false)) {
+    // handle form view and failed POST
+    $form_display->display(true, true);
+} else {
+    // check for form errors
+    if ($form_display->hasErrors()) {
+        // form has errors, show warning
+        $separator = PMA_get_arg_separator('html');
+        ?>
+        <div class="warning">
+            <h4><?php echo __('Warning') ?></h4>
+            <?php echo PMA_lang('error_form') ?><br />
+            <a href="?form=<?php echo $form_param ?>&amp;mode=revert"><?php echo PMA_lang('RevertErroneousFields') ?></a>
+        </div>
+        <?php $form_display->displayErrors() ?>
+        <a class="btn" href="user_preferences.php"><?php echo PMA_lang('IgnoreErrors') ?></a>
+        &nbsp;
+        <a class="btn" href="?form=<?php echo $form_param ?>&amp;mode=edit"><?php echo PMA_lang('ShowForm') ?></a>
+        <?php
+    } else {
+        // redirect
+        $url_params = array('form' => $form_param);
+        PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'user_preferences.php'
+                . PMA_generate_common_url($url_params, '&'));
+        exit;
+    }
+}
+
 /**
  * Displays the footer
  */

From 4572e3ec8220b53a62a40e0d90747baaac013135 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 11 Jun 2010 22:00:52 +0200
Subject: [PATCH 008/106] Fix paths in config templates

---
 libraries/config/FormDisplay.class.php         |  6 +++---
 .../config}/FormDisplay.tpl.php                | 18 +++++++++++-------
 user_preferences.php                           |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)
 rename {setup/lib => libraries/config}/FormDisplay.tpl.php (91%)

diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 62d21a1fd..274a58588 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -16,7 +16,7 @@
 /**
  * Core libraries.
  */
-require_once './setup/lib/FormDisplay.tpl.php';
+require_once './libraries/config/FormDisplay.tpl.php';
 require_once './setup/lib/validate.lib.php';
 require_once './libraries/js_escape.lib.php';
 
@@ -225,7 +225,7 @@ class FormDisplay
             foreach ($this->js_lang_strings as $str) {
                 $lang = isset($GLOBALS["strSetup$str"])
                     ? $GLOBALS["strSetup$str"]
-                    : filter_input($GLOBALS["str$str"]); // null if not set
+                    : filter_var($GLOBALS["str$str"]); // null if not set
                 $js_lang[] = "'$str': '" . PMA_jsFormat($lang, false) . '\'';
             }
             $js[] = '$.extend(PMA_messages, {' . implode(",\n\t", $js_lang) . '})';
@@ -541,7 +541,7 @@ class FormDisplay
         if ($test == 'Import' || $test == 'Export') {
             return '';
         }
-        return '../Documentation.html#cfg_' . self::_getOptName($path);
+        return 'Documentation.html#cfg_' . self::_getOptName($path);
     }
 
     /**
diff --git a/setup/lib/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
similarity index 91%
rename from setup/lib/FormDisplay.tpl.php
rename to libraries/config/FormDisplay.tpl.php
index f6cb5a53f..5ed53f3c2 100644
--- a/setup/lib/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -25,7 +25,7 @@ function display_form_top($action = null, $method = 'post', $hidden_fields = nul
         $method = 'get';
     }
 ?>
-<form method="<?php echo $method ?>" action="<?php echo htmlspecialchars($action) ?>">
+<form method="<?php echo $method ?>" action="<?php echo htmlspecialchars($action) ?>" class="config-form">
 <?php
     // we do validation on page refresh when browser remembers field values,
     // add a field with known value which will be used for checks
@@ -115,14 +115,18 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
 {
     $field_class = $value_is_default ? '' : ' class="custom"';
     $name_id = 'name="' . $path . '" id="' . $path . '"';
-?>
+    $base_dir = defined('PMA_SETUP') ? '../' : '';
+    $img_path = defined('PMA_SETUP')
+        ? $GLOBALS['cfg']['ThemePath'] . '/original/img/'
+        : $_SESSION['PMA_Theme']->img_path;
+d?>
 <tr>
     <th>
         <label for="<?php echo htmlspecialchars($path) ?>"><?php echo $name ?></label>
         <?php if (!empty($opts['doc']) || !empty($opts['wiki'])): ?>
         <span class="doc">
-            <?php if (!empty($opts['doc'])) { ?><a href="<?php echo $opts['doc']  ?>" target="documentation"><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath'] ?>/original/img/b_help.png" width="11" height="11" alt="Doc" title="<?php echo __('Documentation') ?>" /></a><?php } ?>
-            <?php if (!empty($opts['wiki'])){ ?><a href="<?php echo $opts['wiki'] ?>" target="wiki"><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath'] ?>/original/img/b_info.png" width="11" height="11" alt="Wiki" title="Wiki" /></a><?php } ?>
+            <?php if (!empty($opts['doc'])) { ?><a href="<?php echo $base_dir . $opts['doc']  ?>" target="documentation"><img class="icon" src="<?php echo $img_path ?>b_help.png" width="11" height="11" alt="Doc" title="<?php echo __('Documentation') ?>" /></a><?php } ?>
+            <?php if (!empty($opts['wiki'])){ ?><a href="<?php echo $opts['wiki'] ?>" target="wiki"><img class="icon" src="<?php echo $img_path ?>b_info.png" width="11" height="11" alt="Wiki" title="Wiki" /></a><?php } ?>
         </span>
         <?php endif; ?>
         <?php if (!empty($description)) { ?><small><?php echo $description ?></small><?php } ?>
@@ -179,12 +183,12 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
     }
     if (isset($opts['setvalue']) && $opts['setvalue']) {
         ?>
-        <a class="set-value" href="#<?php echo "$path={$opts['setvalue']}" ?>" title="<?php echo sprintf(__('Set value: %s'), htmlspecialchars($opts['setvalue'])) ?>" style="display:none"><img alt="set-value" src="../<?php echo $GLOBALS['cfg']['ThemePath'] ?>/original/img/b_edit.png" width="16" height="16" /></a>
+        <a class="set-value" href="#<?php echo "$path={$opts['setvalue']}" ?>" title="<?php echo sprintf(__('Set value: %s'), htmlspecialchars($opts['setvalue'])) ?>" style="display:none"><img alt="set-value" src="<?php echo $img_path ?>b_edit.png" width="16" height="16" /></a>
         <?php
     }
     if (isset($opts['show_restore_default']) && $opts['show_restore_default']) {
         ?>
-        <a class="restore-default" href="#<?php echo $path ?>" title="<?php echo __('Restore default value') ?>" style="display:none"><img alt="restore-default" src="../<?php echo $GLOBALS['cfg']['ThemePath'] ?>/original/img/s_reload.png" width="16" height="16" /></a>
+        <a class="restore-default" href="#<?php echo $path ?>" title="<?php echo __('Restore default value') ?>" style="display:none"><img alt="restore-default" src="../<?php echo $img_path ?>s_reload.png" width="16" height="16" /></a>
         <?php
     }
     // this must match with displayErrors() in scripts.js
@@ -290,4 +294,4 @@ function display_errors($name, $error_list) {
     }
     echo '</dl>';
 }
-?>
+?>
\ No newline at end of file
diff --git a/user_preferences.php b/user_preferences.php
index 3021a74ca..daac4d9fd 100644
--- a/user_preferences.php
+++ b/user_preferences.php
@@ -84,7 +84,7 @@ if (!$form_display->process(false)) {
         exit;
     }
 }
-
+print_r($_SESSION);
 /**
  * Displays the footer
  */

From 082604eed3c0241c68ef157f5f2379826585f1b5 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 11 Jun 2010 23:42:36 +0200
Subject: [PATCH 009/106] Fixed JSDoc

---
 setup/scripts.js | 95 ++++++++++++++++++++++++------------------------
 1 file changed, 47 insertions(+), 48 deletions(-)

diff --git a/setup/scripts.js b/setup/scripts.js
index 7298e63ac..e6ab823b7 100644
--- a/setup/scripts.js
+++ b/setup/scripts.js
@@ -1,7 +1,5 @@
 /**
- * functions used in setup script
- * 
- * @version $Id$
+ * Functions used in configuration forms
  */
 
 // show this window in top frame
@@ -18,7 +16,7 @@ var PMA_messages = {};
 /**
  * Returns field type
  *
- * @param Element field
+ * @param {Element} field
  */
 function getFieldType(field) {
 	field = $(field);
@@ -42,9 +40,9 @@ function getFieldType(field) {
  * o boolean - if field_type is 'checkbox'
  * o Array of values - if field_type is 'select'
  *
- * @param Element field
- * @param String  field_type  see getFieldType
- * @param mixed   value
+ * @param {Element} field
+ * @param {String}  field_type  see {@link #getFieldType}
+ * @param {String|Boolean}  [value]
  */
 function setFieldValue(field, field_type, value) {
 	field = $(field);
@@ -80,9 +78,9 @@ function setFieldValue(field, field_type, value) {
  * o boolean - if type is 'checkbox'
  * o Array of values - if type is 'select'
  *
- * @param Element field
- * @param String  field_type  see getFieldType
- * @return mixed
+ * @param {Element} field
+ * @param {String}  field_type returned by {@link #getFieldType}
+ * @type Boolean|String|String[]
  */
 function getFieldValue(field, field_type) {
 	field = $(field);
@@ -127,8 +125,8 @@ function getAllValues() {
 /**
  * Checks whether field has its default value
  *
- * @param Element field
- * @param String  type
+ * @param {Element} field
+ * @param {String}  type
  * @return boolean
  */
 function checkFieldDefault(field, type) {
@@ -160,7 +158,7 @@ function checkFieldDefault(field, type) {
 
 /**
  * Returns element's id prefix
- * @param Element element
+ * @param {Element} element
  */
 function getIdPrefix(element) {
     return $(element).attr('id').replace(/[^-]+$/, '');
@@ -210,7 +208,7 @@ var validators = {
     /**
      * Validates positive number
      *
-     * @param boolean isKeyUp
+     * @param {boolean} isKeyUp
      */
     validate_positive_number: function (isKeyUp) {
         var result = this.value != '0' && validators._regexp_numeric.test(this.value);
@@ -219,7 +217,7 @@ var validators = {
     /**
      * Validates non-negative number
      *
-     * @param boolean isKeyUp
+     * @param {boolean} isKeyUp
      */
     validate_non_negative_number: function (isKeyUp) {
         var result = validators._regexp_numeric.test(this.value);
@@ -228,7 +226,7 @@ var validators = {
     /**
      * Validates port number
      *
-     * @param boolean isKeyUp
+     * @param {boolean} isKeyUp
      */
     validate_port_number: function(isKeyUp) {
         var result = validators._regexp_numeric.test(this.value) && this.value != '0';
@@ -242,7 +240,7 @@ var validators = {
         /**
          * hide_db field
          *
-         * @param boolean isKeyUp
+         * @param {boolean} isKeyUp
          */
         hide_db: function(isKeyUp) {
             if (!isKeyUp && this.value != '') {
@@ -255,7 +253,7 @@ var validators = {
 		/**
          * TrustedProxies field
          *
-         * @param boolean isKeyUp
+         * @param {boolean} isKeyUp
          */
         TrustedProxies: function(isKeyUp) {
             if (!isKeyUp && this.value != '') {
@@ -271,7 +269,7 @@ var validators = {
         /**
          * Validates Server fieldset
          *
-         * @param boolean isKeyUp
+         * @param {boolean} isKeyUp
          */
         Server: function(isKeyUp) {
             if (!isKeyUp) {
@@ -282,7 +280,7 @@ var validators = {
         /**
          * Validates Server_login_options fieldset
          *
-         * @param boolean isKeyUp
+         * @param {boolean} isKeyUp
          */
         Server_login_options: function(isKeyUp) {
             return validators._fieldset.Server.apply(this, [isKeyUp]);
@@ -290,7 +288,7 @@ var validators = {
         /**
          * Validates Server_pmadb fieldset
          *
-         * @param boolean isKeyUp
+         * @param {boolean} isKeyUp
          */
         Server_pmadb: function(isKeyUp) {
             if (isKeyUp) {
@@ -311,9 +309,9 @@ var validators = {
 /**
  * Calls server-side validation procedures
  *
- * @param Element parent  input field in <fieldset> or <fieldset>
- * @param String id       validator id
- * @param Object values   values hash (element_id: value)
+ * @param {Element} parent  input field in <fieldset> or <fieldset>
+ * @param {String}  id      validator id
+ * @param {Object}  values  values hash {element1_id: value, ...}
  */
 function ajaxValidate(parent, id, values) {
 	parent = $(parent);
@@ -349,7 +347,7 @@ function ajaxValidate(parent, id, values) {
             } else if (typeof response['error'] != 'undefined') {
                 error[parent.id] = [response['error']];
             } else {
-                for (key in response) {
+                for (var key in response) {
                 	var value = response[key];
                     error[key] = jQuery.isArray(value) ? value : [value];
                 }
@@ -367,10 +365,10 @@ function ajaxValidate(parent, id, values) {
 /**
  * Registers validator for given field
  *
- * @param String  id       field id
- * @param String  type     validator (key in validators object)
- * @param boolean onKeyUp  whether fire on key up
- * @param mixed   params   validation function parameters
+ * @param {String}  id       field id
+ * @param {String}  type     validator (key in validators object)
+ * @param {boolean} onKeyUp  whether fire on key up
+ * @param {object}  params   validation function parameters
  */
 function validateField(id, type, onKeyUp, params) {
     if (typeof validators[type] == 'undefined') {
@@ -385,9 +383,10 @@ function validateField(id, type, onKeyUp, params) {
 /**
  * Returns valdiation functions associated with form field
  *
- * @param  String  field_id     form field id
- * @param  boolean onKeyUpOnly  see validateField
- * @return Array  array of [function, paramseters to be passed to function]
+ * @param  {String}  field_id     form field id
+ * @param  {boolean} onKeyUpOnly  see validateField
+ * @type Array
+ * @return array of [function, paramseters to be passed to function]
  */
 function getFieldValidators(field_id, onKeyUpOnly) {
     // look for field bound validator
@@ -417,10 +416,10 @@ function getFieldValidators(field_id, onKeyUpOnly) {
  * WARNING: created DOM elements must be identical with the ones made by
  * display_input() in FormDisplay.tpl.php!
  *
- * @param Object  error list (key: field id, value: error array)
+ * @param {Object} error_list list of errors in the form {field id: error array}
  */
 function displayErrors(error_list) {
-    for (field_id in error_list) {
+    for (var field_id in error_list) {
         var errors = error_list[field_id];
         var field = $('#'+field_id);
         var isFieldset = field.attr('tagName') == 'FIELDSET';
@@ -460,9 +459,9 @@ function displayErrors(error_list) {
 /**
  * Validates fieldset and puts errors in 'errors' object
  *
- * @param Element field
- * @param boolean isKeyUp
- * @param Object  errors
+ * @param {Element} fieldset
+ * @param {boolean} isKeyUp
+ * @param {Object}  errors
  */
 function validate_fieldset(fieldset, isKeyUp, errors) {
 	fieldset = $(fieldset);
@@ -483,9 +482,9 @@ function validate_fieldset(fieldset, isKeyUp, errors) {
 /**
  * Validates form field and puts errors in 'errors' object
  *
- * @param Element field
- * @param boolean isKeyUp
- * @param Object  errors
+ * @param {Element} field
+ * @param {boolean} isKeyUp
+ * @param {Object}  errors
  */
 function validate_field(field, isKeyUp, errors) {
 	field = $(field);
@@ -506,8 +505,8 @@ function validate_field(field, isKeyUp, errors) {
 /**
  * Validates form field and parent fieldset
  *
- * @param Element field
- * @param boolean isKeyUp
+ * @param {Element} field
+ * @param {boolean} isKeyUp
  */
 function validate_field_and_fieldset(field, isKeyUp) {
 	field = $(field);
@@ -520,7 +519,7 @@ function validate_field_and_fieldset(field, isKeyUp) {
 /**
  * Marks field depending on its value (system default or custom)
  *
- * @param Element field
+ * @param {Element} field
  */
 function markField(field) {
 	field = $(field);
@@ -536,8 +535,8 @@ function markField(field) {
 /**
  * Enables or disables the "restore default value" button
  *
- * @param Element field
- * @param bool    display
+ * @param {Element} field
+ * @param {boolean} display
  */
 function setRestoreDefaultBtn(field, display) {
     var el = $(field).closest('td').find('.restore-default');
@@ -599,7 +598,7 @@ $(function() {
 /**
  * Sets active tab
  *
- * @param Element tab_link
+ * @param {Element} tab_link
  */
 function setTab(tab_link) {
     var tabs_menu = $(tab_link).closest('.tabs');
@@ -666,7 +665,7 @@ $(function() {
 //
 
 $(function() {
-    $('input[type=button]').click(function(e) {
+    $('input[type=button]').click(function() {
         var fields = $(this).closest('fieldset').find('input, select, textarea');
         for (var i = 0, imax = fields.length; i < imax; i++) {
             setFieldValue(fields[i], getFieldType(fields[i]));
@@ -685,7 +684,7 @@ $(function() {
 /**
  * Restores field's default value
  *
- * @param String field_id
+ * @param {String} field_id
  */
 function restoreField(field_id) {
     var field = $('#'+field_id);

From b2ecf178038524b7b245e6c507118eb6ad432a31 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 12 Jun 2010 12:42:29 +0200
Subject: [PATCH 010/106] Split setup/scripts.js into generic and setup script
 specific parts

---
 js/config.js         | 574 +++++++++++++++++++++++++++++++++++++++++++
 setup/index.php      |   1 +
 setup/scripts.js     | 566 +-----------------------------------------
 user_preferences.php |   2 +-
 4 files changed, 580 insertions(+), 563 deletions(-)
 create mode 100644 js/config.js

diff --git a/js/config.js b/js/config.js
new file mode 100644
index 000000000..4f19e4a1d
--- /dev/null
+++ b/js/config.js
@@ -0,0 +1,574 @@
+/**
+ * Functions used in configuration forms
+ */
+
+// default values for fields
+var defaultValues = {};
+
+// language strings
+var PMA_messages = {};
+
+/**
+ * Returns field type
+ *
+ * @param {Element} field
+ */
+function getFieldType(field) {
+	field = $(field);
+    var tagName = field.attr('tagName');
+	if (tagName == 'INPUT') {
+        return field.attr('type');
+    } else if (tagName == 'SELECT') {
+        return 'select';
+    } else if (tagName == 'TEXTAREA') {
+        return 'text';
+    }
+    return '';
+}
+
+/**
+ * Sets field value
+ *
+ * value must be of type:
+ * o undefined (omitted) - restore default value (form default, not PMA default)
+ * o String - if field_type is 'text'
+ * o boolean - if field_type is 'checkbox'
+ * o Array of values - if field_type is 'select'
+ *
+ * @param {Element} field
+ * @param {String}  field_type  see {@link #getFieldType}
+ * @param {String|Boolean}  [value]
+ */
+function setFieldValue(field, field_type, value) {
+	field = $(field);
+    switch (field_type) {
+        case 'text':
+            field.attr('value', (value != undefined ? value : field.attr('defaultValue')));
+            break;
+        case 'checkbox':
+            field.attr('checked', (value != undefined ? value : field.attr('defaultChecked')));
+            break;
+        case 'select':
+            var options = field.attr('options');
+        	var i, imax = options.length;
+            if (value == undefined) {
+                for (i = 0; i < imax; i++) {
+                	options[i].selected = options[i].defaultSelected;
+                }
+            } else {
+                for (i = 0; i < imax; i++) {
+                	options[i].selected = (value.indexOf(options[i].value) != -1);
+                }
+            }
+            break;
+    }
+    markField(field);
+}
+
+/**
+ * Gets field value
+ *
+ * Will return one of:
+ * o String - if type is 'text'
+ * o boolean - if type is 'checkbox'
+ * o Array of values - if type is 'select'
+ *
+ * @param {Element} field
+ * @param {String}  field_type returned by {@link #getFieldType}
+ * @type Boolean|String|String[]
+ */
+function getFieldValue(field, field_type) {
+	field = $(field);
+    switch (field_type) {
+        case 'text':
+            return field.attr('value');
+        case 'checkbox':
+            return field.attr('checked');
+        case 'select':
+        	var options = field.attr('options');
+            var i, imax = options.length, items = [];
+            for (i = 0; i < imax; i++) {
+                if (options[i].selected) {
+                    items.push(options[i].value);
+                }
+            }
+            return items;
+    }
+}
+
+/**
+ * Returns values for all fields in fieldsets
+ */
+function getAllValues() {
+    var elements = $('fieldset input, fieldset select, fieldset textarea');
+    var values = {};
+    var type, value;
+    for (var i = 0; i < elements.length; i++) {
+        type = getFieldType(elements[i]);
+        value = getFieldValue(elements[i], type);
+        if (typeof value != 'undefined') {
+            // we only have single selects, fatten array
+            if (type == 'select') {
+                value = value[0];
+            }
+            values[elements[i].name] = value;
+        }
+    }
+    return values;
+}
+
+/**
+ * Checks whether field has its default value
+ *
+ * @param {Element} field
+ * @param {String}  type
+ * @return boolean
+ */
+function checkFieldDefault(field, type) {
+    field = $(field);
+    var field_id = field.attr('id');
+    if (typeof defaultValues[field_id] == 'undefined') {
+        return true;
+    }
+    var isDefault = true;
+    var currentValue = getFieldValue(field, type);
+    if (type != 'select') {
+        isDefault = currentValue == defaultValues[field_id];
+    } else {
+        // compare arrays, will work for our representation of select values
+        if (currentValue.length != defaultValues[field_id].length) {
+            isDefault = false;
+        }
+        else {
+            for (var i = 0; i < currentValue.length; i++) {
+                if (currentValue[i] != defaultValues[field_id][i]) {
+                    isDefault = false;
+                    break;
+                }
+            }
+        }
+    }
+    return isDefault;
+}
+
+/**
+ * Returns element's id prefix
+ * @param {Element} element
+ */
+function getIdPrefix(element) {
+    return $(element).attr('id').replace(/[^-]+$/, '');
+}
+
+// ------------------------------------------------------------------
+// Form validation and field operations
+//
+
+// form validator assignments
+var validate = {};
+
+// form validator list
+var validators = {
+    // regexp: numeric value
+    _regexp_numeric: new RegExp('^[0-9]*$'),
+    /**
+     * Validates positive number
+     *
+     * @param {boolean} isKeyUp
+     */
+    validate_positive_number: function (isKeyUp) {
+        var result = this.value != '0' && validators._regexp_numeric.test(this.value);
+        return result ? true : PMA_messages['error_nan_p'];
+    },
+    /**
+     * Validates non-negative number
+     *
+     * @param {boolean} isKeyUp
+     */
+    validate_non_negative_number: function (isKeyUp) {
+        var result = validators._regexp_numeric.test(this.value);
+        return result ? true : PMA_messages['error_nan_nneg'];
+    },
+    /**
+     * Validates port number
+     *
+     * @param {boolean} isKeyUp
+     */
+    validate_port_number: function(isKeyUp) {
+        var result = validators._regexp_numeric.test(this.value) && this.value != '0';
+        if (!result || this.value > 65536) {
+            result = PMA_messages['error_incorrect_port'];
+        }
+        return result;
+    },
+    // field validators
+    _field: {
+    },
+    // fieldset validators
+    _fieldset: {
+    }
+};
+
+/**
+ * Registers validator for given field
+ *
+ * @param {String}  id       field id
+ * @param {String}  type     validator (key in validators object)
+ * @param {boolean} onKeyUp  whether fire on key up
+ * @param {object}  params   validation function parameters
+ */
+function validateField(id, type, onKeyUp, params) {
+    if (typeof validators[type] == 'undefined') {
+        return;
+    }
+    if (typeof validate[id] == 'undefined') {
+        validate[id] = [];
+    }
+    validate[id].push([type, params, onKeyUp]);
+}
+
+/**
+ * Returns valdiation functions associated with form field
+ *
+ * @param  {String}  field_id     form field id
+ * @param  {boolean} onKeyUpOnly  see validateField
+ * @type Array
+ * @return array of [function, paramseters to be passed to function]
+ */
+function getFieldValidators(field_id, onKeyUpOnly) {
+    // look for field bound validator
+    var name = field_id.match(/[^-]+$/)[0];
+    if (typeof validators._field[name] != 'undefined') {
+        return [[validators._field[name], null]];
+    }
+
+    // look for registered validators
+    var functions = [];
+    if (typeof validate[field_id] != 'undefined') {
+        // validate[field_id]: array of [type, params, onKeyUp]
+        for (var i = 0, imax = validate[field_id].length; i < imax; i++) {
+            if (onKeyUpOnly && !validate[field_id][i][2]) {
+                continue;
+            }
+            functions.push([validators[validate[field_id][i][0]], validate[field_id][i][1]]);
+        }
+    }
+
+    return functions;
+}
+
+/**
+ * Displays errors for given form fields
+ *
+ * WARNING: created DOM elements must be identical with the ones made by
+ * display_input() in FormDisplay.tpl.php!
+ *
+ * @param {Object} error_list list of errors in the form {field id: error array}
+ */
+function displayErrors(error_list) {
+    for (var field_id in error_list) {
+        var errors = error_list[field_id];
+        var field = $('#'+field_id);
+        var isFieldset = field.attr('tagName') == 'FIELDSET';
+        var errorCnt = isFieldset
+            ? field.find('dl.errors')
+            : field.siblings('.inline_errors');
+
+        // remove empty errors (used to clear error list)
+        errors = $.grep(errors, function(item) {
+            return item != '';
+        });
+
+        if (errors.length) {
+            // if error container doesn't exist, create it
+            if (errorCnt.length == 0) {
+                if (isFieldset) {
+                    errorCnt = $('<dl class="errors" />');
+                    field.find('table').before(errorCnt);
+                } else {
+                    errorCnt = $('<dl class="inline_errors" />');
+                    field.closest('td').append(errorCnt);
+                }
+            }
+
+            var html = '';
+            for (var i = 0, imax = errors.length; i < imax; i++) {
+                html += '<dd>' + errors[i] + '</dd>';
+            }
+            errorCnt.html(html);
+        } else if (errorCnt !== null) {
+            // remove useless error container
+            errorCnt.remove();
+        }
+    }
+}
+
+/**
+ * Validates fieldset and puts errors in 'errors' object
+ *
+ * @param {Element} fieldset
+ * @param {boolean} isKeyUp
+ * @param {Object}  errors
+ */
+function validate_fieldset(fieldset, isKeyUp, errors) {
+	fieldset = $(fieldset);
+    if (fieldset.length && typeof validators._fieldset[fieldset.attr('id')] != 'undefined') {
+        var fieldset_errors = validators._fieldset[fieldset.attr('id')].apply(fieldset[0], [isKeyUp]);
+        for (var field_id in fieldset_errors) {
+            if (typeof errors[field_id] == 'undefined') {
+                errors[field_id] = [];
+            }
+            if (typeof fieldset_errors[field_id] == 'string') {
+                fieldset_errors[field_id] = [fieldset_errors[field_id]];
+            }
+            $.merge(errors[field_id], fieldset_errors[field_id]);
+        }
+    }
+}
+
+/**
+ * Validates form field and puts errors in 'errors' object
+ *
+ * @param {Element} field
+ * @param {boolean} isKeyUp
+ * @param {Object}  errors
+ */
+function validate_field(field, isKeyUp, errors) {
+	field = $(field);
+	var field_id = field.attr('id');
+    errors[field_id] = [];
+    var functions = getFieldValidators(field_id, isKeyUp);
+    for (var i = 0; i < functions.length; i++) {
+        var result = functions[i][0].apply(field[0], [isKeyUp, functions[i][1]]);
+        if (result !== true) {
+            if (typeof result == 'string') {
+            	result = [result];
+            }
+            $.merge(errors[field_id], result);
+        }
+    }
+}
+
+/**
+ * Validates form field and parent fieldset
+ *
+ * @param {Element} field
+ * @param {boolean} isKeyUp
+ */
+function validate_field_and_fieldset(field, isKeyUp) {
+	field = $(field);
+    var errors = {};
+    validate_field(field, isKeyUp, errors);
+    validate_fieldset(field.closest('fieldset'), isKeyUp, errors);
+    displayErrors(errors);
+}
+
+/**
+ * Marks field depending on its value (system default or custom)
+ *
+ * @param {Element} field
+ */
+function markField(field) {
+	field = $(field);
+    var type = getFieldType(field);
+    var isDefault = checkFieldDefault(field, type);
+
+    // checkboxes uses parent <span> for marking
+    var fieldMarker = (type == 'checkbox') ? field.parent() : field;
+    setRestoreDefaultBtn(field, !isDefault);
+    fieldMarker[isDefault ? 'removeClass' : 'addClass']('custom');
+}
+
+/**
+ * Enables or disables the "restore default value" button
+ *
+ * @param {Element} field
+ * @param {boolean} display
+ */
+function setRestoreDefaultBtn(field, display) {
+    var el = $(field).closest('td').find('.restore-default');
+    el.css('display', (el.css('display') ? '' : 'none'));
+}
+
+$(function() {
+    // register validators and mark custom values
+	var elements = $('input[id], select[id], textarea[id]');
+    $('input[id], select[id], textarea[id]').each(function(){
+        markField(this);
+        var el = $(this);
+        el.bind('change', function() {
+            validate_field_and_fieldset(this, false);
+            markField(this);
+        });
+        var tagName = el.attr('tagName');
+        // text fields can be validated after each change
+        if (tagName == 'INPUT' && el.attr('type') == 'text') {
+        	el.keyup(function() {
+                validate_field_and_fieldset(el, true);
+                markField(el);
+            });
+        }
+        // disable textarea spellcheck
+        if (tagName == 'TEXTAREA') {
+        	el.attr('spellcheck', false);
+        }
+    });
+
+	// check whether we've refreshed a page and browser remembered modified
+	// form values
+	var check_page_refresh = $('#check_page_refresh');
+	if (check_page_refresh.length == 0 || check_page_refresh.val() == '1') {
+		// run all field validators
+		var errors = {};
+		for (var i = 0; i < elements.length; i++) {
+			validate_field(elements[i], false, errors);
+		}
+		// run all fieldset validators
+		$('fieldset').each(function(){
+			validate_fieldset(this, false, errors);
+		});
+
+		displayErrors(errors);
+	} else if (check_page_refresh) {
+		check_page_refresh.val('1');
+	}
+});
+
+//
+// END: Form validation and field operations
+// ------------------------------------------------------------------
+
+// ------------------------------------------------------------------
+// Tabbed forms
+//
+
+/**
+ * Sets active tab
+ *
+ * @param {Element} tab_link
+ */
+function setTab(tab_link) {
+    var tabs_menu = $(tab_link).closest('.tabs');
+
+    var links = tabs_menu.find('a');
+    var contents, link;
+    for (var i = 0, imax = links.length; i < imax; i++) {
+    	link = $(links[i]);
+        contents = $(link.attr('href'));
+        if (links[i] == tab_link) {
+        	link.addClass('active');
+            contents.css('display', 'block');
+        } else {
+            link.removeClass('active');
+            contents.css('display', 'none');
+        }
+    }
+    location.hash = 'tab_' + $(tab_link).attr('href').substr(1);
+}
+
+$(function() {
+    var tabs = $('.tabs');
+    var url_tab = location.hash.match(/^#tab_.+/)
+        ? $('a[href$="' + location.hash.substr(5) + '"]') : null;
+    if (url_tab) {
+        url_tab = url_tab[0];
+    }
+    // add tabs events and activate one tab (the first one or indicated by location hash)
+    for (var i = 0, imax = tabs.length; i < imax; i++) {
+        var links = $(tabs[i]).find('a');
+        var selected_tab = links[0];
+        for (var j = 0, jmax = links.length; j < jmax; j++) {
+            $(links[j]).click(function(e) {
+                e.preventDefault();
+                setTab(this);
+            });
+            if (links[j] == url_tab) {
+                selected_tab = links[j];
+            }
+        }
+        setTab(selected_tab);
+    }
+    // tab links handling, check each 200ms
+    // (works with history in FF, further browser support here would be an overkill)
+    var prev_hash = location.hash;
+    setInterval(function() {
+        if (location.hash != prev_hash) {
+            prev_hash = location.hash;
+            var url_tab = location.hash.match(/^#tab_.+/)
+                ? $('a[href$="' + location.hash.substr(5) + '"]') : null;
+            if (url_tab) {
+                setTab(url_tab[0]);
+            }
+        }
+    }, 200);
+});
+
+//
+// END: Tabbed forms
+// ------------------------------------------------------------------
+
+// ------------------------------------------------------------------
+// Form reset buttons
+//
+
+$(function() {
+    $('input[type=button]').click(function() {
+        var fields = $(this).closest('fieldset').find('input, select, textarea');
+        for (var i = 0, imax = fields.length; i < imax; i++) {
+            setFieldValue(fields[i], getFieldType(fields[i]));
+        }
+    });
+});
+
+//
+// END: Form reset buttons
+// ------------------------------------------------------------------
+
+// ------------------------------------------------------------------
+// "Restore default" and "set value" buttons
+//
+
+/**
+ * Restores field's default value
+ *
+ * @param {String} field_id
+ */
+function restoreField(field_id) {
+    var field = $('#'+field_id);
+    if (field.length == 0 || defaultValues[field_id] == undefined) {
+        return;
+    }
+    setFieldValue(field, getFieldType(field), defaultValues[field_id]);
+}
+
+$(function() {
+    $('.restore-default, .set-value').each(function() {
+        var link = $(this);
+        link.css('opacity', 0.25);
+        if (!link.hasClass('restore-default')) {
+            // restore-default is handled by markField
+        	link.css('display', '');
+        }
+        link.bind({
+            mouseenter: function() {$(this).css('opacity', 1);},
+            mouseleave: function() {$(this).css('opacity', 0.25);},
+            click: function(e) {
+                e.preventDefault();
+                var href = $(this).attr('href').substr(1);
+                var field_id;
+                if ($(this).hasClass('restore-default')) {
+                    field_id = href;
+                    restoreField(field_id);
+                } else {
+                    field_id = href.match(/^[^=]+/)[0];
+                    var value = href.match(/=(.+)$/)[1];
+                    setFieldValue($('#'+field_id), 'text', value);
+                }
+                $('#'+field_id).trigger('change');
+            }
+        });
+    });
+});
+
+//
+// END: "Restore default" and "set value" buttons
+// ------------------------------------------------------------------
diff --git a/setup/index.php b/setup/index.php
index 0d16e5f06..d5db95c67 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -37,6 +37,7 @@ require './libraries/header_http.inc.php';
 <script type="text/javascript" src="../js/jquery/jquery-1.4.2.js"></script>
 <script type="text/javascript" src="../js/jquery/jquery-ui-1.8.custom.js"></script>
 <script type="text/javascript" src="../js/jquery/jquery.json-2.2.js"></script>
+<script type="text/javascript" src="../js/config.js"></script>
 <script type="text/javascript" src="scripts.js"></script>
 </head>
 <body>
diff --git a/setup/scripts.js b/setup/scripts.js
index e6ab823b7..4763ff081 100644
--- a/setup/scripts.js
+++ b/setup/scripts.js
@@ -1,5 +1,5 @@
 /**
- * Functions used in configuration forms
+ * Functions used in Setup configuration forms
  */
 
 // show this window in top frame
@@ -7,163 +7,6 @@ if (top != self) {
     window.top.location.href = location;
 }
 
-// default values for fields
-var defaultValues = {};
-
-// language strings
-var PMA_messages = {};
-
-/**
- * Returns field type
- *
- * @param {Element} field
- */
-function getFieldType(field) {
-	field = $(field);
-    var tagName = field.attr('tagName');
-	if (tagName == 'INPUT') {
-        return field.attr('type');
-    } else if (tagName == 'SELECT') {
-        return 'select';
-    } else if (tagName == 'TEXTAREA') {
-        return 'text';
-    }
-    return '';
-}
-
-/**
- * Sets field value
- *
- * value must be of type:
- * o undefined (omitted) - restore default value (form default, not PMA default)
- * o String - if field_type is 'text'
- * o boolean - if field_type is 'checkbox'
- * o Array of values - if field_type is 'select'
- *
- * @param {Element} field
- * @param {String}  field_type  see {@link #getFieldType}
- * @param {String|Boolean}  [value]
- */
-function setFieldValue(field, field_type, value) {
-	field = $(field);
-    switch (field_type) {
-        case 'text':
-            field.attr('value', (value != undefined ? value : field.attr('defaultValue')));
-            break;
-        case 'checkbox':
-            field.attr('checked', (value != undefined ? value : field.attr('defaultChecked')));
-            break;
-        case 'select':
-            var options = field.attr('options');
-        	var i, imax = options.length;
-            if (value == undefined) {
-                for (i = 0; i < imax; i++) {
-                	options[i].selected = options[i].defaultSelected;
-                }
-            } else {
-                for (i = 0; i < imax; i++) {
-                	options[i].selected = (value.indexOf(options[i].value) != -1);
-                }
-            }
-            break;
-    }
-    markField(field);
-}
-
-/**
- * Gets field value
- *
- * Will return one of:
- * o String - if type is 'text'
- * o boolean - if type is 'checkbox'
- * o Array of values - if type is 'select'
- *
- * @param {Element} field
- * @param {String}  field_type returned by {@link #getFieldType}
- * @type Boolean|String|String[]
- */
-function getFieldValue(field, field_type) {
-	field = $(field);
-    switch (field_type) {
-        case 'text':
-            return field.attr('value');
-        case 'checkbox':
-            return field.attr('checked');
-        case 'select':
-        	var options = field.attr('options');
-            var i, imax = options.length, items = [];
-            for (i = 0; i < imax; i++) {
-                if (options[i].selected) {
-                    items.push(options[i].value);
-                }
-            }
-            return items;
-    }
-}
-
-/**
- * Returns values for all fields in fieldsets
- */
-function getAllValues() {
-    var elements = $('fieldset input, fieldset select, fieldset textarea');
-    var values = {};
-    var type, value;
-    for (var i = 0; i < elements.length; i++) {
-        type = getFieldType(elements[i]);
-        value = getFieldValue(elements[i], type);
-        if (typeof value != 'undefined') {
-            // we only have single selects, fatten array
-            if (type == 'select') {
-                value = value[0];
-            }
-            values[elements[i].name] = value;
-        }
-    }
-    return values;
-}
-
-/**
- * Checks whether field has its default value
- *
- * @param {Element} field
- * @param {String}  type
- * @return boolean
- */
-function checkFieldDefault(field, type) {
-    field = $(field);
-    var field_id = field.attr('id');
-    if (typeof defaultValues[field_id] == 'undefined') {
-        return true;
-    }
-    var isDefault = true;
-    var currentValue = getFieldValue(field, type);
-    if (type != 'select') {
-        isDefault = currentValue == defaultValues[field_id];
-    } else {
-        // compare arrays, will work for our representation of select values
-        if (currentValue.length != defaultValues[field_id].length) {
-            isDefault = false;
-        }
-        else {
-            for (var i = 0; i < currentValue.length; i++) {
-                if (currentValue[i] != defaultValues[field_id][i]) {
-                    isDefault = false;
-                    break;
-                }
-            }
-        }
-    }
-    return isDefault;
-}
-
-/**
- * Returns element's id prefix
- * @param {Element} element
- */
-function getIdPrefix(element) {
-    return $(element).attr('id').replace(/[^-]+$/, '');
-}
-
 // ------------------------------------------------------------------
 // Messages
 //
@@ -198,43 +41,7 @@ $(function() {
 // Form validation and field operations
 //
 
-// form validator assignments
-var validate = {};
-
-// form validator list
-var validators = {
-    // regexp: numeric value
-    _regexp_numeric: new RegExp('^[0-9]*$'),
-    /**
-     * Validates positive number
-     *
-     * @param {boolean} isKeyUp
-     */
-    validate_positive_number: function (isKeyUp) {
-        var result = this.value != '0' && validators._regexp_numeric.test(this.value);
-        return result ? true : PMA_messages['error_nan_p'];
-    },
-    /**
-     * Validates non-negative number
-     *
-     * @param {boolean} isKeyUp
-     */
-    validate_non_negative_number: function (isKeyUp) {
-        var result = validators._regexp_numeric.test(this.value);
-        return result ? true : PMA_messages['error_nan_nneg'];
-    },
-    /**
-     * Validates port number
-     *
-     * @param {boolean} isKeyUp
-     */
-    validate_port_number: function(isKeyUp) {
-        var result = validators._regexp_numeric.test(this.value) && this.value != '0';
-        if (!result || this.value > 65536) {
-            result = PMA_messages['error_incorrect_port'];
-        }
-        return result;
-    },
+$.extend(true, validators, {
     // field validators
     _field: {
         /**
@@ -304,7 +111,7 @@ var validators = {
             return true;
         }
     }
-};
+});
 
 /**
  * Calls server-side validation procedures
@@ -322,7 +129,7 @@ function ajaxValidate(parent, id, values) {
             return false;
         }
     }
- 
+
     if (parent.data('ajax') != null) {
     	parent.data('ajax').abort();
     }
@@ -361,368 +168,3 @@ function ajaxValidate(parent, id, values) {
 
     return true;
 }
-
-/**
- * Registers validator for given field
- *
- * @param {String}  id       field id
- * @param {String}  type     validator (key in validators object)
- * @param {boolean} onKeyUp  whether fire on key up
- * @param {object}  params   validation function parameters
- */
-function validateField(id, type, onKeyUp, params) {
-    if (typeof validators[type] == 'undefined') {
-        return;
-    }
-    if (typeof validate[id] == 'undefined') {
-        validate[id] = [];
-    }
-    validate[id].push([type, params, onKeyUp]);
-}
-
-/**
- * Returns valdiation functions associated with form field
- *
- * @param  {String}  field_id     form field id
- * @param  {boolean} onKeyUpOnly  see validateField
- * @type Array
- * @return array of [function, paramseters to be passed to function]
- */
-function getFieldValidators(field_id, onKeyUpOnly) {
-    // look for field bound validator
-    var name = field_id.match(/[^-]+$/)[0];
-    if (typeof validators._field[name] != 'undefined') {
-        return [[validators._field[name], null]];
-    }
-
-    // look for registered validators
-    var functions = [];
-    if (typeof validate[field_id] != 'undefined') {
-        // validate[field_id]: array of [type, params, onKeyUp]
-        for (var i = 0, imax = validate[field_id].length; i < imax; i++) {
-            if (onKeyUpOnly && !validate[field_id][i][2]) {
-                continue;
-            }
-            functions.push([validators[validate[field_id][i][0]], validate[field_id][i][1]]);
-        }
-    }
-
-    return functions;
-}
-
-/**
- * Displays errors for given form fields
- *
- * WARNING: created DOM elements must be identical with the ones made by
- * display_input() in FormDisplay.tpl.php!
- *
- * @param {Object} error_list list of errors in the form {field id: error array}
- */
-function displayErrors(error_list) {
-    for (var field_id in error_list) {
-        var errors = error_list[field_id];
-        var field = $('#'+field_id);
-        var isFieldset = field.attr('tagName') == 'FIELDSET';
-        var errorCnt = isFieldset
-            ? field.find('dl.errors')
-            : field.siblings('.inline_errors');
-
-        // remove empty errors (used to clear error list)
-        errors = $.grep(errors, function(item) {
-            return item != '';
-        });
-
-        if (errors.length) {
-            // if error container doesn't exist, create it
-            if (errorCnt.length == 0) {
-                if (isFieldset) {
-                    errorCnt = $('<dl class="errors" />');
-                    field.find('table').before(errorCnt);
-                } else {
-                    errorCnt = $('<dl class="inline_errors" />');
-                    field.closest('td').append(errorCnt);
-                }
-            }
-
-            var html = '';
-            for (var i = 0, imax = errors.length; i < imax; i++) {
-                html += '<dd>' + errors[i] + '</dd>';
-            }
-            errorCnt.html(html);
-        } else if (errorCnt !== null) {
-            // remove useless error container
-            errorCnt.remove();
-        }
-    }
-}
-
-/**
- * Validates fieldset and puts errors in 'errors' object
- *
- * @param {Element} fieldset
- * @param {boolean} isKeyUp
- * @param {Object}  errors
- */
-function validate_fieldset(fieldset, isKeyUp, errors) {
-	fieldset = $(fieldset);
-    if (fieldset.length && typeof validators._fieldset[fieldset.attr('id')] != 'undefined') {
-        var fieldset_errors = validators._fieldset[fieldset.attr('id')].apply(fieldset[0], [isKeyUp]);
-        for (field_id in fieldset_errors) {
-            if (typeof errors[field_id] == 'undefined') {
-                errors[field_id] = [];
-            }
-            if (typeof fieldset_errors[field_id] == 'string') {
-                fieldset_errors[field_id] = [fieldset_errors[field_id]];
-            }
-            $.merge(errors[field_id], fieldset_errors[field_id]);
-        }
-    }
-}
-
-/**
- * Validates form field and puts errors in 'errors' object
- *
- * @param {Element} field
- * @param {boolean} isKeyUp
- * @param {Object}  errors
- */
-function validate_field(field, isKeyUp, errors) {
-	field = $(field);
-	var field_id = field.attr('id');
-    errors[field_id] = [];
-    var functions = getFieldValidators(field_id, isKeyUp);
-    for (var i = 0; i < functions.length; i++) {
-        var result = functions[i][0].apply(field[0], [isKeyUp, functions[i][1]]);
-        if (result !== true) {
-            if (typeof result == 'string') {
-            	result = [result];
-            }
-            $.merge(errors[field_id], result);
-        }
-    }
-}
-
-/**
- * Validates form field and parent fieldset
- *
- * @param {Element} field
- * @param {boolean} isKeyUp
- */
-function validate_field_and_fieldset(field, isKeyUp) {
-	field = $(field);
-    var errors = {};
-    validate_field(field, isKeyUp, errors);
-    validate_fieldset(field.closest('fieldset'), isKeyUp, errors);
-    displayErrors(errors);
-}
-
-/**
- * Marks field depending on its value (system default or custom)
- *
- * @param {Element} field
- */
-function markField(field) {
-	field = $(field);
-    var type = getFieldType(field);
-    var isDefault = checkFieldDefault(field, type);
-
-    // checkboxes uses parent <span> for marking
-    var fieldMarker = (type == 'checkbox') ? field.parent() : field;
-    setRestoreDefaultBtn(field, !isDefault);
-    fieldMarker[isDefault ? 'removeClass' : 'addClass']('custom');
-}
-
-/**
- * Enables or disables the "restore default value" button
- *
- * @param {Element} field
- * @param {boolean} display
- */
-function setRestoreDefaultBtn(field, display) {
-    var el = $(field).closest('td').find('.restore-default');
-    el.css('display', (el.css('display') ? '' : 'none'));
-}
-
-$(function() {
-    // register validators and mark custom values
-	var elements = $('input[id], select[id], textarea[id]');
-    $('input[id], select[id], textarea[id]').each(function(){
-        markField(this);
-        var el = $(this);
-        el.bind('change', function() {
-            validate_field_and_fieldset(this, false);
-            markField(this);
-        });
-        var tagName = el.attr('tagName');
-        // text fields can be validated after each change
-        if (tagName == 'INPUT' && el.attr('type') == 'text') {
-        	el.keyup(function() {
-                validate_field_and_fieldset(el, true);
-                markField(el);
-            });
-        }
-        // disable textarea spellcheck
-        if (tagName == 'TEXTAREA') {
-        	el.attr('spellcheck', false);
-        }    	
-    });
-
-	// check whether we've refreshed a page and browser remembered modified
-	// form values
-	var check_page_refresh = $('#check_page_refresh');
-	if (check_page_refresh.length == 0 || check_page_refresh.val() == '1') {
-		// run all field validators
-		var errors = {};
-		for (var i = 0; i < elements.length; i++) {
-			validate_field(elements[i], false, errors);
-		}
-		// run all fieldset validators
-		$('fieldset').each(function(){
-			validate_fieldset(this, false, errors);
-		});
-		
-		displayErrors(errors);
-	} else if (check_page_refresh) {
-		check_page_refresh.val('1');
-	}
-});
-
-//
-// END: Form validation and field operations
-// ------------------------------------------------------------------
-
-// ------------------------------------------------------------------
-// Tabbed forms
-//
-
-/**
- * Sets active tab
- *
- * @param {Element} tab_link
- */
-function setTab(tab_link) {
-    var tabs_menu = $(tab_link).closest('.tabs');
-
-    var links = tabs_menu.find('a');
-    var contents, link;
-    for (var i = 0, imax = links.length; i < imax; i++) {
-    	link = $(links[i]);
-        contents = $(link.attr('href'));
-        if (links[i] == tab_link) {
-        	link.addClass('active');
-            contents.css('display', 'block');
-        } else {
-            link.removeClass('active');
-            contents.css('display', 'none');
-        }
-    }
-    location.hash = 'tab_' + $(tab_link).attr('href').substr(1);
-}
-
-$(function() {
-    var tabs = $('.tabs');
-    var url_tab = location.hash.match(/^#tab_.+/)
-        ? $('a[href$="' + location.hash.substr(5) + '"]') : null;
-    if (url_tab) {
-        url_tab = url_tab[0];
-    }
-    // add tabs events and activate one tab (the first one or indicated by location hash)
-    for (var i = 0, imax = tabs.length; i < imax; i++) {
-        var links = $(tabs[i]).find('a');
-        var selected_tab = links[0];
-        for (var j = 0, jmax = links.length; j < jmax; j++) {
-            $(links[j]).click(function(e) {
-                e.preventDefault();
-                setTab(this);
-            });
-            if (links[j] == url_tab) {
-                selected_tab = links[j];
-            }
-        }
-        setTab(selected_tab);
-    }
-    // tab links handling, check each 200ms
-    // (works with history in FF, further browser support here would be an overkill)
-    var prev_hash = location.hash;
-    setInterval(function() {
-        if (location.hash != prev_hash) {
-            prev_hash = location.hash;
-            var url_tab = location.hash.match(/^#tab_.+/)
-                ? $('a[href$="' + location.hash.substr(5) + '"]') : null;
-            if (url_tab) {
-                setTab(url_tab[0]);
-            }
-        }
-    }, 200);
-});
-
-//
-// END: Tabbed forms
-// ------------------------------------------------------------------
-
-// ------------------------------------------------------------------
-// Form reset buttons
-//
-
-$(function() {
-    $('input[type=button]').click(function() {
-        var fields = $(this).closest('fieldset').find('input, select, textarea');
-        for (var i = 0, imax = fields.length; i < imax; i++) {
-            setFieldValue(fields[i], getFieldType(fields[i]));
-        }
-    });
-});
-
-//
-// END: Form reset buttons
-// ------------------------------------------------------------------
-
-// ------------------------------------------------------------------
-// "Restore default" and "set value" buttons
-//
-
-/**
- * Restores field's default value
- *
- * @param {String} field_id
- */
-function restoreField(field_id) {
-    var field = $('#'+field_id);
-    if (field.length == 0 || defaultValues[field_id] == undefined) {
-        return;
-    }
-    setFieldValue(field, getFieldType(field), defaultValues[field_id]);
-}
-
-$(function() {
-    $('.restore-default, .set-value').each(function() {
-        var link = $(this);
-        link.css('opacity', 0.25);
-        if (!link.hasClass('restore-default')) {
-            // restore-default is handled by markField
-        	link.css('display', '');
-        }
-        link.bind({
-            mouseenter: function() {$(this).css('opacity', 1);},
-            mouseleave: function() {$(this).css('opacity', 0.25);},
-            click: function(e) {
-                e.preventDefault();
-                var href = $(this).attr('href').substr(1);
-                var field_id;
-                if ($(this).hasClass('restore-default')) {
-                    field_id = href;
-                    restoreField(field_id);
-                } else {
-                    field_id = href.match(/^[^=]+/)[0];
-                    var value = href.match(/=(.+)$/)[1];
-                    setFieldValue($('#'+field_id), 'text', value);
-                }
-                $('#'+field_id).trigger('change');
-            }
-        });
-    });
-});
-
-//
-// END: "Restore default" and "set value" buttons
-// ------------------------------------------------------------------
diff --git a/user_preferences.php b/user_preferences.php
index daac4d9fd..613bafc9b 100644
--- a/user_preferences.php
+++ b/user_preferences.php
@@ -17,7 +17,7 @@ require_once './libraries/config/ConfigFile.class.php';
 require_once './libraries/config/Form.class.php';
 require_once './libraries/config/FormDisplay.class.php';
 
-$GLOBALS['js_include'][] = 'js/settings_forms.js';
+$GLOBALS['js_include'][] = 'js/config.js';
 
 require_once './libraries/header.inc.php';
 

From 2e1fd2677fffa08315e277bd39626531d0701931 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 12 Jun 2010 23:48:07 +0200
Subject: [PATCH 011/106] Configuration forms styling

---
 libraries/config/FormDisplay.tpl.php    |   6 +-
 setup/styles.css                        |   9 +-
 themes/original/css/theme_right.css.php | 145 +++++++++++++++++++++++-
 user_preferences.php                    |   4 +-
 4 files changed, 152 insertions(+), 12 deletions(-)

diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 5ed53f3c2..907c46189 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -117,9 +117,9 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
     $name_id = 'name="' . $path . '" id="' . $path . '"';
     $base_dir = defined('PMA_SETUP') ? '../' : '';
     $img_path = defined('PMA_SETUP')
-        ? $GLOBALS['cfg']['ThemePath'] . '/original/img/'
+        ? '../' . ltrim($GLOBALS['cfg']['ThemePath'], './') . '/original/img/'
         : $_SESSION['PMA_Theme']->img_path;
-d?>
+?>
 <tr>
     <th>
         <label for="<?php echo htmlspecialchars($path) ?>"><?php echo $name ?></label>
@@ -188,7 +188,7 @@ d?>
     }
     if (isset($opts['show_restore_default']) && $opts['show_restore_default']) {
         ?>
-        <a class="restore-default" href="#<?php echo $path ?>" title="<?php echo __('Restore default value') ?>" style="display:none"><img alt="restore-default" src="../<?php echo $img_path ?>s_reload.png" width="16" height="16" /></a>
+        <a class="restore-default" href="#<?php echo $path ?>" title="<?php echo __('Restore default value') ?>" style="display:none"><img alt="restore-default" src="<?php echo $img_path ?>s_reload.png" width="16" height="16" /></a>
         <?php
     }
     // this must match with displayErrors() in scripts.js
diff --git a/setup/styles.css b/setup/styles.css
index d5a399d77..48d7ec4d0 100644
--- a/setup/styles.css
+++ b/setup/styles.css
@@ -253,10 +253,6 @@ fieldset th {
     vertical-align: top;
 }
 
-fieldset th small {
-    display: block;
-}
-
 fieldset .doc {
     margin-left: 1em;
 }
@@ -267,6 +263,7 @@ fieldset td {
 }
 
 fieldset th small {
+    display: block;
     font-weight: normal;
     font-family: sans-serif;
     font-size: x-small;
@@ -314,16 +311,16 @@ fieldset.simple .lastrow {
 
 span.checkbox {
     padding: 2px;
+    display: inline-block;    
 }
 
 .custom { /* customized field */
     background: #FFC;
 }
 
-span.checkbox.custom {
+.checkbox.custom {
     padding: 1px;
     border: 1px #EDEC90 solid;
-    background: #FFC;
 }
 
 input[type="text"], select, textarea {
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 36e689a2a..0f5de45d6 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -582,7 +582,7 @@ form.login label {
 /* specific elements */
 
 /* topmenu */
-ul#topmenu {
+ul#topmenu, ul.tabs {
     font-weight:        bold;
     list-style-type:    none;
     margin:             0;
@@ -1232,3 +1232,146 @@ table#serverconnection_trg_local  {
   */
 .invalid_value
 {background:#F00;}
+
+/* config forms */
+.config-form ul.tabs {
+    margin:      1em 0.2em 0;
+    padding:     0 0 0.3em 0;
+    list-style:  none;
+    font-weight: bold;
+}
+
+.config-form ul.tabs li {
+    float: <?php echo $left; ?>;
+}
+
+.config-form ul.tabs li a {
+    display:          block;
+    margin:           0.1em 0.2em 0;
+    padding:          0.1em 0.4em;
+    white-space:      nowrap;
+    text-decoration:  none;
+    background-color: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
+    border:           1px solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+    border-bottom:    none;
+}
+
+.config-form ul.tabs li a:hover,
+.config-form ul.tabs li a:active,
+.config-form ul.tabs li a.active {
+    margin:           0;
+    padding:          0.1em 0.6em 0.2em;
+}
+
+.config-form ul.tabs li a.active {
+    background-color: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+}
+
+.config-form fieldset {
+    margin-top:   0;
+    padding:      0;
+    clear:        both;
+    border-color: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+}
+
+.config-form legend {
+    display: none;
+}
+
+.config-form fieldset p {
+    margin:  0;
+    padding: 0.5em;
+}
+
+.config-form fieldset .errors { /* form error list */
+    margin:       0 -2px 1em -2px;
+    padding:      0.5em 1.5em;
+    background:   #FBEAD9;
+    border: 1px   #C83838 solid;
+    border-width: 1px 0;
+    list-style:   none;
+    font-family:  sans-serif;
+    font-size:    small;
+}
+
+.config-form fieldset .inline_errors { /* field error list */
+    margin:     0.3em 0.3em 0.3em 0;
+    padding:    0;
+    list-style: none;
+    color:      #9A0000;
+	font-size:  small;
+}
+
+.config-form fieldset th {
+    padding:        0.3em 0.3em 0.3em 0.5em;
+    text-align:     left;
+    vertical-align: top;
+    width:          40%;
+    background:     transparent;
+}
+
+.config-form fieldset .doc {
+    margin-left: 1em;
+}
+
+.config-form fieldset td {
+    padding-top:    0.3em;
+    padding-bottom: 0.3em;
+    vertical-align: top;
+}
+
+.config-form fieldset th small {
+    display:     block;
+    font-weight: normal;
+    font-family: sans-serif;
+    font-size:   x-small;
+    color:       #444;
+}
+
+.config-form fieldset th, fieldset td {
+    border-top: 1px #666 dotted;
+}
+
+.config-form .lastrow {
+    background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;;
+    padding:    0.5em;
+    text-align: center;
+}
+
+.config-form .form .lastrow {
+    border-top: 1px #555 dotted;
+}
+
+.config-form .lastrow input {
+    font-weight: bold;
+}
+
+/* form elements */
+
+.config-form span.checkbox {
+    padding: 2px;
+    display: inline-block;
+}
+
+.config-form .custom { /* customized field */
+    background: #FFC;
+}
+
+.config-form span.checkbox.custom {
+    padding:    1px;
+    border:     1px #EDEC90 solid;
+    background: #FFC;
+}
+
+.config-form input[type="text"],
+.config-form select,
+.config-form textarea {
+    border: 1px #A7A6AA solid;
+}
+
+.config-form input[type="text"]:focus,
+.config-form select:focus,
+.config-form textarea:focus {
+    border:     1px #6676FF solid;
+    background: #F7FBFF;
+}
diff --git a/user_preferences.php b/user_preferences.php
index 613bafc9b..1241b3a8a 100644
--- a/user_preferences.php
+++ b/user_preferences.php
@@ -17,7 +17,7 @@ require_once './libraries/config/ConfigFile.class.php';
 require_once './libraries/config/Form.class.php';
 require_once './libraries/config/FormDisplay.class.php';
 
-$GLOBALS['js_include'][] = 'js/config.js';
+$GLOBALS['js_include'][] = 'config.js';
 
 require_once './libraries/header.inc.php';
 
@@ -84,7 +84,7 @@ if (!$form_display->process(false)) {
         exit;
     }
 }
-print_r($_SESSION);
+
 /**
  * Displays the footer
  */

From a90b0a21f242bb552451118e5f0101345d1cdb15 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sun, 13 Jun 2010 15:01:37 +0200
Subject: [PATCH 012/106] removed some messages from messages.inc.php
 (validation, some other error messages)

User preferences:
added translations and values for some fields
validation for DefaultPropDisplay
---
 Documentation.html                      |  2 +-
 js/config.js                            | 12 ++++++
 libraries/config.default.php            |  2 +-
 libraries/config.values.php             |  2 +
 libraries/config/FormDisplay.class.php  | 24 +++++++-----
 libraries/config/messages.inc.php       | 51 ++++++++++++++-----------
 libraries/user_preferences.lib.php      | 22 ++++-------
 setup/lib/form_processing.lib.php       |  2 +-
 setup/lib/index.lib.php                 |  8 ++--
 setup/lib/validate.lib.php              | 49 +++++++++++++++---------
 themes/original/css/theme_right.css.php | 12 +++++-
 user_preferences.php                    |  2 +-
 12 files changed, 115 insertions(+), 73 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index b2b5f085a..14718953a 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2160,7 +2160,7 @@ setfacl -d -m "g:www-data:rwx" tmp
     <dt id="cfg_TitleDatabase">$cfg['TitleDatabase'] string</dt>
     <dt id="cfg_TitleServer">$cfg['TitleServer'] string</dt>
     <dt id="cfg_TitleDefault">$cfg['TitleDefault'] string</dt>
-    <dd>Allows you to specify window's title bar. Following magic string can
+    <dd>Allows you to specify windows' title bar. Following magic strings can
         be used to get special values:
         <dl>
             <dt><code>@HTTP_HOST@</code></dt>
diff --git a/js/config.js b/js/config.js
index 4f19e4a1d..ce0830c51 100644
--- a/js/config.js
+++ b/js/config.js
@@ -200,6 +200,18 @@ var validators = {
         }
         return result;
     },
+    /**
+     * DefaultPropDisplay validator
+     *
+     * @param {boolean} isKeyUp
+     */
+    validate_DefaultPropDisplay: function(isKeyUp) {
+        if (isKeyUp && this.value == '') {
+            return true;
+        }
+        var valid = this.value.match(/^(?:horizontal|vertical|[0-9]+)$/) != null;
+        return valid ? true : PMA_messages['error_invalid_value']
+    },
     // field validators
     _field: {
     },
diff --git a/libraries/config.default.php b/libraries/config.default.php
index b2a393275..6bc339557 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2149,7 +2149,7 @@ $cfg['DefaultDisplay'] = 'horizontal';
 /**
  * default display direction for altering/creating columns (tbl_properties)
  * (horizontal|vertical|<number>)
- * number indicates maximal number for which vertical model is used
+ * number indicates maximum number for which vertical model is used
  *
  * @global integer $cfg['DefaultPropDisplay']
  */
diff --git a/libraries/config.values.php b/libraries/config.values.php
index 188335477..db9f5161b 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -64,6 +64,7 @@ $cfg_db['QueryWindowDefTab'] = array(
 	'files',   // Import files
 	'history', // SQL history
 	'full');   // All (SQL and SQL history)
+$cfg_db['InitialSlidersState'] = array('open', 'closed');
 $cfg_db['Import']['format'] = array(
     'csv',    // CSV
     'docsql', // DocSQL
@@ -110,5 +111,6 @@ $cfg_db['_validators'] = array(
     'CharTextareaRows' => 'validate_positive_number',
     'InsertRows' => 'validate_positive_number',
     'ForeignKeyMaxLimit' => 'validate_positive_number',
+    'DefaultPropDisplay' => 'validate_DefaultPropDisplay',
     'Import/skip_queries' => 'validate_non_negative_number');
 ?>
\ No newline at end of file
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 274a58588..7d812fbe2 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -58,8 +58,7 @@ class FormDisplay
      * Will be looked up in $GLOBALS: str{value} or strSetup{value}
      * @var array
      */
-    private $js_lang_strings = array('error_nan_p', 'error_nan_nneg',
-        'error_incorrect_port');
+    private $js_lang_strings = array();
 
     /**
      * Tells whether forms have been validated
@@ -67,6 +66,16 @@ class FormDisplay
      */
     private $is_valdiated = true;
 
+    public function __construct()
+    {
+        $this->js_lang_strings = array(
+            'error_nan_p' => __('Not a positive number'),
+            'error_nan_nneg' => __('Not a non-negative number'),
+            'error_incorrect_port' => __('Not a valid port number'),
+            'error_invalid_value' => __('Incorrect value')
+        );
+    }
+
     /**
      * Registers form in form manager
      *
@@ -222,11 +231,8 @@ class FormDisplay
         if (!$js_lang_sent) {
             $js_lang_sent = true;
             $js_lang = array();
-            foreach ($this->js_lang_strings as $str) {
-                $lang = isset($GLOBALS["strSetup$str"])
-                    ? $GLOBALS["strSetup$str"]
-                    : filter_var($GLOBALS["str$str"]); // null if not set
-                $js_lang[] = "'$str': '" . PMA_jsFormat($lang, false) . '\'';
+            foreach ($this->js_lang_strings as $strName => $strValue) {
+                $js_lang[] = "'$strName': '" . PMA_jsFormat($strValue, false) . '\'';
             }
             $js[] = '$.extend(PMA_messages, {' . implode(",\n\t", $js_lang) . '})';
         }
@@ -434,8 +440,8 @@ class FormDisplay
                     if ($form->getOptionType($field) == 'boolean') {
                         $_POST[$key] = false;
                     } else {
-                        $this->errors[$form->name][] = PMA_lang(
-                            'error_missing_field_data',
+                        $this->errors[$form->name][] = sprintf(
+                            __('Missing data for %s'),
                             '<i>' . PMA_lang_name($system_path) . '</i>');
                         $result = false;
                         continue;
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 7b58193aa..e22ed5424 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -18,10 +18,7 @@ $strSetupAllowArbitraryServer_desc = __('If enabled user can enter any MySQL ser
 $strSetupAllowArbitraryServerMsg = __('This [a@?page=form&amp;formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&amp;formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
 $strSetupAllowArbitraryServer_name = __('Allow login to any MySQL server');
 $strSetupAllowUserDropDatabase_name = __('Show &quot;Drop database&quot; link to normal users');
-$strSetupBlowfishSecretCharsMsg = __('Key should contain letters, numbers [em]and[/em] special characters');
 $strSetupblowfish_secret_desc = __('Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] authentication');
-$strSetupBlowfishSecretLengthMsg = __('Key is too short, it should have at least 8 characters');
-$strSetupBlowfishSecretMsg = __('You didn\'t have blowfish secret set and have enabled cookie authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.');
 $strSetupblowfish_secret_name = __('Blowfish secret');
 $strSetupBrowseMarkerEnable_desc = __('Highlight selected rows');
 $strSetupBrowseMarkerEnable_name = __('Row marker');
@@ -29,9 +26,8 @@ $strSetupBrowsePointerEnable_desc = __('Highlight row pointed by the mouse curso
 $strSetupBrowsePointerEnable_name = __('Highlight pointer');
 $strSetupBZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for import and export operations');
 $strSetupBZipDump_name = __('Bzip2');
-$strSetupBZipDumpWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.');
 $strSetupCannotLoadConfig = __('Cannot load or save configuration');
-$strSetupCannotLoadConfigMsg = __('Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@../Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.');
+$strSetupCannotLoadConfigMsg = __('Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.');
 $strSetupCharEditing_desc = __('Defines which type of editing controls should be used for CHAR and VARCHAR columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in columns');
 $strSetupCharEditing_name = __('CHAR columns editing');
 $strSetupCharTextareaCols_desc = __('Number of columns for CHAR/VARCHAR textareas');
@@ -39,15 +35,17 @@ $strSetupCharTextareaCols_name = __('CHAR textarea columns');
 $strSetupCharTextareaRows_desc = __('Number of rows for CHAR/VARCHAR textareas');
 $strSetupCharTextareaRows_name = __('CHAR textarea rows');
 $strSetupCheckConfigurationPermissions_name = __('Check config file permissions');
-$strSetupClear = __('Clear');
 $strSetupCompressOnFly_desc = __('Compress gzip/bzip2 exports on the fly without the need for much memory; if you encounter problems with created gzip/bzip2 files disable this feature');
 $strSetupCompressOnFly_name = __('Compress on the fly');
 $strSetupConfigurationFile = __('Configuration file');
 $strSetupConfirm_desc = __('Whether a warning (&quot;Are your really sure...&quot;) should be displayed when you\'re about to lose data');
 $strSetupConfirm_name = __('Confirm DROP queries');
+$strSetupCtrlArrowsMoving_name = __('Field navigation using Ctrl+Arrows');
 $strSetupDefaultCharset_desc = __('Default character set used for conversions');
 $strSetupDefaultCharset_name = __('Default character set');
 $strSetupDefaultLanguage = __('Default language');
+$strSetupDefaultPropDisplay_name = __('Display direction for altering/creating columns');
+$strSetupDefaultPropDisplay_desc = __('[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates maximum number for which vertical model is used');
 $strSetupDefaultServer = __('Default server');
 $strSetupDefaultTabDatabase_desc = __('Tab that is displayed when entering a database');
 $strSetupDefaultTabDatabase_name = __('Default database tab');
@@ -64,19 +62,8 @@ $strSetupDisplayServersList_name = __('Display servers as a list');
 $strSetupDonateLink = __('Donate');
 $strSetupDownload = __('Download');
 $strSetupEndOfLine = __('End of line');
-$strSetuperror_connection = __('Could not connect to MySQL server');
-$strSetuperror_empty_pmadb_password = __('Empty phpMyAdmin control user password while using pmadb');
-$strSetuperror_empty_pmadb_user = __('Empty phpMyAdmin control user while using pmadb');
-$strSetuperror_empty_signon_session = __('Empty signon session name while using signon authentication method');
-$strSetuperror_empty_signon_url = __('Empty signon URL while using signon authentication method');
-$strSetuperror_empty_user_for_config_auth = __('Empty username while using config authentication method');
-$strSetuperror_form = __('Submitted form contains errors');
-$strSetuperror_incorrect_ip_address = __('Incorrect IP address: %s');
-$strSetuperror_incorrect_port = __('Not a valid port number');
-$strSetuperror_incorrect_value = __('Incorrect value');
-$strSetuperror_missing_field_data = __('Missing data for %s');
-$strSetuperror_nan_nneg = __('Not a non-negative number');
-$strSetuperror_nan_p = __('Not a positive number');
+$strSetupErrorIconic_name = __('Iconic errors');
+$strSetupErrorIconic_desc = __('Show icons for warning, error and information messages');
 $strSetupExecTimeLimit_desc = __('Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)');
 $strSetupExecTimeLimit_name = __('Maximum execution time');
 $strSetupExport_asfile_name = __('Save as file');
@@ -103,6 +90,7 @@ $strSetupForm_Edit_desc = __('Customize edit mode');
 $strSetupForm_Edit = __('Edit mode');
 $strSetupForm_Export_defaults_desc = __('Customize default export options');
 $strSetupForm_Export_defaults = __('Export defaults');
+$strSetupForm_General = __('General settings');
 $strSetupForm_Import_defaults_desc = __('Customize default common import options');
 $strSetupForm_Import_defaults = __('Import defaults');
 $strSetupForm_Import_export_desc = __('Set import and export directories and compression options');
@@ -120,6 +108,8 @@ $strSetupForm_Other_core_settings_desc = __('Settings that didn\'t fit enywhere
 $strSetupForm_Other_core_settings = __('Other core settings');
 $strSetupForm_Query_window_desc = __('Customize query window options');
 $strSetupForm_Query_window = __('Query window');
+$strSetupForm_Page_titles = __('Page titles');
+$strSetupForm_Page_titles_desc = __('Specify windows\' title bar. Refer to [a@Documentation.html#cfg_TitleTable]documentation[/a] for magic strings that can be used to get special values.');
 $strSetupForm_Security_desc = __('Please note that phpMyAdmin is just a user interface and its features do not limit MySQL');
 $strSetupForm_Security = __('Security');
 $strSetupForm_Server = __('Basic settings');
@@ -128,7 +118,7 @@ $strSetupForm_Server_config = __('Server configuration');
 $strSetupForm_Server_desc = __('Enter server connection parameters');
 $strSetupForm_Server_login_options_desc = __('Enter login options for signon authentication');
 $strSetupForm_Server_login_options = __('Signon login options');
-$strSetupForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@../Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation');
+$strSetupForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation');
 $strSetupForm_Server_pmadb = __('PMA database');
 $strSetupForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.');
 $strSetupForm_Server_tracking = __('Changes tracking');
@@ -160,6 +150,7 @@ $strSetupImport_format_desc = __('Default format; be aware that this list depend
 $strSetupImport_format_name = __('Format of imported file');
 $strSetupImport_skip_queries_desc = __('Number of queries to skip from start');
 $strSetupImport_skip_queries_name = __('Partial import: skip queries');
+$strSetupInitialSlidersState_name = __('Initial state for sliders');
 $strSetupInsecureConnection = __('Insecure connection');
 $strSetupInsecureConnectionMsg1 = __('You are not using a secure connection; all data (including potentially sensitive information, like passwords) is transferred unencrypted!');
 $strSetupInsecureConnectionMsg2 = __('If your server is also configured to accept HTTPS requests follow [a@%s]this link[/a] to use a secure connection.');
@@ -197,6 +188,8 @@ $strSetupLoginCookieStore_name = __('Login cookie store');
 $strSetupLoginCookieValidity_desc = __('Define how long (in seconds) a login cookie is valid');
 $strSetupLoginCookieValidityMsg = __('[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.');
 $strSetupLoginCookieValidity_name = __('Login cookie validity');
+$strSetupLongtextDoubleTextarea_name = __('Bigger textarea for LONGTEXT');
+$strSetupLongtextDoubleTextarea_desc = __('Double size of textarea for LONGTEXT fields');
 $strSetupMainPageIconic_name = __('Use icons on main page');
 $strSetupMaxCharactersInDisplayedSQL_desc = __('Maximum number of characters used when a SQL query is displayed');
 $strSetupMaxCharactersInDisplayedSQL_name = __('Maximum displayed SQL length');
@@ -208,6 +201,8 @@ $strSetupMaxTableList_desc = __('Maximum number of tables displayed in table lis
 $strSetupMaxTableList_name = __('Maximum tables');
 $strSetupMemoryLimit_desc = __('The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] ([kbd]0[/kbd] for no limit)');
 $strSetupMemoryLimit_name = __('Memory limit');
+$strSetupNaturalOrder_name = __('Natural order');
+$strSetupNaturalOrder_desc = __('Use natural order for sorting table and database names');
 $strSetupNavigationBarIconic_desc = __('Use only icons, only text or both');
 $strSetupNavigationBarIconic_name = __('Iconic navigation bar');
 $strSetupNewServer = __('New server');
@@ -232,6 +227,8 @@ $strSetupQueryWindowDefTab_desc = __('Tab displayed when opening a new query win
 $strSetupQueryWindowDefTab_name = __('Default query window tab');
 $strSetupRecodingEngine_desc = __('Select which functions will be used for character set conversion');
 $strSetupRecodingEngine_name = __('Recoding engine');
+$strSetupReplaceHelpImg_name = __('Show help button');
+$strSetupReplaceHelpImg_desc = __('Show help button instead of Documentation text');
 $strSetupRestoreDefaultValue = __('Restore default value');
 $strSetupRevertErroneousFields = __('Try to revert erroneous fields to their default values');
 $strSetupSaveDir_desc = __('Directory where exports can be saved on server');
@@ -270,7 +267,6 @@ $strSetupServers_designer_coords_name = __('Designer table');
 $strSetupServers_DisableIS_desc = __('More information on [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]');
 $strSetupServers_DisableIS_name = __('Disable use of INFORMATION_SCHEMA');
 $strSetupServerSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - [a@?page=servers&amp;mode=edit&amp;id=%1$d#tab_Server_config]host authentication[/a] settings and [a@?page=form&amp;formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
-$strSetupServersEdit = __('Edit server');
 $strSetupServers_extension_desc = __('What PHP extension to use; you should use mysqli if supported');
 $strSetupServers_extension_name = __('PHP extension to use');
 $strSetupServers_hide_db_desc = __('Hide databases matching regular expression (PCRE)');
@@ -357,6 +353,17 @@ $strSetupSQLQuery_ShowAsPHP_name = __('Create PHP Code');
 $strSetupSQLQuery_Validate_name = __('Validate SQL');
 $strSetupSuggestDBName_desc = __('Suggest a database name on the &quot;Create Database&quot; form (if possible) or keep the text field empty');
 $strSetupSuggestDBName_name = __('Suggest new database name');
+$strSetupTextareaCols_name = __('Textarea columns');
+$strSetupTextareaCols_desc = __('Textarea size (columns) in edit mode, this value will be emphasized for SQL query textareas (*2) and for query window (*1.25)');
+$strSetupTextareaRows_name = __('Textarea rows');
+$strSetupTitleDefault_name = __('Default title');
+$strSetupTitleDefault_desc = __('Title of browser window when nothing is selected');
+$strSetupTitleTable_name = __('Table');
+$strSetupTitleTable_desc = __('Title of browser window when a table is selected');
+$strSetupTitleDatabase_name = __('Database');
+$strSetupTitleDatabase_desc = __('Title of browser window when a database is selected');
+$strSetupTitleServer_name = __('Server');
+$strSetupTitleServer_desc = __('Title of browser window when a server is selected');
 $strSetupTrue = __('yes');
 $strSetupTrustedProxies_desc = __('Input proxies as [kbd]IP: trusted HTTP header[/kbd]. The following example specifies that phpMyAdmin should trust a HTTP_X_FORWARDED_FOR (X-Forwarded-For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: HTTP_X_FORWARDED_FOR[/kbd]');
 $strSetupTrustedProxies_name = __('List of trusted proxies for IP allow/deny');
@@ -381,4 +388,4 @@ $strSetupZipDumpExportWarning = __('[a@?page=form&amp;formset=features#tab_Impor
 $strSetupZipDumpImportWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]Zip decompression[/a] requires functions (%s) which are unavailable on this system.');
 $strSetupZipDump_name = __('ZIP');
 
-?>
+?>
\ No newline at end of file
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index c53c3dd75..dd0b8ffc7 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -8,9 +8,6 @@
 
 $forms = array();
 $forms['Features']['General'] = array(
-    'DefaultLang',
-    'DefaultConnectionCollation',
-    'ThemeDefault',
     'NaturalOrder',
     'InitialSlidersState',
     'ErrorIconic',
@@ -28,26 +25,21 @@ $forms['Sql_queries']['Sql_queries'] = array(
     'IgnoreMultiSubmitErrors',
     'VerboseMultiSubmit',
     'MaxCharactersInDisplayedSQL',// [s-]
-    'SQLQuery/Edit',// [s-]
-    'SQLQuery/Explain',// [s-]
-    'SQLQuery/ShowAsPHP',// [s-]
-    'SQLQuery/Validate',// [false or no override]
-    'SQLQuery/Refresh',// [s-]
     'EditInWindow',// [s-]
     'QueryWindowWidth',// [s-]
     'QueryWindowHeight',// [s-]
     'QueryWindowDefTab');// [s-]
 $forms['Sql_queries']['Sql_box'] = array(
-    'Edit',
-    'Explain',
-    'ShowAsPHP',
-    'Validate',// (false or no override)
-    'Refresh');
+    'SQLQuery/Edit',// [s-]
+    'SQLQuery/Explain',// [s-]
+    'SQLQuery/ShowAsPHP',// [s-]
+    'SQLQuery/Validate',// [false or no override]
+    'SQLQuery/Refresh');// [s-]
 $forms['Features']['Page_titles'] = array(
+    'TitleDefault',// [s-]
     'TitleTable',// [s-]
     'TitleDatabase',// [s-]
-    'TitleServer',// [s-]
-    'TitleDefault');// [s-]
+    'TitleServer');// [s-]
 $forms['Left_frame']['Left_frame'] = array(
     'LeftFrameLight',
     'LeftDisplayLogo',
diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
index 7128a6119..5e95f8bfb 100644
--- a/setup/lib/form_processing.lib.php
+++ b/setup/lib/form_processing.lib.php
@@ -41,7 +41,7 @@ function process_formset(FormDisplay $form_display) {
             ?>
             <div class="warning">
                 <h4><?php echo __('Warning') ?></h4>
-                <?php echo PMA_lang('error_form') ?><br />
+                <?php echo __('Submitted form contains errors') ?><br />
                 <a href="?page=<?php echo $page . $formset . $id . $separator ?>mode=revert"><?php echo PMA_lang('RevertErroneousFields') ?></a>
             </div>
             <?php $form_display->displayErrors() ?>
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index 8cb2ed1c2..ce0b99e81 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -323,20 +323,20 @@ function perform_config_checks()
         if ($blowfish_secret_set) {
             // 'cookie' auth used, blowfish_secret was generated
             messages_set('notice', 'blowfish_secret_created', 'blowfish_secret_name',
-                 PMA_lang('BlowfishSecretMsg'));
+                 __('You didn\'t have blowfish secret set and have enabled cookie authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.'));
         } else {
             $blowfish_warnings = array();
             // check length
             if (strlen($blowfish_secret) < 8) {
                 // too short key
-                $blowfish_warnings[] = PMA_lang('BlowfishSecretLengthMsg');
+                $blowfish_warnings[] = __('Key is too short, it should have at least 8 characters');
             }
             // check used characters
             $has_digits = (bool) preg_match('/\d/', $blowfish_secret);
             $has_chars = (bool) preg_match('/\S/', $blowfish_secret);
             $has_nonword = (bool) preg_match('/\W/', $blowfish_secret);
             if (!$has_digits || !$has_chars || !$has_nonword) {
-                $blowfish_warnings[] = PMA_lang('BlowfishSecretCharsMsg');
+                $blowfish_warnings[] = PMA_sanitize(__('Key should contain letters, numbers [em]and[/em] special characters'));
             }
             if (!empty($blowfish_warnings)) {
                 messages_set('warning', 'blowfish_warnings' . count($blowfish_warnings),
@@ -413,7 +413,7 @@ function perform_config_checks()
             ? ''
             : ($functions ? ', ' : '') . 'bzcompress';
         messages_set('warning', 'BZipDump', 'BZipDump_name',
-            PMA_lang('BZipDumpWarning', $functions));
+            PMA_sanitize(sprintf(__('[a@?page=form&amp;formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.'), $functions)));
     }
 
     //
diff --git a/setup/lib/validate.lib.php b/setup/lib/validate.lib.php
index 05b09783c..34c5d98bb 100644
--- a/setup/lib/validate.lib.php
+++ b/setup/lib/validate.lib.php
@@ -131,14 +131,14 @@ function test_db_connection($extension, $connect_type, $host, $port, $socket, $u
     if ($extension == 'mysql') {
         $conn = @mysql_connect($host . $socket . $port, $user, $pass);
         if (!$conn) {
-            $error = PMA_lang('error_connection');
+            $error = __('Could not connect to MySQL server');
         } else {
             mysql_close($conn);
         }
     } else {
         $conn = @mysqli_connect($host, $user, $pass, null, $port, $socket);
         if (!$conn) {
-            $error = PMA_lang('error_connection');
+            $error = __('Could not connect to MySQL server');
         } else {
             mysqli_close($conn);
         }
@@ -162,15 +162,15 @@ function validate_server($path, $values)
     $result = array('Server' => '', 'Servers/1/user' => '', 'Servers/1/SignonSession' => '', 'Servers/1/SignonURL' => '');
     $error = false;
     if ($values['Servers/1/auth_type'] == 'config' && empty($values['Servers/1/user'])) {
-        $result['Servers/1/user'] = PMA_lang('error_empty_user_for_config_auth');
+        $result['Servers/1/user'] = __('Empty username while using config authentication method');
         $error = true;
     }
     if ($values['Servers/1/auth_type'] == 'signon' && empty($values['Servers/1/SignonSession'])) {
-        $result['Servers/1/SignonSession'] = PMA_lang('error_empty_signon_session');
+        $result['Servers/1/SignonSession'] = __('Empty signon session name while using signon authentication method');
         $error = true;
     }
     if ($values['Servers/1/auth_type'] == 'signon' && empty($values['Servers/1/SignonURL'])) {
-        $result['Servers/1/SignonURL'] = PMA_lang('error_empty_signon_url');
+        $result['Servers/1/SignonURL'] = __('Empty signon URL while using signon authentication method');
         $error = true;
     }
 
@@ -203,15 +203,17 @@ function validate_pmadb($path, $values)
 
     $result = array();
     if ($values['Servers/1/controluser'] == '') {
-        $result['Servers/1/controluser'] = PMA_lang('error_empty_pmadb_user');
+        $result['Servers/1/controluser'] = __('Empty phpMyAdmin control user while using pmadb');
         $error = true;
     }
     if ($values['Servers/1/controlpass'] == '') {
-        $result['Servers/1/controlpass'] = PMA_lang('error_empty_pmadb_password');
+        $result['Servers/1/controlpass'] = __('Empty phpMyAdmin control user password while using pmadb');
         $error = true;
     }
     if (!$error) {
-        $test = test_db_connection($values['Servers/1/extension'], $values['Servers/1/connect_type'], $values['Servers/1/host'], $values['Servers/1/port'], $values['Servers/1/socket'], $values['Servers/1/controluser'], $values['Servers/1/controlpass'], 'Server_pmadb');
+        $test = test_db_connection($values['Servers/1/extension'], $values['Servers/1/connect_type'],
+            $values['Servers/1/host'], $values['Servers/1/port'], $values['Servers/1/socket'],
+            $values['Servers/1/controluser'], $values['Servers/1/controlpass'], 'Server_pmadb');
         if ($test !== true) {
             $result = array_merge($result, $test);
         }
@@ -283,14 +285,14 @@ function validate_trusted_proxies($path, $values)
         $matches = array();
         // we catch anything that may (or may not) be an IP
         if (!preg_match("/^(.+):(?:[ ]?)\\w+$/", $line, $matches)) {
-            $result[$path][] = PMA_lang('error_incorrect_value') . ': ' . $line;
+            $result[$path][] = __('Incorrect value') . ': ' . $line;
             continue;
         }
         // now let's check whether we really have an IP address
         if (filter_var($matches[1], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false
             && filter_var($matches[1], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false) {
             $ip = htmlspecialchars(trim($matches[1]));
-            $result[$path][] = PMA_lang('error_incorrect_ip_address', $ip);
+            $result[$path][] = sprintf(__('Incorrect IP address: %s'), $ip);
             continue;
         }
     }
@@ -307,17 +309,17 @@ function validate_trusted_proxies($path, $values)
  * @param bool   $allow_neg       allow negative values
  * @param bool   $allow_zero      allow zero
  * @param int    $max_value       max allowed value
- * @param string $error_lang_key  error message key: $GLOBALS["strSetup$error_lang_key"]
+ * @param string $error_string    error message key: $GLOBALS["strSetup$error_lang_key"]
  * @return string  empty string if test is successful
  */
-function test_number($path, $values, $allow_neg, $allow_zero, $max_value, $error_lang_key)
+function test_number($path, $values, $allow_neg, $allow_zero, $max_value, $error_string)
 {
     if ($values[$path] === '') {
         return '';
     }
 
     if (intval($values[$path]) != $values[$path] || (!$allow_neg && $values[$path] < 0) || (!$allow_zero && $values[$path] == 0) || $values[$path] > $max_value) {
-        return PMA_lang($error_lang_key);
+        return $error_string;
     }
 
     return '';
@@ -332,7 +334,7 @@ function test_number($path, $values, $allow_neg, $allow_zero, $max_value, $error
  */
 function validate_port_number($path, $values)
 {
-    return array($path => test_number($path, $values, false, false, 65536, 'error_incorrect_port'));
+    return array($path => test_number($path, $values, false, false, 65536, __('Not a valid port number')));
 }
 
 /**
@@ -344,7 +346,7 @@ function validate_port_number($path, $values)
  */
 function validate_positive_number($path, $values)
 {
-    return array($path => test_number($path, $values, false, false, PHP_INT_MAX, 'error_nan_p'));
+    return array($path => test_number($path, $values, false, false, PHP_INT_MAX, __('Not a positive number')));
 }
 
 /**
@@ -356,6 +358,19 @@ function validate_positive_number($path, $values)
  */
 function validate_non_negative_number($path, $values)
 {
-    return array($path => test_number($path, $values, false, true, PHP_INT_MAX, 'error_nan_nneg'));
+    return array($path => test_number($path, $values, false, true, PHP_INT_MAX, __('Not a non-negative number')));
 }
-?>
+
+/**
+ * Validates DefaultPropDisplay field
+ *
+ * @param  $path
+ * @param  $values
+ * @return array
+ */
+function validate_DefaultPropDisplay($path, $values)
+{
+    $result = preg_match('/^(?:horizontal|vertical|\d+)$/',  $values[$path]);
+    return array($path => ($result ? '' : __('Incorrect value')));
+}
+?>
\ No newline at end of file
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 0f5de45d6..86d6e7422 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1251,7 +1251,6 @@ table#serverconnection_trg_local  {
     padding:          0.1em 0.4em;
     white-space:      nowrap;
     text-decoration:  none;
-    background-color: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
     border:           1px solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
     border-bottom:    none;
 }
@@ -1264,7 +1263,7 @@ table#serverconnection_trg_local  {
 }
 
 .config-form ul.tabs li a.active {
-    background-color: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+    background-color: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
 }
 
 .config-form fieldset {
@@ -1375,3 +1374,12 @@ table#serverconnection_trg_local  {
     border:     1px #6676FF solid;
     background: #F7FBFF;
 }
+
+/* error list */
+dd {
+    margin-left: 0.5em;
+}
+
+dd:before {
+    content: "\25B8  ";
+}
diff --git a/user_preferences.php b/user_preferences.php
index 1241b3a8a..a6817d750 100644
--- a/user_preferences.php
+++ b/user_preferences.php
@@ -68,7 +68,7 @@ if (!$form_display->process(false)) {
         ?>
         <div class="warning">
             <h4><?php echo __('Warning') ?></h4>
-            <?php echo PMA_lang('error_form') ?><br />
+            <?php echo __('Submitted form contains errors') ?><br />
             <a href="?form=<?php echo $form_param ?>&amp;mode=revert"><?php echo PMA_lang('RevertErroneousFields') ?></a>
         </div>
         <?php $form_display->displayErrors() ?>

From eb31291dcaa405c93089e4d11f0d644aadf7bd9c Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Wed, 16 Jun 2010 23:50:44 +0200
Subject: [PATCH 013/106] docs typo

---
 Documentation.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation.html b/Documentation.html
index 34338a083..e137953e3 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1864,7 +1864,7 @@ $cfg['TrustedProxies'] =
         editing.</dd>
 
     <dt id="cfg_LimitChars">$cfg['LimitChars'] integer</dt>
-    <dd>Maximum number of characters showen in any non-numeric column on browse view.
+    <dd>Maximum number of characters shown in any non-numeric column on browse view.
         Can be turned off by a toggle button on the browse page.</dd>
 
     <dt><span id="cfg_ModifyDeleteAtLeft">$cfg['ModifyDeleteAtLeft'] </span>boolean

From c7b304b6e62cdcd331c0cdc8aa4f884644f0f085 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Wed, 16 Jun 2010 23:54:35 +0200
Subject: [PATCH 014/106] improve js validators add missing validations and
 language strings

---
 js/config.js                            | 11 +++++-
 libraries/config.values.php             | 31 ++++++++++-------
 libraries/config/messages.inc.php       | 19 +++++++++-
 libraries/user_preferences.lib.php      | 46 ++++++++++++-------------
 setup/styles.css                        |  6 +---
 themes/original/css/theme_right.css.php | 20 +++++------
 6 files changed, 81 insertions(+), 52 deletions(-)

diff --git a/js/config.js b/js/config.js
index ce0830c51..fa68d7034 100644
--- a/js/config.js
+++ b/js/config.js
@@ -169,13 +169,16 @@ var validate = {};
 // form validator list
 var validators = {
     // regexp: numeric value
-    _regexp_numeric: new RegExp('^[0-9]*$'),
+    _regexp_numeric: new RegExp('^[0-9]+$'),
     /**
      * Validates positive number
      *
      * @param {boolean} isKeyUp
      */
     validate_positive_number: function (isKeyUp) {
+        if (isKeyUp && this.value == '') {
+            return true;
+        }
         var result = this.value != '0' && validators._regexp_numeric.test(this.value);
         return result ? true : PMA_messages['error_nan_p'];
     },
@@ -185,6 +188,9 @@ var validators = {
      * @param {boolean} isKeyUp
      */
     validate_non_negative_number: function (isKeyUp) {
+        if (isKeyUp && this.value == '') {
+            return true;
+        }
         var result = validators._regexp_numeric.test(this.value);
         return result ? true : PMA_messages['error_nan_nneg'];
     },
@@ -194,6 +200,9 @@ var validators = {
      * @param {boolean} isKeyUp
      */
     validate_port_number: function(isKeyUp) {
+        if (isKeyUp && this.value == '') {
+            return true;
+        }
         var result = validators._regexp_numeric.test(this.value) && this.value != '0';
         if (!result || this.value > 65536) {
             result = PMA_messages['error_incorrect_port'];
diff --git a/libraries/config.values.php b/libraries/config.values.php
index db9f5161b..522d2362f 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -39,6 +39,7 @@ $cfg_db['LeftDefaultTabTable'] = array(
 $cfg_db['NavigationBarIconic'] = array(true, false, 'both');
 $cfg_db['Order'] = array('ASC', 'DESC', 'SMART');
 $cfg_db['ProtectBinary'] = array(false, 'blob', 'all');
+$cfg_db['DefaultDisplay'] = array('horizontal', 'vertical', 'horizontalflipped');
 $cfg_db['CharEditing'] = array('input', 'textarea');
 $cfg_db['PropertiesIconic'] = array(true, false, 'both');
 $cfg_db['DefaultTabServer'] = array(
@@ -97,20 +98,26 @@ $cfg_db['_overrides']['Servers/1/extension'] = extension_loaded('mysqli')
  * Use only full paths and form ids
  */
 $cfg_db['_validators'] = array(
+    'CharTextareaCols' => 'validate_positive_number',
+    'CharTextareaRows' => 'validate_positive_number',
+    'DefaultPropDisplay' => 'validate_DefaultPropDisplay',
+    'ForeignKeyMaxLimit' => 'validate_positive_number',
+    'Import/skip_queries' => 'validate_non_negative_number',
+    'InsertRows' => 'validate_positive_number',
+    'LeftFrameTableLevel' => 'validate_positive_number',
+    'LimitChars' => 'validate_positive_number',
+    'LoginCookieValidity' => 'validate_positive_number',
+    'LoginCookieStore' => 'validate_non_negative_number',
+    'MaxCharactersInDisplayedSQL' => 'validate_positive_number',
+    'MaxRows' => 'validate_positive_number',
+    'QueryHistoryMax' => 'validate_positive_number',
+    'QueryWindowWidth' => 'validate_positive_number',
+    'QueryWindowHeight' => 'validate_positive_number',
+    'RepeatCells' => 'validate_non_negative_number',
     'Server' => 'validate_server',
     'Server_pmadb' => 'validate_pmadb',
     'Servers/1/port' => 'validate_port_number',
     'Servers/1/hide_db' => 'validate_regex',
-    'TrustedProxies' => 'validate_trusted_proxies',
-    'LoginCookieValidity' => 'validate_positive_number',
-    'LoginCookieStore' => 'validate_non_negative_number',
-    'QueryHistoryMax' => 'validate_positive_number',
-    'LeftFrameTableLevel' => 'validate_positive_number',
-    'MaxRows' => 'validate_positive_number',
-    'CharTextareaCols' => 'validate_positive_number',
-    'CharTextareaRows' => 'validate_positive_number',
-    'InsertRows' => 'validate_positive_number',
-    'ForeignKeyMaxLimit' => 'validate_positive_number',
-    'DefaultPropDisplay' => 'validate_DefaultPropDisplay',
-    'Import/skip_queries' => 'validate_non_negative_number');
+    'TextareaCols' => 'validate_positive_number',
+    'TrustedProxies' => 'validate_trusted_proxies');
 ?>
\ No newline at end of file
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index e22ed5424..380735447 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -43,6 +43,7 @@ $strSetupConfirm_name = __('Confirm DROP queries');
 $strSetupCtrlArrowsMoving_name = __('Field navigation using Ctrl+Arrows');
 $strSetupDefaultCharset_desc = __('Default character set used for conversions');
 $strSetupDefaultCharset_name = __('Default character set');
+$strSetupDefaultDisplay_name = __('Default display direction');
 $strSetupDefaultLanguage = __('Default language');
 $strSetupDefaultPropDisplay_name = __('Display direction for altering/creating columns');
 $strSetupDefaultPropDisplay_desc = __('[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates maximum number for which vertical model is used');
@@ -54,6 +55,8 @@ $strSetupDefaultTabServer_name = __('Default server tab');
 $strSetupDefaultTabTable_desc = __('Tab that is displayed when entering a table');
 $strSetupDefaultTabTable_name = __('Default table tab');
 $strSetupDirectoryNotice = __('This value should be double checked to ensure that this directory is neither world accessible nor readable or writable by other users on your server.');
+$strSetupDisplayBinaryAsHex_name = __('Show binary contents as HEX');
+$strSetupDisplayBinaryAsHex_desc = __('Show binary contents as HEX by default');
 $strSetupDisplayDatabasesList_desc = __('Show database listing as a list instead of a drop down');
 $strSetupDisplayDatabasesList_name = __('Display databases as a list');
 $strSetupDisplay = __('Display');
@@ -61,6 +64,8 @@ $strSetupDisplayServersList_desc = __('Show server listing as a list instead of
 $strSetupDisplayServersList_name = __('Display servers as a list');
 $strSetupDonateLink = __('Donate');
 $strSetupDownload = __('Download');
+$strSetupEditInWindow_name = __('Edit in window');
+$strSetupEditInWindow_desc = __('Edit SQL queries in popup window');
 $strSetupEndOfLine = __('End of line');
 $strSetupErrorIconic_name = __('Iconic errors');
 $strSetupErrorIconic_desc = __('Show icons for warning, error and information messages');
@@ -109,7 +114,7 @@ $strSetupForm_Other_core_settings = __('Other core settings');
 $strSetupForm_Query_window_desc = __('Customize query window options');
 $strSetupForm_Query_window = __('Query window');
 $strSetupForm_Page_titles = __('Page titles');
-$strSetupForm_Page_titles_desc = __('Specify windows\' title bar. Refer to [a@Documentation.html#cfg_TitleTable]documentation[/a] for magic strings that can be used to get special values.');
+$strSetupForm_Page_titles_desc = __('Specify browser\'s title bar text. Refer to [a@Documentation.html#cfg_TitleTable]documentation[/a] for magic strings that can be used to get special values.');
 $strSetupForm_Security_desc = __('Please note that phpMyAdmin is just a user interface and its features do not limit MySQL');
 $strSetupForm_Security = __('Security');
 $strSetupForm_Server = __('Basic settings');
@@ -178,6 +183,8 @@ $strSetupLeftPointerEnable_name = __('Enable highlighting');
 $strSetupLetUserChoose = __('let the user choose');
 $strSetupLightTabs_desc = __('Use less graphically intense tabs');
 $strSetupLightTabs_name = __('Light tabs');
+$strSetupLimitChars_name = __('Limit column characters');
+$strSetupLimitChars_desc = __('Maximum number of characters shown in any non-numeric column on browse view');
 $strSetupLoad = __('Load');
 $strSetupLoginCookieDeleteAll_desc = __('If TRUE, logout deletes cookies for all servers; when set to FALSE, logout only occurs for the current server. Setting this to FALSE makes it easy to forget to log out from other servers when connected to multiple servers.');
 $strSetupLoginCookieDeleteAll_name = __('Delete all cookies on logout');
@@ -201,6 +208,8 @@ $strSetupMaxTableList_desc = __('Maximum number of tables displayed in table lis
 $strSetupMaxTableList_name = __('Maximum tables');
 $strSetupMemoryLimit_desc = __('The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] ([kbd]0[/kbd] for no limit)');
 $strSetupMemoryLimit_name = __('Memory limit');
+$strSetupModifyDeleteAtLeft_name = __('Show left delete link');
+$strSetupModifyDeleteAtRight_name = __('Show right delete link');
 $strSetupNaturalOrder_name = __('Natural order');
 $strSetupNaturalOrder_desc = __('Use natural order for sorting table and database names');
 $strSetupNavigationBarIconic_desc = __('Use only icons, only text or both');
@@ -219,12 +228,18 @@ $strSetupPropertiesIconic_desc = __('Use only icons, only text or both');
 $strSetupPropertiesIconic_name = __('Iconic table operations');
 $strSetupProtectBinary_desc = __('Disallow BLOB and BINARY columns from editing');
 $strSetupProtectBinary_name = __('Protect binary columns');
+$strSetupRepeatCells_name = __('Repeat headers');
+$strSetupRepeatCells_desc = __('Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature');
 $strSetupQueryHistoryDB_desc = __('Enable if you want DB-based query history (requires pmadb). If disabled, this utilizes JS-routines to display query history (lost by window close).');
 $strSetupQueryHistoryDB_name = __('Permanent query history');
 $strSetupQueryHistoryMax_desc = __('How many queries are kept in history');
 $strSetupQueryHistoryMax_name = __('Query history length');
 $strSetupQueryWindowDefTab_desc = __('Tab displayed when opening a new query window');
 $strSetupQueryWindowDefTab_name = __('Default query window tab');
+$strSetupQueryWindowHeight_name = __('Query window height');
+$strSetupQueryWindowHeight_desc = __('Query window height (in pixels)');
+$strSetupQueryWindowWidth_name = __('Query window width');
+$strSetupQueryWindowWidth_desc = __('Query window height (in pixels)');
 $strSetupRecodingEngine_desc = __('Select which functions will be used for character set conversion');
 $strSetupRecodingEngine_name = __('Recoding engine');
 $strSetupReplaceHelpImg_name = __('Show help button');
@@ -328,6 +343,8 @@ $strSetupShowAll_name = __('Allow to display all the rows');
 $strSetupShowChgPassword_desc = __('Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly');
 $strSetupShowChgPassword_name = __('Show password change form');
 $strSetupShowCreateDb_name = __('Show create database form');
+$strSetupShowFieldTypesInDataEditView_name = __('Show field types');
+$strSetupShowFieldTypesInDataEditView_desc = __('Defines whether or not type fields should be initially displayed in edit/insert mode');
 $strSetupShowForm = __('Show form');
 $strSetupShowFunctionFields_desc = __('Display the function fields in edit/insert mode');
 $strSetupShowFunctionFields_name = __('Show function fields');
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index dd0b8ffc7..e9c93b3cd 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -16,30 +16,30 @@ $forms['Features']['Text_fields'] = array(
     'CharEditing',
     'CharTextareaCols',
     'CharTextareaRows',
-    'TextareaCols',// [s-]
-    'TextareaRows',// [s-]
-    'LongtextDoubleTextarea');// [s-]
+    'TextareaCols',
+    'TextareaRows',
+    'LongtextDoubleTextarea');
 $forms['Sql_queries']['Sql_queries'] = array(
     'ShowSQL',
     'Confirm',
     'IgnoreMultiSubmitErrors',
     'VerboseMultiSubmit',
-    'MaxCharactersInDisplayedSQL',// [s-]
-    'EditInWindow',// [s-]
-    'QueryWindowWidth',// [s-]
-    'QueryWindowHeight',// [s-]
-    'QueryWindowDefTab');// [s-]
+    'MaxCharactersInDisplayedSQL',
+    'EditInWindow',
+    'QueryWindowWidth',
+    'QueryWindowHeight',
+    'QueryWindowDefTab');
 $forms['Sql_queries']['Sql_box'] = array(
-    'SQLQuery/Edit',// [s-]
-    'SQLQuery/Explain',// [s-]
-    'SQLQuery/ShowAsPHP',// [s-]
+    'SQLQuery/Edit',
+    'SQLQuery/Explain',
+    'SQLQuery/ShowAsPHP',
     'SQLQuery/Validate',// [false or no override]
-    'SQLQuery/Refresh');// [s-]
+    'SQLQuery/Refresh');
 $forms['Features']['Page_titles'] = array(
-    'TitleDefault',// [s-]
-    'TitleTable',// [s-]
-    'TitleDatabase',// [s-]
-    'TitleServer');// [s-]
+    'TitleDefault',
+    'TitleTable',
+    'TitleDatabase',
+    'TitleServer');
 $forms['Left_frame']['Left_frame'] = array(
     'LeftFrameLight',
     'LeftDisplayLogo',
@@ -72,20 +72,20 @@ $forms['Main_frame']['Browse'] = array(
     'DisplayBinaryAsHex',
     'BrowsePointerEnable',
     'BrowseMarkerEnable',
-    'RepeatCells',// [s-]
-    'LimitChars',// [s-]
-    'ModifyDeleteAtLeft',// [s-]
-    'ModifyDeleteAtRight',// [s-]
-    'DefaultDisplay');// [s-]
+    'RepeatCells',
+    'LimitChars',
+    'ModifyDeleteAtLeft',
+    'ModifyDeleteAtRight',
+    'DefaultDisplay');
 $forms['Main_frame']['Edit'] = array(
     'ProtectBinary',
     'ShowFunctionFields',
-    'ShowFieldTypesInDataEditView',// [s-]
+    'ShowFieldTypesInDataEditView',
     'InsertRows',
     'ForeignKeyDropdownOrder',// [s, ? custom text value]
     'ForeignKeyMaxLimit',
     'CtrlArrowsMoving',
-    'DefaultPropDisplay');// [s-]
+    'DefaultPropDisplay');
 $forms['Main_frame']['Tabs'] = array(
     'LightTabs',
     'PropertiesIconic',
diff --git a/setup/styles.css b/setup/styles.css
index 48d7ec4d0..63fc47884 100644
--- a/setup/styles.css
+++ b/setup/styles.css
@@ -270,7 +270,7 @@ fieldset th small {
     color: #666;
 }
 
-fieldset th, fieldset td {
+fieldset th, fieldset td, .form .lastrow {
     border-top: 1px #555 dotted;
 }
 
@@ -280,10 +280,6 @@ fieldset .lastrow, .form .lastrow {
     text-align: center;
 }
 
-.form .lastrow {
-    border-top: 1px #555 dotted;
-}
-
 fieldset .lastrow input, .form .lastrow input {
     font-weight: bold;
 }
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 86d6e7422..69df8b387 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1228,14 +1228,14 @@ table#serverconnection_trg_local  {
   float:left;
 }
 /**
-  *  Validation error message styles
+  *  Validation error message styles<style>/*
   */
 .invalid_value
 {background:#F00;}
 
 /* config forms */
 .config-form ul.tabs {
-    margin:      1em 0.2em 0;
+    margin:      1.1em 0.2em 0;
     padding:     0 0 0.3em 0;
     list-style:  none;
     font-weight: bold;
@@ -1270,7 +1270,7 @@ table#serverconnection_trg_local  {
     margin-top:   0;
     padding:      0;
     clear:        both;
-    border-color: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+    /*border-color: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;*/
 }
 
 .config-form legend {
@@ -1286,7 +1286,7 @@ table#serverconnection_trg_local  {
     margin:       0 -2px 1em -2px;
     padding:      0.5em 1.5em;
     background:   #FBEAD9;
-    border: 1px   #C83838 solid;
+    border:       0 #C83838 solid;
     border-width: 1px 0;
     list-style:   none;
     font-family:  sans-serif;
@@ -1327,8 +1327,12 @@ table#serverconnection_trg_local  {
     color:       #444;
 }
 
-.config-form fieldset th, fieldset td {
-    border-top: 1px #666 dotted;
+.config-form fieldset th, .config-form fieldset td {
+    border-top: 1px <?php echo $GLOBALS['cfg']['BgTwo']; ?> solid;
+}
+
+.config-form .lastrow {
+    border-top: 1px #000 solid;
 }
 
 .config-form .lastrow {
@@ -1337,10 +1341,6 @@ table#serverconnection_trg_local  {
     text-align: center;
 }
 
-.config-form .form .lastrow {
-    border-top: 1px #555 dotted;
-}
-
 .config-form .lastrow input {
     font-weight: bold;
 }

From 02bb83cad3121b9ce9f9e66f3b11e9e3ca950e4a Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Wed, 16 Jun 2010 23:54:57 +0200
Subject: [PATCH 015/106] add new settings to setup script

---
 setup/frames/form.inc.php |  3 ++-
 setup/lib/forms.inc.php   | 28 ++++++++++++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php
index cc36aa6b7..5ede9d483 100644
--- a/setup/frames/form.inc.php
+++ b/setup/frames/form.inc.php
@@ -22,7 +22,8 @@ require './setup/lib/forms.inc.php';
 
 $formsets = array(
     'features' => array(
-        'forms' => array('Import_export', 'Security', 'Sql_queries', 'Other_core_settings')),
+        '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(
diff --git a/setup/lib/forms.inc.php b/setup/lib/forms.inc.php
index 6eb0e7193..015892fc4 100644
--- a/setup/lib/forms.inc.php
+++ b/setup/lib/forms.inc.php
@@ -99,7 +99,17 @@ $forms['Sql_queries'] = array(
     'QueryHistoryDB',
     'QueryHistoryMax',
     'IgnoreMultiSubmitErrors',
-    'VerboseMultiSubmit');
+    'VerboseMultiSubmit',
+    'MaxCharactersInDisplayedSQL',
+    'EditInWindow',
+    'QueryWindowWidth',
+    'QueryWindowHeight',
+    'QueryWindowDefTab');
+$forms['Page_titles'] = array(
+    'TitleDefault',
+    'TitleTable',
+    'TitleDatabase',
+    'TitleServer');
 $forms['Other_core_settings'] = array(
     'MaxDbList',
     'MaxTableList',
@@ -144,16 +154,26 @@ $forms['Browse'] = array(
     'MaxRows',
     'Order',
     'BrowsePointerEnable',
-    'BrowseMarkerEnable');
+    'BrowseMarkerEnable',
+    'RepeatCells',
+    'LimitChars',
+    'ModifyDeleteAtLeft',
+    'ModifyDeleteAtRight',
+    'DefaultDisplay');
 $forms['Edit'] = array(
     'ProtectBinary',
     'ShowFunctionFields',
+    'ShowFieldTypesInDataEditView',
     'CharEditing',
     'CharTextareaCols',
     'CharTextareaRows',
+    'TextareaCols',
+    'TextareaRows',
+    'LongtextDoubleTextarea',
     'InsertRows',
     'ForeignKeyDropdownOrder',
-    'ForeignKeyMaxLimit');
+    'ForeignKeyMaxLimit',
+    'DefaultPropDisplay');
 $forms['Tabs'] = array(
     'LightTabs',
     'PropertiesIconic',
@@ -182,4 +202,4 @@ $forms['Export_defaults'] = array('Export' => array(
     'file_template_table',
     'file_template_database',
     'file_template_server'));
-?>
+?>
\ No newline at end of file

From b2e232b582c4245da4ac76b9b4cd853a8b899500 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 18 Jun 2010 17:53:53 +0200
Subject: [PATCH 016/106] Added pmadb table for preferences storage Removed
 some messages from messages.inc.php

---
 libraries/config.default.php         |   9 ++
 libraries/config/FormDisplay.tpl.php |   2 +-
 libraries/config/messages.inc.php    |  37 +------
 phpmyadmin.css.php                   |   6 +-
 scripts/create_tables.sql            |  15 +++
 setup/frames/index.inc.php           |  11 ++-
 setup/lib/forms.inc.php              |   5 +-
 setup/lib/index.lib.php              | 139 ++++++++++++++++-----------
 8 files changed, 123 insertions(+), 101 deletions(-)

diff --git a/libraries/config.default.php b/libraries/config.default.php
index 6bc339557..08b4e56d2 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -347,6 +347,15 @@ $cfg['Servers'][$i]['designer_coords'] = '';
  */
 $cfg['Servers'][$i]['tracking'] = '';
 
+/**
+ * table to store user preferences
+ *   - leave blank to disable server storage
+ *     SUGGESTED: 'pma_userconfig'
+ *
+ * @global string $cfg['Servers'][$i]['userconfig']
+ */
+$cfg['Servers'][$i]['userconfig'] = '';
+
 /**
  * set to false if you know that your pma_* tables are up to date.
  * This prevents compatibility checks and thereby increases performance.
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 907c46189..e22d3a9b5 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -152,7 +152,7 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
             foreach ($opts['values'] as $opt_value => $opt_name) {
                 // set names for boolean values
                 if (is_bool($opt_name)) {
-                    $opt_name = $GLOBALS['strSetup' . ($opt_value ? 'True' : 'False')];
+                    $opt_name = $GLOBALS['strSetup' . ($opt_value ? __('Yes') : __('No'))];
                 }
                 // cast boolean values to integers
                 $display_value = is_bool($opt_value) ? (int) $opt_value : $opt_value;
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 380735447..fe9de51cd 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -15,7 +15,6 @@ if (!function_exists('__')) {
 
 $strSetupAllowAnywhereRecoding_name = __('Allow character set conversion');
 $strSetupAllowArbitraryServer_desc = __('If enabled user can enter any MySQL server in login form for cookie auth');
-$strSetupAllowArbitraryServerMsg = __('This [a@?page=form&amp;formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&amp;formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
 $strSetupAllowArbitraryServer_name = __('Allow login to any MySQL server');
 $strSetupAllowUserDropDatabase_name = __('Show &quot;Drop database&quot; link to normal users');
 $strSetupblowfish_secret_desc = __('Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] authentication');
@@ -26,8 +25,6 @@ $strSetupBrowsePointerEnable_desc = __('Highlight row pointed by the mouse curso
 $strSetupBrowsePointerEnable_name = __('Highlight pointer');
 $strSetupBZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for import and export operations');
 $strSetupBZipDump_name = __('Bzip2');
-$strSetupCannotLoadConfig = __('Cannot load or save configuration');
-$strSetupCannotLoadConfigMsg = __('Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.');
 $strSetupCharEditing_desc = __('Defines which type of editing controls should be used for CHAR and VARCHAR columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in columns');
 $strSetupCharEditing_name = __('CHAR columns editing');
 $strSetupCharTextareaCols_desc = __('Number of columns for CHAR/VARCHAR textareas');
@@ -54,7 +51,6 @@ $strSetupDefaultTabServer_desc = __('Tab that is displayed when entering a serve
 $strSetupDefaultTabServer_name = __('Default server tab');
 $strSetupDefaultTabTable_desc = __('Tab that is displayed when entering a table');
 $strSetupDefaultTabTable_name = __('Default table tab');
-$strSetupDirectoryNotice = __('This value should be double checked to ensure that this directory is neither world accessible nor readable or writable by other users on your server.');
 $strSetupDisplayBinaryAsHex_name = __('Show binary contents as HEX');
 $strSetupDisplayBinaryAsHex_desc = __('Show binary contents as HEX by default');
 $strSetupDisplayDatabasesList_desc = __('Show database listing as a list instead of a drop down');
@@ -81,9 +77,7 @@ $strSetupExport_format_name = __('Format');
 $strSetupExport_onserver_name = __('Save on server');
 $strSetupExport_onserver_overwrite_name = __('Overwrite existing file(s)');
 $strSetupExport_remember_file_template_name = __('Remember file name template');
-$strSetupFalse = __('no');
 $strSetupForceSSL_desc = __('Force secured connection while using phpMyAdmin');
-$strSetupForceSSLMsg = __('This [a@?page=form&amp;formset=features#tab_Security]option[/a] should be enabled if your web server supports it');
 $strSetupForceSSL_name = __('Force SSL connection');
 $strSetupForeignKeyDropdownOrder_desc = __('Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is the referenced data, [kbd]id[/kbd] is the key value');
 $strSetupForeignKeyDropdownOrder_name = __('Foreign key dropdown order');
@@ -143,8 +137,6 @@ $strSetupForm_Tabs_desc = __('Choose how you want tabs to work');
 $strSetupForm_Tabs = __('Tabs');
 $strSetupGZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import and export operations');
 $strSetupGZipDump_name = __('GZip');
-$strSetupGZipDumpWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.');
-$strSetupHomepageLink = __('phpMyAdmin homepage');
 $strSetupIconvExtraParams_name = __('Extra parameters for iconv');
 $strSetupIgnoreErrors = __('Ignore errors');
 $strSetupIgnoreMultiSubmitErrors_desc = __('If enabled, phpMyAdmin continues computing multiple-statement queries even if one of the queries failed');
@@ -156,9 +148,6 @@ $strSetupImport_format_name = __('Format of imported file');
 $strSetupImport_skip_queries_desc = __('Number of queries to skip from start');
 $strSetupImport_skip_queries_name = __('Partial import: skip queries');
 $strSetupInitialSlidersState_name = __('Initial state for sliders');
-$strSetupInsecureConnection = __('Insecure connection');
-$strSetupInsecureConnectionMsg1 = __('You are not using a secure connection; all data (including potentially sensitive information, like passwords) is transferred unencrypted!');
-$strSetupInsecureConnectionMsg2 = __('If your server is also configured to accept HTTPS requests follow [a@%s]this link[/a] to use a secure connection.');
 $strSetupInsertRows_desc = __('How many rows can be inserted at one time');
 $strSetupInsertRows_name = __('Number of inserted rows');
 $strSetupLeftDefaultTabTable_name = __('Target for quick access icon');
@@ -185,7 +174,6 @@ $strSetupLightTabs_desc = __('Use less graphically intense tabs');
 $strSetupLightTabs_name = __('Light tabs');
 $strSetupLimitChars_name = __('Limit column characters');
 $strSetupLimitChars_desc = __('Maximum number of characters shown in any non-numeric column on browse view');
-$strSetupLoad = __('Load');
 $strSetupLoginCookieDeleteAll_desc = __('If TRUE, logout deletes cookies for all servers; when set to FALSE, logout only occurs for the current server. Setting this to FALSE makes it easy to forget to log out from other servers when connected to multiple servers.');
 $strSetupLoginCookieDeleteAll_name = __('Delete all cookies on logout');
 $strSetupLoginCookieRecall_desc = __('Define whether the previous login should be recalled or not in cookie authentication mode');
@@ -193,7 +181,6 @@ $strSetupLoginCookieRecall_name = __('Recall user name');
 $strSetupLoginCookieStore_desc = __('Defines how long (in seconds) a login cookie should be stored in browser. The default of 0 means that it will be kept for the existing session only, and will be deleted as soon as you close the browser window. This is recommended for non-trusted environments.');
 $strSetupLoginCookieStore_name = __('Login cookie store');
 $strSetupLoginCookieValidity_desc = __('Define how long (in seconds) a login cookie is valid');
-$strSetupLoginCookieValidityMsg = __('[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.');
 $strSetupLoginCookieValidity_name = __('Login cookie validity');
 $strSetupLongtextDoubleTextarea_name = __('Bigger textarea for LONGTEXT');
 $strSetupLongtextDoubleTextarea_desc = __('Double size of textarea for LONGTEXT fields');
@@ -214,14 +201,11 @@ $strSetupNaturalOrder_name = __('Natural order');
 $strSetupNaturalOrder_desc = __('Use natural order for sorting table and database names');
 $strSetupNavigationBarIconic_desc = __('Use only icons, only text or both');
 $strSetupNavigationBarIconic_name = __('Iconic navigation bar');
-$strSetupNewServer = __('New server');
-$strSetupNoServers = __('There are no configured servers');
 $strSetupOBGzip_desc = __('use GZip output buffering for increased speed in HTTP transfers');
 $strSetupOBGzip_name = __('GZip output buffering');
 $strSetupOptionNone = __('- none -');
 $strSetupOrder_desc = __('[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, DATETIME and TIMESTAMP, ascending order otherwise');
 $strSetupOrder_name = __('Default sorting order');
-$strSetupOverview = __('Overview');
 $strSetupPersistentConnections_desc = __('Use persistent connections to MySQL databases');
 $strSetupPersistentConnections_name = __('Persistent connections');
 $strSetupPropertiesIconic_desc = __('Use only icons, only text or both');
@@ -248,10 +232,6 @@ $strSetupRestoreDefaultValue = __('Restore default value');
 $strSetupRevertErroneousFields = __('Try to revert erroneous fields to their default values');
 $strSetupSaveDir_desc = __('Directory where exports can be saved on server');
 $strSetupSaveDir_name = __('Save directory');
-$strSetupServerAuthConfigMsg = __('You set the [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set [a@?page=servers&amp;mode=edit&amp;id=%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/kbd].');
-$strSetupServerExtensionMsg = __('You should use mysqli for performance reasons');
-$strSetupServerNoPasswordMsg = __('You allow for connecting to the server without a password.');
-$strSetupServersAdd = __('Add a new server');
 $strSetupServers_AllowDeny_order_desc = __('Leave blank if not used');
 $strSetupServers_AllowDeny_order_name = __('Host authentication order');
 $strSetupServers_AllowDeny_rules_desc = __('Leave blank for defaults');
@@ -281,7 +261,6 @@ $strSetupServers_designer_coords_desc = __('Leave blank for no Designer support,
 $strSetupServers_designer_coords_name = __('Designer table');
 $strSetupServers_DisableIS_desc = __('More information on [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]');
 $strSetupServers_DisableIS_name = __('Disable use of INFORMATION_SCHEMA');
-$strSetupServerSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - [a@?page=servers&amp;mode=edit&amp;id=%1$d#tab_Server_config]host authentication[/a] settings and [a@?page=form&amp;formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
 $strSetupServers_extension_desc = __('What PHP extension to use; you should use mysqli if supported');
 $strSetupServers_extension_name = __('PHP extension to use');
 $strSetupServers_hide_db_desc = __('Hide databases matching regular expression (PCRE)');
@@ -322,7 +301,6 @@ $strSetupServers_tracking_add_drop_table_desc = __('Whether a DROP TABLE IF EXIS
 $strSetupServers_tracking_add_drop_table_name = __('Add DROP TABLE');
 $strSetupServers_tracking_add_drop_database_desc = __('Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database.');
 $strSetupServers_tracking_add_drop_database_name = __('Add DROP DATABASE');
-$strSetupServerSslMsg = __('You should use SSL connections if your web server supports it');
 $strSetupServers_socket_desc = __('Socket on which MySQL server is listening, leave empty for default');
 $strSetupServers_socket_name = __('Server socket');
 $strSetupServers_ssl_desc = __('Enable SSL for connection to MySQL server');
@@ -333,11 +311,12 @@ $strSetupServers_table_info_desc = __('Table to describe the display columns, le
 $strSetupServers_table_info_name = __('Display columns table');
 $strSetupServers_user_desc = __('Leave empty if not using config auth');
 $strSetupServers_user_name = __('User for config auth');
+$strSetupServers_userconfig_name = __('User preferences storage table');
+$strSetupServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_config[/kbd]');
 $strSetupServers_verbose_check_desc = __('Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance');
 $strSetupServers_verbose_check_name = __('Verbose check');
 $strSetupServers_verbose_desc = __('A user-friendly description of this server. Leave blank to display the hostname instead.');
 $strSetupServers_verbose_name = __('Verbose name of this server');
-$strSetupSetValue = __('Set value: %s');
 $strSetupShowAll_desc = __('Whether a user should be displayed a &quot;show all (rows)&quot; button');
 $strSetupShowAll_name = __('Allow to display all the rows');
 $strSetupShowChgPassword_desc = __('Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly');
@@ -381,7 +360,6 @@ $strSetupTitleDatabase_name = __('Database');
 $strSetupTitleDatabase_desc = __('Title of browser window when a database is selected');
 $strSetupTitleServer_name = __('Server');
 $strSetupTitleServer_desc = __('Title of browser window when a server is selected');
-$strSetupTrue = __('yes');
 $strSetupTrustedProxies_desc = __('Input proxies as [kbd]IP: trusted HTTP header[/kbd]. The following example specifies that phpMyAdmin should trust a HTTP_X_FORWARDED_FOR (X-Forwarded-For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: HTTP_X_FORWARDED_FOR[/kbd]');
 $strSetupTrustedProxies_name = __('List of trusted proxies for IP allow/deny');
 $strSetupUploadDir_desc = __('Directory on server where you can upload files for import');
@@ -390,19 +368,8 @@ $strSetupUseDbSearch_desc = __('Allow for searching inside the entire database')
 $strSetupUseDbSearch_name = __('Use database search');
 $strSetupVerboseMultiSubmit_desc = __('Show affected rows of each statement on multiple-statement queries. See libraries/import.lib.php for defaults on how many queries a statement may contain.');
 $strSetupVerboseMultiSubmit_name = __('Verbose multiple statements');
-$strSetupVersionCheckDataError = __('Reading of version failed. Maybe you\'re offline or the upgrade server does not respond.');
-$strSetupVersionCheckInvalid = __('Got invalid version string from server');
 $strSetupVersionCheckLink = __('Check for latest version');
-$strSetupVersionCheckNewAvailable = __('A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.');
-$strSetupVersionCheckNewAvailableSvn = __('You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable version is %s, released on %s.');
-$strSetupVersionCheckNone = __('No newer stable version is available');
-$strSetupVersionCheckUnparsable = __('Unparsable version string');
-$strSetupVersionCheck = __('Version check');
-$strSetupVersionCheckWrapperError = __('Neither URL wrapper nor CURL is available. Version check is not possible.');
-$strSetupWarning = __('Warning');
 $strSetupZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression for import and export operations');
-$strSetupZipDumpExportWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]Zip compression[/a] requires functions (%s) which are unavailable on this system.');
-$strSetupZipDumpImportWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]Zip decompression[/a] requires functions (%s) which are unavailable on this system.');
 $strSetupZipDump_name = __('ZIP');
 
 ?>
\ No newline at end of file
diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php
index c6408de4e..8f5f32d37 100644
--- a/phpmyadmin.css.php
+++ b/phpmyadmin.css.php
@@ -36,7 +36,11 @@ header('Content-Type: text/css; charset=UTF-8');
 
 // Cache output in client - the nocache query parameter makes sure that this
 // file is reloaded when config changes
+// todo: restore header
 //header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
+//header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21
+//header('Last-Modified: ' . $GLOBALS['now']);
+header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
 
 $_SESSION['PMA_Theme_Manager']->printCss(PMA_FRAME);
-?>
+?>
\ No newline at end of file
diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql
index bcb8b357c..1ad42f0f6 100644
--- a/scripts/create_tables.sql
+++ b/scripts/create_tables.sql
@@ -192,3 +192,18 @@ CREATE TABLE IF NOT EXISTS `pma_tracking` (
   `tracking_active` int(1) unsigned NOT NULL default '1',
   PRIMARY KEY  (`db_name`,`table_name`,`version`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=COMPACT;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `pma_userconfig`
+--
+
+CREATE TABLE IF NOT EXISTS `pma_userconfig` (
+  `username` varchar(64) NOT NULL,
+  `timevalue` timestamp NOT NULL,
+  `config_data` text NOT NULL,
+  PRIMARY KEY  (`username`)
+)
+  ENGINE=MyISAM COMMENT='User preferences storage for phpMyAdmin'
+  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 0bab3d632..970114483 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -48,7 +48,8 @@ $config_writable = false;
 $config_exists = false;
 check_config_rw($config_readable, $config_writable, $config_exists);
 if (!$config_writable || !$config_readable) {
-    messages_set('error', 'config_rw', 'CannotLoadConfig', PMA_lang('CannotLoadConfigMsg'));
+    messages_set('error', 'config_rw', __('Cannot load or save configuration'),
+        PMA_lang(__('Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.')));
 }
 //
 // Check https connection
@@ -56,11 +57,13 @@ if (!$config_writable || !$config_readable) {
 $is_https = !empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on';
 if (!$is_https) {
     $text = __('You are not using a secure connection; all data (including potentially sensitive information, like passwords) is transferred unencrypted!');
+
     if (!empty($_SERVER['REQUEST_URI']) && !empty($_SERVER['HTTP_HOST'])) {
-        $text .= ' ' . PMA_lang('InsecureConnectionMsg2',
+        $strInsecureConnectionMsg2 = __('If your server is also configured to accept HTTPS requests follow [a@%s]this link[/a] to use a secure connection.');
+        $text .= ' ' . PMA_lang($strInsecureConnectionMsg2,
             'https://' . htmlspecialchars($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']));
     }
-    messages_set('warning', 'no_https', 'InsecureConnection', $text);
+    messages_set('warning', 'no_https', __('Insecure connection'), $text);
 }
 ?>
 
@@ -110,7 +113,7 @@ display_form_top('index.php', 'get', array(
 <tr>
     <th>#</th>
     <th><?php echo __('Name') ?></th>
-    <th>Authentication type</th>
+    <th><?php echo __('Authentication type') ?></th>
     <th colspan="2">DSN</th>
 </tr>
 <?php foreach ($_SESSION['ConfigFile']['Servers'] as $id => $server): ?>
diff --git a/setup/lib/forms.inc.php b/setup/lib/forms.inc.php
index 015892fc4..795ca91f1 100644
--- a/setup/lib/forms.inc.php
+++ b/setup/lib/forms.inc.php
@@ -57,12 +57,13 @@ $forms['Server_pmadb'] = array('Servers' => array(1 => array(
     'verbose_check',
     'bookmarktable' => 'pma_bookmark',
     'relation' => 'pma_relation',
+    'userconfig' => 'pma_userconfig',
     'table_info' => 'pma_table_info',
-    'table_coords' => 'pma_table_coords',
-    'pdf_pages' => 'pma_pdf_pages',
     'column_info' => 'pma_column_info',
     'history' => 'pma_history',
     'tracking' => 'pma_tracking',
+    'table_coords' => 'pma_table_coords',
+    'pdf_pages' => 'pma_pdf_pages',
     'designer_coords' => 'pma_designer_coords')));
 $forms['Server_tracking'] = array('Servers' => array(1 => array(
     'tracking_version_auto_create',
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index ce0b99e81..2e96dc5b3 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -49,7 +49,6 @@ function messages_begin()
 function messages_set($type, $id, $title, $message)
 {
     $fresh = !isset($_SESSION['messages'][$type][$id]);
-    $title = PMA_lang($title);
     $_SESSION['messages'][$type][$id] = array(
         'fresh' => $fresh,
         'active' => true,
@@ -123,15 +122,15 @@ function PMA_version_check()
             $data = curl_exec($ch);
             curl_close($ch);
         } else {
-            messages_set('error', $message_id, 'VersionCheck',
-                PMA_lang('VersionCheckWrapperError'));
+            messages_set('error', $message_id, __('Version check'),
+                __('Neither URL wrapper nor CURL is available. Version check is not possible.'));
             return;
         }
     }
 
     if (empty($data)) {
-        messages_set('error', $message_id, 'VersionCheck',
-            PMA_lang('VersionCheckDataError'));
+        messages_set('error', $message_id, __('Version check'),
+            __('Reading of version failed. Maybe you\'re offline or the upgrade server does not respond.'));
         return;
     }
 
@@ -147,30 +146,30 @@ function PMA_version_check()
 
     $version_upstream = version_to_int($version);
     if ($version_upstream === false) {
-        messages_set('error', $message_id, 'VersionCheck',
-            PMA_lang('VersionCheckInvalid'));
+        messages_set('error', $message_id, __('Version check'),
+            __('Got invalid version string from server'));
         return;
     }
 
     $version_local = version_to_int($GLOBALS['PMA_Config']->get('PMA_VERSION'));
     if ($version_local === false) {
-        messages_set('error', $message_id, 'VersionCheck',
-            PMA_lang('VersionCheckUnparsable'));
+        messages_set('error', $message_id, __('Version check'),
+            __('Unparsable version string'));
         return;
     }
 
     if ($version_upstream > $version_local) {
         $version = htmlspecialchars($version);
         $date = htmlspecialchars($date);
-        messages_set('notice', $message_id, 'VersionCheck',
-            PMA_lang('VersionCheckNewAvailable', $version, $date));
+        messages_set('notice', $message_id, __('Version check'),
+            sprintf(__('A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.'), $version, $date));
     } else {
         if ($version_local % 100 == 0) {
-            messages_set('notice', $message_id, 'VersionCheck',
-                PMA_lang('VersionCheckNewAvailableSvn', $version, $date));
+            messages_set('notice', $message_id, __('Version check'),
+                PMA_sanitize(sprintf(__('You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable version is %s, released on %s.'), $version, $date)));
         } else {
-            messages_set('notice', $message_id, 'VersionCheck',
-                PMA_lang('VersionCheckNone'));
+            messages_set('notice', $message_id, __('Version check'),
+                __('No newer stable version is available'));
         }
     }
 }
@@ -205,7 +204,7 @@ function version_to_int($version)
                 $added = 0;
                 break;
             default:
-                messages_set('notice', 'version_match', 'VersionCheck',
+                messages_set('notice', 'version_match', __('Version check'),
                     'Unknown version part: ' . htmlspecialchars($matches[6]));
                 $added = 0;
                 break;
@@ -254,6 +253,19 @@ function perform_config_checks()
     $blowfish_secret = $cf->get('blowfish_secret');
     $blowfish_secret_set = false;
     $cookie_auth_used = false;
+
+    $strAllowArbitraryServerWarning = __('This [a@?page=form&amp;formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&amp;formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
+    $strBlowfishSecretMsg = __('You didn\'t have blowfish secret set and have enabled cookie authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.');
+    $strBZipDumpWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.');
+    $strDirectoryNotice = __('This value should be double checked to ensure that this directory is neither world accessible nor readable or writable by other users on your server.');
+    $strForceSSLNotice = __('This [a@?page=form&amp;formset=features#tab_Security]option[/a] should be enabled if your web server supports it');
+    $strGZipDumpWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.');
+    $strLoginCookieValidityWarning = __('[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.');
+    $strSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - [a@?page=servers&amp;mode=edit&amp;id=%1$d#tab_Server_config]host authentication[/a] settings and [a@?page=form&amp;formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
+    $strServerAuthConfigMsg = __('You set the [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set [a@?page=servers&amp;mode=edit&amp;id=%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/kbd].');
+    $strZipDumpExportWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]Zip compression[/a] requires functions (%s) which are unavailable on this system.');
+    $strZipDumpImportWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]Zip decompression[/a] requires functions (%s) which are unavailable on this system.');
+
     for ($i = 1, $server_cnt = $cf->getServerCount(); $i <= $server_cnt; $i++) {
         $cookie_auth_server = ($cf->getValue("Servers/$i/auth_type") == 'cookie');
         $cookie_auth_used |= $cookie_auth_server;
@@ -273,9 +285,9 @@ function perform_config_checks()
         // should be enabled if possible
         //
         if (!$cf->getValue("Servers/$i/ssl")) {
-            $title = PMA_lang_name('Servers/1/ssl') . " ($server_name)";
+            $title = PMA_lang(PMA_lang_name('Servers/1/ssl')) . " ($server_name)";
             messages_set('notice', "Servers/$i/ssl", $title,
-                PMA_lang('ServerSslMsg'));
+                __('You should use SSL connections if your web server supports it'));
         }
 
         //
@@ -283,9 +295,9 @@ function perform_config_checks()
         // warn about using 'mysql'
         //
         if ($cf->getValue("Servers/$i/extension") == 'mysql') {
-            $title = PMA_lang_name('Servers/1/extension') . " ($server_name)";
+            $title = PMA_lang(PMA_lang_name('Servers/1/extension')) . " ($server_name)";
             messages_set('notice', "Servers/$i/extension", $title,
-                PMA_lang('ServerExtensionMsg'));
+                __('You should use mysqli for performance reasons'));
         }
 
         //
@@ -293,12 +305,12 @@ function perform_config_checks()
         // warn about full user credentials if 'auth_type' is 'config'
         //
         if ($cf->getValue("Servers/$i/auth_type") == 'config'
-            && $cf->getValue("Servers/$i/user") != ''
-            && $cf->getValue("Servers/$i/password") != '') {
-            $title = PMA_lang_name('Servers/1/auth_type') . " ($server_name)";
+                && $cf->getValue("Servers/$i/user") != ''
+                && $cf->getValue("Servers/$i/password") != '') {
+            $title = PMA_lang(PMA_lang_name('Servers/1/auth_type')) . " ($server_name)";
             messages_set('warning', "Servers/$i/auth_type", $title,
-                PMA_lang('ServerAuthConfigMsg', $i) . ' ' .
-                PMA_lang('ServerSecurityInfoMsg', $i));
+                    PMA_lang($strServerAuthConfigMsg, $i) . ' ' .
+                            PMA_lang($strSecurityInfoMsg, $i));
         }
 
         //
@@ -307,11 +319,11 @@ function perform_config_checks()
         // serious security flaw
         //
         if ($cf->getValue("Servers/$i/AllowRoot")
-            && $cf->getValue("Servers/$i/AllowNoPassword")) {
-            $title = PMA_lang_name('Servers/1/AllowNoPassword') . " ($server_name)";
+                && $cf->getValue("Servers/$i/AllowNoPassword")) {
+            $title = PMA_lang(PMA_lang_name('Servers/1/AllowNoPassword')) . " ($server_name)";
             messages_set('warning', "Servers/$i/AllowNoPassword", $title,
-                PMA_lang('ServerNoPasswordMsg') . ' ' .
-                PMA_lang('ServerSecurityInfoMsg', $i));
+                    __('You allow for connecting to the server without a password.') . ' ' .
+                            PMA_lang($strSecurityInfoMsg, $i));
         }
     }
 
@@ -322,8 +334,9 @@ function perform_config_checks()
     if ($cookie_auth_used) {
         if ($blowfish_secret_set) {
             // 'cookie' auth used, blowfish_secret was generated
-            messages_set('notice', 'blowfish_secret_created', 'blowfish_secret_name',
-                 __('You didn\'t have blowfish secret set and have enabled cookie authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.'));
+            messages_set('notice', 'blowfish_secret_created',
+                PMA_lang(PMA_lang_name('blowfish_secret')),
+                $strBlowfishSecretMsg);
         } else {
             $blowfish_warnings = array();
             // check length
@@ -336,11 +349,12 @@ function perform_config_checks()
             $has_chars = (bool) preg_match('/\S/', $blowfish_secret);
             $has_nonword = (bool) preg_match('/\W/', $blowfish_secret);
             if (!$has_digits || !$has_chars || !$has_nonword) {
-                $blowfish_warnings[] = PMA_sanitize(__('Key should contain letters, numbers [em]and[/em] special characters'));
+                $blowfish_warnings[] = PMA_lang(__('Key should contain letters, numbers [em]and[/em] special characters'));
             }
             if (!empty($blowfish_warnings)) {
                 messages_set('warning', 'blowfish_warnings' . count($blowfish_warnings),
-                    'blowfish_secret_name', implode("<br />", $blowfish_warnings));
+                    PMA_lang(PMA_lang_name('blowfish_secret')),
+                    implode("<br />", $blowfish_warnings));
             }
         }
     }
@@ -350,8 +364,9 @@ function perform_config_checks()
     // should be enabled if possible
     //
     if (!$cf->getValue('ForceSSL')) {
-        messages_set('notice', 'ForceSSL', 'ForceSSL_name',
-            PMA_lang('ForceSSLMsg'));
+        messages_set('notice', 'ForceSSL',
+            PMA_lang(PMA_lang_name('ForceSSL')),
+            PMA_lang($strForceSSLNotice));
     }
 
     //
@@ -359,8 +374,9 @@ function perform_config_checks()
     // should be disabled
     //
     if ($cf->getValue('AllowArbitraryServer')) {
-        messages_set('warning', 'AllowArbitraryServer', 'AllowArbitraryServer_name',
-            PMA_lang('AllowArbitraryServerMsg'));
+        messages_set('warning', 'AllowArbitraryServer',
+            PMA_lang(PMA_lang_name('AllowArbitraryServer')),
+            PMA_lang($strAllowArbitraryServerWarning));
     }
 
     //
@@ -368,8 +384,9 @@ function perform_config_checks()
     // should be at most 1800 (30 min)
     //
     if ($cf->getValue('LoginCookieValidity') > 1800) {
-        messages_set('warning', 'LoginCookieValidity', 'LoginCookieValidity_name',
-            PMA_lang('LoginCookieValidityMsg'));
+        messages_set('warning', 'LoginCookieValidity',
+            PMA_lang(PMA_lang_name('LoginCookieValidity')),
+            PMA_lang($strLoginCookieValidityWarning));
     }
 
     //
@@ -377,8 +394,9 @@ function perform_config_checks()
     // should not be world-accessible
     //
     if ($cf->getValue('SaveDir') != '') {
-        messages_set('notice', 'SaveDir', 'SaveDir_name',
-            PMA_lang('DirectoryNotice'));
+        messages_set('notice', 'SaveDir',
+            PMA_lang(PMA_lang_name('SaveDir')),
+            PMA_lang($strDirectoryNotice));
     }
 
     //
@@ -386,8 +404,9 @@ function perform_config_checks()
     // should not be world-accessible
     //
     if ($cf->getValue('TempDir') != '') {
-        messages_set('notice', 'TempDir', 'TempDir_name',
-            PMA_lang('DirectoryNotice'));
+        messages_set('notice', 'TempDir',
+            PMA_lang(PMA_lang_name('TempDir')),
+            PMA_lang($strDirectoryNotice));
     }
 
     //
@@ -395,9 +414,10 @@ function perform_config_checks()
     // requires zlib functions
     //
     if ($cf->getValue('GZipDump')
-        && (@!function_exists('gzopen') || @!function_exists('gzencode'))) {
-        messages_set('warning', 'GZipDump', 'GZipDump_name',
-            PMA_lang('GZipDumpWarning', 'gzencode'));
+            && (@!function_exists('gzopen') || @!function_exists('gzencode'))) {
+        messages_set('warning', 'GZipDump',
+            PMA_lang(PMA_lang_name('GZipDump')),
+            PMA_lang($strGZipDumpWarning, 'gzencode'));
     }
 
     //
@@ -405,15 +425,16 @@ function perform_config_checks()
     // requires bzip2 functions
     //
     if ($cf->getValue('BZipDump')
-        && (!@function_exists('bzopen') || !@function_exists('bzcompress'))) {
+            && (!@function_exists('bzopen') || !@function_exists('bzcompress'))) {
         $functions = @function_exists('bzopen')
-            ? '' :
-            'bzopen';
+                ? '' :
+                'bzopen';
         $functions .= @function_exists('bzcompress')
-            ? ''
-            : ($functions ? ', ' : '') . 'bzcompress';
-        messages_set('warning', 'BZipDump', 'BZipDump_name',
-            PMA_sanitize(sprintf(__('[a@?page=form&amp;formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.'), $functions)));
+                ? ''
+                : ($functions ? ', ' : '') . 'bzcompress';
+        messages_set('warning', 'BZipDump',
+            PMA_lang(PMA_lang_name('BZipDump')),
+            PMA_lang($strBZipDumpWarning, $functions));
     }
 
     //
@@ -421,8 +442,9 @@ function perform_config_checks()
     // requires zip_open in import
     //
     if ($cf->getValue('ZipDump') && !@function_exists('zip_open')) {
-        messages_set('warning', 'ZipDump_import', 'ZipDump_name',
-            PMA_lang('ZipDumpImportWarning', 'zip_open'));
+        messages_set('warning', 'ZipDump_import',
+            PMA_lang(PMA_lang_name('ZipDump')),
+            PMA_lang($strZipDumpImportWarning, 'zip_open'));
     }
 
     //
@@ -430,8 +452,9 @@ function perform_config_checks()
     // requires gzcompress in export
     //
     if ($cf->getValue('ZipDump') && !@function_exists('gzcompress')) {
-        messages_set('warning', 'ZipDump_export', 'ZipDump_name',
-            PMA_lang('ZipDumpExportWarning', 'gzcompress'));
+        messages_set('warning', 'ZipDump_export',
+            PMA_lang(PMA_lang_name('ZipDump')),
+            PMA_lang($strZipDumpExportWarning, 'gzcompress'));
     }
 }
-?>
+?>
\ No newline at end of file

From 3ff76ffcf52b07a788f081f3f1f12f59d5e64bcb Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 18 Jun 2010 19:33:24 +0200
Subject: [PATCH 017/106] moved forms definition files

---
 .../config/setup.forms.php                    |  0
 libraries/config/user_preferences.forms.php   | 97 +++++++++++++++++++
 libraries/user_preferences.lib.php            | 89 +----------------
 3 files changed, 98 insertions(+), 88 deletions(-)
 rename setup/lib/forms.inc.php => libraries/config/setup.forms.php (100%)
 create mode 100644 libraries/config/user_preferences.forms.php

diff --git a/setup/lib/forms.inc.php b/libraries/config/setup.forms.php
similarity index 100%
rename from setup/lib/forms.inc.php
rename to libraries/config/setup.forms.php
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
new file mode 100644
index 000000000..e9c93b3cd
--- /dev/null
+++ b/libraries/config/user_preferences.forms.php
@@ -0,0 +1,97 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Functions for displaying user preferences pages
+ *
+ * @package phpMyAdmin
+ */
+
+$forms = array();
+$forms['Features']['General'] = array(
+    'NaturalOrder',
+    'InitialSlidersState',
+    'ErrorIconic',
+    'ReplaceHelpImg');
+$forms['Features']['Text_fields'] = array(
+    'CharEditing',
+    'CharTextareaCols',
+    'CharTextareaRows',
+    'TextareaCols',
+    'TextareaRows',
+    'LongtextDoubleTextarea');
+$forms['Sql_queries']['Sql_queries'] = array(
+    'ShowSQL',
+    'Confirm',
+    'IgnoreMultiSubmitErrors',
+    'VerboseMultiSubmit',
+    'MaxCharactersInDisplayedSQL',
+    'EditInWindow',
+    'QueryWindowWidth',
+    'QueryWindowHeight',
+    'QueryWindowDefTab');
+$forms['Sql_queries']['Sql_box'] = array(
+    'SQLQuery/Edit',
+    'SQLQuery/Explain',
+    'SQLQuery/ShowAsPHP',
+    'SQLQuery/Validate',// [false or no override]
+    'SQLQuery/Refresh');
+$forms['Features']['Page_titles'] = array(
+    'TitleDefault',
+    'TitleTable',
+    'TitleDatabase',
+    'TitleServer');
+$forms['Left_frame']['Left_frame'] = array(
+    'LeftFrameLight',
+    'LeftDisplayLogo',
+    'LeftLogoLink',
+    'LeftLogoLinkWindow',
+    'LeftPointerEnable');
+$forms['Left_frame']['Left_servers'] = array(
+    'LeftDisplayServers',
+    'DisplayServersList');
+$forms['Left_frame']['Left_databases'] = array(
+    'DisplayDatabasesList',
+    'LeftFrameDBTree',
+    'LeftFrameDBSeparator',
+    'LeftFrameTableLevel',
+    'ShowTooltipAliasDB');
+$forms['Left_frame']['Left_tables'] = array(
+    'LeftDefaultTabTable',
+    'LeftFrameTableSeparator',
+    'LeftFrameTableLevel',
+    'ShowTooltip',
+    'ShowTooltipAliasTB');
+$forms['Main_frame']['Startup'] = array(
+    'MainPageIconic',
+    'SuggestDBName');
+$forms['Main_frame']['Browse'] = array(
+    'NavigationBarIconic',
+    'ShowAll',
+    'MaxRows',
+    'Order',
+    'DisplayBinaryAsHex',
+    'BrowsePointerEnable',
+    'BrowseMarkerEnable',
+    'RepeatCells',
+    'LimitChars',
+    'ModifyDeleteAtLeft',
+    'ModifyDeleteAtRight',
+    'DefaultDisplay');
+$forms['Main_frame']['Edit'] = array(
+    'ProtectBinary',
+    'ShowFunctionFields',
+    'ShowFieldTypesInDataEditView',
+    'InsertRows',
+    'ForeignKeyDropdownOrder',// [s, ? custom text value]
+    'ForeignKeyMaxLimit',
+    'CtrlArrowsMoving',
+    'DefaultPropDisplay');
+$forms['Main_frame']['Tabs'] = array(
+    'LightTabs',
+    'PropertiesIconic',
+    'DefaultTabServer',
+    'DefaultTabDatabase',
+    'DefaultTabTable');
+$forms['Import']['Import_defaults'] = array();
+$forms['Export']['Export_defaults'] = array();
+?>
\ No newline at end of file
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index e9c93b3cd..e28ec7208 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -6,92 +6,5 @@
  * @package phpMyAdmin
  */
 
-$forms = array();
-$forms['Features']['General'] = array(
-    'NaturalOrder',
-    'InitialSlidersState',
-    'ErrorIconic',
-    'ReplaceHelpImg');
-$forms['Features']['Text_fields'] = array(
-    'CharEditing',
-    'CharTextareaCols',
-    'CharTextareaRows',
-    'TextareaCols',
-    'TextareaRows',
-    'LongtextDoubleTextarea');
-$forms['Sql_queries']['Sql_queries'] = array(
-    'ShowSQL',
-    'Confirm',
-    'IgnoreMultiSubmitErrors',
-    'VerboseMultiSubmit',
-    'MaxCharactersInDisplayedSQL',
-    'EditInWindow',
-    'QueryWindowWidth',
-    'QueryWindowHeight',
-    'QueryWindowDefTab');
-$forms['Sql_queries']['Sql_box'] = array(
-    'SQLQuery/Edit',
-    'SQLQuery/Explain',
-    'SQLQuery/ShowAsPHP',
-    'SQLQuery/Validate',// [false or no override]
-    'SQLQuery/Refresh');
-$forms['Features']['Page_titles'] = array(
-    'TitleDefault',
-    'TitleTable',
-    'TitleDatabase',
-    'TitleServer');
-$forms['Left_frame']['Left_frame'] = array(
-    'LeftFrameLight',
-    'LeftDisplayLogo',
-    'LeftLogoLink',
-    'LeftLogoLinkWindow',
-    'LeftPointerEnable');
-$forms['Left_frame']['Left_servers'] = array(
-    'LeftDisplayServers',
-    'DisplayServersList');
-$forms['Left_frame']['Left_databases'] = array(
-    'DisplayDatabasesList',
-    'LeftFrameDBTree',
-    'LeftFrameDBSeparator',
-    'LeftFrameTableLevel',
-    'ShowTooltipAliasDB');
-$forms['Left_frame']['Left_tables'] = array(
-    'LeftDefaultTabTable',
-    'LeftFrameTableSeparator',
-    'LeftFrameTableLevel',
-    'ShowTooltip',
-    'ShowTooltipAliasTB');
-$forms['Main_frame']['Startup'] = array(
-    'MainPageIconic',
-    'SuggestDBName');
-$forms['Main_frame']['Browse'] = array(
-    'NavigationBarIconic',
-    'ShowAll',
-    'MaxRows',
-    'Order',
-    'DisplayBinaryAsHex',
-    'BrowsePointerEnable',
-    'BrowseMarkerEnable',
-    'RepeatCells',
-    'LimitChars',
-    'ModifyDeleteAtLeft',
-    'ModifyDeleteAtRight',
-    'DefaultDisplay');
-$forms['Main_frame']['Edit'] = array(
-    'ProtectBinary',
-    'ShowFunctionFields',
-    'ShowFieldTypesInDataEditView',
-    'InsertRows',
-    'ForeignKeyDropdownOrder',// [s, ? custom text value]
-    'ForeignKeyMaxLimit',
-    'CtrlArrowsMoving',
-    'DefaultPropDisplay');
-$forms['Main_frame']['Tabs'] = array(
-    'LightTabs',
-    'PropertiesIconic',
-    'DefaultTabServer',
-    'DefaultTabDatabase',
-    'DefaultTabTable');
-$forms['Import']['Import_defaults'] = array();
-$forms['Export']['Export_defaults'] = array();
+
 ?>
\ No newline at end of file

From 114869eb7a3d8b74f0c3ad4827dac6807335ab34 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 18 Jun 2010 19:36:00 +0200
Subject: [PATCH 018/106] updated paths

---
 libraries/config/user_preferences.forms.php | 13 +++++++++++--
 setup/config.php                            |  2 +-
 user_preferences.php                        |  1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index e9c93b3cd..bf6ed7540 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -1,7 +1,16 @@
 <?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Functions for displaying user preferences pages
+ * List of avaible forms, each form is described as an array of fields to display.
+ * Fields MUST have their counterparts in the $cfg array.
+ *
+ * There are two possible notations:
+ * $forms['Form name'] = array('Servers' => array(1 => array('host')));
+ * can be written as
+ * $forms['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(
+ *  'pmadb' => 'phpmyadmin')));
  *
  * @package phpMyAdmin
  */
diff --git a/setup/config.php b/setup/config.php
index 8b514d27c..d6c6d4075 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -14,7 +14,7 @@ require './lib/common.inc.php';
 require_once './libraries/config/Form.class.php';
 require_once './libraries/config/FormDisplay.class.php';
 
-require './setup/lib/forms.inc.php';
+require './libraries/config/setup.forms.php';
 
 $form_display = new FormDisplay();
 $form_display->registerForm('_config.php', $forms['_config.php']);
diff --git a/user_preferences.php b/user_preferences.php
index a6817d750..e7add4900 100644
--- a/user_preferences.php
+++ b/user_preferences.php
@@ -16,6 +16,7 @@ require_once './libraries/config/messages.inc.php';
 require_once './libraries/config/ConfigFile.class.php';
 require_once './libraries/config/Form.class.php';
 require_once './libraries/config/FormDisplay.class.php';
+require_once './libraries/config/user_preferences.forms.php';
 
 $GLOBALS['js_include'][] = 'config.js';
 

From d68f2db90463d3d93be96a8531505706aae5618e Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 18 Jun 2010 20:22:34 +0200
Subject: [PATCH 019/106] add warnings if pma_userconfig is not present

---
 Documentation.html         | 20 ++++++++++++++++++++
 config.sample.inc.php      |  1 +
 libraries/relation.lib.php | 15 ++++++++++++++-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/Documentation.html b/Documentation.html
index e137953e3..8b809f6b2 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1135,6 +1135,26 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         <br/><br/>
     </dd>
 
+    <dt id="userconfig">
+        <span id="cfg_Servers_userconfig">$cfg['Servers'][$i]['userconfig']</span> string
+    </dt>
+    <dd>
+        Since release 3.4.x phpMyAdmin allows users to set most preferences by themselves
+        and store them in the database.
+        <br /><br />
+
+        If you don't allow for storing preferences in <a href="#pmadb">pmadb</a>, users can
+        still personalize phpMyAdmin, but settings will be saved in browser's local storage,
+        or, it is is unavailable, until the end of session.
+        <br /><br />
+
+        To allow the usage of this functionality:
+
+        <ul>
+            <li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li>
+            <li>put the table name in <tt>$cfg['Servers'][$i]['userconfig']</tt></li>
+        </ul>
+    </dd>
 
     <dt id="designer_coords">
         <span id="cfg_Servers_designer_coords">$cfg['Servers'][$i]['designer_coords']</span> string
diff --git a/config.sample.inc.php b/config.sample.inc.php
index 575e96562..3a09b56fe 100644
--- a/config.sample.inc.php
+++ b/config.sample.inc.php
@@ -55,6 +55,7 @@ $cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
 // $cfg['Servers'][$i]['history'] = 'pma_history';
 // $cfg['Servers'][$i]['tracking'] = 'pma_tracking';
 // $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords';
+// $cfg['Servers'][$i]['userconfig'] = 'pma_userconfig';
 /* Contrib / Swekey authentication */
 // $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf';
 
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 587a67e20..1a2f8aa5a 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -84,6 +84,8 @@ function PMA_getRelationsParam($verbose = false)
  * @uses    __('Please see the documentation on how to update your column_comments table')
  * @uses    __('SQL history')
  * @uses    __('Designer')
+ * @uses    __('Tracking')
+ * @uses    __('User preferences')
  * @uses    $cfg['Server']['pmadb']
  * @uses    sprintf()
  * @uses    PMA_printDiagMessageForFeature()
@@ -154,6 +156,10 @@ function PMA_printRelationsParamDiagnostic($cfgRelation)
 
     PMA_printDiagMessageForFeature(__('Tracking'), 'trackingwork', $messages);
 
+    PMA_printDiagMessageForParameter('userconfig', isset($cfgRelation['userconfig']), $messages, 'userconfig');
+
+    PMA_printDiagMessageForFeature(__('User preferences'), 'userconfigwork', $messages);
+
     echo '</table>' . "\n";
 
     echo '<p>' . __('Quick steps to setup advanced features:') . '</p>';
@@ -230,6 +236,7 @@ function PMA__getRelationsParam()
     $cfgRelation['historywork'] = false;
     $cfgRelation['trackingwork'] = false;
     $cfgRelation['designerwork'] = false;
+    $cfgRelation['userconfigwork'] = false;
     $cfgRelation['allworks']    = false;
     $cfgRelation['user']        = null;
     $cfgRelation['db']          = null;
@@ -280,6 +287,8 @@ function PMA__getRelationsParam()
             $cfgRelation['history'] = $curr_table[0];
         } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['tracking']) {
             $cfgRelation['tracking'] = $curr_table[0];
+        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['userconfig']) {
+            $cfgRelation['userconfig'] = $curr_table[0];
         }
     } // end while
     PMA_DBI_free_result($tab_rs);
@@ -334,6 +343,10 @@ function PMA__getRelationsParam()
         $cfgRelation['trackingwork']     = true;
     }
 
+    if (isset($cfgRelation['userconfig'])) {
+        $cfgRelation['userconfigwork']   = true;
+    }
+
     // we do not absolutely need that the internal relations or the PDF
     // schema feature be activated
     if (isset($cfgRelation['designer_coords'])) {
@@ -347,7 +360,7 @@ function PMA__getRelationsParam()
     if ($cfgRelation['relwork'] && $cfgRelation['displaywork']
      && $cfgRelation['pdfwork'] && $cfgRelation['commwork']
      && $cfgRelation['mimework'] && $cfgRelation['historywork']
-     && $cfgRelation['trackingwork']
+     && $cfgRelation['trackingwork'] && $cfgRelation['userconfigwork']
      && $cfgRelation['bookmarkwork'] && $cfgRelation['designerwork']) {
         $cfgRelation['allworks'] = true;
     }

From 9f44d864b6763682b858f6d9ff03401d8c236a28 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sun, 20 Jun 2010 21:34:13 +0200
Subject: [PATCH 020/106] user preferences saving and integration

---
 .gsoc/options.txt                           | 112 -------------
 .gsoc/todo.txt                              |   1 +
 libraries/Config.class.php                  |  34 ++++
 libraries/common.inc.php                    |   3 +
 libraries/config/ConfigFile.class.php       | 164 ++++++++++++++++++--
 libraries/config/Form.class.php             |   9 +-
 libraries/config/FormDisplay.class.php      |   2 +-
 libraries/config/FormDisplay.tpl.php        |   3 +-
 libraries/config/setup.forms.php            |   8 +-
 libraries/config/user_preferences.forms.php |  10 +-
 libraries/user_preferences.lib.php          |  38 +++++
 setup/config.php                            |   4 +-
 setup/frames/form.inc.php                   |   2 +-
 setup/frames/index.inc.php                  |   4 +-
 setup/frames/servers.inc.php                |   2 +-
 setup/lib/common.inc.php                    |   3 -
 user_preferences.php                        |  62 ++++++--
 17 files changed, 291 insertions(+), 170 deletions(-)
 delete mode 100644 .gsoc/options.txt
 create mode 100644 .gsoc/todo.txt

diff --git a/.gsoc/options.txt b/.gsoc/options.txt
deleted file mode 100644
index e4bb56b94..000000000
--- a/.gsoc/options.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-Features
-General
-    DefaultLang (just persist main page settings?)
-    DefaultConnectionCollation (just persist main page settings?)
-    ThemeDefault (if ThemeManager == true)
-    NaturalOrder [s-]
-    InitialSlidersState [s-]
-    ErrorIconic [s-]
-    ReplaceHelpImg [s-]
-Text fields
-    CharEditing [s]
-    CharTextareaCols [s]
-    CharTextareaRows [s]
-    TextareaCols [s-]
-    TextareaRows [s-]
-    LongtextDoubleTextarea [s-]
-SQL Queries
-    ShowSQL [s]
-    Confirm [s]
-    IgnoreMultiSubmitErrors [s]
-    VerboseMultiSubmit [s]
-    MaxCharactersInDisplayedSQL [s-]
-    SQLQuery/Edit [s-]
-    SQLQuery/Explain [s-]
-    SQLQuery/ShowAsPHP [s-]
-    SQLQuery/Validate [false or no override]
-    SQLQuery/Refresh [s-]
-    EditInWindow [s-]
-    QueryWindowWidth [s-]
-    QueryWindowHeight [s-]
-    QueryWindowDefTab [s-]
-Page titles
-    TitleTable [s-]
-    TitleDatabase[s-]
-    TitleServer [s-]
-    TitleDefault [s-]
-
-LEFT FRAME
-Navigation frame
-    LeftFrameLight [s]
-    LeftDisplayLogo [s]
-    LeftLogoLink [s]
-    LeftLogoLinkWindow [s]
-    LeftPointerEnable [s]
-Servers
-    LeftDisplayServers [s]
-    DisplayServersList [s]
-Databases
-    DisplayDatabasesList [s]
-    LeftFrameDBTree [s]
-    LeftFrameDBSeparator [s]
-    LeftFrameTableLevel [s]
-    ShowTooltipAliasDB [s]
-Tables
-    LeftDefaultTabTable [s]
-    LeftFrameTableSeparator [s]
-    LeftFrameTableLevel [s]
-    ShowTooltip [s]
-    ShowTooltipAliasTB [s]
-
-MAIN FRAME
-AT STARTUP
-    MainPageIconic [s]
-    -ShowStats [false or no override]
-    -ShowPhpInfo [false or no override]
-    -ShowServerInfo [false or no override]
-    -ShowChgPassword [false or no override]
-    -ShowCreateDb [false or no override]
-    SuggestDBName [s]
-In browse mode...
-    NavigationBarIconic [s]
-    ShowAll [s]
-    MaxRows [s]
-    Order [s]
-    DisplayBinaryAsHex [s]
-    BrowsePointerEnable [s]
-    BrowseMarkerEnable [s]
-    RepeatCells [s-]
-    LimitChars [s-]
-    ModifyDeleteAtLeft [s-]
-    ModifyDeleteAtRight [s-]
-    DefaultDisplay [s-]
-In edit mode...
-    ProtectBinary [s]
-    ShowFunctionFields [s]
-    ShowFieldTypesInDataEditView [s-]
-    InsertRows [s]
-    ForeignKeyDropdownOrder [s, ? custom text value]
-    ForeignKeyMaxLimit [s]
-    CtrlArrowsMoving [s]
-    DefaultPropDisplay [s-]
-Tabs display settings
-    LightTabs [s]
-    PropertiesIconic [s]
-    DefaultTabServer [s]
-    DefaultTabDatabase [s]
-    DefaultTabTable [s]
-
-SQL Query Box
-    Edit [s]
-    Explain [s]
-    ShowAsPHP [s]
-    Validate (false or no override)
-    Refresh [s]
-
-Export
-    PDFDefaultPageSize [s-]
-    WYSIWYG-PDF [s-]
-    all export defaults [s:some]
-
-Import
-    all import defaults [s:some]
diff --git a/.gsoc/todo.txt b/.gsoc/todo.txt
new file mode 100644
index 000000000..4dd9492f8
--- /dev/null
+++ b/.gsoc/todo.txt
@@ -0,0 +1 @@
+restore cache'ing in phpmyadmin.css.php
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index c0090aa7f..7b72240ca 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -409,6 +409,40 @@ class PMA_Config
         return true;
     }
 
+    /**
+     * loads user preferences and merges them with current config
+     * must be called after control connection has been estabilished
+     *
+     * @uses PMA_array_merge_recursive
+     * @uses PMA_backquote()
+     * @uses PMA_DBI_fetch_value
+     * @uses PMA_getRelationsParam()
+     * @uses PMA_sqlAddslashes()
+     * @uses $GLOBALS['cfg']
+     * @uses $GLOBALS['controllink']
+     * @return boolean
+     */
+    function loadUserPreferences()
+    {
+        $cfgRelation = PMA_getRelationsParam();
+        if (!$cfgRelation['userconfigwork']) {
+            return false;
+        }
+        $query_table = PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['userconfig']);
+        $query = '
+            SELECT `config_data`
+            FROM ' . $query_table . '
+              WHERE `username` = \'' . PMA_sqlAddslashes($cfgRelation['user']) . '\'';
+        $config_data = PMA_DBI_fetch_value($query, 0, 0, $GLOBALS['controllink']);
+        if (!$config_data) {
+            return false;
+        }
+        $config_data = unserialize($config_data);
+        $this->settings = PMA_array_merge_recursive($this->settings, $config_data);
+        $GLOBALS['cfg'] = PMA_array_merge_recursive($GLOBALS['cfg'], $config_data);
+        $this->set('user_preferences_loaded', true);
+    }
+
     /**
      * set source
      * @param   string  $source
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 710ecdfc4..8dfb7e7d3 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -954,6 +954,9 @@ if (! defined('PMA_MINIMUM_COMMON')) {
 
     } // end server connecting
 
+    // load user preferences
+    $GLOBALS['PMA_Config']->loadUserPreferences();
+
     /**
      * check if profiling was requested and remember it
      * (note: when $cfg['ServerDefault'] = 0, constant is not defined)
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index bcb1e8ac2..ffbcea1ad 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -29,7 +29,25 @@ class ConfigFile
      * Keys which will be always written to config file
      * @var array
      */
-    private $persistKeys;
+    private $persistKeys = array();
+
+    /**
+     * Key filter for {@link set()}
+     * @var array|null
+     */
+    private $setFilter;
+
+    /**
+     * Instance id (key in $_SESSION array, separate for each server - ConfigFile{server id})
+     * @var string
+     */
+    private $id;
+
+    /**
+     * Result for {@link _flattenArray()}
+     * @var array
+     */
+    private $_flattenArrayResult;
 
     /**
      * ConfigFile instance
@@ -56,6 +74,11 @@ class ConfigFile
                 PMA_array_write($path, $cfg, $value);
             }
         }
+
+        $this->id = 'ConfigFile' . $GLOBALS['server'];
+        if (!isset($_SESSION[$this->id])) {
+            $_SESSION[$this->id] = array();
+        }
     }
 
     /**
@@ -83,6 +106,40 @@ class ConfigFile
         $this->persistKeys = array_flip($keys);
     }
 
+    /**
+     * By default ConfigFile allows setting of all configuration keys, use this method
+     * to set up a filter on {@link set()} method
+     *
+     * @param array|null $keys array of allowed keys or null to remove filter
+     */
+    public function setAllowedKeys($keys)
+    {
+        if ($keys === null) {
+            $this->setFilter = null;
+            return;
+        }
+        // checking key presence is much faster than searching so move values to keys
+        $this->setFilter = array_flip($keys);
+    }
+
+    /**
+     * Resets configuration data
+     */
+    public function resetConfigData()
+    {
+        $_SESSION[$this->id] = array();
+    }
+
+    /**
+     * Sets configuration data (overrides old data)
+     *
+     * @param array $cfg
+     */
+    public function setConfigData(array $cfg)
+    {
+        $_SESSION[$this->id] = $cfg;
+    }
+
     /**
      * Sets config value
      *
@@ -95,13 +152,57 @@ class ConfigFile
         if ($canonical_path === null) {
             $canonical_path = $this->getCanonicalPath($path);
         }
+        // apply key whitelist
+        if ($this->setFilter !== null && !isset($this->setFilter[$canonical_path])) {
+            return;
+        }
         // remove if the path isn't protected and it's empty or has a default value
         $default_value = $this->getDefault($canonical_path);
         if (!isset($this->persistKeys[$canonical_path])
-            && (($value == $default_value) || (empty($value) && empty($default_value)))) {
-            PMA_array_remove($path, $_SESSION['ConfigFile']);
+                && (($value == $default_value) || (empty($value) && empty($default_value)))) {
+            PMA_array_remove($path, $_SESSION[$this->id]);
         } else {
-            PMA_array_write($path, $_SESSION['ConfigFile'], $value);
+            PMA_array_write($path, $_SESSION[$this->id], $value);
+        }
+    }
+
+    /**
+     * Flattens multidimensional array, changes indices to paths (eg. 'key/subkey')
+     *
+     * @param mixed $value
+     * @param mixed $key
+     * @param mixed $prefix
+     */
+    private function _flattenArray($value, $key, $prefix)
+    {
+        // no recursion for numeric arrays
+        if (is_array($value) && !isset($value[0])) {
+            //$prefix .= (empty($prefix) ? '' : '/') . $key;
+            $prefix .= $key . '/';
+            array_walk($value, array($this, '_flattenArray'), $prefix);
+        } else {
+            //$this->_flattenArrayResult[$prefix . '/' . $key] = $value;
+            $this->_flattenArrayResult[$prefix . $key] = $value;
+        }
+    }
+
+    /**
+     * Updates config with values read from PMA_Config class
+     * (config will contain differences to defaults from config.defaults.php).
+     *
+     * @param PMA_Config $PMA_Config
+     */
+    public function updateWithGlobalConfig(PMA_Config $PMA_Config)
+    {
+        // load config array and flatten it
+        $this->_flattenArrayResult = array();
+        array_walk($PMA_Config->settings, array($this, '_flattenArray'), '');
+        $flat_cfg = $this->_flattenArrayResult;
+        $this->_flattenArrayResult = null;
+
+        // save values
+        foreach ($flat_cfg as $path => $value) {
+            $this->set($path, $value, $path);
         }
     }
 
@@ -114,7 +215,7 @@ class ConfigFile
      */
     public function get($path, $default = null)
     {
-        return PMA_array_read($path, $_SESSION['ConfigFile'], $default);
+        return PMA_array_read($path, $_SESSION[$this->id], $default);
     }
 
     /**
@@ -141,7 +242,7 @@ class ConfigFile
      */
     public function getValue($path, $default = null)
     {
-        $v = PMA_array_read($path, $_SESSION['ConfigFile'], null);
+        $v = PMA_array_read($path, $_SESSION[$this->id], null);
         if ($v !== null) {
             return $v;
         }
@@ -178,11 +279,23 @@ class ConfigFile
      */
     public function getServerCount()
     {
-      return isset($_SESSION['ConfigFile']['Servers'])
-          ? count($_SESSION['ConfigFile']['Servers'])
+      return isset($_SESSION[$this->id]['Servers'])
+          ? count($_SESSION[$this->id]['Servers'])
           : 0;
     }
 
+    /**
+     * Returns server list
+     *
+     * @return array|null
+     */
+    public function getServers()
+    {
+      return isset($_SESSION[$this->id]['Servers'])
+          ? $_SESSION[$this->id]['Servers']
+          : null;
+    }
+
     /**
      * Returns DSN of given server
      *
@@ -191,7 +304,7 @@ class ConfigFile
      */
     function getServerDSN($server)
     {
-        if (!isset($_SESSION['ConfigFile']['Servers'][$server])) {
+        if (!isset($_SESSION[$this->id]['Servers'][$server])) {
             return '';
         }
 
@@ -224,7 +337,7 @@ class ConfigFile
      */
     public function getServerName($id)
     {
-        if (!isset($_SESSION['ConfigFile']['Servers'][$id])) {
+        if (!isset($_SESSION[$this->id]['Servers'][$id])) {
             return '';
         }
         $verbose = $this->get("Servers/$id/verbose");
@@ -242,19 +355,19 @@ class ConfigFile
      */
     public function removeServer($server)
     {
-        if (!isset($_SESSION['ConfigFile']['Servers'][$server])) {
+        if (!isset($_SESSION[$this->id]['Servers'][$server])) {
             return;
         }
         $last_server = $this->getServerCount();
 
         for ($i = $server; $i < $last_server; $i++) {
-            $_SESSION['ConfigFile']['Servers'][$i] = $_SESSION['ConfigFile']['Servers'][$i+1];
+            $_SESSION[$this->id]['Servers'][$i] = $_SESSION[$this->id]['Servers'][$i+1];
         }
-        unset($_SESSION['ConfigFile']['Servers'][$last_server]);
+        unset($_SESSION[$this->id]['Servers'][$last_server]);
 
-        if (isset($_SESSION['ConfigFile']['ServerDefault'])
-            && $_SESSION['ConfigFile']['ServerDefault'] >= 0) {
-            unset($_SESSION['ConfigFile']['ServerDefault']);
+        if (isset($_SESSION[$this->id]['ServerDefault'])
+            && $_SESSION[$this->id]['ServerDefault'] >= 0) {
+            unset($_SESSION[$this->id]['ServerDefault']);
         }
     }
 
@@ -273,6 +386,23 @@ class ConfigFile
         return SETUP_CONFIG_FILE;
     }
 
+    /**
+     * Returns configuration array
+     *
+     * @return array
+     */
+    public function getConfigArray()
+    {
+        $c = $_SESSION[$this->id];
+        $persistKeys = array_diff(array_keys($this->persistKeys), array_keys($c));
+        foreach ($persistKeys as $k) {
+            if (strpos($k, '/') === false) {
+                $c[$k] = $this->getDefault($k);
+            }
+        }
+        return $c;
+    }
+
     /**
      * Creates config file
      *
@@ -281,7 +411,7 @@ class ConfigFile
     public function getConfigFile()
     {
         $crlf = (isset($_SESSION['eol']) && $_SESSION['eol'] == 'win') ? "\r\n" : "\n";
-        $c = $_SESSION['ConfigFile'];
+        $c = $_SESSION[$this->id];
 
         // header
         $ret = '<?php' . $crlf
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
index 13ceee8b7..fbc5237e2 100644
--- a/libraries/config/Form.class.php
+++ b/libraries/config/Form.class.php
@@ -93,7 +93,7 @@ class Form
 
     /**
      * array_walk callback function, reads path of form fields from
-     * array (see file comment in forms.inc.php)
+     * array (see file comment in setup.forms.php or user_preferences.forms.inc)
      *
      * @param   mixed   $value
      * @param   mixed   $key
@@ -102,14 +102,14 @@ class Form
     private function _readFormPathsCallback($value, $key, $prefix)
     {
         if (is_array($value)) {
-            $prefix .= (empty($prefix) ? '' : '/') . $key;
+            $prefix .= $key . '/';
             array_walk($value, array($this, '_readFormPathsCallback'), $prefix);
         } else {
             if (!is_int($key)) {
-                $this->default[$prefix . '/' . $key] = $value;
+                $this->default[$prefix . $key] = $value;
                 $value = $key;
             }
-            $this->fields[] = $prefix . '/' . $value;
+            $this->fields[] = $prefix . $value;
         }
     }
 
@@ -129,7 +129,6 @@ class Form
         $paths = $this->fields;
         $this->fields = array();
         foreach ($paths as $path) {
-            $path = ltrim($path, '/');
             $key = ltrim(substr($path, strrpos($path, '/')), '/');
             $this->fields[$key] = $path;
         }
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 7d812fbe2..55a02952d 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -28,7 +28,7 @@ class FormDisplay
 {
     /**
      * Form list
-     * @var array
+     * @var Form[]
      */
     private $forms = array();
 
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index e22d3a9b5..1fced4a60 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -116,6 +116,7 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
     $field_class = $value_is_default ? '' : ' class="custom"';
     $name_id = 'name="' . $path . '" id="' . $path . '"';
     $base_dir = defined('PMA_SETUP') ? '../' : '';
+    //todo use PMA_showDocu(), create and use PMA_showWiki()    
     $img_path = defined('PMA_SETUP')
         ? '../' . ltrim($GLOBALS['cfg']['ThemePath'], './') . '/original/img/'
         : $_SESSION['PMA_Theme']->img_path;
@@ -152,7 +153,7 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
             foreach ($opts['values'] as $opt_value => $opt_name) {
                 // set names for boolean values
                 if (is_bool($opt_name)) {
-                    $opt_name = $GLOBALS['strSetup' . ($opt_value ? __('Yes') : __('No'))];
+                    $opt_name = strtolower($opt_value ? __('Yes') : __('No'));
                 }
                 // cast boolean values to integers
                 $display_value = is_bool($opt_value) ? (int) $opt_value : $opt_value;
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 795ca91f1..2f78f6732 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -103,8 +103,8 @@ $forms['Sql_queries'] = array(
     'VerboseMultiSubmit',
     'MaxCharactersInDisplayedSQL',
     'EditInWindow',
-    'QueryWindowWidth',
-    'QueryWindowHeight',
+    //'QueryWindowWidth', // overridden in theme
+    //'QueryWindowHeight',
     'QueryWindowDefTab');
 $forms['Page_titles'] = array(
     'TitleDefault',
@@ -112,6 +112,10 @@ $forms['Page_titles'] = array(
     'TitleDatabase',
     'TitleServer');
 $forms['Other_core_settings'] = array(
+    'NaturalOrder',
+    'InitialSlidersState',
+    'ErrorIconic',
+    'ReplaceHelpImg',
     'MaxDbList',
     'MaxTableList',
     'MaxCharactersInDisplayedSQL',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index bf6ed7540..dbc1ef691 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -3,10 +3,8 @@
  * List of avaible forms, each form is described as an array of fields to display.
  * Fields MUST have their counterparts in the $cfg array.
  *
- * There are two possible notations:
- * $forms['Form name'] = array('Servers' => array(1 => array('host')));
- * can be written as
- * $forms['Form name'] = array('Servers/1/host');
+ * To define form field, use the notatnion below:
+ * $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(
@@ -35,8 +33,8 @@ $forms['Sql_queries']['Sql_queries'] = array(
     'VerboseMultiSubmit',
     'MaxCharactersInDisplayedSQL',
     'EditInWindow',
-    'QueryWindowWidth',
-    'QueryWindowHeight',
+    //'QueryWindowWidth', // overridden in theme
+    //'QueryWindowHeight',
     'QueryWindowDefTab');
 $forms['Sql_queries']['Sql_box'] = array(
     'SQLQuery/Edit',
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index e28ec7208..74ed13dd5 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -6,5 +6,43 @@
  * @package phpMyAdmin
  */
 
+/**
+ * Saves user preferences
+ *
+ * @uses PMA_getRelationsParam()
+ * @return true|PMA_Message
+ */
+function PMA_save_userprefs()
+{
+    $cfgRelation = PMA_getRelationsParam();
+    $cf = ConfigFile::getInstance();
 
+    $config_data = serialize($cf->getConfigArray());
+
+    $query_table = PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['userconfig']);
+    $query = '
+        SELECT `username`
+        FROM ' . $query_table . '
+          WHERE `username` = \'' . PMA_sqlAddslashes($cfgRelation['user']) . '\'';
+
+    $has_config = PMA_DBI_fetch_value($query, 0, 0, $GLOBALS['controllink']);
+    if ($has_config) {
+        $query = '
+            UPDATE ' . $query_table . '
+            SET `config_data` = \'' . PMA_sqlAddslashes($config_data) . '\'
+            WHERE `username` = \'' . PMA_sqlAddslashes($cfgRelation['user']) . '\'';
+    } else {
+        $query = '
+            INSERT INTO ' . $query_table . ' (`username`, `config_data`)
+            VALUES (\'' . PMA_sqlAddslashes($cfgRelation['user']) . '\',
+                \'' . PMA_sqlAddslashes($config_data) . '\')';
+    }
+    if (!PMA_DBI_try_query($query, $GLOBALS['controllink'])) {
+        $message = PMA_Message::error(__('Could not save configuration'));
+        $message->addMessage('<br /><br />');
+        $message->addMessage(PMA_Message::rawError(PMA_DBI_getError($GLOBALS['controllink'])));
+        return $message;
+    }
+    return true;
+}
 ?>
\ No newline at end of file
diff --git a/setup/config.php b/setup/config.php
index d6c6d4075..555a8ab84 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -29,7 +29,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
 	//
 	// Clear current config and return to main page
 	//
-	$_SESSION['ConfigFile'] = array();
+	ConfigFile::getInstance()->resetConfigData();
     // drop post data
     header('HTTP/1.1 303 See Other');
     header('Location: index.php');
@@ -56,7 +56,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
 	//
     $cfg = array();
     require_once $config_file_path;
-    $_SESSION['ConfigFile'] = $cfg;
+    ConfigFile::getInstance()->setConfigData($cfg);
     header('HTTP/1.1 303 See Other');
     header('Location: index.php');
     exit;
diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php
index 5ede9d483..604189ea7 100644
--- a/setup/frames/form.inc.php
+++ b/setup/frames/form.inc.php
@@ -18,7 +18,7 @@ require_once './libraries/config/Form.class.php';
 require_once './libraries/config/FormDisplay.class.php';
 require_once './setup/lib/form_processing.lib.php';
 
-require './setup/lib/forms.inc.php';
+require './libraries/config/setup.forms.php';
 
 $formsets = array(
     'features' => array(
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 970114483..b82801201 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -116,7 +116,7 @@ display_form_top('index.php', 'get', array(
     <th><?php echo __('Authentication type') ?></th>
     <th colspan="2">DSN</th>
 </tr>
-<?php foreach ($_SESSION['ConfigFile']['Servers'] as $id => $server): ?>
+<?php foreach ($cf->getServers() as $id => $server): ?>
 <tr>
     <td><?php echo $id ?></td>
     <td><?php echo $cf->getServerName($id) ?></td>
@@ -189,7 +189,7 @@ if ($cf->getServerCount() > 0) {
     }
     $opts['values_disabled'][] = '-';
 
-    foreach ($_SESSION['ConfigFile']['Servers'] as $id => $server) {
+    foreach ($cf->getServers() as $id => $server) {
         $opts['values'][(string)$id] = $cf->getServerName($id) . " [$id]";
     }
 } else {
diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php
index 12d0a4656..5fe22f960 100644
--- a/setup/frames/servers.inc.php
+++ b/setup/frames/servers.inc.php
@@ -18,7 +18,7 @@ require_once './libraries/config/Form.class.php';
 require_once './libraries/config/FormDisplay.class.php';
 require_once './setup/lib/form_processing.lib.php';
 
-require './setup/lib/forms.inc.php';
+require './libraries/config/setup.forms.php';
 
 $mode = filter_input(INPUT_GET, 'mode');
 $id = filter_input(INPUT_GET, 'id', FILTER_VALIDATE_INT);
diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php
index bc85e7b0b..5233cb373 100644
--- a/setup/lib/common.inc.php
+++ b/setup/lib/common.inc.php
@@ -30,9 +30,6 @@ restore_error_handler();
 // Save current language in a cookie, required since we use PMA_MINIMUM_COMMON
 $GLOBALS['PMA_Config']->setCookie('pma_lang', $GLOBALS['lang']);
 
-if (!isset($_SESSION['ConfigFile'])) {
-    $_SESSION['ConfigFile'] = array();
-}
 ConfigFile::getInstance()->setPersistKeys(array(
     'DefaultLang',
     'ServerDefault',
diff --git a/user_preferences.php b/user_preferences.php
index e7add4900..5763ea647 100644
--- a/user_preferences.php
+++ b/user_preferences.php
@@ -16,34 +16,52 @@ require_once './libraries/config/messages.inc.php';
 require_once './libraries/config/ConfigFile.class.php';
 require_once './libraries/config/Form.class.php';
 require_once './libraries/config/FormDisplay.class.php';
-require_once './libraries/config/user_preferences.forms.php';
+require './libraries/config/user_preferences.forms.php';
 
 $GLOBALS['js_include'][] = 'config.js';
 
 require_once './libraries/header.inc.php';
 
-// Any message to display?
-if (! empty($message)) {
-    PMA_showMessage($message);
-    unset($message);
-}
-
+// build tabs
 $tabs = array();
 $form_param = filter_input(INPUT_GET, 'form');
 if (!isset($forms[$form_param])) {
-    $form_param = array_shift(array_keys($forms));
+    $forms_keys = array_keys($forms);
+    $form_param = array_shift($forms_keys);
 }
-foreach (array_keys($forms) as $form) {
+foreach (array_keys($forms) as $formset) {
     $tabs[] = array(
         'link' => 'user_preferences.php',
-        'text' => PMA_ifSetOr($GLOBALS['strSetupForm_' . $form], $form), // TODO: remove ifSetOr
-        'active' => $form == $form_param,
-        'url_params' => array('form' => $form)
+        'text' => PMA_ifSetOr($GLOBALS['strSetupForm_' . $formset], $formset), // TODO: remove ifSetOr
+        'active' => $formset == $form_param,
+        'url_params' => array('form' => $formset)
     );
 }
 
 echo PMA_generate_html_tabs($tabs, array());
 
+// handle form display and processing
+$forms_all_keys = array();
+foreach ($forms as $formset) {
+    foreach ($formset as $form) {
+        $forms_all_keys = array_merge($forms_all_keys, $form);
+    }
+}
+
+$cf = ConfigFile::getInstance();
+$cf->setAllowedKeys($forms_all_keys);
+$cf->updateWithGlobalConfig($GLOBALS['PMA_Config']);
+
+// todo: debug - remove
+$arr = $cf->getConfigArray();
+$arr2 = array();
+foreach ($arr as $k => $v) {
+    $arr2[] = "<b>$k</b> " . var_export($v, true);
+}
+$arr2 = implode(', ', $arr2);
+$msg = !empty($arr2) ? PMA_Message::notice('Debug: ' . $arr2) : PMA_Message::notice('no settings');
+$msg->display();
+
 $form_display = new FormDisplay();
 foreach ($forms[$form_param] as $form_name => $form) {
     $form_display->registerForm($form_name, $form);
@@ -78,13 +96,23 @@ if (!$form_display->process(false)) {
         <a class="btn" href="?form=<?php echo $form_param ?>&amp;mode=edit"><?php echo PMA_lang('ShowForm') ?></a>
         <?php
     } else {
-        // redirect
-        $url_params = array('form' => $form_param);
-        PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'user_preferences.php'
-                . PMA_generate_common_url($url_params, '&'));
-        exit;
+        // save settings
+        $result = PMA_save_userprefs();
+        if ($result === true) {
+            $message = PMA_Message::rawSuccess(__('Configuration has been saved'));
+            $message->display();
+            // redirect
+            //$url_params = array('form' => $form_param);
+            //PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'user_preferences.php'
+            //        . PMA_generate_common_url($url_params, '&'));
+            //exit;
+        } else {
+            $result->display();
+        }
+        $form_display->display(true, true);
     }
 }
+$GLOBALS['error_handler']->dispAllErrors();
 
 /**
  * Displays the footer

From b68ba42f9f3a9017b25d7ac6668543c4ccde108c Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Mon, 21 Jun 2010 01:05:45 +0200
Subject: [PATCH 021/106] Better error handling

---
 user_preferences.php | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/user_preferences.php b/user_preferences.php
index 5763ea647..d0a0abeea 100644
--- a/user_preferences.php
+++ b/user_preferences.php
@@ -67,7 +67,7 @@ foreach ($forms[$form_param] as $form_name => $form) {
     $form_display->registerForm($form_name, $form);
 }
 
-if (filter_input(INPUT_GET, 'mode') == 'revert') {
+if (isset($_POST['revert'])) {
     // revert erroneous fields to their default values
     $form_display->fixErrors();
     // redirect
@@ -82,19 +82,14 @@ if (!$form_display->process(false)) {
 } else {
     // check for form errors
     if ($form_display->hasErrors()) {
-        // form has errors, show warning
-        $separator = PMA_get_arg_separator('html');
+        // form has errors
         ?>
-        <div class="warning">
-            <h4><?php echo __('Warning') ?></h4>
-            <?php echo __('Submitted form contains errors') ?><br />
-            <a href="?form=<?php echo $form_param ?>&amp;mode=revert"><?php echo PMA_lang('RevertErroneousFields') ?></a>
-        </div>
-        <?php $form_display->displayErrors() ?>
-        <a class="btn" href="user_preferences.php"><?php echo PMA_lang('IgnoreErrors') ?></a>
-        &nbsp;
-        <a class="btn" href="?form=<?php echo $form_param ?>&amp;mode=edit"><?php echo PMA_lang('ShowForm') ?></a>
+        <fieldset>
+            <b><?php echo __('Submitted form contains errors') ?></b>
+            <?php $form_display->displayErrors(); ?>
+        </fieldset>
         <?php
+        $form_display->display(true, true);
     } else {
         // save settings
         $result = PMA_save_userprefs();

From 3a8de5a7162edde4c3dee33f1cb63bcb14137d25 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Mon, 21 Jun 2010 15:24:07 +0200
Subject: [PATCH 022/106] make form definition structure the same for setup
 script and user preferences

---
 .gsoc/todo.txt                              |  5 +++
 libraries/config/ConfigFile.class.php       |  2 -
 libraries/config/messages.inc.php           | 11 +++--
 libraries/config/setup.forms.php            | 46 ++++++++++-----------
 libraries/config/user_preferences.forms.php |  3 +-
 setup/frames/form.inc.php                   | 23 ++---------
 setup/frames/menu.inc.php                   | 10 ++---
 setup/frames/servers.inc.php                | 10 ++---
 user_preferences.php                        |  7 +---
 9 files changed, 48 insertions(+), 69 deletions(-)

diff --git a/.gsoc/todo.txt b/.gsoc/todo.txt
index 4dd9492f8..1da79aa5e 100644
--- a/.gsoc/todo.txt
+++ b/.gsoc/todo.txt
@@ -1 +1,6 @@
+cache'ing of user preferences to avoid round trips to server on each page refresh
+
+backlog:
+- Import and Export options
+
 restore cache'ing in phpmyadmin.css.php
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index ffbcea1ad..c91a964cc 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -177,11 +177,9 @@ class ConfigFile
     {
         // no recursion for numeric arrays
         if (is_array($value) && !isset($value[0])) {
-            //$prefix .= (empty($prefix) ? '' : '/') . $key;
             $prefix .= $key . '/';
             array_walk($value, array($this, '_flattenArray'), $prefix);
         } else {
-            //$this->_flattenArrayResult[$prefix . '/' . $key] = $value;
             $this->_flattenArrayResult[$prefix . $key] = $value;
         }
     }
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index fe9de51cd..490f32ec2 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -121,12 +121,11 @@ $strSetupForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain acce
 $strSetupForm_Server_pmadb = __('PMA database');
 $strSetupForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.');
 $strSetupForm_Server_tracking = __('Changes tracking');
-$strSetupFormset_customization = __('Customization');
-$strSetupFormset_export = __('Customize export options');
-$strSetupFormset_features = __('Features');
-$strSetupFormset_import = __('Customize import defaults');
-$strSetupFormset_left_frame = __('Customize navigation frame');
-$strSetupFormset_main_frame = __('Customize main frame');
+$strSetupFormset_Export = __('Customize export options');
+$strSetupFormset_Features = __('Features');
+$strSetupFormset_Import = __('Customize import defaults');
+$strSetupFormset_Left_frame = __('Customize navigation frame');
+$strSetupFormset_Main_frame = __('Customize main frame');
 $strSetupForm_Sql_box_desc = __('Customize links shown in SQL Query boxes');
 $strSetupForm_Sql_box = __('SQL Query box');
 $strSetupForm_Sql_queries_desc = __('SQL queries settings, for SQL Query box options see [a@?page=form&amp;formset=main_frame#tab_Sql_box]Navigation frame[/a] settings');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 2f78f6732..2ddc0e97a 100644
--- a/libraries/config/setup.forms.php
+++ b/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',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index dbc1ef691..a60c162d2 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -7,8 +7,7 @@
  * $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(
- *  'pmadb' => 'phpmyadmin')));
+ * $forms['Server']['pmadb form'] = array('Servers/1/pmadb' => 'phpmyadmin');
  *
  * @package phpMyAdmin
  */
diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php
index 604189ea7..91feebb00 100644
--- a/setup/frames/form.inc.php
+++ b/setup/frames/form.inc.php
@@ -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);
-?>
+?>
\ No newline at end of file
diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php
index 1da38512b..262812118 100644
--- a/setup/frames/menu.inc.php
+++ b/setup/frames/menu.inc.php
@@ -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>
diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php
index 5fe22f960..6cb24f6d1 100644
--- a/setup/frames/servers.inc.php
+++ b/setup/frames/servers.inc.php
@@ -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);
-?>
+?>
\ No newline at end of file
diff --git a/user_preferences.php b/user_preferences.php
index d0a0abeea..dcab713fa 100644
--- a/user_preferences.php
+++ b/user_preferences.php
@@ -41,13 +41,8 @@ foreach (array_keys($forms) as $formset) {
 echo PMA_generate_html_tabs($tabs, array());
 
 // handle form display and processing
-$forms_all_keys = array();
-foreach ($forms as $formset) {
-    foreach ($formset as $form) {
-        $forms_all_keys = array_merge($forms_all_keys, $form);
-    }
-}
 
+$forms_all_keys = PMA_read_userprefs_fieldnames($forms);
 $cf = ConfigFile::getInstance();
 $cf->setAllowedKeys($forms_all_keys);
 $cf->updateWithGlobalConfig($GLOBALS['PMA_Config']);

From 0dc5d2e2b19bce4efd325c76544cef38d3d179f8 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Mon, 21 Jun 2010 16:24:34 +0200
Subject: [PATCH 023/106] markers for field errors

---
 js/config.js                            |  7 ++++++
 libraries/config/Form.class.php         |  2 +-
 libraries/config/FormDisplay.tpl.php    | 29 +++++++++++++++++--------
 setup/styles.css                        |  4 ++++
 themes/original/css/theme_right.css.php |  8 +++++--
 5 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/js/config.js b/js/config.js
index fa68d7034..5a6a98cf9 100644
--- a/js/config.js
+++ b/js/config.js
@@ -299,6 +299,13 @@ function displayErrors(error_list) {
             return item != '';
         });
 
+        // CSS error class
+        if (!isFieldset) {
+            // checkboxes uses parent <span> for marking
+            var fieldMarker = (field.attr('type') == 'checkbox') ? field.parent() : field;
+            fieldMarker[errors.length ? 'addClass' : 'removeClass']('field-error');
+        }
+
         if (errors.length) {
             // if error container doesn't exist, create it
             if (errorCnt.length == 0) {
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
index fbc5237e2..c0d4db086 100644
--- a/libraries/config/Form.class.php
+++ b/libraries/config/Form.class.php
@@ -10,7 +10,7 @@
  * Base class for forms, loads default configuration options, checks allowed
  * values etc.
  *
- * @package    phpMyAdmin-setup
+ * @package    phpMyAdmin
  */
 class Form
 {
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 1fced4a60..68fe9f58c 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -98,6 +98,7 @@ function display_fieldset_top($title = '', $description = '', $errors = null, $a
  * o errors - error array
  * o setvalue - (string) shows button allowing to set poredefined value
  * o show_restore_default - (boolean) whether show "restore default" button
+ * o userprefs_allow - whether show user preferences allow/deny checkbox (null - no, true/false - yes)
  * o values - key - value paris for <select> fields
  * o values_escaped - (boolean) tells whether values array is already escaped (defaults to false)
  * o values_disabled -  (array)list of disabled values (keys from values)
@@ -113,13 +114,23 @@ function display_fieldset_top($title = '', $description = '', $errors = null, $a
  */
 function display_input($path, $name, $description = '', $type, $value, $value_is_default = true, $opts = null)
 {
-    $field_class = $value_is_default ? '' : ' class="custom"';
+    static $base_dir, $img_path;
+
+    if ($base_dir === null) {
+        $is_setup_script = defined('PMA_SETUP') && PMA_SETUP;
+        $base_dir = $is_setup_script ? '../' : '';
+        $img_path = $is_setup_script
+            ? '../' . ltrim($GLOBALS['cfg']['ThemePath'], './') . '/original/img/'
+            : $_SESSION['PMA_Theme']->img_path;
+    }
+    $has_errors = isset($opts['errors']) && !empty($opts['errors']);
+    $field_class = $type == 'checkbox' ? '' : 'checkbox';
+    if (!$value_is_default) {
+        $field_class .= ($field_class == '' ? '' : ' ') . ($has_errors ? 'custom field-error' : 'custom');
+    }
+    $field_class = 'class="' . $field_class . '"';
     $name_id = 'name="' . $path . '" id="' . $path . '"';
-    $base_dir = defined('PMA_SETUP') ? '../' : '';
-    //todo use PMA_showDocu(), create and use PMA_showWiki()    
-    $img_path = defined('PMA_SETUP')
-        ? '../' . ltrim($GLOBALS['cfg']['ThemePath'], './') . '/original/img/'
-        : $_SESSION['PMA_Theme']->img_path;
+
 ?>
 <tr>
     <th>
@@ -141,7 +152,7 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
                 . ' value="' . htmlspecialchars($value) . '" />';
           break;
         case 'checkbox':
-            echo '<span class="checkbox' . ($value_is_default ? '' : ' custom')
+            echo '<span ' . $field_class
               . '"><input type="checkbox" ' . $name_id
               . ($value ? ' checked="checked"' : '') . ' /></span>';
           break;
@@ -192,8 +203,8 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
         <a class="restore-default" href="#<?php echo $path ?>" title="<?php echo __('Restore default value') ?>" style="display:none"><img alt="restore-default" src="<?php echo $img_path ?>s_reload.png" width="16" height="16" /></a>
         <?php
     }
-    // this must match with displayErrors() in scripts.js
-    if (isset($opts['errors']) && !empty($opts['errors'])) {
+    // this must match with displayErrors() in scripts/config.js
+    if ($has_errors) {
         echo "\n        <dl class=\"inline_errors\">";
         foreach ($opts['errors'] as $error) {
             echo '<dd>' . htmlspecialchars($error) . '</dd>';
diff --git a/setup/styles.css b/setup/styles.css
index 63fc47884..23364177b 100644
--- a/setup/styles.css
+++ b/setup/styles.css
@@ -319,6 +319,10 @@ span.checkbox {
     border: 1px #EDEC90 solid;
 }
 
+.field-error {
+    border-color: #C11 !important;
+}
+
 input[type="text"], select, textarea {
     border: 1px #A7A6AA solid;
 }
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 69df8b387..26f231eb0 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1362,6 +1362,10 @@ table#serverconnection_trg_local  {
     background: #FFC;
 }
 
+.config-form .field-error {
+    border-color: #A11 !important;
+}
+
 .config-form input[type="text"],
 .config-form select,
 .config-form textarea {
@@ -1376,10 +1380,10 @@ table#serverconnection_trg_local  {
 }
 
 /* error list */
-dd {
+.config-form dd {
     margin-left: 0.5em;
 }
 
-dd:before {
+.config-form dd:before {
     content: "\25B8  ";
 }

From d09c35f5a83da6753f6cb9efcbea453b6933ed55 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Mon, 21 Jun 2010 18:46:23 +0200
Subject: [PATCH 024/106] setup script - better config file generation

---
 libraries/config/ConfigFile.class.php | 59 ++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index c91a964cc..f270561c7 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -442,7 +442,7 @@ class ConfigFile
         $persistKeys = $this->persistKeys;
         foreach ($c as $k => $v) {
             $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
-            $ret .= "\$cfg['$k'] = " . var_export($v, true) . ';' . $crlf;
+            $ret .= $this->_getVarExport($k, $v, $crlf);
             if (isset($persistKeys[$k])) {
                 unset($persistKeys[$k]);
             }
@@ -451,12 +451,67 @@ class ConfigFile
         foreach (array_keys($persistKeys) as $k) {
             if (strpos($k, '/') === false) {
                 $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
-                $ret .= "\$cfg['$k'] = " . var_export($this->getDefault($k), true) . ';' . $crlf;
+                $ret .= $this->_getVarExport($k, $this->getDefault($k), $crlf);
             }
         }
         $ret .= '?>';
 
         return $ret;
     }
+
+    /**
+     * Returns exported configuration variable
+     *
+     * @param string $var_name
+     * @param mixed  $var_value
+     * @param string $crlf
+     * @return string
+     */
+    private function _getVarExport($var_name, $var_value, $crlf)
+    {
+        if (!is_array($var_value) || empty($var_value)) {
+            return "\$cfg['$var_name'] = " . var_export($var_value, true) . ';' . $crlf;
+        }
+        $numeric_keys = true;
+        foreach (array_keys($var_value) as $k) {
+            if (!is_numeric($k)) {
+                $numeric_keys = false;
+                break;
+            }
+        }
+        if ($numeric_keys) {
+            for ($i = 0; $i < count($var_value); $i++) {
+                if (!isset($var_value[$i])) {
+                    $numeric_keys = false;
+                    break;
+                }
+            }
+        }
+        $ret = '';
+        if ($numeric_keys) {
+            $retv = array();
+            foreach ($var_value as $v) {
+                $retv[] = var_export($v, true);
+            }
+            if (count($retv) <= 4) {
+                // up to 4 values - one line
+                $ret = "\$cfg['$var_name'] = array(" . implode(', ', $retv) . ');' . $crlf;
+            } else {
+                // more than 4 values - value per line
+                $ret = "\$cfg['$var_name'] = array(";
+                for ($i = 0, $imax = count($ret)-1; $i <= $imax; $i++) {
+                    $ret .= ($i < $imax ? $crlf : '') . '    ' . $v;
+                }
+                $ret .= ');' . $crlf;
+            }
+        } else {
+            // string keys: $cfg[key][subkey] = value
+            foreach ($var_value as $k => $v) {
+                $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
+                $ret = "\$cfg['$var_name']['$k'] = " . var_export($v, true) . ';' . $crlf;
+            }
+        }
+        return $ret;
+    }
 }
 ?>
\ No newline at end of file

From e5238f384573ffe1e96a36314b811bf03822c665 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Mon, 21 Jun 2010 19:12:25 +0200
Subject: [PATCH 025/106] add $cfg['UserprefsDisallow'] and allow setting it in
 setup script correct IE opacity issue for "restore default value" button fix
 regressions introduced in previous commit

---
 Documentation.html                     |  5 ++
 js/config.js                           |  3 +-
 libraries/config.default.php           |  8 ++-
 libraries/config/ConfigFile.class.php  |  5 +-
 libraries/config/FormDisplay.class.php | 68 ++++++++++++++++++++++----
 libraries/config/FormDisplay.tpl.php   | 33 ++++++++-----
 setup/scripts.js                       | 22 +++++++++
 setup/styles.css                       | 14 +++++-
 8 files changed, 133 insertions(+), 25 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index e471ce9e2..bdba1779e 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2176,6 +2176,11 @@ setfacl -d -m "g:www-data:rwx" tmp
     closed state. A value of <tt>'open'</tt> does the reverse. To completely 
     disable all visual sliders, use <tt>'disabled'</tt>.</dd>
 
+    <dt id="cfg_UserprefsDisallow">$cfg['UserprefsDisallow'] array</dt>
+    <dd>Contains names of configuration options (keys in <tt>$cfg</tt> array)
+        that users can't set through user preferences. For possible values, refer
+        to <tt>libraries/config/user_preferences.forms.php</tt>.</dd>
+
     <dt id="cfg_TitleTable">$cfg['TitleTable'] string</dt>
     <dt id="cfg_TitleDatabase">$cfg['TitleDatabase'] string</dt>
     <dt id="cfg_TitleServer">$cfg['TitleServer'] string</dt>
diff --git a/js/config.js b/js/config.js
index 5a6a98cf9..85dc4c51f 100644
--- a/js/config.js
+++ b/js/config.js
@@ -571,7 +571,8 @@ function restoreField(field_id) {
 $(function() {
     $('.restore-default, .set-value').each(function() {
         var link = $(this);
-        link.css('opacity', 0.25);
+        // inline-block for IE so opacity inheritance works
+        link.css('display', 'inline-block').css('opacity', 0.25);
         if (!link.hasClass('restore-default')) {
             // restore-default is handled by markField
         	link.css('display', '');
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 08b4e56d2..8db79c39b 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2282,7 +2282,13 @@ $cfg['NaturalOrder'] = true;
  */
 $cfg['InitialSlidersState'] = 'closed';
 
-
+/**
+ * User preferences: disallow these settings
+ * For possible setting names look in libraries/config/user_preferences.forms.php
+ *
+ * @global array $cfg['UserprefsDisallow']
+ */
+$cfg['UserprefsDisallow'] = array();
 
 //-----------------------------------------------------------------------------
 // custom-setup by mkkeck: 2004-05-04
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index f270561c7..acbb260f8 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -499,8 +499,9 @@ class ConfigFile
             } else {
                 // more than 4 values - value per line
                 $ret = "\$cfg['$var_name'] = array(";
-                for ($i = 0, $imax = count($ret)-1; $i <= $imax; $i++) {
-                    $ret .= ($i < $imax ? $crlf : '') . '    ' . $v;
+                $imax = count($retv)-1;
+                for ($i = 0; $i <= $imax; $i++) {
+                    $ret .= ($i < $imax ? ($i > 0 ? ',' : '') : '') . $crlf . '    ' . $retv[$i];
                 }
                 $ret .= ');' . $crlf;
             }
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 55a02952d..be643ac48 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -8,9 +8,8 @@
  * o translated_path - work_path modified for HTML field name, a path with
  *                     slashes changed to hyphens, eg. Servers-4-verbose
  *
- * @package    phpMyAdmin-setup
+ * @package    phpMyAdmin
  * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
  */
 
 /**
@@ -64,7 +63,19 @@ class FormDisplay
      * Tells whether forms have been validated
      * @var bool
      */
-    private $is_valdiated = true;
+    private $is_validated = true;
+
+    /**
+     * Dictionary with user preferences keys
+     * @var array
+     */
+    private $userprefs_keys;
+
+    /**
+     * Dictionary with disallowed user preferences keys
+     * @var array
+     */
+    private $userprefs_disallow;
 
     public function __construct()
     {
@@ -86,7 +97,7 @@ class FormDisplay
     public function registerForm($form_name, array $form, $server_id = null)
     {
         $this->forms[$form_name] = new Form($form_name, $form, $server_id);
-        $this->is_valdiated = false;
+        $this->is_validated = false;
         foreach ($this->forms[$form_name]->fields as $path) {
             $work_path = $server_id === null
                 ? $path
@@ -121,7 +132,7 @@ class FormDisplay
      */
     private function _validate()
     {
-        if ($this->is_valdiated) {
+        if ($this->is_validated) {
             return;
         }
 
@@ -155,7 +166,7 @@ class FormDisplay
                 $this->errors[$work_path] = $error_list;
             }
         }
-        $this->is_valdiated = true;
+        $this->is_validated = true;
     }
 
 
@@ -197,6 +208,16 @@ class FormDisplay
             $this->_validate();
         }
 
+        // user preferences
+        if ($this->userprefs_keys === null) {
+            $this->userprefs_keys = array_flip(PMA_read_userprefs_fieldnames());
+            // read real config for user preferences display
+            $userprefs_disallow = defined('PMA_SETUP') && PMA_SETUP
+                ? ConfigFile::getInstance()->get('UserprefsDisallow', array())
+                : $GLOBALS['cfg']['UserprefsDisallow'];
+            $this->userprefs_disallow = array_flip($userprefs_disallow);
+        }
+
         // display forms
         foreach ($this->forms as $form) {
             /* @var $form Form */
@@ -211,9 +232,13 @@ class FormDisplay
             foreach ($form->fields as $field => $path) {
                 $work_path = array_search($path, $this->system_paths);
                 $translated_path = $this->translated_paths[$work_path];
+                // always true/false for user preferences display
+                $userprefs_allow = isset($this->userprefs_keys[$path])
+                    ? !isset($this->userprefs_disallow[$path])
+                    : null;
                 // display input
                 $this->_displayFieldInput($form, $field, $path, $work_path,
-                    $translated_path, $show_restore_default, $js_default);
+                    $translated_path, $show_restore_default, $userprefs_allow, $js_default);
                 // register JS validators for this field
                 if (isset($validators[$path])) {
                     js_validate($translated_path, $validators[$path], $js);
@@ -250,10 +275,11 @@ class FormDisplay
      * @param string $work_path             work path, eg. Servers/4/verbose
      * @param string $translated_path       work path changed so that it can be used as XHTML id
      * @param bool   $show_restore_default  whether show "restore default" button besides the input field
+     * @param mixed  $userprefs_allow       whether user preferences are enabled for this field (null - no support, true/false - enabled/disabled)
      * @param array  &$js_default           array which stores JavaScript code to be displayed
      */
     private function _displayFieldInput(Form $form, $field, $system_path, $work_path,
-        $translated_path, $show_restore_default, array &$js_default)
+            $translated_path, $show_restore_default, $userprefs_allow, array &$js_default)
     {
         $name = PMA_lang_name($system_path);
         $description = PMA_lang_desc($system_path);
@@ -270,7 +296,8 @@ class FormDisplay
         $opts = array(
             'doc' => $this->getDocLink($system_path),
             'wiki' =>  $this->getWikiLink($system_path),
-            'show_restore_default' => $show_restore_default);
+            'show_restore_default' => $show_restore_default,
+            'userprefs_allow' => $userprefs_allow);
         if (isset($form->default[$system_path])) {
             $opts['setvalue'] = $form->default[$system_path];
         }
@@ -417,6 +444,16 @@ class FormDisplay
 
         $values = array();
         $to_save = array();
+        $is_setup_script = defined('PMA_SETUP') && PMA_SETUP;
+        if ($is_setup_script && $this->userprefs_keys === null) {
+            $this->userprefs_keys = array_flip(PMA_read_userprefs_fieldnames());
+            // read real config for user preferences display
+            $userprefs_disallow = $is_setup_script
+                ? ConfigFile::getInstance()->get('UserprefsDisallow', array())
+                : $GLOBALS['cfg']['UserprefsDisallow'];
+            $this->userprefs_disallow = array_flip($userprefs_disallow);
+        }
+
         $this->errors = array();
         foreach ($forms as $form) {
             /* @var $form Form */
@@ -448,6 +485,16 @@ class FormDisplay
                     }
                 }
 
+                // user preferences allow/disallow
+                if ($is_setup_script && isset($this->userprefs_keys[$system_path])) {
+                    if (isset($this->userprefs_disallow[$system_path])
+                            && isset($_POST[$key . '-userprefs-allow'])) {
+                        unset($this->userprefs_disallow[$system_path]);
+                    } else if (!isset($_POST[$key . '-userprefs-allow'])) {
+                        $this->userprefs_disallow[$system_path] = true;
+                    }
+                }
+
                 // cast variables to correct type
                 $type = $form->getOptionType($field);
                 switch ($type) {
@@ -516,6 +563,9 @@ class FormDisplay
                 }
                 $cf->set($work_path, $values[$path], $path);
             }
+            if ($is_setup_script) {
+                $cf->set('UserprefsDisallow', array_keys($this->userprefs_disallow));
+            }
         }
 
         // don't look for non-critical errors
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 68fe9f58c..6345c2651 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -2,9 +2,8 @@
 /**
  * Form templates
  *
- * @package    phpMyAdmin-setup
+ * @package    phpMyAdmin
  * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
  */
 
 /**
@@ -98,7 +97,7 @@ function display_fieldset_top($title = '', $description = '', $errors = null, $a
  * o errors - error array
  * o setvalue - (string) shows button allowing to set poredefined value
  * o show_restore_default - (boolean) whether show "restore default" button
- * o userprefs_allow - whether show user preferences allow/deny checkbox (null - no, true/false - yes)
+ * o userprefs_allow - whether user preferences are enabled for this field (null - no support, true/false - enabled/disabled)
  * o values - key - value paris for <select> fields
  * o values_escaped - (boolean) tells whether values array is already escaped (defaults to false)
  * o values_disabled -  (array)list of disabled values (keys from values)
@@ -116,21 +115,20 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
 {
     static $base_dir, $img_path;
 
+    $is_setup_script = defined('PMA_SETUP') && PMA_SETUP;
     if ($base_dir === null) {
-        $is_setup_script = defined('PMA_SETUP') && PMA_SETUP;
         $base_dir = $is_setup_script ? '../' : '';
         $img_path = $is_setup_script
             ? '../' . ltrim($GLOBALS['cfg']['ThemePath'], './') . '/original/img/'
             : $_SESSION['PMA_Theme']->img_path;
     }
     $has_errors = isset($opts['errors']) && !empty($opts['errors']);
-    $field_class = $type == 'checkbox' ? '' : 'checkbox';
+    $field_class = $type == 'checkbox' ? 'checkbox' : '';
     if (!$value_is_default) {
         $field_class .= ($field_class == '' ? '' : ' ') . ($has_errors ? 'custom field-error' : 'custom');
     }
-    $field_class = 'class="' . $field_class . '"';
+    $field_class = $field_class ? ' class="' . $field_class . '"' : '';
     $name_id = 'name="' . $path . '" id="' . $path . '"';
-
 ?>
 <tr>
     <th>
@@ -152,8 +150,7 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
                 . ' value="' . htmlspecialchars($value) . '" />';
           break;
         case 'checkbox':
-            echo '<span ' . $field_class
-              . '"><input type="checkbox" ' . $name_id
+            echo '<span' . $field_class . '><input type="checkbox" ' . $name_id
               . ($value ? ' checked="checked"' : '') . ' /></span>';
           break;
         case 'select':
@@ -212,8 +209,18 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
         echo '</dl>';
     }
     ?>
-
     </td>
+    <?php
+    if ($is_setup_script && isset($opts['userprefs_allow'])) {
+    ?>
+    <td class="userprefs-allow" title="<?php echo __('Allow users to customize this value') ?>">
+        <input type="checkbox" name="<?php echo $path ?>-userprefs-allow" <?php if ($opts['userprefs_allow']) echo 'checked="checked"' ?> />
+    </td>
+    <?php
+    } else if ($is_setup_script) {
+        echo '<td>&nbsp;</td>';
+    }
+    ?>
 </tr>
 <?php
 }
@@ -225,9 +232,13 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
  */
 function display_fieldset_bottom()
 {
+    $colspan = 2;
+    if (defined('PMA_SETUP') && PMA_SETUP) {
+        $colspan++;
+    }
 ?>
 <tr>
-    <td colspan="2" class="lastrow">
+    <td colspan="<?php echo $colspan ?>" class="lastrow">
         <input type="submit" name="submit_save" value="<?php echo __('Save') ?>" class="green" />
         <input type="button" name="submit_reset" value="<?php echo __('Reset') ?>" />
     </td>
diff --git a/setup/scripts.js b/setup/scripts.js
index 4763ff081..8a853c08a 100644
--- a/setup/scripts.js
+++ b/setup/scripts.js
@@ -168,3 +168,25 @@ function ajaxValidate(parent, id, values) {
 
     return true;
 }
+
+//
+// END: Form validation and field operations
+// ------------------------------------------------------------------
+
+// ------------------------------------------------------------------
+// User preferences allow/disallow UI
+//
+
+$(function() {
+   $('.userprefs-allow').click(function(e) {
+       if (this != e.target) {
+           return;
+       }
+       var el = $(this).find('input');
+       el.attr('checked', !el.attr('checked'));
+   });
+});
+
+//
+// END: User preferences allow/disallow UI
+// ------------------------------------------------------------------
\ No newline at end of file
diff --git a/setup/styles.css b/setup/styles.css
index 23364177b..fc14a3235 100644
--- a/setup/styles.css
+++ b/setup/styles.css
@@ -262,6 +262,18 @@ fieldset td {
     vertical-align: top;
 }
 
+fieldset td.userprefs-allow {
+    padding: 0;
+    vertical-align: middle;
+    text-align: center;
+    width: 3em;
+}
+
+fieldset td.userprefs-allow:hover {
+    cursor: pointer;
+    background-color: #EEE;
+}
+
 fieldset th small {
     display: block;
     font-weight: normal;
@@ -307,7 +319,7 @@ fieldset.simple .lastrow {
 
 span.checkbox {
     padding: 2px;
-    display: inline-block;    
+    display: inline-block;
 }
 
 .custom { /* customized field */

From e842432c7ec268f9cf1780995281a8db7de5490e Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 26 Jun 2010 01:04:17 +0200
Subject: [PATCH 026/106] User preferences: - add icons to category tabs - user
 overrides were unavailable in CSS files - apply saved configuration
 immediately after save, reload navigation frame if it's affected - disabled
 overrides marked in user preferences forms

---
 libraries/Config.class.php                  | 40 ++++++-----
 libraries/common.inc.php                    |  6 +-
 libraries/config/ConfigFile.class.php       | 15 +++--
 libraries/config/FormDisplay.tpl.php        |  3 +
 libraries/config/user_preferences.forms.php |  1 -
 libraries/user_preferences.lib.php          | 74 +++++++++++++++++++++
 themes/original/css/theme_right.css.php     |  9 ++-
 user_preferences.php                        | 58 +++++++++++++---
 8 files changed, 170 insertions(+), 36 deletions(-)

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 7b72240ca..c290e54de 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -413,31 +413,38 @@ class PMA_Config
      * loads user preferences and merges them with current config
      * must be called after control connection has been estabilished
      *
-     * @uses PMA_array_merge_recursive
-     * @uses PMA_backquote()
-     * @uses PMA_DBI_fetch_value
-     * @uses PMA_getRelationsParam()
-     * @uses PMA_sqlAddslashes()
      * @uses $GLOBALS['cfg']
-     * @uses $GLOBALS['controllink']
+     * @uses $_SESSION['cache']['config_mtime']
+     * @uses $_SESSION['cache']['userprefs']
+     * @uses $_SESSION['cache']['userprefs_mtime']
+     * @uses PMA_apply_userprefs()
+     * @uses PMA_array_merge_recursive()
+     * @uses PMA_load_userprefs()
      * @return boolean
      */
     function loadUserPreferences()
     {
-        $cfgRelation = PMA_getRelationsParam();
-        if (!$cfgRelation['userconfigwork']) {
-            return false;
+        // index.php should load these settings, so that phpmyadmin.css.php
+        // will have everything avaiable in session cache
+        if (!defined('PMA_MINIMUM_COMMON')) {
+            $config_mtime = max($this->default_source_mtime, $this->source_mtime);
+            // cache user preferences, use database only when needed
+            if (!isset($_SESSION['cache']['userprefs'])
+                    || $_SESSION['cache']['config_mtime'] < $config_mtime) {
+                require_once './libraries/user_preferences.lib.php';
+                require_once './libraries/config/config_functions.lib.php';
+                $prefs = PMA_load_userprefs();
+                $_SESSION['cache']['userprefs'] = PMA_apply_userprefs($prefs['config_data']);
+                $_SESSION['cache']['userprefs_mtime'] = $prefs['mtime'];
+                $_SESSION['cache']['config_mtime'] = $config_mtime;
+            }
+        } else if (!isset($_SESSION['cache']['userprefs'])) {
+            return;
         }
-        $query_table = PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['userconfig']);
-        $query = '
-            SELECT `config_data`
-            FROM ' . $query_table . '
-              WHERE `username` = \'' . PMA_sqlAddslashes($cfgRelation['user']) . '\'';
-        $config_data = PMA_DBI_fetch_value($query, 0, 0, $GLOBALS['controllink']);
+        $config_data = $_SESSION['cache']['userprefs'];
         if (!$config_data) {
             return false;
         }
-        $config_data = unserialize($config_data);
         $this->settings = PMA_array_merge_recursive($this->settings, $config_data);
         $GLOBALS['cfg'] = PMA_array_merge_recursive($GLOBALS['cfg'], $config_data);
         $this->set('user_preferences_loaded', true);
@@ -572,6 +579,7 @@ class PMA_Config
             $fontsize +
             $this->source_mtime +
             $this->default_source_mtime +
+            (isset($_SESSION['cache']['userprefs_mtime']) ? $_SESSION['cache']['userprefs_mtime'] : 0) +
             $_SESSION['PMA_Theme']->mtime_info +
             $_SESSION['PMA_Theme']->filesize_info)
             . (isset($_SESSION['tmp_user_values']['custom_color']) ? substr($_SESSION['tmp_user_values']['custom_color'],1,6) : '');
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 8dfb7e7d3..694bcecb9 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -954,9 +954,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
 
     } // end server connecting
 
-    // load user preferences
-    $GLOBALS['PMA_Config']->loadUserPreferences();
-
     /**
      * check if profiling was requested and remember it
      * (note: when $cfg['ServerDefault'] = 0, constant is not defined)
@@ -978,6 +975,9 @@ if (! defined('PMA_MINIMUM_COMMON')) {
     }
 } // end if !defined('PMA_MINIMUM_COMMON')
 
+// load user preferences
+$GLOBALS['PMA_Config']->loadUserPreferences();
+
 // remove sensitive values from session
 $GLOBALS['PMA_Config']->set('blowfish_secret', '');
 $GLOBALS['PMA_Config']->set('Servers', '');
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index acbb260f8..4eff1d13a 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -167,7 +167,8 @@ class ConfigFile
     }
 
     /**
-     * Flattens multidimensional array, changes indices to paths (eg. 'key/subkey')
+     * Flattens multidimensional array, changes indices to paths (eg. 'key/subkey').
+     * Used as array_walk() callback.
      *
      * @param mixed $value
      * @param mixed $key
@@ -385,18 +386,20 @@ class ConfigFile
     }
 
     /**
-     * Returns configuration array
+     * Returns configuration array (flat format)
      *
      * @return array
      */
     public function getConfigArray()
     {
-        $c = $_SESSION[$this->id];
+        $this->_flattenArrayResult = array();
+        array_walk($_SESSION[$this->id], array($this, '_flattenArray'), '');
+        $c = $this->_flattenArrayResult;
+        $this->_flattenArrayResult = null;
+
         $persistKeys = array_diff(array_keys($this->persistKeys), array_keys($c));
         foreach ($persistKeys as $k) {
-            if (strpos($k, '/') === false) {
-                $c[$k] = $this->getDefault($k);
-            }
+            $c[$k] = $this->getDefault($k);
         }
         return $c;
     }
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 6345c2651..2ec8142cd 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -139,6 +139,9 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
             <?php if (!empty($opts['wiki'])){ ?><a href="<?php echo $opts['wiki'] ?>" target="wiki"><img class="icon" src="<?php echo $img_path ?>b_info.png" width="11" height="11" alt="Wiki" title="Wiki" /></a><?php } ?>
         </span>
         <?php endif; ?>
+        <?php if (!$is_setup_script && isset($opts['userprefs_allow']) && !$opts['userprefs_allow']): ?>
+            <span class="disabled-notice" title="<?php echo __('This setting is disabled, it will not be applied to your configuration') ?>"><?php echo __('Disabled') ?></span>
+        <?php endif; ?>
         <?php if (!empty($description)) { ?><small><?php echo $description ?></small><?php } ?>
 
     </th>
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index a60c162d2..98c9275d8 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -59,7 +59,6 @@ $forms['Left_frame']['Left_databases'] = array(
     'DisplayDatabasesList',
     'LeftFrameDBTree',
     'LeftFrameDBSeparator',
-    'LeftFrameTableLevel',
     'ShowTooltipAliasDB');
 $forms['Left_frame']['Left_tables'] = array(
     'LeftDefaultTabTable',
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 74ed13dd5..71356ced7 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -6,9 +6,57 @@
  * @package phpMyAdmin
  */
 
+/**
+ * Loads user preferences
+ *
+ * Returns false or an array:
+ * * config_data - path => value pairs
+ * * mtime - last modification time
+ *
+ * @uses PMA_array_merge_recursive
+ * @uses PMA_backquote()
+ * @uses PMA_DBI_fetch_single_row()
+ * @uses PMA_getRelationsParam()
+ * @uses PMA_sqlAddslashes()
+ * @uses $GLOBALS['controllink']
+ * @return false|array
+ */
+function PMA_load_userprefs()
+{
+    $cfgRelation = PMA_getRelationsParam();
+    if (!$cfgRelation['userconfigwork']) {
+        return false;
+    }
+    $query_table = PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['userconfig']);
+    $query = '
+        SELECT `config_data`, UNIX_TIMESTAMP(`timevalue`) ts
+        FROM ' . $query_table . '
+          WHERE `username` = \'' . PMA_sqlAddslashes($cfgRelation['user']) . '\'';
+    $row = PMA_DBI_fetch_single_row($query, 'ASSOC', $GLOBALS['controllink']);
+    if (!$row) {
+        return false;
+    }
+    $config_data = unserialize($row['config_data']);
+    return array(
+        'config_data' => $config_data,
+        'mtime' => $row['ts']);
+}
+
 /**
  * Saves user preferences
  *
+ * @uses $GLOBALS['controllink']
+ * @uses $_SESSION['cache']['userprefs']
+ * @uses ConfigFile::getConfigArray()
+ * @uses ConfigFile::getInstance()
+ * @uses PMA_backquote()
+ * @uses PMA_DBI_fetch_value
+ * @uses PMA_DBI_getError()
+ * @uses PMA_DBI_try_query()
+ * @uses PMA_Message::addMessage()
+ * @uses PMA_Message::error()
+ * @uses PMA_Message::rawError()
+ * @uses PMA_sqlAddslashes()
  * @uses PMA_getRelationsParam()
  * @return true|PMA_Message
  */
@@ -37,6 +85,9 @@ function PMA_save_userprefs()
             VALUES (\'' . PMA_sqlAddslashes($cfgRelation['user']) . '\',
                 \'' . PMA_sqlAddslashes($config_data) . '\')';
     }
+    if (isset($_SESSION['cache']['userprefs'])) {
+        unset($_SESSION['cache']['userprefs']);
+    }
     if (!PMA_DBI_try_query($query, $GLOBALS['controllink'])) {
         $message = PMA_Message::error(__('Could not save configuration'));
         $message->addMessage('<br /><br />');
@@ -45,4 +96,27 @@ function PMA_save_userprefs()
     }
     return true;
 }
+
+/**
+ * Returns a user preferences array filtered by $cfg['UserprefsDisallow']
+ * (blacklist) and keys from user preferences form (whitelist)
+ *
+ * @uses PMA_array_write()
+ * @uses PMA_read_userprefs_fieldnames()
+ * @param array $config_data path => value pairs
+ * @return array
+ */
+function PMA_apply_userprefs(array $config_data)
+{
+    $cfg = array();
+    $blacklist = array_flip($GLOBALS['cfg']['UserprefsDisallow']);
+    $whitelist = array_flip(PMA_read_userprefs_fieldnames());
+    foreach ($config_data as $path => $value) {
+        if (!isset($whitelist[$path]) || isset($blacklist[$path])) {
+            continue;
+        }
+        PMA_array_write($path, $cfg, $value);
+    }
+    return $cfg;
+}
 ?>
\ No newline at end of file
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 26f231eb0..745d11ff9 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1309,10 +1309,17 @@ table#serverconnection_trg_local  {
     background:     transparent;
 }
 
-.config-form fieldset .doc {
+.config-form fieldset .doc, .config-form fieldset .disabled-notice {
     margin-left: 1em;
 }
 
+.config-form fieldset .disabled-notice {
+    font-size: 80%;
+    text-transform: uppercase;
+    color: #E00;
+    cursor: help;
+}
+
 .config-form fieldset td {
     padding-top:    0.3em;
     padding-bottom: 0.3em;
diff --git a/user_preferences.php b/user_preferences.php
index dcab713fa..f67c9e7db 100644
--- a/user_preferences.php
+++ b/user_preferences.php
@@ -29,17 +29,39 @@ if (!isset($forms[$form_param])) {
     $forms_keys = array_keys($forms);
     $form_param = array_shift($forms_keys);
 }
+$tabs_icons = array(
+    'Features'    => 'b_tblops.png',
+    'Sql_queries' => 'b_sql.png',
+    'Left_frame'  => 'b_select.png',
+    'Main_frame'  => 'b_props.png',
+    'Import'      => 'b_import.png',
+    'Export'      => 'b_export.png');
 foreach (array_keys($forms) as $formset) {
     $tabs[] = array(
         'link' => 'user_preferences.php',
         'text' => PMA_ifSetOr($GLOBALS['strSetupForm_' . $formset], $formset), // TODO: remove ifSetOr
+        'icon' => $tabs_icons[$formset],
         'active' => $formset == $form_param,
-        'url_params' => array('form' => $formset)
-    );
+        'url_params' => array('form' => $formset));
 }
 
 echo PMA_generate_html_tabs($tabs, array());
 
+// show "configuration saved" message and reload navigation frame if needed
+if (!empty($_GET['saved'])) {
+    $message = PMA_Message::rawSuccess(__('Configuration has been saved'));
+    $message->display();
+    if (isset($_GET['refresh_left_frame']) && $_GET['refresh_left_frame'] == '1') {
+?>
+<script type="text/javascript">
+if (window.parent && window.parent.frame_navigation) {
+    window.parent.frame_navigation.location.reload();
+}
+</script>
+<?php
+    }
+}
+
 // handle form display and processing
 
 $forms_all_keys = PMA_read_userprefs_fieldnames($forms);
@@ -54,7 +76,10 @@ foreach ($arr as $k => $v) {
     $arr2[] = "<b>$k</b> " . var_export($v, true);
 }
 $arr2 = implode(', ', $arr2);
-$msg = !empty($arr2) ? PMA_Message::notice('Debug: ' . $arr2) : PMA_Message::notice('no settings');
+$arr2 .= '<br />Blacklist: ' . (empty($cfg['UserprefsDisallow'])
+        ? '<i>empty</i>'
+        : implode(', ', $cfg['UserprefsDisallow']));
+$msg = PMA_Message::notice('Debug: ' . $arr2);
 $msg->display();
 
 $form_display = new FormDisplay();
@@ -87,15 +112,30 @@ if (!$form_display->process(false)) {
         $form_display->display(true, true);
     } else {
         // save settings
+        $old_settings = PMA_load_userprefs();
         $result = PMA_save_userprefs();
         if ($result === true) {
-            $message = PMA_Message::rawSuccess(__('Configuration has been saved'));
-            $message->display();
+            // compute differences and check whether left frame should be refreshed
+            $old_settings = isset($old_settings['config_data'])
+                    ? $old_settings['config_data']
+                    : array();
+            $new_settings = ConfigFile::getInstance()->getConfigArray();
+            $diff_keys = array_keys(array_diff_assoc($old_settings, $new_settings)
+                    + array_diff_assoc($new_settings, $old_settings));
+            $check_keys = array('NaturalOrder', 'MainPageIconic', 'DefaultTabDatabase');
+            $check_keys = array_merge($check_keys, $forms['Left_frame']['Left_frame'],
+                 $forms['Left_frame']['Left_servers'], $forms['Left_frame']['Left_databases']);
+            $diff = array_intersect($check_keys, $diff_keys);
+            $refresh_left_frame = !empty($diff);
+
             // redirect
-            //$url_params = array('form' => $form_param);
-            //PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'user_preferences.php'
-            //        . PMA_generate_common_url($url_params, '&'));
-            //exit;
+            $url_params = array(
+                'form' => $form_param,
+                'saved' => 1,
+                'refresh_left_frame' => $refresh_left_frame);
+            PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'user_preferences.php'
+                    . PMA_generate_common_url($url_params, '&'));
+            exit;
         } else {
             $result->display();
         }

From c91c105da82609b81c28e002ae278d61ce019b24 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sun, 27 Jun 2010 12:43:54 +0200
Subject: [PATCH 027/106] added missing file

---
 libraries/config/config_functions.lib.php | 229 ++++++++++++++++++++++
 1 file changed, 229 insertions(+)
 create mode 100644 libraries/config/config_functions.lib.php

diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
new file mode 100644
index 000000000..b0fa9fd32
--- /dev/null
+++ b/libraries/config/config_functions.lib.php
@@ -0,0 +1,229 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Common config manipulation functions
+ *
+ * @package    phpMyAdmin
+ */
+
+/**
+ * Returns value of an element in $array given by $path.
+ * $path is a string describing position of an element in an associative array,
+ * eg. Servers/1/host refers to $array[Servers][1][host]
+ *
+ * @param  string   $path
+ * @param  array    $array
+ * @param  mixed    $default
+ * @return mixed    array element or $default
+ */
+function PMA_array_read($path, $array, $default = null)
+{
+    $keys = explode('/', $path);
+    $value =& $array;
+    foreach ($keys as $key) {
+        if (!isset($value[$key])) {
+            return $default;
+        }
+        $value =& $value[$key];
+    }
+    return $value;
+}
+
+/**
+ * Stores value in an array
+ *
+ * @param  string   $path
+ * @param  array    &$array
+ * @param  mixed    $value
+ */
+function PMA_array_write($path, &$array, $value)
+{
+    $keys = explode('/', $path);
+    $last_key = array_pop($keys);
+    $a =& $array;
+    foreach ($keys as $key) {
+        if (!isset($a[$key])) {
+            $a[$key] = array();
+        }
+        $a =& $a[$key];
+    }
+    $a[$last_key] = $value;
+}
+
+/**
+ * Removes value from an array
+ *
+ * @param  string   $path
+ * @param  array    &$array
+ * @param  mixed    $value
+ */
+function PMA_array_remove($path, &$array)
+{
+    $keys = explode('/', $path);
+    $keys_last = array_pop($keys);
+    $path = array();
+    $depth = 0;
+
+    $path[0] =& $array;
+    $found = true;
+    // go as deep as required or possible
+    foreach ($keys as $key) {
+        if (!isset($path[$depth][$key])) {
+            $found = false;
+            break;
+        }
+        $depth++;
+        $path[$depth] =& $path[$depth-1][$key];
+    }
+    // if element found, remove it
+    if ($found) {
+        unset($path[$depth][$keys_last]);
+        $depth--;
+    }
+
+    // remove empty nested arrays
+    for (; $depth >= 0; $depth--) {
+        if (!isset($path[$depth+1]) || count($path[$depth+1]) == 0) {
+            unset($path[$depth][$keys[$depth]]);
+        } else {
+            break;
+        }
+    }
+}
+
+/**
+ * Returns sanitized language string, taking into account our special codes
+ * for formatting. Takes variable number of arguments.
+ * Based on PMA_sanitize from sanitize.lib.php.
+ *
+ * @param  string  $lang_key key in $GLOBALS WITHOUT 'strSetup' prefix
+ * @param  mixed   $args     arguments for sprintf
+ * @return string
+ */
+function PMA_lang($lang_key)
+{
+    static $search, $replace;
+
+    // some quick cache'ing
+    if ($search === null) {
+        $replace_pairs = array(
+            '<'         => '&lt;',
+            '>'         => '&gt;',
+            '[em]'      => '<em>',
+            '[/em]'     => '</em>',
+            '[strong]'  => '<strong>',
+            '[/strong]' => '</strong>',
+            '[code]'    => '<code>',
+            '[/code]'   => '</code>',
+            '[kbd]'     => '<kbd>',
+            '[/kbd]'    => '</kbd>',
+            '[br]'      => '<br />',
+            '[sup]'     => '<sup>',
+            '[/sup]'    => '</sup>');
+        if (defined('PMA_SETUP')) {
+            $replace_pairs['[a@Documentation.html'] = '[a@../Documentation.html';
+        }
+        $search = array_keys($replace_pairs);
+        $replace = array_values($replace_pairs);
+    }
+    $message = isset($GLOBALS["strSetup$lang_key"]) ? $GLOBALS["strSetup$lang_key"] : $lang_key;
+    $message = str_replace($search, $replace, $message);
+    // replace [a@"$1"]$2[/a] with <a href="$1">$2</a>
+    $message = preg_replace('#\[a@("?)([^\]]+)\1\]([^\[]+)\[/a\]#e',
+        "PMA_lang_link_replace('$2', '$3')", $message);
+
+    if (func_num_args() == 1) {
+        return $message;
+    } else {
+        $args = func_get_args();
+        array_shift($args);
+        return vsprintf($message, $args);
+    }
+}
+
+/**
+ * Returns translated field name
+ *
+ * @param string $canonical_path
+ * @return string
+ */
+function PMA_lang_name($canonical_path)
+{
+    $lang_key = str_replace(
+    	array('Servers/1/', '/'),
+    	array('Servers/', '_'),
+    	$canonical_path) . '_name';
+    return isset($GLOBALS["strSetup$lang_key"])
+        ? $GLOBALS["strSetup$lang_key"]
+        : $lang_key;
+}
+
+/**
+ * Returns translated field description
+ *
+ * @param string $canonical_path
+ * @return string
+ */
+function PMA_lang_desc($canonical_path)
+{
+    $lang_key = str_replace(
+    	array('Servers/1/', '/'),
+    	array('Servers/', '_'),
+    	$canonical_path) . '_desc';
+    return isset($GLOBALS["strSetup$lang_key"])
+        ? PMA_lang($lang_key)
+        : '';
+}
+
+/**
+ * Wraps link in &lt;a&gt; tags and replaces argument separator in internal links
+ * to the one returned by PMA_get_arg_separator()
+ *
+ * @param string $link
+ * @param string $text
+ * @return string
+ */
+function PMA_lang_link_replace($link, $text)
+{
+    static $separator;
+
+    if (!isset($separator)) {
+        $separator = PMA_get_arg_separator('html');
+    }
+
+    if (!preg_match('#^http://#', $link)) {
+        $link = str_replace('&amp;', $separator, $link);
+    }
+
+    return '<a href="' . $link . '">' . $text . '</a>';
+}
+
+/**
+ * Reads user preferences field names
+ *
+ * @param array|null $forms
+ * @return array
+ */
+function PMA_read_userprefs_fieldnames(array $forms = null)
+{
+    static $names;
+
+    // return cached results
+    if ($names !== null) {
+        return $names;
+    }
+    if (is_null($forms)) {
+        $forms = array();
+        include 'libraries/config/user_preferences.forms.php';
+    }
+    $names = array();
+    foreach ($forms as $formset) {
+        foreach ($formset as $form) {
+            foreach ($form as $k => $v) {
+                $names[] = is_int($k) ? $v : $k;
+            }
+        }
+    }
+    return $names;
+}
+?>
\ No newline at end of file

From b13dee72f389bfda1eb3769e8d0abb54239fc057 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Thu, 1 Jul 2010 22:24:18 +0200
Subject: [PATCH 028/106] Import settings

---
 js/config.js                                | 24 +++++++++++++
 libraries/config.default.php                | 23 ++++++++++++-
 libraries/config.values.php                 |  6 ++++
 libraries/config/messages.inc.php           | 32 ++++++++++++++++-
 libraries/config/setup.forms.php            | 25 ++++++++++++++
 libraries/config/user_preferences.forms.php | 38 +++++++++++++++++++--
 setup/lib/validate.lib.php                  | 30 ++++++++++++++--
 7 files changed, 172 insertions(+), 6 deletions(-)

diff --git a/js/config.js b/js/config.js
index 85dc4c51f..aa2e41bd0 100644
--- a/js/config.js
+++ b/js/config.js
@@ -221,6 +221,30 @@ var validators = {
         var valid = this.value.match(/^(?:horizontal|vertical|[0-9]+)$/) != null;
         return valid ? true : PMA_messages['error_invalid_value']
     },
+    /**
+     * Validates string length - must be 1 character long
+     *
+     * @param {boolean} isKeyUp
+     */
+    validate_str1: function (isKeyUp) {
+        if (isKeyUp && this.value == '') {
+            return true;
+        }
+        var result = this.value.length == 1;
+        return result ? true : PMA_messages['error_invalid_value'];
+    },
+    /**
+     * Validates string length - must be 0 or 1 character long
+     *
+     * @param {boolean} isKeyUp
+     */
+    validate_str01: function (isKeyUp) {
+        if (isKeyUp && this.value == '') {
+            return true;
+        }
+        var result = this.value.length <= 1;
+        return result ? true : PMA_messages['error_invalid_value'];
+    },
     // field validators
     _field: {
     },
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 8db79c39b..810d25ff8 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -1726,7 +1726,7 @@ $cfg['Import']['allow_interrupt'] = true;
  *
  * @global integer $cfg['Import']['skip_queries']
  */
-$cfg['Import']['skip_queries'] = '0';
+$cfg['Import']['skip_queries'] = 0;
 
 /**
  *
@@ -1749,6 +1749,13 @@ $cfg['Import']['sql_no_auto_value_on_zero'] = true;
  */
 $cfg['Import']['csv_replace'] = false;
 
+/**
+ *
+ *
+ * @global boolean $cfg['Import']['csv_ignore']
+ */
+$cfg['Import']['csv_ignore'] = false;
+
 /**
  *
  *
@@ -1798,6 +1805,13 @@ $cfg['Import']['csv_col_names'] = false;
  */
 $cfg['Import']['ldi_replace'] = false;
 
+/**
+ *
+ *
+ * @global boolean $cfg['Import']['ldi_ignore']
+ */
+$cfg['Import']['ldi_ignore'] = false;
+
 /**
  *
  *
@@ -1882,6 +1896,13 @@ $cfg['Import']['xls_col_names'] = false;
  */
 $cfg['Import']['xls_empty_rows'] = true;
 
+/**
+ *
+ *
+ * @global string $cfg['Import']['xlsx_col_names']
+ */
+$cfg['Import']['xlsx_col_names'] = false;
+
 /**
  * Link to the official MySQL documentation.
  * Be sure to include no trailing slash on the path.
diff --git a/libraries/config.values.php b/libraries/config.values.php
index 522d2362f..f7978210e 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -102,6 +102,12 @@ $cfg_db['_validators'] = array(
     'CharTextareaRows' => 'validate_positive_number',
     'DefaultPropDisplay' => 'validate_DefaultPropDisplay',
     'ForeignKeyMaxLimit' => 'validate_positive_number',
+    'Import/csv_enclosed' => 'validate_str01',
+    'Import/csv_escaped' => 'validate_str1',
+    'Import/csv_terminated' => 'validate_str1',
+    'Import/ldi_enclosed' => 'validate_str01',
+    'Import/ldi_escaped' => 'validate_str1',
+    'Import/ldi_terminated' => 'validate_str1',
     'Import/skip_queries' => 'validate_non_negative_number',
     'InsertRows' => 'validate_positive_number',
     'LeftFrameTableLevel' => 'validate_positive_number',
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 490f32ec2..575a82b05 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -85,8 +85,12 @@ $strSetupForeignKeyMaxLimit_desc = __('A dropdown will be used if fewer items ar
 $strSetupForeignKeyMaxLimit_name = __('Foreign key limit');
 $strSetupForm_Browse = __('Browse mode');
 $strSetupForm_Browse_desc = __('Customize browse mode');
+$strSetupForm_Csv = __('CSV');
+$strSetupForm_Csv_desc = __('Customize default options');
 $strSetupForm_Edit_desc = __('Customize edit mode');
 $strSetupForm_Edit = __('Edit mode');
+$strSetupForm_Excel = __('Excel Workbook');
+$strSetupForm_Excel_desc = __('Customize default options');
 $strSetupForm_Export_defaults_desc = __('Customize default export options');
 $strSetupForm_Export_defaults = __('Export defaults');
 $strSetupForm_General = __('General settings');
@@ -94,6 +98,8 @@ $strSetupForm_Import_defaults_desc = __('Customize default common import options
 $strSetupForm_Import_defaults = __('Import defaults');
 $strSetupForm_Import_export_desc = __('Set import and export directories and compression options');
 $strSetupForm_Import_export = __('Import / export');
+$strSetupForm_Ldi = __('CSV using LOAD DATA');
+$strSetupForm_Ldi_desc = __('Customize default options');
 $strSetupForm_Left_databases = __('Databases');
 $strSetupForm_Left_databases_desc = __('Databases display options');
 $strSetupForm_Left_frame_desc = __('Customize appearance of the navigation frame');
@@ -103,12 +109,16 @@ $strSetupForm_Left_servers = __('Servers');
 $strSetupForm_Left_tables_desc = __('Tables display options');
 $strSetupForm_Left_tables = __('Tables');
 $strSetupForm_Main_frame = __('Main frame');
+$strSetupForm_Ods = __('Open Document Spreadsheet');
+$strSetupForm_Ods_desc = __('Customize default options');
 $strSetupForm_Other_core_settings_desc = __('Settings that didn\'t fit enywhere else');
 $strSetupForm_Other_core_settings = __('Other core settings');
 $strSetupForm_Query_window_desc = __('Customize query window options');
 $strSetupForm_Query_window = __('Query window');
 $strSetupForm_Page_titles = __('Page titles');
 $strSetupForm_Page_titles_desc = __('Specify browser\'s title bar text. Refer to [a@Documentation.html#cfg_TitleTable]documentation[/a] for magic strings that can be used to get special values.');
+$strSetupForm_Sql = __('SQL');
+$strSetupForm_Sql_desc = __('Customize default options');
 $strSetupForm_Security_desc = __('Please note that phpMyAdmin is just a user interface and its features do not limit MySQL');
 $strSetupForm_Security = __('Security');
 $strSetupForm_Server = __('Basic settings');
@@ -128,7 +138,7 @@ $strSetupFormset_Left_frame = __('Customize navigation frame');
 $strSetupFormset_Main_frame = __('Customize main frame');
 $strSetupForm_Sql_box_desc = __('Customize links shown in SQL Query boxes');
 $strSetupForm_Sql_box = __('SQL Query box');
-$strSetupForm_Sql_queries_desc = __('SQL queries settings, for SQL Query box options see [a@?page=form&amp;formset=main_frame#tab_Sql_box]Navigation frame[/a] settings');
+$strSetupForm_Sql_queries_desc = __('SQL queries settings, for SQL Query box options see [a@?page=form&amp;formset=Main_frame#tab_Sql_box]Navigation frame[/a] settings');
 $strSetupForm_Sql_queries = __('SQL queries');
 $strSetupForm_Startup_desc = __('Customize startup page');
 $strSetupForm_Startup = __('Startup');
@@ -142,10 +152,30 @@ $strSetupIgnoreMultiSubmitErrors_desc = __('If enabled, phpMyAdmin continues com
 $strSetupIgnoreMultiSubmitErrors_name = __('Ignore multiple statement errors');
 $strSetupImport_allow_interrupt_desc = __('Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.');
 $strSetupImport_allow_interrupt_name = __('Partial import: allow interrupt');
+$strSetupImport_csv_replace_name = __('Replace table data with file');
+$strSetupImport_csv_ignore_name = __('Ignore duplicate rows');
+$strSetupImport_csv_terminated_name = __('Columns terminated by');
+$strSetupImport_csv_enclosed_name = __('Columns enclosed by');
+$strSetupImport_csv_escaped_name = __('Columns escaped by');
+$strSetupImport_csv_col_names_name = __('Lines terminated by');
 $strSetupImport_format_desc = __('Default format; be aware that this list depends on location (database, table) and only SQL is always available');
 $strSetupImport_format_name = __('Format of imported file');
+$strSetupImport_ldi_replace_name = __('Replace table data with file');
+$strSetupImport_ldi_ignore_name = __('Ignore duplicate rows');
+$strSetupImport_ldi_terminated_name = __('Columns terminated by');
+$strSetupImport_ldi_enclosed_name = __('Columns enclosed by');
+$strSetupImport_ldi_escaped_name = __('Columns escaped by');
+$strSetupImport_ldi_local_option_name = __('Use LOCAL keyword');
+$strSetupImport_ods_col_names_name = __('Column names in first row');
+$strSetupImport_ods_empty_rows_name = __('Do not import empty rows');
+$strSetupImport_ods_recognize_percentages_name = __('Import percentages as proper decimals (12.00% to .12)');
+$strSetupImport_ods_recognize_currency_name = __('Import currencies ($5.00 to 5.00)');
+$strSetupImport_sql_compatibility_name = __('SQL compatibility mode');
+$strSetupImport_sql_no_auto_value_on_zero_name = __('Do not use AUTO_INCREMENT for zero values');
 $strSetupImport_skip_queries_desc = __('Number of queries to skip from start');
 $strSetupImport_skip_queries_name = __('Partial import: skip queries');
+$strSetupImport_xls_col_names_name = __('Column names in first row') . ' (Excel 97-2003)';
+$strSetupImport_xlsx_col_names_name = __('Column names in first row') . ' (Excel 2007+)';
 $strSetupInitialSlidersState_name = __('Initial state for sliders');
 $strSetupInsertRows_desc = __('How many rows can be inserted at one time');
 $strSetupInsertRows_name = __('Number of inserted rows');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 2ddc0e97a..b44d4e085 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -196,6 +196,31 @@ $forms['Import']['Import_defaults'] = array('Import' => array(
     'format',
     'allow_interrupt',
     'skip_queries'));
+$forms['Import']['Sql'] = array('Import' => array(
+    'sql_compatibility',
+    'sql_no_auto_value_on_zero'));
+$forms['Import']['Csv'] = array('Import' => array(
+    'csv_replace',
+    'csv_ignore',
+    'csv_terminated',
+    'csv_enclosed',
+    'csv_escaped',
+    'csv_col_names'));
+$forms['Import']['Ldi'] = array('Import' => array(
+    'ldi_replace',
+    'ldi_ignore',
+    'ldi_terminated',
+    'ldi_enclosed',
+    'ldi_escaped',
+    'ldi_local_option'));
+$forms['Import']['Excel'] = array('Import' => array(
+    'xls_col_names',
+    'xlsx_col_names'));
+$forms['Import']['Ods'] = array('Import' => array(
+    'ods_col_names',
+    'ods_empty_rows',
+    'ods_recognize_percentages',
+    'ods_recognize_currency'));
 $forms['Export']['Export_defaults'] = array('Export' => array(
     'format',
     'compression',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 98c9275d8..290bb1003 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -97,6 +97,40 @@ $forms['Main_frame']['Tabs'] = array(
     'DefaultTabServer',
     'DefaultTabDatabase',
     'DefaultTabTable');
-$forms['Import']['Import_defaults'] = array();
-$forms['Export']['Export_defaults'] = array();
+$forms['Import']['Import_defaults'] = array(
+    'Import/format',
+    'Import/allow_interrupt',
+    'Import/skip_queries');
+$forms['Import']['Sql'] = array(
+    'Import/sql_compatibility',
+    'Import/sql_no_auto_value_on_zero');
+$forms['Import']['Csv'] = array(
+    'Import/csv_replace',
+    'Import/csv_ignore',
+    'Import/csv_terminated',
+    'Import/csv_enclosed',
+    'Import/csv_escaped',
+    'Import/csv_col_names');
+$forms['Import']['Ldi'] = array(
+    'Import/ldi_replace',
+    'Import/ldi_ignore',
+    'Import/ldi_terminated',
+    'Import/ldi_enclosed',
+    'Import/ldi_escaped',
+    'Import/ldi_local_option');
+$forms['Import']['Excel'] = array(
+    'Import/xls_col_names',
+    'Import/xlsx_col_names');
+$forms['Import']['Ods'] = array(
+    'Import/ods_col_names',
+    'Import/ods_empty_rows',
+    'Import/ods_recognize_percentages',
+    'Import/ods_recognize_currency');
+$forms['Export']['Export_defaults'] = array(
+    'Export/format',
+    'Export/compression',
+    'Export/remember_file_template',
+    'Export/file_template_table',
+    'Export/file_template_database',
+    'Export/file_template_server');
 ?>
\ No newline at end of file
diff --git a/setup/lib/validate.lib.php b/setup/lib/validate.lib.php
index 34c5d98bb..47e81d10c 100644
--- a/setup/lib/validate.lib.php
+++ b/setup/lib/validate.lib.php
@@ -364,8 +364,8 @@ function validate_non_negative_number($path, $values)
 /**
  * Validates DefaultPropDisplay field
  *
- * @param  $path
- * @param  $values
+ * @param string $path
+ * @param array $values
  * @return array
  */
 function validate_DefaultPropDisplay($path, $values)
@@ -373,4 +373,30 @@ function validate_DefaultPropDisplay($path, $values)
     $result = preg_match('/^(?:horizontal|vertical|\d+)$/',  $values[$path]);
     return array($path => ($result ? '' : __('Incorrect value')));
 }
+
+/**
+ * Validates string length - must be 1 character long
+ *
+ * @param string $path
+ * @param array $values
+ * @return array
+ */
+function validate_str1($path, $values)
+{
+    $result = strlen($values[$path]) == 1;
+    return array($path => ($result ? '' : __('Incorrect value')));
+}
+
+/**
+ * Validates string length - must be 0 or 1 character long
+ *
+ * @param string $path
+ * @param array $values
+ * @return array
+ */
+function validate_str01($path, $values)
+{
+    $result = strlen($values[$path]) <= 1;
+    return array($path => ($result ? '' : __('Incorrect value')));
+}
 ?>
\ No newline at end of file

From 49c2562eaeb563b4cb2fe156f9ddc17211036d3c Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 3 Jul 2010 13:45:48 +0200
Subject: [PATCH 029/106] more flexible <select> declaration fix array export
 in ConfigFile

---
 libraries/config.values.php            | 1 +
 libraries/config/ConfigFile.class.php  | 2 +-
 libraries/config/Form.class.php        | 8 +++++++-
 libraries/config/FormDisplay.class.php | 8 ++------
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/libraries/config.values.php b/libraries/config.values.php
index f7978210e..e79ef04e5 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -83,6 +83,7 @@ $cfg_db['Export']['format'] = array('codegen', 'csv', 'excel', 'htmlexcel',
     'yaml');
 $cfg_db['Export']['compression'] = array('none', 'zip', 'gzip', 'bzip2');
 $cfg_db['Export']['charset'] = array_merge(array(''), $GLOBALS['cfg']['AvailableCharsets']);
+$cfg_db['Export']['codegen_format'] = array('#', 'NHibernate C# DO', 'NHibernate XML');
 
 /**
  * Default values overrides
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index 4eff1d13a..62b23e0c4 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -512,7 +512,7 @@ class ConfigFile
             // string keys: $cfg[key][subkey] = value
             foreach ($var_value as $k => $v) {
                 $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
-                $ret = "\$cfg['$var_name']['$k'] = " . var_export($v, true) . ';' . $crlf;
+                $ret .= "\$cfg['$var_name']['$k'] = " . var_export($v, true) . ';' . $crlf;
             }
         }
         return $ret;
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
index c0d4db086..6e2f99474 100644
--- a/libraries/config/Form.class.php
+++ b/libraries/config/Form.class.php
@@ -88,7 +88,13 @@ class Form
             trigger_error("$option_path - not a static value list", E_USER_ERROR);
             return array();
         }
-        return $value;
+        // convert value list array('a', 'b') to array('a' => 'a', 'b' => 'b')
+        // and array('#', 'a', 'b') to array('a', 'b')
+        if ($value[0] == '#') {
+            array_shift($value);
+            return $value;
+        }
+        return array_combine($value, $value);
     }
 
     /**
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index be643ac48..4e3f8d586 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -320,11 +320,7 @@ class FormDisplay
                 break;
             case 'select':
                 $type = 'select';
-                $opts['values'] = array();
-                $values = $form->getOptionValueList($form->fields[$field]);
-                foreach ($values as $v) {
-                    $opts['values'][$v] = $v;
-                }
+                $opts['values'] = $form->getOptionValueList($form->fields[$field]);
                 break;
             case 'array':
                 $type = 'list';
@@ -508,7 +504,7 @@ class FormDisplay
                         }
                         break;
                     case 'select':
-                        if (!$this->_validateSelect($_POST[$key], $form->getOptionValueList($system_path))) {
+                        if (!$this->_validateSelect($_POST[$key], array_keys($form->getOptionValueList($system_path)))) {
                             $this->errors[$work_path][] = __('Incorrect value');
                             $result = false;
                             continue;

From 9130ebb7b64f0a5d010e8af92b04a8cf006cccbf Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 3 Jul 2010 19:02:54 +0200
Subject: [PATCH 030/106] allow to group fields in forms

---
 libraries/config.values.php            |  2 +
 libraries/config/Form.class.php        | 26 +++++++++---
 libraries/config/FormDisplay.class.php |  8 ++++
 libraries/config/FormDisplay.tpl.php   | 57 ++++++++++++++++++++++++--
 setup/styles.css                       | 14 +++++++
 5 files changed, 99 insertions(+), 8 deletions(-)

diff --git a/libraries/config.values.php b/libraries/config.values.php
index e79ef04e5..33e120d77 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -84,6 +84,8 @@ $cfg_db['Export']['format'] = array('codegen', 'csv', 'excel', 'htmlexcel',
 $cfg_db['Export']['compression'] = array('none', 'zip', 'gzip', 'bzip2');
 $cfg_db['Export']['charset'] = array_merge(array(''), $GLOBALS['cfg']['AvailableCharsets']);
 $cfg_db['Export']['codegen_format'] = array('#', 'NHibernate C# DO', 'NHibernate XML');
+$cfg_db['Export']['excel_edition'] = array('win' => 'Windows',
+    'mac_excel2003' => 'Excel 2003 / Macintosh', 'mac_excel2008' => 'Excel 2008 / Macintosh');
 
 /**
  * Default values overrides
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
index 6e2f99474..e91f03d2e 100644
--- a/libraries/config/Form.class.php
+++ b/libraries/config/Form.class.php
@@ -88,13 +88,25 @@ class Form
             trigger_error("$option_path - not a static value list", E_USER_ERROR);
             return array();
         }
-        // convert value list array('a', 'b') to array('a' => 'a', 'b' => 'b')
-        // and array('#', 'a', 'b') to array('a', 'b')
-        if ($value[0] == '#') {
+        // convert array('#', 'a', 'b') to array('a', 'b')
+        if (isset($value[0]) && $value[0] == '#') {
+            // remove first element ('#')
             array_shift($value);
-            return $value;
+        } else {
+            // convert value list array('a', 'b') to array('a' => 'a', 'b' => 'b')
+            $has_string_keys = false;
+            for ($i = 0; $i < count($value); $i++) {
+                if (!isset($value[$i])) {
+                    $has_string_keys = true;
+                    break;
+                }
+            }
+            if (!$has_string_keys) {
+                $value = array_combine($value, $value);
+            }
         }
-        return array_combine($value, $value);
+        // $value has keys and value names, return it
+        return $value;
     }
 
     /**
@@ -148,6 +160,10 @@ class Form
     {
         $cf = ConfigFile::getInstance();
         foreach ($this->fields as $name => $path) {
+            if (strpos($name, ':group:') === 0) {
+                $this->fieldsTypes[$name] = 'group';
+                continue;
+            }
             $v = $cf->getDbEntry($path);
             if ($v !== null) {
                 $type = is_array($v) ? 'select' : $v;
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 4e3f8d586..c20e926ef 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -327,6 +327,14 @@ class FormDisplay
                 $value = (array) $value;
                 $value_default = (array) $value_default;
                 break;
+            case 'group':
+                $text = substr($field, 7);
+                if ($text != 'end') {
+                    display_group_header($text);
+                } else {
+                    display_group_footer();
+                }
+                return;
             case 'NULL':
             	trigger_error("Field $system_path has no type", E_USER_WARNING);
             	return;
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 2ec8142cd..efdb22433 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -66,6 +66,10 @@ function display_tabs_top($tabs) {
  */
 function display_fieldset_top($title = '', $description = '', $errors = null, $attributes = array())
 {
+    global $_FormDisplayGroup;
+
+    $_FormDisplayGroup = false;
+
     $attributes = array_merge(array('class' => 'optbox'), $attributes);
     foreach ($attributes as $k => &$attr) {
         $attr = $k . '="' . htmlspecialchars($attr) . '"';
@@ -113,6 +117,7 @@ function display_fieldset_top($title = '', $description = '', $errors = null, $a
  */
 function display_input($path, $name, $description = '', $type, $value, $value_is_default = true, $opts = null)
 {
+    global $_FormDisplayGroup;
     static $base_dir, $img_path;
 
     $is_setup_script = defined('PMA_SETUP') && PMA_SETUP;
@@ -129,8 +134,17 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
     }
     $field_class = $field_class ? ' class="' . $field_class . '"' : '';
     $name_id = 'name="' . $path . '" id="' . $path . '"';
+    $tr_class = $_FormDisplayGroup ? ' class="group-field"' : '';
+    if (isset($opts['setvalue']) && $opts['setvalue'] == ':group') {
+        unset($opts['setvalue']);
+        $tr_class = ' class="group-header"';
+        if ($_FormDisplayGroup) {
+            display_group_footer();
+        }
+        $_FormDisplayGroup = true;
+    }
 ?>
-<tr>
+<tr<?php echo $tr_class ?>>
     <th>
         <label for="<?php echo htmlspecialchars($path) ?>"><?php echo $name ?></label>
         <?php if (!empty($opts['doc']) || !empty($opts['wiki'])): ?>
@@ -229,9 +243,46 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
 }
 
 /**
- * Displays bottom part of a fieldset
+ * Display group header
  *
- * @param array $js_array
+ * @param string $header_text
+ */
+function display_group_header($header_text)
+{
+    global $_FormDisplayGroup;
+
+    if ($_FormDisplayGroup) {
+        display_group_footer();
+    }
+    $_FormDisplayGroup = true;
+    if (!$header_text) {
+        return;
+    }
+    $colspan = 2;
+    if (defined('PMA_SETUP') && PMA_SETUP) {
+        $colspan++;
+    }
+?>
+<tr class="group-header">
+    <th colspan="<?php echo $colspan ?>">
+        <?php echo $header_text ?>
+    </th>
+</tr>
+<?php
+}
+
+/**
+ * Display group footer
+ */
+function display_group_footer()
+{
+    global $_FormDisplayGroup;
+
+    $_FormDisplayGroup = false;
+}
+
+/**
+ * Displays bottom part of a fieldset
  */
 function display_fieldset_bottom()
 {
diff --git a/setup/styles.css b/setup/styles.css
index fc14a3235..09b2a3e6b 100644
--- a/setup/styles.css
+++ b/setup/styles.css
@@ -286,6 +286,20 @@ fieldset th, fieldset td, .form .lastrow {
     border-top: 1px #555 dotted;
 }
 
+fieldset .group-header th, fieldset .group-header td {
+    background: #F7FBFF;
+    border: 0 #DEE1FF solid;
+    border-width: 2px 0 0 0.5em;
+}
+
+fieldset .group-header td {
+    border-left: none;
+}
+
+fieldset .group-field th {
+    padding-left: 1em;
+}
+
 fieldset .lastrow, .form .lastrow {
     background: #F7FBFF;
     padding: 0.5em;

From 2fab9fbf28a26cb59ecd8d14a0181ab4773bd245 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 3 Jul 2010 22:45:14 +0200
Subject: [PATCH 031/106] Export options

---
 libraries/config.default.php                | 23 ++++-
 libraries/config.values.php                 |  4 +-
 libraries/config/messages.inc.php           | 88 +++++++++++++++++--
 libraries/config/setup.forms.php            | 96 ++++++++++++++++++++-
 libraries/config/user_preferences.forms.php | 93 +++++++++++++++++++-
 5 files changed, 291 insertions(+), 13 deletions(-)

diff --git a/libraries/config.default.php b/libraries/config.default.php
index 810d25ff8..030ccca42 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -1139,6 +1139,13 @@ $cfg['Export']['file_template_database'] = '__DB__';
  */
 $cfg['Export']['file_template_server'] = '__SERVER__';
 
+/**
+ * 
+ *
+ * @global $cfg['Export']['codegen_format']
+ */
+$cfg['Export']['codegen_format'] = 0;
+
 /**
  *
  *
@@ -1328,6 +1335,13 @@ $cfg['Export']['csv_escaped'] = '\\';
  */
 $cfg['Export']['csv_terminated'] = 'AUTO';
 
+/**
+ *
+ *
+ * @global string $cfg['Export']['csv_removeCRLF']
+ */
+$cfg['Export']['csv_removeCRLF'] = false;
+
 /**
  *
  *
@@ -1349,6 +1363,13 @@ $cfg['Export']['excel_null'] = 'NULL';
  */
 $cfg['Export']['excel_edition'] = 'win';
 
+/**
+ *
+ *
+ * @global string $cfg['Export']['excel_removeCRLF']
+ */
+$cfg['Export']['excel_removeCRLF'] = false;
+
 /**
  *
  *
@@ -1587,7 +1608,7 @@ $cfg['Export']['sql_hex_for_blob'] = true;
  *
  * @global string $cfg['Export']['sql_type']
  */
-$cfg['Export']['sql_type'] = 'insert';
+$cfg['Export']['sql_type'] = 'INSERT';
 
 /**
  *
diff --git a/libraries/config.values.php b/libraries/config.values.php
index 33e120d77..e65a0d5a8 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -71,7 +71,7 @@ $cfg_db['Import']['format'] = array(
     'docsql', // DocSQL
     'ldi',    // CSV using LOAD DATA
     'sql');   // SQL
-$cfg_db['Import']['sql_compatibility'] = array(
+$cfg_db['Import']['sql_compatibility'] = $cfg_db['Export']['sql_compatibility'] = array(
     'NONE', 'ANSI', 'DB2', 'MAXDB', 'MYSQL323', 'MYSQL40', 'MSSQL', 'ORACLE',
     // removed; in MySQL 5.0.33, this produces exports that
     // can't be read by POSTGRESQL (see our bug #1596328)
@@ -86,6 +86,7 @@ $cfg_db['Export']['charset'] = array_merge(array(''), $GLOBALS['cfg']['Available
 $cfg_db['Export']['codegen_format'] = array('#', 'NHibernate C# DO', 'NHibernate XML');
 $cfg_db['Export']['excel_edition'] = array('win' => 'Windows',
     'mac_excel2003' => 'Excel 2003 / Macintosh', 'mac_excel2008' => 'Excel 2008 / Macintosh');
+$cfg_db['Export']['sql_type'] = array('INSERT', 'UPDATE', 'REPLACE');
 
 /**
  * Default values overrides
@@ -104,6 +105,7 @@ $cfg_db['_validators'] = array(
     'CharTextareaCols' => 'validate_positive_number',
     'CharTextareaRows' => 'validate_positive_number',
     'DefaultPropDisplay' => 'validate_DefaultPropDisplay',
+    'Export/sql_max_query_size' => 'validate_positive_number',
     'ForeignKeyMaxLimit' => 'validate_positive_number',
     'Import/csv_enclosed' => 'validate_str01',
     'Import/csv_escaped' => 'validate_str1',
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 575a82b05..0e445795e 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -69,14 +69,84 @@ $strSetupExecTimeLimit_desc = __('Set the number of seconds a script is allowed
 $strSetupExecTimeLimit_name = __('Maximum execution time');
 $strSetupExport_asfile_name = __('Save as file');
 $strSetupExport_charset_name = __('Character set of the file');
+$strSetupExport_codegen_format_name = __('Format');
 $strSetupExport_compression_name = __('Compression');
+$strSetupExport_csv_columns_name = __('Put columns names in the first row');
+$strSetupExport_csv_enclosed_name = __('Columns enclosed by');
+$strSetupExport_csv_escaped_name = __('Columns escaped by');
+$strSetupExport_csv_null_name = __('Replace NULL by');
+$strSetupExport_csv_removeCRLF_name = __('Remove CRLF characters within columns');
+$strSetupExport_csv_separator_name = __('Columns terminated by');
+$strSetupExport_csv_terminated_name = __('Lines terminated by');
+$strSetupExport_excel_columns_name = __('Put columns names in the first row');
+$strSetupExport_excel_edition_name = __('Excel edition');
+$strSetupExport_excel_null_name = __('Replace NULL by');
+$strSetupExport_excel_removeCRLF_name = __('Remove CRLF characters within columns');
 $strSetupExport_file_template_database_name = __('Database name template');
 $strSetupExport_file_template_server_name = __('Server name template');
 $strSetupExport_file_template_table_name = __('Table name template');
 $strSetupExport_format_name = __('Format');
+$strSetupExport_htmlword_columns_name = __('Put columns names in the first row');
+$strSetupExport_htmlword_data_name = __('Data');
+$strSetupExport_htmlword_null_name = __('Replace NULL by');
+$strSetupExport_htmlword_structure_name = __('Structure');
+$strSetupExport_latex_caption_name = __('Include table caption');
+$strSetupExport_latex_columns_name = __('Put columns names in the first row');
+$strSetupExport_latex_comments_name = __('Comments');
+$strSetupExport_latex_data_caption_name = __('Table caption');
+$strSetupExport_latex_data_continued_caption_name = __('Continued table caption');
+$strSetupExport_latex_data_label_name = __('Label key');
+$strSetupExport_latex_data_name = __('Data');
+$strSetupExport_latex_mime_name = __('MIME type');
+$strSetupExport_latex_null_name  = __('Replace NULL by');
+$strSetupExport_latex_relation_name = __('Relations');
+$strSetupExport_latex_structure_caption_name = __('Table caption');
+$strSetupExport_latex_structure_continued_caption_name = __('Continued table caption');
+$strSetupExport_latex_structure_label_name = __('Label key');
+$strSetupExport_latex_structure_name = __('Structure');
+$strSetupExport_ods_columns_name = __('Put columns names in the first row');
+$strSetupExport_ods_null_name = __('Replace NULL by');
+$strSetupExport_odt_columns_name = __('Put columns names in the first row');
+$strSetupExport_odt_comments_name = __('Comments');
+$strSetupExport_odt_data_name = __('Data');
+$strSetupExport_odt_mime_name = __('MIME type');
+$strSetupExport_odt_null_name = __('Replace NULL by');
+$strSetupExport_odt_relation_name = __('Relations');
+$strSetupExport_odt_structure_name = __('Structure');
 $strSetupExport_onserver_name = __('Save on server');
 $strSetupExport_onserver_overwrite_name = __('Overwrite existing file(s)');
+$strSetupExport_sql_auto_increment_name = __('Add AUTO_INCREMENT value');
+$strSetupExport_sql_backquotes_name = __('Enclose table and column names with backquotes');
+$strSetupExport_sql_columns_name = __('Complete inserts');
+$strSetupExport_sql_compatibility_name = __('SQL compatibility mode');
+$strSetupExport_sql_data_name = __('Data');
+$strSetupExport_sql_dates_name = __('Creation/Update/Check dates');
+$strSetupExport_sql_delayed_name = __('Use delayed inserts');
+$strSetupExport_sql_disable_fk_name = __('Disable foreign key checks');
+$strSetupExport_sql_drop_database_name = sprintf(__('Add %s'), 'DROP DATABASE');
+$strSetupExport_sql_drop_table_name = sprintf(__('Add %s'), 'DROP TABLE / VIEW / PROCEDURE / FUNCTION / EVENT');
+$strSetupExport_sql_extended_name = __('Extended inserts');
+$strSetupExport_sql_hex_for_blob_name = __('Use hexadecimal for BLOB');
+$strSetupExport_sql_if_not_exists_name = sprintf(__('Add %s'), 'IF NOT EXISTS');
+$strSetupExport_sql_ignore_name = __('Use ignore inserts');
+$strSetupExport_sql_include_comments_name = __('Comments');
+$strSetupExport_sql_max_query_size_name = __('Maximal length of created query');
+$strSetupExport_sql_mime_name = __('MIME type');
+$strSetupExport_sql_procedure_function_name = sprintf(__('Add %s'), 'CREATE PROCEDURE / FUNCTION / EVENT');
+$strSetupExport_sql_relation_name = __('Relations');
+$strSetupExport_sql_structure_name = __('Structure');
+$strSetupExport_sql_type_name = __('Export type');
+$strSetupExport_sql_use_transaction_name = __('Enclose export in a transaction');
+$strSetupExport_sql_utc_time_name = __('Export time in UTC');
 $strSetupExport_remember_file_template_name = __('Remember file name template');
+$strSetupExport_texytext_columns_name = __('Put columns names in the first row');
+$strSetupExport_texytext_data_name = __('Data');
+$strSetupExport_texytext_null_name = __('Replace NULL by');
+$strSetupExport_texytext_structure_name = __('Structure');
+$strSetupExport_xls_columns_name = __('Put columns names in the first row');
+$strSetupExport_xls_null_name = __('Replace NULL by');
+$strSetupExport_xlsx_columns_name = __('Put columns names in the first row');
+$strSetupExport_xlsx_null_name = __('Replace NULL by');
 $strSetupForceSSL_desc = __('Force secured connection while using phpMyAdmin');
 $strSetupForceSSL_name = __('Force SSL connection');
 $strSetupForeignKeyDropdownOrder_desc = __('Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is the referenced data, [kbd]id[/kbd] is the key value');
@@ -85,12 +155,12 @@ $strSetupForeignKeyMaxLimit_desc = __('A dropdown will be used if fewer items ar
 $strSetupForeignKeyMaxLimit_name = __('Foreign key limit');
 $strSetupForm_Browse = __('Browse mode');
 $strSetupForm_Browse_desc = __('Customize browse mode');
+$strSetupForm_CodeGen = 'CodeGen';
+$strSetupForm_CodeGen_desc = __('Customize default options');
 $strSetupForm_Csv = __('CSV');
 $strSetupForm_Csv_desc = __('Customize default options');
 $strSetupForm_Edit_desc = __('Customize edit mode');
 $strSetupForm_Edit = __('Edit mode');
-$strSetupForm_Excel = __('Excel Workbook');
-$strSetupForm_Excel_desc = __('Customize default options');
 $strSetupForm_Export_defaults_desc = __('Customize default export options');
 $strSetupForm_Export_defaults = __('Export defaults');
 $strSetupForm_General = __('General settings');
@@ -98,6 +168,8 @@ $strSetupForm_Import_defaults_desc = __('Customize default common import options
 $strSetupForm_Import_defaults = __('Import defaults');
 $strSetupForm_Import_export_desc = __('Set import and export directories and compression options');
 $strSetupForm_Import_export = __('Import / export');
+$strSetupForm_Latex = __('LaTeX');
+$strSetupForm_Latex_desc = __('Customize default options');
 $strSetupForm_Ldi = __('CSV using LOAD DATA');
 $strSetupForm_Ldi_desc = __('Customize default options');
 $strSetupForm_Left_databases = __('Databases');
@@ -109,8 +181,10 @@ $strSetupForm_Left_servers = __('Servers');
 $strSetupForm_Left_tables_desc = __('Tables display options');
 $strSetupForm_Left_tables = __('Tables');
 $strSetupForm_Main_frame = __('Main frame');
-$strSetupForm_Ods = __('Open Document Spreadsheet');
-$strSetupForm_Ods_desc = __('Customize default options');
+$strSetupForm_Microsoft_Office = __('Microsoft Office');
+$strSetupForm_Microsoft_Office_desc = __('Customize default options');
+$strSetupForm_Open_Document = __('Open Document');
+$strSetupForm_Open_Document_desc = __('Customize default options');
 $strSetupForm_Other_core_settings_desc = __('Settings that didn\'t fit enywhere else');
 $strSetupForm_Other_core_settings = __('Other core settings');
 $strSetupForm_Query_window_desc = __('Customize query window options');
@@ -131,6 +205,8 @@ $strSetupForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain acce
 $strSetupForm_Server_pmadb = __('PMA database');
 $strSetupForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.');
 $strSetupForm_Server_tracking = __('Changes tracking');
+$strSetupForm_Texy = __('Texy! text');
+$strSetupForm_Texy_desc = __('Customize default options');
 $strSetupFormset_Export = __('Customize export options');
 $strSetupFormset_Features = __('Features');
 $strSetupFormset_Import = __('Customize import defaults');
@@ -174,8 +250,8 @@ $strSetupImport_sql_compatibility_name = __('SQL compatibility mode');
 $strSetupImport_sql_no_auto_value_on_zero_name = __('Do not use AUTO_INCREMENT for zero values');
 $strSetupImport_skip_queries_desc = __('Number of queries to skip from start');
 $strSetupImport_skip_queries_name = __('Partial import: skip queries');
-$strSetupImport_xls_col_names_name = __('Column names in first row') . ' (Excel 97-2003)';
-$strSetupImport_xlsx_col_names_name = __('Column names in first row') . ' (Excel 2007+)';
+$strSetupImport_xls_col_names_name = __('Column names in first row');
+$strSetupImport_xlsx_col_names_name = __('Column names in first row');
 $strSetupInitialSlidersState_name = __('Initial state for sliders');
 $strSetupInsertRows_desc = __('How many rows can be inserted at one time');
 $strSetupInsertRows_name = __('Number of inserted rows');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index b44d4e085..377f82839 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -213,10 +213,13 @@ $forms['Import']['Ldi'] = array('Import' => array(
     'ldi_enclosed',
     'ldi_escaped',
     'ldi_local_option'));
-$forms['Import']['Excel'] = array('Import' => array(
+$forms['Import']['Microsoft_Office'] = array('Import' => array(
+    ':group:' . __('Excel 97-2003 XLS Workbook'),
     'xls_col_names',
+    ':group:' . __('Excel 2007 XLSX Workbook'),
     'xlsx_col_names'));
-$forms['Import']['Ods'] = array('Import' => array(
+$forms['Import']['Open_Document'] = array('Import' => array(
+    ':group:' . __('Open Document Spreadsheet'),
     'ods_col_names',
     'ods_empty_rows',
     'ods_recognize_percentages',
@@ -224,12 +227,99 @@ $forms['Import']['Ods'] = array('Import' => array(
 $forms['Export']['Export_defaults'] = array('Export' => array(
     'format',
     'compression',
-    'asfile',
     'charset',
+    'asfile' => ':group',
     'onserver',
     'onserver_overwrite',
+    ':group:end',
     'remember_file_template',
     'file_template_table',
     'file_template_database',
     'file_template_server'));
+$forms['Export']['Sql'] = array('Export' => array(
+    'sql_include_comments',
+    'sql_use_transaction',
+    'sql_disable_fk',
+    'sql_compatibility',
+    ':group:' . __('Database export options'),
+    'sql_drop_database',
+    'sql_structure' => ':group',
+    'sql_drop_table',
+    'sql_if_not_exists',
+    'sql_auto_increment',
+    'sql_backquotes',
+    'sql_procedure_function',
+    ':group:' . __('Add into comments'),
+    'sql_dates',
+    'sql_relation',
+    'sql_mime',
+    'sql_data' => ':group',
+    'sql_columns',
+    'sql_extended',
+    'sql_max_query_size',
+    'sql_delayed',
+    'sql_ignore',
+    'sql_hex_for_blob',
+    'sql_utc_time',
+    'sql_type'));
+$forms['Export']['CodeGen'] = array('Export' => array(
+    'codegen_format'));
+$forms['Export']['Csv'] = array('Export' => array(
+    ':group:' . __('CSV'),
+    'csv_separator',
+    'csv_enclosed',
+    'csv_escaped',
+    'csv_terminated',
+    'csv_null',
+    'csv_removeCRLF',
+    'csv_columns',
+    ':group:' . __('CSV for MS Excel'),
+    'excel_null',
+    'excel_removeCRLF',
+    'excel_columns',
+    'excel_edition'));
+$forms['Export']['Latex'] = array('Export' => array(
+    'latex_caption',
+    'latex_structure' => ':group',
+    'latex_structure_caption',
+    'latex_structure_continued_caption',
+    'latex_structure_label',
+    'latex_relation',
+    'latex_comments',
+    'latex_mime',
+    'latex_data' => ':group',
+    'latex_columns',
+    'latex_data_caption',
+    'latex_data_continued_caption',
+    'latex_data_label',
+    'latex_null'));
+$forms['Export']['Microsoft_Office'] = array('Export' => array(
+    ':group:' . __('Excel 97-2003 XLS Workbook'),
+    'xls_null',
+    'xls_columns',
+    ':group:' . __('Excel 2007 XLSX Workbook'),
+    'xlsx_null',
+    'xlsx_columns',
+    ':group:' . __('Microsoft Word 2000'),
+    'htmlword_structure',
+    'htmlword_data',
+    'htmlword_null',
+    'htmlword_columns'));
+$forms['Export']['Open_Document'] = array('Export' => array(
+    ':group:' . __('Open Document Spreadsheet'),
+    'ods_null',
+    'ods_columns',
+    ':group:' . __('Open Document Text'),
+    'odt_structure' => ':group',
+    'odt_relation',
+    'odt_comments',
+    'odt_mime',
+    'odt_data' => ':group',
+    'odt_columns',
+    'odt_null'));
+$forms['Export']['Texy'] = array('Export' => array(
+    'texytext_structure',
+    'texytext_data' => ':group',
+    'texytext_null',
+    'texytext_columns'));
 ?>
\ No newline at end of file
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 290bb1003..e28cf09b9 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -118,10 +118,13 @@ $forms['Import']['Ldi'] = array(
     'Import/ldi_enclosed',
     'Import/ldi_escaped',
     'Import/ldi_local_option');
-$forms['Import']['Excel'] = array(
+$forms['Import']['Microsoft_Office'] = array(
+    ':group:' . __('Excel 97-2003 XLS Workbook'),
     'Import/xls_col_names',
+    ':group:' . __('Excel 2007 XLSX Workbook'),
     'Import/xlsx_col_names');
-$forms['Import']['Ods'] = array(
+$forms['Import']['Open_Document'] = array(
+    ':group:' . __('Open Document Spreadsheet'),
     'Import/ods_col_names',
     'Import/ods_empty_rows',
     'Import/ods_recognize_percentages',
@@ -133,4 +136,90 @@ $forms['Export']['Export_defaults'] = array(
     'Export/file_template_table',
     'Export/file_template_database',
     'Export/file_template_server');
+$forms['Export']['Sql'] = array(
+    'Export/sql_include_comments',
+    'Export/sql_use_transaction',
+    'Export/sql_disable_fk',
+    'Export/sql_compatibility',
+    ':group:' . __('Database export options'),
+    'Export/sql_drop_database',
+    'Export/sql_structure' => ':group',
+    'Export/sql_drop_table',
+    'Export/sql_if_not_exists',
+    'Export/sql_auto_increment',
+    'Export/sql_backquotes',
+    'Export/sql_procedure_function',
+    ':group:' . __('Add into comments'),
+    'Export/sql_dates',
+    'Export/sql_relation',
+    'Export/sql_mime',
+    'Export/sql_data' => ':group',
+    'Export/sql_columns',
+    'Export/sql_extended',
+    'Export/sql_max_query_size',
+    'Export/sql_delayed',
+    'Export/sql_ignore',
+    'Export/sql_hex_for_blob',
+    'Export/sql_utc_time',
+    'Export/sql_type');
+$forms['Export']['CodeGen'] = array(
+    'Export/codegen_format');
+$forms['Export']['Csv'] = array(
+    ':group:' . __('CSV'),
+    'Export/csv_separator',
+    'Export/csv_enclosed',
+    'Export/csv_escaped',
+    'Export/csv_terminated',
+    'Export/csv_null',
+    'Export/csv_removeCRLF',
+    'Export/csv_columns',
+    ':group:' . __('CSV for MS Excel'),
+    'Export/excel_null',
+    'Export/excel_removeCRLF',
+    'Export/excel_columns',
+    'Export/excel_edition');
+$forms['Export']['Latex'] = array(
+    'Export/latex_caption',
+    'Export/latex_structure' => ':group',
+    'Export/latex_structure_caption',
+    'Export/latex_structure_continued_caption',
+    'Export/latex_structure_label',
+    'Export/latex_relation',
+    'Export/latex_comments',
+    'Export/latex_mime',
+    'Export/latex_data' => ':group',
+    'Export/latex_columns',
+    'Export/latex_data_caption',
+    'Export/latex_data_continued_caption',
+    'Export/latex_data_label',
+    'Export/latex_null');
+$forms['Export']['Microsoft_Office'] = array(
+    ':group:' . __('Excel 97-2003 XLS Workbook'),
+    'Export/xls_null',
+    'Export/xls_columns',
+    ':group:' . __('Excel 2007 XLSX Workbook'),
+    'Export/xlsx_null',
+    'Export/xlsx_columns',
+    ':group:' . __('Microsoft Word 2000'),
+    'Export/htmlword_structure',
+    'Export/htmlword_data',
+    'Export/htmlword_null',
+    'Export/htmlword_columns');
+$forms['Export']['Open_Document'] = array(
+    ':group:' . __('Open Document Spreadsheet'),
+    'Export/ods_null',
+    'Export/ods_columns',
+    ':group:' . __('Open Document Text'),
+    'Export/odt_structure' => ':group',
+    'Export/odt_relation',
+    'Export/odt_comments',
+    'Export/odt_mime',
+    'Export/odt_data' => ':group',
+    'Export/odt_columns',
+    'Export/odt_null');
+$forms['Export']['Texy'] = array(
+    'Export/texytext_structure',
+    'Export/texytext_data' => ':group',
+    'Export/texytext_null',
+    'Export/texytext_columns');
 ?>
\ No newline at end of file

From a3d46e16e2891fc766cda9dd85aff6df8c5746ca Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 3 Jul 2010 22:50:06 +0200
Subject: [PATCH 032/106] sort messages

---
 libraries/config/messages.inc.php | 138 +++++++++++++++---------------
 1 file changed, 69 insertions(+), 69 deletions(-)

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 0e445795e..cb033a0dc 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -42,8 +42,8 @@ $strSetupDefaultCharset_desc = __('Default character set used for conversions');
 $strSetupDefaultCharset_name = __('Default character set');
 $strSetupDefaultDisplay_name = __('Default display direction');
 $strSetupDefaultLanguage = __('Default language');
-$strSetupDefaultPropDisplay_name = __('Display direction for altering/creating columns');
 $strSetupDefaultPropDisplay_desc = __('[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates maximum number for which vertical model is used');
+$strSetupDefaultPropDisplay_name = __('Display direction for altering/creating columns');
 $strSetupDefaultServer = __('Default server');
 $strSetupDefaultTabDatabase_desc = __('Tab that is displayed when entering a database');
 $strSetupDefaultTabDatabase_name = __('Default database tab');
@@ -51,20 +51,20 @@ $strSetupDefaultTabServer_desc = __('Tab that is displayed when entering a serve
 $strSetupDefaultTabServer_name = __('Default server tab');
 $strSetupDefaultTabTable_desc = __('Tab that is displayed when entering a table');
 $strSetupDefaultTabTable_name = __('Default table tab');
-$strSetupDisplayBinaryAsHex_name = __('Show binary contents as HEX');
+$strSetupDisplay = __('Display');
 $strSetupDisplayBinaryAsHex_desc = __('Show binary contents as HEX by default');
+$strSetupDisplayBinaryAsHex_name = __('Show binary contents as HEX');
 $strSetupDisplayDatabasesList_desc = __('Show database listing as a list instead of a drop down');
 $strSetupDisplayDatabasesList_name = __('Display databases as a list');
-$strSetupDisplay = __('Display');
 $strSetupDisplayServersList_desc = __('Show server listing as a list instead of a drop down');
 $strSetupDisplayServersList_name = __('Display servers as a list');
 $strSetupDonateLink = __('Donate');
 $strSetupDownload = __('Download');
-$strSetupEditInWindow_name = __('Edit in window');
 $strSetupEditInWindow_desc = __('Edit SQL queries in popup window');
+$strSetupEditInWindow_name = __('Edit in window');
 $strSetupEndOfLine = __('End of line');
-$strSetupErrorIconic_name = __('Iconic errors');
 $strSetupErrorIconic_desc = __('Show icons for warning, error and information messages');
+$strSetupErrorIconic_name = __('Iconic errors');
 $strSetupExecTimeLimit_desc = __('Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)');
 $strSetupExecTimeLimit_name = __('Maximum execution time');
 $strSetupExport_asfile_name = __('Save as file');
@@ -115,6 +115,7 @@ $strSetupExport_odt_relation_name = __('Relations');
 $strSetupExport_odt_structure_name = __('Structure');
 $strSetupExport_onserver_name = __('Save on server');
 $strSetupExport_onserver_overwrite_name = __('Overwrite existing file(s)');
+$strSetupExport_remember_file_template_name = __('Remember file name template');
 $strSetupExport_sql_auto_increment_name = __('Add AUTO_INCREMENT value');
 $strSetupExport_sql_backquotes_name = __('Enclose table and column names with backquotes');
 $strSetupExport_sql_columns_name = __('Complete inserts');
@@ -138,7 +139,6 @@ $strSetupExport_sql_structure_name = __('Structure');
 $strSetupExport_sql_type_name = __('Export type');
 $strSetupExport_sql_use_transaction_name = __('Enclose export in a transaction');
 $strSetupExport_sql_utc_time_name = __('Export time in UTC');
-$strSetupExport_remember_file_template_name = __('Remember file name template');
 $strSetupExport_texytext_columns_name = __('Put columns names in the first row');
 $strSetupExport_texytext_data_name = __('Data');
 $strSetupExport_texytext_null_name = __('Replace NULL by');
@@ -159,67 +159,67 @@ $strSetupForm_CodeGen = 'CodeGen';
 $strSetupForm_CodeGen_desc = __('Customize default options');
 $strSetupForm_Csv = __('CSV');
 $strSetupForm_Csv_desc = __('Customize default options');
-$strSetupForm_Edit_desc = __('Customize edit mode');
 $strSetupForm_Edit = __('Edit mode');
-$strSetupForm_Export_defaults_desc = __('Customize default export options');
+$strSetupForm_Edit_desc = __('Customize edit mode');
 $strSetupForm_Export_defaults = __('Export defaults');
+$strSetupForm_Export_defaults_desc = __('Customize default export options');
 $strSetupForm_General = __('General settings');
-$strSetupForm_Import_defaults_desc = __('Customize default common import options');
 $strSetupForm_Import_defaults = __('Import defaults');
-$strSetupForm_Import_export_desc = __('Set import and export directories and compression options');
+$strSetupForm_Import_defaults_desc = __('Customize default common import options');
 $strSetupForm_Import_export = __('Import / export');
+$strSetupForm_Import_export_desc = __('Set import and export directories and compression options');
 $strSetupForm_Latex = __('LaTeX');
 $strSetupForm_Latex_desc = __('Customize default options');
 $strSetupForm_Ldi = __('CSV using LOAD DATA');
 $strSetupForm_Ldi_desc = __('Customize default options');
 $strSetupForm_Left_databases = __('Databases');
 $strSetupForm_Left_databases_desc = __('Databases display options');
-$strSetupForm_Left_frame_desc = __('Customize appearance of the navigation frame');
 $strSetupForm_Left_frame = __('Navigation frame');
-$strSetupForm_Left_servers_desc = __('Servers display options');
+$strSetupForm_Left_frame_desc = __('Customize appearance of the navigation frame');
 $strSetupForm_Left_servers = __('Servers');
-$strSetupForm_Left_tables_desc = __('Tables display options');
+$strSetupForm_Left_servers_desc = __('Servers display options');
 $strSetupForm_Left_tables = __('Tables');
+$strSetupForm_Left_tables_desc = __('Tables display options');
 $strSetupForm_Main_frame = __('Main frame');
 $strSetupForm_Microsoft_Office = __('Microsoft Office');
 $strSetupForm_Microsoft_Office_desc = __('Customize default options');
 $strSetupForm_Open_Document = __('Open Document');
 $strSetupForm_Open_Document_desc = __('Customize default options');
-$strSetupForm_Other_core_settings_desc = __('Settings that didn\'t fit enywhere else');
 $strSetupForm_Other_core_settings = __('Other core settings');
-$strSetupForm_Query_window_desc = __('Customize query window options');
-$strSetupForm_Query_window = __('Query window');
+$strSetupForm_Other_core_settings_desc = __('Settings that didn\'t fit enywhere else');
 $strSetupForm_Page_titles = __('Page titles');
 $strSetupForm_Page_titles_desc = __('Specify browser\'s title bar text. Refer to [a@Documentation.html#cfg_TitleTable]documentation[/a] for magic strings that can be used to get special values.');
-$strSetupForm_Sql = __('SQL');
-$strSetupForm_Sql_desc = __('Customize default options');
-$strSetupForm_Security_desc = __('Please note that phpMyAdmin is just a user interface and its features do not limit MySQL');
+$strSetupForm_Query_window = __('Query window');
+$strSetupForm_Query_window_desc = __('Customize query window options');
 $strSetupForm_Security = __('Security');
+$strSetupForm_Security_desc = __('Please note that phpMyAdmin is just a user interface and its features do not limit MySQL');
 $strSetupForm_Server = __('Basic settings');
-$strSetupForm_Server_config_desc = __('Advanced server configuration, do not change these options unless you know what they are for');
 $strSetupForm_Server_config = __('Server configuration');
+$strSetupForm_Server_config_desc = __('Advanced server configuration, do not change these options unless you know what they are for');
 $strSetupForm_Server_desc = __('Enter server connection parameters');
-$strSetupForm_Server_login_options_desc = __('Enter login options for signon authentication');
 $strSetupForm_Server_login_options = __('Signon login options');
-$strSetupForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation');
+$strSetupForm_Server_login_options_desc = __('Enter login options for signon authentication');
 $strSetupForm_Server_pmadb = __('PMA database');
-$strSetupForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.');
+$strSetupForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation');
 $strSetupForm_Server_tracking = __('Changes tracking');
-$strSetupForm_Texy = __('Texy! text');
-$strSetupForm_Texy_desc = __('Customize default options');
+$strSetupForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.');
 $strSetupFormset_Export = __('Customize export options');
 $strSetupFormset_Features = __('Features');
 $strSetupFormset_Import = __('Customize import defaults');
 $strSetupFormset_Left_frame = __('Customize navigation frame');
 $strSetupFormset_Main_frame = __('Customize main frame');
-$strSetupForm_Sql_box_desc = __('Customize links shown in SQL Query boxes');
+$strSetupForm_Sql = __('SQL');
 $strSetupForm_Sql_box = __('SQL Query box');
-$strSetupForm_Sql_queries_desc = __('SQL queries settings, for SQL Query box options see [a@?page=form&amp;formset=Main_frame#tab_Sql_box]Navigation frame[/a] settings');
+$strSetupForm_Sql_box_desc = __('Customize links shown in SQL Query boxes');
+$strSetupForm_Sql_desc = __('Customize default options');
 $strSetupForm_Sql_queries = __('SQL queries');
-$strSetupForm_Startup_desc = __('Customize startup page');
+$strSetupForm_Sql_queries_desc = __('SQL queries settings, for SQL Query box options see [a@?page=form&amp;formset=Main_frame#tab_Sql_box]Navigation frame[/a] settings');
 $strSetupForm_Startup = __('Startup');
-$strSetupForm_Tabs_desc = __('Choose how you want tabs to work');
+$strSetupForm_Startup_desc = __('Customize startup page');
 $strSetupForm_Tabs = __('Tabs');
+$strSetupForm_Tabs_desc = __('Choose how you want tabs to work');
+$strSetupForm_Texy = __('Texy! text');
+$strSetupForm_Texy_desc = __('Customize default options');
 $strSetupGZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import and export operations');
 $strSetupGZipDump_name = __('GZip');
 $strSetupIconvExtraParams_name = __('Extra parameters for iconv');
@@ -228,28 +228,28 @@ $strSetupIgnoreMultiSubmitErrors_desc = __('If enabled, phpMyAdmin continues com
 $strSetupIgnoreMultiSubmitErrors_name = __('Ignore multiple statement errors');
 $strSetupImport_allow_interrupt_desc = __('Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.');
 $strSetupImport_allow_interrupt_name = __('Partial import: allow interrupt');
-$strSetupImport_csv_replace_name = __('Replace table data with file');
-$strSetupImport_csv_ignore_name = __('Ignore duplicate rows');
-$strSetupImport_csv_terminated_name = __('Columns terminated by');
+$strSetupImport_csv_col_names_name = __('Lines terminated by');
 $strSetupImport_csv_enclosed_name = __('Columns enclosed by');
 $strSetupImport_csv_escaped_name = __('Columns escaped by');
-$strSetupImport_csv_col_names_name = __('Lines terminated by');
+$strSetupImport_csv_ignore_name = __('Ignore duplicate rows');
+$strSetupImport_csv_replace_name = __('Replace table data with file');
+$strSetupImport_csv_terminated_name = __('Columns terminated by');
 $strSetupImport_format_desc = __('Default format; be aware that this list depends on location (database, table) and only SQL is always available');
 $strSetupImport_format_name = __('Format of imported file');
-$strSetupImport_ldi_replace_name = __('Replace table data with file');
-$strSetupImport_ldi_ignore_name = __('Ignore duplicate rows');
-$strSetupImport_ldi_terminated_name = __('Columns terminated by');
 $strSetupImport_ldi_enclosed_name = __('Columns enclosed by');
 $strSetupImport_ldi_escaped_name = __('Columns escaped by');
+$strSetupImport_ldi_ignore_name = __('Ignore duplicate rows');
 $strSetupImport_ldi_local_option_name = __('Use LOCAL keyword');
+$strSetupImport_ldi_replace_name = __('Replace table data with file');
+$strSetupImport_ldi_terminated_name = __('Columns terminated by');
 $strSetupImport_ods_col_names_name = __('Column names in first row');
 $strSetupImport_ods_empty_rows_name = __('Do not import empty rows');
-$strSetupImport_ods_recognize_percentages_name = __('Import percentages as proper decimals (12.00% to .12)');
 $strSetupImport_ods_recognize_currency_name = __('Import currencies ($5.00 to 5.00)');
-$strSetupImport_sql_compatibility_name = __('SQL compatibility mode');
-$strSetupImport_sql_no_auto_value_on_zero_name = __('Do not use AUTO_INCREMENT for zero values');
+$strSetupImport_ods_recognize_percentages_name = __('Import percentages as proper decimals (12.00% to .12)');
 $strSetupImport_skip_queries_desc = __('Number of queries to skip from start');
 $strSetupImport_skip_queries_name = __('Partial import: skip queries');
+$strSetupImport_sql_compatibility_name = __('SQL compatibility mode');
+$strSetupImport_sql_no_auto_value_on_zero_name = __('Do not use AUTO_INCREMENT for zero values');
 $strSetupImport_xls_col_names_name = __('Column names in first row');
 $strSetupImport_xlsx_col_names_name = __('Column names in first row');
 $strSetupInitialSlidersState_name = __('Initial state for sliders');
@@ -277,8 +277,8 @@ $strSetupLeftPointerEnable_name = __('Enable highlighting');
 $strSetupLetUserChoose = __('let the user choose');
 $strSetupLightTabs_desc = __('Use less graphically intense tabs');
 $strSetupLightTabs_name = __('Light tabs');
-$strSetupLimitChars_name = __('Limit column characters');
 $strSetupLimitChars_desc = __('Maximum number of characters shown in any non-numeric column on browse view');
+$strSetupLimitChars_name = __('Limit column characters');
 $strSetupLoginCookieDeleteAll_desc = __('If TRUE, logout deletes cookies for all servers; when set to FALSE, logout only occurs for the current server. Setting this to FALSE makes it easy to forget to log out from other servers when connected to multiple servers.');
 $strSetupLoginCookieDeleteAll_name = __('Delete all cookies on logout');
 $strSetupLoginCookieRecall_desc = __('Define whether the previous login should be recalled or not in cookie authentication mode');
@@ -287,8 +287,8 @@ $strSetupLoginCookieStore_desc = __('Defines how long (in seconds) a login cooki
 $strSetupLoginCookieStore_name = __('Login cookie store');
 $strSetupLoginCookieValidity_desc = __('Define how long (in seconds) a login cookie is valid');
 $strSetupLoginCookieValidity_name = __('Login cookie validity');
-$strSetupLongtextDoubleTextarea_name = __('Bigger textarea for LONGTEXT');
 $strSetupLongtextDoubleTextarea_desc = __('Double size of textarea for LONGTEXT fields');
+$strSetupLongtextDoubleTextarea_name = __('Bigger textarea for LONGTEXT');
 $strSetupMainPageIconic_name = __('Use icons on main page');
 $strSetupMaxCharactersInDisplayedSQL_desc = __('Maximum number of characters used when a SQL query is displayed');
 $strSetupMaxCharactersInDisplayedSQL_name = __('Maximum displayed SQL length');
@@ -302,8 +302,8 @@ $strSetupMemoryLimit_desc = __('The number of bytes a script is allowed to alloc
 $strSetupMemoryLimit_name = __('Memory limit');
 $strSetupModifyDeleteAtLeft_name = __('Show left delete link');
 $strSetupModifyDeleteAtRight_name = __('Show right delete link');
-$strSetupNaturalOrder_name = __('Natural order');
 $strSetupNaturalOrder_desc = __('Use natural order for sorting table and database names');
+$strSetupNaturalOrder_name = __('Natural order');
 $strSetupNavigationBarIconic_desc = __('Use only icons, only text or both');
 $strSetupNavigationBarIconic_name = __('Iconic navigation bar');
 $strSetupOBGzip_desc = __('use GZip output buffering for increased speed in HTTP transfers');
@@ -317,22 +317,22 @@ $strSetupPropertiesIconic_desc = __('Use only icons, only text or both');
 $strSetupPropertiesIconic_name = __('Iconic table operations');
 $strSetupProtectBinary_desc = __('Disallow BLOB and BINARY columns from editing');
 $strSetupProtectBinary_name = __('Protect binary columns');
-$strSetupRepeatCells_name = __('Repeat headers');
-$strSetupRepeatCells_desc = __('Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature');
 $strSetupQueryHistoryDB_desc = __('Enable if you want DB-based query history (requires pmadb). If disabled, this utilizes JS-routines to display query history (lost by window close).');
 $strSetupQueryHistoryDB_name = __('Permanent query history');
 $strSetupQueryHistoryMax_desc = __('How many queries are kept in history');
 $strSetupQueryHistoryMax_name = __('Query history length');
 $strSetupQueryWindowDefTab_desc = __('Tab displayed when opening a new query window');
 $strSetupQueryWindowDefTab_name = __('Default query window tab');
-$strSetupQueryWindowHeight_name = __('Query window height');
 $strSetupQueryWindowHeight_desc = __('Query window height (in pixels)');
-$strSetupQueryWindowWidth_name = __('Query window width');
+$strSetupQueryWindowHeight_name = __('Query window height');
 $strSetupQueryWindowWidth_desc = __('Query window height (in pixels)');
+$strSetupQueryWindowWidth_name = __('Query window width');
 $strSetupRecodingEngine_desc = __('Select which functions will be used for character set conversion');
 $strSetupRecodingEngine_name = __('Recoding engine');
-$strSetupReplaceHelpImg_name = __('Show help button');
+$strSetupRepeatCells_desc = __('Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature');
+$strSetupRepeatCells_name = __('Repeat headers');
 $strSetupReplaceHelpImg_desc = __('Show help button instead of Documentation text');
+$strSetupReplaceHelpImg_name = __('Show help button');
 $strSetupRestoreDefaultValue = __('Restore default value');
 $strSetupRevertErroneousFields = __('Try to revert erroneous fields to their default values');
 $strSetupSaveDir_desc = __('Directory where exports can be saved on server');
@@ -372,8 +372,6 @@ $strSetupServers_hide_db_desc = __('Hide databases matching regular expression (
 $strSetupServers_hide_db_name = __('Hide databases');
 $strSetupServers_history_desc = __('Leave blank for no SQL query history support, suggested: [kbd]pma_history[/kbd]');
 $strSetupServers_history_name = __('SQL query history table');
-$strSetupServers_tracking_desc = __('Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/kbd]');
-$strSetupServers_tracking_name = __('SQL query tracking table');
 $strSetupServers_host_desc = __('Hostname where MySQL server is running');
 $strSetupServers_host_name = __('Server hostname');
 $strSetupServers_LogoutURL_name = __('Logout URL');
@@ -396,16 +394,6 @@ $strSetupServers_ShowDatabasesCommand_name = __('SHOW DATABASES command');
 $strSetupServers_SignonSession_desc = __('See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types[/a] for an example');
 $strSetupServers_SignonSession_name = __('Signon session name');
 $strSetupServers_SignonURL_name = __('Signon URL');
-$strSetupServers_tracking_version_auto_create_desc = __('Whether the tracking mechanism creates versions for tables and views automatically.');
-$strSetupServers_tracking_version_auto_create_name = __('Automatically create versions');
-$strSetupServers_tracking_default_statements_desc = __('Defines the list of statements the auto-creation uses for new versions.');
-$strSetupServers_tracking_default_statements_name = __('Statements to track');
-$strSetupServers_tracking_add_drop_view_desc = __('Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view.');
-$strSetupServers_tracking_add_drop_view_name = __('Add DROP VIEW');
-$strSetupServers_tracking_add_drop_table_desc = __('Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table.');
-$strSetupServers_tracking_add_drop_table_name = __('Add DROP TABLE');
-$strSetupServers_tracking_add_drop_database_desc = __('Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database.');
-$strSetupServers_tracking_add_drop_database_name = __('Add DROP DATABASE');
 $strSetupServers_socket_desc = __('Socket on which MySQL server is listening, leave empty for default');
 $strSetupServers_socket_name = __('Server socket');
 $strSetupServers_ssl_desc = __('Enable SSL for connection to MySQL server');
@@ -414,10 +402,22 @@ $strSetupServers_table_coords_desc = __('Leave blank for no PDF schema support,
 $strSetupServers_table_coords_name = __('PDF schema: table coordinates');
 $strSetupServers_table_info_desc = __('Table to describe the display columns, leave blank for no support; suggested: [kbd]pma_table_info[/kbd]');
 $strSetupServers_table_info_name = __('Display columns table');
+$strSetupServers_tracking_add_drop_database_desc = __('Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database.');
+$strSetupServers_tracking_add_drop_database_name = __('Add DROP DATABASE');
+$strSetupServers_tracking_add_drop_table_desc = __('Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table.');
+$strSetupServers_tracking_add_drop_table_name = __('Add DROP TABLE');
+$strSetupServers_tracking_add_drop_view_desc = __('Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view.');
+$strSetupServers_tracking_add_drop_view_name = __('Add DROP VIEW');
+$strSetupServers_tracking_default_statements_desc = __('Defines the list of statements the auto-creation uses for new versions.');
+$strSetupServers_tracking_default_statements_name = __('Statements to track');
+$strSetupServers_tracking_desc = __('Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/kbd]');
+$strSetupServers_tracking_name = __('SQL query tracking table');
+$strSetupServers_tracking_version_auto_create_desc = __('Whether the tracking mechanism creates versions for tables and views automatically.');
+$strSetupServers_tracking_version_auto_create_name = __('Automatically create versions');
+$strSetupServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_config[/kbd]');
+$strSetupServers_userconfig_name = __('User preferences storage table');
 $strSetupServers_user_desc = __('Leave empty if not using config auth');
 $strSetupServers_user_name = __('User for config auth');
-$strSetupServers_userconfig_name = __('User preferences storage table');
-$strSetupServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_config[/kbd]');
 $strSetupServers_verbose_check_desc = __('Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance');
 $strSetupServers_verbose_check_name = __('Verbose check');
 $strSetupServers_verbose_desc = __('A user-friendly description of this server. Leave blank to display the hostname instead.');
@@ -427,8 +427,8 @@ $strSetupShowAll_name = __('Allow to display all the rows');
 $strSetupShowChgPassword_desc = __('Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly');
 $strSetupShowChgPassword_name = __('Show password change form');
 $strSetupShowCreateDb_name = __('Show create database form');
-$strSetupShowFieldTypesInDataEditView_name = __('Show field types');
 $strSetupShowFieldTypesInDataEditView_desc = __('Defines whether or not type fields should be initially displayed in edit/insert mode');
+$strSetupShowFieldTypesInDataEditView_name = __('Show field types');
 $strSetupShowForm = __('Show form');
 $strSetupShowFunctionFields_desc = __('Display the function fields in edit/insert mode');
 $strSetupShowFunctionFields_name = __('Show function fields');
@@ -454,17 +454,17 @@ $strSetupSQLQuery_ShowAsPHP_name = __('Create PHP Code');
 $strSetupSQLQuery_Validate_name = __('Validate SQL');
 $strSetupSuggestDBName_desc = __('Suggest a database name on the &quot;Create Database&quot; form (if possible) or keep the text field empty');
 $strSetupSuggestDBName_name = __('Suggest new database name');
-$strSetupTextareaCols_name = __('Textarea columns');
 $strSetupTextareaCols_desc = __('Textarea size (columns) in edit mode, this value will be emphasized for SQL query textareas (*2) and for query window (*1.25)');
+$strSetupTextareaCols_name = __('Textarea columns');
 $strSetupTextareaRows_name = __('Textarea rows');
-$strSetupTitleDefault_name = __('Default title');
-$strSetupTitleDefault_desc = __('Title of browser window when nothing is selected');
-$strSetupTitleTable_name = __('Table');
-$strSetupTitleTable_desc = __('Title of browser window when a table is selected');
-$strSetupTitleDatabase_name = __('Database');
 $strSetupTitleDatabase_desc = __('Title of browser window when a database is selected');
-$strSetupTitleServer_name = __('Server');
+$strSetupTitleDatabase_name = __('Database');
+$strSetupTitleDefault_desc = __('Title of browser window when nothing is selected');
+$strSetupTitleDefault_name = __('Default title');
 $strSetupTitleServer_desc = __('Title of browser window when a server is selected');
+$strSetupTitleServer_name = __('Server');
+$strSetupTitleTable_desc = __('Title of browser window when a table is selected');
+$strSetupTitleTable_name = __('Table');
 $strSetupTrustedProxies_desc = __('Input proxies as [kbd]IP: trusted HTTP header[/kbd]. The following example specifies that phpMyAdmin should trust a HTTP_X_FORWARDED_FOR (X-Forwarded-For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: HTTP_X_FORWARDED_FOR[/kbd]');
 $strSetupTrustedProxies_name = __('List of trusted proxies for IP allow/deny');
 $strSetupUploadDir_desc = __('Directory on server where you can upload files for import');

From 47cd7c9a20071fe527b5dd06f9ab69340593fe5e Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 3 Jul 2010 23:22:20 +0200
Subject: [PATCH 033/106] styling moved some options (SQL Queries and SQL Box
 forms)

---
 .gsoc/todo.txt                              |  6 +---
 libraries/config/FormDisplay.tpl.php        |  2 +-
 libraries/config/messages.inc.php           |  4 ++-
 libraries/config/setup.forms.php            | 38 ++++++++++-----------
 libraries/config/user_preferences.forms.php |  2 +-
 setup/frames/menu.inc.php                   |  1 +
 setup/styles.css                            | 12 +++----
 themes/original/css/theme_right.css.php     | 13 +++++++
 8 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/.gsoc/todo.txt b/.gsoc/todo.txt
index 1da79aa5e..4736039f2 100644
--- a/.gsoc/todo.txt
+++ b/.gsoc/todo.txt
@@ -1,6 +1,2 @@
-cache'ing of user preferences to avoid round trips to server on each page refresh
-
-backlog:
-- Import and Export options
-
 restore cache'ing in phpmyadmin.css.php
+make CSS for darkblue_orange
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index efdb22433..b8188201c 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -137,7 +137,7 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
     $tr_class = $_FormDisplayGroup ? ' class="group-field"' : '';
     if (isset($opts['setvalue']) && $opts['setvalue'] == ':group') {
         unset($opts['setvalue']);
-        $tr_class = ' class="group-header"';
+        $tr_class = ' class="group-header-field"';
         if ($_FormDisplayGroup) {
             display_group_footer();
         }
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index cb033a0dc..73ca52174 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -161,9 +161,11 @@ $strSetupForm_Csv = __('CSV');
 $strSetupForm_Csv_desc = __('Customize default options');
 $strSetupForm_Edit = __('Edit mode');
 $strSetupForm_Edit_desc = __('Customize edit mode');
+$strSetupForm_Export = __('Export');
 $strSetupForm_Export_defaults = __('Export defaults');
 $strSetupForm_Export_defaults_desc = __('Customize default export options');
 $strSetupForm_General = __('General settings');
+$strSetupForm_Import = __('Import');
 $strSetupForm_Import_defaults = __('Import defaults');
 $strSetupForm_Import_defaults_desc = __('Customize default common import options');
 $strSetupForm_Import_export = __('Import / export');
@@ -213,7 +215,7 @@ $strSetupForm_Sql_box = __('SQL Query box');
 $strSetupForm_Sql_box_desc = __('Customize links shown in SQL Query boxes');
 $strSetupForm_Sql_desc = __('Customize default options');
 $strSetupForm_Sql_queries = __('SQL queries');
-$strSetupForm_Sql_queries_desc = __('SQL queries settings, for SQL Query box options see [a@?page=form&amp;formset=Main_frame#tab_Sql_box]Navigation frame[/a] settings');
+$strSetupForm_Sql_queries_desc = __('SQL queries settings');
 $strSetupForm_Startup = __('Startup');
 $strSetupForm_Startup_desc = __('Customize startup page');
 $strSetupForm_Tabs = __('Tabs');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 377f82839..f07463cae 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -94,18 +94,6 @@ $forms['Features']['Security'] = array(
     'LoginCookieValidity',
     'LoginCookieStore',
     'LoginCookieDeleteAll');
-$forms['Features']['Sql_queries'] = array(
-    'ShowSQL',
-    'Confirm',
-    'QueryHistoryDB',
-    'QueryHistoryMax',
-    'IgnoreMultiSubmitErrors',
-    'VerboseMultiSubmit',
-    'MaxCharactersInDisplayedSQL',
-    'EditInWindow',
-    //'QueryWindowWidth', // overridden in theme
-    //'QueryWindowHeight',
-    'QueryWindowDefTab');
 $forms['Features']['Page_titles'] = array(
     'TitleDefault',
     'TitleTable',
@@ -125,6 +113,24 @@ $forms['Features']['Other_core_settings'] = array(
     'MemoryLimit',
     'SkipLockedTables',
     'UseDbSearch');
+$forms['Sql_queries']['Sql_queries'] = array(
+    'ShowSQL',
+    'Confirm',
+    'QueryHistoryDB',
+    'QueryHistoryMax',
+    'IgnoreMultiSubmitErrors',
+    'VerboseMultiSubmit',
+    'MaxCharactersInDisplayedSQL',
+    'EditInWindow',
+    //'QueryWindowWidth', // overridden in theme
+    //'QueryWindowHeight',
+    'QueryWindowDefTab');
+$forms['Sql_queries']['Sql_box'] = array('SQLQuery' => array(
+    'Edit',
+    'Explain',
+    'ShowAsPHP',
+    'Validate',
+    'Refresh'));
 $forms['Left_frame']['Left_frame'] = array(
     'LeftFrameLight',
     'LeftDisplayLogo',
@@ -145,7 +151,7 @@ $forms['Left_frame']['Left_tables'] = array(
     'LeftFrameTableLevel',
     'ShowTooltip',
     'ShowTooltipAliasTB');
-$forms['Startup'] = array(
+$forms['Main_frame']['Startup'] = array(
     'MainPageIconic',
     'ShowStats',
     'ShowPhpInfo',
@@ -186,12 +192,6 @@ $forms['Main_frame']['Tabs'] = array(
     'DefaultTabDatabase',
     'DefaultTabTable',
 	'QueryWindowDefTab');
-$forms['Main_frame']['Sql_box'] = array('SQLQuery' => array(
-    'Edit',
-    'Explain',
-    'ShowAsPHP',
-    'Validate',
-    'Refresh'));
 $forms['Import']['Import_defaults'] = array('Import' => array(
     'format',
     'allow_interrupt',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index e28cf09b9..4ce0195fa 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -39,7 +39,7 @@ $forms['Sql_queries']['Sql_box'] = array(
     'SQLQuery/Edit',
     'SQLQuery/Explain',
     'SQLQuery/ShowAsPHP',
-    'SQLQuery/Validate',// [false or no override]
+//    'SQLQuery/Validate',// [false or no override]
     'SQLQuery/Refresh');
 $forms['Features']['Page_titles'] = array(
     'TitleDefault',
diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php
index 262812118..b4c016a9c 100644
--- a/setup/frames/menu.inc.php
+++ b/setup/frames/menu.inc.php
@@ -16,6 +16,7 @@ $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=Sql_queries"><?php echo __('SQL queries') ?></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>
diff --git a/setup/styles.css b/setup/styles.css
index 09b2a3e6b..4a5cbf2a9 100644
--- a/setup/styles.css
+++ b/setup/styles.css
@@ -286,14 +286,14 @@ fieldset th, fieldset td, .form .lastrow {
     border-top: 1px #555 dotted;
 }
 
-fieldset .group-header th, fieldset .group-header td {
-    background: #F7FBFF;
-    border: 0 #DEE1FF solid;
-    border-width: 2px 0 0 0.5em;
+fieldset .group-header th {
+    background: #EAEDFF;
+    border: none;
 }
 
-fieldset .group-header td {
-    border-left: none;
+fieldset .group-header + tr th, fieldset .group-header + tr td,
+fieldset p + table tr:first-child td, fieldset p + table tr:first-child th {
+    border-top: none;
 }
 
 fieldset .group-field th {
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 745d11ff9..1c04970f9 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1338,6 +1338,18 @@ table#serverconnection_trg_local  {
     border-top: 1px <?php echo $GLOBALS['cfg']['BgTwo']; ?> solid;
 }
 
+fieldset .group-header th {
+    background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+}
+
+fieldset .group-header + tr th {
+    padding-top: 0.6em;
+}
+
+fieldset .group-field th {
+    padding-left: 1.5em;
+}
+
 .config-form .lastrow {
     border-top: 1px #000 solid;
 }
@@ -1377,6 +1389,7 @@ table#serverconnection_trg_local  {
 .config-form select,
 .config-form textarea {
     border: 1px #A7A6AA solid;
+    height: auto;
 }
 
 .config-form input[type="text"]:focus,

From 7c5a298f271260e47ee690c11eec3c37c1f08b43 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 3 Jul 2010 23:27:02 +0200
Subject: [PATCH 034/106] moved validate.lib.php

---
 libraries/config.values.php                      | 4 ++--
 libraries/config/FormDisplay.class.php           | 2 +-
 {setup/lib => libraries/config}/validate.lib.php | 3 +--
 setup/validate.php                               | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename {setup/lib => libraries/config}/validate.lib.php (99%)

diff --git a/libraries/config.values.php b/libraries/config.values.php
index e65a0d5a8..e0f4101e8 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -97,8 +97,8 @@ $cfg_db['_overrides']['Servers/1/extension'] = extension_loaded('mysqli')
     ? 'mysqli' : 'mysql';
 
 /**
- * Validator assignments (functions from setup/validate.lib.php and 'validators'
- * object in setup/scripts.js)
+ * Validator assignments (functions from libraries/config/validate.lib.php and 'validators'
+ * object in js/config.js)
  * Use only full paths and form ids
  */
 $cfg_db['_validators'] = array(
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index c20e926ef..4e251d271 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -16,7 +16,7 @@
  * Core libraries.
  */
 require_once './libraries/config/FormDisplay.tpl.php';
-require_once './setup/lib/validate.lib.php';
+require_once './libraries/config/validate.lib.php';
 require_once './libraries/js_escape.lib.php';
 
 /**
diff --git a/setup/lib/validate.lib.php b/libraries/config/validate.lib.php
similarity index 99%
rename from setup/lib/validate.lib.php
rename to libraries/config/validate.lib.php
index 47e81d10c..ca01ec1f9 100644
--- a/setup/lib/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -11,9 +11,8 @@
  *
  * Valdiation functions are assigned in $cfg_db['_validators'] (config.values.php).
  *
- * @package    phpMyAdmin-setup
+ * @package    phpMyAdmin
  * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
  */
 
 /**
diff --git a/setup/validate.php b/setup/validate.php
index 68781bc98..c4441184d 100644
--- a/setup/validate.php
+++ b/setup/validate.php
@@ -14,7 +14,7 @@
 require './lib/common.inc.php';
 
 $validators = array();
-require './setup/lib/validate.lib.php';
+require './libraries/config/validate.lib.php';
 
 header('Content-type: application/json');
 

From 9dc47ecc41865486a595cbc300451600137fb255 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sun, 4 Jul 2010 00:04:55 +0200
Subject: [PATCH 035/106] rename $strSetup* variables to $strConfig*

---
 libraries/config/FormDisplay.class.php    |   4 +-
 libraries/config/config_functions.lib.php |   8 +-
 libraries/config/messages.inc.php         | 930 +++++++++++-----------
 libraries/config/validate.lib.php         |   2 +-
 scripts/find_unused_messages.sh           |   2 +-
 setup/frames/form.inc.php                 |   4 +-
 user_preferences.php                      |   2 +-
 7 files changed, 476 insertions(+), 476 deletions(-)

diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 4e251d271..cd2d6a407 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -221,7 +221,7 @@ class FormDisplay
         // display forms
         foreach ($this->forms as $form) {
             /* @var $form Form */
-            $form_desc = isset($GLOBALS["strSetupForm_{$form->name}_desc"])
+            $form_desc = isset($GLOBALS["strConfigForm_{$form->name}_desc"])
                 ? PMA_lang("Form_{$form->name}_desc")
                 : '';
             $form_errors = isset($this->errors[$form->name])
@@ -389,7 +389,7 @@ class FormDisplay
                 $path = $this->system_paths[$system_path];
                 $name = PMA_lang_name($path);
             } else {
-                $name = $GLOBALS["strSetupForm_$system_path"];
+                $name = $GLOBALS["strConfigForm_$system_path"];
             }
             display_errors($name, $error_list);
         }
diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
index b0fa9fd32..3c83bb730 100644
--- a/libraries/config/config_functions.lib.php
+++ b/libraries/config/config_functions.lib.php
@@ -126,7 +126,7 @@ function PMA_lang($lang_key)
         $search = array_keys($replace_pairs);
         $replace = array_values($replace_pairs);
     }
-    $message = isset($GLOBALS["strSetup$lang_key"]) ? $GLOBALS["strSetup$lang_key"] : $lang_key;
+    $message = isset($GLOBALS["strConfig$lang_key"]) ? $GLOBALS["strConfig$lang_key"] : $lang_key;
     $message = str_replace($search, $replace, $message);
     // replace [a@"$1"]$2[/a] with <a href="$1">$2</a>
     $message = preg_replace('#\[a@("?)([^\]]+)\1\]([^\[]+)\[/a\]#e',
@@ -153,8 +153,8 @@ function PMA_lang_name($canonical_path)
     	array('Servers/1/', '/'),
     	array('Servers/', '_'),
     	$canonical_path) . '_name';
-    return isset($GLOBALS["strSetup$lang_key"])
-        ? $GLOBALS["strSetup$lang_key"]
+    return isset($GLOBALS["strConfig$lang_key"])
+        ? $GLOBALS["strConfig$lang_key"]
         : $lang_key;
 }
 
@@ -170,7 +170,7 @@ function PMA_lang_desc($canonical_path)
     	array('Servers/1/', '/'),
     	array('Servers/', '_'),
     	$canonical_path) . '_desc';
-    return isset($GLOBALS["strSetup$lang_key"])
+    return isset($GLOBALS["strConfig$lang_key"])
         ? PMA_lang($lang_key)
         : '';
 }
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 73ca52174..ab218182b 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -13,470 +13,470 @@ if (!function_exists('__')) {
 }
 
 
-$strSetupAllowAnywhereRecoding_name = __('Allow character set conversion');
-$strSetupAllowArbitraryServer_desc = __('If enabled user can enter any MySQL server in login form for cookie auth');
-$strSetupAllowArbitraryServer_name = __('Allow login to any MySQL server');
-$strSetupAllowUserDropDatabase_name = __('Show &quot;Drop database&quot; link to normal users');
-$strSetupblowfish_secret_desc = __('Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] authentication');
-$strSetupblowfish_secret_name = __('Blowfish secret');
-$strSetupBrowseMarkerEnable_desc = __('Highlight selected rows');
-$strSetupBrowseMarkerEnable_name = __('Row marker');
-$strSetupBrowsePointerEnable_desc = __('Highlight row pointed by the mouse cursor');
-$strSetupBrowsePointerEnable_name = __('Highlight pointer');
-$strSetupBZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for import and export operations');
-$strSetupBZipDump_name = __('Bzip2');
-$strSetupCharEditing_desc = __('Defines which type of editing controls should be used for CHAR and VARCHAR columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in columns');
-$strSetupCharEditing_name = __('CHAR columns editing');
-$strSetupCharTextareaCols_desc = __('Number of columns for CHAR/VARCHAR textareas');
-$strSetupCharTextareaCols_name = __('CHAR textarea columns');
-$strSetupCharTextareaRows_desc = __('Number of rows for CHAR/VARCHAR textareas');
-$strSetupCharTextareaRows_name = __('CHAR textarea rows');
-$strSetupCheckConfigurationPermissions_name = __('Check config file permissions');
-$strSetupCompressOnFly_desc = __('Compress gzip/bzip2 exports on the fly without the need for much memory; if you encounter problems with created gzip/bzip2 files disable this feature');
-$strSetupCompressOnFly_name = __('Compress on the fly');
-$strSetupConfigurationFile = __('Configuration file');
-$strSetupConfirm_desc = __('Whether a warning (&quot;Are your really sure...&quot;) should be displayed when you\'re about to lose data');
-$strSetupConfirm_name = __('Confirm DROP queries');
-$strSetupCtrlArrowsMoving_name = __('Field navigation using Ctrl+Arrows');
-$strSetupDefaultCharset_desc = __('Default character set used for conversions');
-$strSetupDefaultCharset_name = __('Default character set');
-$strSetupDefaultDisplay_name = __('Default display direction');
-$strSetupDefaultLanguage = __('Default language');
-$strSetupDefaultPropDisplay_desc = __('[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates maximum number for which vertical model is used');
-$strSetupDefaultPropDisplay_name = __('Display direction for altering/creating columns');
-$strSetupDefaultServer = __('Default server');
-$strSetupDefaultTabDatabase_desc = __('Tab that is displayed when entering a database');
-$strSetupDefaultTabDatabase_name = __('Default database tab');
-$strSetupDefaultTabServer_desc = __('Tab that is displayed when entering a server');
-$strSetupDefaultTabServer_name = __('Default server tab');
-$strSetupDefaultTabTable_desc = __('Tab that is displayed when entering a table');
-$strSetupDefaultTabTable_name = __('Default table tab');
-$strSetupDisplay = __('Display');
-$strSetupDisplayBinaryAsHex_desc = __('Show binary contents as HEX by default');
-$strSetupDisplayBinaryAsHex_name = __('Show binary contents as HEX');
-$strSetupDisplayDatabasesList_desc = __('Show database listing as a list instead of a drop down');
-$strSetupDisplayDatabasesList_name = __('Display databases as a list');
-$strSetupDisplayServersList_desc = __('Show server listing as a list instead of a drop down');
-$strSetupDisplayServersList_name = __('Display servers as a list');
-$strSetupDonateLink = __('Donate');
-$strSetupDownload = __('Download');
-$strSetupEditInWindow_desc = __('Edit SQL queries in popup window');
-$strSetupEditInWindow_name = __('Edit in window');
-$strSetupEndOfLine = __('End of line');
-$strSetupErrorIconic_desc = __('Show icons for warning, error and information messages');
-$strSetupErrorIconic_name = __('Iconic errors');
-$strSetupExecTimeLimit_desc = __('Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)');
-$strSetupExecTimeLimit_name = __('Maximum execution time');
-$strSetupExport_asfile_name = __('Save as file');
-$strSetupExport_charset_name = __('Character set of the file');
-$strSetupExport_codegen_format_name = __('Format');
-$strSetupExport_compression_name = __('Compression');
-$strSetupExport_csv_columns_name = __('Put columns names in the first row');
-$strSetupExport_csv_enclosed_name = __('Columns enclosed by');
-$strSetupExport_csv_escaped_name = __('Columns escaped by');
-$strSetupExport_csv_null_name = __('Replace NULL by');
-$strSetupExport_csv_removeCRLF_name = __('Remove CRLF characters within columns');
-$strSetupExport_csv_separator_name = __('Columns terminated by');
-$strSetupExport_csv_terminated_name = __('Lines terminated by');
-$strSetupExport_excel_columns_name = __('Put columns names in the first row');
-$strSetupExport_excel_edition_name = __('Excel edition');
-$strSetupExport_excel_null_name = __('Replace NULL by');
-$strSetupExport_excel_removeCRLF_name = __('Remove CRLF characters within columns');
-$strSetupExport_file_template_database_name = __('Database name template');
-$strSetupExport_file_template_server_name = __('Server name template');
-$strSetupExport_file_template_table_name = __('Table name template');
-$strSetupExport_format_name = __('Format');
-$strSetupExport_htmlword_columns_name = __('Put columns names in the first row');
-$strSetupExport_htmlword_data_name = __('Data');
-$strSetupExport_htmlword_null_name = __('Replace NULL by');
-$strSetupExport_htmlword_structure_name = __('Structure');
-$strSetupExport_latex_caption_name = __('Include table caption');
-$strSetupExport_latex_columns_name = __('Put columns names in the first row');
-$strSetupExport_latex_comments_name = __('Comments');
-$strSetupExport_latex_data_caption_name = __('Table caption');
-$strSetupExport_latex_data_continued_caption_name = __('Continued table caption');
-$strSetupExport_latex_data_label_name = __('Label key');
-$strSetupExport_latex_data_name = __('Data');
-$strSetupExport_latex_mime_name = __('MIME type');
-$strSetupExport_latex_null_name  = __('Replace NULL by');
-$strSetupExport_latex_relation_name = __('Relations');
-$strSetupExport_latex_structure_caption_name = __('Table caption');
-$strSetupExport_latex_structure_continued_caption_name = __('Continued table caption');
-$strSetupExport_latex_structure_label_name = __('Label key');
-$strSetupExport_latex_structure_name = __('Structure');
-$strSetupExport_ods_columns_name = __('Put columns names in the first row');
-$strSetupExport_ods_null_name = __('Replace NULL by');
-$strSetupExport_odt_columns_name = __('Put columns names in the first row');
-$strSetupExport_odt_comments_name = __('Comments');
-$strSetupExport_odt_data_name = __('Data');
-$strSetupExport_odt_mime_name = __('MIME type');
-$strSetupExport_odt_null_name = __('Replace NULL by');
-$strSetupExport_odt_relation_name = __('Relations');
-$strSetupExport_odt_structure_name = __('Structure');
-$strSetupExport_onserver_name = __('Save on server');
-$strSetupExport_onserver_overwrite_name = __('Overwrite existing file(s)');
-$strSetupExport_remember_file_template_name = __('Remember file name template');
-$strSetupExport_sql_auto_increment_name = __('Add AUTO_INCREMENT value');
-$strSetupExport_sql_backquotes_name = __('Enclose table and column names with backquotes');
-$strSetupExport_sql_columns_name = __('Complete inserts');
-$strSetupExport_sql_compatibility_name = __('SQL compatibility mode');
-$strSetupExport_sql_data_name = __('Data');
-$strSetupExport_sql_dates_name = __('Creation/Update/Check dates');
-$strSetupExport_sql_delayed_name = __('Use delayed inserts');
-$strSetupExport_sql_disable_fk_name = __('Disable foreign key checks');
-$strSetupExport_sql_drop_database_name = sprintf(__('Add %s'), 'DROP DATABASE');
-$strSetupExport_sql_drop_table_name = sprintf(__('Add %s'), 'DROP TABLE / VIEW / PROCEDURE / FUNCTION / EVENT');
-$strSetupExport_sql_extended_name = __('Extended inserts');
-$strSetupExport_sql_hex_for_blob_name = __('Use hexadecimal for BLOB');
-$strSetupExport_sql_if_not_exists_name = sprintf(__('Add %s'), 'IF NOT EXISTS');
-$strSetupExport_sql_ignore_name = __('Use ignore inserts');
-$strSetupExport_sql_include_comments_name = __('Comments');
-$strSetupExport_sql_max_query_size_name = __('Maximal length of created query');
-$strSetupExport_sql_mime_name = __('MIME type');
-$strSetupExport_sql_procedure_function_name = sprintf(__('Add %s'), 'CREATE PROCEDURE / FUNCTION / EVENT');
-$strSetupExport_sql_relation_name = __('Relations');
-$strSetupExport_sql_structure_name = __('Structure');
-$strSetupExport_sql_type_name = __('Export type');
-$strSetupExport_sql_use_transaction_name = __('Enclose export in a transaction');
-$strSetupExport_sql_utc_time_name = __('Export time in UTC');
-$strSetupExport_texytext_columns_name = __('Put columns names in the first row');
-$strSetupExport_texytext_data_name = __('Data');
-$strSetupExport_texytext_null_name = __('Replace NULL by');
-$strSetupExport_texytext_structure_name = __('Structure');
-$strSetupExport_xls_columns_name = __('Put columns names in the first row');
-$strSetupExport_xls_null_name = __('Replace NULL by');
-$strSetupExport_xlsx_columns_name = __('Put columns names in the first row');
-$strSetupExport_xlsx_null_name = __('Replace NULL by');
-$strSetupForceSSL_desc = __('Force secured connection while using phpMyAdmin');
-$strSetupForceSSL_name = __('Force SSL connection');
-$strSetupForeignKeyDropdownOrder_desc = __('Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is the referenced data, [kbd]id[/kbd] is the key value');
-$strSetupForeignKeyDropdownOrder_name = __('Foreign key dropdown order');
-$strSetupForeignKeyMaxLimit_desc = __('A dropdown will be used if fewer items are present');
-$strSetupForeignKeyMaxLimit_name = __('Foreign key limit');
-$strSetupForm_Browse = __('Browse mode');
-$strSetupForm_Browse_desc = __('Customize browse mode');
-$strSetupForm_CodeGen = 'CodeGen';
-$strSetupForm_CodeGen_desc = __('Customize default options');
-$strSetupForm_Csv = __('CSV');
-$strSetupForm_Csv_desc = __('Customize default options');
-$strSetupForm_Edit = __('Edit mode');
-$strSetupForm_Edit_desc = __('Customize edit mode');
-$strSetupForm_Export = __('Export');
-$strSetupForm_Export_defaults = __('Export defaults');
-$strSetupForm_Export_defaults_desc = __('Customize default export options');
-$strSetupForm_General = __('General settings');
-$strSetupForm_Import = __('Import');
-$strSetupForm_Import_defaults = __('Import defaults');
-$strSetupForm_Import_defaults_desc = __('Customize default common import options');
-$strSetupForm_Import_export = __('Import / export');
-$strSetupForm_Import_export_desc = __('Set import and export directories and compression options');
-$strSetupForm_Latex = __('LaTeX');
-$strSetupForm_Latex_desc = __('Customize default options');
-$strSetupForm_Ldi = __('CSV using LOAD DATA');
-$strSetupForm_Ldi_desc = __('Customize default options');
-$strSetupForm_Left_databases = __('Databases');
-$strSetupForm_Left_databases_desc = __('Databases display options');
-$strSetupForm_Left_frame = __('Navigation frame');
-$strSetupForm_Left_frame_desc = __('Customize appearance of the navigation frame');
-$strSetupForm_Left_servers = __('Servers');
-$strSetupForm_Left_servers_desc = __('Servers display options');
-$strSetupForm_Left_tables = __('Tables');
-$strSetupForm_Left_tables_desc = __('Tables display options');
-$strSetupForm_Main_frame = __('Main frame');
-$strSetupForm_Microsoft_Office = __('Microsoft Office');
-$strSetupForm_Microsoft_Office_desc = __('Customize default options');
-$strSetupForm_Open_Document = __('Open Document');
-$strSetupForm_Open_Document_desc = __('Customize default options');
-$strSetupForm_Other_core_settings = __('Other core settings');
-$strSetupForm_Other_core_settings_desc = __('Settings that didn\'t fit enywhere else');
-$strSetupForm_Page_titles = __('Page titles');
-$strSetupForm_Page_titles_desc = __('Specify browser\'s title bar text. Refer to [a@Documentation.html#cfg_TitleTable]documentation[/a] for magic strings that can be used to get special values.');
-$strSetupForm_Query_window = __('Query window');
-$strSetupForm_Query_window_desc = __('Customize query window options');
-$strSetupForm_Security = __('Security');
-$strSetupForm_Security_desc = __('Please note that phpMyAdmin is just a user interface and its features do not limit MySQL');
-$strSetupForm_Server = __('Basic settings');
-$strSetupForm_Server_config = __('Server configuration');
-$strSetupForm_Server_config_desc = __('Advanced server configuration, do not change these options unless you know what they are for');
-$strSetupForm_Server_desc = __('Enter server connection parameters');
-$strSetupForm_Server_login_options = __('Signon login options');
-$strSetupForm_Server_login_options_desc = __('Enter login options for signon authentication');
-$strSetupForm_Server_pmadb = __('PMA database');
-$strSetupForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation');
-$strSetupForm_Server_tracking = __('Changes tracking');
-$strSetupForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.');
-$strSetupFormset_Export = __('Customize export options');
-$strSetupFormset_Features = __('Features');
-$strSetupFormset_Import = __('Customize import defaults');
-$strSetupFormset_Left_frame = __('Customize navigation frame');
-$strSetupFormset_Main_frame = __('Customize main frame');
-$strSetupForm_Sql = __('SQL');
-$strSetupForm_Sql_box = __('SQL Query box');
-$strSetupForm_Sql_box_desc = __('Customize links shown in SQL Query boxes');
-$strSetupForm_Sql_desc = __('Customize default options');
-$strSetupForm_Sql_queries = __('SQL queries');
-$strSetupForm_Sql_queries_desc = __('SQL queries settings');
-$strSetupForm_Startup = __('Startup');
-$strSetupForm_Startup_desc = __('Customize startup page');
-$strSetupForm_Tabs = __('Tabs');
-$strSetupForm_Tabs_desc = __('Choose how you want tabs to work');
-$strSetupForm_Texy = __('Texy! text');
-$strSetupForm_Texy_desc = __('Customize default options');
-$strSetupGZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import and export operations');
-$strSetupGZipDump_name = __('GZip');
-$strSetupIconvExtraParams_name = __('Extra parameters for iconv');
-$strSetupIgnoreErrors = __('Ignore errors');
-$strSetupIgnoreMultiSubmitErrors_desc = __('If enabled, phpMyAdmin continues computing multiple-statement queries even if one of the queries failed');
-$strSetupIgnoreMultiSubmitErrors_name = __('Ignore multiple statement errors');
-$strSetupImport_allow_interrupt_desc = __('Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.');
-$strSetupImport_allow_interrupt_name = __('Partial import: allow interrupt');
-$strSetupImport_csv_col_names_name = __('Lines terminated by');
-$strSetupImport_csv_enclosed_name = __('Columns enclosed by');
-$strSetupImport_csv_escaped_name = __('Columns escaped by');
-$strSetupImport_csv_ignore_name = __('Ignore duplicate rows');
-$strSetupImport_csv_replace_name = __('Replace table data with file');
-$strSetupImport_csv_terminated_name = __('Columns terminated by');
-$strSetupImport_format_desc = __('Default format; be aware that this list depends on location (database, table) and only SQL is always available');
-$strSetupImport_format_name = __('Format of imported file');
-$strSetupImport_ldi_enclosed_name = __('Columns enclosed by');
-$strSetupImport_ldi_escaped_name = __('Columns escaped by');
-$strSetupImport_ldi_ignore_name = __('Ignore duplicate rows');
-$strSetupImport_ldi_local_option_name = __('Use LOCAL keyword');
-$strSetupImport_ldi_replace_name = __('Replace table data with file');
-$strSetupImport_ldi_terminated_name = __('Columns terminated by');
-$strSetupImport_ods_col_names_name = __('Column names in first row');
-$strSetupImport_ods_empty_rows_name = __('Do not import empty rows');
-$strSetupImport_ods_recognize_currency_name = __('Import currencies ($5.00 to 5.00)');
-$strSetupImport_ods_recognize_percentages_name = __('Import percentages as proper decimals (12.00% to .12)');
-$strSetupImport_skip_queries_desc = __('Number of queries to skip from start');
-$strSetupImport_skip_queries_name = __('Partial import: skip queries');
-$strSetupImport_sql_compatibility_name = __('SQL compatibility mode');
-$strSetupImport_sql_no_auto_value_on_zero_name = __('Do not use AUTO_INCREMENT for zero values');
-$strSetupImport_xls_col_names_name = __('Column names in first row');
-$strSetupImport_xlsx_col_names_name = __('Column names in first row');
-$strSetupInitialSlidersState_name = __('Initial state for sliders');
-$strSetupInsertRows_desc = __('How many rows can be inserted at one time');
-$strSetupInsertRows_name = __('Number of inserted rows');
-$strSetupLeftDefaultTabTable_name = __('Target for quick access icon');
-$strSetupLeftDisplayLogo_desc = __('Show logo in left frame');
-$strSetupLeftDisplayLogo_name = __('Display logo');
-$strSetupLeftDisplayServers_desc = __('Display server choice at the top of the left frame');
-$strSetupLeftDisplayServers_name = __('Display servers selection');
-$strSetupLeftFrameDBSeparator_desc = __('String that separates databases into different tree levels');
-$strSetupLeftFrameDBSeparator_name = __('Database tree separator');
-$strSetupLeftFrameDBTree_desc = __('Only light version; display databases in a tree (determined by the separator defined below)');
-$strSetupLeftFrameDBTree_name = __('Display databases in a tree');
-$strSetupLeftFrameLight_desc = __('Disable this if you want to see all databases at once');
-$strSetupLeftFrameLight_name = __('Use light version');
-$strSetupLeftFrameTableLevel_name = __('Maximum table tree depth');
-$strSetupLeftFrameTableSeparator_desc = __('String that separates tables into different tree levels');
-$strSetupLeftFrameTableSeparator_name = __('Table tree separator');
-$strSetupLeftLogoLink_name = __('Logo link URL');
-$strSetupLeftLogoLinkWindow_desc = __('Open the linked page in the main window ([kbd]main[/kbd]) or in a new one ([kbd]new[/kbd])');
-$strSetupLeftLogoLinkWindow_name = __('Logo link target');
-$strSetupLeftPointerEnable_desc = __('Highlight server under the mouse cursor');
-$strSetupLeftPointerEnable_name = __('Enable highlighting');
-$strSetupLetUserChoose = __('let the user choose');
-$strSetupLightTabs_desc = __('Use less graphically intense tabs');
-$strSetupLightTabs_name = __('Light tabs');
-$strSetupLimitChars_desc = __('Maximum number of characters shown in any non-numeric column on browse view');
-$strSetupLimitChars_name = __('Limit column characters');
-$strSetupLoginCookieDeleteAll_desc = __('If TRUE, logout deletes cookies for all servers; when set to FALSE, logout only occurs for the current server. Setting this to FALSE makes it easy to forget to log out from other servers when connected to multiple servers.');
-$strSetupLoginCookieDeleteAll_name = __('Delete all cookies on logout');
-$strSetupLoginCookieRecall_desc = __('Define whether the previous login should be recalled or not in cookie authentication mode');
-$strSetupLoginCookieRecall_name = __('Recall user name');
-$strSetupLoginCookieStore_desc = __('Defines how long (in seconds) a login cookie should be stored in browser. The default of 0 means that it will be kept for the existing session only, and will be deleted as soon as you close the browser window. This is recommended for non-trusted environments.');
-$strSetupLoginCookieStore_name = __('Login cookie store');
-$strSetupLoginCookieValidity_desc = __('Define how long (in seconds) a login cookie is valid');
-$strSetupLoginCookieValidity_name = __('Login cookie validity');
-$strSetupLongtextDoubleTextarea_desc = __('Double size of textarea for LONGTEXT fields');
-$strSetupLongtextDoubleTextarea_name = __('Bigger textarea for LONGTEXT');
-$strSetupMainPageIconic_name = __('Use icons on main page');
-$strSetupMaxCharactersInDisplayedSQL_desc = __('Maximum number of characters used when a SQL query is displayed');
-$strSetupMaxCharactersInDisplayedSQL_name = __('Maximum displayed SQL length');
-$strSetupMaxDbList_desc = __('Maximum number of databases displayed in left frame and database list');
-$strSetupMaxDbList_name = __('Maximum databases');
-$strSetupMaxRows_desc = __('Number of rows displayed when browsing a result set. If the result set contains more rows, &quot;Previous&quot; and &quot;Next&quot; links will be shown.');
-$strSetupMaxRows_name = __('Maximum number of rows to display');
-$strSetupMaxTableList_desc = __('Maximum number of tables displayed in table list');
-$strSetupMaxTableList_name = __('Maximum tables');
-$strSetupMemoryLimit_desc = __('The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] ([kbd]0[/kbd] for no limit)');
-$strSetupMemoryLimit_name = __('Memory limit');
-$strSetupModifyDeleteAtLeft_name = __('Show left delete link');
-$strSetupModifyDeleteAtRight_name = __('Show right delete link');
-$strSetupNaturalOrder_desc = __('Use natural order for sorting table and database names');
-$strSetupNaturalOrder_name = __('Natural order');
-$strSetupNavigationBarIconic_desc = __('Use only icons, only text or both');
-$strSetupNavigationBarIconic_name = __('Iconic navigation bar');
-$strSetupOBGzip_desc = __('use GZip output buffering for increased speed in HTTP transfers');
-$strSetupOBGzip_name = __('GZip output buffering');
-$strSetupOptionNone = __('- none -');
-$strSetupOrder_desc = __('[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, DATETIME and TIMESTAMP, ascending order otherwise');
-$strSetupOrder_name = __('Default sorting order');
-$strSetupPersistentConnections_desc = __('Use persistent connections to MySQL databases');
-$strSetupPersistentConnections_name = __('Persistent connections');
-$strSetupPropertiesIconic_desc = __('Use only icons, only text or both');
-$strSetupPropertiesIconic_name = __('Iconic table operations');
-$strSetupProtectBinary_desc = __('Disallow BLOB and BINARY columns from editing');
-$strSetupProtectBinary_name = __('Protect binary columns');
-$strSetupQueryHistoryDB_desc = __('Enable if you want DB-based query history (requires pmadb). If disabled, this utilizes JS-routines to display query history (lost by window close).');
-$strSetupQueryHistoryDB_name = __('Permanent query history');
-$strSetupQueryHistoryMax_desc = __('How many queries are kept in history');
-$strSetupQueryHistoryMax_name = __('Query history length');
-$strSetupQueryWindowDefTab_desc = __('Tab displayed when opening a new query window');
-$strSetupQueryWindowDefTab_name = __('Default query window tab');
-$strSetupQueryWindowHeight_desc = __('Query window height (in pixels)');
-$strSetupQueryWindowHeight_name = __('Query window height');
-$strSetupQueryWindowWidth_desc = __('Query window height (in pixels)');
-$strSetupQueryWindowWidth_name = __('Query window width');
-$strSetupRecodingEngine_desc = __('Select which functions will be used for character set conversion');
-$strSetupRecodingEngine_name = __('Recoding engine');
-$strSetupRepeatCells_desc = __('Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature');
-$strSetupRepeatCells_name = __('Repeat headers');
-$strSetupReplaceHelpImg_desc = __('Show help button instead of Documentation text');
-$strSetupReplaceHelpImg_name = __('Show help button');
-$strSetupRestoreDefaultValue = __('Restore default value');
-$strSetupRevertErroneousFields = __('Try to revert erroneous fields to their default values');
-$strSetupSaveDir_desc = __('Directory where exports can be saved on server');
-$strSetupSaveDir_name = __('Save directory');
-$strSetupServers_AllowDeny_order_desc = __('Leave blank if not used');
-$strSetupServers_AllowDeny_order_name = __('Host authentication order');
-$strSetupServers_AllowDeny_rules_desc = __('Leave blank for defaults');
-$strSetupServers_AllowDeny_rules_name = __('Host authentication rules');
-$strSetupServers_AllowNoPassword_name = __('Allow logins without a password');
-$strSetupServers_AllowRoot_name = __('Allow root login');
-$strSetupServers_auth_http_realm_desc = __('HTTP Basic Auth Realm name to display when doing HTTP Auth');
-$strSetupServers_auth_http_realm_name = __('HTTP Realm');
-$strSetupServers_auth_swekey_config_desc = __('The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)');
-$strSetupServers_auth_swekey_config_name = __('SweKey config file');
-$strSetupServers_auth_type_desc = __('Authentication method to use');
-$strSetupServers_auth_type_name = __('Authentication type');
-$strSetupServers_bookmarktable_desc = __('Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] support, suggested: [kbd]pma_bookmark[/kbd]');
-$strSetupServers_bookmarktable_name = __('Bookmark table');
-$strSetupServers_column_info_desc = __('Leave blank for no column comments/mime types, suggested: [kbd]pma_column_info[/kbd]');
-$strSetupServers_column_info_name = __('Column information table');
-$strSetupServers_compress_desc = __('Compress connection to MySQL server');
-$strSetupServers_compress_name = __('Compress connection');
-$strSetupServers_connect_type_desc = __('How to connect to server, keep [kbd]tcp[/kbd] if unsure');
-$strSetupServers_connect_type_name = __('Connection type');
-$strSetupServers_controlpass_name = __('Control user password');
-$strSetupServers_controluser_desc = __('A special MySQL user configured with limited permissions, more information available on [a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]');
-$strSetupServers_controluser_name = __('Control user');
-$strSetupServers_CountTables_desc = __('Count tables when showing database list');
-$strSetupServers_CountTables_name = __('Count tables');
-$strSetupServers_designer_coords_desc = __('Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/kbd]');
-$strSetupServers_designer_coords_name = __('Designer table');
-$strSetupServers_DisableIS_desc = __('More information on [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]');
-$strSetupServers_DisableIS_name = __('Disable use of INFORMATION_SCHEMA');
-$strSetupServers_extension_desc = __('What PHP extension to use; you should use mysqli if supported');
-$strSetupServers_extension_name = __('PHP extension to use');
-$strSetupServers_hide_db_desc = __('Hide databases matching regular expression (PCRE)');
-$strSetupServers_hide_db_name = __('Hide databases');
-$strSetupServers_history_desc = __('Leave blank for no SQL query history support, suggested: [kbd]pma_history[/kbd]');
-$strSetupServers_history_name = __('SQL query history table');
-$strSetupServers_host_desc = __('Hostname where MySQL server is running');
-$strSetupServers_host_name = __('Server hostname');
-$strSetupServers_LogoutURL_name = __('Logout URL');
-$strSetupServers_nopassword_desc = __('Try to connect without password');
-$strSetupServers_nopassword_name = __('Connect without password');
-$strSetupServers_only_db_desc = __('You can use MySQL wildcard characters (% and _), escape them if you want to use their literal instances, i.e. use \'my\_db\' and not \'my_db\'');
-$strSetupServers_only_db_name = __('Show only listed databases');
-$strSetupServers_password_desc = __('Leave empty if not using config auth');
-$strSetupServers_password_name = __('Password for config auth');
-$strSetupServers_pdf_pages_desc = __('Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]');
-$strSetupServers_pdf_pages_name = __('PDF schema: pages table');
-$strSetupServers_pmadb_desc = __('Database used for relations, bookmarks, and PDF features. See [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for no support. Suggested: [kbd]phpmyadmin[/kbd]');
-$strSetupServers_pmadb_name = __('PMA database');
-$strSetupServers_port_desc = __('Port on which MySQL server is listening, leave empty for default');
-$strSetupServers_port_name = __('Server port');
-$strSetupServers_relation_desc = __('Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links[/a] support, suggested: [kbd]pma_relation[/kbd]');
-$strSetupServers_relation_name = __('Relation table');
-$strSetupServers_ShowDatabasesCommand_desc = __('SQL command to fetch available databases');
-$strSetupServers_ShowDatabasesCommand_name = __('SHOW DATABASES command');
-$strSetupServers_SignonSession_desc = __('See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types[/a] for an example');
-$strSetupServers_SignonSession_name = __('Signon session name');
-$strSetupServers_SignonURL_name = __('Signon URL');
-$strSetupServers_socket_desc = __('Socket on which MySQL server is listening, leave empty for default');
-$strSetupServers_socket_name = __('Server socket');
-$strSetupServers_ssl_desc = __('Enable SSL for connection to MySQL server');
-$strSetupServers_ssl_name = __('Use SSL');
-$strSetupServers_table_coords_desc = __('Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]');
-$strSetupServers_table_coords_name = __('PDF schema: table coordinates');
-$strSetupServers_table_info_desc = __('Table to describe the display columns, leave blank for no support; suggested: [kbd]pma_table_info[/kbd]');
-$strSetupServers_table_info_name = __('Display columns table');
-$strSetupServers_tracking_add_drop_database_desc = __('Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database.');
-$strSetupServers_tracking_add_drop_database_name = __('Add DROP DATABASE');
-$strSetupServers_tracking_add_drop_table_desc = __('Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table.');
-$strSetupServers_tracking_add_drop_table_name = __('Add DROP TABLE');
-$strSetupServers_tracking_add_drop_view_desc = __('Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view.');
-$strSetupServers_tracking_add_drop_view_name = __('Add DROP VIEW');
-$strSetupServers_tracking_default_statements_desc = __('Defines the list of statements the auto-creation uses for new versions.');
-$strSetupServers_tracking_default_statements_name = __('Statements to track');
-$strSetupServers_tracking_desc = __('Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/kbd]');
-$strSetupServers_tracking_name = __('SQL query tracking table');
-$strSetupServers_tracking_version_auto_create_desc = __('Whether the tracking mechanism creates versions for tables and views automatically.');
-$strSetupServers_tracking_version_auto_create_name = __('Automatically create versions');
-$strSetupServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_config[/kbd]');
-$strSetupServers_userconfig_name = __('User preferences storage table');
-$strSetupServers_user_desc = __('Leave empty if not using config auth');
-$strSetupServers_user_name = __('User for config auth');
-$strSetupServers_verbose_check_desc = __('Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance');
-$strSetupServers_verbose_check_name = __('Verbose check');
-$strSetupServers_verbose_desc = __('A user-friendly description of this server. Leave blank to display the hostname instead.');
-$strSetupServers_verbose_name = __('Verbose name of this server');
-$strSetupShowAll_desc = __('Whether a user should be displayed a &quot;show all (rows)&quot; button');
-$strSetupShowAll_name = __('Allow to display all the rows');
-$strSetupShowChgPassword_desc = __('Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly');
-$strSetupShowChgPassword_name = __('Show password change form');
-$strSetupShowCreateDb_name = __('Show create database form');
-$strSetupShowFieldTypesInDataEditView_desc = __('Defines whether or not type fields should be initially displayed in edit/insert mode');
-$strSetupShowFieldTypesInDataEditView_name = __('Show field types');
-$strSetupShowForm = __('Show form');
-$strSetupShowFunctionFields_desc = __('Display the function fields in edit/insert mode');
-$strSetupShowFunctionFields_name = __('Show function fields');
-$strSetupShowHiddenMessages = __('Show hidden messages (#MSG_COUNT)');
-$strSetupShowPhpInfo_desc = __('Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] output');
-$strSetupShowPhpInfo_name = __('Show phpinfo() link');
-$strSetupShowServerInfo_name = __('Show detailed MySQL server information');
-$strSetupShowSQL_desc = __('Defines whether SQL queries generated by phpMyAdmin should be displayed');
-$strSetupShowSQL_name = __('Show SQL queries');
-$strSetupShowStats_desc = __('Allow to display database and table statistics (eg. space usage)');
-$strSetupShowStats_name = __('Show statistics');
-$strSetupShowTooltipAliasDB_desc = __('If tooltips are enabled and a database comment is set, this will flip the comment and the real name');
-$strSetupShowTooltipAliasDB_name = __('Display database comment instead of its name');
-$strSetupShowTooltipAliasTB_desc = __('When setting this to [kbd]nested[/kbd], the alias of the table name is only used to split/nest the tables according to the $cfg[\'LeftFrameTableSeparator\'] directive, so only the folder is called like the alias, the table name itself stays unchanged');
-$strSetupShowTooltipAliasTB_name = __('Display table comment instead of its name');
-$strSetupShowTooltip_name = __('Display table comments in tooltips');
-$strSetupSkipLockedTables_desc = __('Mark used tables and make it possible to show databases with locked tables');
-$strSetupSkipLockedTables_name = __('Skip locked tables');
-$strSetupSQLQuery_Edit_name = __('Edit');
-$strSetupSQLQuery_Explain_name = __('Explain SQL');
-$strSetupSQLQuery_Refresh_name = __('Refresh');
-$strSetupSQLQuery_ShowAsPHP_name = __('Create PHP Code');
-$strSetupSQLQuery_Validate_name = __('Validate SQL');
-$strSetupSuggestDBName_desc = __('Suggest a database name on the &quot;Create Database&quot; form (if possible) or keep the text field empty');
-$strSetupSuggestDBName_name = __('Suggest new database name');
-$strSetupTextareaCols_desc = __('Textarea size (columns) in edit mode, this value will be emphasized for SQL query textareas (*2) and for query window (*1.25)');
-$strSetupTextareaCols_name = __('Textarea columns');
-$strSetupTextareaRows_name = __('Textarea rows');
-$strSetupTitleDatabase_desc = __('Title of browser window when a database is selected');
-$strSetupTitleDatabase_name = __('Database');
-$strSetupTitleDefault_desc = __('Title of browser window when nothing is selected');
-$strSetupTitleDefault_name = __('Default title');
-$strSetupTitleServer_desc = __('Title of browser window when a server is selected');
-$strSetupTitleServer_name = __('Server');
-$strSetupTitleTable_desc = __('Title of browser window when a table is selected');
-$strSetupTitleTable_name = __('Table');
-$strSetupTrustedProxies_desc = __('Input proxies as [kbd]IP: trusted HTTP header[/kbd]. The following example specifies that phpMyAdmin should trust a HTTP_X_FORWARDED_FOR (X-Forwarded-For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: HTTP_X_FORWARDED_FOR[/kbd]');
-$strSetupTrustedProxies_name = __('List of trusted proxies for IP allow/deny');
-$strSetupUploadDir_desc = __('Directory on server where you can upload files for import');
-$strSetupUploadDir_name = __('Upload directory');
-$strSetupUseDbSearch_desc = __('Allow for searching inside the entire database');
-$strSetupUseDbSearch_name = __('Use database search');
-$strSetupVerboseMultiSubmit_desc = __('Show affected rows of each statement on multiple-statement queries. See libraries/import.lib.php for defaults on how many queries a statement may contain.');
-$strSetupVerboseMultiSubmit_name = __('Verbose multiple statements');
-$strSetupVersionCheckLink = __('Check for latest version');
-$strSetupZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression for import and export operations');
-$strSetupZipDump_name = __('ZIP');
+$strConfigAllowAnywhereRecoding_name = __('Allow character set conversion');
+$strConfigAllowArbitraryServer_desc = __('If enabled user can enter any MySQL server in login form for cookie auth');
+$strConfigAllowArbitraryServer_name = __('Allow login to any MySQL server');
+$strConfigAllowUserDropDatabase_name = __('Show &quot;Drop database&quot; link to normal users');
+$strConfigblowfish_secret_desc = __('Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] authentication');
+$strConfigblowfish_secret_name = __('Blowfish secret');
+$strConfigBrowseMarkerEnable_desc = __('Highlight selected rows');
+$strConfigBrowseMarkerEnable_name = __('Row marker');
+$strConfigBrowsePointerEnable_desc = __('Highlight row pointed by the mouse cursor');
+$strConfigBrowsePointerEnable_name = __('Highlight pointer');
+$strConfigBZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for import and export operations');
+$strConfigBZipDump_name = __('Bzip2');
+$strConfigCharEditing_desc = __('Defines which type of editing controls should be used for CHAR and VARCHAR columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in columns');
+$strConfigCharEditing_name = __('CHAR columns editing');
+$strConfigCharTextareaCols_desc = __('Number of columns for CHAR/VARCHAR textareas');
+$strConfigCharTextareaCols_name = __('CHAR textarea columns');
+$strConfigCharTextareaRows_desc = __('Number of rows for CHAR/VARCHAR textareas');
+$strConfigCharTextareaRows_name = __('CHAR textarea rows');
+$strConfigCheckConfigurationPermissions_name = __('Check config file permissions');
+$strConfigCompressOnFly_desc = __('Compress gzip/bzip2 exports on the fly without the need for much memory; if you encounter problems with created gzip/bzip2 files disable this feature');
+$strConfigCompressOnFly_name = __('Compress on the fly');
+$strConfigConfigurationFile = __('Configuration file');
+$strConfigConfirm_desc = __('Whether a warning (&quot;Are your really sure...&quot;) should be displayed when you\'re about to lose data');
+$strConfigConfirm_name = __('Confirm DROP queries');
+$strConfigCtrlArrowsMoving_name = __('Field navigation using Ctrl+Arrows');
+$strConfigDefaultCharset_desc = __('Default character set used for conversions');
+$strConfigDefaultCharset_name = __('Default character set');
+$strConfigDefaultDisplay_name = __('Default display direction');
+$strConfigDefaultLanguage = __('Default language');
+$strConfigDefaultPropDisplay_desc = __('[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates maximum number for which vertical model is used');
+$strConfigDefaultPropDisplay_name = __('Display direction for altering/creating columns');
+$strConfigDefaultServer = __('Default server');
+$strConfigDefaultTabDatabase_desc = __('Tab that is displayed when entering a database');
+$strConfigDefaultTabDatabase_name = __('Default database tab');
+$strConfigDefaultTabServer_desc = __('Tab that is displayed when entering a server');
+$strConfigDefaultTabServer_name = __('Default server tab');
+$strConfigDefaultTabTable_desc = __('Tab that is displayed when entering a table');
+$strConfigDefaultTabTable_name = __('Default table tab');
+$strConfigDisplay = __('Display');
+$strConfigDisplayBinaryAsHex_desc = __('Show binary contents as HEX by default');
+$strConfigDisplayBinaryAsHex_name = __('Show binary contents as HEX');
+$strConfigDisplayDatabasesList_desc = __('Show database listing as a list instead of a drop down');
+$strConfigDisplayDatabasesList_name = __('Display databases as a list');
+$strConfigDisplayServersList_desc = __('Show server listing as a list instead of a drop down');
+$strConfigDisplayServersList_name = __('Display servers as a list');
+$strConfigDonateLink = __('Donate');
+$strConfigDownload = __('Download');
+$strConfigEditInWindow_desc = __('Edit SQL queries in popup window');
+$strConfigEditInWindow_name = __('Edit in window');
+$strConfigEndOfLine = __('End of line');
+$strConfigErrorIconic_desc = __('Show icons for warning, error and information messages');
+$strConfigErrorIconic_name = __('Iconic errors');
+$strConfigExecTimeLimit_desc = __('Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)');
+$strConfigExecTimeLimit_name = __('Maximum execution time');
+$strConfigExport_asfile_name = __('Save as file');
+$strConfigExport_charset_name = __('Character set of the file');
+$strConfigExport_codegen_format_name = __('Format');
+$strConfigExport_compression_name = __('Compression');
+$strConfigExport_csv_columns_name = __('Put columns names in the first row');
+$strConfigExport_csv_enclosed_name = __('Columns enclosed by');
+$strConfigExport_csv_escaped_name = __('Columns escaped by');
+$strConfigExport_csv_null_name = __('Replace NULL by');
+$strConfigExport_csv_removeCRLF_name = __('Remove CRLF characters within columns');
+$strConfigExport_csv_separator_name = __('Columns terminated by');
+$strConfigExport_csv_terminated_name = __('Lines terminated by');
+$strConfigExport_excel_columns_name = __('Put columns names in the first row');
+$strConfigExport_excel_edition_name = __('Excel edition');
+$strConfigExport_excel_null_name = __('Replace NULL by');
+$strConfigExport_excel_removeCRLF_name = __('Remove CRLF characters within columns');
+$strConfigExport_file_template_database_name = __('Database name template');
+$strConfigExport_file_template_server_name = __('Server name template');
+$strConfigExport_file_template_table_name = __('Table name template');
+$strConfigExport_format_name = __('Format');
+$strConfigExport_htmlword_columns_name = __('Put columns names in the first row');
+$strConfigExport_htmlword_data_name = __('Data');
+$strConfigExport_htmlword_null_name = __('Replace NULL by');
+$strConfigExport_htmlword_structure_name = __('Structure');
+$strConfigExport_latex_caption_name = __('Include table caption');
+$strConfigExport_latex_columns_name = __('Put columns names in the first row');
+$strConfigExport_latex_comments_name = __('Comments');
+$strConfigExport_latex_data_caption_name = __('Table caption');
+$strConfigExport_latex_data_continued_caption_name = __('Continued table caption');
+$strConfigExport_latex_data_label_name = __('Label key');
+$strConfigExport_latex_data_name = __('Data');
+$strConfigExport_latex_mime_name = __('MIME type');
+$strConfigExport_latex_null_name  = __('Replace NULL by');
+$strConfigExport_latex_relation_name = __('Relations');
+$strConfigExport_latex_structure_caption_name = __('Table caption');
+$strConfigExport_latex_structure_continued_caption_name = __('Continued table caption');
+$strConfigExport_latex_structure_label_name = __('Label key');
+$strConfigExport_latex_structure_name = __('Structure');
+$strConfigExport_ods_columns_name = __('Put columns names in the first row');
+$strConfigExport_ods_null_name = __('Replace NULL by');
+$strConfigExport_odt_columns_name = __('Put columns names in the first row');
+$strConfigExport_odt_comments_name = __('Comments');
+$strConfigExport_odt_data_name = __('Data');
+$strConfigExport_odt_mime_name = __('MIME type');
+$strConfigExport_odt_null_name = __('Replace NULL by');
+$strConfigExport_odt_relation_name = __('Relations');
+$strConfigExport_odt_structure_name = __('Structure');
+$strConfigExport_onserver_name = __('Save on server');
+$strConfigExport_onserver_overwrite_name = __('Overwrite existing file(s)');
+$strConfigExport_remember_file_template_name = __('Remember file name template');
+$strConfigExport_sql_auto_increment_name = __('Add AUTO_INCREMENT value');
+$strConfigExport_sql_backquotes_name = __('Enclose table and column names with backquotes');
+$strConfigExport_sql_columns_name = __('Complete inserts');
+$strConfigExport_sql_compatibility_name = __('SQL compatibility mode');
+$strConfigExport_sql_data_name = __('Data');
+$strConfigExport_sql_dates_name = __('Creation/Update/Check dates');
+$strConfigExport_sql_delayed_name = __('Use delayed inserts');
+$strConfigExport_sql_disable_fk_name = __('Disable foreign key checks');
+$strConfigExport_sql_drop_database_name = sprintf(__('Add %s'), 'DROP DATABASE');
+$strConfigExport_sql_drop_table_name = sprintf(__('Add %s'), 'DROP TABLE / VIEW / PROCEDURE / FUNCTION / EVENT');
+$strConfigExport_sql_extended_name = __('Extended inserts');
+$strConfigExport_sql_hex_for_blob_name = __('Use hexadecimal for BLOB');
+$strConfigExport_sql_if_not_exists_name = sprintf(__('Add %s'), 'IF NOT EXISTS');
+$strConfigExport_sql_ignore_name = __('Use ignore inserts');
+$strConfigExport_sql_include_comments_name = __('Comments');
+$strConfigExport_sql_max_query_size_name = __('Maximal length of created query');
+$strConfigExport_sql_mime_name = __('MIME type');
+$strConfigExport_sql_procedure_function_name = sprintf(__('Add %s'), 'CREATE PROCEDURE / FUNCTION / EVENT');
+$strConfigExport_sql_relation_name = __('Relations');
+$strConfigExport_sql_structure_name = __('Structure');
+$strConfigExport_sql_type_name = __('Export type');
+$strConfigExport_sql_use_transaction_name = __('Enclose export in a transaction');
+$strConfigExport_sql_utc_time_name = __('Export time in UTC');
+$strConfigExport_texytext_columns_name = __('Put columns names in the first row');
+$strConfigExport_texytext_data_name = __('Data');
+$strConfigExport_texytext_null_name = __('Replace NULL by');
+$strConfigExport_texytext_structure_name = __('Structure');
+$strConfigExport_xls_columns_name = __('Put columns names in the first row');
+$strConfigExport_xls_null_name = __('Replace NULL by');
+$strConfigExport_xlsx_columns_name = __('Put columns names in the first row');
+$strConfigExport_xlsx_null_name = __('Replace NULL by');
+$strConfigForceSSL_desc = __('Force secured connection while using phpMyAdmin');
+$strConfigForceSSL_name = __('Force SSL connection');
+$strConfigForeignKeyDropdownOrder_desc = __('Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is the referenced data, [kbd]id[/kbd] is the key value');
+$strConfigForeignKeyDropdownOrder_name = __('Foreign key dropdown order');
+$strConfigForeignKeyMaxLimit_desc = __('A dropdown will be used if fewer items are present');
+$strConfigForeignKeyMaxLimit_name = __('Foreign key limit');
+$strConfigForm_Browse = __('Browse mode');
+$strConfigForm_Browse_desc = __('Customize browse mode');
+$strConfigForm_CodeGen = 'CodeGen';
+$strConfigForm_CodeGen_desc = __('Customize default options');
+$strConfigForm_Csv = __('CSV');
+$strConfigForm_Csv_desc = __('Customize default options');
+$strConfigForm_Edit = __('Edit mode');
+$strConfigForm_Edit_desc = __('Customize edit mode');
+$strConfigForm_Export = __('Export');
+$strConfigForm_Export_defaults = __('Export defaults');
+$strConfigForm_Export_defaults_desc = __('Customize default export options');
+$strConfigForm_General = __('General settings');
+$strConfigForm_Import = __('Import');
+$strConfigForm_Import_defaults = __('Import defaults');
+$strConfigForm_Import_defaults_desc = __('Customize default common import options');
+$strConfigForm_Import_export = __('Import / export');
+$strConfigForm_Import_export_desc = __('Set import and export directories and compression options');
+$strConfigForm_Latex = __('LaTeX');
+$strConfigForm_Latex_desc = __('Customize default options');
+$strConfigForm_Ldi = __('CSV using LOAD DATA');
+$strConfigForm_Ldi_desc = __('Customize default options');
+$strConfigForm_Left_databases = __('Databases');
+$strConfigForm_Left_databases_desc = __('Databases display options');
+$strConfigForm_Left_frame = __('Navigation frame');
+$strConfigForm_Left_frame_desc = __('Customize appearance of the navigation frame');
+$strConfigForm_Left_servers = __('Servers');
+$strConfigForm_Left_servers_desc = __('Servers display options');
+$strConfigForm_Left_tables = __('Tables');
+$strConfigForm_Left_tables_desc = __('Tables display options');
+$strConfigForm_Main_frame = __('Main frame');
+$strConfigForm_Microsoft_Office = __('Microsoft Office');
+$strConfigForm_Microsoft_Office_desc = __('Customize default options');
+$strConfigForm_Open_Document = __('Open Document');
+$strConfigForm_Open_Document_desc = __('Customize default options');
+$strConfigForm_Other_core_settings = __('Other core settings');
+$strConfigForm_Other_core_settings_desc = __('Settings that didn\'t fit enywhere else');
+$strConfigForm_Page_titles = __('Page titles');
+$strConfigForm_Page_titles_desc = __('Specify browser\'s title bar text. Refer to [a@Documentation.html#cfg_TitleTable]documentation[/a] for magic strings that can be used to get special values.');
+$strConfigForm_Query_window = __('Query window');
+$strConfigForm_Query_window_desc = __('Customize query window options');
+$strConfigForm_Security = __('Security');
+$strConfigForm_Security_desc = __('Please note that phpMyAdmin is just a user interface and its features do not limit MySQL');
+$strConfigForm_Server = __('Basic settings');
+$strConfigForm_Server_config = __('Server configuration');
+$strConfigForm_Server_config_desc = __('Advanced server configuration, do not change these options unless you know what they are for');
+$strConfigForm_Server_desc = __('Enter server connection parameters');
+$strConfigForm_Server_login_options = __('Signon login options');
+$strConfigForm_Server_login_options_desc = __('Enter login options for signon authentication');
+$strConfigForm_Server_pmadb = __('PMA database');
+$strConfigForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation');
+$strConfigForm_Server_tracking = __('Changes tracking');
+$strConfigForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.');
+$strConfigFormset_Export = __('Customize export options');
+$strConfigFormset_Features = __('Features');
+$strConfigFormset_Import = __('Customize import defaults');
+$strConfigFormset_Left_frame = __('Customize navigation frame');
+$strConfigFormset_Main_frame = __('Customize main frame');
+$strConfigForm_Sql = __('SQL');
+$strConfigForm_Sql_box = __('SQL Query box');
+$strConfigForm_Sql_box_desc = __('Customize links shown in SQL Query boxes');
+$strConfigForm_Sql_desc = __('Customize default options');
+$strConfigForm_Sql_queries = __('SQL queries');
+$strConfigForm_Sql_queries_desc = __('SQL queries settings');
+$strConfigForm_Startup = __('Startup');
+$strConfigForm_Startup_desc = __('Customize startup page');
+$strConfigForm_Tabs = __('Tabs');
+$strConfigForm_Tabs_desc = __('Choose how you want tabs to work');
+$strConfigForm_Texy = __('Texy! text');
+$strConfigForm_Texy_desc = __('Customize default options');
+$strConfigGZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import and export operations');
+$strConfigGZipDump_name = __('GZip');
+$strConfigIconvExtraParams_name = __('Extra parameters for iconv');
+$strConfigIgnoreErrors = __('Ignore errors');
+$strConfigIgnoreMultiSubmitErrors_desc = __('If enabled, phpMyAdmin continues computing multiple-statement queries even if one of the queries failed');
+$strConfigIgnoreMultiSubmitErrors_name = __('Ignore multiple statement errors');
+$strConfigImport_allow_interrupt_desc = __('Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.');
+$strConfigImport_allow_interrupt_name = __('Partial import: allow interrupt');
+$strConfigImport_csv_col_names_name = __('Lines terminated by');
+$strConfigImport_csv_enclosed_name = __('Columns enclosed by');
+$strConfigImport_csv_escaped_name = __('Columns escaped by');
+$strConfigImport_csv_ignore_name = __('Ignore duplicate rows');
+$strConfigImport_csv_replace_name = __('Replace table data with file');
+$strConfigImport_csv_terminated_name = __('Columns terminated by');
+$strConfigImport_format_desc = __('Default format; be aware that this list depends on location (database, table) and only SQL is always available');
+$strConfigImport_format_name = __('Format of imported file');
+$strConfigImport_ldi_enclosed_name = __('Columns enclosed by');
+$strConfigImport_ldi_escaped_name = __('Columns escaped by');
+$strConfigImport_ldi_ignore_name = __('Ignore duplicate rows');
+$strConfigImport_ldi_local_option_name = __('Use LOCAL keyword');
+$strConfigImport_ldi_replace_name = __('Replace table data with file');
+$strConfigImport_ldi_terminated_name = __('Columns terminated by');
+$strConfigImport_ods_col_names_name = __('Column names in first row');
+$strConfigImport_ods_empty_rows_name = __('Do not import empty rows');
+$strConfigImport_ods_recognize_currency_name = __('Import currencies ($5.00 to 5.00)');
+$strConfigImport_ods_recognize_percentages_name = __('Import percentages as proper decimals (12.00% to .12)');
+$strConfigImport_skip_queries_desc = __('Number of queries to skip from start');
+$strConfigImport_skip_queries_name = __('Partial import: skip queries');
+$strConfigImport_sql_compatibility_name = __('SQL compatibility mode');
+$strConfigImport_sql_no_auto_value_on_zero_name = __('Do not use AUTO_INCREMENT for zero values');
+$strConfigImport_xls_col_names_name = __('Column names in first row');
+$strConfigImport_xlsx_col_names_name = __('Column names in first row');
+$strConfigInitialSlidersState_name = __('Initial state for sliders');
+$strConfigInsertRows_desc = __('How many rows can be inserted at one time');
+$strConfigInsertRows_name = __('Number of inserted rows');
+$strConfigLeftDefaultTabTable_name = __('Target for quick access icon');
+$strConfigLeftDisplayLogo_desc = __('Show logo in left frame');
+$strConfigLeftDisplayLogo_name = __('Display logo');
+$strConfigLeftDisplayServers_desc = __('Display server choice at the top of the left frame');
+$strConfigLeftDisplayServers_name = __('Display servers selection');
+$strConfigLeftFrameDBSeparator_desc = __('String that separates databases into different tree levels');
+$strConfigLeftFrameDBSeparator_name = __('Database tree separator');
+$strConfigLeftFrameDBTree_desc = __('Only light version; display databases in a tree (determined by the separator defined below)');
+$strConfigLeftFrameDBTree_name = __('Display databases in a tree');
+$strConfigLeftFrameLight_desc = __('Disable this if you want to see all databases at once');
+$strConfigLeftFrameLight_name = __('Use light version');
+$strConfigLeftFrameTableLevel_name = __('Maximum table tree depth');
+$strConfigLeftFrameTableSeparator_desc = __('String that separates tables into different tree levels');
+$strConfigLeftFrameTableSeparator_name = __('Table tree separator');
+$strConfigLeftLogoLink_name = __('Logo link URL');
+$strConfigLeftLogoLinkWindow_desc = __('Open the linked page in the main window ([kbd]main[/kbd]) or in a new one ([kbd]new[/kbd])');
+$strConfigLeftLogoLinkWindow_name = __('Logo link target');
+$strConfigLeftPointerEnable_desc = __('Highlight server under the mouse cursor');
+$strConfigLeftPointerEnable_name = __('Enable highlighting');
+$strConfigLetUserChoose = __('let the user choose');
+$strConfigLightTabs_desc = __('Use less graphically intense tabs');
+$strConfigLightTabs_name = __('Light tabs');
+$strConfigLimitChars_desc = __('Maximum number of characters shown in any non-numeric column on browse view');
+$strConfigLimitChars_name = __('Limit column characters');
+$strConfigLoginCookieDeleteAll_desc = __('If TRUE, logout deletes cookies for all servers; when set to FALSE, logout only occurs for the current server. Setting this to FALSE makes it easy to forget to log out from other servers when connected to multiple servers.');
+$strConfigLoginCookieDeleteAll_name = __('Delete all cookies on logout');
+$strConfigLoginCookieRecall_desc = __('Define whether the previous login should be recalled or not in cookie authentication mode');
+$strConfigLoginCookieRecall_name = __('Recall user name');
+$strConfigLoginCookieStore_desc = __('Defines how long (in seconds) a login cookie should be stored in browser. The default of 0 means that it will be kept for the existing session only, and will be deleted as soon as you close the browser window. This is recommended for non-trusted environments.');
+$strConfigLoginCookieStore_name = __('Login cookie store');
+$strConfigLoginCookieValidity_desc = __('Define how long (in seconds) a login cookie is valid');
+$strConfigLoginCookieValidity_name = __('Login cookie validity');
+$strConfigLongtextDoubleTextarea_desc = __('Double size of textarea for LONGTEXT fields');
+$strConfigLongtextDoubleTextarea_name = __('Bigger textarea for LONGTEXT');
+$strConfigMainPageIconic_name = __('Use icons on main page');
+$strConfigMaxCharactersInDisplayedSQL_desc = __('Maximum number of characters used when a SQL query is displayed');
+$strConfigMaxCharactersInDisplayedSQL_name = __('Maximum displayed SQL length');
+$strConfigMaxDbList_desc = __('Maximum number of databases displayed in left frame and database list');
+$strConfigMaxDbList_name = __('Maximum databases');
+$strConfigMaxRows_desc = __('Number of rows displayed when browsing a result set. If the result set contains more rows, &quot;Previous&quot; and &quot;Next&quot; links will be shown.');
+$strConfigMaxRows_name = __('Maximum number of rows to display');
+$strConfigMaxTableList_desc = __('Maximum number of tables displayed in table list');
+$strConfigMaxTableList_name = __('Maximum tables');
+$strConfigMemoryLimit_desc = __('The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] ([kbd]0[/kbd] for no limit)');
+$strConfigMemoryLimit_name = __('Memory limit');
+$strConfigModifyDeleteAtLeft_name = __('Show left delete link');
+$strConfigModifyDeleteAtRight_name = __('Show right delete link');
+$strConfigNaturalOrder_desc = __('Use natural order for sorting table and database names');
+$strConfigNaturalOrder_name = __('Natural order');
+$strConfigNavigationBarIconic_desc = __('Use only icons, only text or both');
+$strConfigNavigationBarIconic_name = __('Iconic navigation bar');
+$strConfigOBGzip_desc = __('use GZip output buffering for increased speed in HTTP transfers');
+$strConfigOBGzip_name = __('GZip output buffering');
+$strConfigOptionNone = __('- none -');
+$strConfigOrder_desc = __('[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, DATETIME and TIMESTAMP, ascending order otherwise');
+$strConfigOrder_name = __('Default sorting order');
+$strConfigPersistentConnections_desc = __('Use persistent connections to MySQL databases');
+$strConfigPersistentConnections_name = __('Persistent connections');
+$strConfigPropertiesIconic_desc = __('Use only icons, only text or both');
+$strConfigPropertiesIconic_name = __('Iconic table operations');
+$strConfigProtectBinary_desc = __('Disallow BLOB and BINARY columns from editing');
+$strConfigProtectBinary_name = __('Protect binary columns');
+$strConfigQueryHistoryDB_desc = __('Enable if you want DB-based query history (requires pmadb). If disabled, this utilizes JS-routines to display query history (lost by window close).');
+$strConfigQueryHistoryDB_name = __('Permanent query history');
+$strConfigQueryHistoryMax_desc = __('How many queries are kept in history');
+$strConfigQueryHistoryMax_name = __('Query history length');
+$strConfigQueryWindowDefTab_desc = __('Tab displayed when opening a new query window');
+$strConfigQueryWindowDefTab_name = __('Default query window tab');
+$strConfigQueryWindowHeight_desc = __('Query window height (in pixels)');
+$strConfigQueryWindowHeight_name = __('Query window height');
+$strConfigQueryWindowWidth_desc = __('Query window height (in pixels)');
+$strConfigQueryWindowWidth_name = __('Query window width');
+$strConfigRecodingEngine_desc = __('Select which functions will be used for character set conversion');
+$strConfigRecodingEngine_name = __('Recoding engine');
+$strConfigRepeatCells_desc = __('Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature');
+$strConfigRepeatCells_name = __('Repeat headers');
+$strConfigReplaceHelpImg_desc = __('Show help button instead of Documentation text');
+$strConfigReplaceHelpImg_name = __('Show help button');
+$strConfigRestoreDefaultValue = __('Restore default value');
+$strConfigRevertErroneousFields = __('Try to revert erroneous fields to their default values');
+$strConfigSaveDir_desc = __('Directory where exports can be saved on server');
+$strConfigSaveDir_name = __('Save directory');
+$strConfigServers_AllowDeny_order_desc = __('Leave blank if not used');
+$strConfigServers_AllowDeny_order_name = __('Host authentication order');
+$strConfigServers_AllowDeny_rules_desc = __('Leave blank for defaults');
+$strConfigServers_AllowDeny_rules_name = __('Host authentication rules');
+$strConfigServers_AllowNoPassword_name = __('Allow logins without a password');
+$strConfigServers_AllowRoot_name = __('Allow root login');
+$strConfigServers_auth_http_realm_desc = __('HTTP Basic Auth Realm name to display when doing HTTP Auth');
+$strConfigServers_auth_http_realm_name = __('HTTP Realm');
+$strConfigServers_auth_swekey_config_desc = __('The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)');
+$strConfigServers_auth_swekey_config_name = __('SweKey config file');
+$strConfigServers_auth_type_desc = __('Authentication method to use');
+$strConfigServers_auth_type_name = __('Authentication type');
+$strConfigServers_bookmarktable_desc = __('Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] support, suggested: [kbd]pma_bookmark[/kbd]');
+$strConfigServers_bookmarktable_name = __('Bookmark table');
+$strConfigServers_column_info_desc = __('Leave blank for no column comments/mime types, suggested: [kbd]pma_column_info[/kbd]');
+$strConfigServers_column_info_name = __('Column information table');
+$strConfigServers_compress_desc = __('Compress connection to MySQL server');
+$strConfigServers_compress_name = __('Compress connection');
+$strConfigServers_connect_type_desc = __('How to connect to server, keep [kbd]tcp[/kbd] if unsure');
+$strConfigServers_connect_type_name = __('Connection type');
+$strConfigServers_controlpass_name = __('Control user password');
+$strConfigServers_controluser_desc = __('A special MySQL user configured with limited permissions, more information available on [a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]');
+$strConfigServers_controluser_name = __('Control user');
+$strConfigServers_CountTables_desc = __('Count tables when showing database list');
+$strConfigServers_CountTables_name = __('Count tables');
+$strConfigServers_designer_coords_desc = __('Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/kbd]');
+$strConfigServers_designer_coords_name = __('Designer table');
+$strConfigServers_DisableIS_desc = __('More information on [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]');
+$strConfigServers_DisableIS_name = __('Disable use of INFORMATION_SCHEMA');
+$strConfigServers_extension_desc = __('What PHP extension to use; you should use mysqli if supported');
+$strConfigServers_extension_name = __('PHP extension to use');
+$strConfigServers_hide_db_desc = __('Hide databases matching regular expression (PCRE)');
+$strConfigServers_hide_db_name = __('Hide databases');
+$strConfigServers_history_desc = __('Leave blank for no SQL query history support, suggested: [kbd]pma_history[/kbd]');
+$strConfigServers_history_name = __('SQL query history table');
+$strConfigServers_host_desc = __('Hostname where MySQL server is running');
+$strConfigServers_host_name = __('Server hostname');
+$strConfigServers_LogoutURL_name = __('Logout URL');
+$strConfigServers_nopassword_desc = __('Try to connect without password');
+$strConfigServers_nopassword_name = __('Connect without password');
+$strConfigServers_only_db_desc = __('You can use MySQL wildcard characters (% and _), escape them if you want to use their literal instances, i.e. use \'my\_db\' and not \'my_db\'');
+$strConfigServers_only_db_name = __('Show only listed databases');
+$strConfigServers_password_desc = __('Leave empty if not using config auth');
+$strConfigServers_password_name = __('Password for config auth');
+$strConfigServers_pdf_pages_desc = __('Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]');
+$strConfigServers_pdf_pages_name = __('PDF schema: pages table');
+$strConfigServers_pmadb_desc = __('Database used for relations, bookmarks, and PDF features. See [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for no support. Suggested: [kbd]phpmyadmin[/kbd]');
+$strConfigServers_pmadb_name = __('PMA database');
+$strConfigServers_port_desc = __('Port on which MySQL server is listening, leave empty for default');
+$strConfigServers_port_name = __('Server port');
+$strConfigServers_relation_desc = __('Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links[/a] support, suggested: [kbd]pma_relation[/kbd]');
+$strConfigServers_relation_name = __('Relation table');
+$strConfigServers_ShowDatabasesCommand_desc = __('SQL command to fetch available databases');
+$strConfigServers_ShowDatabasesCommand_name = __('SHOW DATABASES command');
+$strConfigServers_SignonSession_desc = __('See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types[/a] for an example');
+$strConfigServers_SignonSession_name = __('Signon session name');
+$strConfigServers_SignonURL_name = __('Signon URL');
+$strConfigServers_socket_desc = __('Socket on which MySQL server is listening, leave empty for default');
+$strConfigServers_socket_name = __('Server socket');
+$strConfigServers_ssl_desc = __('Enable SSL for connection to MySQL server');
+$strConfigServers_ssl_name = __('Use SSL');
+$strConfigServers_table_coords_desc = __('Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]');
+$strConfigServers_table_coords_name = __('PDF schema: table coordinates');
+$strConfigServers_table_info_desc = __('Table to describe the display columns, leave blank for no support; suggested: [kbd]pma_table_info[/kbd]');
+$strConfigServers_table_info_name = __('Display columns table');
+$strConfigServers_tracking_add_drop_database_desc = __('Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database.');
+$strConfigServers_tracking_add_drop_database_name = __('Add DROP DATABASE');
+$strConfigServers_tracking_add_drop_table_desc = __('Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table.');
+$strConfigServers_tracking_add_drop_table_name = __('Add DROP TABLE');
+$strConfigServers_tracking_add_drop_view_desc = __('Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view.');
+$strConfigServers_tracking_add_drop_view_name = __('Add DROP VIEW');
+$strConfigServers_tracking_default_statements_desc = __('Defines the list of statements the auto-creation uses for new versions.');
+$strConfigServers_tracking_default_statements_name = __('Statements to track');
+$strConfigServers_tracking_desc = __('Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/kbd]');
+$strConfigServers_tracking_name = __('SQL query tracking table');
+$strConfigServers_tracking_version_auto_create_desc = __('Whether the tracking mechanism creates versions for tables and views automatically.');
+$strConfigServers_tracking_version_auto_create_name = __('Automatically create versions');
+$strConfigServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_config[/kbd]');
+$strConfigServers_userconfig_name = __('User preferences storage table');
+$strConfigServers_user_desc = __('Leave empty if not using config auth');
+$strConfigServers_user_name = __('User for config auth');
+$strConfigServers_verbose_check_desc = __('Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance');
+$strConfigServers_verbose_check_name = __('Verbose check');
+$strConfigServers_verbose_desc = __('A user-friendly description of this server. Leave blank to display the hostname instead.');
+$strConfigServers_verbose_name = __('Verbose name of this server');
+$strConfigShowAll_desc = __('Whether a user should be displayed a &quot;show all (rows)&quot; button');
+$strConfigShowAll_name = __('Allow to display all the rows');
+$strConfigShowChgPassword_desc = __('Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly');
+$strConfigShowChgPassword_name = __('Show password change form');
+$strConfigShowCreateDb_name = __('Show create database form');
+$strConfigShowFieldTypesInDataEditView_desc = __('Defines whether or not type fields should be initially displayed in edit/insert mode');
+$strConfigShowFieldTypesInDataEditView_name = __('Show field types');
+$strConfigShowForm = __('Show form');
+$strConfigShowFunctionFields_desc = __('Display the function fields in edit/insert mode');
+$strConfigShowFunctionFields_name = __('Show function fields');
+$strConfigShowHiddenMessages = __('Show hidden messages (#MSG_COUNT)');
+$strConfigShowPhpInfo_desc = __('Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] output');
+$strConfigShowPhpInfo_name = __('Show phpinfo() link');
+$strConfigShowServerInfo_name = __('Show detailed MySQL server information');
+$strConfigShowSQL_desc = __('Defines whether SQL queries generated by phpMyAdmin should be displayed');
+$strConfigShowSQL_name = __('Show SQL queries');
+$strConfigShowStats_desc = __('Allow to display database and table statistics (eg. space usage)');
+$strConfigShowStats_name = __('Show statistics');
+$strConfigShowTooltipAliasDB_desc = __('If tooltips are enabled and a database comment is set, this will flip the comment and the real name');
+$strConfigShowTooltipAliasDB_name = __('Display database comment instead of its name');
+$strConfigShowTooltipAliasTB_desc = __('When setting this to [kbd]nested[/kbd], the alias of the table name is only used to split/nest the tables according to the $cfg[\'LeftFrameTableSeparator\'] directive, so only the folder is called like the alias, the table name itself stays unchanged');
+$strConfigShowTooltipAliasTB_name = __('Display table comment instead of its name');
+$strConfigShowTooltip_name = __('Display table comments in tooltips');
+$strConfigSkipLockedTables_desc = __('Mark used tables and make it possible to show databases with locked tables');
+$strConfigSkipLockedTables_name = __('Skip locked tables');
+$strConfigSQLQuery_Edit_name = __('Edit');
+$strConfigSQLQuery_Explain_name = __('Explain SQL');
+$strConfigSQLQuery_Refresh_name = __('Refresh');
+$strConfigSQLQuery_ShowAsPHP_name = __('Create PHP Code');
+$strConfigSQLQuery_Validate_name = __('Validate SQL');
+$strConfigSuggestDBName_desc = __('Suggest a database name on the &quot;Create Database&quot; form (if possible) or keep the text field empty');
+$strConfigSuggestDBName_name = __('Suggest new database name');
+$strConfigTextareaCols_desc = __('Textarea size (columns) in edit mode, this value will be emphasized for SQL query textareas (*2) and for query window (*1.25)');
+$strConfigTextareaCols_name = __('Textarea columns');
+$strConfigTextareaRows_name = __('Textarea rows');
+$strConfigTitleDatabase_desc = __('Title of browser window when a database is selected');
+$strConfigTitleDatabase_name = __('Database');
+$strConfigTitleDefault_desc = __('Title of browser window when nothing is selected');
+$strConfigTitleDefault_name = __('Default title');
+$strConfigTitleServer_desc = __('Title of browser window when a server is selected');
+$strConfigTitleServer_name = __('Server');
+$strConfigTitleTable_desc = __('Title of browser window when a table is selected');
+$strConfigTitleTable_name = __('Table');
+$strConfigTrustedProxies_desc = __('Input proxies as [kbd]IP: trusted HTTP header[/kbd]. The following example specifies that phpMyAdmin should trust a HTTP_X_FORWARDED_FOR (X-Forwarded-For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: HTTP_X_FORWARDED_FOR[/kbd]');
+$strConfigTrustedProxies_name = __('List of trusted proxies for IP allow/deny');
+$strConfigUploadDir_desc = __('Directory on server where you can upload files for import');
+$strConfigUploadDir_name = __('Upload directory');
+$strConfigUseDbSearch_desc = __('Allow for searching inside the entire database');
+$strConfigUseDbSearch_name = __('Use database search');
+$strConfigVerboseMultiSubmit_desc = __('Show affected rows of each statement on multiple-statement queries. See libraries/import.lib.php for defaults on how many queries a statement may contain.');
+$strConfigVerboseMultiSubmit_name = __('Verbose multiple statements');
+$strConfigVersionCheckLink = __('Check for latest version');
+$strConfigZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression for import and export operations');
+$strConfigZipDump_name = __('ZIP');
 
 ?>
\ No newline at end of file
diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index ca01ec1f9..54a0c6d94 100644
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -308,7 +308,7 @@ function validate_trusted_proxies($path, $values)
  * @param bool   $allow_neg       allow negative values
  * @param bool   $allow_zero      allow zero
  * @param int    $max_value       max allowed value
- * @param string $error_string    error message key: $GLOBALS["strSetup$error_lang_key"]
+ * @param string $error_string    error message key: $GLOBALS["strConfig$error_lang_key"]
  * @return string  empty string if test is successful
  */
 function test_number($path, $values, $allow_neg, $allow_zero, $max_value, $error_string)
diff --git a/scripts/find_unused_messages.sh b/scripts/find_unused_messages.sh
index ea8394b4b..bf01ffc65 100755
--- a/scripts/find_unused_messages.sh
+++ b/scripts/find_unused_messages.sh
@@ -29,7 +29,7 @@ echo
 echo Not used messages present in messages file:
 echo
 
-diff $tmp1 $tmp2 | awk '/^</ {print $2}' | grep -Ev '(strSetup.*_(desc|name)|strSetupForm_|strSetupFormset_)'
+diff $tmp1 $tmp2 | awk '/^</ {print $2}' | grep -Ev '(strConfig.*_(desc|name)|strConfigForm_|strConfigFormset_)'
 
 
 rm -f $tmp1 $tmp2
diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php
index 91feebb00..66a4a0ca7 100644
--- a/setup/frames/form.inc.php
+++ b/setup/frames/form.inc.php
@@ -26,8 +26,8 @@ if (!isset($forms[$formset_id])) {
     die('Incorrect formset, check $formsets array in setup/frames/form.inc.php');
 }
 
-if (isset($GLOBALS['strSetupFormset_' . $formset_id])) {
-    echo '<h2>' . $GLOBALS['strSetupFormset_' . $formset_id] . '</h2>';
+if (isset($GLOBALS['strConfigFormset_' . $formset_id])) {
+    echo '<h2>' . $GLOBALS['strConfigFormset_' . $formset_id] . '</h2>';
 }
 $form_display = new FormDisplay();
 foreach ($forms[$formset_id] as $form_name => $form) {
diff --git a/user_preferences.php b/user_preferences.php
index f67c9e7db..69f3a318f 100644
--- a/user_preferences.php
+++ b/user_preferences.php
@@ -39,7 +39,7 @@ $tabs_icons = array(
 foreach (array_keys($forms) as $formset) {
     $tabs[] = array(
         'link' => 'user_preferences.php',
-        'text' => PMA_ifSetOr($GLOBALS['strSetupForm_' . $formset], $formset), // TODO: remove ifSetOr
+        'text' => PMA_lang('Form_' . $formset),
         'icon' => $tabs_icons[$formset],
         'active' => $formset == $form_param,
         'url_params' => array('form' => $formset));

From d63fa35c0f4147859370adbda34fbb27c811634d Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sun, 4 Jul 2010 00:18:04 +0200
Subject: [PATCH 036/106] finished messages.inc.php cleanup

---
 libraries/config/messages.inc.php | 13 +------------
 setup/lib/form_processing.lib.php |  6 +++---
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index ab218182b..39536ffdf 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -41,28 +41,22 @@ $strConfigCtrlArrowsMoving_name = __('Field navigation using Ctrl+Arrows');
 $strConfigDefaultCharset_desc = __('Default character set used for conversions');
 $strConfigDefaultCharset_name = __('Default character set');
 $strConfigDefaultDisplay_name = __('Default display direction');
-$strConfigDefaultLanguage = __('Default language');
 $strConfigDefaultPropDisplay_desc = __('[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates maximum number for which vertical model is used');
 $strConfigDefaultPropDisplay_name = __('Display direction for altering/creating columns');
-$strConfigDefaultServer = __('Default server');
 $strConfigDefaultTabDatabase_desc = __('Tab that is displayed when entering a database');
 $strConfigDefaultTabDatabase_name = __('Default database tab');
 $strConfigDefaultTabServer_desc = __('Tab that is displayed when entering a server');
 $strConfigDefaultTabServer_name = __('Default server tab');
 $strConfigDefaultTabTable_desc = __('Tab that is displayed when entering a table');
 $strConfigDefaultTabTable_name = __('Default table tab');
-$strConfigDisplay = __('Display');
 $strConfigDisplayBinaryAsHex_desc = __('Show binary contents as HEX by default');
 $strConfigDisplayBinaryAsHex_name = __('Show binary contents as HEX');
 $strConfigDisplayDatabasesList_desc = __('Show database listing as a list instead of a drop down');
 $strConfigDisplayDatabasesList_name = __('Display databases as a list');
 $strConfigDisplayServersList_desc = __('Show server listing as a list instead of a drop down');
 $strConfigDisplayServersList_name = __('Display servers as a list');
-$strConfigDonateLink = __('Donate');
-$strConfigDownload = __('Download');
 $strConfigEditInWindow_desc = __('Edit SQL queries in popup window');
 $strConfigEditInWindow_name = __('Edit in window');
-$strConfigEndOfLine = __('End of line');
 $strConfigErrorIconic_desc = __('Show icons for warning, error and information messages');
 $strConfigErrorIconic_name = __('Iconic errors');
 $strConfigExecTimeLimit_desc = __('Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)');
@@ -210,6 +204,7 @@ $strConfigFormset_Features = __('Features');
 $strConfigFormset_Import = __('Customize import defaults');
 $strConfigFormset_Left_frame = __('Customize navigation frame');
 $strConfigFormset_Main_frame = __('Customize main frame');
+$strConfigFormset_Sql_queries = __('SQL queries');
 $strConfigForm_Sql = __('SQL');
 $strConfigForm_Sql_box = __('SQL Query box');
 $strConfigForm_Sql_box_desc = __('Customize links shown in SQL Query boxes');
@@ -225,7 +220,6 @@ $strConfigForm_Texy_desc = __('Customize default options');
 $strConfigGZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import and export operations');
 $strConfigGZipDump_name = __('GZip');
 $strConfigIconvExtraParams_name = __('Extra parameters for iconv');
-$strConfigIgnoreErrors = __('Ignore errors');
 $strConfigIgnoreMultiSubmitErrors_desc = __('If enabled, phpMyAdmin continues computing multiple-statement queries even if one of the queries failed');
 $strConfigIgnoreMultiSubmitErrors_name = __('Ignore multiple statement errors');
 $strConfigImport_allow_interrupt_desc = __('Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.');
@@ -276,7 +270,6 @@ $strConfigLeftLogoLinkWindow_desc = __('Open the linked page in the main window
 $strConfigLeftLogoLinkWindow_name = __('Logo link target');
 $strConfigLeftPointerEnable_desc = __('Highlight server under the mouse cursor');
 $strConfigLeftPointerEnable_name = __('Enable highlighting');
-$strConfigLetUserChoose = __('let the user choose');
 $strConfigLightTabs_desc = __('Use less graphically intense tabs');
 $strConfigLightTabs_name = __('Light tabs');
 $strConfigLimitChars_desc = __('Maximum number of characters shown in any non-numeric column on browse view');
@@ -310,7 +303,6 @@ $strConfigNavigationBarIconic_desc = __('Use only icons, only text or both');
 $strConfigNavigationBarIconic_name = __('Iconic navigation bar');
 $strConfigOBGzip_desc = __('use GZip output buffering for increased speed in HTTP transfers');
 $strConfigOBGzip_name = __('GZip output buffering');
-$strConfigOptionNone = __('- none -');
 $strConfigOrder_desc = __('[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, DATETIME and TIMESTAMP, ascending order otherwise');
 $strConfigOrder_name = __('Default sorting order');
 $strConfigPersistentConnections_desc = __('Use persistent connections to MySQL databases');
@@ -336,7 +328,6 @@ $strConfigRepeatCells_name = __('Repeat headers');
 $strConfigReplaceHelpImg_desc = __('Show help button instead of Documentation text');
 $strConfigReplaceHelpImg_name = __('Show help button');
 $strConfigRestoreDefaultValue = __('Restore default value');
-$strConfigRevertErroneousFields = __('Try to revert erroneous fields to their default values');
 $strConfigSaveDir_desc = __('Directory where exports can be saved on server');
 $strConfigSaveDir_name = __('Save directory');
 $strConfigServers_AllowDeny_order_desc = __('Leave blank if not used');
@@ -431,10 +422,8 @@ $strConfigShowChgPassword_name = __('Show password change form');
 $strConfigShowCreateDb_name = __('Show create database form');
 $strConfigShowFieldTypesInDataEditView_desc = __('Defines whether or not type fields should be initially displayed in edit/insert mode');
 $strConfigShowFieldTypesInDataEditView_name = __('Show field types');
-$strConfigShowForm = __('Show form');
 $strConfigShowFunctionFields_desc = __('Display the function fields in edit/insert mode');
 $strConfigShowFunctionFields_name = __('Show function fields');
-$strConfigShowHiddenMessages = __('Show hidden messages (#MSG_COUNT)');
 $strConfigShowPhpInfo_desc = __('Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] output');
 $strConfigShowPhpInfo_name = __('Show phpinfo() link');
 $strConfigShowServerInfo_name = __('Show detailed MySQL server information');
diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
index 5e95f8bfb..553e87c15 100644
--- a/setup/lib/form_processing.lib.php
+++ b/setup/lib/form_processing.lib.php
@@ -42,12 +42,12 @@ function process_formset(FormDisplay $form_display) {
             <div class="warning">
                 <h4><?php echo __('Warning') ?></h4>
                 <?php echo __('Submitted form contains errors') ?><br />
-                <a href="?page=<?php echo $page . $formset . $id . $separator ?>mode=revert"><?php echo PMA_lang('RevertErroneousFields') ?></a>
+                <a href="?page=<?php echo $page . $formset . $id . $separator ?>mode=revert"><?php echo __('Try to revert erroneous fields to their default values') ?></a>
             </div>
             <?php $form_display->displayErrors() ?>
-            <a class="btn" href="index.php"><?php echo PMA_lang('IgnoreErrors') ?></a>
+            <a class="btn" href="index.php"><?php echo __('Ignore errors') ?></a>
             &nbsp;
-            <a class="btn" href="?page=<?php echo $page . $formset . $id . $separator ?>mode=edit"><?php echo PMA_lang('ShowForm') ?></a>
+            <a class="btn" href="?page=<?php echo $page . $formset . $id . $separator ?>mode=edit"><?php echo __('Show form') ?></a>
             <?php
         } else {
             // drop post data

From 68d9c401138e184575ad30bb4cae9f5e5be9d11a Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sun, 4 Jul 2010 21:56:46 +0200
Subject: [PATCH 037/106] moved Import by LOAD DATA settings to CSV category
 moved PMA_array_* functions to core.lib.php moved
 PMA_read_userprefs_fieldnames() to user_preferences.lib.php
 server/database/table filename templates are saved to pmadb when "remember
 template" is checked

---
 .gsoc/todo.txt                              |   2 +
 export.php                                  |   9 +-
 libraries/Config.class.php                  |  52 ++++++++-
 libraries/config/config_functions.lib.php   | 114 --------------------
 libraries/config/messages.inc.php           |   2 -
 libraries/config/setup.forms.php            |   5 +-
 libraries/config/user_preferences.forms.php |   5 +-
 libraries/core.lib.php                      |  85 +++++++++++++++
 libraries/display_export.lib.php            |  24 ++---
 libraries/user_preferences.lib.php          |  60 ++++++++++-
 setup/lib/common.inc.php                    |   1 +
 user_preferences.php                        |   2 +-
 12 files changed, 216 insertions(+), 145 deletions(-)

diff --git a/.gsoc/todo.txt b/.gsoc/todo.txt
index 4736039f2..e36b79397 100644
--- a/.gsoc/todo.txt
+++ b/.gsoc/todo.txt
@@ -1,2 +1,4 @@
 restore cache'ing in phpmyadmin.css.php
 make CSS for darkblue_orange
+check input escaping, $cfg is no longer safe to use
+
diff --git a/export.php b/export.php
index 5d487a107..59f57edc8 100644
--- a/export.php
+++ b/export.php
@@ -246,17 +246,20 @@ if ($asfile) {
     $pma_uri_parts = parse_url($cfg['PmaAbsoluteUri']);
     if ($export_type == 'server') {
         if (isset($remember_template)) {
-            $GLOBALS['PMA_Config']->setCookie('pma_server_filename_template', $filename_template);
+            $GLOBALS['PMA_Config']->setUserValue('pma_server_filename_template',
+                'Export/file_template_server', $filename_template);
         }
         $filename = str_replace('__SERVER__', $GLOBALS['cfg']['Server']['host'], strftime($filename_template));
     } elseif ($export_type == 'database') {
         if (isset($remember_template)) {
-            $GLOBALS['PMA_Config']->setCookie('pma_db_filename_template', $filename_template);
+            $GLOBALS['PMA_Config']->setUserValue('pma_db_filename_template',
+                'Export/file_template_database', $filename_template);
         }
         $filename = str_replace('__DB__', $db, str_replace('__SERVER__', $GLOBALS['cfg']['Server']['host'], strftime($filename_template)));
     } else {
         if (isset($remember_template)) {
-            $GLOBALS['PMA_Config']->setCookie('pma_table_filename_template', $filename_template);
+            $GLOBALS['PMA_Config']->setUserValue('pma_table_filename_template',
+                'Export/file_template_table', $filename_template);
         }
         $filename = str_replace('__TABLE__', $table, str_replace('__DB__', $db, str_replace('__SERVER__', $GLOBALS['cfg']['Server']['host'], strftime($filename_template))));
     }
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index c290e54de..d31c6e23c 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -24,6 +24,11 @@ class PMA_Config
      */
     var $default_source = './libraries/config.default.php';
 
+    /**
+     * @var array   default configuration settings
+     */
+    var $default = array();
+
     /**
      * @var array   configuration settings
      */
@@ -321,6 +326,7 @@ class PMA_Config
         $this->default_server = $cfg['Servers'][1];
         unset($cfg['Servers']);
 
+        $this->default = $cfg;
         $this->settings = PMA_array_merge_recursive($this->settings, $cfg);
 
         $this->error_config_default_file = false;
@@ -431,8 +437,8 @@ class PMA_Config
             // cache user preferences, use database only when needed
             if (!isset($_SESSION['cache']['userprefs'])
                     || $_SESSION['cache']['config_mtime'] < $config_mtime) {
+                // load required libraries
                 require_once './libraries/user_preferences.lib.php';
-                require_once './libraries/config/config_functions.lib.php';
                 $prefs = PMA_load_userprefs();
                 $_SESSION['cache']['userprefs'] = PMA_apply_userprefs($prefs['config_data']);
                 $_SESSION['cache']['userprefs_mtime'] = $prefs['mtime'];
@@ -447,7 +453,49 @@ class PMA_Config
         }
         $this->settings = PMA_array_merge_recursive($this->settings, $config_data);
         $GLOBALS['cfg'] = PMA_array_merge_recursive($GLOBALS['cfg'], $config_data);
-        $this->set('user_preferences_loaded', true);
+        $this->set('user_preferences', true);
+    }
+
+    /**
+     * Sets config value which is stored in user preferences (if available) or in a cookie
+     *
+     * @param  $cookie_name
+     * @param  $cfg_path
+     * @param  $new_cfg_value
+     * @return void
+     */
+    function setUserValue($cookie_name, $cfg_path, $new_cfg_value)
+    {
+        // use permanent user preferences if possible
+        if ($this->get('user_preferences')) {
+            require_once './libraries/user_preferences.lib.php';
+            PMA_persist_option($cfg_path, $new_cfg_value, PMA_array_read($cfg_path, $this->default));
+        } else {
+            // fall back to cookies
+            $this->setCookie($cookie_name, $new_cfg_value, PMA_array_read($cfg_path, $this->settings));
+        }
+    }
+
+    /**
+     * Reads value stored by {@link setUserValue()}
+     *
+     * @param  $cookie_name
+     * @param  $cfg_value
+     * @return
+     */
+    function getUserValue($cookie_name, $cfg_value)
+    {
+        $cookie_exists = isset($_COOKIE) && !empty($_COOKIE[$cookie_name]);
+        if ($this->get('user_preferences')) {
+            // user preferences value exists, remove cookie
+            if ($cookie_exists) {
+                $this->removeCookie($cookie_name);
+            }
+        } else if ($cookie_exists) {
+            return $_COOKIE[$cookie_name];
+        }
+        // return value from $cfg array
+        return $cfg_value;
     }
 
     /**
diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
index 3c83bb730..8867c0654 100644
--- a/libraries/config/config_functions.lib.php
+++ b/libraries/config/config_functions.lib.php
@@ -6,91 +6,6 @@
  * @package    phpMyAdmin
  */
 
-/**
- * Returns value of an element in $array given by $path.
- * $path is a string describing position of an element in an associative array,
- * eg. Servers/1/host refers to $array[Servers][1][host]
- *
- * @param  string   $path
- * @param  array    $array
- * @param  mixed    $default
- * @return mixed    array element or $default
- */
-function PMA_array_read($path, $array, $default = null)
-{
-    $keys = explode('/', $path);
-    $value =& $array;
-    foreach ($keys as $key) {
-        if (!isset($value[$key])) {
-            return $default;
-        }
-        $value =& $value[$key];
-    }
-    return $value;
-}
-
-/**
- * Stores value in an array
- *
- * @param  string   $path
- * @param  array    &$array
- * @param  mixed    $value
- */
-function PMA_array_write($path, &$array, $value)
-{
-    $keys = explode('/', $path);
-    $last_key = array_pop($keys);
-    $a =& $array;
-    foreach ($keys as $key) {
-        if (!isset($a[$key])) {
-            $a[$key] = array();
-        }
-        $a =& $a[$key];
-    }
-    $a[$last_key] = $value;
-}
-
-/**
- * Removes value from an array
- *
- * @param  string   $path
- * @param  array    &$array
- * @param  mixed    $value
- */
-function PMA_array_remove($path, &$array)
-{
-    $keys = explode('/', $path);
-    $keys_last = array_pop($keys);
-    $path = array();
-    $depth = 0;
-
-    $path[0] =& $array;
-    $found = true;
-    // go as deep as required or possible
-    foreach ($keys as $key) {
-        if (!isset($path[$depth][$key])) {
-            $found = false;
-            break;
-        }
-        $depth++;
-        $path[$depth] =& $path[$depth-1][$key];
-    }
-    // if element found, remove it
-    if ($found) {
-        unset($path[$depth][$keys_last]);
-        $depth--;
-    }
-
-    // remove empty nested arrays
-    for (; $depth >= 0; $depth--) {
-        if (!isset($path[$depth+1]) || count($path[$depth+1]) == 0) {
-            unset($path[$depth][$keys[$depth]]);
-        } else {
-            break;
-        }
-    }
-}
-
 /**
  * Returns sanitized language string, taking into account our special codes
  * for formatting. Takes variable number of arguments.
@@ -197,33 +112,4 @@ function PMA_lang_link_replace($link, $text)
 
     return '<a href="' . $link . '">' . $text . '</a>';
 }
-
-/**
- * Reads user preferences field names
- *
- * @param array|null $forms
- * @return array
- */
-function PMA_read_userprefs_fieldnames(array $forms = null)
-{
-    static $names;
-
-    // return cached results
-    if ($names !== null) {
-        return $names;
-    }
-    if (is_null($forms)) {
-        $forms = array();
-        include 'libraries/config/user_preferences.forms.php';
-    }
-    $names = array();
-    foreach ($forms as $formset) {
-        foreach ($formset as $form) {
-            foreach ($form as $k => $v) {
-                $names[] = is_int($k) ? $v : $k;
-            }
-        }
-    }
-    return $names;
-}
 ?>
\ No newline at end of file
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 39536ffdf..7235ce98d 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -166,8 +166,6 @@ $strConfigForm_Import_export = __('Import / export');
 $strConfigForm_Import_export_desc = __('Set import and export directories and compression options');
 $strConfigForm_Latex = __('LaTeX');
 $strConfigForm_Latex_desc = __('Customize default options');
-$strConfigForm_Ldi = __('CSV using LOAD DATA');
-$strConfigForm_Ldi_desc = __('Customize default options');
 $strConfigForm_Left_databases = __('Databases');
 $strConfigForm_Left_databases_desc = __('Databases display options');
 $strConfigForm_Left_frame = __('Navigation frame');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index f07463cae..a8674d9f0 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -200,13 +200,14 @@ $forms['Import']['Sql'] = array('Import' => array(
     'sql_compatibility',
     'sql_no_auto_value_on_zero'));
 $forms['Import']['Csv'] = array('Import' => array(
+    ':group:' . __('CSV'),
     'csv_replace',
     'csv_ignore',
     'csv_terminated',
     'csv_enclosed',
     'csv_escaped',
-    'csv_col_names'));
-$forms['Import']['Ldi'] = array('Import' => array(
+    'csv_col_names',
+    ':group:' . __('CSV using LOAD DATA'),
     'ldi_replace',
     'ldi_ignore',
     'ldi_terminated',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 4ce0195fa..4e5466810 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -105,13 +105,14 @@ $forms['Import']['Sql'] = array(
     'Import/sql_compatibility',
     'Import/sql_no_auto_value_on_zero');
 $forms['Import']['Csv'] = array(
+    ':group:' . __('CSV'),
     'Import/csv_replace',
     'Import/csv_ignore',
     'Import/csv_terminated',
     'Import/csv_enclosed',
     'Import/csv_escaped',
-    'Import/csv_col_names');
-$forms['Import']['Ldi'] = array(
+    'Import/csv_col_names',
+    ':group:' . __('CSV using LOAD DATA'),
     'Import/ldi_replace',
     'Import/ldi_ignore',
     'Import/ldi_terminated',
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index 12e28c531..55322367a 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -539,4 +539,89 @@ function PMA_getenv($var_name) {
 
     return '';
 }
+
+/**
+ * Returns value of an element in $array given by $path.
+ * $path is a string describing position of an element in an associative array,
+ * eg. Servers/1/host refers to $array[Servers][1][host]
+ *
+ * @param  string   $path
+ * @param  array    $array
+ * @param  mixed    $default
+ * @return mixed    array element or $default
+ */
+function PMA_array_read($path, $array, $default = null)
+{
+    $keys = explode('/', $path);
+    $value =& $array;
+    foreach ($keys as $key) {
+        if (!isset($value[$key])) {
+            return $default;
+        }
+        $value =& $value[$key];
+    }
+    return $value;
+}
+
+/**
+ * Stores value in an array
+ *
+ * @param  string   $path
+ * @param  array    &$array
+ * @param  mixed    $value
+ */
+function PMA_array_write($path, &$array, $value)
+{
+    $keys = explode('/', $path);
+    $last_key = array_pop($keys);
+    $a =& $array;
+    foreach ($keys as $key) {
+        if (!isset($a[$key])) {
+            $a[$key] = array();
+        }
+        $a =& $a[$key];
+    }
+    $a[$last_key] = $value;
+}
+
+/**
+ * Removes value from an array
+ *
+ * @param  string   $path
+ * @param  array    &$array
+ * @param  mixed    $value
+ */
+function PMA_array_remove($path, &$array)
+{
+    $keys = explode('/', $path);
+    $keys_last = array_pop($keys);
+    $path = array();
+    $depth = 0;
+
+    $path[0] =& $array;
+    $found = true;
+    // go as deep as required or possible
+    foreach ($keys as $key) {
+        if (!isset($path[$depth][$key])) {
+            $found = false;
+            break;
+        }
+        $depth++;
+        $path[$depth] =& $path[$depth-1][$key];
+    }
+    // if element found, remove it
+    if ($found) {
+        unset($path[$depth][$keys_last]);
+        $depth--;
+    }
+
+    // remove empty nested arrays
+    for (; $depth >= 0; $depth--) {
+        if (!isset($path[$depth+1]) || count($path[$depth+1]) == 0) {
+            unset($path[$depth][$keys[$depth]]);
+        } else {
+            break;
+        }
+    }
+}
 ?>
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 54867f503..5d76d7a38 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -172,23 +172,17 @@ echo PMA_pluginGetJavascript($export_list);
     <?php
         echo ' value="';
         if ($export_type == 'database') {
-            if (isset($_COOKIE) && !empty($_COOKIE['pma_db_filename_template'])) {
-                echo htmlspecialchars($_COOKIE['pma_db_filename_template']);
-            } else {
-                echo $GLOBALS['cfg']['Export']['file_template_database'];
-            }
+            echo htmlspecialchars($GLOBALS['PMA_Config']->getUserValue(
+                'pma_db_filename_template',
+                $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'];
-            }
+            echo htmlspecialchars($GLOBALS['PMA_Config']->getUserValue(
+                'pma_table_filename_template',
+                $GLOBALS['cfg']['Export']['file_template_table']));
         } else {
-            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 htmlspecialchars($GLOBALS['PMA_Config']->getUserValue(
+                'pma_server_filename_template',
+                $GLOBALS['cfg']['Export']['file_template_server']));
         }
         echo '"';
     ?>
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 71356ced7..90a5a2eb8 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -58,14 +58,13 @@ function PMA_load_userprefs()
  * @uses PMA_Message::rawError()
  * @uses PMA_sqlAddslashes()
  * @uses PMA_getRelationsParam()
+ * @param array $config_data
  * @return true|PMA_Message
  */
-function PMA_save_userprefs()
+function PMA_save_userprefs(array $config_array)
 {
     $cfgRelation = PMA_getRelationsParam();
-    $cf = ConfigFile::getInstance();
-
-    $config_data = serialize($cf->getConfigArray());
+    $config_data = serialize($config_array);
 
     $query_table = PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['userconfig']);
     $query = '
@@ -119,4 +118,57 @@ function PMA_apply_userprefs(array $config_data)
     }
     return $cfg;
 }
+
+/**
+ * Reads user preferences field names
+ *
+ * @param array|null $forms
+ * @return array
+ */
+function PMA_read_userprefs_fieldnames(array $forms = null)
+{
+    static $names;
+
+    // return cached results
+    if ($names !== null) {
+        return $names;
+    }
+    if (is_null($forms)) {
+        $forms = array();
+        include 'libraries/config/user_preferences.forms.php';
+    }
+    $names = array();
+    foreach ($forms as $formset) {
+        foreach ($formset as $form) {
+            foreach ($form as $k => $v) {
+                $names[] = is_int($k) ? $v : $k;
+            }
+        }
+    }
+    return $names;
+}
+
+/**
+ * Updates one user preferences option (loads and saves to database).
+ *
+ * No validation is done!
+ *
+ * @param string $cfg_name
+ * @param mixed $value
+ * @return void
+ */
+function PMA_persist_option($path, $value, $default_value)
+{
+    $prefs = PMA_load_userprefs();
+    if ($value === $default_value) {
+        if (isset($prefs['config_data'][$path])) {
+            unset($prefs['config_data'][$path]);
+        } else {
+            return;
+        }
+    } else {
+        $prefs['config_data'][$path] = $value;
+    }
+    PMA_save_userprefs($prefs['config_data']);
+}
 ?>
\ No newline at end of file
diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php
index 5233cb373..99ab535e1 100644
--- a/setup/lib/common.inc.php
+++ b/setup/lib/common.inc.php
@@ -23,6 +23,7 @@ require_once './libraries/config/config_functions.lib.php';
 require_once './libraries/config/messages.inc.php';
 require_once './libraries/config/ConfigFile.class.php';
 require_once './libraries/url_generating.lib.php';
+require_once './libraries/user_preferences.lib.php';
 
 // use default error handler
 restore_error_handler();
diff --git a/user_preferences.php b/user_preferences.php
index 69f3a318f..de1145283 100644
--- a/user_preferences.php
+++ b/user_preferences.php
@@ -113,7 +113,7 @@ if (!$form_display->process(false)) {
     } else {
         // save settings
         $old_settings = PMA_load_userprefs();
-        $result = PMA_save_userprefs();
+        $result = PMA_save_userprefs($cf->getConfigArray());
         if ($result === true) {
             // compute differences and check whether left frame should be refreshed
             $old_settings = isset($old_settings['config_data'])

From a9f39a92e7331a0a71e6da1b60987fd4d964375a Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 6 Jul 2010 18:20:33 +0200
Subject: [PATCH 038/106] saving of theme and font size

---
 libraries/Config.class.php              | 91 ++++++++++++++++++++-----
 libraries/user_preferences.lib.php      |  3 +
 themes/original/css/theme_right.css.php |  2 +-
 3 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index d31c6e23c..f1ad1871a 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -423,6 +423,7 @@ class PMA_Config
      * @uses $_SESSION['cache']['config_mtime']
      * @uses $_SESSION['cache']['userprefs']
      * @uses $_SESSION['cache']['userprefs_mtime']
+     * @uses $_SESSION['PMA_Theme_Manager']
      * @uses PMA_apply_userprefs()
      * @uses PMA_array_merge_recursive()
      * @uses PMA_load_userprefs()
@@ -445,43 +446,94 @@ class PMA_Config
                 $_SESSION['cache']['config_mtime'] = $config_mtime;
             }
         } else if (!isset($_SESSION['cache']['userprefs'])) {
+            $this->set('user_preferences', false);
             return;
         }
         $config_data = $_SESSION['cache']['userprefs'];
+        // todo: check for empty user data, user_preferences should then be true
         if (!$config_data) {
+            $this->set('user_preferences', false);
             return false;
         }
+        $this->set('user_preferences', true);
+
+        // backup some settings
+        $fontsize = $this->get('fontsize');
+        // load config array
         $this->settings = PMA_array_merge_recursive($this->settings, $config_data);
         $GLOBALS['cfg'] = PMA_array_merge_recursive($GLOBALS['cfg'], $config_data);
-        $this->set('user_preferences', true);
+
+        if (defined('PMA_MINIMUM_COMMON')) {
+            return;
+        }
+
+        // settings below start really working on next page load, but
+        // changes are made only in index.php so everything is set when
+        // in frames
+
+        // load/save theme
+        // theme cookie exists only if we are using non-default theme
+        $tmanager = $_SESSION['PMA_Theme_Manager'];
+        if (isset($_REQUEST['set_theme'])) {
+            // new theme was set in common.inc.php
+            $this->setUserValue(null, 'ThemeDefault', $tmanager->theme->id);
+        } else if (!$tmanager->getThemeCookie()) {
+            // no cookie - read default from settings
+            if ($this->settings['ThemeDefault'] != $tmanager->theme
+                    && $tmanager->checkTheme($this->settings['ThemeDefault'])) {
+                $tmanager->setActiveTheme($this->settings['ThemeDefault']);
+                $tmanager->setThemeCookie();
+            }
+        }
+        // save new font size
+        // fontsize cookie exists only if we are using a non-default size
+        if (isset($_POST['set_fontsize']) || isset($_COOKIE['pma_fontsize'])) {
+            // cookie with new fontsize exists, save setting to database and remove it
+            $this->setUserValue('pma_fontsize', 'fontsize', $fontsize, '82%');
+        }
     }
 
     /**
-     * Sets config value which is stored in user preferences (if available) or in a cookie
+     * Sets config value which is stored in user preferences (if available) or in a cookie.
      *
-     * @param  $cookie_name
-     * @param  $cfg_path
-     * @param  $new_cfg_value
-     * @return void
+     * If user preferences are not yet initialized, option is applied to global config and
+     * added to a update queue, which is processed by {@link loadUserPreferences()}
+     *
+     * @uses $GLOBALS['cfg']
+     * @uses PMA_array_read()
+     * @uses PMA_array_write()
+     * @uses PMA_persist_option()
+     * @param string $cookie_name can be null
+     * @param string $cfg_path
+     * @param mixed  $new_cfg_value
+     * @param mixed  $default_value
      */
-    function setUserValue($cookie_name, $cfg_path, $new_cfg_value)
+    function setUserValue($cookie_name, $cfg_path, $new_cfg_value, $default_value = null)
     {
         // use permanent user preferences if possible
         if ($this->get('user_preferences')) {
             require_once './libraries/user_preferences.lib.php';
-            PMA_persist_option($cfg_path, $new_cfg_value, PMA_array_read($cfg_path, $this->default));
-        } else {
+            if ($default_value === null) {
+                $default_value = PMA_array_read($cfg_path, $this->default);
+            }
+            PMA_persist_option($cfg_path, $new_cfg_value, $default_value);
+        } else if ($cookie_name) {
             // fall back to cookies
-            $this->setCookie($cookie_name, $new_cfg_value, PMA_array_read($cfg_path, $this->settings));
+            if ($default_value === null) {
+                $default_value = PMA_array_read($cfg_path, $this->settings);
+            }
+            $this->setCookie($cookie_name, $new_cfg_value, $default_value);
         }
+        PMA_array_write($cfg_path, $GLOBALS['cfg'], $new_cfg_value);
+        PMA_array_write($cfg_path, $this->settings, $new_cfg_value);
     }
 
     /**
      * Reads value stored by {@link setUserValue()}
      *
-     * @param  $cookie_name
-     * @param  $cfg_value
-     * @return
+     * @param string $cookie_name
+     * @param mixed $cfg_value
+     * @return mixed
      */
     function getUserValue($cookie_name, $cfg_value)
     {
@@ -1103,7 +1155,7 @@ class PMA_Config
         $options = PMA_Config::_getFontsizeOptions($current_size);
 
         $return = '<label for="select_fontsize">' . __('Font size') . ':</label>' . "\n";
-        $return .= '<select name="fontsize" id="select_fontsize" onchange="this.form.submit();">' . "\n";
+        $return .= '<select name="set_fontsize" id="select_fontsize" onchange="this.form.submit();">' . "\n";
         foreach ($options as $option) {
             $return .= '<option value="' . $option . '"';
             if ($option == $current_size) {
@@ -1176,10 +1228,13 @@ class PMA_Config
         if ($validity == null) {
             $validity = 2592000;
         }
-        if (strlen($value) && null !== $default && $value === $default
-         && isset($_COOKIE[$cookie])) {
-            // remove cookie, default value is used
-            return $this->removeCookie($cookie);
+        if (strlen($value) && null !== $default && $value === $default) {
+            // default value is used
+            if (isset($_COOKIE[$cookie])) {
+                // remove cookie
+                return $this->removeCookie($cookie);
+            }
+            return false;
         }
 
         if (! strlen($value) && isset($_COOKIE[$cookie])) {
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 90a5a2eb8..8477e96f0 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -110,6 +110,8 @@ function PMA_apply_userprefs(array $config_data)
     $cfg = array();
     $blacklist = array_flip($GLOBALS['cfg']['UserprefsDisallow']);
     $whitelist = array_flip(PMA_read_userprefs_fieldnames());
+    $whitelist['ThemeDefault'] = true;
+    $whitelist['fontsize'] = true;
     foreach ($config_data as $path => $value) {
         if (!isset($whitelist[$path]) || isset($blacklist[$path])) {
             continue;
@@ -153,6 +155,7 @@ function PMA_read_userprefs_fieldnames(array $forms = null)
  *
  * No validation is done!
  *
+ * @uses PMA_save_userprefs()
  * @param string $cfg_name
  * @param mixed $value
  * @return void
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 1c04970f9..1c681f221 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -17,7 +17,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 /* general tags */
 html {
     font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : (
-        isset($_COOKIE['pma_fontsize']) ? $_COOKIE['pma_fontsize'] : '84%'));?>;
+        isset($_COOKIE['pma_fontsize']) ? $_COOKIE['pma_fontsize'] : '82%'));?>;
 }
 
 input, select, textarea {

From 54c322544cbd774ff7858cdff0644f6f7b3250f1 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Wed, 7 Jul 2010 01:27:05 +0200
Subject: [PATCH 039/106] move user preferences to top level server menu

---
 libraries/config/messages.inc.php       |  4 ++
 libraries/server_links.inc.php          |  4 ++
 themes/original/css/theme_right.css.php | 57 +++++++++++++++++--------
 user_preferences.php                    | 16 ++++---
 4 files changed, 56 insertions(+), 25 deletions(-)

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 7235ce98d..33a63313c 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -158,7 +158,9 @@ $strConfigForm_Edit_desc = __('Customize edit mode');
 $strConfigForm_Export = __('Export');
 $strConfigForm_Export_defaults = __('Export defaults');
 $strConfigForm_Export_defaults_desc = __('Customize default export options');
+$strConfigForm_Features = __('Features');
 $strConfigForm_General = __('General settings');
+$strConfigForm_General_desc = __('Set some commonly used options');
 $strConfigForm_Import = __('Import');
 $strConfigForm_Import_defaults = __('Import defaults');
 $strConfigForm_Import_defaults_desc = __('Customize default common import options');
@@ -213,6 +215,8 @@ $strConfigForm_Startup = __('Startup');
 $strConfigForm_Startup_desc = __('Customize startup page');
 $strConfigForm_Tabs = __('Tabs');
 $strConfigForm_Tabs_desc = __('Choose how you want tabs to work');
+$strConfigForm_Text_fields = __('Text fields');
+$strConfigForm_Text_fields_desc = __('Customize text input fields');
 $strConfigForm_Texy = __('Texy! text');
 $strConfigForm_Texy_desc = __('Customize default options');
 $strConfigGZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import and export operations');
diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php
index 1608de3e7..a2a411c3a 100644
--- a/libraries/server_links.inc.php
+++ b/libraries/server_links.inc.php
@@ -91,6 +91,10 @@ $tabs['synchronize']['icon'] = 's_sync.png';
 $tabs['synchronize']['link'] = 'server_synchronize.php';
 $tabs['synchronize']['text'] = __('Synchronize');
 
+$tabs['settings']['icon'] = 'b_tblops.png';
+$tabs['settings']['link'] = 'user_preferences.php';
+$tabs['settings']['text'] = __('Settings');
+
 echo PMA_generate_html_tabs($tabs, array());
 unset($tabs);
 
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 1c681f221..b8257a56a 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -582,55 +582,62 @@ form.login label {
 /* specific elements */
 
 /* topmenu */
-ul#topmenu, ul.tabs {
+ul#topmenu, ul#topmenu2, ul.tabs {
     font-weight:        bold;
     list-style-type:    none;
     margin:             0;
     padding:            0;
 }
 
-ul#topmenu li {
+ul#topmenu li, ul#topmenu2 li {
     float:              <?php echo $left; ?>;
     margin:             0;
     padding:            0;
     vertical-align:     middle;
 }
 
-#topmenu img {
+#topmenu img, #topmenu2 img {
     vertical-align:     middle;
     margin-<?php echo $right; ?>:       0.1em;
 }
 
 /* default tab styles */
-.tab, .tabcaution, .tabactive {
+ul#topmenu .tab, ul#topmenu .tabcaution, ul#topmenu .tabactive {
     display:            block;
     margin:             0.2em 0.2em 0 0.2em;
     padding:            0.2em 0.2em 0 0.2em;
     white-space:        nowrap;
 }
 
+ul#topmenu2 .tab, ul#topmenu2 .tabactive {
+    display:            block;
+    margin:             0.1em;
+    padding:            0.2em;
+    white-space:        nowrap;
+}
+
 /* disabled tabs */
-span.tab {
+ul#topmenu span.tab {
     color:              #666666;
 }
 
 /* disabled drop/empty tabs */
-span.tabcaution {
+ul#topmenu span.tabcaution {
     color:              #ff6666;
 }
 
 /* enabled drop/empty tabs */
-a.tabcaution {
+ul#topmenu a.tabcaution {
     color:              #FF0000;
 }
-a.tabcaution:hover {
+ul#topmenu a.tabcaution:hover {
     color: #FFFFFF;
     background-color:   #FF0000;
 }
 
 <?php if ($GLOBALS['cfg']['LightTabs']) { ?>
 /* active tab */
-a.tabactive {
+ul#topmenu a.tabactive, ul#topmenu2 a.tabactive {
     color:              black;
 }
 <?php } else { ?>
@@ -639,12 +646,18 @@ a.tabactive {
     padding:            0.1em 0.3em 0.1em 0.3em;
 }
 
+ul#topmenu2 {
+    margin: 0.25em 0.5em 0;
+    height: 2em;
+    clear: both;
+}
+
 ul#topmenu li {
     border-bottom:      1pt solid black;
 }
 
 /* default tab styles */
-.tab, .tabcaution, .tabactive {
+ul#topmenu .tab, ul#topmenu .tabcaution, ul#topmenu .tabactive {
     background-color:   <?php echo $GLOBALS['cfg']['BgOne']; ?>;
     border:             1pt solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
     border-bottom:      0;
@@ -653,29 +666,37 @@ ul#topmenu li {
 }
 
 /* enabled hover/active tabs */
-a.tab:hover,
-a.tabcaution:hover,
-.tabactive,
-.tabactive:hover {
+ul#topmenu a.tab:hover,
+ul#topmenu a.tabcaution:hover,
+ul#topmenu .tabactive,
+ul#topmenu .tabactive:hover {
     margin:             0;
     padding:            0.2em 0.4em 0.2em 0.4em;
     text-decoration:    none;
 }
 
-a.tab:hover,
-.tabactive {
+ul#topmenu a.tab:hover,
+ul#topmenu .tabactive {
     background-color:   <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
 }
 
+ul#topmenu2 a.tab:hover,
+ul#topmenu2 a.tabactive {
+    background-color:   <?php echo $GLOBALS['cfg']['BgOne']; ?>;
+    -moz-border-radius: 0.3em;
+    border-radius:      0.3em;
+    text-decoration:    none;
+}
+
 /* to be able to cancel the bottom border, use <li class="active"> */
 ul#topmenu li.active {
      border-bottom:      1pt solid <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
 }
 
 /* disabled drop/empty tabs */
-span.tab,
+ul#topmenu span.tab,
 a.warning,
-span.tabcaution {
+ul#topmenu span.tabcaution {
     cursor:             url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>error.ico), default;
 }
 <?php } ?>
diff --git a/user_preferences.php b/user_preferences.php
index de1145283..178dd6416 100644
--- a/user_preferences.php
+++ b/user_preferences.php
@@ -22,8 +22,10 @@ $GLOBALS['js_include'][] = 'config.js';
 
 require_once './libraries/header.inc.php';
 
-// build tabs
-$tabs = array();
+// show server tabs
+require './libraries/server_links.inc.php';
+
+// build user preferences menu
 $form_param = filter_input(INPUT_GET, 'form');
 if (!isset($forms[$form_param])) {
     $forms_keys = array_keys($forms);
@@ -36,16 +38,16 @@ $tabs_icons = array(
     'Main_frame'  => 'b_props.png',
     'Import'      => 'b_import.png',
     'Export'      => 'b_export.png');
+echo '<ul id="topmenu2">';
 foreach (array_keys($forms) as $formset) {
-    $tabs[] = array(
+    $tab = array(
         'link' => 'user_preferences.php',
         'text' => PMA_lang('Form_' . $formset),
         'icon' => $tabs_icons[$formset],
-        'active' => $formset == $form_param,
-        'url_params' => array('form' => $formset));
+        'active' => $formset == $form_param);
+    echo PMA_generate_html_tab($tab, array('form' => $formset));
 }
-
-echo PMA_generate_html_tabs($tabs, array());
+echo '</ul>';
 
 // show "configuration saved" message and reload navigation frame if needed
 if (!empty($_GET['saved'])) {

From 104b40cb11ff09d3cf65e2848c61606863448a34 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Thu, 8 Jul 2010 12:36:09 +0200
Subject: [PATCH 040/106] rename file

---
 libraries/server_links.inc.php          | 2 +-
 main.php                                | 2 +-
 user_preferences.php => prefs_forms.php | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename user_preferences.php => prefs_forms.php (96%)

diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php
index a2a411c3a..b0a78247e 100644
--- a/libraries/server_links.inc.php
+++ b/libraries/server_links.inc.php
@@ -92,7 +92,7 @@ $tabs['synchronize']['link'] = 'server_synchronize.php';
 $tabs['synchronize']['text'] = __('Synchronize');
 
 $tabs['settings']['icon'] = 'b_tblops.png';
-$tabs['settings']['link'] = 'user_preferences.php';
+$tabs['settings']['link'] = 'prefs_forms.php';
 $tabs['settings']['text'] = __('Settings');
 
 echo PMA_generate_html_tabs($tabs, array());
diff --git a/main.php b/main.php
index 1b385dd52..7bd80ad6d 100644
--- a/main.php
+++ b/main.php
@@ -176,7 +176,7 @@ echo '</ul>';
 
 echo '<ul>';
 echo PMA_printListItem(__('More settings'), 'li_user_preferences',
-                    './user_preferences.php?' . $common_url_query);
+                    './prefs_forms.php?' . $common_url_query);
 echo '<ul>';
 
 echo '</div>';
diff --git a/user_preferences.php b/prefs_forms.php
similarity index 96%
rename from user_preferences.php
rename to prefs_forms.php
index 178dd6416..a964e5147 100644
--- a/user_preferences.php
+++ b/prefs_forms.php
@@ -41,7 +41,7 @@ $tabs_icons = array(
 echo '<ul id="topmenu2">';
 foreach (array_keys($forms) as $formset) {
     $tab = array(
-        'link' => 'user_preferences.php',
+        'link' => 'prefs_forms.php',
         'text' => PMA_lang('Form_' . $formset),
         'icon' => $tabs_icons[$formset],
         'active' => $formset == $form_param);
@@ -94,7 +94,7 @@ if (isset($_POST['revert'])) {
     $form_display->fixErrors();
     // redirect
     $url_params = array('form' => $form_param);
-    PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'user_preferences.php'
+    PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'prefs_forms.php'
             . PMA_generate_common_url($url_params, '&'));
     exit;
 }
@@ -135,7 +135,7 @@ if (!$form_display->process(false)) {
                 'form' => $form_param,
                 'saved' => 1,
                 'refresh_left_frame' => $refresh_left_frame);
-            PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'user_preferences.php'
+            PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'prefs_forms.php'
                     . PMA_generate_common_url($url_params, '&'));
             exit;
         } else {

From 104ac11c1d2184a15a5cd7ae2a521728fe73b5b2 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Thu, 8 Jul 2010 19:01:09 +0200
Subject: [PATCH 041/106] import and export for user preferences (currently
 JSON file only) add preferences reset

---
 .gsoc/todo.txt                          |   2 +
 js/config.js                            |  47 +++++-
 libraries/config/ConfigFile.class.php   |  14 ++
 libraries/config/FormDisplay.class.php  |  11 +-
 libraries/server_links.inc.php          |   4 +-
 libraries/user_preferences.inc.php      |  82 ++++++++++
 libraries/user_preferences.lib.php      |  34 ++++
 main.php                                |   2 +-
 prefs_forms.php                         |  84 +---------
 prefs_manage.php                        | 203 ++++++++++++++++++++++++
 themes/original/css/theme_right.css.php |   6 +
 11 files changed, 402 insertions(+), 87 deletions(-)
 create mode 100644 libraries/user_preferences.inc.php
 create mode 100644 prefs_manage.php

diff --git a/.gsoc/todo.txt b/.gsoc/todo.txt
index e36b79397..961215a7b 100644
--- a/.gsoc/todo.txt
+++ b/.gsoc/todo.txt
@@ -2,3 +2,5 @@ restore cache'ing in phpmyadmin.css.php
 make CSS for darkblue_orange
 check input escaping, $cfg is no longer safe to use
 
+preference:
+- synchronize language, theme ThemeDefault
\ No newline at end of file
diff --git a/js/config.js b/js/config.js
index aa2e41bd0..2b07f0a7a 100644
--- a/js/config.js
+++ b/js/config.js
@@ -1,5 +1,5 @@
 /**
- * Functions used in configuration forms
+ * Functions used in configuration forms and on user preferences pages
  */
 
 // default values for fields
@@ -625,3 +625,48 @@ $(function() {
 //
 // END: "Restore default" and "set value" buttons
 // ------------------------------------------------------------------
+
+// ------------------------------------------------------------------
+// User preferences import/export
+//
+
+$(function() {
+    var radios = $('#import_local_storage, #export_local_storage');
+    if (!radios.length) {
+        return;
+    }
+
+    // enable JavaScript dependent fields
+    radios
+        .attr('disabled', false)
+        .add('#export_text_file, #import_text_file')
+        .click(function(){
+            var show_id = $(this).attr('id');
+            var hide_id = show_id.match(/local_storage$/)
+                ? show_id.replace(/local_storage$/, 'text_file')
+                : show_id.replace(/text_file$/, 'local_storage');
+        $('#opts_'+hide_id).hide('fast');
+        $('#opts_'+show_id).show('fast');
+    });
+
+    // detect localStorage state
+    var ls_supported = window.localStorage || false;
+    var ls_exists = ls_supported ? (window.localStorage['config'] || false) : false;
+    $('.localStorage-'+(ls_supported ? 'un' : '')+'supported').hide();
+    $('.localStorage-'+(ls_exists ? 'empty' : 'exists')).hide();
+    $('form.prefs-form').change(function(){
+        var form = $(this);
+        var disabled = false;
+        if (!ls_supported) {
+            disabled = form.find('input[type=radio][value$=local_storage]').attr('checked');
+        } else if (!ls_exists && form.attr('name') == 'prefs_import'
+                && $('#import_local_storage')[0].checked) {
+            disabled = true;
+        }
+        form.find('input[type=submit]').attr('disabled', disabled);
+    });
+});
+
+//
+// END: User preferences import/export
+// ------------------------------------------------------------------
\ No newline at end of file
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index 62b23e0c4..1f501140a 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -185,6 +185,20 @@ class ConfigFile
         }
     }
 
+    /**
+     * Returns default config in a flattened array
+     *
+     * @return array
+     */
+    public function getFlatDefaultConfig()
+    {
+        $this->_flattenArrayResult = array();
+        array_walk($this->cfg, array($this, '_flattenArray'), '');
+        $flat_cfg = $this->_flattenArrayResult;
+        $this->_flattenArrayResult = null;
+        return $flat_cfg;
+    }
+
     /**
      * Updates config with values read from PMA_Config class
      * (config will contain differences to defaults from config.defaults.php).
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index cd2d6a407..ef8592a9c 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -111,12 +111,12 @@ class FormDisplay
      * Processes forms, returns true on successful save
      *
      * @param  bool  $allow_partial_save  allows for partial form saving on failed validation
+     * @param  bool  $check_form_submit   whether check for $_POST['submit_save']
      * @return boolean
      */
-    public function process($allow_partial_save = true)
+    public function process($allow_partial_save = true, $check_form_submit = true)
     {
-        // gather list of forms to save
-        if (!isset($_POST['submit_save'])) {
+        if ($check_form_submit && !isset($_POST['submit_save'])) {
             return false;
         }
 
@@ -475,6 +475,11 @@ class FormDisplay
                 $work_path = array_search($system_path, $this->system_paths);
                 $key = $this->translated_paths[$work_path];
 
+                // skip groups
+                if ($form->getOptionType($field) == 'group') {
+                    continue;
+                }
+
                 // ensure the value is set
                 if (!isset($_POST[$key])) {
                     // checkboxes aren't set by browsers if they're off
diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php
index b0a78247e..34e327f88 100644
--- a/libraries/server_links.inc.php
+++ b/libraries/server_links.inc.php
@@ -92,8 +92,10 @@ $tabs['synchronize']['link'] = 'server_synchronize.php';
 $tabs['synchronize']['text'] = __('Synchronize');
 
 $tabs['settings']['icon'] = 'b_tblops.png';
-$tabs['settings']['link'] = 'prefs_forms.php';
+$tabs['settings']['link'] = 'prefs_manage.php';
 $tabs['settings']['text'] = __('Settings');
+$tabs['settings']['active'] = in_array(basename($GLOBALS['PMA_PHP_SELF']),
+    array('prefs_forms.php', 'prefs_manage.php'));
 
 echo PMA_generate_html_tabs($tabs, array());
 unset($tabs);
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
new file mode 100644
index 000000000..2cdb01368
--- /dev/null
+++ b/libraries/user_preferences.inc.php
@@ -0,0 +1,82 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @package phpMyAdmin
+ */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
+// show server tabs
+require './libraries/server_links.inc.php';
+
+// build user preferences menu
+
+$form_param = filter_input(INPUT_GET, 'form');
+if (!isset($forms[$form_param])) {
+    $forms_keys = array_keys($forms);
+    $form_param = array_shift($forms_keys);
+}
+$tabs_icons = array(
+    'Features'    => 'b_tblops.png',
+    'Sql_queries' => 'b_sql.png',
+    'Left_frame'  => 'b_select.png',
+    'Main_frame'  => 'b_props.png',
+    'Import'      => 'b_import.png',
+    'Export'      => 'b_export.png');
+echo '<ul id="topmenu2">';
+echo PMA_generate_html_tab(array(
+    'link' => 'prefs_manage.php',
+    'text' => __('Manage your settings'))) . "\n";
+echo '<li>&nbsp; &nbsp;</li>' . "\n";
+$script_name = basename(basename($GLOBALS['PMA_PHP_SELF']));
+foreach (array_keys($forms) as $formset) {
+    $tab = array(
+        'link' => 'prefs_forms.php',
+        'text' => PMA_lang('Form_' . $formset),
+        'icon' => $tabs_icons[$formset],
+        'active' => ($script_name == 'prefs_forms.php' && $formset == $form_param));
+    echo PMA_generate_html_tab($tab, array('form' => $formset)) . "\n";
+}
+echo '</ul>';
+
+// show "configuration saved" message and reload navigation frame if needed
+if (!empty($_GET['saved'])) {
+    $message = PMA_Message::rawSuccess(__('Configuration has been saved'));
+    $message->display();
+    if (isset($_GET['refresh_left_frame']) && $_GET['refresh_left_frame'] == '1') {
+?>
+<script type="text/javascript">
+if (window.parent && window.parent.frame_navigation) {
+    window.parent.frame_navigation.location.reload();
+}
+</script>
+<?php
+    }
+}
+
+$forms_all_keys = PMA_read_userprefs_fieldnames($forms);
+$cf = ConfigFile::getInstance();
+$cf->setAllowedKeys($forms_all_keys);
+$cf->updateWithGlobalConfig($GLOBALS['PMA_Config']);
+
+// todo: debug - remove
+$arr = $cf->getConfigArray();
+$arr2 = array();
+foreach ($arr as $k => $v) {
+    $arr2[] = "<b>$k</b> " . var_export($v, true);
+}
+$arr2 = implode(', ', $arr2);
+$arr2 .= '<br />Blacklist: ' . (empty($cfg['UserprefsDisallow'])
+        ? '<i>empty</i>'
+        : implode(', ', $cfg['UserprefsDisallow']));
+$msg = PMA_Message::notice('Debug: ' . $arr2);
+$msg->display();
+
+if (isset($error) && $error) {
+    if (!$error instanceof PMA_Message) {
+        $error = PMA_Message::error($error);
+    }
+    $error->display();
+}
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 8477e96f0..3b52e9bbf 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -174,4 +174,38 @@ function PMA_persist_option($path, $value, $default_value)
     }
     PMA_save_userprefs($prefs['config_data']);
 }
+
+/**
+ * Redirects after saving new user preferences
+ *
+ * @param array  $forms
+ * @param array  $old_settings
+ * @param string $file_name
+ * @param array  $params
+ */
+function PMA_userprefs_redirect(array $forms, array $old_settings, $file_name, $params = null)
+{
+    // compute differences and check whether left frame should be refreshed
+    $old_settings = isset($old_settings['config_data'])
+            ? $old_settings['config_data']
+            : array();
+    $new_settings = ConfigFile::getInstance()->getConfigArray();
+    $diff_keys = array_keys(array_diff_assoc($old_settings, $new_settings)
+            + array_diff_assoc($new_settings, $old_settings));
+    $check_keys = array('NaturalOrder', 'MainPageIconic', 'DefaultTabDatabase');
+    $check_keys = array_merge($check_keys, $forms['Left_frame']['Left_frame'],
+         $forms['Left_frame']['Left_servers'], $forms['Left_frame']['Left_databases']);
+    $diff = array_intersect($check_keys, $diff_keys);
+    $refresh_left_frame = !empty($diff);
+
+    // redirect
+    $url_params = array(
+        'saved' => 1,
+        'refresh_left_frame' => $refresh_left_frame);
+    if (is_array($params)) {
+        $url_params = array_merge($params, $url_params);
+    }
+    PMA_sendHeaderLocation($GLOBALS['cfg']['PmaAbsoluteUri'] . $file_name
+            . PMA_generate_common_url($url_params, '&'));
+}
 ?>
\ No newline at end of file
diff --git a/main.php b/main.php
index 7bd80ad6d..3ff65ad91 100644
--- a/main.php
+++ b/main.php
@@ -176,7 +176,7 @@ echo '</ul>';
 
 echo '<ul>';
 echo PMA_printListItem(__('More settings'), 'li_user_preferences',
-                    './prefs_forms.php?' . $common_url_query);
+                    './prefs_manage.php?' . $common_url_query);
 echo '<ul>';
 
 echo '</div>';
diff --git a/prefs_forms.php b/prefs_forms.php
index a964e5147..9e3a30789 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -19,71 +19,11 @@ require_once './libraries/config/FormDisplay.class.php';
 require './libraries/config/user_preferences.forms.php';
 
 $GLOBALS['js_include'][] = 'config.js';
-
 require_once './libraries/header.inc.php';
-
-// show server tabs
-require './libraries/server_links.inc.php';
-
-// build user preferences menu
-$form_param = filter_input(INPUT_GET, 'form');
-if (!isset($forms[$form_param])) {
-    $forms_keys = array_keys($forms);
-    $form_param = array_shift($forms_keys);
-}
-$tabs_icons = array(
-    'Features'    => 'b_tblops.png',
-    'Sql_queries' => 'b_sql.png',
-    'Left_frame'  => 'b_select.png',
-    'Main_frame'  => 'b_props.png',
-    'Import'      => 'b_import.png',
-    'Export'      => 'b_export.png');
-echo '<ul id="topmenu2">';
-foreach (array_keys($forms) as $formset) {
-    $tab = array(
-        'link' => 'prefs_forms.php',
-        'text' => PMA_lang('Form_' . $formset),
-        'icon' => $tabs_icons[$formset],
-        'active' => $formset == $form_param);
-    echo PMA_generate_html_tab($tab, array('form' => $formset));
-}
-echo '</ul>';
-
-// show "configuration saved" message and reload navigation frame if needed
-if (!empty($_GET['saved'])) {
-    $message = PMA_Message::rawSuccess(__('Configuration has been saved'));
-    $message->display();
-    if (isset($_GET['refresh_left_frame']) && $_GET['refresh_left_frame'] == '1') {
-?>
-<script type="text/javascript">
-if (window.parent && window.parent.frame_navigation) {
-    window.parent.frame_navigation.location.reload();
-}
-</script>
-<?php
-    }
-}
+require_once './libraries/user_preferences.inc.php';
 
 // handle form display and processing
 
-$forms_all_keys = PMA_read_userprefs_fieldnames($forms);
-$cf = ConfigFile::getInstance();
-$cf->setAllowedKeys($forms_all_keys);
-$cf->updateWithGlobalConfig($GLOBALS['PMA_Config']);
-
-// todo: debug - remove
-$arr = $cf->getConfigArray();
-$arr2 = array();
-foreach ($arr as $k => $v) {
-    $arr2[] = "<b>$k</b> " . var_export($v, true);
-}
-$arr2 = implode(', ', $arr2);
-$arr2 .= '<br />Blacklist: ' . (empty($cfg['UserprefsDisallow'])
-        ? '<i>empty</i>'
-        : implode(', ', $cfg['UserprefsDisallow']));
-$msg = PMA_Message::notice('Debug: ' . $arr2);
-$msg->display();
-
 $form_display = new FormDisplay();
 foreach ($forms[$form_param] as $form_name => $form) {
     $form_display->registerForm($form_name, $form);
@@ -117,26 +57,8 @@ if (!$form_display->process(false)) {
         $old_settings = PMA_load_userprefs();
         $result = PMA_save_userprefs($cf->getConfigArray());
         if ($result === true) {
-            // compute differences and check whether left frame should be refreshed
-            $old_settings = isset($old_settings['config_data'])
-                    ? $old_settings['config_data']
-                    : array();
-            $new_settings = ConfigFile::getInstance()->getConfigArray();
-            $diff_keys = array_keys(array_diff_assoc($old_settings, $new_settings)
-                    + array_diff_assoc($new_settings, $old_settings));
-            $check_keys = array('NaturalOrder', 'MainPageIconic', 'DefaultTabDatabase');
-            $check_keys = array_merge($check_keys, $forms['Left_frame']['Left_frame'],
-                 $forms['Left_frame']['Left_servers'], $forms['Left_frame']['Left_databases']);
-            $diff = array_intersect($check_keys, $diff_keys);
-            $refresh_left_frame = !empty($diff);
-
-            // redirect
-            $url_params = array(
-                'form' => $form_param,
-                'saved' => 1,
-                'refresh_left_frame' => $refresh_left_frame);
-            PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'prefs_forms.php'
-                    . PMA_generate_common_url($url_params, '&'));
+            PMA_userprefs_redirect($forms, $old_settings, 'prefs_forms.php', array(
+                'form' => $form_param));
             exit;
         } else {
             $result->display();
diff --git a/prefs_manage.php b/prefs_manage.php
new file mode 100644
index 000000000..663ed0ea8
--- /dev/null
+++ b/prefs_manage.php
@@ -0,0 +1,203 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * User preferences management page
+ *
+ * @package phpMyAdmin
+ */
+
+/**
+ * Gets some core libraries and displays a top message if required
+ */
+require_once './libraries/common.inc.php';
+require_once './libraries/user_preferences.lib.php';
+require_once './libraries/config/config_functions.lib.php';
+require_once './libraries/config/messages.inc.php';
+require_once './libraries/config/ConfigFile.class.php';
+require_once './libraries/config/Form.class.php';
+require_once './libraries/config/FormDisplay.class.php';
+require './libraries/config/user_preferences.forms.php';
+
+$error = '';
+if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') == 'text_file') {
+    // export to JSON file
+    $filename = 'phpMyAdmin-config-' . urlencode(PMA_getenv('HTTP_HOST')) . '.json';
+    header('Content-Type: application/json');
+    header('Content-Disposition: attachment; filename="' . $filename . '"');
+    header('Expires: ' . date(DATE_RFC1123));
+    $settings = PMA_load_userprefs();
+    echo json_encode($settings['config_data']);
+    return;
+} else if (isset($_POST['submit_import'])) {
+    // load from JSON file
+    $json = '';
+    if (filter_input(INPUT_POST, 'import_type') == 'text_file'
+            && isset($_FILES['import_file'])
+            && $_FILES['import_file']['error'] == UPLOAD_ERR_OK
+            && is_uploaded_file($_FILES['import_file']['tmp_name'])) {
+        // read JSON from uploaded file
+        $open_basedir = @ini_get('open_basedir');
+        $file_to_unlink = '';
+        $import_file = $_FILES['import_file']['tmp_name'];
+
+        // If we are on a server with open_basedir, we must move the file
+        // before opening it. The doc explains how to create the "./tmp"
+        // directory
+        if (!empty($open_basedir)) {
+            $tmp_subdir = (PMA_IS_WINDOWS ? '.\\tmp\\' : './tmp/');
+            if (is_writable($tmp_subdir)) {
+                $import_file_new = tempnam($tmp_subdir, 'prefs');
+                if (move_uploaded_file($import_file, $import_file_new)) {
+                    $import_file = $import_file_new;
+                    $file_to_unlink = $import_file_new;
+                }
+            }
+        }
+        $json = file_get_contents($import_file);
+        if ($file_to_unlink) {
+            unlink($file_to_unlink);
+        }
+    } else {
+        // read from POST value (json)
+        $json = filter_input(INPUT_POST, 'json');
+    }
+    $config = json_decode($json, true);
+    if (!is_array($config)) {
+        $error = __('Could not import configuration');
+    } else {
+        // sanitize input values: treat them as though they came from HTTP POST request
+        $form_display = new FormDisplay();
+        foreach ($forms as $formset_id => $formset) {
+            foreach ($formset as $form_name => $form) {
+                $form_display->registerForm($formset_id . ': ' . $form_name, $form);
+            }
+        }
+        $cf = ConfigFile::getInstance();
+        if (empty($_POST['import_merge'])) {
+            $cf->resetConfigData();
+        }
+        $_POST_bak = $_POST;
+        foreach ($cf->getFlatDefaultConfig() as $k => $v) {
+            $_POST[str_replace('/', '-', $k)] = $v;
+        }
+        $_POST = array_merge($_POST, $config);
+        $all_ok = $form_display->process(true, false);
+        $_POST = $_POST_bak;
+
+        if (!$all_ok) {
+            // todo: ask about saving that what can be saved
+            $form_display->displayErrors();
+            die('errors');
+        }
+
+        // save settings
+        $old_settings = PMA_load_userprefs();
+        $result = PMA_save_userprefs($cf->getConfigArray());
+        if ($result === true) {
+            PMA_userprefs_redirect($forms, $old_settings, 'prefs_manage.php');
+            exit;
+        } else {
+            $error = $result;
+        }
+    }
+} else if (isset($_POST['submit_clear'])) {
+    $old_settings = PMA_load_userprefs();
+    $result = PMA_save_userprefs(array());
+    ConfigFile::getInstance()->resetConfigData();
+    if ($result === true) {
+        PMA_userprefs_redirect($forms, $old_settings, 'prefs_manage.php');
+        exit;
+    } else {
+        $error = $result;
+    }
+    exit;
+}
+
+$GLOBALS['js_include'][] = 'config.js';
+require_once './libraries/header.inc.php';
+require_once './libraries/user_preferences.inc.php';
+?>
+<div id="maincontainer">
+    <div id="main_pane_left">
+        <div class="group">
+            <h2><?php echo __('Import') ?></h2>
+            <form class="group-cnt prefs-form" name="prefs_import" action="prefs_manage.php" method="post" enctype="multipart/form-data">
+            <?php
+            echo PMA_generateHiddenMaxFileSize($max_upload_size) . "\n";
+            echo PMA_generate_common_hidden_inputs() . "\n";
+            ?>
+                <div style="padding-bottom:0.5em">
+                    <input type="radio" id="import_text_file" name="import_type" value="text_file" checked="checked" />
+                    <label for="import_text_file"><?php echo __('Import from text file') ?></label>
+                    <br />
+                    <input type="radio" id="import_local_storage" name="import_type" value="local_storage" disabled="disabled" />
+                    <label for="import_local_storage"><?php echo __('Import from browser\'s storage') ?></label>
+                </div>
+                <div id="opts_import_text_file">
+                    <label for="input_import_file"><?php echo __('Location of the text file'); ?></label>
+                    <input style="margin: 5px" type="file" name="import_file" id="input_import_file" />
+                </div>
+                <div id="opts_import_local_storage" style="display:none">
+                    <span class="localStorage-supported">
+                        <?php echo __('Settings will be imported from your browser\'s local storage.') ?>
+                        <span class="localStorage-empty">
+                            <?php  PMA_Message::notice(__('You have no saved settings!'))->display() ?>
+                        </span>
+                    </span>
+                    <span class="localStorage-unsupported">
+                        <?php PMA_Message::notice(__('This feature is not supported by your web browser'))->display() ?>
+                    </span>
+                </div>
+                <input type="checkbox" id="import_merge" name="import_merge" />
+                <label for="import_merge"><?php echo __('Merge with current configuration') ?></label>
+                <br /><br />
+                <input type="submit" name="submit_import" value="<?php echo __('Go'); ?>" />
+            </form>
+        </div>
+    </div>
+    <div id="main_pane_right">
+        <div class="group">
+            <h2><?php echo __('Export') ?></h2>
+            <form class="group-cnt prefs-form" name="prefs_export" action="prefs_manage.php" method="post">
+            <?php echo PMA_generate_common_hidden_inputs() . "\n" ?>
+                <div style="padding-bottom:0.5em">
+                    <input type="radio" id="export_text_file" name="export_type" value="text_file" checked="checked" />
+                    <label for="export_text_file"><?php echo __('Save as file') ?></label>
+                    <br />
+                    <input type="radio" id="export_local_storage" name="export_type" value="local_storage" disabled="disabled" />
+                    <label for="export_local_storage"><?php echo __('Save to browser\'s storage') ?></label>
+                </div>
+                <div id="opts_export_local_storage" style="display:none">
+                    <span class="localStorage-supported">
+                        <?php echo __('Settings will be saved in your browser\'s local storage.') ?>
+                        <span class="localStorage-exists">
+                            <b><?php PMA_Message::notice(__('Existing settings will be overridden!'))->display() ?></b>
+                        </span>
+                    </span>
+                    <span class="localStorage-unsupported">
+                        <?php PMA_Message::notice(__('This feature is not supported by your web browser'))->display() ?>
+                    </span>
+                </div>
+                <br />
+                <input type="submit" name="submit_export" value="<?php echo __('Go'); ?>" />
+            </form>
+        </div>
+        <div class="group">
+            <h2><?php echo __('Reset') ?></h2>
+            <form class="group-cnt prefs-form" name="prefs_export" action="prefs_manage.php" method="post">
+            <?php echo PMA_generate_common_hidden_inputs() . "\n" ?>
+                <?php echo __('You can reset all your settings and restore them to default values') ?>
+                <br /><br />
+                <input type="submit" name="submit_clear" value="<?php echo __('Reset') ?>" />
+            </form>
+
+        </div>
+    </div>
+    <br class="clearfloat" />
+</div>
+<?php
+/**
+ * Displays the footer
+ */
+require_once './libraries/footer.inc.php';
+?>
\ No newline at end of file
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index b8257a56a..1fbc7652a 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1214,6 +1214,12 @@ code.sql {
     margin-top:         0;
 }
 
+.group-cnt {
+    padding: 0 0 0 0.5em;
+    display: inline-block;
+    width: 100%;
+}
+
 /* for elements that should be revealed only via js */
 .hide {
     display:            none;

From 5717683ef16e7d35a0991e93bbf0459b0f1dfa4f Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 9 Jul 2010 19:37:49 +0200
Subject: [PATCH 042/106] basic import/export for localStorage, needs to be
 polished

---
 .gsoc/todo.txt   |  4 +++-
 js/config.js     | 40 ++++++++++++++++++++++++++++++++++++++++
 prefs_manage.php | 21 ++++++++++++++++-----
 3 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/.gsoc/todo.txt b/.gsoc/todo.txt
index 961215a7b..579ab144b 100644
--- a/.gsoc/todo.txt
+++ b/.gsoc/todo.txt
@@ -3,4 +3,6 @@ make CSS for darkblue_orange
 check input escaping, $cfg is no longer safe to use
 
 preference:
-- synchronize language, theme ThemeDefault
\ No newline at end of file
+- synchronize language, theme ThemeDefault
+
+allow to import ThemeDefault
diff --git a/js/config.js b/js/config.js
index 2b07f0a7a..5e1c3d28c 100644
--- a/js/config.js
+++ b/js/config.js
@@ -664,9 +664,49 @@ $(function() {
             disabled = true;
         }
         form.find('input[type=submit]').attr('disabled', disabled);
+    }).submit(function(e) {
+        var form = $(this);
+        if (form.attr('name') == 'prefs_export' && $('#export_local_storage')[0].checked) {
+            e.preventDefault();
+            // use AJAX to read JSON settings and save them
+            savePrefsToLocalStorage(form);
+        } else if (form.attr('name') == 'prefs_import' && $('#import_local_storage')[0].checked) {
+            // set 'json' input and submit form
+            form.find('input[name=json]').val(window.localStorage['config']);
+        }
     });
 });
 
+/**
+ * Saves user preferences to localStorage
+ *
+ * @param {Element} form
+ */
+function savePrefsToLocalStorage(form)
+{
+    form = $(form);
+    var submit = form.find('input[type=submit]');
+    //PMA_messages['strPrefsSaved']
+    submit.attr('disabled', true);
+    $.ajax({
+        url: 'prefs_manage.php',
+        cache: false,
+        type: 'POST',
+        data: {
+            token: form.find('input[name=token]').val(),
+            submit_get_json: true
+        },
+        success: function(response) {
+            window.localStorage.setItem('config', response.prefs);
+            $('.localStorage-empty').hide();
+            $('.localStorage-exists').show();
+        },
+        complete: function() {
+            submit.attr('disabled', false);
+        }
+    });
+}
+
 //
 // END: User preferences import/export
 // ------------------------------------------------------------------
\ No newline at end of file
diff --git a/prefs_manage.php b/prefs_manage.php
index 663ed0ea8..0829dd83e 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -28,6 +28,11 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
     $settings = PMA_load_userprefs();
     echo json_encode($settings['config_data']);
     return;
+} else if (isset($_POST['submit_get_json'])) {
+    $settings = PMA_load_userprefs();
+    header('Content-Type: application/json');
+    echo json_encode(array('prefs' => json_encode($settings['config_data'])));
+    return;
 } else if (isset($_POST['submit_import'])) {
     // load from JSON file
     $json = '';
@@ -117,15 +122,21 @@ $GLOBALS['js_include'][] = 'config.js';
 require_once './libraries/header.inc.php';
 require_once './libraries/user_preferences.inc.php';
 ?>
+<script type="text/javascript">
+<?php
+PMA_printJsValue("PMA_messages['strPrefsSaved']", __('Settings have been saved'));
+?>
+</script>
 <div id="maincontainer">
     <div id="main_pane_left">
         <div class="group">
             <h2><?php echo __('Import') ?></h2>
             <form class="group-cnt prefs-form" name="prefs_import" action="prefs_manage.php" method="post" enctype="multipart/form-data">
-            <?php
-            echo PMA_generateHiddenMaxFileSize($max_upload_size) . "\n";
-            echo PMA_generate_common_hidden_inputs() . "\n";
-            ?>
+                <?php
+                echo PMA_generateHiddenMaxFileSize($max_upload_size) . "\n";
+                echo PMA_generate_common_hidden_inputs() . "\n";
+                ?>
+                <input type="hidden" name="json" value="" />
                 <div style="padding-bottom:0.5em">
                     <input type="radio" id="import_text_file" name="import_type" value="text_file" checked="checked" />
                     <label for="import_text_file"><?php echo __('Import from text file') ?></label>
@@ -184,7 +195,7 @@ require_once './libraries/user_preferences.inc.php';
         </div>
         <div class="group">
             <h2><?php echo __('Reset') ?></h2>
-            <form class="group-cnt prefs-form" name="prefs_export" action="prefs_manage.php" method="post">
+            <form class="group-cnt prefs-form" name="prefs_reset" action="prefs_manage.php" method="post">
             <?php echo PMA_generate_common_hidden_inputs() . "\n" ?>
                 <?php echo __('You can reset all your settings and restore them to default values') ?>
                 <br /><br />

From bcaecbf10a4cf84b38b14a776ce02911c6e13725 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 9 Jul 2010 20:37:04 +0200
Subject: [PATCH 043/106] allow user preferences to work without pmadb, but
 warn users about that

---
 libraries/Config.class.php              | 19 ++++++++-------
 libraries/user_preferences.inc.php      |  5 ++++
 libraries/user_preferences.lib.php      | 31 ++++++++++++++++++++++---
 themes/original/css/theme_right.css.php |  2 +-
 4 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index f1ad1871a..0cf0c3baf 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -416,7 +416,7 @@ class PMA_Config
     }
 
     /**
-     * loads user preferences and merges them with current config
+     * Loads user preferences and merges them with current config
      * must be called after control connection has been estabilished
      *
      * @uses $GLOBALS['cfg']
@@ -443,6 +443,7 @@ class PMA_Config
                 $prefs = PMA_load_userprefs();
                 $_SESSION['cache']['userprefs'] = PMA_apply_userprefs($prefs['config_data']);
                 $_SESSION['cache']['userprefs_mtime'] = $prefs['mtime'];
+                $_SESSION['cache']['userprefs_type'] = $prefs['type'];
                 $_SESSION['cache']['config_mtime'] = $config_mtime;
             }
         } else if (!isset($_SESSION['cache']['userprefs'])) {
@@ -450,12 +451,11 @@ class PMA_Config
             return;
         }
         $config_data = $_SESSION['cache']['userprefs'];
-        // todo: check for empty user data, user_preferences should then be true
+        // type id 'db' or 'session'
+        $this->set('user_preferences', $_SESSION['cache']['userprefs_type']);
         if (!$config_data) {
-            $this->set('user_preferences', false);
             return false;
         }
-        $this->set('user_preferences', true);
 
         // backup some settings
         $fontsize = $this->get('fontsize');
@@ -511,13 +511,15 @@ class PMA_Config
     function setUserValue($cookie_name, $cfg_path, $new_cfg_value, $default_value = null)
     {
         // use permanent user preferences if possible
-        if ($this->get('user_preferences')) {
+        $prefs_type = $this->get('user_preferences');
+        if ($prefs_type) {
             require_once './libraries/user_preferences.lib.php';
             if ($default_value === null) {
                 $default_value = PMA_array_read($cfg_path, $this->default);
             }
             PMA_persist_option($cfg_path, $new_cfg_value, $default_value);
-        } else if ($cookie_name) {
+        }
+        if ($prefs_type != 'db' && $cookie_name) {
             // fall back to cookies
             if ($default_value === null) {
                 $default_value = PMA_array_read($cfg_path, $this->settings);
@@ -538,8 +540,9 @@ class PMA_Config
     function getUserValue($cookie_name, $cfg_value)
     {
         $cookie_exists = isset($_COOKIE) && !empty($_COOKIE[$cookie_name]);
-        if ($this->get('user_preferences')) {
-            // user preferences value exists, remove cookie
+        $prefs_type = $this->get('user_preferences');
+        if ($prefs_type == 'db') {
+            // permanent user preferences value exists, remove cookie
             if ($cookie_exists) {
                 $this->removeCookie($cookie_name);
             }
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 2cdb01368..3b3ebe798 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -74,6 +74,11 @@ $arr2 .= '<br />Blacklist: ' . (empty($cfg['UserprefsDisallow'])
 $msg = PMA_Message::notice('Debug: ' . $arr2);
 $msg->display();
 
+// warn about using session storage for settings
+$msg = __('Your preferences will be saved only for current session. Storing them permanently requires %s pmadb %s.');
+$msg = PMA_sanitize(sprintf($msg, '[a@http://wiki.phpmyadmin.net/pma/pmadb@_blank]', '[/a]'));
+PMA_Message::notice($msg)->display();
+
 if (isset($error) && $error) {
     if (!$error instanceof PMA_Message) {
         $error = PMA_Message::error($error);
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 3b52e9bbf..421ebebf1 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -12,7 +12,9 @@
  * Returns false or an array:
  * * config_data - path => value pairs
  * * mtime - last modification time
+ * * type - 'db' (config read from pmadb) or 'session' (read from user session)
  *
+ * @uses $_SESSION['userconfig']
  * @uses PMA_array_merge_recursive
  * @uses PMA_backquote()
  * @uses PMA_DBI_fetch_single_row()
@@ -25,8 +27,18 @@ function PMA_load_userprefs()
 {
     $cfgRelation = PMA_getRelationsParam();
     if (!$cfgRelation['userconfigwork']) {
-        return false;
+        // no pmadb table, use session storage
+        if (!isset($_SESSION['userconfig'])) {
+            $_SESSION['userconfig'] = array(
+                'db' => array(),
+                'ts' => time());
+        }
+        return array(
+            'config_data' => $_SESSION['userconfig']['db'],
+            'mtime' => $_SESSION['userconfig']['ts'],
+            'type' => 'session');
     }
+    // load configuration from pmadb
     $query_table = PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['userconfig']);
     $query = '
         SELECT `config_data`, UNIX_TIMESTAMP(`timevalue`) ts
@@ -39,7 +51,8 @@ function PMA_load_userprefs()
     $config_data = unserialize($row['config_data']);
     return array(
         'config_data' => $config_data,
-        'mtime' => $row['ts']);
+        'mtime' => $row['ts'],
+        'type' => 'db');
 }
 
 /**
@@ -47,6 +60,7 @@ function PMA_load_userprefs()
  *
  * @uses $GLOBALS['controllink']
  * @uses $_SESSION['cache']['userprefs']
+ * @uses $_SESSION['userconfig']
  * @uses ConfigFile::getConfigArray()
  * @uses ConfigFile::getInstance()
  * @uses PMA_backquote()
@@ -64,8 +78,18 @@ function PMA_load_userprefs()
 function PMA_save_userprefs(array $config_array)
 {
     $cfgRelation = PMA_getRelationsParam();
-    $config_data = serialize($config_array);
+    if (!$cfgRelation['userconfigwork']) {
+        // no pmadb table, use session storage
+        $_SESSION['userconfig'] = array(
+            'db' => $config_array,
+            'ts' => time());
+        if (isset($_SESSION['cache']['userprefs'])) {
+           unset($_SESSION['cache']['userprefs']);
+        }
+        return true;
+    }
 
+    // save configuration to pmadb
     $query_table = PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['userconfig']);
     $query = '
         SELECT `username`
@@ -73,6 +97,7 @@ function PMA_save_userprefs(array $config_array)
           WHERE `username` = \'' . PMA_sqlAddslashes($cfgRelation['user']) . '\'';
 
     $has_config = PMA_DBI_fetch_value($query, 0, 0, $GLOBALS['controllink']);
+    $config_data = serialize($config_array);
     if ($has_config) {
         $query = '
             UPDATE ' . $query_table . '
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 1fbc7652a..8cfb5d6e4 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1217,7 +1217,7 @@ code.sql {
 .group-cnt {
     padding: 0 0 0 0.5em;
     display: inline-block;
-    width: 100%;
+    width: 98%;
 }
 
 /* for elements that should be revealed only via js */

From 3137cc2f1d1e18a14c0dce9b63d34472f781dd49 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 10 Jul 2010 00:06:50 +0200
Subject: [PATCH 044/106] add date information when importing from localStorage

---
 js/config.js                       | 32 +++++++++++++++++++++++++++++-
 libraries/user_preferences.inc.php |  2 +-
 prefs_manage.php                   |  9 +++++++--
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/js/config.js b/js/config.js
index 5e1c3d28c..e8777545b 100644
--- a/js/config.js
+++ b/js/config.js
@@ -654,6 +654,9 @@ $(function() {
     var ls_exists = ls_supported ? (window.localStorage['config'] || false) : false;
     $('.localStorage-'+(ls_supported ? 'un' : '')+'supported').hide();
     $('.localStorage-'+(ls_exists ? 'empty' : 'exists')).hide();
+    if (ls_exists) {
+        updatePrefsDate();
+    }
     $('form.prefs-form').change(function(){
         var form = $(this);
         var disabled = false;
@@ -697,7 +700,10 @@ function savePrefsToLocalStorage(form)
             submit_get_json: true
         },
         success: function(response) {
-            window.localStorage.setItem('config', response.prefs);
+            window.localStorage['config'] = response.prefs;
+            window.localStorage['config_mtime'] = response.mtime;
+            window.localStorage['config_mtime_local'] = (new Date()).toUTCString();
+            updatePrefsDate();
             $('.localStorage-empty').hide();
             $('.localStorage-exists').show();
         },
@@ -707,6 +713,30 @@ function savePrefsToLocalStorage(form)
     });
 }
 
+/**
+ * Updates preferences timestamp in Import form
+ */
+function updatePrefsDate()
+{
+    var d = new Date(window.localStorage['config_mtime_local']);
+    var msg = PMA_messages['strSavedOn'].replace('__DATE__', formatDate(d));
+    $('#opts_import_local_storage .localStorage-exists').html(msg);
+}
+
+/**
+ * Returns date formatted as YYYY-MM-DD HH:II
+ *
+ * @param {Date} d
+ */
+function formatDate(d)
+{
+    return d.getFullYear() + '-'
+        + (d.getMonth() < 10 ? '0'+d.getMonth() : d.getMonth())
+        + '-' + (d.getDay() < 10 ? '0'+d.getDay() : d.getDay())
+        + ' ' + (d.getHours() < 10 ? '0'+d.getHours() : d.getHours())
+        + ':' + (d.getMinutes() < 10 ? '0'+d.getMinutes() : d.getMinutes());
+}
+
 //
 // END: User preferences import/export
 // ------------------------------------------------------------------
\ No newline at end of file
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 3b3ebe798..1bdbe3a91 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -75,7 +75,7 @@ $msg = PMA_Message::notice('Debug: ' . $arr2);
 $msg->display();
 
 // warn about using session storage for settings
-$msg = __('Your preferences will be saved only for current session. Storing them permanently requires %s pmadb %s.');
+$msg = __('Your preferences will be saved only for current session. Storing them permanently requires %spmadb%s.');
 $msg = PMA_sanitize(sprintf($msg, '[a@http://wiki.phpmyadmin.net/pma/pmadb@_blank]', '[/a]'));
 PMA_Message::notice($msg)->display();
 
diff --git a/prefs_manage.php b/prefs_manage.php
index 0829dd83e..ebdecce49 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -31,7 +31,9 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
 } else if (isset($_POST['submit_get_json'])) {
     $settings = PMA_load_userprefs();
     header('Content-Type: application/json');
-    echo json_encode(array('prefs' => json_encode($settings['config_data'])));
+    echo json_encode(array(
+        'prefs' => json_encode($settings['config_data']),
+        'mtime' => $settings['mtime']));
     return;
 } else if (isset($_POST['submit_import'])) {
     // load from JSON file
@@ -124,7 +126,7 @@ require_once './libraries/user_preferences.inc.php';
 ?>
 <script type="text/javascript">
 <?php
-PMA_printJsValue("PMA_messages['strPrefsSaved']", __('Settings have been saved'));
+PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: __DATE__'));
 ?>
 </script>
 <div id="maincontainer">
@@ -151,6 +153,9 @@ PMA_printJsValue("PMA_messages['strPrefsSaved']", __('Settings have been saved')
                 <div id="opts_import_local_storage" style="display:none">
                     <span class="localStorage-supported">
                         <?php echo __('Settings will be imported from your browser\'s local storage.') ?>
+                        <span class="localStorage-exists">
+                            <?php echo __('Saved on: __DATE__') ?>
+                        </span>
                         <span class="localStorage-empty">
                             <?php  PMA_Message::notice(__('You have no saved settings!'))->display() ?>
                         </span>

From e6b551dc7176e94989291647ab728218ea71c5f1 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 10 Jul 2010 12:09:34 +0200
Subject: [PATCH 045/106] bugfixes: allow to work with multiple servers, fix
 boolean values in select fields

---
 libraries/Config.class.php                  | 24 ++++++++++++---------
 libraries/config/Form.class.php             |  4 +++-
 libraries/config/user_preferences.forms.php |  5 +++--
 libraries/user_preferences.lib.php          | 14 +++++++-----
 4 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 0cf0c3baf..4c415507b 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -433,26 +433,30 @@ class PMA_Config
     {
         // index.php should load these settings, so that phpmyadmin.css.php
         // will have everything avaiable in session cache
-        if (!defined('PMA_MINIMUM_COMMON')) {
+        $server = isset($GLOBALS['server'])
+            ? $GLOBALS['server']
+            : $GLOBALS['cfg']['ServerDefault'];
+        $cache_key = 'server_' . $server;
+        if ($server > 0 && !defined('PMA_MINIMUM_COMMON')) {
             $config_mtime = max($this->default_source_mtime, $this->source_mtime);
             // cache user preferences, use database only when needed
-            if (!isset($_SESSION['cache']['userprefs'])
-                    || $_SESSION['cache']['config_mtime'] < $config_mtime) {
+            if (!isset($_SESSION['cache'][$cache_key]['userprefs'])
+                    || $_SESSION['cache'][$cache_key]['config_mtime'] < $config_mtime) {
                 // load required libraries
                 require_once './libraries/user_preferences.lib.php';
                 $prefs = PMA_load_userprefs();
-                $_SESSION['cache']['userprefs'] = PMA_apply_userprefs($prefs['config_data']);
-                $_SESSION['cache']['userprefs_mtime'] = $prefs['mtime'];
-                $_SESSION['cache']['userprefs_type'] = $prefs['type'];
-                $_SESSION['cache']['config_mtime'] = $config_mtime;
+                $_SESSION['cache'][$cache_key]['userprefs'] = PMA_apply_userprefs($prefs['config_data']);
+                $_SESSION['cache'][$cache_key]['userprefs_mtime'] = $prefs['mtime'];
+                $_SESSION['cache'][$cache_key]['userprefs_type'] = $prefs['type'];
+                $_SESSION['cache'][$cache_key]['config_mtime'] = $config_mtime;
             }
-        } else if (!isset($_SESSION['cache']['userprefs'])) {
+        } else if ($server == 0 || !isset($_SESSION['cache'][$cache_key]['userprefs'])) {
             $this->set('user_preferences', false);
             return;
         }
-        $config_data = $_SESSION['cache']['userprefs'];
+        $config_data = $_SESSION['cache'][$cache_key]['userprefs'];
         // type id 'db' or 'session'
-        $this->set('user_preferences', $_SESSION['cache']['userprefs_type']);
+        $this->set('user_preferences', $_SESSION['cache'][$cache_key]['userprefs_type']);
         if (!$config_data) {
             return false;
         }
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
index e91f03d2e..bea1e5000 100644
--- a/libraries/config/Form.class.php
+++ b/libraries/config/Form.class.php
@@ -95,14 +95,16 @@ class Form
         } else {
             // convert value list array('a', 'b') to array('a' => 'a', 'b' => 'b')
             $has_string_keys = false;
+            $keys = array();
             for ($i = 0; $i < count($value); $i++) {
                 if (!isset($value[$i])) {
                     $has_string_keys = true;
                     break;
                 }
+                $keys[] = is_bool($value[$i]) ? (int)$value[$i] : $value[$i];
             }
             if (!$has_string_keys) {
-                $value = array_combine($value, $value);
+                $value = array_combine($keys, $value);
             }
         }
         // $value has keys and value names, return it
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 4e5466810..69505b5ef 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -52,9 +52,10 @@ $forms['Left_frame']['Left_frame'] = array(
     'LeftLogoLink',
     'LeftLogoLinkWindow',
     'LeftPointerEnable');
-$forms['Left_frame']['Left_servers'] = array(
+// pmadb is unavailable when these settings are used
+/*$forms['Left_frame']['Left_servers'] = array(
     'LeftDisplayServers',
-    'DisplayServersList');
+    'DisplayServersList');*/
 $forms['Left_frame']['Left_databases'] = array(
     'DisplayDatabasesList',
     'LeftFrameDBTree',
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 421ebebf1..2ca0417b7 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -78,13 +78,17 @@ function PMA_load_userprefs()
 function PMA_save_userprefs(array $config_array)
 {
     $cfgRelation = PMA_getRelationsParam();
+    $server = isset($GLOBALS['server'])
+        ? $GLOBALS['server']
+        : $GLOBALS['cfg']['ServerDefault'];
+    $cache_key = 'server_' . $server;
     if (!$cfgRelation['userconfigwork']) {
         // no pmadb table, use session storage
         $_SESSION['userconfig'] = array(
             'db' => $config_array,
             'ts' => time());
-        if (isset($_SESSION['cache']['userprefs'])) {
-           unset($_SESSION['cache']['userprefs']);
+        if (isset($_SESSION['cache'][$cache_key]['userprefs'])) {
+           unset($_SESSION['cache'][$cache_key]['userprefs']);
         }
         return true;
     }
@@ -109,8 +113,8 @@ function PMA_save_userprefs(array $config_array)
             VALUES (\'' . PMA_sqlAddslashes($cfgRelation['user']) . '\',
                 \'' . PMA_sqlAddslashes($config_data) . '\')';
     }
-    if (isset($_SESSION['cache']['userprefs'])) {
-        unset($_SESSION['cache']['userprefs']);
+    if (isset($_SESSION['cache'][$cache_key]['userprefs'])) {
+        unset($_SESSION['cache'][$cache_key]['userprefs']);
     }
     if (!PMA_DBI_try_query($query, $GLOBALS['controllink'])) {
         $message = PMA_Message::error(__('Could not save configuration'));
@@ -219,7 +223,7 @@ function PMA_userprefs_redirect(array $forms, array $old_settings, $file_name, $
             + array_diff_assoc($new_settings, $old_settings));
     $check_keys = array('NaturalOrder', 'MainPageIconic', 'DefaultTabDatabase');
     $check_keys = array_merge($check_keys, $forms['Left_frame']['Left_frame'],
-         $forms['Left_frame']['Left_servers'], $forms['Left_frame']['Left_databases']);
+         $forms['Left_frame']['Left_databases']);
     $diff = array_intersect($check_keys, $diff_keys);
     $refresh_left_frame = !empty($diff);
 

From 956315e0b2e06a90544f721763894708b427bb66 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 10 Jul 2010 21:51:54 +0200
Subject: [PATCH 046/106] bugfix: show warning only when pmadb is unavailable

---
 libraries/user_preferences.inc.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 1bdbe3a91..ad69848d9 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -75,9 +75,12 @@ $msg = PMA_Message::notice('Debug: ' . $arr2);
 $msg->display();
 
 // warn about using session storage for settings
-$msg = __('Your preferences will be saved only for current session. Storing them permanently requires %spmadb%s.');
-$msg = PMA_sanitize(sprintf($msg, '[a@http://wiki.phpmyadmin.net/pma/pmadb@_blank]', '[/a]'));
-PMA_Message::notice($msg)->display();
+$cfgRelation = PMA_getRelationsParam();
+if (!$cfgRelation['userconfigwork']) {
+    $msg = __('Your preferences will be saved only for current session. Storing them permanently requires %spmadb%s.');
+    $msg = PMA_sanitize(sprintf($msg, '[a@http://wiki.phpmyadmin.net/pma/pmadb@_blank]', '[/a]'));
+    PMA_Message::notice($msg)->display();
+}
 
 if (isset($error) && $error) {
     if (!$error instanceof PMA_Message) {

From 625b9edca8c8451e5aa4ed7f532af217f800065c Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Mon, 12 Jul 2010 14:02:45 +0200
Subject: [PATCH 047/106] show message when preferences are saved to
 localStorage

---
 js/config.js                            | 10 ++++++++++
 prefs_manage.php                        |  6 ++++++
 themes/original/css/theme_right.css.php |  4 ++++
 3 files changed, 20 insertions(+)

diff --git a/js/config.js b/js/config.js
index e8777545b..4f4a89d73 100644
--- a/js/config.js
+++ b/js/config.js
@@ -678,6 +678,12 @@ $(function() {
             form.find('input[name=json]').val(window.localStorage['config']);
         }
     });
+
+    $('.click-hide-message').live('click', function(){
+        var div = $(this);
+        div.hide().parent('.group').css('height', '');
+        div.next('form').show();
+    });
 });
 
 /**
@@ -706,6 +712,10 @@ function savePrefsToLocalStorage(form)
             updatePrefsDate();
             $('.localStorage-empty').hide();
             $('.localStorage-exists').show();
+            var group = form.parent('.group');
+            group.css('height', group.height() + 'px');
+            form.hide('fast');
+            form.prev('.click-hide-message').show('fast');
         },
         complete: function() {
             submit.attr('disabled', false);
diff --git a/prefs_manage.php b/prefs_manage.php
index ebdecce49..4d972d495 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -174,6 +174,12 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: __DATE__'));
     <div id="main_pane_right">
         <div class="group">
             <h2><?php echo __('Export') ?></h2>
+            <div class="click-hide-message group-cnt" style="display:none">
+                <?php
+                $message = PMA_Message::rawSuccess(__('Configuration has been saved'));
+                $message->display();
+                ?>
+            </div>
             <form class="group-cnt prefs-form" name="prefs_export" action="prefs_manage.php" method="post">
             <?php echo PMA_generate_common_hidden_inputs() . "\n" ?>
                 <div style="padding-bottom:0.5em">
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 8cfb5d6e4..754c34a9c 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1434,3 +1434,7 @@ fieldset .group-field th {
 .config-form dd:before {
     content: "\25B8  ";
 }
+
+.click-hide-message {
+    cursor: pointer;
+}

From b3ae73f2aa53072a85fccd24f0debcc094ab0813 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Mon, 12 Jul 2010 19:24:07 +0200
Subject: [PATCH 048/106] ui fixes

---
 js/config.js                            |  4 ++--
 prefs_manage.php                        | 15 ++++++++-------
 themes/original/css/theme_right.css.php |  4 ++++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/js/config.js b/js/config.js
index 4f4a89d73..612425bf9 100644
--- a/js/config.js
+++ b/js/config.js
@@ -645,8 +645,8 @@ $(function() {
             var hide_id = show_id.match(/local_storage$/)
                 ? show_id.replace(/local_storage$/, 'text_file')
                 : show_id.replace(/text_file$/, 'local_storage');
-        $('#opts_'+hide_id).hide('fast');
-        $('#opts_'+show_id).show('fast');
+        $('#opts_'+hide_id).hide();
+        $('#opts_'+show_id).show();
     });
 
     // detect localStorage state
diff --git a/prefs_manage.php b/prefs_manage.php
index 4d972d495..4741855a5 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -139,27 +139,28 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: __DATE__'));
                 echo PMA_generate_common_hidden_inputs() . "\n";
                 ?>
                 <input type="hidden" name="json" value="" />
-                <div style="padding-bottom:0.5em">
+                <div>
                     <input type="radio" id="import_text_file" name="import_type" value="text_file" checked="checked" />
                     <label for="import_text_file"><?php echo __('Import from text file') ?></label>
                     <br />
                     <input type="radio" id="import_local_storage" name="import_type" value="local_storage" disabled="disabled" />
                     <label for="import_local_storage"><?php echo __('Import from browser\'s storage') ?></label>
                 </div>
-                <div id="opts_import_text_file">
+                <div id="opts_import_text_file" class="prefsmanage_opts">
                     <label for="input_import_file"><?php echo __('Location of the text file'); ?></label>
-                    <input style="margin: 5px" type="file" name="import_file" id="input_import_file" />
+                    <input type="file" name="import_file" id="input_import_file" />
                 </div>
-                <div id="opts_import_local_storage" style="display:none">
-                    <span class="localStorage-supported">
+                <div id="opts_import_local_storage" class="prefsmanage_opts" style="display:none">
+                    <div class="localStorage-supported">
                         <?php echo __('Settings will be imported from your browser\'s local storage.') ?>
+                        <br />
                         <span class="localStorage-exists">
                             <?php echo __('Saved on: __DATE__') ?>
                         </span>
                         <span class="localStorage-empty">
                             <?php  PMA_Message::notice(__('You have no saved settings!'))->display() ?>
                         </span>
-                    </span>
+                    </div>
                     <span class="localStorage-unsupported">
                         <?php PMA_Message::notice(__('This feature is not supported by your web browser'))->display() ?>
                     </span>
@@ -189,7 +190,7 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: __DATE__'));
                     <input type="radio" id="export_local_storage" name="export_type" value="local_storage" disabled="disabled" />
                     <label for="export_local_storage"><?php echo __('Save to browser\'s storage') ?></label>
                 </div>
-                <div id="opts_export_local_storage" style="display:none">
+                <div id="opts_export_local_storage" class="prefsmanage_opts" style="display:none">
                     <span class="localStorage-supported">
                         <?php echo __('Settings will be saved in your browser\'s local storage.') ?>
                         <span class="localStorage-exists">
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 754c34a9c..329ea80d7 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1438,3 +1438,7 @@ fieldset .group-field th {
 .click-hide-message {
     cursor: pointer;
 }
+
+.prefsmanage_opts {
+    margin-<?php echo $left; ?>: 2em;
+}
\ No newline at end of file

From 57a8d902f4016b8b4e6d5f8cf866c54a4ba93f96 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 13 Jul 2010 22:17:19 +0200
Subject: [PATCH 049/106] fix ThemeDefault and fontsize export

---
 libraries/Config.class.php            | 29 +++++++++++++--------------
 libraries/config/ConfigFile.class.php |  3 ++-
 libraries/user_preferences.inc.php    |  1 +
 libraries/user_preferences.lib.php    | 15 ++++++--------
 4 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 4c415507b..c72054724 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -455,11 +455,8 @@ class PMA_Config
             return;
         }
         $config_data = $_SESSION['cache'][$cache_key]['userprefs'];
-        // type id 'db' or 'session'
+        // type is 'db' or 'session'
         $this->set('user_preferences', $_SESSION['cache'][$cache_key]['userprefs_type']);
-        if (!$config_data) {
-            return false;
-        }
 
         // backup some settings
         $fontsize = $this->get('fontsize');
@@ -478,10 +475,13 @@ class PMA_Config
         // load/save theme
         // theme cookie exists only if we are using non-default theme
         $tmanager = $_SESSION['PMA_Theme_Manager'];
-        if (isset($_REQUEST['set_theme'])) {
-            // new theme was set in common.inc.php
-            $this->setUserValue(null, 'ThemeDefault', $tmanager->theme->id);
-        } else if (!$tmanager->getThemeCookie()) {
+        if ($tmanager->getThemeCookie()) {
+            if (!isset($config_data['ThemeDefault'])
+                    || $config_data['ThemeDefault'] != $tmanager->theme->getId()) {
+                // new theme was set in common.inc.php
+                $this->setUserValue(null, 'ThemeDefault', $tmanager->theme->getId(), 'original');
+            }
+        } else {
             // no cookie - read default from settings
             if ($this->settings['ThemeDefault'] != $tmanager->theme
                     && $tmanager->checkTheme($this->settings['ThemeDefault'])) {
@@ -489,10 +489,9 @@ class PMA_Config
                 $tmanager->setThemeCookie();
             }
         }
+
         // save new font size
-        // fontsize cookie exists only if we are using a non-default size
-        if (isset($_POST['set_fontsize']) || isset($_COOKIE['pma_fontsize'])) {
-            // cookie with new fontsize exists, save setting to database and remove it
+        if (!isset($config_data['fontsize']) || $fontsize != $config_data['fontsize']) {
             $this->setUserValue('pma_fontsize', 'fontsize', $fontsize, '82%');
         }
     }
@@ -876,10 +875,10 @@ class PMA_Config
     {
         $new_fontsize = '';
 
-        if (isset($_GET['fontsize'])) {
-            $new_fontsize = $_GET['fontsize'];
-        } elseif (isset($_POST['fontsize'])) {
-            $new_fontsize = $_POST['fontsize'];
+        if (isset($_GET['set_fontsize'])) {
+            $new_fontsize = $_GET['set_fontsize'];
+        } elseif (isset($_POST['set_fontsize'])) {
+            $new_fontsize = $_POST['set_fontsize'];
         } elseif (isset($_COOKIE['pma_fontsize'])) {
             $new_fontsize = $_COOKIE['pma_fontsize'];
         }
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index 1f501140a..b9357ad7a 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -63,8 +63,9 @@ class ConfigFile
         // load default config values
         $cfg = &$this->cfg;
         require './libraries/config.default.php';
+        $cfg['fontsize'] = '82%';
 
-        // load additionsl config information
+        // load additional config information
         $cfg_db = &$this->cfgDb;
         require './libraries/config.values.php';
 
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index ad69848d9..101f39199 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -58,6 +58,7 @@ if (window.parent && window.parent.frame_navigation) {
 
 $forms_all_keys = PMA_read_userprefs_fieldnames($forms);
 $cf = ConfigFile::getInstance();
+$cf->resetConfigData(); // start with a clean instance
 $cf->setAllowedKeys($forms_all_keys);
 $cf->updateWithGlobalConfig($GLOBALS['PMA_Config']);
 
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 2ca0417b7..2cd958eb9 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -9,7 +9,7 @@
 /**
  * Loads user preferences
  *
- * Returns false or an array:
+ * Returns an array:
  * * config_data - path => value pairs
  * * mtime - last modification time
  * * type - 'db' (config read from pmadb) or 'session' (read from user session)
@@ -21,7 +21,7 @@
  * @uses PMA_getRelationsParam()
  * @uses PMA_sqlAddslashes()
  * @uses $GLOBALS['controllink']
- * @return false|array
+ * @return array
  */
 function PMA_load_userprefs()
 {
@@ -45,13 +45,9 @@ function PMA_load_userprefs()
         FROM ' . $query_table . '
           WHERE `username` = \'' . PMA_sqlAddslashes($cfgRelation['user']) . '\'';
     $row = PMA_DBI_fetch_single_row($query, 'ASSOC', $GLOBALS['controllink']);
-    if (!$row) {
-        return false;
-    }
-    $config_data = unserialize($row['config_data']);
     return array(
-        'config_data' => $config_data,
-        'mtime' => $row['ts'],
+        'config_data' => $row ? unserialize($row['config_data']) : array(),
+        'mtime' => $row ? $row['ts'] : time(),
         'type' => 'db');
 }
 
@@ -225,7 +221,8 @@ function PMA_userprefs_redirect(array $forms, array $old_settings, $file_name, $
     $check_keys = array_merge($check_keys, $forms['Left_frame']['Left_frame'],
          $forms['Left_frame']['Left_databases']);
     $diff = array_intersect($check_keys, $diff_keys);
-    $refresh_left_frame = !empty($diff);
+    $refresh_left_frame = !empty($diff)
+            || (isset($params['refresh_left_frame']) && $params['refresh_left_frame']);
 
     // redirect
     $url_params = array(

From e7dd9a7c678f5b680dcaa93f7bf337e058df4677 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 13 Jul 2010 22:59:21 +0200
Subject: [PATCH 050/106] allow to partially import broken configs - show
 message with error list and import only correct values

---
 prefs_forms.php  |  5 +++--
 prefs_manage.php | 58 +++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/prefs_forms.php b/prefs_forms.php
index 9e3a30789..a73e529d3 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -46,10 +46,10 @@ if (!$form_display->process(false)) {
     if ($form_display->hasErrors()) {
         // form has errors
         ?>
-        <fieldset>
+        <div class="warning config-form">
             <b><?php echo __('Submitted form contains errors') ?></b>
             <?php $form_display->displayErrors(); ?>
-        </fieldset>
+        </div>
         <?php
         $form_display->display(true, true);
     } else {
@@ -66,6 +66,7 @@ if (!$form_display->process(false)) {
         $form_display->display(true, true);
     }
 }
+// todo: remove debug
 $GLOBALS['error_handler']->dispAllErrors();
 
 /**
diff --git a/prefs_manage.php b/prefs_manage.php
index 4741855a5..5355b7f90 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -89,19 +89,57 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
         }
         $_POST = array_merge($_POST, $config);
         $all_ok = $form_display->process(true, false);
+        $all_ok = $all_ok && !$form_display->hasErrors();
         $_POST = $_POST_bak;
 
+        if (!$all_ok && isset($_POST['fix_errors'])) {
+            $form_display->fixErrors();
+            $all_ok = true;
+        }
         if (!$all_ok) {
-            // todo: ask about saving that what can be saved
+            // mimic original form and post json in a hidden field
+            require_once './libraries/header.inc.php';
+            require_once './libraries/user_preferences.inc.php';
+            $msg = PMA_Message::warning(__('Configuration contains incorrect data for some fields.'));
+            $msg->display();
+            echo '<div class="config-form">';
             $form_display->displayErrors();
-            die('errors');
+            echo '</div>';
+            ?>
+            <form action="prefs_manage.php" method="post">
+                <?php echo PMA_generate_common_hidden_inputs() . "\n"; ?>
+                <input type="hidden" name="json" value="<?php echo htmlspecialchars($json) ?>" />
+                <input type="hidden" name="fix_errors" value="1" />
+                <?php if (!empty($_POST['import_merge'])): ?>
+                <input type="hidden" name="import_merge" value="1" />
+                <?php endif; ?>
+                <p><?php echo __('Do you want to import remaining settings?') ?></p>
+                <input type="submit" name="submit_import" value="<?php echo __('Yes') ?>" />
+                <input type="submit" name="submit_ignore" value="<?php echo __('No') ?>" />
+            </form>
+            <?php
+            require_once './libraries/footer.inc.php';
+            return;
+        }
+
+        // check for ThemeDefault and fontsize
+        $params = array();
+        if (isset($config['ThemeDefault'])
+                && $_SESSION['PMA_Theme_Manager']->checkTheme($config['ThemeDefault'])) {
+            $_SESSION['PMA_Theme_Manager']->setActiveTheme($config['ThemeDefault']);
+            $_SESSION['PMA_Theme_Manager']->setThemeCookie();
+            $params['refresh_left_frame'] = true;
+        }
+        if (isset($config['fontsize'])) {
+            $params['set_fontsize'] = $config['fontsize'];
+            $params['refresh_left_frame'] = true;
         }
 
         // save settings
         $old_settings = PMA_load_userprefs();
         $result = PMA_save_userprefs($cf->getConfigArray());
         if ($result === true) {
-            PMA_userprefs_redirect($forms, $old_settings, 'prefs_manage.php');
+            PMA_userprefs_redirect($forms, $old_settings, 'prefs_manage.php', $params);
             exit;
         } else {
             $error = $result;
@@ -110,9 +148,19 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
 } else if (isset($_POST['submit_clear'])) {
     $old_settings = PMA_load_userprefs();
     $result = PMA_save_userprefs(array());
-    ConfigFile::getInstance()->resetConfigData();
     if ($result === true) {
-        PMA_userprefs_redirect($forms, $old_settings, 'prefs_manage.php');
+        $params = array();
+        if ($_SESSION['PMA_Theme_Manager']->theme->getId() != 'original') {
+            $GLOBALS['PMA_Config']->removeCookie($_SESSION['PMA_Theme_Manager']->getThemeCookieName());
+            unset($_SESSION['PMA_Theme_Manager']);
+            unset($_SESSION['PMA_Theme']);
+            $params['refresh_left_frame'] = true;
+        }
+        if ($GLOBALS['PMA_Config']->get('fontsize') != '82%') {
+            $GLOBALS['PMA_Config']->removeCookie('pma_fontsize');
+            $params['refresh_left_frame'] = true;
+        }
+        PMA_userprefs_redirect($forms, $old_settings, 'prefs_manage.php', $params);
         exit;
     } else {
         $error = $result;

From 030abc511430327aedd764e1486e9c5bb24efbda Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 13 Jul 2010 23:15:22 +0200
Subject: [PATCH 051/106] add missing validation for TextareaRows fix warning
 in FormDisplay while importing settings

---
 .gsoc/todo.txt                         | 5 +----
 libraries/config.values.php            | 1 +
 libraries/config/FormDisplay.class.php | 4 +++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gsoc/todo.txt b/.gsoc/todo.txt
index 579ab144b..625cf1862 100644
--- a/.gsoc/todo.txt
+++ b/.gsoc/todo.txt
@@ -2,7 +2,4 @@ restore cache'ing in phpmyadmin.css.php
 make CSS for darkblue_orange
 check input escaping, $cfg is no longer safe to use
 
-preference:
-- synchronize language, theme ThemeDefault
-
-allow to import ThemeDefault
+local storage - autoload?
diff --git a/libraries/config.values.php b/libraries/config.values.php
index e0f4101e8..77ce1a671 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -130,5 +130,6 @@ $cfg_db['_validators'] = array(
     'Servers/1/port' => 'validate_port_number',
     'Servers/1/hide_db' => 'validate_regex',
     'TextareaCols' => 'validate_positive_number',
+    'TextareaRows' => 'validate_positive_number',
     'TrustedProxies' => 'validate_trusted_proxies');
 ?>
\ No newline at end of file
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index ef8592a9c..1234e01c7 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -528,7 +528,9 @@ class FormDisplay
                         break;
                     case 'array':
                         // eliminate empty values and ensure we have an array
-                        $post_values = explode("\n", $_POST[$key]);
+                        $post_values = is_array($_POST[$key])
+                            ? $_POST[$key]
+                            : explode("\n", $_POST[$key]);
                         $_POST[$key] = array();
                         foreach ($post_values as $v) {
                             $v = trim($v);

From 60285cd6650e055b999c05e23cdca101b829036d Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Wed, 14 Jul 2010 17:07:19 +0200
Subject: [PATCH 052/106] add missing string escapes don't create <a> tag if
 LeftLogoLink is empty

---
 libraries/header_scripts.inc.php    |  2 +-
 libraries/navigation_header.inc.php | 34 ++++++++++++++++-------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php
index cb366b5e7..e6b8f7385 100644
--- a/libraries/header_scripts.inc.php
+++ b/libraries/header_scripts.inc.php
@@ -82,7 +82,7 @@ foreach ($GLOBALS['js_include'] as $js_script_file) {
 // Updates the title of the frameset if possible (ns4 does not allow this)
 if (typeof(parent.document) != 'undefined' && typeof(parent.document) != 'unknown'
     && typeof(parent.document.title) == 'string') {
-    parent.document.title = '<?php echo PMA_sanitize(PMA_escapeJsString($title)); ?>';
+    parent.document.title = '<?php echo PMA_sanitize(PMA_escapeJsString(htmlspecialchars($title))); ?>';
 }
 
 <?php
diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php
index 969d86ad8..05c831462 100644
--- a/libraries/navigation_header.inc.php
+++ b/libraries/navigation_header.inc.php
@@ -30,22 +30,26 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) {
             .'alt="' . $logo . '" id="imgpmalogo" />';
     }
 
-    echo '<div id="pmalogo">' . "\n"
-        .'<a href="' . $GLOBALS['cfg']['LeftLogoLink'];
-    switch ($GLOBALS['cfg']['LeftLogoLinkWindow']) {
-        case 'new':
-            echo '" target="_blank"';
-            break;
-        case 'main':
-            // do not add our parameters for an external link
-            if (substr(strtolower($GLOBALS['cfg']['LeftLogoLink']), 0, 4) !== 'http') {
-                echo '?' . $query_url . '" target="frame_content"';
-            } else {
-                echo '"';
-            }
+    echo '<div id="pmalogo">' . "\n";
+    if ($GLOBALS['cfg']['LeftLogoLink']) {
+        echo '<a href="' . htmlspecialchars($GLOBALS['cfg']['LeftLogoLink']);
+        switch ($GLOBALS['cfg']['LeftLogoLinkWindow']) {
+            case 'new':
+                echo '" target="_blank"';
+                break;
+            case 'main':
+                // do not add our parameters for an external link
+                if (substr(strtolower($GLOBALS['cfg']['LeftLogoLink']), 0, 4) !== '://') {
+                    echo '?' . $query_url . '" target="frame_content"';
+                } else {
+                    echo '" target="_blank"';
+                }
+        }
+        echo '>' . $logo . '</a>' . "\n";
+    } else {
+        echo $logo . "\n";
     }
-    echo '>' . $logo . '</a>' . "\n"
-        .'</div>' . "\n";
+    echo '</div>' . "\n";
 } // end of display logo
 ?>
 <div id="leftframelinks">

From 7a5fd6281078b234c665e64cea968641c4aceec0 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Wed, 14 Jul 2010 21:28:24 +0200
Subject: [PATCH 053/106] allow users to easily work with preferences stored in
 session (when pmadb is disabled): after logging in, user is presented with a
 message asking whether settings from localStorage should be loaded

---
 js/config.js                            | 27 +++++++++++++++++++++
 libraries/footer.inc.php                |  8 +++++++
 libraries/header.inc.php                | 14 +++++++++++
 libraries/user_preferences.inc.php      |  9 -------
 libraries/user_preferences.lib.php      | 29 +++++++++++++++++++---
 prefs_manage.php                        | 32 +++++++++++++++++++++----
 themes/original/css/theme_right.css.php |  6 ++++-
 7 files changed, 107 insertions(+), 18 deletions(-)

diff --git a/js/config.js b/js/config.js
index 612425bf9..421a0aca3 100644
--- a/js/config.js
+++ b/js/config.js
@@ -631,6 +631,7 @@ $(function() {
 //
 
 $(function() {
+    offerPrefsAutoimport();
     var radios = $('#import_local_storage, #export_local_storage');
     if (!radios.length) {
         return;
@@ -747,6 +748,32 @@ function formatDate(d)
         + ':' + (d.getMinutes() < 10 ? '0'+d.getMinutes() : d.getMinutes());
 }
 
+/**
+ * Prepares message which informs that localStorage preferences are available and can be imported
+ */
+function offerPrefsAutoimport()
+{
+    var has_config = (window.localStorage || false) && (window.localStorage['config'] || false);
+    var cnt = $('#prefs_autoload');
+    if (!cnt.length || !has_config) {
+        return;
+    }
+    cnt.find('a').click(function(e) {
+        e.stopPropagation();
+        var a = $(this);
+        if (a.attr('href') == '#no') {
+            cnt.remove();
+            $.post('main.php', {
+                token: cnt.find('input[name=token]').val(),
+                prefs_autoload: 'hide'});
+            return;
+        }
+        cnt.find('input[name=json]').val(window.localStorage['config']);
+        cnt.find('form').submit();
+    });
+    cnt.show();
+}
+
 //
 // END: User preferences import/export
 // ------------------------------------------------------------------
\ No newline at end of file
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index 2a3cb28f2..a27fa37a8 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -119,7 +119,15 @@ if (window.parent.refreshNavigation) {
     window.parent.refreshNavigation();
 }
         <?php
+    } else if (isset($_GET['reload_left_frame']) && $_GET['reload_left_frame'] == '1') {
+        // reload left frame (used by user preferences)
+        ?>
+        if (window.parent && window.parent.frame_navigation) {
+            window.parent.frame_navigation.location.reload();
+        }
+        <?php
     }
+
     ?>
 // set current db, table and sql query in the querywindow
 if (window.parent.reload_querywindow) {
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 8273d5022..9101c0e33 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -22,6 +22,14 @@ if (empty($GLOBALS['is_header_sent'])) {
     require_once './libraries/ob.lib.php';
     PMA_outBufferPre();
 
+    // if database storage for user preferences is transient, offer to load
+    // exported settings from localStorage (detection will be done in JavaScript)
+    $userprefs_offer_import = $GLOBALS['PMA_Config']->get('user_preferences') == 'session'
+            && !isset($_SESSION['userprefs_autoload']);
+    if ($userprefs_offer_import) {
+        $GLOBALS['js_include'][] = 'config.js';
+    }
+
     // For re-usability, moved http-headers and stylesheets
     // to a seperate file. It can now be included by header.inc.php,
     // querywindow.php.
@@ -59,6 +67,12 @@ if (empty($GLOBALS['is_header_sent'])) {
         PMA_Message::notice(__('Cookies must be enabled past this point.'))->display();
     }
 
+    // offer to load user preferences from localStorage
+    if ($userprefs_offer_import) {
+        require_once './libraries/user_preferences.lib.php';
+        PMA_userprefs_autoload_header();
+    }
+
     if (!defined('PMA_DISPLAY_HEADING')) {
         define('PMA_DISPLAY_HEADING', 1);
     }
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 101f39199..da2b35e51 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -45,15 +45,6 @@ echo '</ul>';
 if (!empty($_GET['saved'])) {
     $message = PMA_Message::rawSuccess(__('Configuration has been saved'));
     $message->display();
-    if (isset($_GET['refresh_left_frame']) && $_GET['refresh_left_frame'] == '1') {
-?>
-<script type="text/javascript">
-if (window.parent && window.parent.frame_navigation) {
-    window.parent.frame_navigation.location.reload();
-}
-</script>
-<?php
-    }
 }
 
 $forms_all_keys = PMA_read_userprefs_fieldnames($forms);
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 2cd958eb9..cac374249 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -221,17 +221,40 @@ function PMA_userprefs_redirect(array $forms, array $old_settings, $file_name, $
     $check_keys = array_merge($check_keys, $forms['Left_frame']['Left_frame'],
          $forms['Left_frame']['Left_databases']);
     $diff = array_intersect($check_keys, $diff_keys);
-    $refresh_left_frame = !empty($diff)
-            || (isset($params['refresh_left_frame']) && $params['refresh_left_frame']);
+    $reload_left_frame = !empty($diff)
+            || (isset($params['reload_left_frame']) && $params['reload_left_frame']);
 
     // redirect
     $url_params = array(
         'saved' => 1,
-        'refresh_left_frame' => $refresh_left_frame);
+        'reload_left_frame' => $reload_left_frame);
     if (is_array($params)) {
         $url_params = array_merge($params, $url_params);
     }
     PMA_sendHeaderLocation($GLOBALS['cfg']['PmaAbsoluteUri'] . $file_name
             . PMA_generate_common_url($url_params, '&'));
 }
+
+function PMA_userprefs_autoload_header()
+{
+    if (isset($_REQUEST['prefs_autoload']) && $_REQUEST['prefs_autoload'] == 'hide') {
+        $_SESSION['userprefs_autoload'] = true;
+        exit;
+    }
+    $script_name = basename(basename($GLOBALS['PMA_PHP_SELF']));
+    $return_url = $script_name . '?' . http_build_query($_GET, '', '&');
+    ?>
+    <div id="prefs_autoload" class="notice" style="display:none">
+        <form action="prefs_manage.php" method="post">
+            <?php echo PMA_generate_common_hidden_inputs() . "\n"; ?>
+            <input type="hidden" name="json" value="" />
+            <input type="hidden" name="submit_import" value="1" />
+            <input type="hidden" name="return_url" value="<?php echo htmlspecialchars($return_url) ?>" />
+            <?php echo __('Your browser has phpMyAdmin configuration for this domain. Would you like to import it for current session?') ?>
+            <br />
+            <a href="#yes"><?php echo __('Yes') ?></a> / <a href="#no"><?php echo __('No') ?></a>
+        </form>
+    </div>
+    <?php
+}
 ?>
\ No newline at end of file
diff --git a/prefs_manage.php b/prefs_manage.php
index 5355b7f90..37b448b66 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -68,7 +68,12 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
         // read from POST value (json)
         $json = filter_input(INPUT_POST, 'json');
     }
+
+    // hide header message
+    $_SESSION['userprefs_autoload'] = true;
+
     $config = json_decode($json, true);
+    $return_url = filter_input(INPUT_POST, 'return_url');
     if (!is_array($config)) {
         $error = __('Could not import configuration');
     } else {
@@ -113,6 +118,9 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
                 <?php if (!empty($_POST['import_merge'])): ?>
                 <input type="hidden" name="import_merge" value="1" />
                 <?php endif; ?>
+                <?php if ($return_url): ?>
+                <input type="hidden" name="return_url" value="<?php echo htmlspecialchars($return_url) ?>" />
+                <?php endif; ?>
                 <p><?php echo __('Do you want to import remaining settings?') ?></p>
                 <input type="submit" name="submit_import" value="<?php echo __('Yes') ?>" />
                 <input type="submit" name="submit_ignore" value="<?php echo __('No') ?>" />
@@ -128,18 +136,32 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
                 && $_SESSION['PMA_Theme_Manager']->checkTheme($config['ThemeDefault'])) {
             $_SESSION['PMA_Theme_Manager']->setActiveTheme($config['ThemeDefault']);
             $_SESSION['PMA_Theme_Manager']->setThemeCookie();
-            $params['refresh_left_frame'] = true;
+            $params['reload_left_frame'] = true;
         }
         if (isset($config['fontsize'])) {
             $params['set_fontsize'] = $config['fontsize'];
-            $params['refresh_left_frame'] = true;
+            $params['reload_left_frame'] = true;
         }
 
         // save settings
         $old_settings = PMA_load_userprefs();
         $result = PMA_save_userprefs($cf->getConfigArray());
         if ($result === true) {
-            PMA_userprefs_redirect($forms, $old_settings, 'prefs_manage.php', $params);
+            if ($return_url) {
+                $query = explode('&', parse_url($return_url, PHP_URL_QUERY));
+                $return_url = parse_url($return_url, PHP_URL_PATH);
+                foreach ($query as $q) {
+                    $pos = strpos($q, '=');
+                    $k = substr($q, 0, $pos);
+                    if ($k == 'token') {
+                        continue;
+                    }
+                    $params[$k] = substr($q, $pos+1);
+                }
+            } else {
+                $return_url = 'prefs_manage.php';
+            }
+            PMA_userprefs_redirect($forms, $old_settings, $return_url, $params);
             exit;
         } else {
             $error = $result;
@@ -154,11 +176,11 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
             $GLOBALS['PMA_Config']->removeCookie($_SESSION['PMA_Theme_Manager']->getThemeCookieName());
             unset($_SESSION['PMA_Theme_Manager']);
             unset($_SESSION['PMA_Theme']);
-            $params['refresh_left_frame'] = true;
+            $params['reload_left_frame'] = true;
         }
         if ($GLOBALS['PMA_Config']->get('fontsize') != '82%') {
             $GLOBALS['PMA_Config']->removeCookie('pma_fontsize');
-            $params['refresh_left_frame'] = true;
+            $params['reload_left_frame'] = true;
         }
         PMA_userprefs_redirect($forms, $old_settings, 'prefs_manage.php', $params);
         exit;
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 329ea80d7..028dd57dc 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1441,4 +1441,8 @@ fieldset .group-field th {
 
 .prefsmanage_opts {
     margin-<?php echo $left; ?>: 2em;
-}
\ No newline at end of file
+}
+
+#prefs_autoload {
+    margin-bottom: 0.5em;
+}

From 995fcba961442a209a7b087c3e532aeb8f0720b3 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 16 Jul 2010 11:30:21 +0200
Subject: [PATCH 054/106] fix theme changing

---
 libraries/Config.class.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index c72054724..a73f87c82 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -459,7 +459,7 @@ class PMA_Config
         $this->set('user_preferences', $_SESSION['cache'][$cache_key]['userprefs_type']);
 
         // backup some settings
-        $fontsize = $this->get('fontsize');
+        $org_fontsize = $this->settings['fontsize'];
         // load config array
         $this->settings = PMA_array_merge_recursive($this->settings, $config_data);
         $GLOBALS['cfg'] = PMA_array_merge_recursive($GLOBALS['cfg'], $config_data);
@@ -475,7 +475,9 @@ class PMA_Config
         // load/save theme
         // theme cookie exists only if we are using non-default theme
         $tmanager = $_SESSION['PMA_Theme_Manager'];
-        if ($tmanager->getThemeCookie()) {
+
+        // save new theme
+        if ($tmanager->getThemeCookie() || isset($_REQUEST['set_theme'])) {
             if (!isset($config_data['ThemeDefault'])
                     || $config_data['ThemeDefault'] != $tmanager->theme->getId()) {
                 // new theme was set in common.inc.php
@@ -483,7 +485,7 @@ class PMA_Config
             }
         } else {
             // no cookie - read default from settings
-            if ($this->settings['ThemeDefault'] != $tmanager->theme
+            if ($this->settings['ThemeDefault'] != $tmanager->theme->getId()
                     && $tmanager->checkTheme($this->settings['ThemeDefault'])) {
                 $tmanager->setActiveTheme($this->settings['ThemeDefault']);
                 $tmanager->setThemeCookie();
@@ -491,8 +493,8 @@ class PMA_Config
         }
 
         // save new font size
-        if (!isset($config_data['fontsize']) || $fontsize != $config_data['fontsize']) {
-            $this->setUserValue('pma_fontsize', 'fontsize', $fontsize, '82%');
+        if (!isset($config_data['fontsize']) || $org_fontsize != $config_data['fontsize']) {
+            $this->setUserValue('pma_fontsize', 'fontsize', $org_fontsize, '82%');
         }
     }
 

From 0b30a339fa24a2f03db8f9f4149f01019f74ce82 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 16 Jul 2010 11:30:51 +0200
Subject: [PATCH 055/106] css for Darkblue/orange

---
 .gsoc/todo.txt                                |   4 -
 .../darkblue_orange/css/theme_right.css.php   | 254 ++++++++++++++++--
 2 files changed, 236 insertions(+), 22 deletions(-)

diff --git a/.gsoc/todo.txt b/.gsoc/todo.txt
index 625cf1862..4dd9492f8 100644
--- a/.gsoc/todo.txt
+++ b/.gsoc/todo.txt
@@ -1,5 +1 @@
 restore cache'ing in phpmyadmin.css.php
-make CSS for darkblue_orange
-check input escaping, $cfg is no longer safe to use
-
-local storage - autoload?
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index c4b8cda00..446f3c0a1 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -607,55 +607,62 @@ form.login label {
 /* specific elements */
 
 /* topmenu */
-ul#topmenu {
+ul#topmenu, ul#topmenu2, ul.tabs {
     font-weight:        bold;
     list-style-type:    none;
     margin:             0;
     padding:            0;
 }
 
-ul#topmenu li {
+ul#topmenu li, ul#topmenu2 li {
     float:              <?php echo $left; ?>;
     margin:             0;
     padding:            0;
     vertical-align:     middle;
 }
 
-#topmenu img {
+#topmenu img, #topmenu2 img {
     vertical-align:     middle;
     margin-<?php echo $right; ?>:       0.1em;
 }
 
 /* default tab styles */
-.tab, .tabcaution, .tabactive {
+ul#topmenu .tab, ul#topmenu .tabcaution, ul#topmenu .tabactive {
     display:            block;
     margin:             0.2em 0.2em 0 0.2em;
     padding:            0.2em 0.2em 0 0.2em;
     white-space:        nowrap;
 }
 
+ul#topmenu2 .tab, ul#topmenu2 .tabactive {
+    display:            block;
+    margin:             0.1em;
+    padding:            0.2em;
+    white-space:        nowrap;
+}
+
 /* disabled tabs */
-span.tab {
+ul#topmenu span.tab {
     color:              #666666;
 }
 
 /* disabled drop/empty tabs */
-span.tabcaution {
+ul#topmenu span.tabcaution {
     color:              #ff6666;
 }
 
 /* enabled drop/empty tabs */
-a.tabcaution {
+ul#topmenu a.tabcaution {
     color:              #FF0000;
 }
-a.tabcaution:hover {
+ul#topmenu a.tabcaution:hover {
     color: #FFFFFF;
     background-color:   #FF0000;
 }
 
 <?php if ($GLOBALS['cfg']['LightTabs']) { ?>
 /* active tab */
-a.tabactive {
+ul#topmenu a.tabactive, ul#topmenu2 a.tabactive {
     color:              black;
 }
 <?php } else { ?>
@@ -664,12 +671,18 @@ a.tabactive {
     padding:            0.1em 0.3em 0.1em 0.3em;
 }
 
+ul#topmenu2 {
+    margin: 0.25em 0.5em 0;
+    height: 2em;
+    clear: both;
+}
+
 ul#topmenu li {
     border-bottom:      1pt solid black;
 }
 
 /* default tab styles */
-.tab, .tabcaution, .tabactive {
+ul#topmenu .tab, ul#topmenu .tabcaution, ul#topmenu .tabactive {
     background-color:   <?php echo $GLOBALS['cfg']['BgOne']; ?>;
     border:             1pt solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
     border-bottom:      0;
@@ -678,29 +691,37 @@ ul#topmenu li {
 }
 
 /* enabled hover/active tabs */
-a.tab:hover,
-a.tabcaution:hover,
-.tabactive,
-.tabactive:hover {
+ul#topmenu a.tab:hover,
+ul#topmenu a.tabcaution:hover,
+ul#topmenu .tabactive,
+ul#topmenu .tabactive:hover {
     margin:             0;
     padding:            0.2em 0.4em 0.2em 0.4em;
     text-decoration:    none;
 }
 
-a.tab:hover,
-.tabactive {
+ul#topmenu a.tab:hover,
+ul#topmenu .tabactive {
     background-color:   <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
 }
 
+ul#topmenu2 a.tab:hover,
+ul#topmenu2 a.tabactive {
+    background-color:   <?php echo $GLOBALS['cfg']['BgOne']; ?>;
+    -moz-border-radius: 0.3em;
+    border-radius:      0.3em;
+    text-decoration:    none;
+}
+
 /* to be able to cancel the bottom border, use <li class="active"> */
 ul#topmenu li.active {
      border-bottom:      1pt solid <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
 }
 
 /* disabled drop/empty tabs */
-span.tab,
+ul#topmenu span.tab,
 a.warning,
-span.tabcaution {
+ul#topmenu span.tabcaution {
     cursor:             url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>error.ico), default;
 }
 <?php } ?>
@@ -1118,6 +1139,10 @@ li#li_switch_dbstats {
 li#li_flush_privileges {
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_reload.png);
 }
+
+li#li_user_preferences {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_tblops.png);
+}
 /* END iconic view for ul items */
 <?php } /* end if $GLOBALS['cfg']['MainPageIconic'] */ ?>
 
@@ -1238,6 +1263,12 @@ code.sql {
     margin-top:         0;
 }
 
+.group-cnt {
+    padding: 0 0 0 0.5em;
+    display: inline-block;
+    width: 98%;
+}
+
 /* for elements that should be revealed only via js */
 .hide {
     display:            none;
@@ -1296,3 +1327,190 @@ table#serverconnection_trg_local  {
   */
 .invalid_value
 {background:#F00;}
+
+/* config forms */
+.config-form ul.tabs {
+    margin:      1.1em 0.2em 0;
+    padding:     0 0 0.3em 0;
+    list-style:  none;
+    font-weight: bold;
+}
+
+.config-form ul.tabs li {
+    float: <?php echo $left; ?>;
+}
+
+.config-form ul.tabs li a {
+    display:          block;
+    margin:           0.1em 0.2em 0;
+    padding:          0.1em 0.4em;
+    white-space:      nowrap;
+    text-decoration:  none;
+    border:           1px solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+    border-bottom:    none;
+}
+
+.config-form ul.tabs li a:hover,
+.config-form ul.tabs li a:active,
+.config-form ul.tabs li a.active {
+    margin:           0;
+    padding:          0.1em 0.6em 0.2em;
+}
+
+.config-form ul.tabs li a.active {
+    background-color: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
+}
+
+.config-form fieldset {
+    margin-top:   0;
+    padding:      0;
+    clear:        both;
+    /*border-color: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;*/
+}
+
+.config-form legend {
+    display: none;
+}
+
+.config-form fieldset p {
+    margin:  0;
+    padding: 0.5em;
+}
+
+.config-form fieldset .errors { /* form error list */
+    margin:       0 -2px 1em -2px;
+    padding:      0.5em 1.5em;
+    background:   #FBEAD9;
+    border:       0 #C83838 solid;
+    border-width: 1px 0;
+    list-style:   none;
+    font-family:  sans-serif;
+    font-size:    small;
+}
+
+.config-form fieldset .inline_errors { /* field error list */
+    margin:     0.3em 0.3em 0.3em 0;
+    padding:    0;
+    list-style: none;
+    color:      #9A0000;
+	font-size:  small;
+}
+
+.config-form fieldset th {
+    padding:        0.3em 0.3em 0.3em 0.5em;
+    text-align:     left;
+    vertical-align: top;
+    width:          40%;
+    background:     transparent;
+}
+
+.config-form fieldset .doc, .config-form fieldset .disabled-notice {
+    margin-left: 1em;
+}
+
+.config-form fieldset .disabled-notice {
+    font-size: 80%;
+    text-transform: uppercase;
+    color: #E00;
+    cursor: help;
+}
+
+.config-form fieldset td {
+    padding-top:    0.3em;
+    padding-bottom: 0.3em;
+    vertical-align: top;
+}
+
+.config-form fieldset th small {
+    display:     block;
+    font-weight: normal;
+    font-family: sans-serif;
+    font-size:   x-small;
+    color:       #444;
+}
+
+.config-form fieldset th, .config-form fieldset td {
+    border-top: 1px <?php echo $GLOBALS['cfg']['BgTwo']; ?> solid;
+}
+
+fieldset .group-header th {
+    background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+}
+
+fieldset .group-header + tr th {
+    padding-top: 0.6em;
+}
+
+fieldset .group-field th {
+    padding-left: 1.5em;
+}
+
+.config-form .lastrow {
+    border-top: 1px #000 solid;
+}
+
+.config-form .lastrow {
+    background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;;
+    padding:    0.5em;
+    text-align: center;
+}
+
+.config-form .lastrow input {
+    font-weight: bold;
+}
+
+/* form elements */
+
+.config-form span.checkbox {
+    padding: 2px;
+    display: inline-block;
+}
+
+.config-form .custom { /* customized field */
+    background: #FFC;
+}
+
+.config-form span.checkbox.custom {
+    padding:    1px;
+    border:     1px #EDEC90 solid;
+    background: #FFC;
+}
+
+.config-form .field-error {
+    border-color: #A11 !important;
+}
+
+.config-form input[type="text"],
+.config-form select,
+.config-form textarea {
+    border: 1px #A7A6AA solid;
+    height: auto;
+}
+
+.config-form input[type="text"]:focus,
+.config-form select:focus,
+.config-form textarea:focus {
+    border:     1px #6676FF solid;
+    background: #F7FBFF;
+}
+
+/* error list */
+.config-form dd {
+    margin-left: 0.5em;
+}
+
+.config-form dd:before {
+    content: "\25B8  ";
+}
+
+.click-hide-message {
+    cursor: pointer;
+}
+
+.prefsmanage_opts {
+    margin-<?php echo $left; ?>: 2em;
+}
+
+#prefs_autoload {
+    margin-bottom: 0.5em;
+}

From c5bef4d2dafb5535a83c9aad4dad7cc933a3e7dc Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 16 Jul 2010 20:28:11 +0200
Subject: [PATCH 056/106] fix "restore default" button, should be visible only
 when field has custom value added missing validations for setup script added
 two field descriptions added SkipLockedTables to user preferences

---
 js/config.js                                | 10 +++++-----
 libraries/config.values.php                 |  6 +++++-
 libraries/config/messages.inc.php           |  2 ++
 libraries/config/setup.forms.php            |  1 -
 libraries/config/user_preferences.forms.php |  3 ++-
 libraries/user_preferences.inc.php          |  2 +-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/js/config.js b/js/config.js
index 421a0aca3..69a2e61ce 100644
--- a/js/config.js
+++ b/js/config.js
@@ -437,8 +437,8 @@ function markField(field) {
  * @param {boolean} display
  */
 function setRestoreDefaultBtn(field, display) {
-    var el = $(field).closest('td').find('.restore-default');
-    el.css('display', (el.css('display') ? '' : 'none'));
+    var el = $(field).closest('td').find('.restore-default img');
+    el[display ? 'show' : 'hide']();
 }
 
 $(function() {
@@ -596,10 +596,10 @@ $(function() {
     $('.restore-default, .set-value').each(function() {
         var link = $(this);
         // inline-block for IE so opacity inheritance works
-        link.css('display', 'inline-block').css('opacity', 0.25);
-        if (!link.hasClass('restore-default')) {
+        link.css({display: 'inline-block', opacity: 0.25});
+        if (link.hasClass('restore-default')) {
             // restore-default is handled by markField
-        	link.css('display', '');
+        	link.find('img').hide();
         }
         link.bind({
             mouseenter: function() {$(this).css('opacity', 1);},
diff --git a/libraries/config.values.php b/libraries/config.values.php
index 77ce1a671..24977fd72 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -97,7 +97,7 @@ $cfg_db['_overrides']['Servers/1/extension'] = extension_loaded('mysqli')
     ? 'mysqli' : 'mysql';
 
 /**
- * Validator assignments (functions from libraries/config/validate.lib.php and 'validators'
+ * Basic validator assignments (functions from libraries/config/validate.lib.php and 'validators'
  * object in js/config.js)
  * Use only full paths and form ids
  */
@@ -105,6 +105,7 @@ $cfg_db['_validators'] = array(
     'CharTextareaCols' => 'validate_positive_number',
     'CharTextareaRows' => 'validate_positive_number',
     'DefaultPropDisplay' => 'validate_DefaultPropDisplay',
+    'ExecTimeLimit' => 'validate_non_negative_number',
     'Export/sql_max_query_size' => 'validate_positive_number',
     'ForeignKeyMaxLimit' => 'validate_positive_number',
     'Import/csv_enclosed' => 'validate_str01',
@@ -119,8 +120,11 @@ $cfg_db['_validators'] = array(
     'LimitChars' => 'validate_positive_number',
     'LoginCookieValidity' => 'validate_positive_number',
     'LoginCookieStore' => 'validate_non_negative_number',
+    'MaxDbList' => 'validate_positive_number',
     'MaxCharactersInDisplayedSQL' => 'validate_positive_number',
     'MaxRows' => 'validate_positive_number',
+    'MaxTableList' => 'validate_positive_number',
+    'MemoryLimit' => 'validate_non_negative_number',
     'QueryHistoryMax' => 'validate_positive_number',
     'QueryWindowWidth' => 'validate_positive_number',
     'QueryWindowHeight' => 'validate_positive_number',
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 33a63313c..91efa5130 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -267,6 +267,7 @@ $strConfigLeftFrameLight_name = __('Use light version');
 $strConfigLeftFrameTableLevel_name = __('Maximum table tree depth');
 $strConfigLeftFrameTableSeparator_desc = __('String that separates tables into different tree levels');
 $strConfigLeftFrameTableSeparator_name = __('Table tree separator');
+$strConfigLeftLogoLink_desc = __('URL where logo in the navigation frame will point to');
 $strConfigLeftLogoLink_name = __('Logo link URL');
 $strConfigLeftLogoLinkWindow_desc = __('Open the linked page in the main window ([kbd]main[/kbd]) or in a new one ([kbd]new[/kbd])');
 $strConfigLeftLogoLinkWindow_name = __('Logo link target');
@@ -449,6 +450,7 @@ $strConfigSuggestDBName_desc = __('Suggest a database name on the &quot;Create D
 $strConfigSuggestDBName_name = __('Suggest new database name');
 $strConfigTextareaCols_desc = __('Textarea size (columns) in edit mode, this value will be emphasized for SQL query textareas (*2) and for query window (*1.25)');
 $strConfigTextareaCols_name = __('Textarea columns');
+$strConfigTextareaRows_desc = __('Textarea size (rows) in edit mode, this value will be emphasized for SQL query textareas (*2) and for query window (*1.25)');
 $strConfigTextareaRows_name = __('Textarea rows');
 $strConfigTitleDatabase_desc = __('Title of browser window when a database is selected');
 $strConfigTitleDatabase_name = __('Database');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index a8674d9f0..ca0f5b649 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -106,7 +106,6 @@ $forms['Features']['Other_core_settings'] = array(
     'ReplaceHelpImg',
     'MaxDbList',
     'MaxTableList',
-    'MaxCharactersInDisplayedSQL',
     'OBGzip',
     'PersistentConnections',
     'ExecTimeLimit',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 69505b5ef..567f9103d 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -17,7 +17,8 @@ $forms['Features']['General'] = array(
     'NaturalOrder',
     'InitialSlidersState',
     'ErrorIconic',
-    'ReplaceHelpImg');
+    'ReplaceHelpImg',
+    'SkipLockedTables');
 $forms['Features']['Text_fields'] = array(
     'CharEditing',
     'CharTextareaCols',
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index da2b35e51..2854de918 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -69,7 +69,7 @@ $msg->display();
 // warn about using session storage for settings
 $cfgRelation = PMA_getRelationsParam();
 if (!$cfgRelation['userconfigwork']) {
-    $msg = __('Your preferences will be saved only for current session. Storing them permanently requires %spmadb%s.');
+    $msg = __('Your preferences will be saved for current session only. Storing them permanently requires %spmadb%s.');
     $msg = PMA_sanitize(sprintf($msg, '[a@http://wiki.phpmyadmin.net/pma/pmadb@_blank]', '[/a]'));
     PMA_Message::notice($msg)->display();
 }

From afca401bc8677482585b6eca60e7ceda0804c68b Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 17 Jul 2010 11:39:30 +0200
Subject: [PATCH 057/106] parametrized validators valdiation by regular
 expressions shorter text fields for numeric inputs

---
 js/config.js                           | 45 ++++++++----------------
 libraries/config.values.php            | 37 +++++++++++++++-----
 libraries/config/FormDisplay.class.php | 22 +++++++-----
 libraries/config/FormDisplay.tpl.php   | 34 ++++++++++++++----
 libraries/config/setup.forms.php       |  2 +-
 libraries/config/validate.lib.php      | 48 +++++++++++---------------
 setup/validate.php                     |  2 +-
 7 files changed, 107 insertions(+), 83 deletions(-)

diff --git a/js/config.js b/js/config.js
index 69a2e61ce..a5f94fa1b 100644
--- a/js/config.js
+++ b/js/config.js
@@ -169,7 +169,9 @@ var validate = {};
 // form validator list
 var validators = {
     // regexp: numeric value
-    _regexp_numeric: new RegExp('^[0-9]+$'),
+    _regexp_numeric: /^[0-9]+$/,
+    // regexp: extract parts from PCRE expression
+    _regexp_pcre_extract: /(.)(.*)\1(.*)?/,
     /**
      * Validates positive number
      *
@@ -210,41 +212,20 @@ var validators = {
         return result;
     },
     /**
-     * DefaultPropDisplay validator
+     * Validates value according to given regular expression
      *
      * @param {boolean} isKeyUp
+     * @param {string}  regexp
      */
-    validate_DefaultPropDisplay: function(isKeyUp) {
+    validate_by_regex: function(isKeyUp, regexp) {
         if (isKeyUp && this.value == '') {
             return true;
         }
-        var valid = this.value.match(/^(?:horizontal|vertical|[0-9]+)$/) != null;
+        // convert PCRE regexp
+        var parts = regexp.match(validators._regexp_pcre_extract);
+        var valid = this.value.match(new RegExp(parts[2], parts[3])) != null;
         return valid ? true : PMA_messages['error_invalid_value']
     },
-    /**
-     * Validates string length - must be 1 character long
-     *
-     * @param {boolean} isKeyUp
-     */
-    validate_str1: function (isKeyUp) {
-        if (isKeyUp && this.value == '') {
-            return true;
-        }
-        var result = this.value.length == 1;
-        return result ? true : PMA_messages['error_invalid_value'];
-    },
-    /**
-     * Validates string length - must be 0 or 1 character long
-     *
-     * @param {boolean} isKeyUp
-     */
-    validate_str01: function (isKeyUp) {
-        if (isKeyUp && this.value == '') {
-            return true;
-        }
-        var result = this.value.length <= 1;
-        return result ? true : PMA_messages['error_invalid_value'];
-    },
     // field validators
     _field: {
     },
@@ -259,7 +240,7 @@ var validators = {
  * @param {String}  id       field id
  * @param {String}  type     validator (key in validators object)
  * @param {boolean} onKeyUp  whether fire on key up
- * @param {object}  params   validation function parameters
+ * @param {Array}   params   validation function parameters
  */
 function validateField(id, type, onKeyUp, params) {
     if (typeof validators[type] == 'undefined') {
@@ -390,7 +371,11 @@ function validate_field(field, isKeyUp, errors) {
     errors[field_id] = [];
     var functions = getFieldValidators(field_id, isKeyUp);
     for (var i = 0; i < functions.length; i++) {
-        var result = functions[i][0].apply(field[0], [isKeyUp, functions[i][1]]);
+        var args = functions[i][1] != null
+            ? functions[i][1].slice(0)
+            : [];
+        args.unshift(isKeyUp);
+        var result = functions[i][0].apply(field[0], args);
         if (result !== true) {
             if (typeof result == 'string') {
             	result = [result];
diff --git a/libraries/config.values.php b/libraries/config.values.php
index 24977fd72..0fde51250 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -27,6 +27,7 @@ $cfg_db['Servers'] = array(1 => array(
 $cfg_db['RecodingEngine'] = array('auto', 'iconv', 'recode');
 $cfg_db['DefaultCharset'] = $GLOBALS['cfg']['AvailableCharsets'];
 $cfg_db['OBGzip'] = array('auto', true, false);
+$cfg_db['MemoryLimit'] = 'short_string';
 $cfg_db['ShowTooltipAliasTB'] = array('nested', true, false);
 $cfg_db['DisplayDatabasesList'] = array('auto', true, false);
 $cfg_db['LeftLogoLinkWindow'] = array('main', 'new');
@@ -36,6 +37,8 @@ $cfg_db['LeftDefaultTabTable'] = array(
     'tbl_select.php',    // search page
     'tbl_change.php',    // insert row page
     'sql.php');          // browse page
+$cfg_db['LeftFrameDBSeparator'] = 'short_string';
+$cfg_db['LeftFrameTableSeparator'] = 'short_string';
 $cfg_db['NavigationBarIconic'] = array(true, false, 'both');
 $cfg_db['Order'] = array('ASC', 'DESC', 'SMART');
 $cfg_db['ProtectBinary'] = array(false, 'blob', 'all');
@@ -77,6 +80,12 @@ $cfg_db['Import']['sql_compatibility'] = $cfg_db['Export']['sql_compatibility']
     // can't be read by POSTGRESQL (see our bug #1596328)
     //'POSTGRESQL',
     'TRADITIONAL');
+$cfg_db['Import']['csv_terminated'] = 'short_string';
+$cfg_db['Import']['csv_enclosed'] = 'short_string';
+$cfg_db['Import']['csv_escaped'] = 'short_string';
+$cfg_db['Import']['ldi_terminated'] = 'short_string';
+$cfg_db['Import']['ldi_enclosed'] = 'short_string';
+$cfg_db['Import']['ldi_escaped'] = 'short_string';
 $cfg_db['Import']['ldi_local_option'] = array('auto', true, false);
 $cfg_db['Export']['format'] = array('codegen', 'csv', 'excel', 'htmlexcel',
     'htmlword', 'latex', 'ods', 'odt', 'pdf', 'sql', 'texytext', 'xls', 'xml',
@@ -84,9 +93,21 @@ $cfg_db['Export']['format'] = array('codegen', 'csv', 'excel', 'htmlexcel',
 $cfg_db['Export']['compression'] = array('none', 'zip', 'gzip', 'bzip2');
 $cfg_db['Export']['charset'] = array_merge(array(''), $GLOBALS['cfg']['AvailableCharsets']);
 $cfg_db['Export']['codegen_format'] = array('#', 'NHibernate C# DO', 'NHibernate XML');
+$cfg_db['Export']['csv_separator'] = 'short_string';
+$cfg_db['Export']['csv_terminated'] = 'short_string';
+$cfg_db['Export']['csv_enclosed'] = 'short_string';
+$cfg_db['Export']['csv_escaped'] = 'short_string';
+$cfg_db['Export']['csv_null'] = 'short_string';
+$cfg_db['Export']['excel_null'] = 'short_string';
 $cfg_db['Export']['excel_edition'] = array('win' => 'Windows',
     'mac_excel2003' => 'Excel 2003 / Macintosh', 'mac_excel2008' => 'Excel 2008 / Macintosh');
 $cfg_db['Export']['sql_type'] = array('INSERT', 'UPDATE', 'REPLACE');
+$cfg_db['Export']['xls_null'] = 'short_string';
+$cfg_db['Export']['xlsx_null'] = 'short_string';
+$cfg_db['Export']['htmlword_null'] = 'short_string';
+$cfg_db['Export']['ods_null'] = 'short_string';
+$cfg_db['Export']['odt_null'] = 'short_string';
+$cfg_db['Export']['texytext_null'] = 'short_string';
 
 /**
  * Default values overrides
@@ -104,16 +125,16 @@ $cfg_db['_overrides']['Servers/1/extension'] = extension_loaded('mysqli')
 $cfg_db['_validators'] = array(
     'CharTextareaCols' => 'validate_positive_number',
     'CharTextareaRows' => 'validate_positive_number',
-    'DefaultPropDisplay' => 'validate_DefaultPropDisplay',
+    'DefaultPropDisplay' => array('validate_by_regex', '/^(?:horizontal|vertical|\d+)$/'),
     'ExecTimeLimit' => 'validate_non_negative_number',
     'Export/sql_max_query_size' => 'validate_positive_number',
     'ForeignKeyMaxLimit' => 'validate_positive_number',
-    'Import/csv_enclosed' => 'validate_str01',
-    'Import/csv_escaped' => 'validate_str1',
-    'Import/csv_terminated' => 'validate_str1',
-    'Import/ldi_enclosed' => 'validate_str01',
-    'Import/ldi_escaped' => 'validate_str1',
-    'Import/ldi_terminated' => 'validate_str1',
+    'Import/csv_enclosed' => array('validate_by_regex', '/^.?$/'),
+    'Import/csv_escaped' => array('validate_by_regex', '/^.$/'),
+    'Import/csv_terminated' => array('validate_by_regex', '/^.$/'),
+    'Import/ldi_enclosed' => array('validate_by_regex', '/^.?$/'),
+    'Import/ldi_escaped' => array('validate_by_regex', '/^.$/'),
+    'Import/ldi_terminated' => array('validate_by_regex', '/^.$/'),
     'Import/skip_queries' => 'validate_non_negative_number',
     'InsertRows' => 'validate_positive_number',
     'LeftFrameTableLevel' => 'validate_positive_number',
@@ -124,7 +145,7 @@ $cfg_db['_validators'] = array(
     'MaxCharactersInDisplayedSQL' => 'validate_positive_number',
     'MaxRows' => 'validate_positive_number',
     'MaxTableList' => 'validate_positive_number',
-    'MemoryLimit' => 'validate_non_negative_number',
+    'MemoryLimit' => array('validate_by_regex', '/^\d+(?:[kmg])?$/i'),
     'QueryHistoryMax' => 'validate_positive_number',
     'QueryWindowWidth' => 'validate_positive_number',
     'QueryWindowHeight' => 'validate_positive_number',
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 1234e01c7..350dec1db 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -151,7 +151,7 @@ class FormDisplay
         }
 
         // run validation
-        $errors = validate($paths, $values, false);
+        $errors = PMA_config_validate($paths, $values, false);
 
         // change error keys from canonical paths to work paths
         if (is_array($errors) && count($errors) > 0) {
@@ -259,10 +259,10 @@ class FormDisplay
             foreach ($this->js_lang_strings as $strName => $strValue) {
                 $js_lang[] = "'$strName': '" . PMA_jsFormat($strValue, false) . '\'';
             }
-            $js[] = '$.extend(PMA_messages, {' . implode(",\n\t", $js_lang) . '})';
+            $js[] = "$.extend(PMA_messages, {\n\t" . implode(",\n\t", $js_lang) . '})';
         }
 
-        $js[] = '$.extend(defaultValues, {' . implode(",\n\t", $js_default) . '})';
+        $js[] = "$.extend(defaultValues, {\n\t" . implode(",\n\t", $js_default) . '})';
         display_js($js);
     }
 
@@ -309,11 +309,12 @@ class FormDisplay
             case 'string':
                 $type = 'text';
                 break;
-            case 'double':
-                $type = 'text';
+            case 'short_string':
+                $type = 'short_text';
                 break;
+            case 'double':
             case 'integer':
-                $type = 'text';
+                $type = 'number_text';
                 break;
             case 'boolean':
                 $type = 'checkbox';
@@ -353,6 +354,8 @@ class FormDisplay
         $js_line = '\'' . $translated_path . '\': ';
         switch ($type) {
             case 'text':
+            case 'short_text':
+            case 'number_text':
                 $js_line .= '\'' . PMA_escapeJsString($value_default) . '\'';
                 break;
             case 'checkbox':
@@ -474,16 +477,17 @@ class FormDisplay
             foreach ($form->fields as $field => $system_path) {
                 $work_path = array_search($system_path, $this->system_paths);
                 $key = $this->translated_paths[$work_path];
+                $type = $form->getOptionType($field);
 
                 // skip groups
-                if ($form->getOptionType($field) == 'group') {
+                if ($type == 'group') {
                     continue;
                 }
 
                 // ensure the value is set
                 if (!isset($_POST[$key])) {
                     // checkboxes aren't set by browsers if they're off
-                    if ($form->getOptionType($field) == 'boolean') {
+                    if ($type == 'boolean') {
                         $_POST[$key] = false;
                     } else {
                         $this->errors[$form->name][] = sprintf(
@@ -505,7 +509,6 @@ class FormDisplay
                 }
 
                 // cast variables to correct type
-                $type = $form->getOptionType($field);
                 switch ($type) {
                     case 'double':
                         settype($_POST[$key], 'float');
@@ -524,6 +527,7 @@ class FormDisplay
                         }
                         break;
                     case 'string':
+                    case 'short_string':
                         $_POST[$key] = trim($_POST[$key]);
                         break;
                     case 'array':
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index b8188201c..e05a583a5 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -43,7 +43,8 @@ function display_form_top($action = null, $method = 'post', $hidden_fields = nul
  *
  * @param array $tabs
  */
-function display_tabs_top($tabs) {
+function display_tabs_top($tabs)
+{
 ?>
 <ul class="tabs">
 <?php foreach ($tabs as $tab_id => $tab_name): ?>
@@ -163,7 +164,15 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
     <?php
     switch ($type) {
         case 'text':
-            echo '<input type="text" size="50" ' . $name_id . $field_class
+            echo '<input type="text" size="60" ' . $name_id . $field_class
+                . ' value="' . htmlspecialchars($value) . '" />';
+          break;
+        case 'short_text':
+            echo '<input type="text" size="25" ' . $name_id . $field_class
+                . ' value="' . htmlspecialchars($value) . '" />';
+          break;
+        case 'number_text':
+            echo '<input type="text" size="15" ' . $name_id . $field_class
                 . ' value="' . htmlspecialchars($value) . '" />';
           break;
         case 'checkbox':
@@ -318,7 +327,8 @@ function display_fieldset_bottom_simple()
 /**
  * Closes form tabs
  */
-function display_tabs_bottom() {
+function display_tabs_bottom()
+{
     echo "</div>\n";
 }
 
@@ -337,8 +347,16 @@ function display_form_bottom()
  * @param string $validator
  * @param array  $js_array
  */
-function js_validate($field_id, $validator, &$js_array) {
-    $js_array[] = "validateField('$field_id', '$validator', true)";
+function js_validate($field_id, $validator, &$js_array)
+{
+    $validator = (array)$validator;
+    $v_name = array_shift($validator);
+    $v_args = array();
+    foreach ($validator as $arg) {
+        $v_args[] = PMA_escapeJsString($arg);
+    }
+    $v_args = $v_args ? ", ['" . implode("', '", $v_args) . "']" : '';
+    $js_array[] = "validateField('$field_id', '$v_name', true$v_args)";
 }
 
 /**
@@ -346,7 +364,8 @@ function js_validate($field_id, $validator, &$js_array) {
  *
  * @param array $js_array
  */
-function display_js($js_array) {
+function display_js($js_array)
+{
     if (empty($js_array)) {
         return;
     }
@@ -363,7 +382,8 @@ function display_js($js_array) {
  * @param string $name
  * @param array  $error_list
  */
-function display_errors($name, $error_list) {
+function display_errors($name, $error_list)
+{
     echo '<dl>';
     echo '<dt>' . htmlspecialchars($name) . '</dt>';
     foreach ($error_list as $error) {
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index ca0f5b649..dd93bc6aa 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -30,7 +30,7 @@ $forms['Servers']['Server'] = array('Servers' => array(1 => array(
     'connect_type',
     'extension',
     'compress',
-    'auth_type',
+    'auth_type' => ':group',
     'auth_http_realm',
     'user',
     'password',
diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index 54a0c6d94..92b05ead6 100644
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -29,7 +29,7 @@
  * @param bool          $isPostSource  tells whether $values are directly from POST request
  * @return bool|array
  */
-function validate($validator_id, &$values, $isPostSource)
+function PMA_config_validate($validator_id, &$values, $isPostSource)
 {
     // find validators
     $cf = ConfigFile::getInstance();
@@ -59,7 +59,12 @@ function validate($validator_id, &$values, $isPostSource)
     // validate
     $result = array();
     foreach ($vids as $vid) {
-        $r = call_user_func($validators[$vid], $vid, $arguments);
+        // call appropriate validation function
+        $vdef = (array) $validators[$vid];
+        $vname = array_shift($vdef);
+        $args = array_merge(array($vid, &$arguments), $vdef);
+        $r = call_user_func_array($vname, $args);
+
         // merge results
         if (is_array($r)) {
             foreach ($r as $key => $error_list) {
@@ -299,7 +304,6 @@ function validate_trusted_proxies($path, $values)
     return $result;
 }
 
-
 /**
  * Tests integer value
  *
@@ -361,41 +365,31 @@ function validate_non_negative_number($path, $values)
 }
 
 /**
- * Validates DefaultPropDisplay field
+ * Validates value according to given regular expression
+ * Pattern and modifiers must be a valid for PCRE <b>and</b> JavaScript RegExp
  *
  * @param string $path
- * @param array $values
- * @return array
+ * @param array  $values
+ * @param string $regex
+ * @return void
  */
-function validate_DefaultPropDisplay($path, $values)
+function validate_by_regex($path, $values, $regex)
 {
-    $result = preg_match('/^(?:horizontal|vertical|\d+)$/',  $values[$path]);
+    $result = preg_match($regex, $values[$path]);
     return array($path => ($result ? '' : __('Incorrect value')));
 }
 
 /**
- * Validates string length - must be 1 character long
- *
+ * Validates upper bound for numeric inputs
+ * 
  * @param string $path
- * @param array $values
+ * @param array  $values
+ * @param int    $max_value
  * @return array
  */
-function validate_str1($path, $values)
+function validate_upper_bound($path, $values, $max_value)
 {
-    $result = strlen($values[$path]) == 1;
-    return array($path => ($result ? '' : __('Incorrect value')));
-}
-
-/**
- * Validates string length - must be 0 or 1 character long
- *
- * @param string $path
- * @param array $values
- * @return array
- */
-function validate_str01($path, $values)
-{
-    $result = strlen($values[$path]) <= 1;
-    return array($path => ($result ? '' : __('Incorrect value')));
+    $result = $values[$path] <= $max_value;
+    return array($path => ($result ? '' : sprintf(__('Value must be equal or lower than %s'), $max_value)));
 }
 ?>
\ No newline at end of file
diff --git a/setup/validate.php b/setup/validate.php
index c4441184d..e8d7a7f6d 100644
--- a/setup/validate.php
+++ b/setup/validate.php
@@ -24,7 +24,7 @@ if (!($values instanceof stdClass)) {
     die('Wrong data');
 }
 $values = (array)$values;
-$result = validate($vids, $values, true);
+$result = PMA_config_validate($vids, $values, true);
 if ($result === false) {
     $result = 'Wrong data or no validation for ' . $vids;
 }

From a7fe3f362c3cb81ca04922049725af6242921438 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 17 Jul 2010 14:02:19 +0200
Subject: [PATCH 058/106] allow multiple validators for one field users can set
 MaxDbList and MaxTableList, values are bounded by the original value

---
 js/config.js                                | 15 +++-
 libraries/config.values.php                 | 23 ++++--
 libraries/config/FormDisplay.class.php      | 10 ++-
 libraries/config/FormDisplay.tpl.php        | 24 +++---
 libraries/config/user_preferences.forms.php |  4 +-
 libraries/config/validate.lib.php           | 82 ++++++++++++++++-----
 6 files changed, 116 insertions(+), 42 deletions(-)

diff --git a/js/config.js b/js/config.js
index a5f94fa1b..6ca16119b 100644
--- a/js/config.js
+++ b/js/config.js
@@ -224,7 +224,20 @@ var validators = {
         // convert PCRE regexp
         var parts = regexp.match(validators._regexp_pcre_extract);
         var valid = this.value.match(new RegExp(parts[2], parts[3])) != null;
-        return valid ? true : PMA_messages['error_invalid_value']
+        return valid ? true : PMA_messages['error_invalid_value'];
+    },
+    /**
+     * Validates upper bound for numeric inputs
+     *
+     * @param {boolean} isKeyUp
+     * @param {int} max_value
+     */
+    validate_upper_bound: function(isKeyUp, max_value) {
+        var val = parseInt(this.value);
+        if (isNaN(val)) {
+            return true;
+        }
+        return val <= max_value ? true : PMA_messages['error_value_lte'].replace('%s', max_value);
     },
     // field validators
     _field: {
diff --git a/libraries/config.values.php b/libraries/config.values.php
index 0fde51250..c5217b230 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -125,16 +125,16 @@ $cfg_db['_overrides']['Servers/1/extension'] = extension_loaded('mysqli')
 $cfg_db['_validators'] = array(
     'CharTextareaCols' => 'validate_positive_number',
     'CharTextareaRows' => 'validate_positive_number',
-    'DefaultPropDisplay' => array('validate_by_regex', '/^(?:horizontal|vertical|\d+)$/'),
+    'DefaultPropDisplay' => array(array('validate_by_regex', '/^(?:horizontal|vertical|\d+)$/')),
     'ExecTimeLimit' => 'validate_non_negative_number',
     'Export/sql_max_query_size' => 'validate_positive_number',
     'ForeignKeyMaxLimit' => 'validate_positive_number',
-    'Import/csv_enclosed' => array('validate_by_regex', '/^.?$/'),
-    'Import/csv_escaped' => array('validate_by_regex', '/^.$/'),
-    'Import/csv_terminated' => array('validate_by_regex', '/^.$/'),
-    'Import/ldi_enclosed' => array('validate_by_regex', '/^.?$/'),
-    'Import/ldi_escaped' => array('validate_by_regex', '/^.$/'),
-    'Import/ldi_terminated' => array('validate_by_regex', '/^.$/'),
+    'Import/csv_enclosed' => array(array('validate_by_regex', '/^.?$/')),
+    'Import/csv_escaped' => array(array('validate_by_regex', '/^.$/')),
+    'Import/csv_terminated' => array(array('validate_by_regex', '/^.$/')),
+    'Import/ldi_enclosed' => array(array('validate_by_regex', '/^.?$/')),
+    'Import/ldi_escaped' => array(array('validate_by_regex', '/^.$/')),
+    'Import/ldi_terminated' => array(array('validate_by_regex', '/^.$/')),
     'Import/skip_queries' => 'validate_non_negative_number',
     'InsertRows' => 'validate_positive_number',
     'LeftFrameTableLevel' => 'validate_positive_number',
@@ -145,7 +145,7 @@ $cfg_db['_validators'] = array(
     'MaxCharactersInDisplayedSQL' => 'validate_positive_number',
     'MaxRows' => 'validate_positive_number',
     'MaxTableList' => 'validate_positive_number',
-    'MemoryLimit' => array('validate_by_regex', '/^\d+(?:[kmg])?$/i'),
+    'MemoryLimit' => array(array('validate_by_regex', '/^\d+(?:[kmg])?$/i')),
     'QueryHistoryMax' => 'validate_positive_number',
     'QueryWindowWidth' => 'validate_positive_number',
     'QueryWindowHeight' => 'validate_positive_number',
@@ -157,4 +157,11 @@ $cfg_db['_validators'] = array(
     'TextareaCols' => 'validate_positive_number',
     'TextareaRows' => 'validate_positive_number',
     'TrustedProxies' => 'validate_trusted_proxies');
+
+/**
+ * Additional validators used for user preferences
+ */
+$cfg_db['_userValidators'] = array(
+    'MaxDbList' => array(array('validate_upper_bound', 'value:MaxDbList')),
+    'MaxTableList' => array(array('validate_upper_bound', 'value:MaxTableList')));
 ?>
\ No newline at end of file
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 350dec1db..c2837c892 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -83,8 +83,10 @@ class FormDisplay
             'error_nan_p' => __('Not a positive number'),
             'error_nan_nneg' => __('Not a non-negative number'),
             'error_incorrect_port' => __('Not a valid port number'),
-            'error_invalid_value' => __('Incorrect value')
-        );
+            'error_invalid_value' => __('Incorrect value'),
+            'error_value_lte' => __('Value must be equal or lower than %s'));
+        // initialize validators
+        PMA_config_get_validators();
     }
 
     /**
@@ -183,7 +185,7 @@ class FormDisplay
         $js = array();
         $js_default = array();
         $tabbed_form = $tabbed_form && (count($this->forms) > 1);
-        $validators = ConfigFile::getInstance()->getDbEntry('_validators', array());
+        $validators = PMA_config_get_validators();
 
         display_form_top();
 
@@ -654,4 +656,4 @@ class FormDisplay
       return str_replace(array('Servers/1/', '/'), array('Servers/', '_'), $path);
     }
 }
-?>
+?>
\ No newline at end of file
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index e05a583a5..e202f0fbf 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -343,20 +343,22 @@ function display_form_bottom()
 /**
  * Appends JS validation code to $js_array
  *
- * @param string $field_id
- * @param string $validator
- * @param array  $js_array
+ * @param string       $field_id
+ * @param string|array $validator
+ * @param array        $js_array
  */
-function js_validate($field_id, $validator, &$js_array)
+function js_validate($field_id, $validators, &$js_array)
 {
-    $validator = (array)$validator;
-    $v_name = array_shift($validator);
-    $v_args = array();
-    foreach ($validator as $arg) {
-        $v_args[] = PMA_escapeJsString($arg);
+    foreach ((array)$validators as $validator) {
+        $validator = (array)$validator;
+        $v_name = array_shift($validator);
+        $v_args = array();
+        foreach ($validator as $arg) {
+            $v_args[] = PMA_escapeJsString($arg);
+        }
+        $v_args = $v_args ? ", ['" . implode("', '", $v_args) . "']" : '';
+        $js_array[] = "validateField('$field_id', '$v_name', true$v_args)";
     }
-    $v_args = $v_args ? ", ['" . implode("', '", $v_args) . "']" : '';
-    $js_array[] = "validateField('$field_id', '$v_name', true$v_args)";
 }
 
 /**
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 567f9103d..592a30042 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -18,7 +18,9 @@ $forms['Features']['General'] = array(
     'InitialSlidersState',
     'ErrorIconic',
     'ReplaceHelpImg',
-    'SkipLockedTables');
+    'SkipLockedTables',
+    'MaxDbList',
+    'MaxTableList');
 $forms['Features']['Text_fields'] = array(
     'CharEditing',
     'CharTextareaCols',
diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index 92b05ead6..5cc252770 100644
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -15,6 +15,43 @@
  * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
  */
 
+/**
+ * Returns validator list
+ *
+ * @uses ConfigFile::getDbEntry()
+ * @uses ConfigFile::getInstance()
+ * @return array
+ */
+function PMA_config_get_validators()
+{
+    static $validators = null;
+
+    if ($validators === null) {
+        $cf = ConfigFile::getInstance();
+        $validators = $cf->getDbEntry('_validators', array());
+        if (!defined('PMA_SETUP') || !PMA_SETUP) {
+            $uvs = $cf->getDbEntry('_userValidators', array());
+            foreach ($uvs as $field => $uv_list) {
+                $uv_list = (array)$uv_list;
+                foreach ($uv_list as &$uv) {
+                    if (!is_array($uv)) {
+                        continue;
+                    }
+                    for ($i = 1; $i < count($uv); $i++) {
+                        if (substr($uv[$i], 0, 6) == 'value:') {
+                            $uv[$i] = PMA_array_read(substr($uv[$i], 6), $GLOBALS['cfg']);
+                        }
+                    }
+                }
+                $validators[$field] = isset($validators[$field])
+                    ? array_merge((array)$validators[$field], $uv_list)
+                    : $uv_list;
+            }
+        }
+    }
+    return $validators;
+}
+
 /**
  * Runs validation $validator_id on values $values and returns error list.
  *
@@ -24,6 +61,9 @@
  *   cleanup in HTML documen
  * o false - when no validators match name(s) given by $validator_id
  *
+ * @uses ConfigFile::getCanonicalPath()
+ * @uses ConfigFile::getInstance()
+ * @uses PMA_config_get_validators()
  * @param string|array  $validator_id
  * @param array         $values
  * @param bool          $isPostSource  tells whether $values are directly from POST request
@@ -32,10 +72,10 @@
 function PMA_config_validate($validator_id, &$values, $isPostSource)
 {
     // find validators
-    $cf = ConfigFile::getInstance();
     $validator_id = (array) $validator_id;
-    $validators = $cf->getDbEntry('_validators');
+    $validators = PMA_config_get_validators();
     $vids = array();
+    $cf = ConfigFile::getInstance();
     foreach ($validator_id as &$vid) {
         $vid = $cf->getCanonicalPath($vid);
         if (isset($validators[$vid])) {
@@ -59,23 +99,25 @@ function PMA_config_validate($validator_id, &$values, $isPostSource)
     // validate
     $result = array();
     foreach ($vids as $vid) {
-        // call appropriate validation function
-        $vdef = (array) $validators[$vid];
-        $vname = array_shift($vdef);
-        $args = array_merge(array($vid, &$arguments), $vdef);
-        $r = call_user_func_array($vname, $args);
+        // call appropriate validation functions
+        foreach ((array)$validators[$vid] as $validator) {
+            $vdef = (array) $validator;
+            $vname = array_shift($vdef);
+            $args = array_merge(array($vid, &$arguments), $vdef);
+            $r = call_user_func_array($vname, $args);
 
-        // merge results
-        if (is_array($r)) {
-            foreach ($r as $key => $error_list) {
-                // skip empty values if $isPostSource is false
-                if (!$isPostSource && empty($error_list)) {
-                    continue;
+            // merge results
+            if (is_array($r)) {
+                foreach ($r as $key => $error_list) {
+                    // skip empty values if $isPostSource is false
+                    if (!$isPostSource && empty($error_list)) {
+                        continue;
+                    }
+                    if (!isset($result[$key])) {
+                        $result[$key] = array();
+                    }
+                    $result[$key] = array_merge($result[$key], (array)$error_list);
                 }
-                if (!isset($result[$key])) {
-                    $result[$key] = array();
-                }
-                $result[$key] = array_merge($result[$key], (array)$error_list);
             }
         }
     }
@@ -157,6 +199,7 @@ function test_db_connection($extension, $connect_type, $host, $port, $socket, $u
 /**
  * Validate server config
  *
+ * @uses test_db_connection()
  * @param string $path
  * @param array  $values
  * @return array
@@ -191,6 +234,7 @@ function validate_server($path, $values)
 /**
  * Validate pmadb config
  *
+ * @uses test_db_connection()
  * @param string $path
  * @param array  $values
  * @return array
@@ -229,6 +273,7 @@ function validate_pmadb($path, $values)
 /**
  * Validates regular expression
  *
+ * @uses test_php_errormsg()
  * @param string $path
  * @param array  $values
  * @return array
@@ -331,6 +376,7 @@ function test_number($path, $values, $allow_neg, $allow_zero, $max_value, $error
 /**
  * Validates port number
  *
+ * @uses test_number()
  * @param string $path
  * @param array  $values
  * @return array
@@ -343,6 +389,7 @@ function validate_port_number($path, $values)
 /**
  * Validates positive number
  *
+ * @uses test_number()
  * @param string $path
  * @param array  $values
  * @return array
@@ -355,6 +402,7 @@ function validate_positive_number($path, $values)
 /**
  * Validates non-negative number
  *
+ * @uses test_number()
  * @param string $path
  * @param array  $values
  * @return array

From b71edb53806b7bb2867db6ab391a11a7e91ccade Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 17 Jul 2010 14:23:15 +0200
Subject: [PATCH 059/106] add missing @uses comments

---
 libraries/config/ConfigFile.class.php  | 11 ++++++-
 libraries/config/Form.class.php        |  6 ++++
 libraries/config/FormDisplay.class.php | 45 ++++++++++++++++++++++++++
 libraries/config/FormDisplay.tpl.php   | 11 +++++++
 4 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index b9357ad7a..2d3ff28d5 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -7,7 +7,8 @@
  */
 
 /**
- * Config file management and generation class
+ * Config file management and generation class.
+ * Stores its data in $_SESSION
  *
  * @package    phpMyAdmin
  */
@@ -57,6 +58,8 @@ class ConfigFile
 
     /**
      * Private constructor, use {@link getInstance()}
+     *
+     * @uses PMA_array_write()
      */
     private function __construct()
     {
@@ -144,6 +147,8 @@ class ConfigFile
     /**
      * Sets config value
      *
+     * @uses PMA_array_remove()
+     * @uses PMA_array_write()
      * @param string $path
      * @param mixed  $value
      * @param string $canonical_path
@@ -223,6 +228,7 @@ class ConfigFile
     /**
      * Returns config value or $default if it's not set
      *
+     * @uses PMA_array_read()
      * @param  string $path
      * @param  mixed  $default
      * @return mixed
@@ -237,6 +243,7 @@ class ConfigFile
      * exist in config.default.php ($cfg) and config.values.php
      * ($_cfg_db['_overrides'])
      *
+     * @uses PMA_array_read()
      * @param  string $canonical_path
      * @param  mixed  $default
      * @return mixed
@@ -250,6 +257,7 @@ class ConfigFile
      * Returns config value, if it's not set uses the default one; returns
      * $default if the path isn't set and doesn't contain a default value
      *
+     * @uses PMA_array_read()
      * @param  string $path
      * @param  mixed  $default
      * @return mixed
@@ -277,6 +285,7 @@ class ConfigFile
     /**
      * Returns config database entry for $path ($cfg_db in config_info.php)
      *
+     * @uses PMA_array_read()
      * @param  string $path
      * @param  mixed  $default
      * @return mixed
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
index bea1e5000..96fc48bd8 100644
--- a/libraries/config/Form.class.php
+++ b/libraries/config/Form.class.php
@@ -74,6 +74,8 @@ class Form
     /**
      * Returns allowed values for select fields
      *
+     * @uses ConfigFile::getDbEntry()
+     * @uses ConfigFile::getInstance()
      * @param   string  $option_path
      * @return  array
      */
@@ -157,6 +159,10 @@ class Form
 
     /**
      * Reads fields' types to $this->fieldsTypes
+     *
+     * @uses ConfigFile::getDbEntry()
+     * @uses ConfigFile::getDefault()
+     * @uses ConfigFile::getInstance()
      */
     protected function readTypes()
     {
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index c2837c892..7c77d0472 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -131,6 +131,10 @@ class FormDisplay
 
     /**
      * Runs validation for all registered forms
+     *
+     * @uses ConfigFile::getInstance()
+     * @uses ConfigFile::getValue()
+     * @uses PMA_config_validate()
      */
     private function _validate()
     {
@@ -175,6 +179,20 @@ class FormDisplay
     /**
      * Outputs HTML for forms
      *
+     * @uses ConfigFile::getInstance()
+     * @uses ConfigFile::get()
+     * @uses display_fieldset_bottom()
+     * @uses display_fieldset_top()
+     * @uses display_form_bottom()
+     * @uses display_form_top()
+     * @uses display_js()
+     * @uses display_tabs_bottom()
+     * @uses display_tabs_top()
+     * @uses js_validate()
+     * @uses PMA_config_get_validators()
+     * @uses PMA_jsFormat()
+     * @uses PMA_lang()
+     * @uses PMA_read_userprefs_fieldnames()
      * @param bool $tabbed_form
      * @param bool   $show_restore_default  whether show "restore default" button besides the input field
      */
@@ -271,6 +289,17 @@ class FormDisplay
     /**
      * Prepares data for input field display and outputs HTML code
      *
+     * @uses ConfigFile::get()
+     * @uses ConfigFile::getDefault()
+     * @uses ConfigFile::getInstance()
+     * @uses display_group_footer()
+     * @uses display_group_header()
+     * @uses display_input()
+     * @uses Form::getOptionType()
+     * @uses Form::getOptionValueList()
+     * @uses PMA_escapeJsString()
+     * @uses PMA_lang_desc()
+     * @uses PMA_lang_name()
      * @param Form   $form
      * @param string $field                 field name as it appears in $form
      * @param string $system_path           field path, eg. Servers/1/verbose
@@ -381,6 +410,9 @@ class FormDisplay
 
     /**
      * Displays errors
+     *
+     * @uses display_errors()
+     * @uses PMA_lang_name()
      */
     public function displayErrors()
     {
@@ -402,6 +434,11 @@ class FormDisplay
 
     /**
      * Reverts erroneous fields to their default values
+     *
+     * @uses ConfigFile::getDefault()
+     * @uses ConfigFile::getInstance()
+     * @uses ConfigFile::set()
+     *
      */
     public function fixErrors()
     {
@@ -441,6 +478,14 @@ class FormDisplay
     /**
      * Validates and saves form data to session
      *
+     * @uses ConfigFile::get()
+     * @uses ConfigFile::getInstance()
+     * @uses ConfigFile::getServerCount()
+     * @uses ConfigFile::set()
+     * @uses Form::getOptionType()
+     * @uses Form::getOptionValueList()
+     * @uses PMA_lang_name()
+     * @uses PMA_read_userprefs_fieldnames()
      * @param  array|string  $forms               array of form names
      * @param  bool          $allow_partial_save  allows for partial form saving on failed validation
      * @return boolean  true on success (no errors and all saved)
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index e202f0fbf..ed6e22297 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -9,6 +9,8 @@
 /**
  * Displays top part of the form
  *
+ * @uses PMA_generate_common_hidden_inputs()
+ * @uses PMA_getHiddenFields()
  * @param string $action         default: $_SERVER['REQUEST_URI']
  * @param string $method         'post' or 'get'
  * @param array  $hidden_fields  array of form hidden fields (key: field name)
@@ -108,6 +110,10 @@ function display_fieldset_top($title = '', $description = '', $errors = null, $a
  * o values_disabled -  (array)list of disabled values (keys from values)
  * o wiki - (string) wiki link
  *
+ * @uses $GLOBALS['_FormDisplayGroup']
+ * @uses $GLOBALS['cfg']['ThemePath']
+ * @uses $_SESSION['PMA_Theme']
+ * @uses display_group_footer()
  * @param string $path
  * @param string $name
  * @param string $description
@@ -254,6 +260,8 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
 /**
  * Display group header
  *
+ * @uses $GLOBALS['_FormDisplayGroup']
+ * @uses display_group_footer()
  * @param string $header_text
  */
 function display_group_header($header_text)
@@ -282,6 +290,8 @@ function display_group_header($header_text)
 
 /**
  * Display group footer
+ *
+ * @uses $GLOBALS['_FormDisplayGroup']
  */
 function display_group_footer()
 {
@@ -343,6 +353,7 @@ function display_form_bottom()
 /**
  * Appends JS validation code to $js_array
  *
+ * @uses PMA_escapeJsString()
  * @param string       $field_id
  * @param string|array $validator
  * @param array        $js_array

From cf99d6511ffd6abe85c77b64b0182b23f2a8bf59 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 17 Jul 2010 22:43:38 +0200
Subject: [PATCH 060/106] fix restore-default not showing after page load setup
 script comments for fields that set constraints on user preferences
 (MaxDbLost, MaxTableList)

---
 js/config.js                              |  1 -
 libraries/config/FormDisplay.class.php    |  5 +++--
 libraries/config/FormDisplay.tpl.php      |  7 +++++-
 libraries/config/config_functions.lib.php | 27 +++++------------------
 libraries/config/messages.inc.php         |  2 ++
 setup/styles.css                          |  5 +++++
 6 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/js/config.js b/js/config.js
index 6ca16119b..dd18a29f1 100644
--- a/js/config.js
+++ b/js/config.js
@@ -597,7 +597,6 @@ $(function() {
         link.css({display: 'inline-block', opacity: 0.25});
         if (link.hasClass('restore-default')) {
             // restore-default is handled by markField
-        	link.find('img').hide();
         }
         link.bind({
             mouseenter: function() {$(this).css('opacity', 1);},
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 7c77d0472..6b2c13352 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -313,7 +313,7 @@ class FormDisplay
             $translated_path, $show_restore_default, $userprefs_allow, array &$js_default)
     {
         $name = PMA_lang_name($system_path);
-        $description = PMA_lang_desc($system_path);
+        $description = PMA_lang_name($system_path, 'desc', '');
 
         $cf = ConfigFile::getInstance();
         $value = $cf->get($work_path);
@@ -328,7 +328,8 @@ class FormDisplay
             'doc' => $this->getDocLink($system_path),
             'wiki' =>  $this->getWikiLink($system_path),
             'show_restore_default' => $show_restore_default,
-            'userprefs_allow' => $userprefs_allow);
+            'userprefs_allow' => $userprefs_allow,
+            'userprefs_comment' => PMA_lang_name($system_path, 'cmt', ''));
         if (isset($form->default[$system_path])) {
             $opts['setvalue'] = $form->default[$system_path];
         }
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index ed6e22297..696a5b6f2 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -105,6 +105,7 @@ function display_fieldset_top($title = '', $description = '', $errors = null, $a
  * o setvalue - (string) shows button allowing to set poredefined value
  * o show_restore_default - (boolean) whether show "restore default" button
  * o userprefs_allow - whether user preferences are enabled for this field (null - no support, true/false - enabled/disabled)
+ * o userprefs_comment - (string) field comment
  * o values - key - value paris for <select> fields
  * o values_escaped - (boolean) tells whether values array is already escaped (defaults to false)
  * o values_disabled -  (array)list of disabled values (keys from values)
@@ -164,7 +165,6 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
             <span class="disabled-notice" title="<?php echo __('This setting is disabled, it will not be applied to your configuration') ?>"><?php echo __('Disabled') ?></span>
         <?php endif; ?>
         <?php if (!empty($description)) { ?><small><?php echo $description ?></small><?php } ?>
-
     </th>
     <td>
     <?php
@@ -222,6 +222,11 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
                 . '</textarea>';
             break;
     }
+    if ($is_setup_script && isset($opts['userprefs_comment']) && $opts['userprefs_comment']) {
+        ?>
+        <a class="userprefs-comment" title="<?php echo htmlspecialchars($opts['userprefs_comment']) ?>"><img alt="comment" src="<?php echo $img_path ?>b_tblops.png" width="16" height="16" /></a>
+        <?php
+    }
     if (isset($opts['setvalue']) && $opts['setvalue']) {
         ?>
         <a class="set-value" href="#<?php echo "$path={$opts['setvalue']}" ?>" title="<?php echo sprintf(__('Set value: %s'), htmlspecialchars($opts['setvalue'])) ?>" style="display:none"><img alt="set-value" src="<?php echo $img_path ?>b_edit.png" width="16" height="16" /></a>
diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
index 8867c0654..a4526acd9 100644
--- a/libraries/config/config_functions.lib.php
+++ b/libraries/config/config_functions.lib.php
@@ -57,37 +57,22 @@ function PMA_lang($lang_key)
 }
 
 /**
- * Returns translated field name
+ * Returns translated field name/description or comment
  *
  * @param string $canonical_path
+ * @param string $type  'name', 'desc' or 'cmt'
+ * @param mixed  $default
  * @return string
  */
-function PMA_lang_name($canonical_path)
+function PMA_lang_name($canonical_path, $type = 'name', $default = 'key')
 {
     $lang_key = str_replace(
     	array('Servers/1/', '/'),
     	array('Servers/', '_'),
-    	$canonical_path) . '_name';
+    	$canonical_path) . '_' . $type;
     return isset($GLOBALS["strConfig$lang_key"])
         ? $GLOBALS["strConfig$lang_key"]
-        : $lang_key;
-}
-
-/**
- * Returns translated field description
- *
- * @param string $canonical_path
- * @return string
- */
-function PMA_lang_desc($canonical_path)
-{
-    $lang_key = str_replace(
-    	array('Servers/1/', '/'),
-    	array('Servers/', '_'),
-    	$canonical_path) . '_desc';
-    return isset($GLOBALS["strConfig$lang_key"])
-        ? PMA_lang($lang_key)
-        : '';
+        : ($default == 'key' ? $lang_key : $default);
 }
 
 /**
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 91efa5130..ab60332c4 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -290,10 +290,12 @@ $strConfigLongtextDoubleTextarea_name = __('Bigger textarea for LONGTEXT');
 $strConfigMainPageIconic_name = __('Use icons on main page');
 $strConfigMaxCharactersInDisplayedSQL_desc = __('Maximum number of characters used when a SQL query is displayed');
 $strConfigMaxCharactersInDisplayedSQL_name = __('Maximum displayed SQL length');
+$strConfigMaxDbList_cmt = __('Users cannot set a higher value');
 $strConfigMaxDbList_desc = __('Maximum number of databases displayed in left frame and database list');
 $strConfigMaxDbList_name = __('Maximum databases');
 $strConfigMaxRows_desc = __('Number of rows displayed when browsing a result set. If the result set contains more rows, &quot;Previous&quot; and &quot;Next&quot; links will be shown.');
 $strConfigMaxRows_name = __('Maximum number of rows to display');
+$strConfigMaxTableList_cmt = __('Users cannot set a higher value');
 $strConfigMaxTableList_desc = __('Maximum number of tables displayed in table list');
 $strConfigMaxTableList_name = __('Maximum tables');
 $strConfigMemoryLimit_desc = __('The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] ([kbd]0[/kbd] for no limit)');
diff --git a/setup/styles.css b/setup/styles.css
index 4a5cbf2a9..dbd2639f0 100644
--- a/setup/styles.css
+++ b/setup/styles.css
@@ -195,6 +195,11 @@ ul.tabs li a:hover, ul.tabs li a:active {
     margin-bottom: -3px;
 }
 
+.userprefs-comment {
+    cursor: help;
+    float: right;
+}
+
 /* forms */
 
 fieldset {

From c67340d023eaeb147e0b28155a55db64c8e1598a Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Mon, 19 Jul 2010 23:57:12 +0200
Subject: [PATCH 061/106] save lang and collation_connection to user
 preferences

---
 libraries/Config.class.php         | 51 +++++++++++++++++++++++-------
 libraries/user_preferences.lib.php | 31 ++++++++++--------
 prefs_manage.php                   | 16 +++++++++-
 3 files changed, 72 insertions(+), 26 deletions(-)

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index a73f87c82..43c213b03 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -420,9 +420,11 @@ class PMA_Config
      * must be called after control connection has been estabilished
      *
      * @uses $GLOBALS['cfg']
-     * @uses $_SESSION['cache']['config_mtime']
-     * @uses $_SESSION['cache']['userprefs']
-     * @uses $_SESSION['cache']['userprefs_mtime']
+     * @uses $GLOBALS['collation_connection']
+     * @uses $GLOBALS['lang']
+     * @uses $_SESSION['cache']['server_$server']['config_mtime']
+     * @uses $_SESSION['cache']['server_$server']['userprefs']
+     * @uses $_SESSION['cache']['server_$server']['userprefs_mtime']
      * @uses $_SESSION['PMA_Theme_Manager']
      * @uses PMA_apply_userprefs()
      * @uses PMA_array_merge_recursive()
@@ -472,14 +474,11 @@ class PMA_Config
         // changes are made only in index.php so everything is set when
         // in frames
 
-        // load/save theme
-        // theme cookie exists only if we are using non-default theme
+        // save theme
         $tmanager = $_SESSION['PMA_Theme_Manager'];
-
-        // save new theme
         if ($tmanager->getThemeCookie() || isset($_REQUEST['set_theme'])) {
-            if (!isset($config_data['ThemeDefault'])
-                    || $config_data['ThemeDefault'] != $tmanager->theme->getId()) {
+            if ((!isset($config_data['ThemeDefault']) && $tmanager->theme->getId() != 'original')
+                    || isset($config_data['ThemeDefault']) && $config_data['ThemeDefault'] != $tmanager->theme->getId()) {
                 // new theme was set in common.inc.php
                 $this->setUserValue(null, 'ThemeDefault', $tmanager->theme->getId(), 'original');
             }
@@ -492,9 +491,37 @@ class PMA_Config
             }
         }
 
-        // save new font size
-        if (!isset($config_data['fontsize']) || $org_fontsize != $config_data['fontsize']) {
-            $this->setUserValue('pma_fontsize', 'fontsize', $org_fontsize, '82%');
+        // save font size
+        if ((!isset($config_data['fontsize']) && $org_fontsize != '82%')
+                || isset($config_data['fontsize']) && $org_fontsize != $config_data['fontsize']) {
+            $this->setUserValue(null, 'fontsize', $org_fontsize, '82%');
+        }
+
+        // save language
+        if (isset($_COOKIE['pma_lang']) || isset($_POST['lang'])) {
+            if ((!isset($config_data['lang']) && $GLOBALS['lang'] != 'en')
+                    || isset($config_data['lang']) && $GLOBALS['lang'] != $config_data['lang']) {
+                $this->setUserValue(null, 'lang', $GLOBALS['lang'], 'en');
+            }
+        } else {
+            // read language from settings
+            if (isset($config_data['lang']) && PMA_langSet($config_data['lang'])) {
+                $this->setCookie('pma_lang', $GLOBALS['lang']);
+            }
+        }
+
+        // save connection collation
+        if (isset($_COOKIE['pma_collation_connection']) || isset($_POST['collation_connection'])) {
+            if ((!isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != 'utf8_general_ci')
+                    || isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != $config_data['collation_connection']) {
+                $this->setUserValue(null, 'collation_connection', $GLOBALS['collation_connection'], 'utf8_general_ci');
+            }
+        } else {
+            // read collation from settings
+            if (isset($config_data['collation_connection'])) {
+                $GLOBALS['collation_connection'] = $config_data['collation_connection'];
+                $this->setCookie('pma_collation_connection', $GLOBALS['collation_connection']);
+            }
         }
     }
 
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index cac374249..257f43d97 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -135,8 +135,11 @@ function PMA_apply_userprefs(array $config_data)
     $cfg = array();
     $blacklist = array_flip($GLOBALS['cfg']['UserprefsDisallow']);
     $whitelist = array_flip(PMA_read_userprefs_fieldnames());
+    // whitelist some additional fields which are custom handled
     $whitelist['ThemeDefault'] = true;
     $whitelist['fontsize'] = true;
+    $whitelist['lang'] = true;
+    $whitelist['collation_connection'] = true;
     foreach ($config_data as $path => $value) {
         if (!isset($whitelist[$path]) || isset($blacklist[$path])) {
             continue;
@@ -210,19 +213,21 @@ function PMA_persist_option($path, $value, $default_value)
  */
 function PMA_userprefs_redirect(array $forms, array $old_settings, $file_name, $params = null)
 {
-    // compute differences and check whether left frame should be refreshed
-    $old_settings = isset($old_settings['config_data'])
-            ? $old_settings['config_data']
-            : array();
-    $new_settings = ConfigFile::getInstance()->getConfigArray();
-    $diff_keys = array_keys(array_diff_assoc($old_settings, $new_settings)
-            + array_diff_assoc($new_settings, $old_settings));
-    $check_keys = array('NaturalOrder', 'MainPageIconic', 'DefaultTabDatabase');
-    $check_keys = array_merge($check_keys, $forms['Left_frame']['Left_frame'],
-         $forms['Left_frame']['Left_databases']);
-    $diff = array_intersect($check_keys, $diff_keys);
-    $reload_left_frame = !empty($diff)
-            || (isset($params['reload_left_frame']) && $params['reload_left_frame']);
+    $reload_left_frame = isset($params['reload_left_frame']) && $params['reload_left_frame'];
+    if (!$reload_left_frame) {
+        // compute differences and check whether left frame should be refreshed
+        $old_settings = isset($old_settings['config_data'])
+                ? $old_settings['config_data']
+                : array();
+        $new_settings = ConfigFile::getInstance()->getConfigArray();
+        $diff_keys = array_keys(array_diff_assoc($old_settings, $new_settings)
+                + array_diff_assoc($new_settings, $old_settings));
+        $check_keys = array('NaturalOrder', 'MainPageIconic', 'DefaultTabDatabase');
+        $check_keys = array_merge($check_keys, $forms['Left_frame']['Left_frame'],
+             $forms['Left_frame']['Left_databases']);
+        $diff = array_intersect($check_keys, $diff_keys);
+        $reload_left_frame = !empty($diff);
+    }
 
     // redirect
     $url_params = array(
diff --git a/prefs_manage.php b/prefs_manage.php
index 37b448b66..9eeacbc6d 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -133,15 +133,27 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
         // check for ThemeDefault and fontsize
         $params = array();
         if (isset($config['ThemeDefault'])
+                && $_SESSION['PMA_Theme_Manager']->theme->getId() != $config['ThemeDefault']
                 && $_SESSION['PMA_Theme_Manager']->checkTheme($config['ThemeDefault'])) {
             $_SESSION['PMA_Theme_Manager']->setActiveTheme($config['ThemeDefault']);
             $_SESSION['PMA_Theme_Manager']->setThemeCookie();
             $params['reload_left_frame'] = true;
         }
-        if (isset($config['fontsize'])) {
+        if (isset($config['fontsize'])
+                && $config['fontsize'] != $GLOBALS['PMA_Config']->get('fontsize')) {
             $params['set_fontsize'] = $config['fontsize'];
             $params['reload_left_frame'] = true;
         }
+        if (isset($config['lang'])
+                && $config['lang'] != $GLOBALS['lang']) {
+            $params['lang'] = $config['lang'];
+            $params['reload_left_frame'] = true;
+        }
+        if (isset($config['collation_connection'])
+                && $config['collation_connection'] != $GLOBALS['collation_connection']) {
+            $params['collation_connection'] = $config['collation_connection'];
+            $params['reload_left_frame'] = true;
+        }
 
         // save settings
         $old_settings = PMA_load_userprefs();
@@ -182,6 +194,8 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
             $GLOBALS['PMA_Config']->removeCookie('pma_fontsize');
             $params['reload_left_frame'] = true;
         }
+        $GLOBALS['PMA_Config']->removeCookie('pma_collaction_connection');
+        $GLOBALS['PMA_Config']->removeCookie('pma_lang');
         PMA_userprefs_redirect($forms, $old_settings, 'prefs_manage.php', $params);
         exit;
     } else {

From c0ba57f040b78736a351701a549a3f7b33157020 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 20 Jul 2010 12:42:18 +0200
Subject: [PATCH 062/106] add config options for charset in Import and Export

---
 libraries/config.values.php                 | 1 +
 libraries/config/messages.inc.php           | 1 +
 libraries/config/setup.forms.php            | 4 +++-
 libraries/config/user_preferences.forms.php | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libraries/config.values.php b/libraries/config.values.php
index 1e223dfa0..3e1a4c63c 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -73,6 +73,7 @@ $cfg_db['Import']['format'] = array(
     'docsql', // DocSQL
     'ldi',    // CSV using LOAD DATA
     'sql');   // SQL
+$cfg_db['Import']['charset'] = array_merge(array(''), $GLOBALS['cfg']['AvailableCharsets']);
 $cfg_db['Import']['sql_compatibility'] = $cfg_db['Export']['sql_compatibility'] = array(
     'NONE', 'ANSI', 'DB2', 'MAXDB', 'MYSQL323', 'MYSQL40', 'MSSQL', 'ORACLE',
     // removed; in MySQL 5.0.33, this produces exports that
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 47c191b83..852e94db4 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -223,6 +223,7 @@ $strConfigIgnoreMultiSubmitErrors_desc = __('If enabled, phpMyAdmin continues co
 $strConfigIgnoreMultiSubmitErrors_name = __('Ignore multiple statement errors');
 $strConfigImport_allow_interrupt_desc = __('Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.');
 $strConfigImport_allow_interrupt_name = __('Partial import: allow interrupt');
+$strConfigImport_charset_name = __('Character set of the file');
 $strConfigImport_csv_col_names_name = __('Lines terminated by');
 $strConfigImport_csv_enclosed_name = __('Columns enclosed by');
 $strConfigImport_csv_escaped_name = __('Columns escaped by');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index e5c0af237..f1ee4dbf7 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -75,8 +75,9 @@ $forms['Servers']['Server_tracking'] = array('Servers' => array(1 => array(
 $forms['Features']['Import_export'] = array(
     'UploadDir',
     'SaveDir',
-    'RecodingEngine',
+    'RecodingEngine' => ':group',
     'IconvExtraParams',
+    ':group:end',
     'ZipDump',
     'GZipDump',
     'BZipDump',
@@ -191,6 +192,7 @@ $forms['Main_frame']['Tabs'] = array(
 	'QueryWindowDefTab');
 $forms['Import']['Import_defaults'] = array('Import' => array(
     'format',
+    'charset',
     'allow_interrupt',
     'skip_queries'));
 $forms['Import']['Sql'] = array('Import' => array(
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index fa5c0ce37..746ef82bd 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -103,6 +103,7 @@ $forms['Main_frame']['Tabs'] = array(
     'DefaultTabTable');
 $forms['Import']['Import_defaults'] = array(
     'Import/format',
+    'Import/charset',    
     'Import/allow_interrupt',
     'Import/skip_queries');
 $forms['Import']['Sql'] = array(
@@ -137,6 +138,7 @@ $forms['Import']['Open_Document'] = array(
 $forms['Export']['Export_defaults'] = array(
     'Export/format',
     'Export/compression',
+    'Export/charset',
     'Export/asfile',
     'Export/remember_file_template',
     'Export/file_template_table',

From a8ed8e61233ff0b6517b901160e99689ad7a92fd Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 20 Jul 2010 16:36:22 +0200
Subject: [PATCH 063/106] SQL Validator forms

---
 libraries/config/messages.inc.php           | 8 ++++++++
 libraries/config/setup.forms.php            | 4 ++++
 libraries/config/user_preferences.forms.php | 6 +++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 852e94db4..318ab2b98 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -208,6 +208,8 @@ $strConfigForm_Sql_box_desc = __('Customize links shown in SQL Query boxes');
 $strConfigForm_Sql_desc = __('Customize default options');
 $strConfigForm_Sql_queries = __('SQL queries');
 $strConfigForm_Sql_queries_desc = __('SQL queries settings');
+$strConfigForm_Sql_validator = __('SQL Validator');
+$strConfigForm_Sql_validator_desc = __('If you wish to use the SQL Validator service, you should be aware that [strong]all SQL statements are stored anonymously for statistical purposes[/strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], Copyright 2002 Upright Database Technology. All rights reserved.[/em]');
 $strConfigForm_Startup = __('Startup');
 $strConfigForm_Startup_desc = __('Customize startup page');
 $strConfigForm_Tabs = __('Tabs');
@@ -445,7 +447,13 @@ $strConfigSQLQuery_Edit_name = __('Edit');
 $strConfigSQLQuery_Explain_name = __('Explain SQL');
 $strConfigSQLQuery_Refresh_name = __('Refresh');
 $strConfigSQLQuery_ShowAsPHP_name = __('Create PHP Code');
+$strConfigSQLQuery_Validate_desc = __('Requires [a@#tab_Sql_validator]SQL Validator[/a] to be enabled');
 $strConfigSQLQuery_Validate_name = __('Validate SQL');
+$strConfigSQLValidator_password_name = __('Password');
+$strConfigSQLValidator_use_desc = __('[strong]Warning:[/strong] requires PEAR SOAP to be installed');
+$strConfigSQLValidator_use_name = __('Enable SQL Validator');
+$strConfigSQLValidator_username_name = __('Username');
+$strConfigSQLValidator_username_desc = __('If you have a custom username, specify it here (defaults to [kbd]anonymous[/kbd])');
 $strConfigSuggestDBName_desc = __('Suggest a database name on the &quot;Create Database&quot; form (if possible) or keep the text field empty');
 $strConfigSuggestDBName_name = __('Suggest new database name');
 $strConfigTextareaCols_desc = __('Textarea size (columns) in edit mode, this value will be emphasized for SQL query textareas (*2) and for query window (*1.25)');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index f1ee4dbf7..5a27413bb 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -129,6 +129,10 @@ $forms['Sql_queries']['Sql_box'] = array('SQLQuery' => array(
     'ShowAsPHP',
     'Validate',
     'Refresh'));
+$forms['Sql_queries']['Sql_validator'] = array('SQLValidator' => array(
+    'use',
+    'username',
+    'password'));
 $forms['Left_frame']['Left_frame'] = array(
     'LeftFrameLight',
     'LeftDisplayLogo',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 746ef82bd..6281a618f 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -42,8 +42,12 @@ $forms['Sql_queries']['Sql_box'] = array(
     'SQLQuery/Edit',
     'SQLQuery/Explain',
     'SQLQuery/ShowAsPHP',
-//    'SQLQuery/Validate',// [false or no override]
+    'SQLQuery/Validate',
     'SQLQuery/Refresh');
+$forms['Sql_queries']['Sql_validator'] = array('SQLValidator' => array(
+    'use',
+    'username',
+    'password'));
 $forms['Features']['Page_titles'] = array(
     'TitleDefault',
     'TitleTable',

From 43a7629da9bdc90910833915aac5df92d1ddea32 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 20 Jul 2010 21:57:05 +0200
Subject: [PATCH 064/106] Users can disable: AllowUserDropDatabase,
 UseDbSearch, QueryHistoryDB, ShowPhpInfo, ShowChgPassword Users can change:
 QueryHistoryMax (must be lower than value from file config)

---
 libraries/config.default.php                | 11 +++++++++++
 libraries/config.values.php                 |  3 ++-
 libraries/config/FormDisplay.class.php      |  4 +++-
 libraries/config/FormDisplay.tpl.php        |  8 ++++----
 libraries/config/config_functions.lib.php   |  9 ++++++---
 libraries/config/messages.inc.php           |  1 +
 libraries/config/setup.forms.php            |  9 +++++----
 libraries/config/user_preferences.forms.php | 22 +++++++++++++++------
 libraries/user_preferences.lib.php          | 16 +++++++++++++++
 9 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/libraries/config.default.php b/libraries/config.default.php
index cf4e1f3a4..a0cd97eed 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2316,6 +2316,17 @@ $cfg['InitialSlidersState'] = 'closed';
  */
 $cfg['UserprefsDisallow'] = array();
 
+/**
+ * User preferences: disabling options by users
+ */
+$cfg['disable'] = array(
+    'AllowUserDropDatabase' => false,
+    'UseDbSearch' => false,
+    'QueryHistoryDB' => false,
+    'ShowPhpInfo' => false,
+    'ShowChgPassword' => false
+);
+
 //-----------------------------------------------------------------------------
 // custom-setup by mkkeck: 2004-05-04
 //    some specials for new icons and scrolling
diff --git a/libraries/config.values.php b/libraries/config.values.php
index 3e1a4c63c..319aa426b 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -163,5 +163,6 @@ $cfg_db['_validators'] = array(
  */
 $cfg_db['_userValidators'] = array(
     'MaxDbList' => array(array('validate_upper_bound', 'value:MaxDbList')),
-    'MaxTableList' => array(array('validate_upper_bound', 'value:MaxTableList')));
+    'MaxTableList' => array(array('validate_upper_bound', 'value:MaxTableList')),
+    'QueryHistoryMax' => array(array('validate_upper_bound', 'value:QueryHistoryMax')),);
 ?>
\ No newline at end of file
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 6b2c13352..464655226 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -699,7 +699,9 @@ class FormDisplay
      */
     private static function _getOptName($path)
     {
-      return str_replace(array('Servers/1/', '/'), array('Servers/', '_'), $path);
+      return str_replace(
+          array('Servers/1/', 'disable/', '/'),
+          array('Servers/', '', '_'), $path);
     }
 }
 ?>
\ No newline at end of file
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 696a5b6f2..ef3b39b3b 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -155,15 +155,15 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
 <tr<?php echo $tr_class ?>>
     <th>
         <label for="<?php echo htmlspecialchars($path) ?>"><?php echo $name ?></label>
-        <?php if (!empty($opts['doc']) || !empty($opts['wiki'])): ?>
+        <?php if (!empty($opts['doc']) || !empty($opts['wiki'])) { ?>
         <span class="doc">
             <?php if (!empty($opts['doc'])) { ?><a href="<?php echo $base_dir . $opts['doc']  ?>" target="documentation"><img class="icon" src="<?php echo $img_path ?>b_help.png" width="11" height="11" alt="Doc" title="<?php echo __('Documentation') ?>" /></a><?php } ?>
             <?php if (!empty($opts['wiki'])){ ?><a href="<?php echo $opts['wiki'] ?>" target="wiki"><img class="icon" src="<?php echo $img_path ?>b_info.png" width="11" height="11" alt="Wiki" title="Wiki" /></a><?php } ?>
         </span>
-        <?php endif; ?>
-        <?php if (!$is_setup_script && isset($opts['userprefs_allow']) && !$opts['userprefs_allow']): ?>
+        <?php } ?>
+        <?php if (!$is_setup_script && isset($opts['userprefs_allow']) && !$opts['userprefs_allow']) { ?>
             <span class="disabled-notice" title="<?php echo __('This setting is disabled, it will not be applied to your configuration') ?>"><?php echo __('Disabled') ?></span>
-        <?php endif; ?>
+        <?php } ?>
         <?php if (!empty($description)) { ?><small><?php echo $description ?></small><?php } ?>
     </th>
     <td>
diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
index a4526acd9..1d42c19cd 100644
--- a/libraries/config/config_functions.lib.php
+++ b/libraries/config/config_functions.lib.php
@@ -66,12 +66,15 @@ function PMA_lang($lang_key)
  */
 function PMA_lang_name($canonical_path, $type = 'name', $default = 'key')
 {
+    if ($type == 'name' && strpos($canonical_path, 'disable/') === 0) {
+        return __('Disable') . ': ' . lcfirst(PMA_lang_name(substr($canonical_path, 8), $type, $default));
+    }
     $lang_key = str_replace(
-    	array('Servers/1/', '/'),
-    	array('Servers/', '_'),
+    	array('Servers/1/', 'disable/', '/'),
+    	array('Servers/', '', '_'),
     	$canonical_path) . '_' . $type;
     return isset($GLOBALS["strConfig$lang_key"])
-        ? $GLOBALS["strConfig$lang_key"]
+        ? ($type == 'desc' ? PMA_lang($lang_key) : $GLOBALS["strConfig$lang_key"])
         : ($default == 'key' ? $lang_key : $default);
 }
 
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 318ab2b98..52533c5d3 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -318,6 +318,7 @@ $strConfigProtectBinary_desc = __('Disallow BLOB and BINARY columns from editing
 $strConfigProtectBinary_name = __('Protect binary columns');
 $strConfigQueryHistoryDB_desc = __('Enable if you want DB-based query history (requires pmadb). If disabled, this utilizes JS-routines to display query history (lost by window close).');
 $strConfigQueryHistoryDB_name = __('Permanent query history');
+$strConfigQueryHistoryMax_cmt = __('Users cannot set a higher value');
 $strConfigQueryHistoryMax_desc = __('How many queries are kept in history');
 $strConfigQueryHistoryMax_name = __('Query history length');
 $strConfigQueryWindowDefTab_desc = __('Tab displayed when opening a new query window');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 5a27413bb..445493f6f 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -155,12 +155,13 @@ $forms['Left_frame']['Left_tables'] = array(
     'ShowTooltipAliasTB');
 $forms['Main_frame']['Startup'] = array(
     'MainPageIconic',
+    'ShowCreateDb' => ':group',
+    'SuggestDBName',
+    ':group:end',
     'ShowStats',
-    'ShowPhpInfo',
     'ShowServerInfo',
-    'ShowChgPassword',
-    'ShowCreateDb',
-    'SuggestDBName');
+    'ShowPhpInfo',
+    'ShowChgPassword');
 $forms['Main_frame']['Browse'] = array(
     'NavigationBarIconic',
     'ShowAll',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 6281a618f..1fc8e14c1 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -20,7 +20,10 @@ $forms['Features']['General'] = array(
     'ReplaceHelpImg',
     'SkipLockedTables',
     'MaxDbList',
-    'MaxTableList');
+    'MaxTableList',
+    'disable/AllowUserDropDatabase',
+    'disable/UseDbSearch',
+    'disable/QueryHistoryDB');
 $forms['Features']['Text_fields'] = array(
     'CharEditing',
     'CharTextareaCols',
@@ -31,6 +34,7 @@ $forms['Features']['Text_fields'] = array(
 $forms['Sql_queries']['Sql_queries'] = array(
     'ShowSQL',
     'Confirm',
+    'QueryHistoryMax',
     'IgnoreMultiSubmitErrors',
     'VerboseMultiSubmit',
     'MaxCharactersInDisplayedSQL',
@@ -44,10 +48,10 @@ $forms['Sql_queries']['Sql_box'] = array(
     'SQLQuery/ShowAsPHP',
     'SQLQuery/Validate',
     'SQLQuery/Refresh');
-$forms['Sql_queries']['Sql_validator'] = array('SQLValidator' => array(
-    'use',
-    'username',
-    'password'));
+$forms['Sql_queries']['Sql_validator'] = array(
+    'SQLValidator/use',
+    'SQLValidator/username',
+    'SQLValidator/password');
 $forms['Features']['Page_titles'] = array(
     'TitleDefault',
     'TitleTable',
@@ -76,7 +80,13 @@ $forms['Left_frame']['Left_tables'] = array(
     'ShowTooltipAliasTB');
 $forms['Main_frame']['Startup'] = array(
     'MainPageIconic',
-    'SuggestDBName');
+    'ShowCreateDb' => ':group',
+    'SuggestDBName',
+    ':group:end',
+    'ShowStats',
+    'ShowServerInfo',
+    'disable/ShowPhpInfo',
+    'disable/ShowChgPassword');
 $forms['Main_frame']['Browse'] = array(
     'NavigationBarIconic',
     'ShowAll',
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 257f43d97..7290603dd 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -144,6 +144,22 @@ function PMA_apply_userprefs(array $config_data)
         if (!isset($whitelist[$path]) || isset($blacklist[$path])) {
             continue;
         }
+        if (strpos($path, 'disable/') === 0) {
+            // write disable/ value
+            PMA_array_write($path, $cfg, $value);
+            // prepare path and value for disabled key
+            $path = substr($path, 8);
+            switch (gettype(PMA_array_read($path, $GLOBALS['PMA_Config']->default))) {
+                case 'string':
+                    $value = '';
+                    break;
+                case 'double':
+                case 'integer':
+                    $value = 0;
+                default:
+                    $value = false;
+            }
+        }
         PMA_array_write($path, $cfg, $value);
     }
     return $cfg;

From cc9b5c9028d04234b033377631b0bdcf4695f09a Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Wed, 21 Jul 2010 01:21:32 +0200
Subject: [PATCH 065/106] mark fields that user can disable in setup script

---
 libraries/config.default.php              | 3 +--
 libraries/config/FormDisplay.class.php    | 8 ++++++--
 libraries/config/FormDisplay.tpl.php      | 5 ++++-
 libraries/config/config_functions.lib.php | 3 ---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/libraries/config.default.php b/libraries/config.default.php
index a0cd97eed..4524cb268 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2324,8 +2324,7 @@ $cfg['disable'] = array(
     'UseDbSearch' => false,
     'QueryHistoryDB' => false,
     'ShowPhpInfo' => false,
-    'ShowChgPassword' => false
-);
+    'ShowChgPassword' => false);
 
 //-----------------------------------------------------------------------------
 // custom-setup by mkkeck: 2004-05-04
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 464655226..7f9f56613 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -328,8 +328,12 @@ class FormDisplay
             'doc' => $this->getDocLink($system_path),
             'wiki' =>  $this->getWikiLink($system_path),
             'show_restore_default' => $show_restore_default,
-            'userprefs_allow' => $userprefs_allow,
-            'userprefs_comment' => PMA_lang_name($system_path, 'cmt', ''));
+            'userprefs_allow' => $userprefs_allow);
+        $comment = PMA_lang_name($system_path, 'cmt', '');
+        if ($cf->getDefault('disable/' . $system_path) === false) {
+            $comment .= ($comment ? "\n" : '') . __('Users can disable this option');
+        }
+        $opts['userprefs_comment'] = $comment;
         if (isset($form->default[$system_path])) {
             $opts['setvalue'] = $form->default[$system_path];
         }
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index ef3b39b3b..db20bbb95 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -141,7 +141,7 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
         $field_class .= ($field_class == '' ? '' : ' ') . ($has_errors ? 'custom field-error' : 'custom');
     }
     $field_class = $field_class ? ' class="' . $field_class . '"' : '';
-    $name_id = 'name="' . $path . '" id="' . $path . '"';
+    $name_id = 'name="' . htmlspecialchars($path) . '" id="' . htmlspecialchars($path) . '"';
     $tr_class = $_FormDisplayGroup ? ' class="group-field"' : '';
     if (isset($opts['setvalue']) && $opts['setvalue'] == ':group') {
         unset($opts['setvalue']);
@@ -182,6 +182,9 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
                 . ' value="' . htmlspecialchars($value) . '" />';
           break;
         case 'checkbox':
+            if (strpos($path, 'disable-') === 0) {
+                echo '<label for="' . htmlspecialchars($path) . '" title="' . __('Mark to disable this option') . '">' . __('Disable') . '</label> ';
+            }
             echo '<span' . $field_class . '><input type="checkbox" ' . $name_id
               . ($value ? ' checked="checked"' : '') . ' /></span>';
           break;
diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
index 1d42c19cd..3b0e60662 100644
--- a/libraries/config/config_functions.lib.php
+++ b/libraries/config/config_functions.lib.php
@@ -66,9 +66,6 @@ function PMA_lang($lang_key)
  */
 function PMA_lang_name($canonical_path, $type = 'name', $default = 'key')
 {
-    if ($type == 'name' && strpos($canonical_path, 'disable/') === 0) {
-        return __('Disable') . ': ' . lcfirst(PMA_lang_name(substr($canonical_path, 8), $type, $default));
-    }
     $lang_key = str_replace(
     	array('Servers/1/', 'disable/', '/'),
     	array('Servers/', '', '_'),

From 600bdbd57ea7fd974381323c99d5a5abd92a50df Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Wed, 21 Jul 2010 14:01:53 +0200
Subject: [PATCH 066/106] Setup script: AllowThirdPartyFraming User preferences
 and setup script: new tab - Warnings, with options to disable mcrypt, Suhosin
 and pmadb warnings

---
 .gsoc/todo.txt                              |  1 +
 libraries/config/messages.inc.php           | 10 ++++++++++
 libraries/config/setup.forms.php            |  7 ++++++-
 libraries/config/user_preferences.forms.php |  4 ++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/.gsoc/todo.txt b/.gsoc/todo.txt
index 4dd9492f8..259072de9 100644
--- a/.gsoc/todo.txt
+++ b/.gsoc/todo.txt
@@ -1 +1,2 @@
 restore cache'ing in phpmyadmin.css.php
+remove debug from user preferences header
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 52533c5d3..a99092b70 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -15,6 +15,8 @@ if (!function_exists('__')) {
 
 $strConfigAllowArbitraryServer_desc = __('If enabled user can enter any MySQL server in login form for cookie auth');
 $strConfigAllowArbitraryServer_name = __('Allow login to any MySQL server');
+$strConfigAllowThirdPartyFraming_desc = __('Enabling this allows a page located on a different domain to call phpMyAdmin inside a frame, and is a potential [strong]security hole[/strong] allowing cross-frame scripting attacks');
+$strConfigAllowThirdPartyFraming_name = __('Allow third party framing');
 $strConfigAllowUserDropDatabase_name = __('Show &quot;Drop database&quot; link to normal users');
 $strConfigblowfish_secret_desc = __('Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] authentication');
 $strConfigblowfish_secret_name = __('Blowfish secret');
@@ -196,6 +198,8 @@ $strConfigForm_Server_pmadb = __('PMA database');
 $strConfigForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation');
 $strConfigForm_Server_tracking = __('Changes tracking');
 $strConfigForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.');
+$strConfigForm_Warnings = __('Warnings');
+$strConfigForm_Warnings_desc = __('Disable some of the warnings shown by phpMyAdmin');
 $strConfigFormset_Export = __('Customize export options');
 $strConfigFormset_Features = __('Features');
 $strConfigFormset_Import = __('Customize import defaults');
@@ -298,6 +302,8 @@ $strConfigMaxRows_name = __('Maximum number of rows to display');
 $strConfigMaxTableList_cmt = __('Users cannot set a higher value');
 $strConfigMaxTableList_desc = __('Maximum number of tables displayed in table list');
 $strConfigMaxTableList_name = __('Maximum tables');
+$strConfigMcryptDisableWarning_desc = __('Disable the default warning that is displayed if mcrypt is missing for cookie authentication');
+$strConfigMcryptDisableWarning_name = __('mcrypt warning');
 $strConfigMemoryLimit_desc = __('The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] ([kbd]0[/kbd] for no limit)');
 $strConfigMemoryLimit_name = __('Memory limit');
 $strConfigModifyDeleteAtLeft_name = __('Show left delete link');
@@ -312,6 +318,8 @@ $strConfigOrder_desc = __('[kbd]SMART[/kbd] - i.e. descending order for columns
 $strConfigOrder_name = __('Default sorting order');
 $strConfigPersistentConnections_desc = __('Use persistent connections to MySQL databases');
 $strConfigPersistentConnections_name = __('Persistent connections');
+$strConfigPmaNoRelation_DisableWarning_desc = __('Disable the default warning that is displayed on the database details Structure page if any of the required tables for the relation features could not be found');
+$strConfigPmaNoRelation_DisableWarning_name = __('Missing relation tables (pmadb)');
 $strConfigPropertiesIconic_desc = __('Use only icons, only text or both');
 $strConfigPropertiesIconic_name = __('Iconic table operations');
 $strConfigProtectBinary_desc = __('Disallow BLOB and BINARY columns from editing');
@@ -455,6 +463,8 @@ $strConfigSQLValidator_use_desc = __('[strong]Warning:[/strong] requires PEAR SO
 $strConfigSQLValidator_use_name = __('Enable SQL Validator');
 $strConfigSQLValidator_username_name = __('Username');
 $strConfigSQLValidator_username_desc = __('If you have a custom username, specify it here (defaults to [kbd]anonymous[/kbd])');
+$strConfigSuhosinDisableWarning_desc = __('A warning is displayed on the main page if Suhosin is detected');
+$strConfigSuhosinDisableWarning_name = __('Suhosin warning');
 $strConfigSuggestDBName_desc = __('Suggest a database name on the &quot;Create Database&quot; form (if possible) or keep the text field empty');
 $strConfigSuggestDBName_name = __('Suggest new database name');
 $strConfigTextareaCols_desc = __('Textarea size (columns) in edit mode, this value will be emphasized for SQL query textareas (*2) and for query window (*1.25)');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 445493f6f..de83864bc 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -98,6 +98,10 @@ $forms['Features']['Page_titles'] = array(
     'TitleTable',
     'TitleDatabase',
     'TitleServer');
+$forms['Features']['Warnings'] = array(
+    'PmaNoRelation_DisableWarning',
+    'SuhosinDisableWarning',
+    'McryptDisableWarning');
 $forms['Features']['Other_core_settings'] = array(
     'NaturalOrder',
     'InitialSlidersState',
@@ -110,7 +114,8 @@ $forms['Features']['Other_core_settings'] = array(
     'ExecTimeLimit',
     'MemoryLimit',
     'SkipLockedTables',
-    'UseDbSearch');
+    'UseDbSearch',
+    'AllowThirdPartyFraming');
 $forms['Sql_queries']['Sql_queries'] = array(
     'ShowSQL',
     'Confirm',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 1fc8e14c1..33923c18f 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -57,6 +57,10 @@ $forms['Features']['Page_titles'] = array(
     'TitleTable',
     'TitleDatabase',
     'TitleServer');
+$forms['Features']['Warnings'] = array(
+    'PmaNoRelation_DisableWarning',
+    'SuhosinDisableWarning',
+    'McryptDisableWarning');
 $forms['Left_frame']['Left_frame'] = array(
     'LeftFrameLight',
     'LeftDisplayLogo',

From 7b0135ed6a4dea645c5c18859cb6f08906504153 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Wed, 21 Jul 2010 16:11:02 +0200
Subject: [PATCH 067/106] fix port number validation correct naming mistake
 (authentication != authorization) setup script: move server authentication
 settings to new tab

---
 Documentation.html                |  4 ++--
 js/config.js                      |  7 ++-----
 libraries/config/messages.inc.php | 10 +++++-----
 libraries/config/setup.forms.php  | 14 +++++++++-----
 libraries/config/validate.lib.php |  2 +-
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 506260526..e7358dd07 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1203,7 +1203,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         <span id="cfg_Servers_AllowDeny_order">$cfg['Servers'][$i]['AllowDeny']['order']</span> string
     </dt>
     <dd>If your rule order is empty, then <abbr title="Internet Protocol">IP</abbr>
-        authentication is disabled.<br /><br />
+        authorization is disabled.<br /><br />
 
         If your rule order is set to <tt>'deny,allow'</tt> then the system applies
         all deny rules followed by allow rules. Access is allowed by default. Any
@@ -1215,7 +1215,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         default.  Any client which does not match an Allow directive or does
         match a Deny directive will be denied access to the server.<br /><br />
 
-        If your rule order is set to 'explicit', the authentication is
+        If your rule order is set to 'explicit', authorization is
         performed in a similar fashion to rule order 'deny,allow', with the
         added restriction that your host/username combination <b>must</b> be
         listed in the <i>allow</i> rules, and not listed in the <i>deny</i>
diff --git a/js/config.js b/js/config.js
index dd18a29f1..ad4e88078 100644
--- a/js/config.js
+++ b/js/config.js
@@ -202,14 +202,11 @@ var validators = {
      * @param {boolean} isKeyUp
      */
     validate_port_number: function(isKeyUp) {
-        if (isKeyUp && this.value == '') {
+        if (this.value == '') {
             return true;
         }
         var result = validators._regexp_numeric.test(this.value) && this.value != '0';
-        if (!result || this.value > 65536) {
-            result = PMA_messages['error_incorrect_port'];
-        }
-        return result;
+        return result && this.value <= 65535 ? true : PMA_messages['error_incorrect_port'];
     },
     /**
      * Validates value according to given regular expression
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index a99092b70..b2b874c30 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -189,11 +189,11 @@ $strConfigForm_Query_window_desc = __('Customize query window options');
 $strConfigForm_Security = __('Security');
 $strConfigForm_Security_desc = __('Please note that phpMyAdmin is just a user interface and its features do not limit MySQL');
 $strConfigForm_Server = __('Basic settings');
+$strConfigForm_Server_auth = __('Authentication');
+$strConfigForm_Server_auth_desc = __('Authentication settings');
 $strConfigForm_Server_config = __('Server configuration');
 $strConfigForm_Server_config_desc = __('Advanced server configuration, do not change these options unless you know what they are for');
 $strConfigForm_Server_desc = __('Enter server connection parameters');
-$strConfigForm_Server_login_options = __('Signon login options');
-$strConfigForm_Server_login_options_desc = __('Enter login options for signon authentication');
 $strConfigForm_Server_pmadb = __('PMA database');
 $strConfigForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation');
 $strConfigForm_Server_tracking = __('Changes tracking');
@@ -345,9 +345,9 @@ $strConfigRestoreDefaultValue = __('Restore default value');
 $strConfigSaveDir_desc = __('Directory where exports can be saved on server');
 $strConfigSaveDir_name = __('Save directory');
 $strConfigServers_AllowDeny_order_desc = __('Leave blank if not used');
-$strConfigServers_AllowDeny_order_name = __('Host authentication order');
+$strConfigServers_AllowDeny_order_name = __('Host authorization order');
 $strConfigServers_AllowDeny_rules_desc = __('Leave blank for defaults');
-$strConfigServers_AllowDeny_rules_name = __('Host authentication rules');
+$strConfigServers_AllowDeny_rules_name = __('Host authorization rules');
 $strConfigServers_AllowNoPassword_name = __('Allow logins without a password');
 $strConfigServers_AllowRoot_name = __('Allow root login');
 $strConfigServers_auth_http_realm_desc = __('HTTP Basic Auth Realm name to display when doing HTTP Auth');
@@ -459,7 +459,7 @@ $strConfigSQLQuery_ShowAsPHP_name = __('Create PHP Code');
 $strConfigSQLQuery_Validate_desc = __('Requires [a@#tab_Sql_validator]SQL Validator[/a] to be enabled');
 $strConfigSQLQuery_Validate_name = __('Validate SQL');
 $strConfigSQLValidator_password_name = __('Password');
-$strConfigSQLValidator_use_desc = __('[strong]Warning:[/strong] requires PEAR SOAP to be installed');
+$strConfigSQLValidator_use_desc = __('[strong]Warning:[/strong] requires PHP SOAP extension or PEAR SOAP to be installed');
 $strConfigSQLValidator_use_name = __('Enable SQL Validator');
 $strConfigSQLValidator_username_name = __('Username');
 $strConfigSQLValidator_username_desc = __('If you have a custom username, specify it here (defaults to [kbd]anonymous[/kbd])');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index de83864bc..ab150a37c 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -30,13 +30,17 @@ $forms['Servers']['Server'] = array('Servers' => array(1 => array(
     'connect_type',
     'extension',
     'compress',
-    'auth_type' => ':group',
-    'auth_http_realm',
+    'nopassword')));
+$forms['Servers']['Server_auth'] = array('Servers' => array(1 => array(
+    'auth_type',
+    ':group:' . __('Config authentication'),
     'user',
     'password',
-    'nopassword',
-    'auth_swekey_config' => './swekey.conf')));
-$forms['Servers']['Server_login_options'] = array('Servers' => array(1 => array(
+    ':group:' . __('Cookie authentication'),
+    'auth_swekey_config' => './swekey.conf',
+    ':group:' . __('HTTP authentication'),
+    'auth_http_realm',
+    ':group:' . __('Signon authentication'),
     'SignonSession',
     'SignonURL',
     'LogoutURL')));
diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index 5cc252770..0a633420f 100644
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -383,7 +383,7 @@ function test_number($path, $values, $allow_neg, $allow_zero, $max_value, $error
  */
 function validate_port_number($path, $values)
 {
-    return array($path => test_number($path, $values, false, false, 65536, __('Not a valid port number')));
+    return array($path => test_number($path, $values, false, false, 65535, __('Not a valid port number')));
 }
 
 /**

From 7ac7e24d8cc97cb3c0234b0058661770c0d0f44c Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Thu, 22 Jul 2010 01:29:36 +0200
Subject: [PATCH 068/106] more styling for disabled options new "Developer" tab
 (by default all options are disabled, users can't modify them) fixed
 UserprefsDisallow export in setup script

---
 libraries/config.default.php                  |  9 +++-
 libraries/config/ConfigFile.class.php         | 11 ++--
 libraries/config/FormDisplay.class.php        | 54 ++++++++++---------
 libraries/config/FormDisplay.tpl.php          | 23 +++++---
 libraries/config/messages.inc.php             |  8 ++-
 libraries/config/setup.forms.php              |  5 ++
 libraries/config/user_preferences.forms.php   | 23 ++++----
 libraries/user_preferences.inc.php            |  2 +-
 prefs_forms.php                               | 13 +++++
 setup/scripts.js                              |  3 ++
 .../darkblue_orange/css/theme_right.css.php   |  7 +++
 themes/original/css/theme_right.css.php       |  7 +++
 12 files changed, 119 insertions(+), 46 deletions(-)

diff --git a/libraries/config.default.php b/libraries/config.default.php
index 4524cb268..df641a899 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2310,11 +2310,16 @@ $cfg['InitialSlidersState'] = 'closed';
 
 /**
  * User preferences: disallow these settings
- * For possible setting names look in libraries/config/user_preferences.forms.php
+ * For possible setting names look in libraries/config/user_preferences.forms.php. Use
+ * <code>
+ * $cfg['UserprefsDisallow'] = array_merge($this->settings['UserprefsDisallow'], array());
+ * </code>
+ * to append new keys.
  *
  * @global array $cfg['UserprefsDisallow']
  */
-$cfg['UserprefsDisallow'] = array();
+$cfg['UserprefsDisallow'] = array(
+    'Error_Handler/display', 'Error_Handler/gather', 'DBG/sql', 'DBG/php');
 
 /**
  * User preferences: disabling options by users
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index 2d3ff28d5..869f9a72e 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -520,18 +520,23 @@ class ConfigFile
             foreach ($var_value as $v) {
                 $retv[] = var_export($v, true);
             }
+            $ret = "\$cfg['$var_name'] = array(";
+            $ret_end = ');' . $crlf;
+            if ($var_name == 'UserprefsDisallow') {
+                $ret = "\$cfg['$var_name'] = array_merge(\$this->settings['UserprefsDisallow'],\n\tarray(";
+                $ret_end = ')' . $ret_end;
+            }
             if (count($retv) <= 4) {
                 // up to 4 values - one line
-                $ret = "\$cfg['$var_name'] = array(" . implode(', ', $retv) . ');' . $crlf;
+                $ret .= implode(', ', $retv);
             } else {
                 // more than 4 values - value per line
-                $ret = "\$cfg['$var_name'] = array(";
                 $imax = count($retv)-1;
                 for ($i = 0; $i <= $imax; $i++) {
                     $ret .= ($i < $imax ? ($i > 0 ? ',' : '') : '') . $crlf . '    ' . $retv[$i];
                 }
-                $ret .= ');' . $crlf;
             }
+            $ret .= $ret_end;
         } else {
             // string keys: $cfg[key][subkey] = value
             foreach ($var_value as $k => $v) {
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 7f9f56613..1fbd33998 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -175,7 +175,6 @@ class FormDisplay
         $this->is_validated = true;
     }
 
-
     /**
      * Outputs HTML for forms
      *
@@ -192,7 +191,6 @@ class FormDisplay
      * @uses PMA_config_get_validators()
      * @uses PMA_jsFormat()
      * @uses PMA_lang()
-     * @uses PMA_read_userprefs_fieldnames()
      * @param bool $tabbed_form
      * @param bool   $show_restore_default  whether show "restore default" button besides the input field
      */
@@ -229,14 +227,9 @@ class FormDisplay
         }
 
         // user preferences
-        if ($this->userprefs_keys === null) {
-            $this->userprefs_keys = array_flip(PMA_read_userprefs_fieldnames());
-            // read real config for user preferences display
-            $userprefs_disallow = defined('PMA_SETUP') && PMA_SETUP
-                ? ConfigFile::getInstance()->get('UserprefsDisallow', array())
-                : $GLOBALS['cfg']['UserprefsDisallow'];
-            $this->userprefs_disallow = array_flip($userprefs_disallow);
-        }
+        $this->_loadUserprefsInfo();
+        $default_disallow = array_flip(
+            ConfigFile::getInstance()->getDefault('UserprefsDisallow', array()));
 
         // display forms
         foreach ($this->forms as $form) {
@@ -252,9 +245,10 @@ class FormDisplay
             foreach ($form->fields as $field => $path) {
                 $work_path = array_search($path, $this->system_paths);
                 $translated_path = $this->translated_paths[$work_path];
-                // always true/false for user preferences display
+                // always true/false/'disable' for user preferences display
+                // otherwise null
                 $userprefs_allow = isset($this->userprefs_keys[$path])
-                    ? !isset($this->userprefs_disallow[$path])
+                    ? (isset($default_disallow[$path]) ? 'disable' : !isset($this->userprefs_disallow[$path]))
                     : null;
                 // display input
                 $this->_displayFieldInput($form, $field, $path, $work_path,
@@ -306,7 +300,8 @@ class FormDisplay
      * @param string $work_path             work path, eg. Servers/4/verbose
      * @param string $translated_path       work path changed so that it can be used as XHTML id
      * @param bool   $show_restore_default  whether show "restore default" button besides the input field
-     * @param mixed  $userprefs_allow       whether user preferences are enabled for this field (null - no support, true/false - enabled/disabled)
+     * @param mixed  $userprefs_allow       whether user preferences are enabled for this field
+     *                                      (null - no support, true/false - enabled/disabled)
      * @param array  &$js_default           array which stores JavaScript code to be displayed
      */
     private function _displayFieldInput(Form $form, $field, $system_path, $work_path,
@@ -490,7 +485,6 @@ class FormDisplay
      * @uses Form::getOptionType()
      * @uses Form::getOptionValueList()
      * @uses PMA_lang_name()
-     * @uses PMA_read_userprefs_fieldnames()
      * @param  array|string  $forms               array of form names
      * @param  bool          $allow_partial_save  allows for partial form saving on failed validation
      * @return boolean  true on success (no errors and all saved)
@@ -504,13 +498,8 @@ class FormDisplay
         $values = array();
         $to_save = array();
         $is_setup_script = defined('PMA_SETUP') && PMA_SETUP;
-        if ($is_setup_script && $this->userprefs_keys === null) {
-            $this->userprefs_keys = array_flip(PMA_read_userprefs_fieldnames());
-            // read real config for user preferences display
-            $userprefs_disallow = $is_setup_script
-                ? ConfigFile::getInstance()->get('UserprefsDisallow', array())
-                : $GLOBALS['cfg']['UserprefsDisallow'];
-            $this->userprefs_disallow = array_flip($userprefs_disallow);
+        if ($is_setup_script) {
+            $this->_loadUserprefsInfo();
         }
 
         $this->errors = array();
@@ -664,7 +653,7 @@ class FormDisplay
         if ($test == 'Import' || $test == 'Export') {
             return '';
         }
-        return 'Documentation.html#cfg_' . self::_getOptName($path);
+        return 'Documentation.html#cfg_' . $this->_getOptName($path);
     }
 
     /**
@@ -675,7 +664,7 @@ class FormDisplay
      */
     public function getWikiLink($path)
     {
-        $opt_name = self::_getOptName($path);
+        $opt_name = $this->_getOptName($path);
         if (substr($opt_name, 0, 7) == 'Servers') {
             $opt_name = substr($opt_name, 8);
             if (strpos($opt_name, 'AllowDeny') === 0) {
@@ -701,11 +690,28 @@ class FormDisplay
      * @param string $path
      * @return string
      */
-    private static function _getOptName($path)
+    private function _getOptName($path)
     {
       return str_replace(
           array('Servers/1/', 'disable/', '/'),
           array('Servers/', '', '_'), $path);
     }
+
+    /**
+     * Fills out {@link userprefs_keys} and {@link userprefs_disallow}
+     *
+     * @uses PMA_read_userprefs_fieldnames()
+     */
+    private function _loadUserprefsInfo()
+    {
+        if ($this->userprefs_keys === null) {
+            $this->userprefs_keys = array_flip(PMA_read_userprefs_fieldnames());
+            // read real config for user preferences display
+            $userprefs_disallow = defined('PMA_SETUP') && PMA_SETUP
+                ? ConfigFile::getInstance()->get('UserprefsDisallow', array())
+                : $GLOBALS['cfg']['UserprefsDisallow'];
+            $this->userprefs_disallow = array_flip($userprefs_disallow);
+        }
+    }
 }
 ?>
\ No newline at end of file
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index db20bbb95..5e443bdfa 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -104,7 +104,8 @@ function display_fieldset_top($title = '', $description = '', $errors = null, $a
  * o errors - error array
  * o setvalue - (string) shows button allowing to set poredefined value
  * o show_restore_default - (boolean) whether show "restore default" button
- * o userprefs_allow - whether user preferences are enabled for this field (null - no support, true/false - enabled/disabled)
+ * o userprefs_allow - whether user preferences are enabled for this field (null - no support,
+ *                     true/false - enabled/disabled, 'disable' - false and field is disabled)
  * o userprefs_comment - (string) field comment
  * o values - key - value paris for <select> fields
  * o values_escaped - (boolean) tells whether values array is already escaped (defaults to false)
@@ -136,21 +137,26 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
             : $_SESSION['PMA_Theme']->img_path;
     }
     $has_errors = isset($opts['errors']) && !empty($opts['errors']);
+    $option_is_disabled = !$is_setup_script && isset($opts['userprefs_allow']) && !$opts['userprefs_allow'];
+    $name_id = 'name="' . htmlspecialchars($path) . '" id="' . htmlspecialchars($path) . '"';
     $field_class = $type == 'checkbox' ? 'checkbox' : '';
     if (!$value_is_default) {
         $field_class .= ($field_class == '' ? '' : ' ') . ($has_errors ? 'custom field-error' : 'custom');
     }
     $field_class = $field_class ? ' class="' . $field_class . '"' : '';
-    $name_id = 'name="' . htmlspecialchars($path) . '" id="' . htmlspecialchars($path) . '"';
-    $tr_class = $_FormDisplayGroup ? ' class="group-field"' : '';
+    $tr_class = $_FormDisplayGroup ? 'group-field' : '';
     if (isset($opts['setvalue']) && $opts['setvalue'] == ':group') {
         unset($opts['setvalue']);
-        $tr_class = ' class="group-header-field"';
+        $tr_class = 'group-header-field';
         if ($_FormDisplayGroup) {
             display_group_footer();
         }
         $_FormDisplayGroup = true;
     }
+    if ($option_is_disabled) {
+        $tr_class .= ($tr_class ? ' ' : '') . 'disabled-field';
+    }
+    $tr_class = $tr_class ? ' class="' . $tr_class . '"' : '';
 ?>
 <tr<?php echo $tr_class ?>>
     <th>
@@ -161,7 +167,7 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
             <?php if (!empty($opts['wiki'])){ ?><a href="<?php echo $opts['wiki'] ?>" target="wiki"><img class="icon" src="<?php echo $img_path ?>b_info.png" width="11" height="11" alt="Wiki" title="Wiki" /></a><?php } ?>
         </span>
         <?php } ?>
-        <?php if (!$is_setup_script && isset($opts['userprefs_allow']) && !$opts['userprefs_allow']) { ?>
+        <?php if ($option_is_disabled) { ?>
             <span class="disabled-notice" title="<?php echo __('This setting is disabled, it will not be applied to your configuration') ?>"><?php echo __('Disabled') ?></span>
         <?php } ?>
         <?php if (!empty($description)) { ?><small><?php echo $description ?></small><?php } ?>
@@ -252,9 +258,14 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
     </td>
     <?php
     if ($is_setup_script && isset($opts['userprefs_allow'])) {
+        $disabled = '';
+        if ($opts['userprefs_allow'] === 'disable') {
+            $opts['userprefs_allow'] = false;
+            $disabled = ' disabled="$disabled"';
+        }
     ?>
     <td class="userprefs-allow" title="<?php echo __('Allow users to customize this value') ?>">
-        <input type="checkbox" name="<?php echo $path ?>-userprefs-allow" <?php if ($opts['userprefs_allow']) echo 'checked="checked"' ?> />
+        <input type="checkbox"<?php echo $disabled ?> name="<?php echo $path ?>-userprefs-allow" <?php if ($opts['userprefs_allow']) echo 'checked="checked"' ?> />
     </td>
     <?php
     } else if ($is_setup_script) {
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index b2b874c30..952f595ba 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -39,6 +39,8 @@ $strConfigConfigurationFile = __('Configuration file');
 $strConfigConfirm_desc = __('Whether a warning (&quot;Are your really sure...&quot;) should be displayed when you\'re about to lose data');
 $strConfigConfirm_name = __('Confirm DROP queries');
 $strConfigCtrlArrowsMoving_name = __('Field navigation using Ctrl+Arrows');
+$strConfigDBG_php_name = __('Debug PHP');
+$strConfigDBG_sql_name = __('Debug SQL');
 $strConfigDefaultDisplay_name = __('Default display direction');
 $strConfigDefaultPropDisplay_desc = __('[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates maximum number for which vertical model is used');
 $strConfigDefaultPropDisplay_name = __('Display direction for altering/creating columns');
@@ -56,6 +58,8 @@ $strConfigDisplayServersList_desc = __('Show server listing as a list instead of
 $strConfigDisplayServersList_name = __('Display servers as a list');
 $strConfigEditInWindow_desc = __('Edit SQL queries in popup window');
 $strConfigEditInWindow_name = __('Edit in window');
+$strConfigError_Handler_display_name = __('Display errors');
+$strConfigError_Handler_gather_name = __('Gather errors');
 $strConfigErrorIconic_desc = __('Show icons for warning, error and information messages');
 $strConfigErrorIconic_name = __('Iconic errors');
 $strConfigExecTimeLimit_desc = __('Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)');
@@ -152,13 +156,15 @@ $strConfigForm_CodeGen = 'CodeGen';
 $strConfigForm_CodeGen_desc = __('Customize default options');
 $strConfigForm_Csv = __('CSV');
 $strConfigForm_Csv_desc = __('Customize default options');
+$strConfigForm_Developer = __('Developer');
+$strConfigForm_Developer_desc = __('Settings for phpMyAdmin developers');
 $strConfigForm_Edit = __('Edit mode');
 $strConfigForm_Edit_desc = __('Customize edit mode');
 $strConfigForm_Export = __('Export');
 $strConfigForm_Export_defaults = __('Export defaults');
 $strConfigForm_Export_defaults_desc = __('Customize default export options');
 $strConfigForm_Features = __('Features');
-$strConfigForm_General = __('General settings');
+$strConfigForm_General = __('General');
 $strConfigForm_General_desc = __('Set some commonly used options');
 $strConfigForm_Import = __('Import');
 $strConfigForm_Import_defaults = __('Import defaults');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index ab150a37c..e98eae2ce 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -106,6 +106,11 @@ $forms['Features']['Warnings'] = array(
     'PmaNoRelation_DisableWarning',
     'SuhosinDisableWarning',
     'McryptDisableWarning');
+$forms['Features']['Developer'] = array(
+    'Error_Handler/display',
+    'Error_Handler/gather',
+    'DBG/sql',
+    'DBG/php');
 $forms['Features']['Other_core_settings'] = array(
     'NaturalOrder',
     'InitialSlidersState',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 33923c18f..73cc64633 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -31,6 +31,20 @@ $forms['Features']['Text_fields'] = array(
     'TextareaCols',
     'TextareaRows',
     'LongtextDoubleTextarea');
+$forms['Features']['Page_titles'] = array(
+    'TitleDefault',
+    'TitleTable',
+    'TitleDatabase',
+    'TitleServer');
+$forms['Features']['Warnings'] = array(
+    'PmaNoRelation_DisableWarning',
+    'SuhosinDisableWarning',
+    'McryptDisableWarning');
+$forms['Features']['Developer'] = array(
+    'Error_Handler/display',
+    'Error_Handler/gather',
+    'DBG/sql',
+    'DBG/php');
 $forms['Sql_queries']['Sql_queries'] = array(
     'ShowSQL',
     'Confirm',
@@ -52,15 +66,6 @@ $forms['Sql_queries']['Sql_validator'] = array(
     'SQLValidator/use',
     'SQLValidator/username',
     'SQLValidator/password');
-$forms['Features']['Page_titles'] = array(
-    'TitleDefault',
-    'TitleTable',
-    'TitleDatabase',
-    'TitleServer');
-$forms['Features']['Warnings'] = array(
-    'PmaNoRelation_DisableWarning',
-    'SuhosinDisableWarning',
-    'McryptDisableWarning');
 $forms['Left_frame']['Left_frame'] = array(
     'LeftFrameLight',
     'LeftDisplayLogo',
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 2854de918..5ec95d83b 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -30,7 +30,7 @@ echo PMA_generate_html_tab(array(
     'link' => 'prefs_manage.php',
     'text' => __('Manage your settings'))) . "\n";
 echo '<li>&nbsp; &nbsp;</li>' . "\n";
-$script_name = basename(basename($GLOBALS['PMA_PHP_SELF']));
+$script_name = basename($GLOBALS['PMA_PHP_SELF']);
 foreach (array_keys($forms) as $formset) {
     $tab = array(
         'link' => 'prefs_forms.php',
diff --git a/prefs_forms.php b/prefs_forms.php
index a73e529d3..06cad1c7c 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -26,6 +26,19 @@ require_once './libraries/user_preferences.inc.php';
 
 $form_display = new FormDisplay();
 foreach ($forms[$form_param] as $form_name => $form) {
+    // skip Developer form if no setting is available
+    if ($form_name == 'Developer') {
+        $show = false;
+        foreach ($form as $field_name) {
+            if (array_search($field_name, $GLOBALS['cfg']['UserprefsDisallow']) === false) {
+                $show = true;
+                break;
+            }
+        }
+        if (!$show) {
+            continue;
+        }
+    }
     $form_display->registerForm($form_name, $form);
 }
 
diff --git a/setup/scripts.js b/setup/scripts.js
index 8a853c08a..f223e0436 100644
--- a/setup/scripts.js
+++ b/setup/scripts.js
@@ -183,6 +183,9 @@ $(function() {
            return;
        }
        var el = $(this).find('input');
+       if (el.attr('disabled')) {
+           return;
+       }
        el.attr('checked', !el.attr('checked'));
    });
 });
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index 446f3c0a1..11f78653c 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -1445,6 +1445,13 @@ fieldset .group-field th {
     padding-left: 1.5em;
 }
 
+fieldset .disabled-field th,
+fieldset .disabled-field th small,
+fieldset .disabled-field td {
+    color: #777;
+    background-color: #eee;
+}
+
 .config-form .lastrow {
     border-top: 1px #000 solid;
 }
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 028dd57dc..33bdfb7a3 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1377,6 +1377,13 @@ fieldset .group-field th {
     padding-left: 1.5em;
 }
 
+fieldset .disabled-field th,
+fieldset .disabled-field th small,
+fieldset .disabled-field td {
+    color: #666;
+    background-color: #ddd;
+}
+
 .config-form .lastrow {
     border-top: 1px #000 solid;
 }

From 7399ce3e6137742af746cbc08389a3e29e186a13 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Thu, 22 Jul 2010 12:37:51 +0200
Subject: [PATCH 069/106] a few changes on preferences manage page fix JS date
 generation on preferences export to localStorage

---
 js/config.js     | 15 +++++++--------
 prefs_manage.php | 18 ++++++++----------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/js/config.js b/js/config.js
index ad4e88078..e0edb4c8d 100644
--- a/js/config.js
+++ b/js/config.js
@@ -636,12 +636,12 @@ $(function() {
         .attr('disabled', false)
         .add('#export_text_file, #import_text_file')
         .click(function(){
-            var show_id = $(this).attr('id');
-            var hide_id = show_id.match(/local_storage$/)
-                ? show_id.replace(/local_storage$/, 'text_file')
-                : show_id.replace(/text_file$/, 'local_storage');
-        $('#opts_'+hide_id).hide();
-        $('#opts_'+show_id).show();
+            var enable_id = $(this).attr('id');
+            var disable_id = enable_id.match(/local_storage$/)
+                ? enable_id.replace(/local_storage$/, 'text_file')
+                : enable_id.replace(/text_file$/, 'local_storage');
+        $('#opts_'+disable_id).addClass('disabled').find('input').attr('disabled', true);
+        $('#opts_'+enable_id).removeClass('disabled').find('input').attr('disabled', false);;
     });
 
     // detect localStorage state
@@ -690,7 +690,6 @@ function savePrefsToLocalStorage(form)
 {
     form = $(form);
     var submit = form.find('input[type=submit]');
-    //PMA_messages['strPrefsSaved']
     submit.attr('disabled', true);
     $.ajax({
         url: 'prefs_manage.php',
@@ -737,7 +736,7 @@ function formatDate(d)
 {
     return d.getFullYear() + '-'
         + (d.getMonth() < 10 ? '0'+d.getMonth() : d.getMonth())
-        + '-' + (d.getDay() < 10 ? '0'+d.getDay() : d.getDay())
+        + '-' + (d.getDate() < 10 ? '0'+d.getDate() : d.getDate())
         + ' ' + (d.getHours() < 10 ? '0'+d.getHours() : d.getHours())
         + ':' + (d.getMinutes() < 10 ? '0'+d.getMinutes() : d.getMinutes());
 }
diff --git a/prefs_manage.php b/prefs_manage.php
index 9eeacbc6d..da2fa09ed 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -223,18 +223,15 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: __DATE__'));
                 echo PMA_generate_common_hidden_inputs() . "\n";
                 ?>
                 <input type="hidden" name="json" value="" />
-                <div>
-                    <input type="radio" id="import_text_file" name="import_type" value="text_file" checked="checked" />
-                    <label for="import_text_file"><?php echo __('Import from text file') ?></label>
-                    <br />
-                    <input type="radio" id="import_local_storage" name="import_type" value="local_storage" disabled="disabled" />
-                    <label for="import_local_storage"><?php echo __('Import from browser\'s storage') ?></label>
-                </div>
+                <input type="radio" id="import_text_file" name="import_type" value="text_file" checked="checked" />
+                <label for="import_text_file"><?php echo __('Import from file') ?></label>
                 <div id="opts_import_text_file" class="prefsmanage_opts">
                     <label for="input_import_file"><?php echo __('Location of the text file'); ?></label>
                     <input type="file" name="import_file" id="input_import_file" />
                 </div>
-                <div id="opts_import_local_storage" class="prefsmanage_opts" style="display:none">
+                <input type="radio" id="import_local_storage" name="import_type" value="local_storage" disabled="disabled" />
+                <label for="import_local_storage"><?php echo __('Import from browser\'s storage') ?></label>
+                <div id="opts_import_local_storage" class="prefsmanage_opts disabled">
                     <div class="localStorage-supported">
                         <?php echo __('Settings will be imported from your browser\'s local storage.') ?>
                         <br />
@@ -249,6 +246,7 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: __DATE__'));
                         <?php PMA_Message::notice(__('This feature is not supported by your web browser'))->display() ?>
                     </span>
                 </div>
+
                 <input type="checkbox" id="import_merge" name="import_merge" />
                 <label for="import_merge"><?php echo __('Merge with current configuration') ?></label>
                 <br /><br />
@@ -274,11 +272,11 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: __DATE__'));
                     <input type="radio" id="export_local_storage" name="export_type" value="local_storage" disabled="disabled" />
                     <label for="export_local_storage"><?php echo __('Save to browser\'s storage') ?></label>
                 </div>
-                <div id="opts_export_local_storage" class="prefsmanage_opts" style="display:none">
+                <div id="opts_export_local_storage" class="prefsmanage_opts disabled">
                     <span class="localStorage-supported">
                         <?php echo __('Settings will be saved in your browser\'s local storage.') ?>
                         <span class="localStorage-exists">
-                            <b><?php PMA_Message::notice(__('Existing settings will be overridden!'))->display() ?></b>
+                            <br /><b><?php echo __('Existing settings will be overwritten!') ?></b>
                         </span>
                     </span>
                     <span class="localStorage-unsupported">

From c8b6acdf59b9c18d94abcbb58af216683bf23658 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Thu, 22 Jul 2010 17:02:17 +0200
Subject: [PATCH 070/106] remove debug use proper function to cancel event

---
 js/config.js    | 2 +-
 prefs_forms.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/js/config.js b/js/config.js
index e0edb4c8d..24b6e169e 100644
--- a/js/config.js
+++ b/js/config.js
@@ -752,7 +752,7 @@ function offerPrefsAutoimport()
         return;
     }
     cnt.find('a').click(function(e) {
-        e.stopPropagation();
+        e.preventDefault();
         var a = $(this);
         if (a.attr('href') == '#no') {
             cnt.remove();
diff --git a/prefs_forms.php b/prefs_forms.php
index 06cad1c7c..2ff08fca8 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -79,8 +79,6 @@ if (!$form_display->process(false)) {
         $form_display->display(true, true);
     }
 }
-// todo: remove debug
-$GLOBALS['error_handler']->dispAllErrors();
 
 /**
  * Displays the footer

From 2e55d85ab5adff22e6c766b2c857fd60a62416cd Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Thu, 22 Jul 2010 20:04:16 +0200
Subject: [PATCH 071/106] Developers tab no longer depends on
 UserprefsDisallow, introduced UserprefsDeveloperTab setting

---
 libraries/config.default.php                | 14 +++++++-------
 libraries/config/ConfigFile.class.php       |  7 +------
 libraries/config/FormDisplay.class.php      |  6 ++----
 libraries/config/FormDisplay.tpl.php        |  9 ++-------
 libraries/config/messages.inc.php           |  2 ++
 libraries/config/setup.forms.php            |  1 +
 libraries/config/user_preferences.forms.php |  1 +
 libraries/user_preferences.lib.php          |  7 +++++++
 prefs_forms.php                             | 13 ++-----------
 9 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/libraries/config.default.php b/libraries/config.default.php
index df641a899..97c513d9b 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2310,16 +2310,16 @@ $cfg['InitialSlidersState'] = 'closed';
 
 /**
  * User preferences: disallow these settings
- * For possible setting names look in libraries/config/user_preferences.forms.php. Use
- * <code>
- * $cfg['UserprefsDisallow'] = array_merge($this->settings['UserprefsDisallow'], array());
- * </code>
- * to append new keys.
+ * For possible setting names look in libraries/config/user_preferences.forms.php
  *
  * @global array $cfg['UserprefsDisallow']
  */
-$cfg['UserprefsDisallow'] = array(
-    'Error_Handler/display', 'Error_Handler/gather', 'DBG/sql', 'DBG/php');
+$cfg['UserprefsDisallow'] = array();
+
+/**
+ * User preferences: enable the Developer tab
+ */
+$cfg['UserprefsDeveloperTab'] = false;
 
 /**
  * User preferences: disabling options by users
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index 869f9a72e..a6acb94f3 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -521,11 +521,6 @@ class ConfigFile
                 $retv[] = var_export($v, true);
             }
             $ret = "\$cfg['$var_name'] = array(";
-            $ret_end = ');' . $crlf;
-            if ($var_name == 'UserprefsDisallow') {
-                $ret = "\$cfg['$var_name'] = array_merge(\$this->settings['UserprefsDisallow'],\n\tarray(";
-                $ret_end = ')' . $ret_end;
-            }
             if (count($retv) <= 4) {
                 // up to 4 values - one line
                 $ret .= implode(', ', $retv);
@@ -536,7 +531,7 @@ class ConfigFile
                     $ret .= ($i < $imax ? ($i > 0 ? ',' : '') : '') . $crlf . '    ' . $retv[$i];
                 }
             }
-            $ret .= $ret_end;
+            $ret .= ');' . $crlf;
         } else {
             // string keys: $cfg[key][subkey] = value
             foreach ($var_value as $k => $v) {
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 1fbd33998..c2d3e581c 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -228,8 +228,6 @@ class FormDisplay
 
         // user preferences
         $this->_loadUserprefsInfo();
-        $default_disallow = array_flip(
-            ConfigFile::getInstance()->getDefault('UserprefsDisallow', array()));
 
         // display forms
         foreach ($this->forms as $form) {
@@ -245,10 +243,10 @@ class FormDisplay
             foreach ($form->fields as $field => $path) {
                 $work_path = array_search($path, $this->system_paths);
                 $translated_path = $this->translated_paths[$work_path];
-                // always true/false/'disable' for user preferences display
+                // always true/false for user preferences display
                 // otherwise null
                 $userprefs_allow = isset($this->userprefs_keys[$path])
-                    ? (isset($default_disallow[$path]) ? 'disable' : !isset($this->userprefs_disallow[$path]))
+                    ? !isset($this->userprefs_disallow[$path])
                     : null;
                 // display input
                 $this->_displayFieldInput($form, $field, $path, $work_path,
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 5e443bdfa..fa49518d8 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -105,7 +105,7 @@ function display_fieldset_top($title = '', $description = '', $errors = null, $a
  * o setvalue - (string) shows button allowing to set poredefined value
  * o show_restore_default - (boolean) whether show "restore default" button
  * o userprefs_allow - whether user preferences are enabled for this field (null - no support,
- *                     true/false - enabled/disabled, 'disable' - false and field is disabled)
+ *                     true/false - enabled/disabled)
  * o userprefs_comment - (string) field comment
  * o values - key - value paris for <select> fields
  * o values_escaped - (boolean) tells whether values array is already escaped (defaults to false)
@@ -258,14 +258,9 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
     </td>
     <?php
     if ($is_setup_script && isset($opts['userprefs_allow'])) {
-        $disabled = '';
-        if ($opts['userprefs_allow'] === 'disable') {
-            $opts['userprefs_allow'] = false;
-            $disabled = ' disabled="$disabled"';
-        }
     ?>
     <td class="userprefs-allow" title="<?php echo __('Allow users to customize this value') ?>">
-        <input type="checkbox"<?php echo $disabled ?> name="<?php echo $path ?>-userprefs-allow" <?php if ($opts['userprefs_allow']) echo 'checked="checked"' ?> />
+        <input type="checkbox" name="<?php echo $path ?>-userprefs-allow" <?php if ($opts['userprefs_allow']) echo 'checked="checked"' ?> />
     </td>
     <?php
     } else if ($is_setup_script) {
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 952f595ba..351f7186b 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -491,6 +491,8 @@ $strConfigUploadDir_desc = __('Directory on server where you can upload files fo
 $strConfigUploadDir_name = __('Upload directory');
 $strConfigUseDbSearch_desc = __('Allow for searching inside the entire database');
 $strConfigUseDbSearch_name = __('Use database search');
+$strConfigUserprefsDeveloperTab_name = __('Enable the Developer tab in settings');
+$strConfigUserprefsDeveloperTab_desc = __('When disabled, users cannot set any of the options below, regardless of the checkbox on the right');
 $strConfigVerboseMultiSubmit_desc = __('Show affected rows of each statement on multiple-statement queries. See libraries/import.lib.php for defaults on how many queries a statement may contain.');
 $strConfigVerboseMultiSubmit_name = __('Verbose multiple statements');
 $strConfigVersionCheckLink = __('Check for latest version');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index e98eae2ce..6609f101a 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -107,6 +107,7 @@ $forms['Features']['Warnings'] = array(
     'SuhosinDisableWarning',
     'McryptDisableWarning');
 $forms['Features']['Developer'] = array(
+    'UserprefsDeveloperTab',
     'Error_Handler/display',
     'Error_Handler/gather',
     'DBG/sql',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 73cc64633..25067a531 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -40,6 +40,7 @@ $forms['Features']['Warnings'] = array(
     'PmaNoRelation_DisableWarning',
     'SuhosinDisableWarning',
     'McryptDisableWarning');
+// settings from this form are treated specially, see prefs_forms.php and user_preferences.lib.php
 $forms['Features']['Developer'] = array(
     'Error_Handler/display',
     'Error_Handler/gather',
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 7290603dd..d0a631f10 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -134,6 +134,13 @@ function PMA_apply_userprefs(array $config_data)
 {
     $cfg = array();
     $blacklist = array_flip($GLOBALS['cfg']['UserprefsDisallow']);
+    if (!$GLOBALS['cfg']['UserprefsDeveloperTab']) {
+        // disallow everything in the Developers tab
+        $blacklist['Error_Handler/display'] = true;
+        $blacklist['Error_Handler/gather'] = true;
+        $blacklist['DBG/sql'] = true;
+        $blacklist['DBG/php'] = true;
+    }
     $whitelist = array_flip(PMA_read_userprefs_fieldnames());
     // whitelist some additional fields which are custom handled
     $whitelist['ThemeDefault'] = true;
diff --git a/prefs_forms.php b/prefs_forms.php
index 2ff08fca8..28d3fce5c 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -27,17 +27,8 @@ require_once './libraries/user_preferences.inc.php';
 $form_display = new FormDisplay();
 foreach ($forms[$form_param] as $form_name => $form) {
     // skip Developer form if no setting is available
-    if ($form_name == 'Developer') {
-        $show = false;
-        foreach ($form as $field_name) {
-            if (array_search($field_name, $GLOBALS['cfg']['UserprefsDisallow']) === false) {
-                $show = true;
-                break;
-            }
-        }
-        if (!$show) {
-            continue;
-        }
+    if ($form_name == 'Developer' && !$GLOBALS['cfg']['UserprefsDeveloperTab']) {
+        continue;
     }
     $form_display->registerForm($form_name, $form);
 }

From 5afd385f307759f6e7d5e4460ecf630390ff5d63 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sun, 25 Jul 2010 22:10:38 +0200
Subject: [PATCH 072/106] create menu for menu tabs which don't fit in one line
 fix tooltip.js error when not in pma frame

---
 js/functions.js                               |  93 ++++++++++++++++++
 js/tooltip.js                                 |   5 +-
 .../darkblue_orange/css/theme_right.css.php   |  67 ++++++++++---
 themes/darkblue_orange/img/b_more.png         | Bin 0 -> 963 bytes
 themes/original/css/theme_right.css.php       |  65 +++++++++---
 themes/original/img/b_more.png                | Bin 0 -> 1005 bytes
 6 files changed, 206 insertions(+), 24 deletions(-)
 create mode 100644 themes/darkblue_orange/img/b_more.png
 create mode 100644 themes/original/img/b_more.png

diff --git a/js/functions.js b/js/functions.js
index b5995f0f5..5ae2b6050 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1735,3 +1735,96 @@ $(document).ready(function(){
     }
 });
 
+function menuResize()
+{
+    var cnt = $('#topmenu');
+    var wmax = cnt.width() - 5; // 5 px margin for jumping menu in Chrome
+    var submenu = cnt.find('.submenu');
+    var submenu_w = submenu.outerWidth(true);
+    var submenu_ul = submenu.find('ul');
+    var li = $('#topmenu > li');
+    var li2 = submenu_ul.find('li');
+    var more_shown = li2.length > 0;
+    var w = more_shown ? submenu_w : 0;
+
+    // hide menu items
+    var hide_start = 0;
+    for (var i = 0; i < li.length-1; i++) { // li.length-1: skip .submenu element
+        var el = $(li[i]);
+        var el_width = el.outerWidth(true);
+        el.data('width', el_width);
+        w += el_width;
+        if (w > wmax) {
+            w -= el_width;
+            if (w + submenu_w < wmax) {
+                hide_start = i;
+            } else {
+                hide_start = i-1;
+                w -= $(li[i-1]).data('width');
+            }
+            break;
+        }
+    }
+
+    if (hide_start > 0) {
+        for (var i = hide_start; i < li.length-1; i++) {
+            $(li[i])[more_shown ? 'prependTo' : 'appendTo'](submenu_ul);
+        }
+        submenu.show();
+    } else if (more_shown) {
+        w -= submenu_w;
+        // nothing hidden, maybe something can be restored
+        for (var i = 0; i < li2.length; i++) {
+            //console.log(li2[i], submenu_w);
+            w += $(li2[i]).data('width');
+            if (w+submenu_w < wmax ) {//|| (i == li2.length-1 && w < wmax)
+                $(li2[i]).insertBefore(submenu);
+                if (i == li2.length-1) {
+                    submenu.hide();
+                }
+                continue;
+            }
+            break;
+        }
+    }
+    if (submenu.find('.tabactive').length) {
+        submenu.addClass('active').find('> a').removeClass('tab').addClass('tabactive');
+    } else {
+        submenu.removeClass('active').find('> a').addClass('tab').removeClass('tabactive');
+    }
+}
+
+$(function() {
+    // create submenu container
+    var link = $('<a />')
+        .attr({href: '#', 'class': 'tab'})
+        .text('More')
+        .click(function(e) {
+            e.preventDefault();
+        });
+    var img = $('#topmenucontainer li:first-child').find('img');
+    if (img.length) {
+        img = img.clone();
+        img.attr('src', img.attr('src').replace(/\/[^\/]+$/, '/b_more.png')).prependTo(link);
+    }
+    var submenu = $('<li />')
+        .attr('class', 'submenu')
+        .append(link)
+        .append($('<ul />').append($('#topmenu li.subitem')))
+        .mouseenter(function() {
+            if ($(this).find('ul .tabactive').length == 0) {
+                $(this).addClass('submenuhover').find('> a').addClass('tabactive');
+            }
+        })
+        .mouseleave(function() {
+            if ($(this).find('ul .tabactive').length == 0) {
+                $(this).removeClass('submenuhover').find('> a').removeClass('tabactive');
+            }
+        })
+        .hide();
+    $('#topmenu').append(submenu);
+
+    // populate submenu and register resize event
+    $(window).resize(menuResize);
+    menuResize();
+});
diff --git a/js/tooltip.js b/js/tooltip.js
index c6661f21a..5bbdd9f8f 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -31,6 +31,9 @@ var myTooltipContainer = null;
  */
 function PMA_TT_init()
 {
+    if (!window.parent.getElementsByClassName) {
+        return;
+    }
     // get all 'light bubbles' on page
     var tooltip_icons = window.parent.getElementsByClassName('footnotemarker', document, 'sup');
     var tooltip_count = tooltip_icons.length;
@@ -48,7 +51,7 @@ function PMA_TT_init()
     document.body.appendChild(myTooltipContainer);
 
     // capture mouse-events
-    for (i = 0; i < tooltip_count; i++) {
+    for (var i = 0; i < tooltip_count; i++) {
         window.parent.addEvent(tooltip_icons[i], 'mousemove', mouseMove);
         window.parent.addEvent(tooltip_icons[i], 'mouseover', pmaTooltip);
         window.parent.addEvent(tooltip_icons[i], 'mouseout', swapTooltip);
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index 09954d425..2059c255c 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -626,14 +626,44 @@ ul#topmenu li, ul#topmenu2 li {
 }
 
 /* default tab styles */
-ul#topmenu .tab, ul#topmenu .tabcaution, ul#topmenu .tabactive {
+ul#topmenu a, ul#topmenu span {
     display:            block;
     margin:             0.2em 0.2em 0 0.2em;
     padding:            0.2em 0.2em 0 0.2em;
     white-space:        nowrap;
 }
 
-ul#topmenu2 .tab, ul#topmenu2 .tabactive {
+ul#topmenu ul a {
+    margin:         0;
+    padding-bottom: 0.2em;
+}
+
+ul#topmenu .submenu {
+    position: relative;
+}
+
+ul#topmenu ul {
+    padding: 0;
+    margin: 0;
+    position: absolute;
+    right: 0;
+    list-style-type: none;
+    display: none;
+    -moz-box-shadow: 2px 2px 3px #666;
+    -webkit-box-shadow: 2px 2px 3px #666;
+    box-shadow: 2px 2px 3px #666;
+    border: 1px #666 solid;
+}
+
+ul#topmenu li:hover ul, ul#topmenu .submenuhover ul {
+    display: block;
+}
+
+ul#topmenu ul li {
+    width: 100%;
+}
+
+ul#topmenu2 a {
     display:            block;
     margin:             0.1em;
     padding:            0.2em;
@@ -676,29 +706,42 @@ ul#topmenu2 {
     clear: both;
 }
 
-ul#topmenu li {
+ul#topmenu > li {
     border-bottom:      1pt solid black;
 }
 
 /* default tab styles */
-ul#topmenu .tab, ul#topmenu .tabcaution, ul#topmenu .tabactive {
-    background-color:   <?php echo $GLOBALS['cfg']['BgOne']; ?>;
-    border:             1pt solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
-    border-bottom:      0;
+ul#topmenu a, ul#topmenu span {
+    background-color: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
+    border:           0 solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+    border-width:       1pt 1pt 0 1pt;
     -moz-border-radius: 0.4em 0.4em 0 0;
     border-radius:      0.4em 0.4em 0 0;
 }
 
+ul#topmenu ul a {
+    border-width:       1pt 0 0 0;
+    -moz-border-radius: 0;
+    border-radius:      0;
+}
+
+ul#topmenu ul li:first-child a {
+    border-width:       0;
+}
+
 /* enabled hover/active tabs */
-ul#topmenu a.tab:hover,
-ul#topmenu a.tabcaution:hover,
-ul#topmenu .tabactive,
-ul#topmenu .tabactive:hover {
+ul#topmenu > li > a:hover,
+ul#topmenu > li > .tabactive {
     margin:             0;
     padding:            0.2em 0.4em 0.2em 0.4em;
     text-decoration:    none;
 }
 
+ul#topmenu ul a:hover,
+ul#topmenu ul .tabactive {
+    text-decoration:    none;
+}
+
 ul#topmenu a.tab:hover,
 ul#topmenu .tabactive {
     background-color:   <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
@@ -713,7 +756,7 @@ ul#topmenu2 a.tabactive {
 }
 
 /* to be able to cancel the bottom border, use <li class="active"> */
-ul#topmenu li.active {
+ul#topmenu > li.active {
      border-bottom:      1pt solid <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
 }
 
diff --git a/themes/darkblue_orange/img/b_more.png b/themes/darkblue_orange/img/b_more.png
new file mode 100644
index 0000000000000000000000000000000000000000..161e0ff32086bf279c2549a523a52e3371c246fa
GIT binary patch
literal 963
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm
z@{>{(JaZG%Q-e|yQz{EjrrIztFe_w+M3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB
zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~
za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTc<hj*9RNP;kyKN>wn`Gtf;oFf&jv
zGt@IQHZeCh*HJJsFf`CNFw!?P(ls=<GB&a@Fi?O3B|8P1qLehNAQv~NT}3Hrwn`Z#
zB?VUc`sL;2dgaD?`9<mahL)C=ATx}Nbc<5bbc-wVN)jt{^NN*WCb*;)Cl_TFlw{`T
zDS%8&Ov*1Uu~kxn8e5TD05>+T7#d8;`MLTPi3R$GdIlgbLHwFq;OmQDX>KlDb#X~h
zD#E>34K5C;EJ)Q4N-fSWElN%eN=;J+xv9X)xhOTUB)=#mKR*W+iUAq<CHch}`2`Bj
z!KMn~nRzMs<;7stzP?tTdBr7(dC94sF1AV)xdnQenJHGL&W<K#hQ=0_rp`u&hAwW7
zCZ@)Yu4a~&Mn<kKM$T?9y)OC5rManjB{01y2)&j#^@0)tC@`#CQj0RnQd8WD@^cly
z9=6KF?G`hf=0WwQ;C72SPQChe3O4$nXhn)<m{5?58;A)`k)YIRr+`TIsd*{3N<~Wc
zcHA7IatsU%mYyz-Ar-fh5+qnfnB7eN)dzhwN}Bk?zw2m^g~%WEYgc<JME<ECI$go*
nVBRwEPQyR@S=Tan7?^k%Qk~gY^Y`>RgR+&UtDnm{r-UW|D3L0D

literal 0
HcmV?d00001

diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 73f57379d..b2a7aa190 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -601,14 +601,44 @@ ul#topmenu li, ul#topmenu2 li {
 }
 
 /* default tab styles */
-ul#topmenu .tab, ul#topmenu .tabcaution, ul#topmenu .tabactive {
+ul#topmenu a, ul#topmenu span {
     display:            block;
     margin:             0.2em 0.2em 0 0.2em;
     padding:            0.2em 0.2em 0 0.2em;
     white-space:        nowrap;
 }
 
-ul#topmenu2 .tab, ul#topmenu2 .tabactive {
+ul#topmenu ul a {
+    margin: 0;
+    padding-bottom: 0.2em;
+}
+
+ul#topmenu .submenu {
+    position: relative;
+}
+
+ul#topmenu ul {
+    margin: 0;
+    padding: 0;
+    position: absolute;
+    right: 0;
+    list-style-type: none;
+    display: none;
+    -moz-box-shadow: 2px 2px 3px #666;
+    -webkit-box-shadow: 2px 2px 3px #666;
+    box-shadow: 2px 2px 3px #666;
+    border: 1px #666 solid;
+}
+
+ul#topmenu li:hover ul, ul#topmenu .submenuhover ul {
+    display: block;
+}
+
+ul#topmenu ul li {
+    width: 100%;
+}
+
+ul#topmenu2 a {
     display:            block;
     margin:             0.1em;
     padding:            0.2em;
@@ -651,29 +681,42 @@ ul#topmenu2 {
     clear: both;
 }
 
-ul#topmenu li {
+ul#topmenu > li {
     border-bottom:      1pt solid black;
 }
 
 /* default tab styles */
-ul#topmenu .tab, ul#topmenu .tabcaution, ul#topmenu .tabactive {
+ul#topmenu a, ul#topmenu span {
     background-color:   <?php echo $GLOBALS['cfg']['BgOne']; ?>;
-    border:             1pt solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
-    border-bottom:      0;
+    border:             0 solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+    border-width:       1pt 1pt 0 1pt;
     -moz-border-radius: 0.4em 0.4em 0 0;
     border-radius:      0.4em 0.4em 0 0;
 }
 
+ul#topmenu ul a {
+    border-width:       1pt 0 0 0;
+    -moz-border-radius: 0;
+    border-radius:      0;
+}
+
+ul#topmenu ul li:first-child a {
+    border-width:       0;
+}
+
 /* enabled hover/active tabs */
-ul#topmenu a.tab:hover,
-ul#topmenu a.tabcaution:hover,
-ul#topmenu .tabactive,
-ul#topmenu .tabactive:hover {
+ul#topmenu > li > a:hover,
+ul#topmenu > li > .tabactive {
     margin:             0;
     padding:            0.2em 0.4em 0.2em 0.4em;
     text-decoration:    none;
 }
 
+ul#topmenu ul a:hover,
+ul#topmenu ul .tabactive {
+    text-decoration:    none;
+}
+
 ul#topmenu a.tab:hover,
 ul#topmenu .tabactive {
     background-color:   <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
@@ -688,7 +731,7 @@ ul#topmenu2 a.tabactive {
 }
 
 /* to be able to cancel the bottom border, use <li class="active"> */
-ul#topmenu li.active {
+ul#topmenu > li.active {
      border-bottom:      1pt solid <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
 }
 
diff --git a/themes/original/img/b_more.png b/themes/original/img/b_more.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a12e8cda897d9fd8418453f3e1920fd1a8e2a24
GIT binary patch
literal 1005
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm
z@{>{(JaZG%Q-e|yQz{EjrrIztFe_w+M3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB
zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~
za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTc<hj*9RNP;kyKN>wn`Gtf;oFf&jv
zGt@IQHZeCh*HJJsFf`CNFw!?P(ls=<GB&a@Fi?O3B|8P1qLehNAQv~NT}3Hrwn`Z#
zB?VUc`sL;2dgaD?`9<mahL)C=ATx}Nbc<5bbc-wVN)jt{^NN*WCb*;)Cl_TFlw{`T
zDS%8&Ov*1Uu~kxn8e5TD05>+T7#d8;`MLTPi3R$GdIlgbLHwFq;OmQDX>KlDb#X~h
zD#E>34K5C;EJ)Q4N-fSWElN%eN=;J+xv9X)xhOTUB)=#mKR*W+iUAq<CHch}`2`Bj
z!KMn~nRzMs<;7stzP?tTdBr7(dC94sF1AV)xdnQenJHFg1}?@1Ca$KIrp}gzhAwW7
zrsl?O#wLblE{2wlMy|#%y)OC5rManjB{01y2)$-F^@0)tC@`#CQj0RnQd8WD@^cly
z9=6KF?G|I4=0WwQ;C71%PQChe3O4$nXhn)<m{5?58;A)`k)YIRr+`TIsd*{3N<~Wc
zc2e^Fo(v2O$(}BbAr-fh{`~)M&#c<e+2~}z!;{cxC?P4?$>*DJz&J^Q!H8Mq`t94@
z!O4Y%hCZ@>`UXy-f=eZ{B^Y8G5;;2fh19JCCh{I!F8M|!!i$AX>Dq@w&vKqzIc+g(
eil#Y(!U2XQ&B~W%ZWh=K%7C7(elF{r5}E)aFgK<E

literal 0
HcmV?d00001


From b39567f38183b05c9a1c7511782ea148ba1c892e Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sun, 25 Jul 2010 22:58:14 +0200
Subject: [PATCH 073/106] revert disable/* options

---
 libraries/config.default.php                | 10 ----------
 libraries/config/FormDisplay.class.php      | 12 +++---------
 libraries/config/FormDisplay.tpl.php        |  3 ---
 libraries/config/config_functions.lib.php   |  4 ++--
 libraries/config/user_preferences.forms.php |  9 ++-------
 libraries/user_preferences.lib.php          | 16 ----------------
 6 files changed, 7 insertions(+), 47 deletions(-)

diff --git a/libraries/config.default.php b/libraries/config.default.php
index ee74f7c9b..0a7835b6a 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2314,16 +2314,6 @@ $cfg['UserprefsDisallow'] = array();
  */
 $cfg['UserprefsDeveloperTab'] = false;
 
-/**
- * User preferences: disabling options by users
- */
-$cfg['disable'] = array(
-    'AllowUserDropDatabase' => false,
-    'UseDbSearch' => false,
-    'QueryHistoryDB' => false,
-    'ShowPhpInfo' => false,
-    'ShowChgPassword' => false);
-
 /*******************************************************************************
  * Window title settings
  */
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index c2d3e581c..b1caa788e 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -321,12 +321,8 @@ class FormDisplay
             'doc' => $this->getDocLink($system_path),
             'wiki' =>  $this->getWikiLink($system_path),
             'show_restore_default' => $show_restore_default,
-            'userprefs_allow' => $userprefs_allow);
-        $comment = PMA_lang_name($system_path, 'cmt', '');
-        if ($cf->getDefault('disable/' . $system_path) === false) {
-            $comment .= ($comment ? "\n" : '') . __('Users can disable this option');
-        }
-        $opts['userprefs_comment'] = $comment;
+            'userprefs_allow' => $userprefs_allow,
+            'userprefs_comment' => PMA_lang_name($system_path, 'cmt', ''));
         if (isset($form->default[$system_path])) {
             $opts['setvalue'] = $form->default[$system_path];
         }
@@ -690,9 +686,7 @@ class FormDisplay
      */
     private function _getOptName($path)
     {
-      return str_replace(
-          array('Servers/1/', 'disable/', '/'),
-          array('Servers/', '', '_'), $path);
+        return str_replace(array('Servers/1/', '/'), array('Servers/', '_'), $path);
     }
 
     /**
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index fa49518d8..20018c804 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -188,9 +188,6 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
                 . ' value="' . htmlspecialchars($value) . '" />';
           break;
         case 'checkbox':
-            if (strpos($path, 'disable-') === 0) {
-                echo '<label for="' . htmlspecialchars($path) . '" title="' . __('Mark to disable this option') . '">' . __('Disable') . '</label> ';
-            }
             echo '<span' . $field_class . '><input type="checkbox" ' . $name_id
               . ($value ? ' checked="checked"' : '') . ' /></span>';
           break;
diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
index 3b0e60662..edc84c217 100644
--- a/libraries/config/config_functions.lib.php
+++ b/libraries/config/config_functions.lib.php
@@ -67,8 +67,8 @@ function PMA_lang($lang_key)
 function PMA_lang_name($canonical_path, $type = 'name', $default = 'key')
 {
     $lang_key = str_replace(
-    	array('Servers/1/', 'disable/', '/'),
-    	array('Servers/', '', '_'),
+    	array('Servers/1/', '/'),
+    	array('Servers/', '_'),
     	$canonical_path) . '_' . $type;
     return isset($GLOBALS["strConfig$lang_key"])
         ? ($type == 'desc' ? PMA_lang($lang_key) : $GLOBALS["strConfig$lang_key"])
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 25067a531..58e49ca76 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -20,10 +20,7 @@ $forms['Features']['General'] = array(
     'ReplaceHelpImg',
     'SkipLockedTables',
     'MaxDbList',
-    'MaxTableList',
-    'disable/AllowUserDropDatabase',
-    'disable/UseDbSearch',
-    'disable/QueryHistoryDB');
+    'MaxTableList');
 $forms['Features']['Text_fields'] = array(
     'CharEditing',
     'CharTextareaCols',
@@ -94,9 +91,7 @@ $forms['Main_frame']['Startup'] = array(
     'SuggestDBName',
     ':group:end',
     'ShowStats',
-    'ShowServerInfo',
-    'disable/ShowPhpInfo',
-    'disable/ShowChgPassword');
+    'ShowServerInfo');
 $forms['Main_frame']['Browse'] = array(
     'NavigationBarIconic',
     'ShowAll',
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index d0a631f10..d89f79c51 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -151,22 +151,6 @@ function PMA_apply_userprefs(array $config_data)
         if (!isset($whitelist[$path]) || isset($blacklist[$path])) {
             continue;
         }
-        if (strpos($path, 'disable/') === 0) {
-            // write disable/ value
-            PMA_array_write($path, $cfg, $value);
-            // prepare path and value for disabled key
-            $path = substr($path, 8);
-            switch (gettype(PMA_array_read($path, $GLOBALS['PMA_Config']->default))) {
-                case 'string':
-                    $value = '';
-                    break;
-                case 'double':
-                case 'integer':
-                    $value = 0;
-                default:
-                    $value = false;
-            }
-        }
         PMA_array_write($path, $cfg, $value);
     }
     return $cfg;

From 8d24baad94ce2b358d62e6ebb57296192b90af04 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sun, 25 Jul 2010 22:58:52 +0200
Subject: [PATCH 074/106] run submenu code only when #topmenu is present todo
 update

---
 .gsoc/todo.txt  | 7 +++++++
 js/functions.js | 8 ++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.gsoc/todo.txt b/.gsoc/todo.txt
index 259072de9..b9a860860 100644
--- a/.gsoc/todo.txt
+++ b/.gsoc/todo.txt
@@ -1,2 +1,9 @@
 restore cache'ing in phpmyadmin.css.php
 remove debug from user preferences header
+
+marker for extension dependent options (SOAP for sql validation)
+
+info about setup script in prefs manage, it seems many people still don't know it exists
+(and maybe some description in docs on making it work with live configuration?)
+
+info for constrained values (eg. MaxDbList)?
diff --git a/js/functions.js b/js/functions.js
index 5ae2b6050..73910e348 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1795,6 +1795,10 @@ function menuResize()
 }
 
 $(function() {
+    var topmenu = $('#topmenu');
+    if (topmenu.length == 0) {
+        return;
+    }
     // create submenu container
     var link = $('<a />')
         .attr({href: '#', 'class': 'tab'})
@@ -1802,7 +1806,7 @@ $(function() {
         .click(function(e) {
             e.preventDefault();
         });
-    var img = $('#topmenucontainer li:first-child').find('img');
+    var img = topmenu.find('li:first-child').find('img');
     if (img.length) {
         img = img.clone();
         img.attr('src', img.attr('src').replace(/\/[^\/]+$/, '/b_more.png')).prependTo(link);
@@ -1822,7 +1826,7 @@ $(function() {
             }
         })
         .hide();
-    $('#topmenu').append(submenu);
+    topmenu.append(submenu);
 
     // populate submenu and register resize event
     $(window).resize(menuResize);

From 812748a50d622ef30aca0d44cb022d4676708698 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Mon, 26 Jul 2010 20:34:31 +0200
Subject: [PATCH 075/106] Changes to conform to latest merge: - use require
 instead if require_once for footer.inc.php - rename pmadb to phpMyAdmin
 configuration storage

---
 libraries/config/messages.inc.php | 10 +++++-----
 prefs_forms.php                   |  2 +-
 prefs_manage.php                  |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 351f7186b..1c0a8aa1b 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -200,8 +200,8 @@ $strConfigForm_Server_auth_desc = __('Authentication settings');
 $strConfigForm_Server_config = __('Server configuration');
 $strConfigForm_Server_config_desc = __('Advanced server configuration, do not change these options unless you know what they are for');
 $strConfigForm_Server_desc = __('Enter server connection parameters');
-$strConfigForm_Server_pmadb = __('PMA database');
-$strConfigForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation');
+$strConfigForm_Server_pmadb = __('Configuration storage');
+$strConfigForm_Server_pmadb_desc = __('Configure phpMyAdmin configuration storage to gain access to additional features, see [a@Documentation.html#linked-tables]phpMyAdmin configuration storage[/a] in documentation');
 $strConfigForm_Server_tracking = __('Changes tracking');
 $strConfigForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.');
 $strConfigForm_Warnings = __('Warnings');
@@ -325,12 +325,12 @@ $strConfigOrder_name = __('Default sorting order');
 $strConfigPersistentConnections_desc = __('Use persistent connections to MySQL databases');
 $strConfigPersistentConnections_name = __('Persistent connections');
 $strConfigPmaNoRelation_DisableWarning_desc = __('Disable the default warning that is displayed on the database details Structure page if any of the required tables for the relation features could not be found');
-$strConfigPmaNoRelation_DisableWarning_name = __('Missing relation tables (pmadb)');
+$strConfigPmaNoRelation_DisableWarning_name = __('Missing phpMyAdmin configuration storage tables');
 $strConfigPropertiesIconic_desc = __('Use only icons, only text or both');
 $strConfigPropertiesIconic_name = __('Iconic table operations');
 $strConfigProtectBinary_desc = __('Disallow BLOB and BINARY columns from editing');
 $strConfigProtectBinary_name = __('Protect binary columns');
-$strConfigQueryHistoryDB_desc = __('Enable if you want DB-based query history (requires pmadb). If disabled, this utilizes JS-routines to display query history (lost by window close).');
+$strConfigQueryHistoryDB_desc = __('Enable if you want DB-based query history (requires phpMyAdmin configuration storage). If disabled, this utilizes JS-routines to display query history (lost by window close).');
 $strConfigQueryHistoryDB_name = __('Permanent query history');
 $strConfigQueryHistoryMax_cmt = __('Users cannot set a higher value');
 $strConfigQueryHistoryMax_desc = __('How many queries are kept in history');
@@ -397,7 +397,7 @@ $strConfigServers_password_name = __('Password for config auth');
 $strConfigServers_pdf_pages_desc = __('Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]');
 $strConfigServers_pdf_pages_name = __('PDF schema: pages table');
 $strConfigServers_pmadb_desc = __('Database used for relations, bookmarks, and PDF features. See [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for no support. Suggested: [kbd]phpmyadmin[/kbd]');
-$strConfigServers_pmadb_name = __('PMA database');
+$strConfigServers_pmadb_name = __('Database name');
 $strConfigServers_port_desc = __('Port on which MySQL server is listening, leave empty for default');
 $strConfigServers_port_name = __('Server port');
 $strConfigServers_relation_desc = __('Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links[/a] support, suggested: [kbd]pma_relation[/kbd]');
diff --git a/prefs_forms.php b/prefs_forms.php
index 28d3fce5c..3db7a1682 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -74,5 +74,5 @@ if (!$form_display->process(false)) {
 /**
  * Displays the footer
  */
-require_once './libraries/footer.inc.php';
+require './libraries/footer.inc.php';
 ?>
\ No newline at end of file
diff --git a/prefs_manage.php b/prefs_manage.php
index da2fa09ed..bcef4bef8 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -126,7 +126,7 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
                 <input type="submit" name="submit_ignore" value="<?php echo __('No') ?>" />
             </form>
             <?php
-            require_once './libraries/footer.inc.php';
+            require './libraries/footer.inc.php';
             return;
         }
 
@@ -304,5 +304,5 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: __DATE__'));
 /**
  * Displays the footer
  */
-require_once './libraries/footer.inc.php';
+require './libraries/footer.inc.php';
 ?>
\ No newline at end of file

From b2674e9d59c6670feb26be1ecb0d9b51f3889a3d Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Mon, 26 Jul 2010 20:56:19 +0200
Subject: [PATCH 076/106] change tab order in server, db and table menus

---
 libraries/db_links.inc.php     | 14 ++++++-----
 libraries/server_links.inc.php | 44 ++++++++++++++++++----------------
 libraries/tbl_links.inc.php    | 15 ++++++------
 3 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php
index 860d3d805..3701cbc63 100644
--- a/libraries/db_links.inc.php
+++ b/libraries/db_links.inc.php
@@ -118,20 +118,22 @@ $tabs = array();
 $tabs[] =& $tab_structure;
 $tabs[] =& $tab_sql;
 $tabs[] =& $tab_search;
-if (PMA_Tracker::isActive()) {
-    $tabs[] =& $tab_tracking;
-}
 $tabs[] =& $tab_qbe;
 $tabs[] =& $tab_export;
 if (! $db_is_information_schema) {
     $tabs[] =& $tab_import;
-    if ($cfgRelation['designerwork']) {
-        $tabs[] =& $tab_designer;
-    }
     $tabs[] =& $tab_operation;
     if ($is_superuser) {
         $tabs[] =& $tab_privileges;
     }
+}
+if (PMA_Tracker::isActive()) {
+    $tabs[] =& $tab_tracking;
+}
+if (! $db_is_information_schema) {
+    if ($cfgRelation['designerwork']) {
+        $tabs[] =& $tab_designer;
+    }
     if ($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) {
         $tabs[] =& $tab_drop;
     }
diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php
index ce6d83e52..5cd7a67b0 100644
--- a/libraries/server_links.inc.php
+++ b/libraries/server_links.inc.php
@@ -47,6 +47,29 @@ $tabs['status']['icon'] = 's_status.png';
 $tabs['status']['link'] = 'server_status.php';
 $tabs['status']['text'] = __('Status');
 
+if (! empty($binary_logs)) {
+    $tabs['binlog']['icon'] = 's_tbl.png';
+    $tabs['binlog']['link'] = 'server_binlog.php';
+    $tabs['binlog']['text'] = __('Binary log');
+}
+$tabs['process']['icon'] = 's_process.png';
+$tabs['process']['link'] = 'server_processlist.php';
+$tabs['process']['text'] = __('Processes');
+
+if ($is_superuser) {
+    $tabs['rights']['icon'] = 's_rights.png';
+    $tabs['rights']['link'] = 'server_privileges.php';
+    $tabs['rights']['text'] = __('Privileges');
+}
+
+$tabs['export']['icon'] = 'b_export.png';
+$tabs['export']['link'] = 'server_export.php';
+$tabs['export']['text'] = __('Export');
+
+$tabs['import']['icon'] = 'b_import.png';
+$tabs['import']['link'] = 'server_import.php';
+$tabs['import']['text'] = __('Import');
+
 $tabs['vars']['icon'] = 's_vars.png';
 $tabs['vars']['link'] = 'server_variables.php';
 $tabs['vars']['text'] = __('Variables');
@@ -60,32 +83,11 @@ $tabs['engine']['link'] = 'server_engines.php';
 $tabs['engine']['text'] = __('Engines');
 
 if ($is_superuser) {
-    $tabs['rights']['icon'] = 's_rights.png';
-    $tabs['rights']['link'] = 'server_privileges.php';
-    $tabs['rights']['text'] = __('Privileges');
-
     $tabs['replication']['icon'] = 's_replication.png';
     $tabs['replication']['link'] = 'server_replication.php';
     $tabs['replication']['text'] = __('Replication');
 }
 
-if (! empty($binary_logs)) {
-    $tabs['binlog']['icon'] = 's_tbl.png';
-    $tabs['binlog']['link'] = 'server_binlog.php';
-    $tabs['binlog']['text'] = __('Binary log');
-}
-$tabs['process']['icon'] = 's_process.png';
-$tabs['process']['link'] = 'server_processlist.php';
-$tabs['process']['text'] = __('Processes');
-
-$tabs['export']['icon'] = 'b_export.png';
-$tabs['export']['link'] = 'server_export.php';
-$tabs['export']['text'] = __('Export');
-
-$tabs['import']['icon'] = 'b_import.png';
-$tabs['import']['link'] = 'server_import.php';
-$tabs['import']['text'] = __('Import');
-
 $tabs['synchronize']['icon'] = 's_sync.png';
 $tabs['synchronize']['link'] = 'server_synchronize.php';
 $tabs['synchronize']['text'] = __('Synchronize');
diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php
index ef612933c..c89faabc2 100644
--- a/libraries/tbl_links.inc.php
+++ b/libraries/tbl_links.inc.php
@@ -61,13 +61,6 @@ $tabs['search']['icon'] = 'b_search.png';
 $tabs['search']['text'] = __('Search');
 $tabs['search']['link'] = 'tbl_select.php';
 
-if(PMA_Tracker::isActive())
-{
-    $tabs['tracking']['icon'] = 'eye.png';
-    $tabs['tracking']['text'] = __('Tracking');
-    $tabs['tracking']['link'] = 'tbl_tracking.php';
-}
-
 if (! (isset($db_is_information_schema) && $db_is_information_schema)) {
     $tabs['insert']['icon'] = 'b_insrow.png';
     $tabs['insert']['link'] = 'tbl_change.php';
@@ -91,7 +84,13 @@ if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_
     $tabs['operation']['icon'] = 'b_tblops.png';
     $tabs['operation']['link'] = 'tbl_operations.php';
     $tabs['operation']['text'] = __('Operations');
-
+}
+if(PMA_Tracker::isActive()) {
+    $tabs['tracking']['icon'] = 'eye.png';
+    $tabs['tracking']['text'] = __('Tracking');
+    $tabs['tracking']['link'] = 'tbl_tracking.php';
+}
+if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_schema)) {
     $tabs['empty']['link']  = 'sql.php';
     $tabs['empty']['args']['reload']    = 1;
     $tabs['empty']['args']['sql_query'] = 'TRUNCATE TABLE ' . PMA_backquote($table);

From edaf7ce86c10bafdf1eb554ed03910ec7b7be691 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Mon, 26 Jul 2010 21:30:57 +0200
Subject: [PATCH 077/106] translate "More" tab cleanup code

---
 js/functions.js | 20 +++++++++-----------
 js/messages.php |  3 +++
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 73910e348..e1bc4f3fb 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1742,7 +1742,7 @@ function menuResize()
     var submenu = cnt.find('.submenu');
     var submenu_w = submenu.outerWidth(true);
     var submenu_ul = submenu.find('ul');
-    var li = $('#topmenu > li');
+    var li = cnt.find('> li');
     var li2 = submenu_ul.find('li');
     var more_shown = li2.length > 0;
     var w = more_shown ? submenu_w : 0;
@@ -1777,7 +1777,8 @@ function menuResize()
         for (var i = 0; i < li2.length; i++) {
             //console.log(li2[i], submenu_w);
             w += $(li2[i]).data('width');
-            if (w+submenu_w < wmax ) {//|| (i == li2.length-1 && w < wmax)
+            // item fits or (it is the last item and it would fit if More got removed)
+            if (w+submenu_w < wmax || (i == li2.length-1 && w < wmax)) {
                 $(li2[i]).insertBefore(submenu);
                 if (i == li2.length-1) {
                     submenu.hide();
@@ -1800,21 +1801,18 @@ $(function() {
         return;
     }
     // create submenu container
-    var link = $('<a />')
-        .attr({href: '#', 'class': 'tab'})
-        .text('More')
+    var link = $('<a />', {href: '#', 'class': 'tab'})
+        .text(PMA_messages['strMore'])
         .click(function(e) {
             e.preventDefault();
         });
-    var img = topmenu.find('li:first-child').find('img');
+    var img = topmenu.find('li:first-child img');
     if (img.length) {
-        img = img.clone();
-        img.attr('src', img.attr('src').replace(/\/[^\/]+$/, '/b_more.png')).prependTo(link);
+        img.clone().attr('src', img.attr('src').replace(/\/[^\/]+$/, '/b_more.png')).prependTo(link);
     }
-    var submenu = $('<li />')
-        .attr('class', 'submenu')
+    var submenu = $('<li />', {'class': 'submenu'})
         .append(link)
-        .append($('<ul />').append($('#topmenu li.subitem')))
+        .append($('<ul />'))
         .mouseenter(function() {
             if ($(this).find('ul .tabactive').length == 0) {
                 $(this).addClass('submenuhover').find('> a').addClass('tabactive');
diff --git a/js/messages.php b/js/messages.php
index aeb93f56c..d86f1b33a 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -66,6 +66,9 @@ $js_messages['strChangeDisplay'] = __('Choose column to display');
 $js_messages['strGeneratePassword'] = __('Generate password');
 $js_messages['strGenerate'] = __('Generate');
 
+/* navigation tabs */
+$js_messages['strMore'] = __('More');
+
 echo "var PMA_messages = new Array();\n";
 foreach ($js_messages as $name => $js_message) {
     PMA_printJsValue("PMA_messages['" . $name . "']", $js_message);

From 9d62971e110d26d15909b91d02c066435699dbcd Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Mon, 26 Jul 2010 22:34:13 +0200
Subject: [PATCH 078/106] clean up config JavaScript

---
 js/config.js | 119 ++++++++++++++++++++-------------------------------
 1 file changed, 47 insertions(+), 72 deletions(-)

diff --git a/js/config.js b/js/config.js
index 24b6e169e..882849c48 100644
--- a/js/config.js
+++ b/js/config.js
@@ -94,6 +94,7 @@ function getFieldValue(field, field_type) {
             }
             return items;
     }
+    return null;
 }
 
 /**
@@ -491,62 +492,42 @@ $(function() {
 /**
  * Sets active tab
  *
- * @param {Element} tab_link
+ * @param {String} tab_id
  */
-function setTab(tab_link) {
-    var tabs_menu = $(tab_link).closest('.tabs');
-
-    var links = tabs_menu.find('a');
-    var contents, link;
-    for (var i = 0, imax = links.length; i < imax; i++) {
-    	link = $(links[i]);
-        contents = $(link.attr('href'));
-        if (links[i] == tab_link) {
-        	link.addClass('active');
-            contents.css('display', 'block');
-        } else {
-            link.removeClass('active');
-            contents.css('display', 'none');
-        }
-    }
-    location.hash = 'tab_' + $(tab_link).attr('href').substr(1);
+function setTab(tab_id) {
+    $('.tabs a').removeClass('active').filter('[href=' + tab_id + ']').addClass('active');
+    $('.tabs_contents fieldset').hide().filter(tab_id).show();
+    location.hash = 'tab_' + tab_id.substr(1);
 }
 
 $(function() {
     var tabs = $('.tabs');
-    var url_tab = location.hash.match(/^#tab_.+/)
-        ? $('a[href$="' + location.hash.substr(5) + '"]') : null;
-    if (url_tab) {
-        url_tab = url_tab[0];
+    if (!tabs.length) {
+        return;
     }
     // add tabs events and activate one tab (the first one or indicated by location hash)
-    for (var i = 0, imax = tabs.length; i < imax; i++) {
-        var links = $(tabs[i]).find('a');
-        var selected_tab = links[0];
-        for (var j = 0, jmax = links.length; j < jmax; j++) {
-            $(links[j]).click(function(e) {
-                e.preventDefault();
-                setTab(this);
-            });
-            if (links[j] == url_tab) {
-                selected_tab = links[j];
-            }
-        }
-        setTab(selected_tab);
-    }
+    tabs.find('a')
+        .click(function(e) {
+            e.preventDefault();
+            setTab($(this).attr('href'));
+        })
+        .filter(':first')
+        .addClass('active');
+    $('.tabs_contents fieldset').hide().filter(':first').show();
+
     // tab links handling, check each 200ms
     // (works with history in FF, further browser support here would be an overkill)
-    var prev_hash = location.hash;
-    setInterval(function() {
+    var prev_hash;
+    var tab_check_fnc = function() {
         if (location.hash != prev_hash) {
             prev_hash = location.hash;
-            var url_tab = location.hash.match(/^#tab_.+/)
-                ? $('a[href$="' + location.hash.substr(5) + '"]') : null;
-            if (url_tab) {
-                setTab(url_tab[0]);
+            if (location.hash.match(/^#tab_.+/) && $('#' + location.hash.substr(5)).length) {
+                setTab('#' + location.hash.substr(5));
             }
         }
-    }, 200);
+    };
+    tab_check_fnc();
+    setInterval(tab_check_fnc, 200);
 });
 
 //
@@ -558,7 +539,7 @@ $(function() {
 //
 
 $(function() {
-    $('input[type=button]').click(function() {
+    $('input[type=button][name=submit_reset]').click(function() {
         var fields = $(this).closest('fieldset').find('input, select, textarea');
         for (var i = 0, imax = fields.length; i < imax; i++) {
             setFieldValue(fields[i], getFieldType(fields[i]));
@@ -588,32 +569,26 @@ function restoreField(field_id) {
 }
 
 $(function() {
-    $('.restore-default, .set-value').each(function() {
-        var link = $(this);
-        // inline-block for IE so opacity inheritance works
-        link.css({display: 'inline-block', opacity: 0.25});
-        if (link.hasClass('restore-default')) {
-            // restore-default is handled by markField
-        }
-        link.bind({
-            mouseenter: function() {$(this).css('opacity', 1);},
-            mouseleave: function() {$(this).css('opacity', 0.25);},
-            click: function(e) {
-                e.preventDefault();
-                var href = $(this).attr('href').substr(1);
-                var field_id;
-                if ($(this).hasClass('restore-default')) {
-                    field_id = href;
-                    restoreField(field_id);
-                } else {
-                    field_id = href.match(/^[^=]+/)[0];
-                    var value = href.match(/=(.+)$/)[1];
-                    setFieldValue($('#'+field_id), 'text', value);
-                }
-                $('#'+field_id).trigger('change');
+    $('.tabs_contents')
+        .delegate('.restore-default, .set-value', 'mouseenter', function(){$(this).css('opacity', 1)})
+        .delegate('.restore-default, .set-value', 'mouseleave', function(){$(this).css('opacity', 0.25)})
+        .delegate('.restore-default, .set-value', 'click', function(e) {
+            e.preventDefault();
+            var href = $(this).attr('href');
+            var field_sel;
+            if ($(this).hasClass('restore-default')) {
+                field_sel = href;
+                restoreField(field_sel.substr(1));
+            } else {
+                field_sel = href.match(/^[^=]+/)[0];
+                var value = href.match(/=(.+)$/)[1];
+                setFieldValue($(field_sel), 'text', value);
             }
-        });
-    });
+            $(field_sel).trigger('change');
+        })
+        .find('.restore-default, .set-value')
+        // inline-block for IE so opacity inheritance works
+        .css({display: 'inline-block', opacity: 0.25});
 });
 
 //
@@ -640,9 +615,9 @@ $(function() {
             var disable_id = enable_id.match(/local_storage$/)
                 ? enable_id.replace(/local_storage$/, 'text_file')
                 : enable_id.replace(/text_file$/, 'local_storage');
-        $('#opts_'+disable_id).addClass('disabled').find('input').attr('disabled', true);
-        $('#opts_'+enable_id).removeClass('disabled').find('input').attr('disabled', false);;
-    });
+            $('#opts_'+disable_id).addClass('disabled').find('input').attr('disabled', true);
+            $('#opts_'+enable_id).removeClass('disabled').find('input').attr('disabled', false);
+        });
 
     // detect localStorage state
     var ls_supported = window.localStorage || false;

From 65e0676ab4836603343951cf6b455e4d7756cfb5 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 27 Jul 2010 19:45:01 +0200
Subject: [PATCH 079/106] remove SQL Validator from user preferences

---
 libraries/config/messages.inc.php           | 2 +-
 libraries/config/user_preferences.forms.php | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 1c0a8aa1b..bdaec1fd7 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -462,7 +462,7 @@ $strConfigSQLQuery_Edit_name = __('Edit');
 $strConfigSQLQuery_Explain_name = __('Explain SQL');
 $strConfigSQLQuery_Refresh_name = __('Refresh');
 $strConfigSQLQuery_ShowAsPHP_name = __('Create PHP Code');
-$strConfigSQLQuery_Validate_desc = __('Requires [a@#tab_Sql_validator]SQL Validator[/a] to be enabled');
+$strConfigSQLQuery_Validate_desc = __('Requires SQL Validator to be enabled');
 $strConfigSQLQuery_Validate_name = __('Validate SQL');
 $strConfigSQLValidator_password_name = __('Password');
 $strConfigSQLValidator_use_desc = __('[strong]Warning:[/strong] requires PHP SOAP extension or PEAR SOAP to be installed');
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 58e49ca76..1c59f4a58 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -60,10 +60,6 @@ $forms['Sql_queries']['Sql_box'] = array(
     'SQLQuery/ShowAsPHP',
     'SQLQuery/Validate',
     'SQLQuery/Refresh');
-$forms['Sql_queries']['Sql_validator'] = array(
-    'SQLValidator/use',
-    'SQLValidator/username',
-    'SQLValidator/password');
 $forms['Left_frame']['Left_frame'] = array(
     'LeftFrameLight',
     'LeftDisplayLogo',

From ac3e9e323b3f33ec5804862943e63ab2e10f4a93 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 27 Jul 2010 22:12:53 +0200
Subject: [PATCH 080/106] keep selected tab after save change pmadb to
 phpMyAdmin configuration storage in warning string

---
 js/config.js                         | 1 +
 libraries/config/FormDisplay.tpl.php | 1 +
 libraries/user_preferences.inc.php   | 4 ++--
 libraries/user_preferences.lib.php   | 8 ++++++--
 prefs_forms.php                      | 3 ++-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/js/config.js b/js/config.js
index 882849c48..1b0ceddd4 100644
--- a/js/config.js
+++ b/js/config.js
@@ -498,6 +498,7 @@ function setTab(tab_id) {
     $('.tabs a').removeClass('active').filter('[href=' + tab_id + ']').addClass('active');
     $('.tabs_contents fieldset').hide().filter(tab_id).show();
     location.hash = 'tab_' + tab_id.substr(1);
+    $('.config-form input[name=tab_hash]').val(location.hash);
 }
 
 $(function() {
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 20018c804..e4a39d4af 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -27,6 +27,7 @@ function display_form_top($action = null, $method = 'post', $hidden_fields = nul
     }
 ?>
 <form method="<?php echo $method ?>" action="<?php echo htmlspecialchars($action) ?>" class="config-form">
+<input type="hidden" name="tab_hash" value="" />
 <?php
     // we do validation on page refresh when browser remembers field values,
     // add a field with known value which will be used for checks
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 5ec95d83b..5e200c960 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -69,8 +69,8 @@ $msg->display();
 // warn about using session storage for settings
 $cfgRelation = PMA_getRelationsParam();
 if (!$cfgRelation['userconfigwork']) {
-    $msg = __('Your preferences will be saved for current session only. Storing them permanently requires %spmadb%s.');
-    $msg = PMA_sanitize(sprintf($msg, '[a@http://wiki.phpmyadmin.net/pma/pmadb@_blank]', '[/a]'));
+    $msg = __('Your preferences will be saved for current session only. Storing them permanently requires %sphpMyAdmin configuration storage%s.');
+    $msg = PMA_sanitize(sprintf($msg, '[a@./Documentation.html#linked-tables@_blank]', '[/a]'));
     PMA_Message::notice($msg)->display();
 }
 
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index d89f79c51..0f10b5816 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -217,8 +217,9 @@ function PMA_persist_option($path, $value, $default_value)
  * @param array  $old_settings
  * @param string $file_name
  * @param array  $params
+ * @param string $hash
  */
-function PMA_userprefs_redirect(array $forms, array $old_settings, $file_name, $params = null)
+function PMA_userprefs_redirect(array $forms, array $old_settings, $file_name, $params = null, $hash = null)
 {
     $reload_left_frame = isset($params['reload_left_frame']) && $params['reload_left_frame'];
     if (!$reload_left_frame) {
@@ -243,8 +244,11 @@ function PMA_userprefs_redirect(array $forms, array $old_settings, $file_name, $
     if (is_array($params)) {
         $url_params = array_merge($params, $url_params);
     }
+    if ($hash) {
+        $hash = '#' . urlencode($hash);
+    }
     PMA_sendHeaderLocation($GLOBALS['cfg']['PmaAbsoluteUri'] . $file_name
-            . PMA_generate_common_url($url_params, '&'));
+            . PMA_generate_common_url($url_params, '&') . $hash);
 }
 
 function PMA_userprefs_autoload_header()
diff --git a/prefs_forms.php b/prefs_forms.php
index 3db7a1682..2e170bf5a 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -61,8 +61,9 @@ if (!$form_display->process(false)) {
         $old_settings = PMA_load_userprefs();
         $result = PMA_save_userprefs($cf->getConfigArray());
         if ($result === true) {
+            $hash = ltrim(filter_input(INPUT_POST, 'tab_hash'), '#');
             PMA_userprefs_redirect($forms, $old_settings, 'prefs_forms.php', array(
-                'form' => $form_param));
+                'form' => $form_param), $hash);
             exit;
         } else {
             $result->display();

From 5a3ec082d80402d96f0288697b700f5ff9f19b7b Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 27 Jul 2010 23:15:23 +0200
Subject: [PATCH 081/106] fix user preferences in phpmyadmin.css.php fix css
 for LightTabs fix values in <select> lists

---
 libraries/Config.class.php                    |  3 +-
 libraries/config/Form.class.php               |  2 +-
 libraries/config/user_preferences.forms.php   |  6 +--
 libraries/header_meta_style.inc.php           |  2 +-
 .../darkblue_orange/css/theme_right.css.php   | 49 +++++++++++--------
 themes/original/css/theme_right.css.php       | 45 ++++++++++-------
 6 files changed, 58 insertions(+), 49 deletions(-)

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index e50e440f4..66c36e8f2 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -436,7 +436,7 @@ class PMA_Config
         // will have everything avaiable in session cache
         $server = isset($GLOBALS['server'])
             ? $GLOBALS['server']
-            : $GLOBALS['cfg']['ServerDefault'];
+            : (!empty($GLOBALS['cfg']['ServerDefault']) ? $GLOBALS['cfg']['ServerDefault'] : 0);
         $cache_key = 'server_' . $server;
         if ($server > 0 && !defined('PMA_MINIMUM_COMMON')) {
             $config_mtime = max($this->default_source_mtime, $this->source_mtime);
@@ -464,7 +464,6 @@ class PMA_Config
         // load config array
         $this->settings = PMA_array_merge_recursive($this->settings, $config_data);
         $GLOBALS['cfg'] = PMA_array_merge_recursive($GLOBALS['cfg'], $config_data);
-
         if (defined('PMA_MINIMUM_COMMON')) {
             return;
         }
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
index 96fc48bd8..dcdba3190 100644
--- a/libraries/config/Form.class.php
+++ b/libraries/config/Form.class.php
@@ -91,7 +91,7 @@ class Form
             return array();
         }
         // convert array('#', 'a', 'b') to array('a', 'b')
-        if (isset($value[0]) && $value[0] == '#') {
+        if (isset($value[0]) && $value[0] === '#') {
             // remove first element ('#')
             array_shift($value);
         } else {
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 1c59f4a58..7d60e1056 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -66,10 +66,6 @@ $forms['Left_frame']['Left_frame'] = array(
     'LeftLogoLink',
     'LeftLogoLinkWindow',
     'LeftPointerEnable');
-// pmadb is unavailable when these settings are used
-/*$forms['Left_frame']['Left_servers'] = array(
-    'LeftDisplayServers',
-    'DisplayServersList');*/
 $forms['Left_frame']['Left_databases'] = array(
     'DisplayDatabasesList',
     'LeftFrameDBTree',
@@ -106,7 +102,7 @@ $forms['Main_frame']['Edit'] = array(
     'ShowFunctionFields',
     'ShowFieldTypesInDataEditView',
     'InsertRows',
-    'ForeignKeyDropdownOrder',// [s, ? custom text value]
+    'ForeignKeyDropdownOrder',
     'ForeignKeyMaxLimit',
     'CtrlArrowsMoving',
     'DefaultPropDisplay');
diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
index 55e799131..46cca27b3 100644
--- a/libraries/header_meta_style.inc.php
+++ b/libraries/header_meta_style.inc.php
@@ -53,7 +53,7 @@ if ($GLOBALS['text_dir'] == 'ltr') {
 <?php
     }
 ?>
-    <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
+    <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php<?php echo PMA_generate_common_url(array('server' => $GLOBALS['server'])); ?>&amp;js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
     <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>print.css" media="print" />
     <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.custom.css" />
     <meta name="robots" content="noindex,nofollow" />
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index 2059c255c..135d8665d 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -613,6 +613,12 @@ ul#topmenu, ul#topmenu2, ul.tabs {
     padding:            0;
 }
 
+ul#topmenu2 {
+    margin:             0.25em 0.5em 0;
+    height:             2em;
+    clear:              both;
+}
+
 ul#topmenu li, ul#topmenu2 li {
     float:              <?php echo $left; ?>;
     margin:             0;
@@ -634,33 +640,30 @@ ul#topmenu a, ul#topmenu span {
 }
 
 ul#topmenu ul a {
-    margin:         0;
-    padding-bottom: 0.2em;
+    margin:             0;
+    padding-bottom:     0.2em;
 }
 
 ul#topmenu .submenu {
-    position: relative;
+    position:           relative;
 }
 
 ul#topmenu ul {
-    padding: 0;
-    margin: 0;
-    position: absolute;
-    right: 0;
-    list-style-type: none;
-    display: none;
-    -moz-box-shadow: 2px 2px 3px #666;
-    -webkit-box-shadow: 2px 2px 3px #666;
-    box-shadow: 2px 2px 3px #666;
-    border: 1px #666 solid;
+    padding:            0;
+    margin:             0;
+    position:           absolute;
+    right:              0;
+    list-style-type:    none;
+    display:            none;
+    border:             1px #666 solid;
 }
 
 ul#topmenu li:hover ul, ul#topmenu .submenuhover ul {
-    display: block;
+    display:            block;
 }
 
 ul#topmenu ul li {
-    width: 100%;
+    width:              100%;
 }
 
 ul#topmenu2 a {
@@ -694,16 +697,20 @@ ul#topmenu a.tabcaution:hover {
 ul#topmenu a.tabactive, ul#topmenu2 a.tabactive {
     color:              black;
 }
+
+ul#topmenu ul {
+    background:         <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
+}
 <?php } else { ?>
 #topmenu {
     margin-top:         0.5em;
     padding:            0.1em 0.3em 0.1em 0.3em;
 }
 
-ul#topmenu2 {
-    margin: 0.25em 0.5em 0;
-    height: 2em;
-    clear: both;
+ul#topmenu ul {
+    -moz-box-shadow:    2px 2px 3px #666;
+    -webkit-box-shadow: 2px 2px 3px #666;
+    box-shadow:         2px 2px 3px #666;
 }
 
 ul#topmenu > li {
@@ -712,8 +719,8 @@ ul#topmenu > li {
 
 /* default tab styles */
 ul#topmenu a, ul#topmenu span {
-    background-color: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
-    border:           0 solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+    background-color:   <?php echo $GLOBALS['cfg']['BgOne']; ?>;
+    border:             0 solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
     border-width:       1pt 1pt 0 1pt;
     -moz-border-radius: 0.4em 0.4em 0 0;
     border-radius:      0.4em 0.4em 0 0;
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index b2a7aa190..8d46acae4 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -588,6 +588,12 @@ ul#topmenu, ul#topmenu2, ul.tabs {
     padding:            0;
 }
 
+ul#topmenu2 {
+    margin: 0.25em 0.5em 0;
+    height: 2em;
+    clear: both;
+}
+
 ul#topmenu li, ul#topmenu2 li {
     float:              <?php echo $left; ?>;
     margin:             0;
@@ -609,33 +615,30 @@ ul#topmenu a, ul#topmenu span {
 }
 
 ul#topmenu ul a {
-    margin: 0;
-    padding-bottom: 0.2em;
+    margin:             0;
+    padding-bottom:     0.2em;
 }
 
 ul#topmenu .submenu {
-    position: relative;
+    position:           relative;
 }
 
 ul#topmenu ul {
-    margin: 0;
-    padding: 0;
-    position: absolute;
-    right: 0;
-    list-style-type: none;
-    display: none;
-    -moz-box-shadow: 2px 2px 3px #666;
-    -webkit-box-shadow: 2px 2px 3px #666;
-    box-shadow: 2px 2px 3px #666;
-    border: 1px #666 solid;
+    margin:             0;
+    padding:            0;
+    position:           absolute;
+    right:              0;
+    list-style-type:    none;
+    display:            none;
+    border:             1px #666 solid;
 }
 
 ul#topmenu li:hover ul, ul#topmenu .submenuhover ul {
-    display: block;
+    display:            block;
 }
 
 ul#topmenu ul li {
-    width: 100%;
+    width:              100%;
 }
 
 ul#topmenu2 a {
@@ -669,16 +672,20 @@ ul#topmenu a.tabcaution:hover {
 ul#topmenu a.tabactive, ul#topmenu2 a.tabactive {
     color:              black;
 }
+
+ul#topmenu ul {
+    background:         <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
+}
 <?php } else { ?>
 #topmenu {
     margin-top:         0.5em;
     padding:            0.1em 0.3em 0.1em 0.3em;
 }
 
-ul#topmenu2 {
-    margin: 0.25em 0.5em 0;
-    height: 2em;
-    clear: both;
+ul#topmenu ul {
+    -moz-box-shadow:    2px 2px 3px #666;
+    -webkit-box-shadow: 2px 2px 3px #666;
+    box-shadow:         2px 2px 3px #666;
 }
 
 ul#topmenu > li {

From 9adc2597c5e94c42979c45aef46700b318ef0384 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 30 Jul 2010 00:47:20 +0200
Subject: [PATCH 082/106] short comments for inputs: - information whether SQL
 validator is enabled for Validate link - information about required
 extensions (SOAP, compression) - information for constrained values (eg.
 MaxDbList)

---
 .gsoc/todo.txt                                |  4 +-
 libraries/config/Form.class.php               |  1 +
 libraries/config/FormDisplay.class.php        | 63 +++++++++++++++++++
 libraries/config/FormDisplay.tpl.php          | 11 ++++
 setup/styles.css                              | 16 +++++
 .../darkblue_orange/css/theme_right.css.php   | 13 ++++
 themes/original/css/theme_right.css.php       | 13 ++++
 7 files changed, 119 insertions(+), 2 deletions(-)

diff --git a/.gsoc/todo.txt b/.gsoc/todo.txt
index b9a860860..959835c0c 100644
--- a/.gsoc/todo.txt
+++ b/.gsoc/todo.txt
@@ -1,9 +1,9 @@
 restore cache'ing in phpmyadmin.css.php
 remove debug from user preferences header
 
-marker for extension dependent options (SOAP for sql validation)
 
 info about setup script in prefs manage, it seems many people still don't know it exists
 (and maybe some description in docs on making it work with live configuration?)
 
-info for constrained values (eg. MaxDbList)?
+
+show blacklist (and debug?) on prefs manage page
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
index dcdba3190..ddf6a0f83 100644
--- a/libraries/config/Form.class.php
+++ b/libraries/config/Form.class.php
@@ -109,6 +109,7 @@ class Form
                 $value = array_combine($keys, $value);
             }
         }
+
         // $value has keys and value names, return it
         return $value;
     }
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index b1caa788e..eba4d0d77 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -374,6 +374,7 @@ class FormDisplay
                 }
             }
         }
+        $this->_setComments($system_path, $opts);
 
         // send default value to form's JS
         $js_line = '\'' . $translated_path . '\': ';
@@ -705,5 +706,67 @@ class FormDisplay
             $this->userprefs_disallow = array_flip($userprefs_disallow);
         }
     }
+
+    /**
+     * Sets field comments and warnings based on current environment
+     *
+     * @param string $system_path
+     * @param array  $opts
+     */
+    private function _setComments($system_path, array &$opts)
+    {
+        // RecodingEngine - mark unavailable types
+        if ($system_path == 'RecodingEngine') {
+            $comment = '';
+            if (!function_exists('iconv')) {
+                $opts['values']['iconv'] .= ' (' . __('unavailable') . ')';
+                $comment = sprintf(__('"%s" requires %s extension'), 'iconv', 'iconv');
+            }
+            if (!function_exists('recode_string')) {
+                $opts['values']['recode'] .= ' (' . __('unavailable') . ')';
+                $comment .= ($comment ? ", " : '') . sprintf(__('"%s" requires %s extension'),
+                    'recode', 'recode');
+            }
+            $opts['comment'] = $comment;
+            $opts['comment_warning'] = true;
+        }
+        // ZipDump, GZipDump, BZipDump - check function availability
+        if ($system_path == 'ZipDump' || $system_path == 'GZipDump' || $system_path == 'BZipDump') {
+            $comment = '';
+            $funcs = array(
+                'ZipDump'  => array('zip_open', 'gzcompress'),
+                'GZipDump' => array('gzopen', 'gzencode'),
+                'BZipDump' => array('bzopen', 'bzcompress'));
+            if (!function_exists($funcs[$system_path][0])) {
+                $comment = sprintf(__('import will not work, missing function (%s)'),
+                    $funcs[$system_path][0]);
+            }
+            if (!function_exists($funcs[$system_path][1])) {
+                $comment .= ($comment ? '; ' : '') . sprintf(__('export will not work, missing function (%s)'),
+                    $funcs[$system_path][1]);
+            }
+            $opts['comment'] = $comment;
+            $opts['comment_warning'] = true;
+        }
+        if ($system_path == 'SQLQuery/Validate' && !$GLOBALS['cfg']['SQLValidator']['use']) {
+            $opts['comment'] = __('SQL Validator is disabled');
+            $opts['comment_warning'] = true;
+        }
+        if ($system_path == 'SQLValidator/use') {
+            if (!class_exists('SOAPClient')) {
+                @include_once 'SOAP/Client.php';
+                if (!class_exists('SOAP_Client')) {
+                    $opts['comment'] = __('SOAP extension not found');
+                    $opts['comment_warning'] = true;
+                }
+            }
+        }
+        if (!defined('PMA_SETUP') || !PMA_SETUP) {
+            if (($system_path == 'MaxDbList' || $system_path == 'MaxTableList'
+                    || $system_path == 'QueryHistoryMax')) {
+                $opts['comment'] = sprintf(__('maximum %s'), $GLOBALS['cfg'][$system_path]);
+            }
+        }
+    }
 }
 ?>
\ No newline at end of file
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index e4a39d4af..f60d6244e 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -111,6 +111,8 @@ function display_fieldset_top($title = '', $description = '', $errors = null, $a
  * o values - key - value paris for <select> fields
  * o values_escaped - (boolean) tells whether values array is already escaped (defaults to false)
  * o values_disabled -  (array)list of disabled values (keys from values)
+ * o comment - (string) tooltip comment
+ * o comment_warning - (bool) whether this comments warns about something
  * o wiki - (string) wiki link
  *
  * @uses $GLOBALS['_FormDisplayGroup']
@@ -229,6 +231,15 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
                 . '</textarea>';
             break;
     }
+    if (isset($opts['comment']) && $opts['comment']) {
+        $class = 'field-comment-mark';
+        if (isset($opts['comment_warning']) && $opts['comment_warning']) {
+            $class .= ' field-comment-warning';
+        }
+        ?>
+        <span class="<?php echo $class ?>" title="<?php echo htmlspecialchars($opts['comment']) ?>">i</span>
+        <?php
+    }
     if ($is_setup_script && isset($opts['userprefs_comment']) && $opts['userprefs_comment']) {
         ?>
         <a class="userprefs-comment" title="<?php echo htmlspecialchars($opts['userprefs_comment']) ?>"><img alt="comment" src="<?php echo $img_path ?>b_tblops.png" width="16" height="16" /></a>
diff --git a/setup/styles.css b/setup/styles.css
index dbd2639f0..0cadd100b 100644
--- a/setup/styles.css
+++ b/setup/styles.css
@@ -363,6 +363,22 @@ input[type="text"]:focus, select:focus, textarea:focus {
     background: #F7FBFF;
 }
 
+.field-comment {
+
+    position: relative;
+}
+
+.field-comment-mark {
+    cursor: help;
+    padding: 0 0.2em;
+    font-weight: bold;
+    font-style: italic;
+}
+
+.field-comment-warning {
+    color: #A00;
+}
+
 .green { /* default form button */
     color: #080;
 }
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index 135d8665d..7c9c09599 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -1550,6 +1550,19 @@ fieldset .disabled-field td {
     background: #F7FBFF;
 }
 
+.config-form .field-comment-mark {
+    font-family: serif;
+    color: #00A;
+    cursor: help;
+    padding: 0 0.2em;
+    font-weight: bold;
+    font-style: italic;
+}
+
+.config-form .field-comment-warning {
+    color: #A00;
+}
+
 /* error list */
 .config-form dd {
     margin-left: 0.5em;
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 8d46acae4..c40a21933 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1482,6 +1482,19 @@ fieldset .disabled-field td {
     background: #F7FBFF;
 }
 
+.config-form .field-comment-mark {
+    font-family: serif;
+    color: #007;
+    cursor: help;
+    padding: 0 0.2em;
+    font-weight: bold;
+    font-style: italic;
+}
+
+.config-form .field-comment-warning {
+    color: #A00;
+}
+
 /* error list */
 .config-form dd {
     margin-left: 0.5em;

From 157c4fb775783486b980075aba0982b69a77eab3 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 30 Jul 2010 19:44:59 +0200
Subject: [PATCH 083/106] fixed some fields not saving due to equality
 conversions (eg. 0 == 'auto') fix user preferences menu display when tabs
 don't fit on screen

---
 libraries/config/ConfigFile.class.php | 2 +-
 libraries/user_preferences.inc.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index a6acb94f3..afd116bab 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -165,7 +165,7 @@ class ConfigFile
         // remove if the path isn't protected and it's empty or has a default value
         $default_value = $this->getDefault($canonical_path);
         if (!isset($this->persistKeys[$canonical_path])
-                && (($value == $default_value) || (empty($value) && empty($default_value)))) {
+                && (($value === $default_value) || (empty($value) && empty($default_value)))) {
             PMA_array_remove($path, $_SESSION[$this->id]);
         } else {
             PMA_array_write($path, $_SESSION[$this->id], $value);
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 5e200c960..e1dee2b66 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -39,7 +39,7 @@ foreach (array_keys($forms) as $formset) {
         'active' => ($script_name == 'prefs_forms.php' && $formset == $form_param));
     echo PMA_generate_html_tab($tab, array('form' => $formset)) . "\n";
 }
-echo '</ul>';
+echo '</ul><div class="clearfloat"></div>';
 
 // show "configuration saved" message and reload navigation frame if needed
 if (!empty($_GET['saved'])) {

From 7f75e7515fbd03a031ffcd35167147f2f51adc0b Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 30 Jul 2010 19:45:53 +0200
Subject: [PATCH 084/106] improve formatting in generated config file

---
 libraries/config/ConfigFile.class.php | 84 ++++++++++++++++-----------
 1 file changed, 51 insertions(+), 33 deletions(-)

diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index afd116bab..1935c5162 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -457,7 +457,10 @@ class ConfigFile
                 foreach ($server as $k => $v) {
                     $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
                     $ret .= "\$cfg['Servers'][\$i]['$k'] = "
-                        . var_export($v, true) . ';' . $crlf;
+                        . (is_array($v) && $this->_isZeroBasedArray($v)
+                                ? $this->_exportZeroBasedArray($v, $crlf)
+                                : var_export($v, true))
+                        . ';' . $crlf;
                 }
                 $ret .= $crlf;
             }
@@ -499,39 +502,10 @@ class ConfigFile
         if (!is_array($var_value) || empty($var_value)) {
             return "\$cfg['$var_name'] = " . var_export($var_value, true) . ';' . $crlf;
         }
-        $numeric_keys = true;
-        foreach (array_keys($var_value) as $k) {
-            if (!is_numeric($k)) {
-                $numeric_keys = false;
-                break;
-            }
-        }
-        if ($numeric_keys) {
-            for ($i = 0; $i < count($var_value); $i++) {
-                if (!isset($var_value[$i])) {
-                    $numeric_keys = false;
-                    break;
-                }
-            }
-        }
         $ret = '';
-        if ($numeric_keys) {
-            $retv = array();
-            foreach ($var_value as $v) {
-                $retv[] = var_export($v, true);
-            }
-            $ret = "\$cfg['$var_name'] = array(";
-            if (count($retv) <= 4) {
-                // up to 4 values - one line
-                $ret .= implode(', ', $retv);
-            } else {
-                // more than 4 values - value per line
-                $imax = count($retv)-1;
-                for ($i = 0; $i <= $imax; $i++) {
-                    $ret .= ($i < $imax ? ($i > 0 ? ',' : '') : '') . $crlf . '    ' . $retv[$i];
-                }
-            }
-            $ret .= ');' . $crlf;
+        if ($this->_isZeroBasedArray($var_value)) {
+            $ret = "\$cfg['$var_name'] = " . $this->_exportZeroBasedArray($var_value, $crlf)
+                . ');' . $crlf;
         } else {
             // string keys: $cfg[key][subkey] = value
             foreach ($var_value as $k => $v) {
@@ -541,5 +515,49 @@ class ConfigFile
         }
         return $ret;
     }
+
+    /**
+     * Check whether $array is a continuous 0-based array
+     *
+     * @param array $array
+     * @return boolean
+     */
+    private function _isZeroBasedArray(array $array)
+    {
+        for ($i = 0; $i < count($array); $i++) {
+            if (!isset($array[$i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Exports continuous 0-based array
+     *
+     * @param array $array
+     * @param string $crlf
+     * @return string
+     */
+    private function _exportZeroBasedArray(array $array, $crlf)
+    {
+        $retv = array();
+        foreach ($array as $v) {
+            $retv[] = var_export($v, true);
+        }
+        $ret = "array(";
+        if (count($retv) <= 4) {
+            // up to 4 values - one line
+            $ret .= implode(', ', $retv);
+        } else {
+            // more than 4 values - value per line
+            $imax = count($retv)-1;
+            for ($i = 0; $i <= $imax; $i++) {
+                $ret .= ($i < $imax ? ($i > 0 ? ',' : '') : '') . $crlf . '    ' . $retv[$i];
+            }
+        }
+        $ret .= ')';
+        return $ret;
+    }
 }
 ?>
\ No newline at end of file

From dcc352a9dce00acc50b919521deaae314c048fd4 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 30 Jul 2010 20:25:22 +0200
Subject: [PATCH 085/106] refactor config file generation out of ConfigFile
 class

---
 libraries/config/ConfigFile.class.php | 164 ++++----------------------
 setup/config.php                      |   5 +-
 setup/frames/config.inc.php           |   3 +-
 setup/lib/ConfigGenerator.class.php   | 150 +++++++++++++++++++++++
 4 files changed, 181 insertions(+), 141 deletions(-)
 create mode 100644 setup/lib/ConfigGenerator.class.php

diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index 1935c5162..ebb520dfc 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * Config file management and generation
+ * Config file management
  *
  * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
  * @package    phpMyAdmin
  */
 
 /**
- * Config file management and generation class.
+ * Config file management class.
  * Stores its data in $_SESSION
  *
  * @package    phpMyAdmin
@@ -110,6 +110,16 @@ class ConfigFile
         $this->persistKeys = array_flip($keys);
     }
 
+    /**
+     * Returns flipped array set by {@link setPersistKeys()}
+     *
+     * @return array
+     */
+    public function getPersistKeysMap()
+    {
+        return $this->persistKeys;
+    }
+
     /**
      * By default ConfigFile allows setting of all configuration keys, use this method
      * to set up a filter on {@link set()} method
@@ -302,9 +312,9 @@ class ConfigFile
      */
     public function getServerCount()
     {
-      return isset($_SESSION[$this->id]['Servers'])
-          ? count($_SESSION[$this->id]['Servers'])
-          : 0;
+        return isset($_SESSION[$this->id]['Servers'])
+            ? count($_SESSION[$this->id]['Servers'])
+            : 0;
     }
 
     /**
@@ -397,7 +407,7 @@ class ConfigFile
     /**
      * Returns config file path, relative to phpMyAdmin's root path
      *
-     * @return unknown
+     * @return string
      */
     public function getFilePath()
     {
@@ -409,6 +419,16 @@ class ConfigFile
         return SETUP_CONFIG_FILE;
     }
 
+    /**
+     * Returns configuration array (full, multidimensional format)
+     *
+     * @return array
+     */
+    public function getConfig()
+    {
+        return $_SESSION[$this->id];
+    }
+
     /**
      * Returns configuration array (flat format)
      *
@@ -427,137 +447,5 @@ class ConfigFile
         }
         return $c;
     }
-
-    /**
-     * Creates config file
-     *
-     * @return string
-     */
-    public function getConfigFile()
-    {
-        $crlf = (isset($_SESSION['eol']) && $_SESSION['eol'] == 'win') ? "\r\n" : "\n";
-        $c = $_SESSION[$this->id];
-
-        // header
-        $ret = '<?php' . $crlf
-            . '/*' . $crlf
-            . ' * Generated configuration file' . $crlf
-            . ' * Generated by: phpMyAdmin '
-                    . $GLOBALS['PMA_Config']->get('PMA_VERSION')
-                    . ' setup script by Piotr Przybylski <piotrprz@gmail.com>' . $crlf
-            . ' * Date: ' . date(DATE_RFC1123) . $crlf
-            . ' */' . $crlf . $crlf;
-
-        // servers
-        if ($this->getServerCount() > 0) {
-            $ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf;
-            foreach ($c['Servers'] as $id => $server) {
-                $ret .= '/* Server: ' . strtr($this->getServerName($id), '*/', '-') . " [$id] */" . $crlf
-                    . '$i++;' . $crlf;
-                foreach ($server as $k => $v) {
-                    $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
-                    $ret .= "\$cfg['Servers'][\$i]['$k'] = "
-                        . (is_array($v) && $this->_isZeroBasedArray($v)
-                                ? $this->_exportZeroBasedArray($v, $crlf)
-                                : var_export($v, true))
-                        . ';' . $crlf;
-                }
-                $ret .= $crlf;
-            }
-            $ret .= '/* End of servers configuration */' . $crlf . $crlf;
-        }
-        unset($c['Servers']);
-
-        // other settings
-        $persistKeys = $this->persistKeys;
-        foreach ($c as $k => $v) {
-            $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
-            $ret .= $this->_getVarExport($k, $v, $crlf);
-            if (isset($persistKeys[$k])) {
-                unset($persistKeys[$k]);
-            }
-        }
-        // keep 1d array keys which are present in $persist_keys (config.values.php)
-        foreach (array_keys($persistKeys) as $k) {
-            if (strpos($k, '/') === false) {
-                $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
-                $ret .= $this->_getVarExport($k, $this->getDefault($k), $crlf);
-            }
-        }
-        $ret .= '?>';
-
-        return $ret;
-    }
-
-    /**
-     * Returns exported configuration variable
-     *
-     * @param string $var_name
-     * @param mixed  $var_value
-     * @param string $crlf
-     * @return string
-     */
-    private function _getVarExport($var_name, $var_value, $crlf)
-    {
-        if (!is_array($var_value) || empty($var_value)) {
-            return "\$cfg['$var_name'] = " . var_export($var_value, true) . ';' . $crlf;
-        }
-        $ret = '';
-        if ($this->_isZeroBasedArray($var_value)) {
-            $ret = "\$cfg['$var_name'] = " . $this->_exportZeroBasedArray($var_value, $crlf)
-                . ');' . $crlf;
-        } else {
-            // string keys: $cfg[key][subkey] = value
-            foreach ($var_value as $k => $v) {
-                $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
-                $ret .= "\$cfg['$var_name']['$k'] = " . var_export($v, true) . ';' . $crlf;
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Check whether $array is a continuous 0-based array
-     *
-     * @param array $array
-     * @return boolean
-     */
-    private function _isZeroBasedArray(array $array)
-    {
-        for ($i = 0; $i < count($array); $i++) {
-            if (!isset($array[$i])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Exports continuous 0-based array
-     *
-     * @param array $array
-     * @param string $crlf
-     * @return string
-     */
-    private function _exportZeroBasedArray(array $array, $crlf)
-    {
-        $retv = array();
-        foreach ($array as $v) {
-            $retv[] = var_export($v, true);
-        }
-        $ret = "array(";
-        if (count($retv) <= 4) {
-            // up to 4 values - one line
-            $ret .= implode(', ', $retv);
-        } else {
-            // more than 4 values - value per line
-            $imax = count($retv)-1;
-            for ($i = 0; $i <= $imax; $i++) {
-                $ret .= ($i < $imax ? ($i > 0 ? ',' : '') : '') . $crlf . '    ' . $retv[$i];
-            }
-        }
-        $ret .= ')';
-        return $ret;
-    }
 }
 ?>
\ No newline at end of file
diff --git a/setup/config.php b/setup/config.php
index 555a8ab84..1f6cc389b 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -13,6 +13,7 @@
 require './lib/common.inc.php';
 require_once './libraries/config/Form.class.php';
 require_once './libraries/config/FormDisplay.class.php';
+require_once './setup/lib/ConfigGenerator.class.php';
 
 require './libraries/config/setup.forms.php';
 
@@ -40,13 +41,13 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
 	//
     header('Content-Type: text/plain');
     header('Content-Disposition: attachment; filename="config.inc.php"');
-    echo ConfigFile::getInstance()->getConfigFile();
+    echo ConfigGenerator::getConfigFile();
     exit;
 } elseif (PMA_ifSetOr($_POST['submit_save'], '')) {
 	//
 	// Save generated config file on the server
 	//
-    file_put_contents($config_file_path, ConfigFile::getInstance()->getConfigFile());
+    file_put_contents($config_file_path, ConfigGenerator::getConfigFile());
     header('HTTP/1.1 303 See Other');
     header('Location: index.php');
     exit;
diff --git a/setup/frames/config.inc.php b/setup/frames/config.inc.php
index 5bb5785da..f1c235615 100644
--- a/setup/frames/config.inc.php
+++ b/setup/frames/config.inc.php
@@ -16,6 +16,7 @@ if (!defined('PHPMYADMIN')) {
  */
 require_once './libraries/config/FormDisplay.class.php';
 require_once './setup/lib/index.lib.php';
+require_once './setup/lib/ConfigGenerator.class.php';
 
 $config_readable = false;
 $config_writable = false;
@@ -29,7 +30,7 @@ check_config_rw($config_readable, $config_writable, $config_exists);
 <tr>
     <td>
         <textarea cols="50" rows="20" name="textconfig" id="textconfig" spellcheck="false"><?php
-            echo htmlspecialchars(ConfigFile::getInstance()->getConfigFile())
+            echo htmlspecialchars(ConfigGenerator::getConfigFile())
         ?></textarea>
     </td>
 </tr>
diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php
new file mode 100644
index 000000000..f062a35c1
--- /dev/null
+++ b/setup/lib/ConfigGenerator.class.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Config file generator
+ *
+ * @package    phpMyAdmin-setup
+ */
+
+/**
+ * Config file generation class
+ *
+ * @package    phpMyAdmin
+ */
+class ConfigGenerator
+{
+    /**
+     * Creates config file
+     *
+     * @return string
+     */
+    public static function getConfigFile()
+    {
+        $cf = ConfigFile::getInstance();
+
+        $crlf = (isset($_SESSION['eol']) && $_SESSION['eol'] == 'win') ? "\r\n" : "\n";
+        $c = $cf->getConfig();
+
+        // header
+        $ret = '<?php' . $crlf
+            . '/*' . $crlf
+            . ' * Generated configuration file' . $crlf
+            . ' * Generated by: phpMyAdmin '
+                    . $GLOBALS['PMA_Config']->get('PMA_VERSION')
+                    . ' setup script by Piotr Przybylski <piotrprz@gmail.com>' . $crlf
+            . ' * Date: ' . date(DATE_RFC1123) . $crlf
+            . ' */' . $crlf . $crlf;
+
+        // servers
+        if ($cf->getServerCount() > 0) {
+            $ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf;
+            foreach ($c['Servers'] as $id => $server) {
+                $ret .= '/* Server: ' . strtr($cf->getServerName($id), '*/', '-') . " [$id] */" . $crlf
+                    . '$i++;' . $crlf;
+                foreach ($server as $k => $v) {
+                    $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
+                    $ret .= "\$cfg['Servers'][\$i]['$k'] = "
+                        . (is_array($v) && self::_isZeroBasedArray($v)
+                                ? self::_exportZeroBasedArray($v, $crlf)
+                                : var_export($v, true))
+                        . ';' . $crlf;
+                }
+                $ret .= $crlf;
+            }
+            $ret .= '/* End of servers configuration */' . $crlf . $crlf;
+        }
+        unset($c['Servers']);
+
+        // other settings
+        $persistKeys = $cf->getPersistKeysMap();
+
+        foreach ($c as $k => $v) {
+            $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
+            $ret .= self::_getVarExport($k, $v, $crlf);
+            if (isset($persistKeys[$k])) {
+                unset($persistKeys[$k]);
+            }
+        }
+        // keep 1d array keys which are present in $persist_keys (config.values.php)
+        foreach (array_keys($persistKeys) as $k) {
+            if (strpos($k, '/') === false) {
+                $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
+                $ret .= self::_getVarExport($k, $cf->getDefault($k), $crlf);
+            }
+        }
+        $ret .= '?>';
+
+        return $ret;
+    }
+
+    /**
+     * Returns exported configuration variable
+     *
+     * @param string $var_name
+     * @param mixed  $var_value
+     * @param string $crlf
+     * @return string
+     */
+    private static function _getVarExport($var_name, $var_value, $crlf)
+    {
+        if (!is_array($var_value) || empty($var_value)) {
+            return "\$cfg['$var_name'] = " . var_export($var_value, true) . ';' . $crlf;
+        }
+        $ret = '';
+        if (self::_isZeroBasedArray($var_value)) {
+            $ret = "\$cfg['$var_name'] = " . self::_exportZeroBasedArray($var_value, $crlf)
+                . ');' . $crlf;
+        } else {
+            // string keys: $cfg[key][subkey] = value
+            foreach ($var_value as $k => $v) {
+                $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
+                $ret .= "\$cfg['$var_name']['$k'] = " . var_export($v, true) . ';' . $crlf;
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * Check whether $array is a continuous 0-based array
+     *
+     * @param array $array
+     * @return boolean
+     */
+    private static function _isZeroBasedArray(array $array)
+    {
+        for ($i = 0; $i < count($array); $i++) {
+            if (!isset($array[$i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Exports continuous 0-based array
+     *
+     * @param array $array
+     * @param string $crlf
+     * @return string
+     */
+    private static function _exportZeroBasedArray(array $array, $crlf)
+    {
+        $retv = array();
+        foreach ($array as $v) {
+            $retv[] = var_export($v, true);
+        }
+        $ret = "array(";
+        if (count($retv) <= 4) {
+            // up to 4 values - one line
+            $ret .= implode(', ', $retv);
+        } else {
+            // more than 4 values - value per line
+            $imax = count($retv)-1;
+            for ($i = 0; $i <= $imax; $i++) {
+                $ret .= ($i < $imax ? ($i > 0 ? ',' : '') : '') . $crlf . '    ' . $retv[$i];
+            }
+        }
+        $ret .= ')';
+        return $ret;
+    }
+}
+?>
\ No newline at end of file

From 23d74c9996853164f2f7b707336e70dd334599a0 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 30 Jul 2010 20:31:47 +0200
Subject: [PATCH 086/106] fix config download from index.php in setup script

---
 libraries/config/FormDisplay.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index f60d6244e..4a7743e1d 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -36,7 +36,7 @@ function display_form_top($action = null, $method = 'post', $hidden_fields = nul
         echo '<input type="hidden" name="check_page_refresh" id="check_page_refresh"'
             . ' value="" />' . "\n";
     }
-    echo PMA_generate_common_hidden_inputs() . "\n";
+    echo PMA_generate_common_hidden_inputs('', '', 0, 'server') . "\n";
     echo PMA_getHiddenFields((array)$hidden_fields);
 }
 

From e76b4f8721528b3530e92e025845a6557bb94b06 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sat, 31 Jul 2010 21:54:38 +0200
Subject: [PATCH 087/106] fix array definition code

---
 setup/lib/ConfigGenerator.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php
index f062a35c1..bae95a59f 100644
--- a/setup/lib/ConfigGenerator.class.php
+++ b/setup/lib/ConfigGenerator.class.php
@@ -92,7 +92,7 @@ class ConfigGenerator
         $ret = '';
         if (self::_isZeroBasedArray($var_value)) {
             $ret = "\$cfg['$var_name'] = " . self::_exportZeroBasedArray($var_value, $crlf)
-                . ');' . $crlf;
+                . ';' . $crlf;
         } else {
             // string keys: $cfg[key][subkey] = value
             foreach ($var_value as $k => $v) {

From 30413def3ef24a4ce11d1426030ad1f14f2fbca7 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sun, 1 Aug 2010 21:46:33 +0200
Subject: [PATCH 088/106] bugfix: removed superfluous ob_end_clean() which
 caused page rendering to fail when OBGzip was enabled

---
 libraries/config/validate.lib.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index 0a633420f..b44281593 100644
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -290,7 +290,6 @@ function validate_regex($path, $values)
 
     $matches = array();
     preg_match($values[$path], '', $matches);
-    ob_end_clean();
 
     test_php_errormsg(false);
 

From 9a733070032a5f00f368c85450e8000fa5e02aca Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sun, 1 Aug 2010 21:55:04 +0200
Subject: [PATCH 089/106] allow users to set only_db and hide_db

---
 libraries/config/ConfigFile.class.php       | 45 ++++++++++++++++++---
 libraries/config/messages.inc.php           |  2 +-
 libraries/config/user_preferences.forms.php |  2 +
 libraries/user_preferences.inc.php          |  5 ++-
 libraries/user_preferences.lib.php          |  5 ++-
 prefs_forms.php                             |  2 +-
 6 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index ebb520dfc..3b9d6f231 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -32,6 +32,13 @@ class ConfigFile
      */
     private $persistKeys = array();
 
+    /**
+     * Changes keys while updating config in {@link updateWithGlobalConfig()} or reading
+     * by {@link getConfig()} or {@link getConfigArray()}
+     * @var array
+     */
+    private $cfgUpdateReadMapping = array();
+
     /**
      * Key filter for {@link set()}
      * @var array|null
@@ -136,6 +143,16 @@ class ConfigFile
         $this->setFilter = array_flip($keys);
     }
 
+    /**
+     * Sets path mapping for updating config in {@link updateWithGlobalConfig()} or reading
+     * by {@link getConfig()} or {@link getConfigArray()}
+     * @var array
+     */
+    public function setCfgUpdateReadMapping(array $mapping)
+    {
+        $this->cfgUpdateReadMapping = $mapping;
+    }
+
     /**
      * Resets configuration data
      */
@@ -216,21 +233,26 @@ class ConfigFile
     }
 
     /**
-     * Updates config with values read from PMA_Config class
+     * Updates config with values read from given array
      * (config will contain differences to defaults from config.defaults.php).
      *
-     * @param PMA_Config $PMA_Config
+     * @param array $cfg
      */
-    public function updateWithGlobalConfig(PMA_Config $PMA_Config)
+    public function updateWithGlobalConfig(array $cfg)
     {
         // load config array and flatten it
         $this->_flattenArrayResult = array();
-        array_walk($PMA_Config->settings, array($this, '_flattenArray'), '');
+        array_walk($cfg, array($this, '_flattenArray'), '');
         $flat_cfg = $this->_flattenArrayResult;
         $this->_flattenArrayResult = null;
 
         // save values
+        // map for translating a few user preferences paths, should be complemented
+        // by code reading from generated config to perform inverse mapping
         foreach ($flat_cfg as $path => $value) {
+            if (isset($this->cfgUpdateReadMapping[$path])) {
+                $path = $this->cfgUpdateReadMapping[$path];
+            }
             $this->set($path, $value, $path);
         }
     }
@@ -426,7 +448,12 @@ class ConfigFile
      */
     public function getConfig()
     {
-        return $_SESSION[$this->id];
+        $c = $_SESSION[$this->id];
+        foreach ($this->cfgUpdateReadMapping as $map_to => $map_from) {
+            PMA_array_write($map_to, $c, PMA_array_read($map_from, $c));
+            PMA_array_remove($map_from, $c);
+        }
+        return $c;
     }
 
     /**
@@ -445,6 +472,14 @@ class ConfigFile
         foreach ($persistKeys as $k) {
             $c[$k] = $this->getDefault($k);
         }
+
+        foreach ($this->cfgUpdateReadMapping as $map_to => $map_from) {
+            if (!isset($c[$map_from])) {
+                continue;
+            }
+            $c[$map_to] = $c[$map_from];
+            unset($c[$map_from]);
+        }
         return $c;
     }
 }
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index bdaec1fd7..a4d731212 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -390,7 +390,7 @@ $strConfigServers_host_name = __('Server hostname');
 $strConfigServers_LogoutURL_name = __('Logout URL');
 $strConfigServers_nopassword_desc = __('Try to connect without password');
 $strConfigServers_nopassword_name = __('Connect without password');
-$strConfigServers_only_db_desc = __('You can use MySQL wildcard characters (% and _), escape them if you want to use their literal instances, i.e. use \'my\_db\' and not \'my_db\'');
+$strConfigServers_only_db_desc = __('You can use MySQL wildcard characters (% and _), escape them if you want to use their literal instances, i.e. use [kbd]\'my\_db\'[/kbd] and not [kbd]\'my_db\'[/kbd]. Using this option you can sort database list, just enter their names in order and use [kbd]*[/kbd] at the end to show the rest in alphabetical order.');
 $strConfigServers_only_db_name = __('Show only listed databases');
 $strConfigServers_password_desc = __('Leave empty if not using config auth');
 $strConfigServers_password_name = __('Password for config auth');
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 7d60e1056..0e913b9d6 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -18,6 +18,8 @@ $forms['Features']['General'] = array(
     'InitialSlidersState',
     'ErrorIconic',
     'ReplaceHelpImg',
+    'Servers/1/only_db', // saves to Server/only_db
+    'Servers/1/hide_db', // saves to Server/hide_db
     'SkipLockedTables',
     'MaxDbList',
     'MaxTableList');
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index e1dee2b66..00bc89747 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -51,7 +51,10 @@ $forms_all_keys = PMA_read_userprefs_fieldnames($forms);
 $cf = ConfigFile::getInstance();
 $cf->resetConfigData(); // start with a clean instance
 $cf->setAllowedKeys($forms_all_keys);
-$cf->updateWithGlobalConfig($GLOBALS['PMA_Config']);
+$cf->setCfgUpdateReadMapping(array(
+    'Server/hide_db' => 'Servers/1/hide_db',
+    'Server/only_db' => 'Servers/1/only_db'));
+$cf->updateWithGlobalConfig($GLOBALS['cfg']);
 
 // todo: debug - remove
 $arr = $cf->getConfigArray();
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 0f10b5816..6616963e8 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -147,6 +147,8 @@ function PMA_apply_userprefs(array $config_data)
     $whitelist['fontsize'] = true;
     $whitelist['lang'] = true;
     $whitelist['collation_connection'] = true;
+    $whitelist['Server/hide_db'] = true;
+    $whitelist['Server/only_db'] = true;
     foreach ($config_data as $path => $value) {
         if (!isset($whitelist[$path]) || isset($blacklist[$path])) {
             continue;
@@ -230,7 +232,8 @@ function PMA_userprefs_redirect(array $forms, array $old_settings, $file_name, $
         $new_settings = ConfigFile::getInstance()->getConfigArray();
         $diff_keys = array_keys(array_diff_assoc($old_settings, $new_settings)
                 + array_diff_assoc($new_settings, $old_settings));
-        $check_keys = array('NaturalOrder', 'MainPageIconic', 'DefaultTabDatabase');
+        $check_keys = array('NaturalOrder', 'MainPageIconic', 'DefaultTabDatabase',
+            'Server/hide_db', 'Server/only_db');
         $check_keys = array_merge($check_keys, $forms['Left_frame']['Left_frame'],
              $forms['Left_frame']['Left_databases']);
         $diff = array_intersect($check_keys, $diff_keys);
diff --git a/prefs_forms.php b/prefs_forms.php
index 2e170bf5a..280083237 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -30,7 +30,7 @@ foreach ($forms[$form_param] as $form_name => $form) {
     if ($form_name == 'Developer' && !$GLOBALS['cfg']['UserprefsDeveloperTab']) {
         continue;
     }
-    $form_display->registerForm($form_name, $form);
+    $form_display->registerForm($form_name, $form, 1);
 }
 
 if (isset($_POST['revert'])) {

From 279724d6f85f0fe3eb4bb59665e7f01ce8d1b593 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sun, 1 Aug 2010 22:52:15 +0200
Subject: [PATCH 090/106] bugfix: user preferences don't work correctly without
 output buffering

---
 libraries/user_preferences.inc.php | 11 +----
 libraries/user_preferences.lib.php | 15 +++++++
 prefs_forms.php                    | 64 ++++++++++++++++--------------
 prefs_manage.php                   | 10 +++--
 4 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 00bc89747..e11b5e1c6 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -47,17 +47,8 @@ if (!empty($_GET['saved'])) {
     $message->display();
 }
 
-$forms_all_keys = PMA_read_userprefs_fieldnames($forms);
-$cf = ConfigFile::getInstance();
-$cf->resetConfigData(); // start with a clean instance
-$cf->setAllowedKeys($forms_all_keys);
-$cf->setCfgUpdateReadMapping(array(
-    'Server/hide_db' => 'Servers/1/hide_db',
-    'Server/only_db' => 'Servers/1/only_db'));
-$cf->updateWithGlobalConfig($GLOBALS['cfg']);
-
 // todo: debug - remove
-$arr = $cf->getConfigArray();
+$arr = ConfigFile::getInstance()->getConfigArray();
 $arr2 = array();
 foreach ($arr as $k => $v) {
     $arr2[] = "<b>$k</b> " . var_export($v, true);
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 6616963e8..dd26a3f95 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -6,6 +6,21 @@
  * @package phpMyAdmin
  */
 
+/**
+ * Common initialization for user preferences modification pages
+ */
+function PMA_userprefs_pageinit()
+{
+    $forms_all_keys = PMA_read_userprefs_fieldnames($GLOBALS['forms']);
+    $cf = ConfigFile::getInstance();
+    $cf->resetConfigData(); // start with a clean instance
+    $cf->setAllowedKeys($forms_all_keys);
+    $cf->setCfgUpdateReadMapping(array(
+        'Server/hide_db' => 'Servers/1/hide_db',
+        'Server/only_db' => 'Servers/1/only_db'));
+    $cf->updateWithGlobalConfig($GLOBALS['cfg']);
+}
+
 /**
  * Loads user preferences
  *
diff --git a/prefs_forms.php b/prefs_forms.php
index 280083237..63cdea502 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -18,11 +18,15 @@ require_once './libraries/config/Form.class.php';
 require_once './libraries/config/FormDisplay.class.php';
 require './libraries/config/user_preferences.forms.php';
 
-$GLOBALS['js_include'][] = 'config.js';
-require_once './libraries/header.inc.php';
-require_once './libraries/user_preferences.inc.php';
+PMA_userprefs_pageinit();
 
-// handle form display and processing
+// handle form processing
+
+$form_param = filter_input(INPUT_GET, 'form');
+if (!isset($forms[$form_param])) {
+    $forms_keys = array_keys($forms);
+    $form_param = array_shift($forms_keys);
+}
 
 $form_display = new FormDisplay();
 foreach ($forms[$form_param] as $form_name => $form) {
@@ -42,36 +46,36 @@ if (isset($_POST['revert'])) {
             . PMA_generate_common_url($url_params, '&'));
     exit;
 }
-if (!$form_display->process(false)) {
-    // handle form view and failed POST
-    $form_display->display(true, true);
-} else {
-    // check for form errors
-    if ($form_display->hasErrors()) {
-        // form has errors
-        ?>
-        <div class="warning config-form">
-            <b><?php echo __('Submitted form contains errors') ?></b>
-            <?php $form_display->displayErrors(); ?>
-        </div>
-        <?php
-        $form_display->display(true, true);
+
+if ($form_display->process(false) && !$form_display->hasErrors()) {
+    // save settings
+    $old_settings = PMA_load_userprefs();
+    $result = PMA_save_userprefs(ConfigFile::getInstance()->getConfigArray());
+    if ($result === true) {
+        $hash = ltrim(filter_input(INPUT_POST, 'tab_hash'), '#');
+        PMA_userprefs_redirect($forms, $old_settings, 'prefs_forms.php', array(
+            'form' => $form_param), $hash);
+        exit;
     } else {
-        // save settings
-        $old_settings = PMA_load_userprefs();
-        $result = PMA_save_userprefs($cf->getConfigArray());
-        if ($result === true) {
-            $hash = ltrim(filter_input(INPUT_POST, 'tab_hash'), '#');
-            PMA_userprefs_redirect($forms, $old_settings, 'prefs_forms.php', array(
-                'form' => $form_param), $hash);
-            exit;
-        } else {
-            $result->display();
-        }
-        $form_display->display(true, true);
+        $error = $result;
     }
 }
 
+// display forms
+$GLOBALS['js_include'][] = 'config.js';
+require './libraries/header.inc.php';
+require './libraries/user_preferences.inc.php';
+if ($form_display->hasErrors()) {
+    // form has errors
+    ?>
+    <div class="warning config-form">
+        <b><?php echo __('Submitted form contains errors') ?></b>
+        <?php $form_display->displayErrors(); ?>
+    </div>
+    <?php
+}
+$form_display->display(true, true);
+
 /**
  * Displays the footer
  */
diff --git a/prefs_manage.php b/prefs_manage.php
index bcef4bef8..52a33f084 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -18,6 +18,8 @@ require_once './libraries/config/Form.class.php';
 require_once './libraries/config/FormDisplay.class.php';
 require './libraries/config/user_preferences.forms.php';
 
+PMA_userprefs_pageinit();
+
 $error = '';
 if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') == 'text_file') {
     // export to JSON file
@@ -103,8 +105,8 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
         }
         if (!$all_ok) {
             // mimic original form and post json in a hidden field
-            require_once './libraries/header.inc.php';
-            require_once './libraries/user_preferences.inc.php';
+            require './libraries/header.inc.php';
+            require './libraries/user_preferences.inc.php';
             $msg = PMA_Message::warning(__('Configuration contains incorrect data for some fields.'));
             $msg->display();
             echo '<div class="config-form">';
@@ -205,8 +207,8 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
 }
 
 $GLOBALS['js_include'][] = 'config.js';
-require_once './libraries/header.inc.php';
-require_once './libraries/user_preferences.inc.php';
+require './libraries/header.inc.php';
+require './libraries/user_preferences.inc.php';
 ?>
 <script type="text/javascript">
 <?php

From e3f6715c44cf5923a8b9e6e68c8c362c69feaeef Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 3 Aug 2010 00:37:39 +0200
Subject: [PATCH 091/106] bugfix: use true/false for boolean values read from
 <select>s instead of 1/0

---
 libraries/config/FormDisplay.class.php |  6 +++---
 libraries/config/FormDisplay.tpl.php   | 21 ++++++++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index eba4d0d77..e2654cc78 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -461,8 +461,8 @@ class FormDisplay
      */
     private function _validateSelect(&$value, array $allowed)
     {
-        foreach ($allowed as $v) {
-          if ($value == $v) {
+        foreach ($allowed as $vk => $v) {
+          if ($value == $vk) {
               settype($value, gettype($v));
               return true;
           }
@@ -556,7 +556,7 @@ class FormDisplay
                         }
                         break;
                     case 'select':
-                        if (!$this->_validateSelect($_POST[$key], array_keys($form->getOptionValueList($system_path)))) {
+                        if (!$this->_validateSelect($_POST[$key], $form->getOptionValueList($system_path))) {
                             $this->errors[$work_path][] = __('Incorrect value');
                             $result = false;
                             continue;
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 4a7743e1d..adc2b76b5 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -199,28 +199,27 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
             $escape = !(isset($opts['values_escaped']) && $opts['values_escaped']);
             $values_disabled = isset($opts['values_disabled'])
                 ? array_flip($opts['values_disabled']) : array();
-            foreach ($opts['values'] as $opt_value => $opt_name) {
+            foreach ($opts['values'] as $opt_value_key => $opt_value) {
                 // set names for boolean values
-                if (is_bool($opt_name)) {
-                    $opt_name = strtolower($opt_value ? __('Yes') : __('No'));
+                if (is_bool($opt_value)) {
+                    $opt_value = strtolower($opt_value ? __('Yes') : __('No'));
                 }
-                // cast boolean values to integers
-                $display_value = is_bool($opt_value) ? (int) $opt_value : $opt_value;
                 // escape if necessary
                 if ($escape) {
-                    $display = htmlspecialchars($opt_name);
-                    $display_value = htmlspecialchars($display_value);
+                    $display = htmlspecialchars($opt_value);
+                    $display_value = htmlspecialchars($opt_value_key);
                 } else {
-                    $display = $opt_name;
+                    $display = $opt_value;
+                    $display_value = $opt_value_key;
                 }
                 // compare with selected value
                 // boolean values are cast to integers when used as array keys
                 $selected = is_bool($value)
-                    ? (int) $value === $opt_value
-                    : $opt_value === $value;
+                    ? (int) $value === $opt_value_key
+                    : $opt_value_key === $value;
                 echo '<option value="' . $display_value . '"'
                     . ($selected ? ' selected="selected"' : '')
-                    . (isset($values_disabled[$opt_value]) ? ' disabled="disabled"' : '')
+                    . (isset($values_disabled[$opt_value_key]) ? ' disabled="disabled"' : '')
                     . '>' . $display . '</option>';
             }
             echo '</select>';

From 4a5ffa7a12c687b46346be9052a3d2fdaeecebee Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 3 Aug 2010 00:55:57 +0200
Subject: [PATCH 092/106] File comments: - remove @license and @version from
 comments - add vim settings - change descriptions in form definition files

---
 libraries/config/ConfigFile.class.php       |   4 +-
 libraries/config/Form.class.php             |   4 +-
 libraries/config/FormDisplay.class.php      |   4 +-
 libraries/config/FormDisplay.tpl.php        |   4 +-
 libraries/config/config_functions.lib.php   |   2 +-
 libraries/config/messages.inc.php           |   4 +-
 libraries/config/setup.forms.php            |  15 +-
 libraries/config/user_preferences.forms.php |  12 +-
 libraries/config/validate.lib.php           |   4 +-
 libraries/user_preferences.inc.php          |   3 +-
 setup/config.php                            |   5 +-
 setup/frames/config.inc.php                 |   5 +-
 setup/frames/form.inc.php                   |   5 +-
 setup/frames/index.inc.php                  |   4 +-
 setup/frames/menu.inc.php                   |   4 +-
 setup/frames/servers.inc.php                |   4 +-
 setup/index.php                             |   1 -
 setup/lib/ConfigGenerator.class.php         |   5 +-
 setup/lib/common.inc.php                    |   4 +-
 setup/lib/form_processing.lib.php           |   5 +-
 setup/lib/forms.inc.php                     |   5 +-
 setup/lib/index.lib.php                     |   6 +-
 setup/lib/messages.inc.php                  | 380 --------------------
 setup/validate.php                          |   6 +-
 24 files changed, 58 insertions(+), 437 deletions(-)
 delete mode 100644 setup/lib/messages.inc.php

diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index 3b9d6f231..41ffe4b07 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -1,9 +1,9 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Config file management
  *
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @package    phpMyAdmin
+ * @package phpMyAdmin
  */
 
 /**
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
index ddf6a0f83..b53d86f85 100644
--- a/libraries/config/Form.class.php
+++ b/libraries/config/Form.class.php
@@ -1,9 +1,9 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Form handling code.
  *
- * @package    phpMyAdmin
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
+ * @package phpMyAdmin
  */
 
 /**
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index e2654cc78..80f07df85 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Form management class, displays and processes forms
  *
@@ -8,8 +9,7 @@
  * o translated_path - work_path modified for HTML field name, a path with
  *                     slashes changed to hyphens, eg. Servers-4-verbose
  *
- * @package    phpMyAdmin
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
+ * @package phpMyAdmin
  */
 
 /**
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index adc2b76b5..8090423e3 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -1,9 +1,9 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Form templates
  *
- * @package    phpMyAdmin
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
+ * @package phpMyAdmin
  */
 
 /**
diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
index edc84c217..6f9aabb34 100644
--- a/libraries/config/config_functions.lib.php
+++ b/libraries/config/config_functions.lib.php
@@ -3,7 +3,7 @@
 /**
  * Common config manipulation functions
  *
- * @package    phpMyAdmin
+ * @package phpMyAdmin
  */
 
 /**
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index a4d731212..2345fdbb1 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -1,11 +1,13 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Messages for phpMyAdmin.
  *
  * This file is here for easy transition to Gettext. You should not add any
  * new messages here, use instead gettext directly in your template/PHP
  * file.
+ *
+ * @package phpMyAdmin
  */
 
 if (!function_exists('__')) {
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 6609f101a..672cf2407 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * List of avaible forms, each form is described as an array of fields to display.
  * Fields MUST have their counterparts in the $cfg array.
@@ -9,12 +10,16 @@
  * $forms['Form group']['Form name'] = array('Servers/1/host');
  *
  * You can assign default values set by special button ("set value: ..."), eg.:
- * $forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array(
- *  'pmadb' => 'phpmyadmin')));
+ * 'Servers/1/pmadb' => 'phpmyadmin'
  *
- * @package    phpMyAdmin-setup
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
+ * To group options, use:
+ * ':group:' . __('group name') // just define a group
+ * or
+ * 'option' => ':group' // group starting from this option
+ * End group blocks with:
+ * ':group:end'
+ *
+ * @package phpMyAdmin-setup
  */
 
 $forms = array();
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 0e913b9d6..a5e5e62f1 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -1,13 +1,21 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * List of avaible forms, each form is described as an array of fields to display.
  * Fields MUST have their counterparts in the $cfg array.
  *
  * To define form field, use the notatnion below:
- * $forms['Form group']['Form name'] = array('Servers/1/host');
+ * $forms['Form group']['Form name'] = array('Option/path');
  *
  * You can assign default values set by special button ("set value: ..."), eg.:
- * $forms['Server']['pmadb form'] = array('Servers/1/pmadb' => 'phpmyadmin');
+ * 'Servers/1/pmadb' => 'phpmyadmin'
+ *
+ * To group options, use:
+ * ':group:' . __('group name') // just define a group
+ * or
+ * 'option' => ':group' // group starting from this option
+ * End group blocks with:
+ * ':group:end'
  *
  * @package phpMyAdmin
  */
diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index b44281593..d5e2f7616 100644
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Various validation functions
  *
@@ -11,8 +12,7 @@
  *
  * Valdiation functions are assigned in $cfg_db['_validators'] (config.values.php).
  *
- * @package    phpMyAdmin
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
+ * @package phpMyAdmin
  */
 
 /**
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index e11b5e1c6..99b31f19a 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -1,10 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
+ * Common header for user preferences pages
  *
  * @package phpMyAdmin
  */
-if (! defined('PHPMYADMIN')) {
+if (!defined('PHPMYADMIN')) {
     exit;
 }
 
diff --git a/setup/config.php b/setup/config.php
index 1f6cc389b..fa181069f 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -1,10 +1,9 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Front controller for config view / download and clear
  *
- * @package    phpMyAdmin-setup
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
+ * @package phpMyAdmin-setup
  */
 
 /**
diff --git a/setup/frames/config.inc.php b/setup/frames/config.inc.php
index f1c235615..e56898fa0 100644
--- a/setup/frames/config.inc.php
+++ b/setup/frames/config.inc.php
@@ -1,10 +1,9 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Config file view and save screen
  *
- * @package    phpMyAdmin-setup
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
+ * @package phpMyAdmin-setup
  */
 
 if (!defined('PHPMYADMIN')) {
diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php
index 66a4a0ca7..27429b44b 100644
--- a/setup/frames/form.inc.php
+++ b/setup/frames/form.inc.php
@@ -1,10 +1,9 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Form edit view
  *
- * @package    phpMyAdmin-setup
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
+ * @package phpMyAdmin-setup
  */
 
 if (!defined('PHPMYADMIN')) {
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index b82801201..1b1285cee 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -2,9 +2,7 @@
 /**
  * Overview (main page)
  *
- * @package    phpMyAdmin-setup
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
+ * @package phpMyAdmin-setup
  */
 
 if (!defined('PHPMYADMIN')) {
diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php
index b4c016a9c..4a1ae9c2b 100644
--- a/setup/frames/menu.inc.php
+++ b/setup/frames/menu.inc.php
@@ -2,9 +2,7 @@
 /**
  * Menu items
  *
- * @package    phpMyAdmin-setup
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
+ * @package phpMyAdmin-setup
  */
 
 if (!defined('PHPMYADMIN')) {
diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php
index 6cb24f6d1..081c416ec 100644
--- a/setup/frames/servers.inc.php
+++ b/setup/frames/servers.inc.php
@@ -2,9 +2,7 @@
 /**
  * Server create and edit view
  *
- * @package    phpMyAdmin-setup
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
+ * @package phpMyAdmin-setup
  */
 
 if (!defined('PHPMYADMIN')) {
diff --git a/setup/index.php b/setup/index.php
index d5db95c67..7d7892819 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -5,7 +5,6 @@
  * @package    phpMyAdmin-setup
  * @copyright  Copyright (c) 2008, Piotr Przybylski <piotrprz@gmail.com>
  * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
  */
 
 /**
diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php
index bae95a59f..ddad7f124 100644
--- a/setup/lib/ConfigGenerator.class.php
+++ b/setup/lib/ConfigGenerator.class.php
@@ -1,14 +1,15 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Config file generator
  *
- * @package    phpMyAdmin-setup
+ * @package phpMyAdmin-setup
  */
 
 /**
  * Config file generation class
  *
- * @package    phpMyAdmin
+ * @package phpMyAdmin
  */
 class ConfigGenerator
 {
diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php
index 99ab535e1..8b43caff9 100644
--- a/setup/lib/common.inc.php
+++ b/setup/lib/common.inc.php
@@ -1,9 +1,9 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Loads libraries/common.inc.php and preforms some additional actions
  *
- * @package    phpMyAdmin-setup
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
+ * @package phpMyAdmin-setup
  */
 
 /**
diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
index 553e87c15..7bad38c59 100644
--- a/setup/lib/form_processing.lib.php
+++ b/setup/lib/form_processing.lib.php
@@ -1,10 +1,9 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Formset processing library
  *
- * @package    phpMyAdmin-setup
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
+ * @package phpMyAdmin-setup
  */
 
 /**
diff --git a/setup/lib/forms.inc.php b/setup/lib/forms.inc.php
index 9770a4f39..7298513e3 100644
--- a/setup/lib/forms.inc.php
+++ b/setup/lib/forms.inc.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * List of avaible forms, each form is described as an array of fields to display.
  * Fields MUST have their counterparts in the $cfg array.
@@ -12,9 +13,7 @@
  * $forms['Server_pmadb'] = array('Servers' => array(1 => array(
  *  'pmadb' => 'phpmyadmin')));
  *
- * @package    phpMyAdmin-setup
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
+ * @package phpMyAdmin-setup
  */
 
 $forms = array();
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index 151480da2..17c9cf675 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -1,14 +1,12 @@
 <?php
-
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Various checks and message functions used on index page.
  *
  * Security checks are the idea of Aung Khant <aungkhant[at]yehg.net>, http://yehg.net/lab
  * Version check taken from the old setup script by Michal Čihař <michal@cihar.com>
  *
- * @package    phpMyAdmin-setup
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
+ * @package phpMyAdmin-setup
  */
 
 if (!defined('PHPMYADMIN')) {
diff --git a/setup/lib/messages.inc.php b/setup/lib/messages.inc.php
deleted file mode 100644
index d1ceb05ed..000000000
--- a/setup/lib/messages.inc.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-/* $Id$ */
-/**
- * Messages for phpMyAdmin.
- *
- * This file is here for easy transition to Gettext. You should not add any
- * new messages here, use instead gettext directly in your template/PHP
- * file.
- */
-
-if (!function_exists('__')) {
-    die('Bad invocation!');
-}
-
-
-$strSetupAllowArbitraryServer_desc = __('If enabled user can enter any MySQL server in login form for cookie auth');
-$strSetupAllowArbitraryServerMsg = __('This [a@?page=form&amp;formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&amp;formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
-$strSetupAllowArbitraryServer_name = __('Allow login to any MySQL server');
-$strSetupAllowUserDropDatabase_name = __('Show &quot;Drop database&quot; link to normal users');
-$strSetupBlowfishSecretCharsMsg = __('Key should contain letters, numbers [em]and[/em] special characters');
-$strSetupblowfish_secret_desc = __('Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] authentication');
-$strSetupBlowfishSecretLengthMsg = __('Key is too short, it should have at least 8 characters');
-$strSetupBlowfishSecretMsg = __('You didn\'t have blowfish secret set and have enabled cookie authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.');
-$strSetupblowfish_secret_name = __('Blowfish secret');
-$strSetupBrowseMarkerEnable_desc = __('Highlight selected rows');
-$strSetupBrowseMarkerEnable_name = __('Row marker');
-$strSetupBrowsePointerEnable_desc = __('Highlight row pointed by the mouse cursor');
-$strSetupBrowsePointerEnable_name = __('Highlight pointer');
-$strSetupBZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for import and export operations');
-$strSetupBZipDump_name = __('Bzip2');
-$strSetupBZipDumpWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.');
-$strSetupCannotLoadConfig = __('Cannot load or save configuration');
-$strSetupCannotLoadConfigMsg = __('Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@../Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.');
-$strSetupCharEditing_desc = __('Defines which type of editing controls should be used for CHAR and VARCHAR columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in columns');
-$strSetupCharEditing_name = __('CHAR columns editing');
-$strSetupCharTextareaCols_desc = __('Number of columns for CHAR/VARCHAR textareas');
-$strSetupCharTextareaCols_name = __('CHAR textarea columns');
-$strSetupCharTextareaRows_desc = __('Number of rows for CHAR/VARCHAR textareas');
-$strSetupCharTextareaRows_name = __('CHAR textarea rows');
-$strSetupCheckConfigurationPermissions_name = __('Check config file permissions');
-$strSetupClear = __('Clear');
-$strSetupCompressOnFly_desc = __('Compress gzip/bzip2 exports on the fly without the need for much memory; if you encounter problems with created gzip/bzip2 files disable this feature');
-$strSetupCompressOnFly_name = __('Compress on the fly');
-$strSetupConfigurationFile = __('Configuration file');
-$strSetupConfirm_desc = __('Whether a warning (&quot;Are your really sure...&quot;) should be displayed when you\'re about to lose data');
-$strSetupConfirm_name = __('Confirm DROP queries');
-$strSetupDefaultLanguage = __('Default language');
-$strSetupDefaultServer = __('Default server');
-$strSetupDefaultTabDatabase_desc = __('Tab that is displayed when entering a database');
-$strSetupDefaultTabDatabase_name = __('Default database tab');
-$strSetupDefaultTabServer_desc = __('Tab that is displayed when entering a server');
-$strSetupDefaultTabServer_name = __('Default server tab');
-$strSetupDefaultTabTable_desc = __('Tab that is displayed when entering a table');
-$strSetupDefaultTabTable_name = __('Default table tab');
-$strSetupDirectoryNotice = __('This value should be double checked to ensure that this directory is neither world accessible nor readable or writable by other users on your server.');
-$strSetupDisplayDatabasesList_desc = __('Show database listing as a list instead of a drop down');
-$strSetupDisplayDatabasesList_name = __('Display databases as a list');
-$strSetupDisplay = __('Display');
-$strSetupDisplayServersList_desc = __('Show server listing as a list instead of a drop down');
-$strSetupDisplayServersList_name = __('Display servers as a list');
-$strSetupDonateLink = __('Donate');
-$strSetupDownload = __('Download');
-$strSetupEndOfLine = __('End of line');
-$strSetuperror_connection = __('Could not connect to MySQL server');
-$strSetuperror_empty_pmadb_password = __('Empty phpMyAdmin control user password while using pmadb');
-$strSetuperror_empty_pmadb_user = __('Empty phpMyAdmin control user while using pmadb');
-$strSetuperror_empty_signon_session = __('Empty signon session name while using signon authentication method');
-$strSetuperror_empty_signon_url = __('Empty signon URL while using signon authentication method');
-$strSetuperror_empty_user_for_config_auth = __('Empty username while using config authentication method');
-$strSetuperror_form = __('Submitted form contains errors');
-$strSetuperror_incorrect_ip_address = __('Incorrect IP address: %s');
-$strSetuperror_incorrect_port = __('Not a valid port number');
-$strSetuperror_incorrect_value = __('Incorrect value');
-$strSetuperror_missing_field_data = __('Missing data for %s');
-$strSetuperror_nan_nneg = __('Not a non-negative number');
-$strSetuperror_nan_p = __('Not a positive number');
-$strSetupExecTimeLimit_desc = __('Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)');
-$strSetupExecTimeLimit_name = __('Maximum execution time');
-$strSetupExport_asfile_name = __('Save as file');
-$strSetupExport_charset_name = __('Character set of the file');
-$strSetupExport_compression_name = __('Compression');
-$strSetupExport_file_template_database_name = __('Database name template');
-$strSetupExport_file_template_server_name = __('Server name template');
-$strSetupExport_file_template_table_name = __('Table name template');
-$strSetupExport_format_name = __('Format');
-$strSetupExport_onserver_name = __('Save on server');
-$strSetupExport_onserver_overwrite_name = __('Overwrite existing file(s)');
-$strSetupExport_remember_file_template_name = __('Remember file name template');
-$strSetupFalse = __('no');
-$strSetupForceSSL_desc = __('Force secured connection while using phpMyAdmin');
-$strSetupForceSSLMsg = __('This [a@?page=form&amp;formset=features#tab_Security]option[/a] should be enabled if your web server supports it');
-$strSetupForceSSL_name = __('Force SSL connection');
-$strSetupForeignKeyDropdownOrder_desc = __('Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is the referenced data, [kbd]id[/kbd] is the key value');
-$strSetupForeignKeyDropdownOrder_name = __('Foreign key dropdown order');
-$strSetupForeignKeyMaxLimit_desc = __('A dropdown will be used if fewer items are present');
-$strSetupForeignKeyMaxLimit_name = __('Foreign key limit');
-$strSetupForm_Browse = __('Browse mode');
-$strSetupForm_Browse_desc = __('Customize browse mode');
-$strSetupForm_Edit_desc = __('Customize edit mode');
-$strSetupForm_Edit = __('Edit mode');
-$strSetupForm_Export_defaults_desc = __('Customize default export options');
-$strSetupForm_Export_defaults = __('Export defaults');
-$strSetupForm_Import_defaults_desc = __('Customize default common import options');
-$strSetupForm_Import_defaults = __('Import defaults');
-$strSetupForm_Import_export_desc = __('Set import and export directories and compression options');
-$strSetupForm_Import_export = __('Import / export');
-$strSetupForm_Left_databases = __('Databases');
-$strSetupForm_Left_databases_desc = __('Databases display options');
-$strSetupForm_Left_frame_desc = __('Customize appearance of the navigation frame');
-$strSetupForm_Left_frame = __('Navigation frame');
-$strSetupForm_Left_servers_desc = __('Servers display options');
-$strSetupForm_Left_servers = __('Servers');
-$strSetupForm_Left_tables_desc = __('Tables display options');
-$strSetupForm_Left_tables = __('Tables');
-$strSetupForm_Main_frame = __('Main frame');
-$strSetupForm_Other_core_settings_desc = __('Settings that didn\'t fit enywhere else');
-$strSetupForm_Other_core_settings = __('Other core settings');
-$strSetupForm_Query_window_desc = __('Customize query window options');
-$strSetupForm_Query_window = __('Query window');
-$strSetupForm_Security_desc = __('Please note that phpMyAdmin is just a user interface and its features do not limit MySQL');
-$strSetupForm_Security = __('Security');
-$strSetupForm_Server = __('Basic settings');
-$strSetupForm_Server_config_desc = __('Advanced server configuration, do not change these options unless you know what they are for');
-$strSetupForm_Server_config = __('Server configuration');
-$strSetupForm_Server_desc = __('Enter server connection parameters');
-$strSetupForm_Server_login_options_desc = __('Enter login options for signon authentication');
-$strSetupForm_Server_login_options = __('Signon login options');
-$strSetupForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@../Documentation.html#linked-tables]phpMyAdmin configuration storage[/a] in documentation');
-$strSetupForm_Server_pmadb = __('PMA database');
-$strSetupForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.');
-$strSetupForm_Server_tracking = __('Changes tracking');
-$strSetupFormset_customization = __('Customization');
-$strSetupFormset_export = __('Customize export options');
-$strSetupFormset_features = __('Features');
-$strSetupFormset_import = __('Customize import defaults');
-$strSetupFormset_left_frame = __('Customize navigation frame');
-$strSetupFormset_main_frame = __('Customize main frame');
-$strSetupForm_Sql_box_desc = __('Customize links shown in SQL Query boxes');
-$strSetupForm_Sql_box = __('SQL Query box');
-$strSetupForm_Sql_queries_desc = __('SQL queries settings, for SQL Query box options see [a@?page=form&amp;formset=main_frame#tab_Sql_box]Navigation frame[/a] settings');
-$strSetupForm_Sql_queries = __('SQL queries');
-$strSetupForm_Startup_desc = __('Customize startup page');
-$strSetupForm_Startup = __('Startup');
-$strSetupForm_Tabs_desc = __('Choose how you want tabs to work');
-$strSetupForm_Tabs = __('Tabs');
-$strSetupGZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import and export operations');
-$strSetupGZipDump_name = __('GZip');
-$strSetupGZipDumpWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.');
-$strSetupHomepageLink = __('phpMyAdmin homepage');
-$strSetupIconvExtraParams_name = __('Extra parameters for iconv');
-$strSetupIgnoreErrors = __('Ignore errors');
-$strSetupIgnoreMultiSubmitErrors_desc = __('If enabled, phpMyAdmin continues computing multiple-statement queries even if one of the queries failed');
-$strSetupIgnoreMultiSubmitErrors_name = __('Ignore multiple statement errors');
-$strSetupImport_allow_interrupt_desc = __('Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.');
-$strSetupImport_allow_interrupt_name = __('Partial import: allow interrupt');
-$strSetupImport_format_desc = __('Default format; be aware that this list depends on location (database, table) and only SQL is always available');
-$strSetupImport_format_name = __('Format of imported file');
-$strSetupImport_skip_queries_desc = __('Number of queries to skip from start');
-$strSetupImport_skip_queries_name = __('Partial import: skip queries');
-$strSetupInsecureConnection = __('Insecure connection');
-$strSetupInsecureConnectionMsg1 = __('You are not using a secure connection; all data (including potentially sensitive information, like passwords) is transferred unencrypted!');
-$strSetupInsecureConnectionMsg2 = __('If your server is also configured to accept HTTPS requests follow [a@%s]this link[/a] to use a secure connection.');
-$strSetupInsertRows_desc = __('How many rows can be inserted at one time');
-$strSetupInsertRows_name = __('Number of inserted rows');
-$strSetupLeftDefaultTabTable_name = __('Target for quick access icon');
-$strSetupLeftDisplayLogo_desc = __('Show logo in left frame');
-$strSetupLeftDisplayLogo_name = __('Display logo');
-$strSetupLeftDisplayServers_desc = __('Display server choice at the top of the left frame');
-$strSetupLeftDisplayServers_name = __('Display servers selection');
-$strSetupLeftFrameDBSeparator_desc = __('String that separates databases into different tree levels');
-$strSetupLeftFrameDBSeparator_name = __('Database tree separator');
-$strSetupLeftFrameDBTree_desc = __('Only light version; display databases in a tree (determined by the separator defined below)');
-$strSetupLeftFrameDBTree_name = __('Display databases in a tree');
-$strSetupLeftFrameLight_desc = __('Disable this if you want to see all databases at once');
-$strSetupLeftFrameLight_name = __('Use light version');
-$strSetupLeftFrameTableLevel_name = __('Maximum table tree depth');
-$strSetupLeftFrameTableSeparator_desc = __('String that separates tables into different tree levels');
-$strSetupLeftFrameTableSeparator_name = __('Table tree separator');
-$strSetupLeftLogoLink_name = __('Logo link URL');
-$strSetupLeftLogoLinkWindow_desc = __('Open the linked page in the main window ([kbd]main[/kbd]) or in a new one ([kbd]new[/kbd])');
-$strSetupLeftLogoLinkWindow_name = __('Logo link target');
-$strSetupLeftPointerEnable_desc = __('Highlight server under the mouse cursor');
-$strSetupLeftPointerEnable_name = __('Enable highlighting');
-$strSetupLetUserChoose = __('let the user choose');
-$strSetupLightTabs_desc = __('Use less graphically intense tabs');
-$strSetupLightTabs_name = __('Light tabs');
-$strSetupLoad = __('Load');
-$strSetupLoginCookieDeleteAll_desc = __('If TRUE, logout deletes cookies for all servers; when set to FALSE, logout only occurs for the current server. Setting this to FALSE makes it easy to forget to log out from other servers when connected to multiple servers.');
-$strSetupLoginCookieDeleteAll_name = __('Delete all cookies on logout');
-$strSetupLoginCookieRecall_desc = __('Define whether the previous login should be recalled or not in cookie authentication mode');
-$strSetupLoginCookieRecall_name = __('Recall user name');
-$strSetupLoginCookieStore_desc = __('Defines how long (in seconds) a login cookie should be stored in browser. The default of 0 means that it will be kept for the existing session only, and will be deleted as soon as you close the browser window. This is recommended for non-trusted environments.');
-$strSetupLoginCookieStore_name = __('Login cookie store');
-$strSetupLoginCookieValidity_desc = __('Define how long (in seconds) a login cookie is valid');
-$strSetupLoginCookieValidityMsg = __('[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.');
-$strSetupLoginCookieValidity_name = __('Login cookie validity');
-$strSetupMaxCharactersInDisplayedSQL_desc = __('Maximum number of characters used when a SQL query is displayed');
-$strSetupMaxCharactersInDisplayedSQL_name = __('Maximum displayed SQL length');
-$strSetupMaxDbList_desc = __('Maximum number of databases displayed in left frame and database list');
-$strSetupMaxDbList_name = __('Maximum databases');
-$strSetupMaxRows_desc = __('Number of rows displayed when browsing a result set. If the result set contains more rows, &quot;Previous&quot; and &quot;Next&quot; links will be shown.');
-$strSetupMaxRows_name = __('Maximum number of rows to display');
-$strSetupMaxTableList_desc = __('Maximum number of tables displayed in table list');
-$strSetupMaxTableList_name = __('Maximum tables');
-$strSetupMemoryLimit_desc = __('The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] ([kbd]0[/kbd] for no limit)');
-$strSetupMemoryLimit_name = __('Memory limit');
-$strSetupNavigationBarIconic_desc = __('Use only icons, only text or both');
-$strSetupNavigationBarIconic_name = __('Iconic navigation bar');
-$strSetupNewServer = __('New server');
-$strSetupNoServers = __('There are no configured servers');
-$strSetupOBGzip_desc = __('use GZip output buffering for increased speed in HTTP transfers');
-$strSetupOBGzip_name = __('GZip output buffering');
-$strSetupOptionNone = __('- none -');
-$strSetupOrder_desc = __('[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, DATETIME and TIMESTAMP, ascending order otherwise');
-$strSetupOrder_name = __('Default sorting order');
-$strSetupOverview = __('Overview');
-$strSetupPersistentConnections_desc = __('Use persistent connections to MySQL databases');
-$strSetupPersistentConnections_name = __('Persistent connections');
-$strSetupPropertiesIconic_desc = __('Use only icons, only text or both');
-$strSetupPropertiesIconic_name = __('Iconic table operations');
-$strSetupProtectBinary_desc = __('Disallow BLOB and BINARY columns from editing');
-$strSetupProtectBinary_name = __('Protect binary columns');
-$strSetupQueryHistoryDB_desc = __('Enable if you want DB-based query history (requires pmadb). If disabled, this utilizes JS-routines to display query history (lost by window close).');
-$strSetupQueryHistoryDB_name = __('Permanent query history');
-$strSetupQueryHistoryMax_desc = __('How many queries are kept in history');
-$strSetupQueryHistoryMax_name = __('Query history length');
-$strSetupQueryWindowDefTab_desc = __('Tab displayed when opening a new query window');
-$strSetupQueryWindowDefTab_name = __('Default query window tab');
-$strSetupRecodingEngine_desc = __('Select which functions will be used for character set conversion');
-$strSetupRecodingEngine_name = __('Recoding engine');
-$strSetupRestoreDefaultValue = __('Restore default value');
-$strSetupRevertErroneousFields = __('Try to revert erroneous fields to their default values');
-$strSetupSaveDir_desc = __('Directory where exports can be saved on server');
-$strSetupSaveDir_name = __('Save directory');
-$strSetupServerAuthConfigMsg = __('You set the [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set [a@?page=servers&amp;mode=edit&amp;id=%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/kbd].');
-$strSetupServerExtensionMsg = __('You should use mysqli for performance reasons');
-$strSetupServerNoPasswordMsg = __('You allow for connecting to the server without a password.');
-$strSetupServersAdd = __('Add a new server');
-$strSetupServers_AllowDeny_order_desc = __('Leave blank if not used');
-$strSetupServers_AllowDeny_order_name = __('Host authentication order');
-$strSetupServers_AllowDeny_rules_desc = __('Leave blank for defaults');
-$strSetupServers_AllowDeny_rules_name = __('Host authentication rules');
-$strSetupServers_AllowNoPassword_name = __('Allow logins without a password');
-$strSetupServers_AllowRoot_name = __('Allow root login');
-$strSetupServers_auth_http_realm_desc = __('HTTP Basic Auth Realm name to display when doing HTTP Auth');
-$strSetupServers_auth_http_realm_name = __('HTTP Realm');
-$strSetupServers_auth_swekey_config_desc = __('The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)');
-$strSetupServers_auth_swekey_config_name = __('SweKey config file');
-$strSetupServers_auth_type_desc = __('Authentication method to use');
-$strSetupServers_auth_type_name = __('Authentication type');
-$strSetupServers_bookmarktable_desc = __('Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] support, suggested: [kbd]pma_bookmark[/kbd]');
-$strSetupServers_bookmarktable_name = __('Bookmark table');
-$strSetupServers_column_info_desc = __('Leave blank for no column comments/mime types, suggested: [kbd]pma_column_info[/kbd]');
-$strSetupServers_column_info_name = __('Column information table');
-$strSetupServers_compress_desc = __('Compress connection to MySQL server');
-$strSetupServers_compress_name = __('Compress connection');
-$strSetupServers_connect_type_desc = __('How to connect to server, keep [kbd]tcp[/kbd] if unsure');
-$strSetupServers_connect_type_name = __('Connection type');
-$strSetupServers_controlpass_name = __('Control user password');
-$strSetupServers_controluser_desc = __('A special MySQL user configured with limited permissions, more information available on [a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]');
-$strSetupServers_controluser_name = __('Control user');
-$strSetupServers_CountTables_desc = __('Count tables when showing database list');
-$strSetupServers_CountTables_name = __('Count tables');
-$strSetupServers_designer_coords_desc = __('Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/kbd]');
-$strSetupServers_designer_coords_name = __('Designer table');
-$strSetupServers_DisableIS_desc = __('More information on [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]');
-$strSetupServers_DisableIS_name = __('Disable use of INFORMATION_SCHEMA');
-$strSetupServerSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - [a@?page=servers&amp;mode=edit&amp;id=%1$d#tab_Server_config]host authentication[/a] settings and [a@?page=form&amp;formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
-$strSetupServersEdit = __('Edit server');
-$strSetupServers_extension_desc = __('What PHP extension to use; you should use mysqli if supported');
-$strSetupServers_extension_name = __('PHP extension to use');
-$strSetupServers_hide_db_desc = __('Hide databases matching regular expression (PCRE)');
-$strSetupServers_hide_db_name = __('Hide databases');
-$strSetupServers_history_desc = __('Leave blank for no SQL query history support, suggested: [kbd]pma_history[/kbd]');
-$strSetupServers_history_name = __('SQL query history table');
-$strSetupServers_tracking_desc = __('Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/kbd]');
-$strSetupServers_tracking_name = __('SQL query tracking table');
-$strSetupServers_host_desc = __('Hostname where MySQL server is running');
-$strSetupServers_host_name = __('Server hostname');
-$strSetupServers_LogoutURL_name = __('Logout URL');
-$strSetupServers_nopassword_desc = __('Try to connect without password');
-$strSetupServers_nopassword_name = __('Connect without password');
-$strSetupServers_only_db_desc = __('You can use MySQL wildcard characters (% and _), escape them if you want to use their literal instances, i.e. use \'my\_db\' and not \'my_db\'');
-$strSetupServers_only_db_name = __('Show only listed databases');
-$strSetupServers_password_desc = __('Leave empty if not using config auth');
-$strSetupServers_password_name = __('Password for config auth');
-$strSetupServers_pdf_pages_desc = __('Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]');
-$strSetupServers_pdf_pages_name = __('PDF schema: pages table');
-$strSetupServers_pmadb_desc = __('Database used for relations, bookmarks, and PDF features. See [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for no support. Suggested: [kbd]phpmyadmin[/kbd]');
-$strSetupServers_pmadb_name = __('PMA database');
-$strSetupServers_port_desc = __('Port on which MySQL server is listening, leave empty for default');
-$strSetupServers_port_name = __('Server port');
-$strSetupServers_relation_desc = __('Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links[/a] support, suggested: [kbd]pma_relation[/kbd]');
-$strSetupServers_relation_name = __('Relation table');
-$strSetupServers_ShowDatabasesCommand_desc = __('SQL command to fetch available databases');
-$strSetupServers_ShowDatabasesCommand_name = __('SHOW DATABASES command');
-$strSetupServers_SignonSession_desc = __('See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types[/a] for an example');
-$strSetupServers_SignonSession_name = __('Signon session name');
-$strSetupServers_SignonURL_name = __('Signon URL');
-$strSetupServers_tracking_version_auto_create_desc = __('Whether the tracking mechanism creates versions for tables and views automatically.');
-$strSetupServers_tracking_version_auto_create_name = __('Automatically create versions');
-$strSetupServers_tracking_default_statements_desc = __('Defines the list of statements the auto-creation uses for new versions.');
-$strSetupServers_tracking_default_statements_name = __('Statements to track');
-$strSetupServers_tracking_add_drop_view_desc = __('Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view.');
-$strSetupServers_tracking_add_drop_view_name = __('Add DROP VIEW');
-$strSetupServers_tracking_add_drop_table_desc = __('Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table.');
-$strSetupServers_tracking_add_drop_table_name = __('Add DROP TABLE');
-$strSetupServers_tracking_add_drop_database_desc = __('Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database.');
-$strSetupServers_tracking_add_drop_database_name = __('Add DROP DATABASE');
-$strSetupServerSslMsg = __('You should use SSL connections if your web server supports it');
-$strSetupServers_socket_desc = __('Socket on which MySQL server is listening, leave empty for default');
-$strSetupServers_socket_name = __('Server socket');
-$strSetupServers_ssl_desc = __('Enable SSL for connection to MySQL server');
-$strSetupServers_ssl_name = __('Use SSL');
-$strSetupServers_table_coords_desc = __('Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]');
-$strSetupServers_table_coords_name = __('PDF schema: table coordinates');
-$strSetupServers_table_info_desc = __('Table to describe the display columns, leave blank for no support; suggested: [kbd]pma_table_info[/kbd]');
-$strSetupServers_table_info_name = __('Display columns table');
-$strSetupServers_user_desc = __('Leave empty if not using config auth');
-$strSetupServers_user_name = __('User for config auth');
-$strSetupServers_verbose_check_desc = __('Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance');
-$strSetupServers_verbose_check_name = __('Verbose check');
-$strSetupServers_verbose_desc = __('A user-friendly description of this server. Leave blank to display the hostname instead.');
-$strSetupServers_verbose_name = __('Verbose name of this server');
-$strSetupSetValue = __('Set value: %s');
-$strSetupShowAll_desc = __('Whether a user should be displayed a &quot;show all (rows)&quot; button');
-$strSetupShowAll_name = __('Allow to display all the rows');
-$strSetupShowChgPassword_desc = __('Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly');
-$strSetupShowChgPassword_name = __('Show password change form');
-$strSetupShowCreateDb_name = __('Show create database form');
-$strSetupShowForm = __('Show form');
-$strSetupShowFunctionFields_desc = __('Display the function fields in edit/insert mode');
-$strSetupShowFunctionFields_name = __('Show function fields');
-$strSetupShowHiddenMessages = __('Show hidden messages (#MSG_COUNT)');
-$strSetupShowPhpInfo_desc = __('Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] output');
-$strSetupShowPhpInfo_name = __('Show phpinfo() link');
-$strSetupShowServerInfo_name = __('Show detailed MySQL server information');
-$strSetupShowSQL_desc = __('Defines whether SQL queries generated by phpMyAdmin should be displayed');
-$strSetupShowSQL_name = __('Show SQL queries');
-$strSetupShowStats_desc = __('Allow to display database and table statistics (eg. space usage)');
-$strSetupShowStats_name = __('Show statistics');
-$strSetupShowTooltipAliasDB_desc = __('If tooltips are enabled and a database comment is set, this will flip the comment and the real name');
-$strSetupShowTooltipAliasDB_name = __('Display database comment instead of its name');
-$strSetupShowTooltipAliasTB_desc = __('When setting this to [kbd]nested[/kbd], the alias of the table name is only used to split/nest the tables according to the $cfg[\'LeftFrameTableSeparator\'] directive, so only the folder is called like the alias, the table name itself stays unchanged');
-$strSetupShowTooltipAliasTB_name = __('Display table comment instead of its name');
-$strSetupShowTooltip_name = __('Display table comments in tooltips');
-$strSetupSkipLockedTables_desc = __('Mark used tables and make it possible to show databases with locked tables');
-$strSetupSkipLockedTables_name = __('Skip locked tables');
-$strSetupSQLQuery_Edit_name = __('Edit');
-$strSetupSQLQuery_Explain_name = __('Explain SQL');
-$strSetupSQLQuery_Refresh_name = __('Refresh');
-$strSetupSQLQuery_ShowAsPHP_name = __('Create PHP Code');
-$strSetupSQLQuery_Validate_name = __('Validate SQL');
-$strSetupSuggestDBName_desc = __('Suggest a database name on the &quot;Create Database&quot; form (if possible) or keep the text field empty');
-$strSetupSuggestDBName_name = __('Suggest new database name');
-$strSetupTrue = __('yes');
-$strSetupTrustedProxies_desc = __('Input proxies as [kbd]IP: trusted HTTP header[/kbd]. The following example specifies that phpMyAdmin should trust a HTTP_X_FORWARDED_FOR (X-Forwarded-For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: HTTP_X_FORWARDED_FOR[/kbd]');
-$strSetupTrustedProxies_name = __('List of trusted proxies for IP allow/deny');
-$strSetupUploadDir_desc = __('Directory on server where you can upload files for import');
-$strSetupUploadDir_name = __('Upload directory');
-$strSetupUseDbSearch_desc = __('Allow for searching inside the entire database');
-$strSetupUseDbSearch_name = __('Use database search');
-$strSetupVerboseMultiSubmit_desc = __('Show affected rows of each statement on multiple-statement queries. See libraries/import.lib.php for defaults on how many queries a statement may contain.');
-$strSetupVerboseMultiSubmit_name = __('Verbose multiple statements');
-$strSetupVersionCheckDataError = __('Reading of version failed. Maybe you\'re offline or the upgrade server does not respond.');
-$strSetupVersionCheckInvalid = __('Got invalid version string from server');
-$strSetupVersionCheckLink = __('Check for latest version');
-$strSetupVersionCheckNewAvailable = __('A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.');
-$strSetupVersionCheckNewAvailableSvn = __('You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable version is %s, released on %s.');
-$strSetupVersionCheckNone = __('No newer stable version is available');
-$strSetupVersionCheckUnparsable = __('Unparsable version string');
-$strSetupVersionCheck = __('Version check');
-$strSetupVersionCheckWrapperError = __('Neither URL wrapper nor CURL is available. Version check is not possible.');
-$strSetupWarning = __('Warning');
-$strSetupZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression for import and export operations');
-$strSetupZipDumpExportWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]Zip compression[/a] requires functions (%s) which are unavailable on this system.');
-$strSetupZipDumpImportWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]Zip decompression[/a] requires functions (%s) which are unavailable on this system.');
-$strSetupZipDump_name = __('ZIP');
-
-?>
diff --git a/setup/validate.php b/setup/validate.php
index e8d7a7f6d..beeba71ce 100644
--- a/setup/validate.php
+++ b/setup/validate.php
@@ -1,11 +1,9 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Validation callback.
  *
- * @package    phpMyAdmin-setup
- * @copyright  Copyright (c) 2008, Piotr Przybylski <piotrprz@gmail.com>
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
+ * @package phpMyAdmin-setup
  */
 
 /**

From 4c430acc7175165a82f31a8051e493bd1da4a690 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Tue, 3 Aug 2010 00:57:14 +0200
Subject: [PATCH 093/106] add missing .htaccess

---
 setup/frames/.htaccess | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 setup/frames/.htaccess

diff --git a/setup/frames/.htaccess b/setup/frames/.htaccess
new file mode 100644
index 000000000..56baee608
--- /dev/null
+++ b/setup/frames/.htaccess
@@ -0,0 +1,3 @@
+# This folder does not require access over HTTP
+# (the following directive denies access by default)
+Order allow,deny

From 1d265c58936ba3cbf2378566182104f6340a458b Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Wed, 4 Aug 2010 00:57:11 +0200
Subject: [PATCH 094/106] fix regular expression validation when phpMyAdmin
 custom error handler is set

---
 libraries/config/validate.lib.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index d5e2f7616..7c35fffa7 100644
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -131,6 +131,16 @@ function PMA_config_validate($validator_id, &$values, $isPostSource)
     return empty($new_result) ? true : $new_result;
 }
 
+/**
+ * Empty error handler, used to temporarily restore PHP internal error handler
+ * 
+ * @return bool
+ */
+function PMA_null_error_handler()
+{
+    return false;
+}
+
 /**
  * Ensures that $php_errormsg variable will be registered in case of an error
  * and enables output buffering (when $start = true).
@@ -141,17 +151,25 @@ function PMA_config_validate($validator_id, &$values, $isPostSource)
  */
 function test_php_errormsg($start = true)
 {
-    static $old_html_errors, $old_track_errors;
+    static $old_html_errors, $old_track_errors, $old_error_reporting;
+    static $old_display_errors;
     if ($start) {
         $old_html_errors = ini_get('html_errors');
         $old_track_errors = ini_get('track_errors');
+        $old_display_errors = ini_get('display_errors');
+        $old_error_reporting = error_reporting(E_ALL);
         ini_set('html_errors', false);
         ini_set('track_errors', true);
+        ini_set('display_errors', true);
+        set_error_handler("PMA_null_error_handler");
         ob_start();
     } else {
         ob_end_clean();
+        restore_error_handler();
+        error_reporting($old_error_reporting);
         ini_set('html_errors', $old_html_errors);
         ini_set('track_errors', $old_track_errors);
+        ini_set('display_errors', $old_display_errors);
     }
 }
 

From 8b78fcec2696efa1fc0dbf2f501e8fea02b79c71 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Wed, 4 Aug 2010 14:35:09 +0200
Subject: [PATCH 095/106] remove unneeded file

---
 setup/lib/forms.inc.php | 181 ----------------------------------------
 1 file changed, 181 deletions(-)
 delete mode 100644 setup/lib/forms.inc.php

diff --git a/setup/lib/forms.inc.php b/setup/lib/forms.inc.php
deleted file mode 100644
index 7298513e3..000000000
--- a/setup/lib/forms.inc.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * List of avaible forms, each form is described as an array of fields to display.
- * Fields MUST have their counterparts in the $cfg array.
- *
- * There are two possible notations:
- * $forms['Form name'] = array('Servers' => array(1 => array('host')));
- * can be written as
- * $forms['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(
- *  'pmadb' => 'phpmyadmin')));
- *
- * @package phpMyAdmin-setup
- */
-
-$forms = array();
-$forms['_config.php'] = array(
-    'DefaultLang',
-    'ServerDefault');
-$forms['Server'] = array('Servers' => array(1 => array(
-    'verbose',
-    'host',
-    'port',
-    'socket',
-    'ssl',
-    'connect_type',
-    'extension',
-    'compress',
-    'auth_type',
-    'auth_http_realm',
-    'user',
-    'password',
-    'nopassword',
-    'auth_swekey_config' => './swekey.conf')));
-$forms['Server_login_options'] = array('Servers' => array(1 => array(
-    'SignonSession',
-    'SignonURL',
-    'LogoutURL')));
-$forms['Server_config'] = array('Servers' => array(1 => array(
-    'only_db',
-    'hide_db',
-    'AllowRoot',
-    'AllowNoPassword',
-    'DisableIS',
-    'AllowDeny/order',
-    'AllowDeny/rules',
-    'ShowDatabasesCommand',
-    'CountTables')));
-$forms['Server_pmadb'] = array('Servers' => array(1 => array(
-    'pmadb' => 'phpmyadmin',
-    'controluser',
-    'controlpass',
-    'verbose_check',
-    'bookmarktable' => 'pma_bookmark',
-    'relation' => 'pma_relation',
-    'table_info' => 'pma_table_info',
-    'table_coords' => 'pma_table_coords',
-    'pdf_pages' => 'pma_pdf_pages',
-    'column_info' => 'pma_column_info',
-    'history' => 'pma_history',
-    'tracking' => 'pma_tracking',
-    'designer_coords' => 'pma_designer_coords')));
-$forms['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(
-    'UploadDir',
-    'SaveDir',
-    'RecodingEngine',
-    'IconvExtraParams',
-    'ZipDump',
-    'GZipDump',
-    'BZipDump',
-    'CompressOnFly');
-$forms['Security'] = array(
-    'blowfish_secret',
-    'ForceSSL',
-    'CheckConfigurationPermissions',
-    'TrustedProxies',
-    'AllowUserDropDatabase',
-    'AllowArbitraryServer',
-    'LoginCookieRecall',
-    'LoginCookieValidity',
-    'LoginCookieStore',
-    'LoginCookieDeleteAll');
-$forms['Sql_queries'] = array(
-    'ShowSQL',
-    'Confirm',
-    'QueryHistoryDB',
-    'QueryHistoryMax',
-    'IgnoreMultiSubmitErrors',
-    'VerboseMultiSubmit');
-$forms['Other_core_settings'] = array(
-    'MaxDbList',
-    'MaxTableList',
-    'MaxCharactersInDisplayedSQL',
-    'OBGzip',
-    'PersistentConnections',
-    'ExecTimeLimit',
-    'MemoryLimit',
-    'SkipLockedTables',
-    'UseDbSearch');
-$forms['Left_frame'] = array(
-    'LeftFrameLight',
-    'LeftDisplayLogo',
-    'LeftLogoLink',
-    'LeftLogoLinkWindow',
-    'LeftDefaultTabTable',
-    'LeftPointerEnable');
-$forms['Left_servers'] = array(
-    'LeftDisplayServers',
-    'DisplayServersList');
-$forms['Left_databases'] = array(
-    'DisplayDatabasesList',
-    'LeftFrameDBTree',
-    'LeftFrameDBSeparator',
-    'ShowTooltipAliasDB');
-$forms['Left_tables'] = array(
-    'LeftFrameTableSeparator',
-    'LeftFrameTableLevel',
-    'ShowTooltip',
-    'ShowTooltipAliasTB');
-$forms['Startup'] = array(
-    'ShowStats',
-    'ShowPhpInfo',
-    'ShowServerInfo',
-    'ShowChgPassword',
-    'ShowCreateDb',
-    'SuggestDBName');
-$forms['Browse'] = array(
-    'NavigationBarIconic',
-    'ShowAll',
-    'MaxRows',
-    'Order',
-    'BrowsePointerEnable',
-    'BrowseMarkerEnable');
-$forms['Edit'] = array(
-    'ProtectBinary',
-    'ShowFunctionFields',
-    'CharEditing',
-    'CharTextareaCols',
-    'CharTextareaRows',
-    'InsertRows',
-    'ForeignKeyDropdownOrder',
-    'ForeignKeyMaxLimit');
-$forms['Tabs'] = array(
-    'LightTabs',
-    'PropertiesIconic',
-    'DefaultTabServer',
-    'DefaultTabDatabase',
-    'DefaultTabTable',
-	'QueryWindowDefTab');
-$forms['Sql_box'] = array('SQLQuery' => array(
-    'Edit',
-    'Explain',
-    'ShowAsPHP',
-    'Validate',
-    'Refresh'));
-$forms['Import_defaults'] = array('Import' => array(
-    'format',
-    'allow_interrupt',
-    'skip_queries'));
-$forms['Export_defaults'] = array('Export' => array(
-    'format',
-    'compression',
-    'asfile',
-    'charset',
-    'onserver',
-    'onserver_overwrite',
-    'remember_file_template',
-    'file_template_table',
-    'file_template_database',
-    'file_template_server'));
-?>

From a6b34a5977fd68e7da5e4703dbff487fbb579e5b Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Wed, 4 Aug 2010 15:27:47 +0200
Subject: [PATCH 096/106] fix generation of theme unique value refresh session
 cache for config after save

---
 libraries/Config.class.php | 3 ++-
 prefs_forms.php            | 2 ++
 prefs_manage.php           | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 66c36e8f2..16fe5a1b3 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -458,6 +458,7 @@ class PMA_Config
         $config_data = $_SESSION['cache'][$cache_key]['userprefs'];
         // type is 'db' or 'session'
         $this->set('user_preferences', $_SESSION['cache'][$cache_key]['userprefs_type']);
+        $this->set('user_preferences_mtime', $_SESSION['cache'][$cache_key]['userprefs_mtime']);
 
         // backup some settings
         $org_fontsize = $this->settings['fontsize'];
@@ -712,7 +713,7 @@ class PMA_Config
             $fontsize +
             $this->source_mtime +
             $this->default_source_mtime +
-            (isset($_SESSION['cache']['userprefs_mtime']) ? $_SESSION['cache']['userprefs_mtime'] : 0) +
+            $this->get('user_preferences_mtime') +
             $_SESSION['PMA_Theme']->mtime_info +
             $_SESSION['PMA_Theme']->filesize_info)
             . (isset($_SESSION['tmp_user_values']['custom_color']) ? substr($_SESSION['tmp_user_values']['custom_color'],1,6) : '');
diff --git a/prefs_forms.php b/prefs_forms.php
index 63cdea502..c5cb8d134 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -52,6 +52,8 @@ if ($form_display->process(false) && !$form_display->hasErrors()) {
     $old_settings = PMA_load_userprefs();
     $result = PMA_save_userprefs(ConfigFile::getInstance()->getConfigArray());
     if ($result === true) {
+        // reload config
+        $GLOBALS['PMA_Config']->loadUserPreferences();
         $hash = ltrim(filter_input(INPUT_POST, 'tab_hash'), '#');
         PMA_userprefs_redirect($forms, $old_settings, 'prefs_forms.php', array(
             'form' => $form_param), $hash);
diff --git a/prefs_manage.php b/prefs_manage.php
index 52a33f084..3df224988 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -175,6 +175,8 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
             } else {
                 $return_url = 'prefs_manage.php';
             }
+            // reload config
+            $GLOBALS['PMA_Config']->loadUserPreferences();
             PMA_userprefs_redirect($forms, $old_settings, $return_url, $params);
             exit;
         } else {

From 5dc9f17d39e9766333dc11bf3208678abce18080 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Wed, 4 Aug 2010 16:02:54 +0200
Subject: [PATCH 097/106] fix <select> value setting

---
 libraries/config/FormDisplay.class.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 80f07df85..a176c3bdf 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -462,10 +462,11 @@ class FormDisplay
     private function _validateSelect(&$value, array $allowed)
     {
         foreach ($allowed as $vk => $v) {
-          if ($value == $vk) {
-              settype($value, gettype($v));
-              return true;
-          }
+            // force string comparison so that 0 isn't equal to any string
+            if ((string)$value == (string)$vk) {
+                settype($value, gettype($v));
+                return true;
+            }
         }
         return false;
     }

From 9d4c5409c608af3900dd4f8889b69e17666dfbd5 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Thu, 5 Aug 2010 21:01:59 +0200
Subject: [PATCH 098/106] fix import merge fix <select> handling (hopefully
 this time for real)

---
 .gsoc/todo.txt                         |  7 -------
 libraries/config/FormDisplay.class.php |  9 +++++++--
 prefs_manage.php                       | 10 ++++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gsoc/todo.txt b/.gsoc/todo.txt
index 570b1dd9d..959835c0c 100644
--- a/.gsoc/todo.txt
+++ b/.gsoc/todo.txt
@@ -7,10 +7,3 @@ info about setup script in prefs manage, it seems many people still don't know i
 
 
 show blacklist (and debug?) on prefs manage page
-
-
-/*        if (!isset($this->persistKeys[$canonical_path])
-                // equality but only if both values are numeric or not numeric, allows to skip 0 == 'auto'
-                && (($value == $default_value && !(is_numeric($value) xor is_numeric($value)))
-                    ||
-                    (empty($value) && empty($default_value)))) {*/
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index a176c3bdf..5a08f5e87 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -461,9 +461,14 @@ class FormDisplay
      */
     private function _validateSelect(&$value, array $allowed)
     {
+        $value_cmp = is_bool($value)
+            ? (int) $value
+            : $value;
         foreach ($allowed as $vk => $v) {
-            // force string comparison so that 0 isn't equal to any string
-            if ((string)$value == (string)$vk) {
+            // equality comparison only if both values are numeric or not numeric
+            // (allows to skip 0 == 'string' equalling to true) or identity (for string-string)
+            if (($vk == $value && !(is_numeric($value_cmp) xor is_numeric($vk)))
+                    || $vk === $value) {
                 settype($value, gettype($v));
                 return true;
             }
diff --git a/prefs_manage.php b/prefs_manage.php
index 3df224988..bd085593e 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -87,14 +87,16 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
             }
         }
         $cf = ConfigFile::getInstance();
-        if (empty($_POST['import_merge'])) {
-            $cf->resetConfigData();
+        $new_config = $cf->getFlatDefaultConfig();
+        if (!empty($_POST['import_merge'])) {
+            $new_config = array_merge($new_config, $cf->getConfigArray());
         }
+        $new_config = array_merge($new_config, $config);
         $_POST_bak = $_POST;
-        foreach ($cf->getFlatDefaultConfig() as $k => $v) {
+        foreach ($new_config as $k => $v) {
             $_POST[str_replace('/', '-', $k)] = $v;
         }
-        $_POST = array_merge($_POST, $config);
+        $cf->resetConfigData();
         $all_ok = $form_display->process(true, false);
         $all_ok = $all_ok && !$form_display->hasErrors();
         $_POST = $_POST_bak;

From f7c3ea158aaad28aea233fb859403d3db27812c3 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 6 Aug 2010 13:57:59 +0200
Subject: [PATCH 099/106] info about setup script in "manage your settings", it
 seems many people still don't know it exists

---
 prefs_manage.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/prefs_manage.php b/prefs_manage.php
index bd085593e..8d47e9039 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -259,6 +259,23 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: __DATE__'));
                 <input type="submit" name="submit_import" value="<?php echo __('Go'); ?>" />
             </form>
         </div>
+        <?php
+        if (file_exists('./setup/index.php')) {
+            // show only if setup script is available, allows to disable this message
+            // by simply removing setup directory
+        ?>
+        <div class="group">
+            <h2><?php echo __('More settings') ?></h2>
+            <div class="group-cnt">
+                <?php
+                echo sprintf(__('You can set more settings by modifying config.inc.php, eg. by using %sSetup script%s.'), '<a href="setup/index.php">', '</a>');
+                echo PMA_showDocu('setup_script');
+                ?>
+            </div>
+        </div>
+        <?php
+        }
+        ?>
     </div>
     <div id="main_pane_right">
         <div class="group">

From 60329f14cbc865e5c312602529966e128a0402da Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 6 Aug 2010 14:36:26 +0200
Subject: [PATCH 100/106] blacklist and settings debug code shown if
 $cfg['DBG']['php'] is true

---
 .gsoc/todo.txt                     |  8 --------
 libraries/user_preferences.inc.php | 24 +++++++++++++-----------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/.gsoc/todo.txt b/.gsoc/todo.txt
index 959835c0c..4dd9492f8 100644
--- a/.gsoc/todo.txt
+++ b/.gsoc/todo.txt
@@ -1,9 +1 @@
 restore cache'ing in phpmyadmin.css.php
-remove debug from user preferences header
-
-
-info about setup script in prefs manage, it seems many people still don't know it exists
-(and maybe some description in docs on making it work with live configuration?)
-
-
-show blacklist (and debug?) on prefs manage page
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 99b31f19a..633b27871 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -48,18 +48,20 @@ if (!empty($_GET['saved'])) {
     $message->display();
 }
 
-// todo: debug - remove
-$arr = ConfigFile::getInstance()->getConfigArray();
-$arr2 = array();
-foreach ($arr as $k => $v) {
-    $arr2[] = "<b>$k</b> " . var_export($v, true);
+// debug info
+if ($cfg['DBG']['php']) {
+    $arr = ConfigFile::getInstance()->getConfigArray();
+    $arr2 = array();
+    foreach ($arr as $k => $v) {
+        $arr2[] = "<b>$k</b> " . var_export($v, true);
+    }
+    $arr2 = implode(', ', $arr2);
+    $arr2 .= '<br />Blacklist: ' . (empty($cfg['UserprefsDisallow'])
+            ? '<i>empty</i>'
+            : implode(', ', $cfg['UserprefsDisallow']));
+    $msg = PMA_Message::notice('Settings: ' . $arr2);
+    $msg->display();
 }
-$arr2 = implode(', ', $arr2);
-$arr2 .= '<br />Blacklist: ' . (empty($cfg['UserprefsDisallow'])
-        ? '<i>empty</i>'
-        : implode(', ', $cfg['UserprefsDisallow']));
-$msg = PMA_Message::notice('Debug: ' . $arr2);
-$msg->display();
 
 // warn about using session storage for settings
 $cfgRelation = PMA_getRelationsParam();

From 4c39f5012e14f3c08e8da67dc05ca445d7a6b2f9 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 6 Aug 2010 14:46:01 +0200
Subject: [PATCH 101/106] restore cache'ing in phpmyadmin.css.php

---
 .gsoc/todo.txt     | 1 -
 phpmyadmin.css.php | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 .gsoc/todo.txt

diff --git a/.gsoc/todo.txt b/.gsoc/todo.txt
deleted file mode 100644
index 4dd9492f8..000000000
--- a/.gsoc/todo.txt
+++ /dev/null
@@ -1 +0,0 @@
-restore cache'ing in phpmyadmin.css.php
diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php
index 7c73cf414..2275c97ff 100644
--- a/phpmyadmin.css.php
+++ b/phpmyadmin.css.php
@@ -35,11 +35,7 @@ header('Content-Type: text/css; charset=UTF-8');
 
 // Cache output in client - the nocache query parameter makes sure that this
 // file is reloaded when config changes
-// todo: restore header
-//header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
-//header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21
-//header('Last-Modified: ' . $GLOBALS['now']);
-header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
+header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
 
 $_SESSION['PMA_Theme_Manager']->printCss(PMA_FRAME);
-?>
\ No newline at end of file
+?>

From bcaec734418959fb0ce5e60a25ccddfa7cc75cb6 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 6 Aug 2010 14:56:52 +0200
Subject: [PATCH 102/106] sort messages

---
 libraries/config/messages.inc.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 2345fdbb1..b2fa7410d 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -14,7 +14,6 @@ if (!function_exists('__')) {
     die('Bad invocation!');
 }
 
-
 $strConfigAllowArbitraryServer_desc = __('If enabled user can enter any MySQL server in login form for cookie auth');
 $strConfigAllowArbitraryServer_name = __('Allow login to any MySQL server');
 $strConfigAllowThirdPartyFraming_desc = __('Enabling this allows a page located on a different domain to call phpMyAdmin inside a frame, and is a potential [strong]security hole[/strong] allowing cross-frame scripting attacks');
@@ -206,8 +205,6 @@ $strConfigForm_Server_pmadb = __('Configuration storage');
 $strConfigForm_Server_pmadb_desc = __('Configure phpMyAdmin configuration storage to gain access to additional features, see [a@Documentation.html#linked-tables]phpMyAdmin configuration storage[/a] in documentation');
 $strConfigForm_Server_tracking = __('Changes tracking');
 $strConfigForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.');
-$strConfigForm_Warnings = __('Warnings');
-$strConfigForm_Warnings_desc = __('Disable some of the warnings shown by phpMyAdmin');
 $strConfigFormset_Export = __('Customize export options');
 $strConfigFormset_Features = __('Features');
 $strConfigFormset_Import = __('Customize import defaults');
@@ -230,6 +227,8 @@ $strConfigForm_Text_fields = __('Text fields');
 $strConfigForm_Text_fields_desc = __('Customize text input fields');
 $strConfigForm_Texy = __('Texy! text');
 $strConfigForm_Texy_desc = __('Customize default options');
+$strConfigForm_Warnings = __('Warnings');
+$strConfigForm_Warnings_desc = __('Disable some of the warnings shown by phpMyAdmin');
 $strConfigGZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import and export operations');
 $strConfigGZipDump_name = __('GZip');
 $strConfigIconvExtraParams_name = __('Extra parameters for iconv');
@@ -469,12 +468,12 @@ $strConfigSQLQuery_Validate_name = __('Validate SQL');
 $strConfigSQLValidator_password_name = __('Password');
 $strConfigSQLValidator_use_desc = __('[strong]Warning:[/strong] requires PHP SOAP extension or PEAR SOAP to be installed');
 $strConfigSQLValidator_use_name = __('Enable SQL Validator');
-$strConfigSQLValidator_username_name = __('Username');
 $strConfigSQLValidator_username_desc = __('If you have a custom username, specify it here (defaults to [kbd]anonymous[/kbd])');
-$strConfigSuhosinDisableWarning_desc = __('A warning is displayed on the main page if Suhosin is detected');
-$strConfigSuhosinDisableWarning_name = __('Suhosin warning');
+$strConfigSQLValidator_username_name = __('Username');
 $strConfigSuggestDBName_desc = __('Suggest a database name on the &quot;Create Database&quot; form (if possible) or keep the text field empty');
 $strConfigSuggestDBName_name = __('Suggest new database name');
+$strConfigSuhosinDisableWarning_desc = __('A warning is displayed on the main page if Suhosin is detected');
+$strConfigSuhosinDisableWarning_name = __('Suhosin warning');
 $strConfigTextareaCols_desc = __('Textarea size (columns) in edit mode, this value will be emphasized for SQL query textareas (*2) and for query window (*1.25)');
 $strConfigTextareaCols_name = __('Textarea columns');
 $strConfigTextareaRows_desc = __('Textarea size (rows) in edit mode, this value will be emphasized for SQL query textareas (*2) and for query window (*1.25)');
@@ -493,8 +492,8 @@ $strConfigUploadDir_desc = __('Directory on server where you can upload files fo
 $strConfigUploadDir_name = __('Upload directory');
 $strConfigUseDbSearch_desc = __('Allow for searching inside the entire database');
 $strConfigUseDbSearch_name = __('Use database search');
-$strConfigUserprefsDeveloperTab_name = __('Enable the Developer tab in settings');
 $strConfigUserprefsDeveloperTab_desc = __('When disabled, users cannot set any of the options below, regardless of the checkbox on the right');
+$strConfigUserprefsDeveloperTab_name = __('Enable the Developer tab in settings');
 $strConfigVerboseMultiSubmit_desc = __('Show affected rows of each statement on multiple-statement queries. See libraries/import.lib.php for defaults on how many queries a statement may contain.');
 $strConfigVerboseMultiSubmit_name = __('Verbose multiple statements');
 $strConfigVersionCheckLink = __('Check for latest version');

From e6170b2dc211a19d43ff4e4f6d17f8598b2d6905 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 6 Aug 2010 15:17:53 +0200
Subject: [PATCH 103/106] comments output escaping

---
 libraries/config/FormDisplay.tpl.php |  2 +-
 libraries/user_preferences.inc.php   |  7 -------
 libraries/user_preferences.lib.php   | 26 ++++++++++++++++++++++++--
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 8090423e3..40c59d1c4 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -246,7 +246,7 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
     }
     if (isset($opts['setvalue']) && $opts['setvalue']) {
         ?>
-        <a class="set-value" href="#<?php echo "$path={$opts['setvalue']}" ?>" title="<?php echo sprintf(__('Set value: %s'), htmlspecialchars($opts['setvalue'])) ?>" style="display:none"><img alt="set-value" src="<?php echo $img_path ?>b_edit.png" width="16" height="16" /></a>
+        <a class="set-value" href="#<?php echo htmlspecialchars("$path={$opts['setvalue']}") ?>" title="<?php echo sprintf(__('Set value: %s'), htmlspecialchars($opts['setvalue'])) ?>" style="display:none"><img alt="set-value" src="<?php echo $img_path ?>b_edit.png" width="16" height="16" /></a>
         <?php
     }
     if (isset($opts['show_restore_default']) && $opts['show_restore_default']) {
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 633b27871..b86e4a144 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -70,10 +70,3 @@ if (!$cfgRelation['userconfigwork']) {
     $msg = PMA_sanitize(sprintf($msg, '[a@./Documentation.html#linked-tables@_blank]', '[/a]'));
     PMA_Message::notice($msg)->display();
 }
-
-if (isset($error) && $error) {
-    if (!$error instanceof PMA_Message) {
-        $error = PMA_Message::error($error);
-    }
-    $error->display();
-}
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index dd26a3f95..c513a19a3 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -8,6 +8,13 @@
 
 /**
  * Common initialization for user preferences modification pages
+ *
+ * @uses ConfigFile::getInstance()
+ * @uses ConfigFile::resetConfigData()
+ * @uses ConfigFile::setAllowedKeys()
+ * @uses ConfigFile::setCfgUpdateReadMapping()
+ * @uses ConfigFile::updateWithGlobalConfig()
+ * @uses PMA_read_userprefs_fieldnames()
  */
 function PMA_userprefs_pageinit()
 {
@@ -30,6 +37,7 @@ function PMA_userprefs_pageinit()
  * * type - 'db' (config read from pmadb) or 'session' (read from user session)
  *
  * @uses $_SESSION['userconfig']
+ * @uses $GLOBALS['controllink']
  * @uses PMA_array_merge_recursive
  * @uses PMA_backquote()
  * @uses PMA_DBI_fetch_single_row()
@@ -69,9 +77,11 @@ function PMA_load_userprefs()
 /**
  * Saves user preferences
  *
- * @uses $GLOBALS['controllink']
- * @uses $_SESSION['cache']['userprefs']
+ * @uses $_SESSION['cache'][...]['userprefs']
  * @uses $_SESSION['userconfig']
+ * @uses $GLOBALS['cfg']['ServerDefault']
+ * @uses $GLOBALS['controllink']
+ * @uses $GLOBALS['server']
  * @uses ConfigFile::getConfigArray()
  * @uses ConfigFile::getInstance()
  * @uses PMA_backquote()
@@ -207,6 +217,7 @@ function PMA_read_userprefs_fieldnames(array $forms = null)
  *
  * No validation is done!
  *
+ * @uses PMA_load_userprefs()
  * @uses PMA_save_userprefs()
  * @param string $cfg_name
  * @param mixed $value
@@ -230,6 +241,10 @@ function PMA_persist_option($path, $value, $default_value)
 /**
  * Redirects after saving new user preferences
  *
+ * @uses ConfigFile::getConfigArray()
+ * @uses ConfigFile::getInstance()
+ * @uses PMA_generate_common_url()
+ * @uses PMA_sendHeaderLocation()
  * @param array  $forms
  * @param array  $old_settings
  * @param string $file_name
@@ -269,6 +284,13 @@ function PMA_userprefs_redirect(array $forms, array $old_settings, $file_name, $
             . PMA_generate_common_url($url_params, '&') . $hash);
 }
 
+/**
+ * Shows form which allows to quickly load settings stored in browser's local storage
+ *
+ * @uses $_REQUEST['prefs_autoload']
+ * @uses $_SESSION['userprefs_autoload']
+ * @uses PMA_generate_common_hidden_inputs()
+ */
 function PMA_userprefs_autoload_header()
 {
     if (isset($_REQUEST['prefs_autoload']) && $_REQUEST['prefs_autoload'] == 'hide') {

From 98cbab04113cac9de1aa8aea07dd92d8ae7f03b7 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sun, 8 Aug 2010 22:10:48 +0200
Subject: [PATCH 104/106] second part of error message display changes

---
 prefs_forms.php  | 6 +++++-
 prefs_manage.php | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/prefs_forms.php b/prefs_forms.php
index c5cb8d134..40ea1719f 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -47,6 +47,7 @@ if (isset($_POST['revert'])) {
     exit;
 }
 
+$error = null;
 if ($form_display->process(false) && !$form_display->hasErrors()) {
     // save settings
     $old_settings = PMA_load_userprefs();
@@ -67,11 +68,14 @@ if ($form_display->process(false) && !$form_display->hasErrors()) {
 $GLOBALS['js_include'][] = 'config.js';
 require './libraries/header.inc.php';
 require './libraries/user_preferences.inc.php';
+if ($error) {
+    $error->display();
+}
 if ($form_display->hasErrors()) {
     // form has errors
     ?>
     <div class="warning config-form">
-        <b><?php echo __('Submitted form contains errors') ?></b>
+        <b><?php echo __('Cannot save settings, submitted form contains errors') ?></b>
         <?php $form_display->displayErrors(); ?>
     </div>
     <?php
diff --git a/prefs_manage.php b/prefs_manage.php
index 8d47e9039..d678f8a88 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -213,6 +213,12 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
 $GLOBALS['js_include'][] = 'config.js';
 require './libraries/header.inc.php';
 require './libraries/user_preferences.inc.php';
+if ($error) {
+    if (!$error instanceof PMA_Message) {
+        $error = PMA_Message::error($error);
+    }
+    $error->display();
+}
 ?>
 <script type="text/javascript">
 <?php

From e3446960163f00125b516712c720a178093f46f2 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Thu, 19 Aug 2010 16:36:41 +0200
Subject: [PATCH 105/106] account for changes introduced when merging lori/gsoc
 branch

---
 libraries/config.default.php                |   7 +
 libraries/config.values.php                 |  18 +-
 libraries/config/messages.inc.php           |  19 +-
 libraries/config/setup.forms.php            | 208 +++++++++++---------
 libraries/config/user_preferences.forms.php | 186 +++++++++--------
 libraries/display_export.lib.php            |   2 +-
 libraries/export/sql.php                    |   2 +-
 7 files changed, 246 insertions(+), 196 deletions(-)

diff --git a/libraries/config.default.php b/libraries/config.default.php
index a378f1f11..0e45456d4 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -1072,6 +1072,13 @@ $cfg['Export'] = array();
  */
 $cfg['Export']['format'] = 'sql';
 
+/**
+ * quick/custom
+ *
+ * @global string $cfg['Export']['format']
+ */
+$cfg['Export']['method'] = 'quick';
+
 /**
  * none/zip/gzip/bzip2
  *
diff --git a/libraries/config.values.php b/libraries/config.values.php
index c9c57dea8..3fd7639b7 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -91,12 +91,19 @@ $cfg_db['Import']['ldi_terminated'] = 'short_string';
 $cfg_db['Import']['ldi_enclosed'] = 'short_string';
 $cfg_db['Import']['ldi_escaped'] = 'short_string';
 $cfg_db['Import']['ldi_local_option'] = array('auto', true, false);
+$cfg_db['Export']['_sod_select'] = array(
+    'structure' => __('structure'),
+    'data' => __('data'),
+    'structure_and_data' => __('structure and data'));
+$cfg_db['Export']['method'] = array(
+    'quick' => __('Quick - display only the minimal options to configure'),
+    'custom' => __('Custom - display all possible options to configure'),
+    /*'custom-no-form'*/);
 $cfg_db['Export']['format'] = array('codegen', 'csv', 'excel', 'htmlexcel',
     'htmlword', 'latex', 'ods', 'odt', 'pdf', 'sql', 'texytext', 'xls', 'xml',
     'yaml');
 $cfg_db['Export']['compression'] = array('none', 'zip', 'gzip', 'bzip2');
 $cfg_db['Export']['charset'] = array_merge(array(''), $GLOBALS['cfg']['AvailableCharsets']);
-$cfg_db['Export']['method'] = array('quick', 'custom', 'custom-no-form');
 $cfg_db['Export']['codegen_format'] = array('#', 'NHibernate C# DO', 'NHibernate XML');
 $cfg_db['Export']['csv_separator'] = 'short_string';
 $cfg_db['Export']['csv_terminated'] = 'short_string';
@@ -106,12 +113,21 @@ $cfg_db['Export']['csv_null'] = 'short_string';
 $cfg_db['Export']['excel_null'] = 'short_string';
 $cfg_db['Export']['excel_edition'] = array('win' => 'Windows',
     'mac_excel2003' => 'Excel 2003 / Macintosh', 'mac_excel2008' => 'Excel 2008 / Macintosh');
+$cfg_db['Export']['sql_structure_or_data'] = $cfg_db['Export']['_sod_select'];
 $cfg_db['Export']['sql_type'] = array('INSERT', 'UPDATE', 'REPLACE');
+$cfg_db['Export']['sql_insert_syntax'] = array(
+    'complete' => __('complete inserts'),
+    'extended' => __('extended inserts'),
+    'both' => __('both of the above'),
+    'none' => __('neither of the above'));
 $cfg_db['Export']['xls_null'] = 'short_string';
 $cfg_db['Export']['xlsx_null'] = 'short_string';
+$cfg_db['Export']['htmlword_structure_or_data'] = $cfg_db['Export']['_sod_select'];
 $cfg_db['Export']['htmlword_null'] = 'short_string';
 $cfg_db['Export']['ods_null'] = 'short_string';
 $cfg_db['Export']['odt_null'] = 'short_string';
+$cfg_db['Export']['odt_structure_or_data'] = $cfg_db['Export']['_sod_select'];
+$cfg_db['Export']['texytext_structure_or_data'] = $cfg_db['Export']['_sod_select'];
 $cfg_db['Export']['texytext_null'] = 'short_string';
 
 /**
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index b2fa7410d..7dc5c1483 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -85,46 +85,42 @@ $strConfigExport_file_template_server_name = __('Server name template');
 $strConfigExport_file_template_table_name = __('Table name template');
 $strConfigExport_format_name = __('Format');
 $strConfigExport_htmlword_columns_name = __('Put columns names in the first row');
-$strConfigExport_htmlword_data_name = __('Data');
 $strConfigExport_htmlword_null_name = __('Replace NULL by');
-$strConfigExport_htmlword_structure_name = __('Structure');
+$strConfigExport_htmlword_structure_or_data_name = __('Dump table');
 $strConfigExport_latex_caption_name = __('Include table caption');
 $strConfigExport_latex_columns_name = __('Put columns names in the first row');
 $strConfigExport_latex_comments_name = __('Comments');
 $strConfigExport_latex_data_caption_name = __('Table caption');
 $strConfigExport_latex_data_continued_caption_name = __('Continued table caption');
 $strConfigExport_latex_data_label_name = __('Label key');
-$strConfigExport_latex_data_name = __('Data');
 $strConfigExport_latex_mime_name = __('MIME type');
 $strConfigExport_latex_null_name  = __('Replace NULL by');
 $strConfigExport_latex_relation_name = __('Relations');
 $strConfigExport_latex_structure_caption_name = __('Table caption');
 $strConfigExport_latex_structure_continued_caption_name = __('Continued table caption');
 $strConfigExport_latex_structure_label_name = __('Label key');
-$strConfigExport_latex_structure_name = __('Structure');
+$strConfigExport_latex_structure_or_data_name = __('Dump table');
+$strConfigExport_method_name = __('Export method');
 $strConfigExport_ods_columns_name = __('Put columns names in the first row');
 $strConfigExport_ods_null_name = __('Replace NULL by');
 $strConfigExport_odt_columns_name = __('Put columns names in the first row');
 $strConfigExport_odt_comments_name = __('Comments');
-$strConfigExport_odt_data_name = __('Data');
 $strConfigExport_odt_mime_name = __('MIME type');
 $strConfigExport_odt_null_name = __('Replace NULL by');
 $strConfigExport_odt_relation_name = __('Relations');
-$strConfigExport_odt_structure_name = __('Structure');
+$strConfigExport_odt_structure_or_data_name = __('Dump table');
 $strConfigExport_onserver_name = __('Save on server');
 $strConfigExport_onserver_overwrite_name = __('Overwrite existing file(s)');
 $strConfigExport_remember_file_template_name = __('Remember file name template');
 $strConfigExport_sql_auto_increment_name = __('Add AUTO_INCREMENT value');
 $strConfigExport_sql_backquotes_name = __('Enclose table and column names with backquotes');
-$strConfigExport_sql_columns_name = __('Complete inserts');
 $strConfigExport_sql_compatibility_name = __('SQL compatibility mode');
-$strConfigExport_sql_data_name = __('Data');
+$strConfigExport_sql_create_table_statements_name = __('Syntax to use when inserting data');
 $strConfigExport_sql_dates_name = __('Creation/Update/Check dates');
 $strConfigExport_sql_delayed_name = __('Use delayed inserts');
 $strConfigExport_sql_disable_fk_name = __('Disable foreign key checks');
 $strConfigExport_sql_drop_database_name = sprintf(__('Add %s'), 'DROP DATABASE');
 $strConfigExport_sql_drop_table_name = sprintf(__('Add %s'), 'DROP TABLE / VIEW / PROCEDURE / FUNCTION / EVENT');
-$strConfigExport_sql_extended_name = __('Extended inserts');
 $strConfigExport_sql_hex_for_blob_name = __('Use hexadecimal for BLOB');
 $strConfigExport_sql_if_not_exists_name = sprintf(__('Add %s'), 'IF NOT EXISTS');
 $strConfigExport_sql_ignore_name = __('Use ignore inserts');
@@ -133,14 +129,13 @@ $strConfigExport_sql_max_query_size_name = __('Maximal length of created query')
 $strConfigExport_sql_mime_name = __('MIME type');
 $strConfigExport_sql_procedure_function_name = sprintf(__('Add %s'), 'CREATE PROCEDURE / FUNCTION / EVENT');
 $strConfigExport_sql_relation_name = __('Relations');
-$strConfigExport_sql_structure_name = __('Structure');
+$strConfigExport_sql_structure_or_data_name = __('Dump table');
 $strConfigExport_sql_type_name = __('Export type');
 $strConfigExport_sql_use_transaction_name = __('Enclose export in a transaction');
 $strConfigExport_sql_utc_time_name = __('Export time in UTC');
 $strConfigExport_texytext_columns_name = __('Put columns names in the first row');
-$strConfigExport_texytext_data_name = __('Data');
 $strConfigExport_texytext_null_name = __('Replace NULL by');
-$strConfigExport_texytext_structure_name = __('Structure');
+$strConfigExport_texytext_structure_or_data_name = __('Dump table');
 $strConfigExport_xls_columns_name = __('Put columns names in the first row');
 $strConfigExport_xls_null_name = __('Replace NULL by');
 $strConfigExport_xlsx_columns_name = __('Put columns names in the first row');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 672cf2407..af8d28415 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -39,16 +39,19 @@ $forms['Servers']['Server'] = array('Servers' => array(1 => array(
 $forms['Servers']['Server_auth'] = array('Servers' => array(1 => array(
     'auth_type',
     ':group:' . __('Config authentication'),
-    'user',
-    'password',
+        'user',
+        'password',
+        ':group:end',
     ':group:' . __('Cookie authentication'),
-    'auth_swekey_config' => './swekey.conf',
+        'auth_swekey_config' => './swekey.conf',
+        ':group:end',
     ':group:' . __('HTTP authentication'),
-    'auth_http_realm',
+        'auth_http_realm',
+        ':group:end',
     ':group:' . __('Signon authentication'),
-    'SignonSession',
-    'SignonURL',
-    'LogoutURL')));
+        'SignonSession',
+        'SignonURL',
+        'LogoutURL')));
 $forms['Servers']['Server_config'] = array('Servers' => array(1 => array(
     'only_db',
     'hide_db',
@@ -85,8 +88,8 @@ $forms['Features']['Import_export'] = array(
     'UploadDir',
     'SaveDir',
     'RecodingEngine' => ':group',
-    'IconvExtraParams',
-    ':group:end',
+        'IconvExtraParams',
+        ':group:end',
     'ZipDump',
     'GZipDump',
     'BZipDump',
@@ -176,8 +179,8 @@ $forms['Left_frame']['Left_tables'] = array(
 $forms['Main_frame']['Startup'] = array(
     'MainPageIconic',
     'ShowCreateDb' => ':group',
-    'SuggestDBName',
-    ':group:end',
+        'SuggestDBName',
+        ':group:end',
     'ShowStats',
     'ShowServerInfo',
     'ShowPhpInfo',
@@ -225,31 +228,35 @@ $forms['Import']['Sql'] = array('Import' => array(
     'sql_no_auto_value_on_zero'));
 $forms['Import']['Csv'] = array('Import' => array(
     ':group:' . __('CSV'),
-    'csv_replace',
-    'csv_ignore',
-    'csv_terminated',
-    'csv_enclosed',
-    'csv_escaped',
-    'csv_col_names',
+        'csv_replace',
+        'csv_ignore',
+        'csv_terminated',
+        'csv_enclosed',
+        'csv_escaped',
+        'csv_col_names',
+        ':group:end',
     ':group:' . __('CSV using LOAD DATA'),
-    'ldi_replace',
-    'ldi_ignore',
-    'ldi_terminated',
-    'ldi_enclosed',
-    'ldi_escaped',
-    'ldi_local_option'));
+        'ldi_replace',
+        'ldi_ignore',
+        'ldi_terminated',
+        'ldi_enclosed',
+        'ldi_escaped',
+        'ldi_local_option',
+        ':group:end'));
 $forms['Import']['Microsoft_Office'] = array('Import' => array(
     ':group:' . __('Excel 97-2003 XLS Workbook'),
-    'xls_col_names',
+        'xls_col_names',
+        ':group:end',
     ':group:' . __('Excel 2007 XLSX Workbook'),
-    'xlsx_col_names'));
+        'xlsx_col_names'));
 $forms['Import']['Open_Document'] = array('Import' => array(
     ':group:' . __('Open Document Spreadsheet'),
-    'ods_col_names',
-    'ods_empty_rows',
-    'ods_recognize_percentages',
-    'ods_recognize_currency'));
+        'ods_col_names',
+        'ods_empty_rows',
+        'ods_recognize_percentages',
+        'ods_recognize_currency'));
 $forms['Export']['Export_defaults'] = array('Export' => array(
+    'method',
     'format',
     'compression',
     'charset',
@@ -262,89 +269,100 @@ $forms['Export']['Export_defaults'] = array('Export' => array(
     'file_template_database',
     'file_template_server'));
 $forms['Export']['Sql'] = array('Export' => array(
-    'sql_include_comments',
+    'sql_include_comments' => ':group',
+        'sql_dates',
+        'sql_relation',
+        'sql_mime',
+        ':group:end',
     'sql_use_transaction',
     'sql_disable_fk',
     'sql_compatibility',
     ':group:' . __('Database export options'),
-    'sql_drop_database',
-    'sql_structure' => ':group',
-    'sql_drop_table',
-    'sql_if_not_exists',
-    'sql_auto_increment',
-    'sql_backquotes',
-    'sql_procedure_function',
-    ':group:' . __('Add into comments'),
-    'sql_dates',
-    'sql_relation',
-    'sql_mime',
-    'sql_data' => ':group',
-    'sql_columns',
-    'sql_extended',
-    'sql_max_query_size',
-    'sql_delayed',
-    'sql_ignore',
-    'sql_hex_for_blob',
-    'sql_utc_time',
-    'sql_type'));
+        'sql_drop_database',
+        'sql_structure_or_data',
+        ':group:end',
+    ':group:' . __('Structure'),
+        'sql_drop_table',
+        'sql_procedure_function',
+        'sql_create_table_statements' => ':group',
+            'sql_if_not_exists',
+            'sql_auto_increment',
+            ':group:end',
+        'sql_backquotes',
+        ':group:end',
+    ':group:' . __('Data'),
+        'sql_delayed',
+        'sql_ignore',
+        'sql_type',
+        'sql_insert_syntax',
+        'sql_max_query_size',
+        'sql_hex_for_blob',
+        'sql_utc_time'));
 $forms['Export']['CodeGen'] = array('Export' => array(
     'codegen_format'));
 $forms['Export']['Csv'] = array('Export' => array(
     ':group:' . __('CSV'),
-    'csv_separator',
-    'csv_enclosed',
-    'csv_escaped',
-    'csv_terminated',
-    'csv_null',
-    'csv_removeCRLF',
-    'csv_columns',
+        'csv_separator',
+        'csv_enclosed',
+        'csv_escaped',
+        'csv_terminated',
+        'csv_null',
+        'csv_removeCRLF',
+        'csv_columns',
+        ':group:end',
     ':group:' . __('CSV for MS Excel'),
-    'excel_null',
-    'excel_removeCRLF',
-    'excel_columns',
-    'excel_edition'));
+        'excel_null',
+        'excel_removeCRLF',
+        'excel_columns',
+        'excel_edition'));
 $forms['Export']['Latex'] = array('Export' => array(
     'latex_caption',
-    'latex_structure' => ':group',
-    'latex_structure_caption',
-    'latex_structure_continued_caption',
-    'latex_structure_label',
-    'latex_relation',
-    'latex_comments',
-    'latex_mime',
-    'latex_data' => ':group',
-    'latex_columns',
-    'latex_data_caption',
-    'latex_data_continued_caption',
-    'latex_data_label',
-    'latex_null'));
+    'latex_structure_or_data',
+    ':group:' . __('Structure'),
+        'latex_structure_caption',
+        'latex_structure_continued_caption',
+        'latex_structure_label',
+        'latex_relation',
+        'latex_comments',
+        'latex_mime',
+        ':group:end',
+    ':group:' . __('Data'),
+        'latex_columns',
+        'latex_data_caption',
+        'latex_data_continued_caption',
+        'latex_data_label',
+        'latex_null'));
 $forms['Export']['Microsoft_Office'] = array('Export' => array(
     ':group:' . __('Excel 97-2003 XLS Workbook'),
-    'xls_null',
-    'xls_columns',
+        'xls_null',
+        'xls_columns',
+        ':group:end',
     ':group:' . __('Excel 2007 XLSX Workbook'),
-    'xlsx_null',
-    'xlsx_columns',
+        'xlsx_null',
+        'xlsx_columns',
+        ':group:end',
     ':group:' . __('Microsoft Word 2000'),
-    'htmlword_structure',
-    'htmlword_data',
-    'htmlword_null',
-    'htmlword_columns'));
+        'htmlword_structure_or_data',
+        'htmlword_null',
+        'htmlword_columns'));
 $forms['Export']['Open_Document'] = array('Export' => array(
     ':group:' . __('Open Document Spreadsheet'),
-    'ods_null',
-    'ods_columns',
+        'ods_columns',
+        'ods_null',
+        ':group:end',
     ':group:' . __('Open Document Text'),
-    'odt_structure' => ':group',
-    'odt_relation',
-    'odt_comments',
-    'odt_mime',
-    'odt_data' => ':group',
-    'odt_columns',
-    'odt_null'));
+        'odt_structure_or_data',
+        ':group:' . __('Structure'),
+            'odt_relation',
+            'odt_comments',
+            'odt_mime',
+            ':group:end',
+        ':group:' . __('Data'),
+            'odt_columns',
+            'odt_null'));
 $forms['Export']['Texy'] = array('Export' => array(
-    'texytext_structure',
-    'texytext_data' => ':group',
-    'texytext_null',
-    'texytext_columns'));
+    'texytext_structure_or_data',
+    ':group:' . __('Data'),
+        'texytext_null',
+        'texytext_columns'));
 ?>
\ No newline at end of file
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index a5e5e62f1..564f09338 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -90,8 +90,8 @@ $forms['Left_frame']['Left_tables'] = array(
 $forms['Main_frame']['Startup'] = array(
     'MainPageIconic',
     'ShowCreateDb' => ':group',
-    'SuggestDBName',
-    ':group:end',
+        'SuggestDBName',
+        ':group:end',
     'ShowStats',
     'ShowServerInfo');
 $forms['Main_frame']['Browse'] = array(
@@ -132,31 +132,34 @@ $forms['Import']['Sql'] = array(
     'Import/sql_no_auto_value_on_zero');
 $forms['Import']['Csv'] = array(
     ':group:' . __('CSV'),
-    'Import/csv_replace',
-    'Import/csv_ignore',
-    'Import/csv_terminated',
-    'Import/csv_enclosed',
-    'Import/csv_escaped',
-    'Import/csv_col_names',
+        'Import/csv_replace',
+        'Import/csv_ignore',
+        'Import/csv_terminated',
+        'Import/csv_enclosed',
+        'Import/csv_escaped',
+        'Import/csv_col_names',
+        ':group:end',
     ':group:' . __('CSV using LOAD DATA'),
-    'Import/ldi_replace',
-    'Import/ldi_ignore',
-    'Import/ldi_terminated',
-    'Import/ldi_enclosed',
-    'Import/ldi_escaped',
-    'Import/ldi_local_option');
+        'Import/ldi_replace',
+        'Import/ldi_ignore',
+        'Import/ldi_terminated',
+        'Import/ldi_enclosed',
+        'Import/ldi_escaped',
+        'Import/ldi_local_option');
 $forms['Import']['Microsoft_Office'] = array(
     ':group:' . __('Excel 97-2003 XLS Workbook'),
-    'Import/xls_col_names',
+        'Import/xls_col_names',
+        ':group:end',
     ':group:' . __('Excel 2007 XLSX Workbook'),
-    'Import/xlsx_col_names');
+        'Import/xlsx_col_names');
 $forms['Import']['Open_Document'] = array(
     ':group:' . __('Open Document Spreadsheet'),
-    'Import/ods_col_names',
-    'Import/ods_empty_rows',
-    'Import/ods_recognize_percentages',
-    'Import/ods_recognize_currency');
+        'Import/ods_col_names',
+        'Import/ods_empty_rows',
+        'Import/ods_recognize_percentages',
+        'Import/ods_recognize_currency');
 $forms['Export']['Export_defaults'] = array(
+    'Export/method',
     'Export/format',
     'Export/compression',
     'Export/charset',
@@ -166,89 +169,100 @@ $forms['Export']['Export_defaults'] = array(
     'Export/file_template_database',
     'Export/file_template_server');
 $forms['Export']['Sql'] = array(
-    'Export/sql_include_comments',
+    'Export/sql_include_comments' => ':group',
+        'Export/sql_dates',
+        'Export/sql_relation',
+        'Export/sql_mime',
+        ':group:end',
     'Export/sql_use_transaction',
     'Export/sql_disable_fk',
     'Export/sql_compatibility',
     ':group:' . __('Database export options'),
-    'Export/sql_drop_database',
-    'Export/sql_structure' => ':group',
-    'Export/sql_drop_table',
-    'Export/sql_if_not_exists',
-    'Export/sql_auto_increment',
-    'Export/sql_backquotes',
-    'Export/sql_procedure_function',
-    ':group:' . __('Add into comments'),
-    'Export/sql_dates',
-    'Export/sql_relation',
-    'Export/sql_mime',
-    'Export/sql_data' => ':group',
-    'Export/sql_columns',
-    'Export/sql_extended',
-    'Export/sql_max_query_size',
-    'Export/sql_delayed',
-    'Export/sql_ignore',
-    'Export/sql_hex_for_blob',
-    'Export/sql_utc_time',
-    'Export/sql_type');
+        'Export/sql_drop_database',
+        'Export/sql_structure_or_data',
+        ':group:end',
+    ':group:' . __('Structure'),
+        'Export/sql_drop_table',
+        'Export/sql_procedure_function',
+        'Export/sql_create_table_statements' => ':group',
+            'Export/sql_if_not_exists',
+            'Export/sql_auto_increment',
+            ':group:end',
+        'Export/sql_backquotes',
+        ':group:end',
+    ':group:' . __('Data'),
+        'Export/sql_delayed',
+        'Export/sql_ignore',
+        'Export/sql_type',
+        'Export/sql_insert_syntax',
+        'Export/sql_max_query_size',
+        'Export/sql_hex_for_blob',
+        'Export/sql_utc_time');
 $forms['Export']['CodeGen'] = array(
     'Export/codegen_format');
 $forms['Export']['Csv'] = array(
     ':group:' . __('CSV'),
-    'Export/csv_separator',
-    'Export/csv_enclosed',
-    'Export/csv_escaped',
-    'Export/csv_terminated',
-    'Export/csv_null',
-    'Export/csv_removeCRLF',
-    'Export/csv_columns',
+        'Export/csv_separator',
+        'Export/csv_enclosed',
+        'Export/csv_escaped',
+        'Export/csv_terminated',
+        'Export/csv_null',
+        'Export/csv_removeCRLF',
+        'Export/csv_columns',
+        ':group:end',
     ':group:' . __('CSV for MS Excel'),
-    'Export/excel_null',
-    'Export/excel_removeCRLF',
-    'Export/excel_columns',
-    'Export/excel_edition');
+        'Export/excel_null',
+        'Export/excel_removeCRLF',
+        'Export/excel_columns',
+        'Export/excel_edition');
 $forms['Export']['Latex'] = array(
     'Export/latex_caption',
-    'Export/latex_structure' => ':group',
-    'Export/latex_structure_caption',
-    'Export/latex_structure_continued_caption',
-    'Export/latex_structure_label',
-    'Export/latex_relation',
-    'Export/latex_comments',
-    'Export/latex_mime',
-    'Export/latex_data' => ':group',
-    'Export/latex_columns',
-    'Export/latex_data_caption',
-    'Export/latex_data_continued_caption',
-    'Export/latex_data_label',
-    'Export/latex_null');
+    'Export/latex_structure_or_data',
+    ':group:' . __('Structure'),
+        'Export/latex_structure_caption',
+        'Export/latex_structure_continued_caption',
+        'Export/latex_structure_label',
+        'Export/latex_relation',
+        'Export/latex_comments',
+        'Export/latex_mime',
+        ':group:end',
+    ':group:' . __('Data'),
+        'Export/latex_columns',
+        'Export/latex_data_caption',
+        'Export/latex_data_continued_caption',
+        'Export/latex_data_label',
+        'Export/latex_null');
 $forms['Export']['Microsoft_Office'] = array(
     ':group:' . __('Excel 97-2003 XLS Workbook'),
-    'Export/xls_null',
-    'Export/xls_columns',
+        'Export/xls_null',
+        'Export/xls_columns',
+        ':group:end',
     ':group:' . __('Excel 2007 XLSX Workbook'),
-    'Export/xlsx_null',
-    'Export/xlsx_columns',
+        'Export/xlsx_null',
+        'Export/xlsx_columns',
+        ':group:end',
     ':group:' . __('Microsoft Word 2000'),
-    'Export/htmlword_structure',
-    'Export/htmlword_data',
-    'Export/htmlword_null',
-    'Export/htmlword_columns');
+        'Export/htmlword_structure_or_data',
+        'Export/htmlword_null',
+        'Export/htmlword_columns');
 $forms['Export']['Open_Document'] = array(
     ':group:' . __('Open Document Spreadsheet'),
-    'Export/ods_null',
-    'Export/ods_columns',
+        'Export/ods_columns',
+        'Export/ods_null',
+        ':group:end',
     ':group:' . __('Open Document Text'),
-    'Export/odt_structure' => ':group',
-    'Export/odt_relation',
-    'Export/odt_comments',
-    'Export/odt_mime',
-    'Export/odt_data' => ':group',
-    'Export/odt_columns',
-    'Export/odt_null');
+        'Export/odt_structure_or_data',
+        ':group:' . __('Structure'),
+            'Export/odt_relation',
+            'Export/odt_comments',
+            'Export/odt_mime',
+            ':group:end',
+        ':group:' . __('Data'),
+            'Export/odt_columns',
+            'Export/odt_null');
 $forms['Export']['Texy'] = array(
-    'Export/texytext_structure',
-    'Export/texytext_data' => ':group',
-    'Export/texytext_null',
-    'Export/texytext_columns');
+    'Export/texytext_structure_or_data',
+    ':group:' . __('Data'),
+        'Export/texytext_null',
+        'Export/texytext_columns');
 ?>
\ No newline at end of file
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 73407b4b0..ad52bacf4 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -69,7 +69,7 @@ if(isset($_GET['export_method'])) {
     $cfg['Export']['method'] = 'quick';
 }
 // 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="' . htmlspecialchars($cfg['Export']['method']) . '" />';
 
 
 if(isset($_GET['sql_query'])) {
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index 2d6708dba..ade857f59 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -109,7 +109,7 @@ if (isset($plugin_list)) {
             /* begin CREATE TABLE statements*/
             $plugin_list['sql']['options'][] =
                 array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'bool', 'name' => 'create_table_statements', 'text' => __('<code>CREATE TABLE</code> options:')));
-                $plugin_list['sql']['options'][] =
+            $plugin_list['sql']['options'][] =
                 array('type' => 'bool', 'name' => 'if_not_exists', 'text' => '<code>IF NOT EXISTS</code>');
             $plugin_list['sql']['options'][] =
                 array('type' => 'bool', 'name' => 'auto_increment', 'text' => '<code>AUTO_INCREMENT</code>');

From a5417a0ce7ebc603871360d0b391881280c8536d Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Thu, 19 Aug 2010 20:35:49 +0200
Subject: [PATCH 106/106] add custom-no-form to Export/method

---
 libraries/config.default.php | 2 +-
 libraries/config.values.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/config.default.php b/libraries/config.default.php
index 0e45456d4..95b0e1a66 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -1073,7 +1073,7 @@ $cfg['Export'] = array();
 $cfg['Export']['format'] = 'sql';
 
 /**
- * quick/custom
+ * quick/custom/custom-no-form
  *
  * @global string $cfg['Export']['format']
  */
diff --git a/libraries/config.values.php b/libraries/config.values.php
index 3fd7639b7..dea8a2337 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -98,7 +98,7 @@ $cfg_db['Export']['_sod_select'] = array(
 $cfg_db['Export']['method'] = array(
     'quick' => __('Quick - display only the minimal options to configure'),
     'custom' => __('Custom - display all possible options to configure'),
-    /*'custom-no-form'*/);
+    'custom-no-form' => __('Custom - like above, but without the quick/custom choice'));
 $cfg_db['Export']['format'] = array('codegen', 'csv', 'excel', 'htmlexcel',
     'htmlword', 'latex', 'ods', 'odt', 'pdf', 'sql', 'texytext', 'xls', 'xml',
     'yaml');