diff --git a/ChangeLog b/ChangeLog index ab21f0a47..d186a90d6 100755 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,8 @@ $Source$ * db_stats.php3; left.php3; libraries/display_tbl.lib.php3: the valid xhtml attribute to display the "tool tip" of an image is "title" and not "alt". * libraries/display_tbl.lib.php3, lines 574 & 578: use localized strings. + * config.inc.php3; Documentation.*: merged patch #542421 - dynamic server + numbers in config file. 2002-04-12 Loïc Chapeaux * libraries/display_tbl.lib.php3, lines 957-991: expended cosmetic changes diff --git a/Documentation.html b/Documentation.html index a1203fe09..fa2b6d25f 100755 --- a/Documentation.html +++ b/Documentation.html @@ -276,8 +276,8 @@ & "Timestamp") tables.
You must specify the details for the controluser in the config.inc.php3 file under the - $cfgServers[n]['controluser'] & - $cfgServers[n]['controlpass'] settings.
+ $cfgServers[$i]['controluser']& + $cfgServers[$i]['controlpass'] settings.
This example assumes you want to use pma as the controluser and pmapass as the controlpass:
@@ -339,10 +339,10 @@

'config' authentication mode:

@@ -396,35 +396,36 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://' Since version 1.4.2, phpMyAdmin supports the administration of multiple MySQL servers. Therefore, a $cfgServers-array has been added which contains the login - information for the different servers. $cfgServers[1]['host'] - contains the hostname of the first server, - $cfgServers[2]['host'] the hostname of the second server, etc. + information for the different servers. The first + $cfgServers[$i]['host'] contains the hostname of the first + server, the second $cfgServers[$i]['host'] the hostname of the + second server, etc. If you have only one server to administer, simply leave free the hostname of the other $cfgServer-entries.

-
$cfgServers[n]['host'] string
+
$cfgServers[$i]['host'] string
- The hostname of your n-th MySQL-server. E.g. localhost. + The hostname of your $i-th MySQL-server. E.g. localhost.

-
$cfgServers[n]['port'] string
+
$cfgServers[$i]['port'] string
- The port-number of your n-th MySQL-server. Default is 3306 (leave + The port-number of your $i-th MySQL-server. Default is 3306 (leave blank).

-
$cfgServers[n]['socket'] string
+
$cfgServers[$i]['socket'] string
The path to the socket to use. Leave blank for default.
To use the socket feature you must run php 3.0.10 or more.

-
$cfgServers[n]['connect_type'] string
+
$cfgServers[$i]['connect_type'] string
What type connection to use with the MySQL server. Your options are 'socket' & 'tcp'. It defaults to 'tcp' as that is nearly guarenteed @@ -434,8 +435,8 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
- $cfgServers[n]['controluser'] string
- $cfgServers[n]['controlpass'] string + $cfgServers[$i]['controluser'] string
+ $cfgServers[$i]['controlpass'] string
When using http or cookie authentication modes (or 'config' @@ -459,7 +460,7 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'

-
$cfgServers[n]['auth_type'] string ['http'|'cookie'|'config']
+
$cfgServers[$i]['auth_type'] string ['http'|'cookie'|'config']
Whether config or cookie or http authentication should be used for this server. @@ -492,8 +493,8 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
- $cfgServers[n]['user'] string
- $cfgServers[n]['password'] string + $cfgServers[$i]['user'] string
+ $cfgServers[$i]['password'] string
The user/password-pair which phpMyAdmin will use to connect to this @@ -501,7 +502,7 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://' authentication is used, and should be empty.

-
$cfgServers[n]['only_db'] string or array
+
$cfgServers[$i]['only_db'] string or array
If set to a(an array of) database name(s), only this(these) database(s) will be shown to the user. Since phpMyAdmin 2.2.1, this/these @@ -518,7 +519,7 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'

-
$cfgServers[n]['verbose'] string
+
$cfgServers[$i]['verbose'] string
Only useful when using phpMyAdmin with multiple server entries. If set, this string will be displayed instead of the hostname in the pulldown @@ -528,8 +529,8 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
- $cfgServers[n]['bookmarkdb'] string
- $cfgServers[n]['bookmarktable'] string + $cfgServers[$i]['bookmarkdb'] string
+ $cfgServers[$i]['bookmarktable'] string
Since release 2.2.0 phpMyAdmin allows to bookmark queries. This can be @@ -552,8 +553,8 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
  • then complete the two variables - $cfgServers[n]['bookmarkdb'] and - $cfgServers[n]['bookmarktable'] with the database and + $cfgServers[$i]['bookmarkdb'] and + $cfgServers[$i]['bookmarktable'] with the database and table names you've choosen so phpMyAdmin will be able to find the bookmarks.
    • @@ -568,7 +569,7 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
    - $cfgServers[n]['relation'] string + $cfgServers[$i]['relation'] string
    Since release 2.2.4 you can describe, in a special 'relation' table, @@ -606,7 +607,7 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
  • put the relation table name in - $cfgServers[n]['relation'] + $cfgServers[$i]['relation']
  • then manually fill the relation table with information about @@ -1201,7 +1202,7 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://' open the connection. To do this in phpMyAdmin, you need to complete the socket information in the config.inc.php3.
    For example: - $cfgServers[n]['socket'] = '/tmp/mysql.sock'; + $cfgServers[$i]['socket'] = '/tmp/mysql.sock';

    • @@ -1310,8 +1311,8 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'