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

handle when ServerDefault is 0

Browse Source
This commit is contained in:
Marc Delisle
2008-07-20 14:45:58 +00:00
parent 15bafa3c33
commit e2b2ad2f1d
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
main.php
View File

@@ -28,33 +28,35 @@ if (! empty($message)) {
$common_url_query = PMA_generate_common_url('', ''); $common_url_query = PMA_generate_common_url('', '');
// when $server > 0, a server has been chosen so we can display
// all MySQL-related information
if ($server > 0) { if ($server > 0) {
require './libraries/server_common.inc.php'; require './libraries/server_common.inc.php';
require './libraries/StorageEngine.class.php'; require './libraries/StorageEngine.class.php';
require './libraries/server_links.inc.php'; require './libraries/server_links.inc.php';
}
// robbat2: Use the verbose name of the server instead of the hostname // Use the verbose name of the server instead of the hostname
// if a value is set // if a value is set
$server_info = ''; $server_info = '';
if (! empty($cfg['Server']['verbose'])) { if (! empty($cfg['Server']['verbose'])) {
$server_info .= htmlspecialchars($cfg['Server']['verbose']); $server_info .= htmlspecialchars($cfg['Server']['verbose']);
if ($GLOBALS['cfg']['ShowServerInfo']) { if ($GLOBALS['cfg']['ShowServerInfo']) {
$server_info .= ' ('; $server_info .= ' (';
} }
} }
if ($GLOBALS['cfg']['ShowServerInfo'] || empty($cfg['Server']['verbose'])) { if ($GLOBALS['cfg']['ShowServerInfo'] || empty($cfg['Server']['verbose'])) {
$server_info .= PMA_DBI_get_host_info(); $server_info .= PMA_DBI_get_host_info();
} }
if (! empty($cfg['Server']['verbose']) && $GLOBALS['cfg']['ShowServerInfo']) { if (! empty($cfg['Server']['verbose']) && $GLOBALS['cfg']['ShowServerInfo']) {
$server_info .= ')'; $server_info .= ')';
} }
$mysql_cur_user_and_host = PMA_DBI_fetch_value('SELECT USER();'); $mysql_cur_user_and_host = PMA_DBI_fetch_value('SELECT USER();');
// should we add the port info here? // should we add the port info here?
$short_server_info = (!empty($GLOBALS['cfg']['Server']['verbose']) $short_server_info = (!empty($GLOBALS['cfg']['Server']['verbose'])
? $GLOBALS['cfg']['Server']['verbose'] ? $GLOBALS['cfg']['Server']['verbose']
: $GLOBALS['cfg']['Server']['host']); : $GLOBALS['cfg']['Server']['host']);
}
echo '<div id="maincontainer">' . "\n"; echo '<div id="maincontainer">' . "\n";
echo '<div id="main_pane_left">'; echo '<div id="main_pane_left">';
@@ -203,11 +205,12 @@ if ($server > 0) {
} }
echo '<div class="group">';
echo '<h2>' . $strWebServer . '</h2>';
echo '<ul>';
PMA_printListItem($_SERVER['SERVER_SOFTWARE'], 'li_web_server_software');
if ($server > 0) { if ($server > 0) {
echo '<div class="group">';
echo '<h2>' . $strWebServer . '</h2>';
echo '<ul>';
PMA_printListItem($_SERVER['SERVER_SOFTWARE'], 'li_web_server_software');
PMA_printListItem($strMysqlClientVersion . ': ' . PMA_DBI_get_client_info(), PMA_printListItem($strMysqlClientVersion . ': ' . PMA_DBI_get_client_info(),
'li_mysql_client_version'); 'li_mysql_client_version');
PMA_printListItem($strPHPExtension . ': ' . $GLOBALS['cfg']['Server']['extension'], PMA_printListItem($strPHPExtension . ': ' . $GLOBALS['cfg']['Server']['extension'],