nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged patch #452877 ($cfgServer['only_db'] - array) from Jakub Wilk

Browse Source
This commit is contained in:
Loïc Chapeaux
2001-08-19 15:02:51 +00:00
parent 5485aa0fe9
commit 9f031ad790
4 changed files with 72 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -31,6 +31,9 @@ $Source$
* lib.inc.php3, line 524: beautify a bit the way the query is displayed. * lib.inc.php3, line 524: beautify a bit the way the query is displayed.
* lang/english.inc.php3; lang/french.inc.php3: put $strInstructions at its * lang/english.inc.php3; lang/french.inc.php3: put $strInstructions at its
right place. right place.
* lib.inc.php3, lines 196-200; config.inc.php3, line 40;
Documentation.html, lines 352-357: merged patch #452877
($cfgServer['only_db'] - array) from Jakub Wilk.
2001-08-18 Robin Johnson <robbat2@orbis-terrarum.net> 2001-08-18 Robin Johnson <robbat2@orbis-terrarum.net>
* lib.inc.php3 (788, 790) : tweak size for lower resolution screens. * lib.inc.php3 (788, 790) : tweak size for lower resolution screens.

10
Documentation.html
View File

@@ -349,10 +349,10 @@
<br /><br /> <br /><br />
</dd> </dd>
<dt><b>$cfgServers[n]['only_db']</b> string</dt> <dt><b>$cfgServers[n]['only_db']</b> string or array</dt>
<dd> <dd>
If set to a database name, only this database will be shown to the If set to a(an array of) database name(s), only this(these) database(s)
user. will be shown to the user.
<br /><br /> <br /><br />
</dd> </dd>
@@ -543,9 +543,7 @@
<br /><br /> <br /><br />
</dd> </dd>
<dt> <dt><b>$cfgLimitChars </b>integer</dt>
<b>$cfgLimitChars </b>integer
</dt>
<dd> <dd>
Maximal number of Chars showed in a field on browse view. Maximal number of Chars showed in a field on browse view.
<br /><br /> <br /><br />

1
config.inc.php3
View File

@@ -37,6 +37,7 @@ $cfgServers[1]['stdpass'] = ''; // MySQL standard password (only needed with ad
$cfgServers[1]['user'] = 'root'; // MySQL user (only needed with basic auth) $cfgServers[1]['user'] = 'root'; // MySQL user (only needed with basic auth)
$cfgServers[1]['password'] = ''; // MySQL password (only needed with basic auth) $cfgServers[1]['password'] = ''; // MySQL password (only needed with basic auth)
$cfgServers[1]['only_db'] = ''; // If set to a db-name, only this db is accessible $cfgServers[1]['only_db'] = ''; // If set to a db-name, only this db is accessible
// 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]['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]['bookmarkdb'] = ''; // Bookmark db - leave blank for no bookmark support
$cfgServers[1]['bookmarktable'] = ''; // Bookmark table - leave blank for no bookmark support $cfgServers[1]['bookmarktable'] = ''; // Bookmark table - leave blank for no bookmark support

4
lib.inc.php3
View File

@@ -193,8 +193,12 @@ if (!defined('__LIB_INC__')){
// The user can work with only one database // The user can work with only one database
if (isset($cfgServer['only_db']) && !empty($cfgServer['only_db'])) { if (isset($cfgServer['only_db']) && !empty($cfgServer['only_db'])) {
if (is_array($cfgServer['only_db'])) {
$dblist = $cfgServer['only_db'];
} else {
$dblist[] = $cfgServer['only_db']; $dblist[] = $cfgServer['only_db'];
} }
}
// Advanced authentication is required // Advanced authentication is required
if ($cfgServer['adv_auth']) { if ($cfgServer['adv_auth']) {