--- phpMyAdmin-2.2.2-rc1/config.inc.php Fri Nov 16 18:47:13 2001 +++ phpMyAdmin/config.inc.php Sun Nov 18 14:32:43 2001 @@ -36,50 +36,15 @@ /** * Server(s) configuration */ -// The $cfgServers array starts with $cfgServers[1]. Do not use $cfgServers[0]. -// You can disable a server config entry by setting host to ''. -$cfgServers[1]['host'] = 'localhost'; // MySQL hostname -$cfgServers[1]['port'] = ''; // MySQL port - leave blank for default port -$cfgServers[1]['socket'] = ''; // Path to the socket - leave blank for default socket -$cfgServers[1]['connect_type'] = 'tcp'; // How to connect to MySQL server ('tcp' or 'socket') -$cfgServers[1]['stduser'] = ''; // MySQL standard user settings (this user must have read-only -$cfgServers[1]['stdpass'] = ''; // access to the "mysql/user" and "mysql/db" tables) -$cfgServers[1]['adv_auth'] = FALSE; // Use advanced authentication? -$cfgServers[1]['user'] = 'root'; // MySQL user -$cfgServers[1]['password'] = ''; // MySQL password (only needed with basic auth) -$cfgServers[1]['only_db'] = ''; // If set to a db-name, only this db is displayed at left frame - // It may also be an array of db-names -$cfgServers[1]['verbose'] = ''; // Verbose name for this host - leave blank to show the hostname -$cfgServers[1]['bookmarkdb'] = ''; // Bookmark db - leave blank for no bookmark support -$cfgServers[1]['bookmarktable'] = ''; // Bookmark table - leave blank for no bookmark support - -$cfgServers[2]['host'] = ''; -$cfgServers[2]['port'] = ''; -$cfgServers[2]['socket'] = ''; -$cfgServers[2]['connect_type'] = 'tcp'; -$cfgServers[2]['stduser'] = ''; -$cfgServers[2]['stdpass'] = ''; -$cfgServers[2]['adv_auth'] = FALSE; -$cfgServers[2]['user'] = 'root'; -$cfgServers[2]['password'] = ''; -$cfgServers[2]['only_db'] = ''; -$cfgServers[2]['verbose'] = ''; -$cfgServers[2]['bookmarkdb'] = ''; -$cfgServers[2]['bookmarktable'] = ''; - -$cfgServers[3]['host'] = ''; -$cfgServers[3]['port'] = ''; -$cfgServers[3]['socket'] = ''; -$cfgServers[3]['connect_type'] = 'tcp'; -$cfgServers[3]['stduser'] = ''; -$cfgServers[3]['stdpass'] = ''; -$cfgServers[3]['adv_auth'] = FALSE; -$cfgServers[3]['user'] = 'root'; -$cfgServers[3]['password'] = ''; -$cfgServers[3]['only_db'] = ''; -$cfgServers[3]['verbose'] = ''; -$cfgServers[3]['bookmarkdb'] = ''; -$cfgServers[3]['bookmarktable'] = ''; +$cfgDBServers = TRUE; +$cfgDBServer["host"] = "localhost"; +$cfgDBServer['adv_auth'] = FALSE; // Use advanced authentication? +$cfgDBServer['stduser'] = ''; // MySQL standard user (only needed with advanced auth) +$cfgDBServer['stdpass'] = ''; // MySQL standard password (only needed with advanced auth) +$cfgDBServer["user"] = "root"; +$cfgDBServer["password"] = ""; +$cfgDBServer["database"] = "phpMyAdmin"; +$cfgDBServer["table"] = "servers"; // If you have more than one server configured, you can set $cfgServerDefault // to any one of them to autoconnect to that server when phpMyAdmin is started, @@ -90,7 +55,6 @@ $cfgServer = ''; unset($cfgServers[0]); - /** * Other core phpMyAdmin settings */ --- phpMyAdmin-2.2.2-rc1/config.inc.php Fri Nov 16 18:47:13 2001 +++ phpMyAdmin/config.inc.php Sun Nov 18 14:51:16 2001 @@ -35,51 +35,40 @@ /** * Server(s) configuration + * + * Server config table structure + * + * CREATE TABLE `servers` ( + * `id` int(11) NOT NULL auto_increment, + * `host` varchar(150) NOT NULL default '', + * `port` int(5) default '0', + * `socket` varchar(150) default '', + * `connect_type` varchar(15) NOT NULL default 'tcp', + * `adv_auth` tinyint(2) NOT NULL default '0', + * `stduser` varchar(150) default '', + * `stdpass` varchar(150) default '', + * `user` varchar(150) NOT NULL default 'root', + * `password` varchar(150) NOT NULL default '', + * `only_db` varchar(250) default '', + * `verbose` varchar(150) NOT NULL default '', + * `bookmarkdb` varchar(150) default '', + * `bookmarktable` varchar(150) default '', + * PRIMARY KEY (`id`), + * UNIQUE KEY `id` (`id`), + * KEY `id_2` (`id`), + * KEY `verbose` (`verbose`) + * ) TYPE=MyISAM; + * */ -// The $cfgServers array starts with $cfgServers[1]. Do not use $cfgServers[0]. -// You can disable a server config entry by setting host to ''. -$cfgServers[1]['host'] = 'localhost'; // MySQL hostname -$cfgServers[1]['port'] = ''; // MySQL port - leave blank for default port -$cfgServers[1]['socket'] = ''; // Path to the socket - leave blank for default socket -$cfgServers[1]['connect_type'] = 'tcp'; // How to connect to MySQL server ('tcp' or 'socket') -$cfgServers[1]['stduser'] = ''; // MySQL standard user settings (this user must have read-only -$cfgServers[1]['stdpass'] = ''; // access to the "mysql/user" and "mysql/db" tables) -$cfgServers[1]['adv_auth'] = FALSE; // Use advanced authentication? -$cfgServers[1]['user'] = 'root'; // MySQL user -$cfgServers[1]['password'] = ''; // MySQL password (only needed with basic auth) -$cfgServers[1]['only_db'] = ''; // If set to a db-name, only this db is displayed at left frame - // It may also be an array of db-names -$cfgServers[1]['verbose'] = ''; // Verbose name for this host - leave blank to show the hostname -$cfgServers[1]['bookmarkdb'] = ''; // Bookmark db - leave blank for no bookmark support -$cfgServers[1]['bookmarktable'] = ''; // Bookmark table - leave blank for no bookmark support - -$cfgServers[2]['host'] = ''; -$cfgServers[2]['port'] = ''; -$cfgServers[2]['socket'] = ''; -$cfgServers[2]['connect_type'] = 'tcp'; -$cfgServers[2]['stduser'] = ''; -$cfgServers[2]['stdpass'] = ''; -$cfgServers[2]['adv_auth'] = FALSE; -$cfgServers[2]['user'] = 'root'; -$cfgServers[2]['password'] = ''; -$cfgServers[2]['only_db'] = ''; -$cfgServers[2]['verbose'] = ''; -$cfgServers[2]['bookmarkdb'] = ''; -$cfgServers[2]['bookmarktable'] = ''; - -$cfgServers[3]['host'] = ''; -$cfgServers[3]['port'] = ''; -$cfgServers[3]['socket'] = ''; -$cfgServers[3]['connect_type'] = 'tcp'; -$cfgServers[3]['stduser'] = ''; -$cfgServers[3]['stdpass'] = ''; -$cfgServers[3]['adv_auth'] = FALSE; -$cfgServers[3]['user'] = 'root'; -$cfgServers[3]['password'] = ''; -$cfgServers[3]['only_db'] = ''; -$cfgServers[3]['verbose'] = ''; -$cfgServers[3]['bookmarkdb'] = ''; -$cfgServers[3]['bookmarktable'] = ''; +$cfgDBServers = TRUE; +$cfgDBServer["host"] = "localhost"; +$cfgDBServer['adv_auth'] = FALSE; // Use advanced authentication? +$cfgDBServer['stduser'] = ''; // MySQL standard user (only needed with advanced auth) +$cfgDBServer['stdpass'] = ''; // MySQL standard password (only needed with advanced auth) +$cfgDBServer["user"] = "root"; +$cfgDBServer["password"] = ""; +$cfgDBServer["database"] = "phpMyAdmin"; +$cfgDBServer["table"] = "servers"; // If you have more than one server configured, you can set $cfgServerDefault // to any one of them to autoconnect to that server when phpMyAdmin is started, @@ -90,7 +79,6 @@ $cfgServer = ''; unset($cfgServers[0]); - /** * Other core phpMyAdmin settings */