--- trunk/phpmyadmin/config.inc	2007/12/11 08:37:36	425
+++ trunk/phpmyadmin/config.inc	2010/03/07 18:01:09	1008
@@ -1,21 +1,10 @@
 <?php
 
-/**
- * Your phpMyAdmin URL.
- *
- * Complete the variable below with the full url ie
- *    http://www.your_web.net/path_to_your_phpMyAdmin_directory/
- *
- * It must contain characters that are valid for a URL, and the path is
- * case sensitive on some Web servers, for example Unix-based servers.
- *
- * In most cases you can leave this variable empty, as the correct value
- * will be detected automatically. However, we recommend that you do
- * test to see that the auto-detection code works in your system. A good
- * test is to browse a table, then edit a row and save it.  There will be
- * an error message if phpMyAdmin cannot auto-detect the correct value.
+/*
+ * This is needed for cookie based authentication to encrypt password in
+ * cookie
  */
-$cfg['PmaAbsoluteUri'] = '';
+$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
 
 /**
  * Server(s) configuration
@@ -30,7 +19,6 @@
 $cfg['Servers'][$i]['host']          = 'localhost'; // MySQL hostname or IP address
 $cfg['Servers'][$i]['port']          = '';          // MySQL port - leave blank for default port
 $cfg['Servers'][$i]['socket']        = '';          // Path to the socket - leave blank for default socket
-$cfg['Servers'][$i]['ssl']           = false;        // Use SSL for connecting to MySQL server?
 $cfg['Servers'][$i]['connect_type']  = 'tcp';       // How to connect to MySQL server ('tcp' or 'socket')
 $cfg['Servers'][$i]['extension']     = 'mysql';     // The php MySQL extension to use ('mysql' or 'mysqli')
 $cfg['Servers'][$i]['compress']      = FALSE;       // Use compressed protocol for the MySQL connection
@@ -42,14 +30,10 @@
                                                     // The controluser is also
                                                     // used for all relational
                                                     // features (pmadb)
-$cfg['Servers'][$i]['auth_type']     = 'http';      // Authentication method (valid choices: config, http, HTTP, signon or cookie)
+$cfg['Servers'][$i]['auth_type']     = 'http';      // Authentication method (config, http or cookie based)?
 $cfg['Servers'][$i]['user']          = '';          // MySQL user
 $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
                                                     // with 'config' auth_type)
-$cfg['Servers'][$i]['SignonSession'] = '';          // Session to use for 'signon' auth method
-$cfg['Servers'][$i]['SignonURL']     = '';          // URL where to redirect user to login for 'signon' auth method
-$cfg['Servers'][$i]['LogoutURL']     = '';          // URL where to redirect user after logout
-$cfg['Servers'][$i]['nopassword']    = FALSE;       // Whether to try to connect without password
 $cfg['Servers'][$i]['only_db']       = '';          // If set to a db-name, only
                                                     // this db is displayed in left frame
                                                     // It may also be an array of db-names, where sorting order is relevant.
@@ -81,9 +65,6 @@
 $cfg['Servers'][$i]['history']       = '';          // table to store SQL history
                                                     //   - leave blank for no SQL query history
                                                     //     DEFAULT: 'pma_history'
-$cfg['Servers'][$i]['designer_coords'] = '';        // table to store the coordinates for Designer
-                                                    //   - leave blank for no Designer feature
-                                                    //     DEFAULT: 'pma_designer_coords'
 $cfg['Servers'][$i]['verbose_check'] = TRUE;        // set to FALSE if you know that your pma_* tables
                                                     // are up to date. This prevents compatibility
                                                     // checks and thereby increases performance.