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

bug #2910000 [gui] ShowServerInfo should hide all server info from main page

Browse Source
This commit is contained in:
Marc Delisle
2009-12-09 17:53:48 +00:00
parent 49dcfddca7
commit 0797eb4cb0
3 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
thanks to Virsacer - virsacer thanks to Virsacer - virsacer
- bug [history] QueryHistoryDB is not respected - bug [history] QueryHistoryDB is not respected
- bug #2905629 [auth] Blowfish secret is not hashed - bug #2905629 [auth] Blowfish secret is not hashed
- bug #2910000 [gui] ShowServerInfo should hide all server info from main page
3.2.4.0 (2009-12-02) 3.2.4.0 (2009-12-02)
- bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status

2
libraries/config.default.php
View File

@@ -756,7 +756,7 @@ $cfg['ShowStats'] = true;
$cfg['ShowPhpInfo'] = false; $cfg['ShowPhpInfo'] = false;
/** /**
* show MySQL server information * show MySQL server and web server information
* *
* @global boolean $cfg['ShowServerInfo'] * @global boolean $cfg['ShowServerInfo']
*/ */

10
main.php
View File

@@ -182,19 +182,16 @@ echo '</div>';
echo '</div>'; echo '</div>';
echo '<div id="main_pane_right">'; echo '<div id="main_pane_right">';
if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) {
if ($server > 0) {
echo '<div class="group">'; echo '<div class="group">';
echo '<h2>MySQL</h2>'; echo '<h2>MySQL</h2>';
echo '<ul>' . "\n"; echo '<ul>' . "\n";
PMA_printListItem($strServer . ': ' . $server_info, 'li_server_info'); PMA_printListItem($strServer . ': ' . $server_info, 'li_server_info');
PMA_printListItem($strServerVersion . ': ' . PMA_MYSQL_STR_VERSION, 'li_server_version'); PMA_printListItem($strServerVersion . ': ' . PMA_MYSQL_STR_VERSION, 'li_server_version');
if ($GLOBALS['cfg']['ShowServerInfo']) {
PMA_printListItem($strProtocolVersion . ': ' . PMA_DBI_get_proto_info(), PMA_printListItem($strProtocolVersion . ': ' . PMA_DBI_get_proto_info(),
'li_mysql_proto'); 'li_mysql_proto');
PMA_printListItem($strUser . ': ' . htmlspecialchars($mysql_cur_user_and_host), PMA_printListItem($strUser . ': ' . htmlspecialchars($mysql_cur_user_and_host),
'li_user_info'); 'li_user_info');
}
echo ' <li id="li_select_mysql_charset">'; echo ' <li id="li_select_mysql_charset">';
echo ' ' . $strMySQLCharset . ': ' echo ' ' . $strMySQLCharset . ': '
@@ -207,10 +204,11 @@ if ($server > 0) {
echo ' </div>'; echo ' </div>';
} }
if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) {
echo '<div class="group">'; echo '<div class="group">';
echo '<h2>' . $strWebServer . '</h2>'; echo '<h2>' . $strWebServer . '</h2>';
echo '<ul>'; echo '<ul>';
if ($GLOBALS['cfg']['ShowServerInfo']) {
PMA_printListItem($_SERVER['SERVER_SOFTWARE'], 'li_web_server_software'); PMA_printListItem($_SERVER['SERVER_SOFTWARE'], 'li_web_server_software');
if ($server > 0) { if ($server > 0) {
@@ -219,12 +217,14 @@ if ($server > 0) {
PMA_printListItem($strPHPExtension . ': ' . $GLOBALS['cfg']['Server']['extension'], PMA_printListItem($strPHPExtension . ': ' . $GLOBALS['cfg']['Server']['extension'],
'li_used_php_extension'); 'li_used_php_extension');
} }
}
if ($cfg['ShowPhpInfo']) { if ($cfg['ShowPhpInfo']) {
PMA_printListItem($strShowPHPInfo, 'li_phpinfo', './phpinfo.php?' . $common_url_query); PMA_printListItem($strShowPHPInfo, 'li_phpinfo', './phpinfo.php?' . $common_url_query);
} }
echo ' </ul>'; echo ' </ul>';
echo ' </div>'; echo ' </div>';
}
echo '<div class="group">'; echo '<div class="group">';
echo '<h2>phpMyAdmin</h2>'; echo '<h2>phpMyAdmin</h2>';