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

More replacements for page title (RFE #1408241).

Browse Source
This commit is contained in:
Michal Čihař
2006-02-23 13:15:20 +00:00
parent 6fe79cc137
commit 6b9e9555b7
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2006-02-23 Michal Čihař <michal@cihar.com>
* libraries/config.default.php, libraries/header.inc.php,
Documentation.html: More replacements for page title (RFE #1408241).
2006-02-23 Marc Delisle <lem9@users.sourceforge.net>
* libraries/Config.class.php: bug #1418769 part 1: stat failed for
./config.inc.php (under PHP 4)

4
Documentation.html
View File

@@ -1645,6 +1645,10 @@ ALTER TABLE `pma_column_comments`
<dd>HTTP host that runs phpMyAdmin</dd>
<dt><code>@SERVER@</code></dt>
<dd>MySQL server name</dd>
<dt><code>@VERBOSE@</code></dt>
<dd>Verbose MySQL server name as defined in <a href="#cfg_Servers_verbose">server configuration</a></dd>
<dt><code>@VSERVER@</code></dt>
<dd>Verbose MySQL server name if set, otherwise normal</dd>
<dt><code>@DATABASE@</code></dt>
<dd>Currently opened database</dd>
<dt><code>@TABLE@</code></dt>

6
libraries/config.default.php
View File

@@ -516,9 +516,9 @@ $cfg['NaturalOrder'] = TRUE; // Sort table and database in natura
// 2004-05-08 rabus: We need to rearrange these variables.
// Window title settings
$cfg['TitleTable'] = '@HTTP_HOST@ / @SERVER@ / @DATABASE@ / @TABLE@ | @PHPMYADMIN@';
$cfg['TitleDatabase'] = '@HTTP_HOST@ / @SERVER@ / @DATABASE@ | @PHPMYADMIN@';
$cfg['TitleServer'] = '@HTTP_HOST@ / @SERVER@ | @PHPMYADMIN@';
$cfg['TitleTable'] = '@HTTP_HOST@ / @VSERVER@ / @DATABASE@ / @TABLE@ | @PHPMYADMIN@';
$cfg['TitleDatabase'] = '@HTTP_HOST@ / @VSERVER@ / @DATABASE@ | @PHPMYADMIN@';
$cfg['TitleServer'] = '@HTTP_HOST@ / @VSERVER@ | @PHPMYADMIN@';
$cfg['TitleDefault'] = '@HTTP_HOST@ | @PHPMYADMIN@';
$cfg['ErrorIconic'] = TRUE; // show some icons for warning, error and information messages (true|false)?

4
libraries/header.inc.php
View File

@@ -30,6 +30,8 @@ if (empty($GLOBALS['is_header_sent'])) {
array(
'@HTTP_HOST@',
'@SERVER@',
'@VERBOSE@',
'@VSERVER@',
'@DATABASE@',
'@TABLE@',
'@PHPMYADMIN@',
@@ -37,6 +39,8 @@ if (empty($GLOBALS['is_header_sent'])) {
array(
isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '',
isset($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['Server']['host'] : '',
isset($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : '',
!empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : (isset($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['Server']['host'] : ''),
isset($GLOBALS['db']) ? $GLOBALS['db'] : '',
isset($GLOBALS['table']) ? $GLOBALS['table'] : '',
'phpMyAdmin ' . PMA_VERSION,