diff --git a/ChangeLog b/ChangeLog index 9973024f6..11befa649 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ $Source$ 2006-07-06 Sebastian Mendel * libraries/select_server.lib.php: make serverlist a real html-list + * main.php: move server selection above server details (more logical) 2006-07-04 Marc Delisle * db_operations.php, tbl_properties_operations.php, diff --git a/main.php b/main.php index bd390cccd..e120b3cab 100644 --- a/main.php +++ b/main.php @@ -12,7 +12,7 @@ if (!defined('PMA_DISPLAY_HEADING')) { /** * Gets some core libraries and displays a top message if required */ -require_once('./libraries/common.lib.php'); +require_once './libraries/common.lib.php'; // Handles some variables that may have been sent by the calling script if (isset($db)) { @@ -22,15 +22,15 @@ if (isset($table)) { unset($table); } $show_query = '1'; -require_once('./libraries/header.inc.php'); +require_once './libraries/header.inc.php'; // Any message to display? -if ( ! empty( $message ) ) { - PMA_showMessage( $message ); - unset( $message ); +if (! empty($message)) { + PMA_showMessage($message); + unset($message); } -$common_url_query = PMA_generate_common_url( '', '' ); +$common_url_query = PMA_generate_common_url('', ''); // this div is required for containing divs can be 50% echo '
' . "\n"; @@ -38,23 +38,32 @@ echo '
' . "\n"; /** * Displays the mysql server related links */ -if ( $server > 0 ) { +if ($server > 0) { - require_once('./libraries/check_user_privileges.lib.php'); + require_once './libraries/check_user_privileges.lib.php'; // why this? a non-priv user should be able to change his // password if the configuration permits //$cfg['ShowChgPassword'] = $is_superuser = PMA_isSuperuser(); $is_superuser = PMA_isSuperuser(); if ($cfg['Server']['auth_type'] == 'config') { - $cfg['ShowChgPassword'] = FALSE; + $cfg['ShowChgPassword'] = false; } } - ?> +?>
- 0 ) { + 1 || $server == 0 && count($cfg['Servers']) == 1)) { + require_once './libraries/select_server.lib.php'; + PMA_select_server(true, false); +} + + +if ($server > 0) { // robbat2: Use the verbose name of the server instead of the hostname // if a value is set $server_info = ''; @@ -81,24 +90,16 @@ if ( $server > 0 ) { echo '

MySQL

' . "\n"; } -/** - * Displays the MySQL servers choice form - */ -if (!$cfg['LeftDisplayServers'] && (count($cfg['Servers']) > 1 || $server == 0 && count($cfg['Servers']) == 1)) { - include('./libraries/select_server.lib.php'); - PMA_select_server(TRUE, FALSE); -} - -if ( $server > 0 ) { +if ($server > 0) { echo '
    ' . "\n"; - PMA_printListItem( $strProtocolVersion . ': ' . PMA_DBI_get_proto_info(), - 'li_mysql_proto' ); - PMA_printListItem( $strServer . ': ' . $server_info, 'li_server_info' ); - PMA_printListItem( $strUser . ': ' . htmlspecialchars( $mysql_cur_user_and_host ), - 'li_user_info' ); + PMA_printListItem($strProtocolVersion . ': ' . PMA_DBI_get_proto_info(), + 'li_mysql_proto'); + PMA_printListItem($strServer . ': ' . $server_info, 'li_server_info'); + PMA_printListItem($strUser . ': ' . htmlspecialchars($mysql_cur_user_and_host), + 'li_user_info'); - if ( $cfg['AllowAnywhereRecoding'] && $allow_recoding && PMA_MYSQL_INT_VERSION < 40100) { + if ($cfg['AllowAnywhereRecoding'] && $allow_recoding && PMA_MYSQL_INT_VERSION < 40100) { echo '
  • '; ?>
    @@ -123,7 +124,7 @@ if ( $server > 0 ) {
    • = 40100 ) { + } elseif (PMA_MYSQL_INT_VERSION >= 40100) { echo '
  • '; echo ' ' . $strMySQLCharset . ': ' . ' ' @@ -137,7 +138,7 @@ if ( $server > 0 ) { . ' ' . "\n" - . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'collation_connection', 'select_collation_connection', $collation_connection, TRUE, 4, TRUE) + . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'collation_connection', 'select_collation_connection', $collation_connection, true, 4, true) . ' ' . "\n" // put the doc link in the form so that it appears on the same line . PMA_showMySQLDocu('MySQL_Database_Administration', 'Charset-connection') . "\n" @@ -147,56 +148,56 @@ if ( $server > 0 ) { if ($cfg['ShowCreateDb']) { echo '
  • '; - require('./libraries/display_create_database.lib.php'); + require './libraries/display_create_database.lib.php'; echo '
    • ' . "\n"; } - PMA_printListItem( $strMySQLShowStatus, 'li_mysql_status', - './server_status.php?' . $common_url_query ); - PMA_printListItem( $strMySQLShowVars, 'li_mysql_variables', - './server_variables.php?' . $common_url_query, 'show-variables' ); - PMA_printListItem( $strProcesses, 'li_mysql_processes', - './server_processlist.php?' . $common_url_query, 'show-processlist' ); + PMA_printListItem($strMySQLShowStatus, 'li_mysql_status', + './server_status.php?' . $common_url_query); + PMA_printListItem($strMySQLShowVars, 'li_mysql_variables', + './server_variables.php?' . $common_url_query, 'show-variables'); + PMA_printListItem($strProcesses, 'li_mysql_processes', + './server_processlist.php?' . $common_url_query, 'show-processlist'); if (PMA_MYSQL_INT_VERSION >= 40100) { - PMA_printListItem( $strCharsetsAndCollations, 'li_mysql_collations', - './server_collations.php?' . $common_url_query ); + PMA_printListItem($strCharsetsAndCollations, 'li_mysql_collations', + './server_collations.php?' . $common_url_query); } - PMA_printListItem( $strStorageEngines, 'li_mysql_engines', - './server_engines.php?' . $common_url_query ); + PMA_printListItem($strStorageEngines, 'li_mysql_engines', + './server_engines.php?' . $common_url_query); if ($is_reload_priv) { - PMA_printListItem( $strReloadPrivileges, 'li_flush_privileges', - './server_privileges.php?flush_privileges=1&' . $common_url_query, 'flush' ); + PMA_printListItem($strReloadPrivileges, 'li_flush_privileges', + './server_privileges.php?flush_privileges=1&' . $common_url_query, 'flush'); } if ($is_superuser) { - PMA_printListItem( $strPrivileges, 'li_mysql_privilegs', - './server_privileges.php?' . $common_url_query ); + PMA_printListItem($strPrivileges, 'li_mysql_privilegs', + './server_privileges.php?' . $common_url_query); } $binlogs = PMA_DBI_try_query('SHOW MASTER LOGS', null, PMA_DBI_QUERY_STORE); - if ( $binlogs ) { + if ($binlogs) { if (PMA_DBI_num_rows($binlogs) > 0) { - PMA_printListItem( $strBinaryLog, 'li_mysql_binlogs', - './server_binlog.php?' . $common_url_query ); + PMA_printListItem($strBinaryLog, 'li_mysql_binlogs', + './server_binlog.php?' . $common_url_query); } PMA_DBI_free_result($binlogs); } - unset( $binlogs ); + unset($binlogs); - PMA_printListItem( $strDatabases, 'li_mysql_databases', - './server_databases.php?' . $common_url_query ); - PMA_printListItem( $strExport, 'li_export', - './server_export.php?' . $common_url_query ); - PMA_printListItem( $strImport, 'li_import', - './server_import.php?' . $common_url_query ); + PMA_printListItem($strDatabases, 'li_mysql_databases', + './server_databases.php?' . $common_url_query); + PMA_printListItem($strExport, 'li_export', + './server_export.php?' . $common_url_query); + PMA_printListItem($strImport, 'li_import', + './server_import.php?' . $common_url_query); // Change password (TODO ? needs another message) if ($cfg['ShowChgPassword']) { - PMA_printListItem( $strChangePassword, 'li_change_password', - './user_password.php?' . $common_url_query ); + PMA_printListItem($strChangePassword, 'li_change_password', + './user_password.php?' . $common_url_query); } // end if // Logout for advanced authentication @@ -205,7 +206,7 @@ if ( $server > 0 ) { ? '' . ($cfg['ReplaceHelpImg'] ? 'Info' : '(*)') . '' : ''; - PMA_printListItem( '' . $strLogout . ' ' . $http_logout, + PMA_printListItem('' . $strLogout . ' ' . $http_logout, 'li_log_out', './index.php?' . $common_url_query . '&old_usr=' . urlencode($PHP_AUTH_USER), null, '_parent'); } // end if @@ -222,23 +223,23 @@ echo '

    phpMyAdmin - ' . PMA_VERSION . '

    ' echo '
      ' . "\n"; -if ( $server > 0 ) { - PMA_printListItem( $strMysqlClientVersion . ': ' . PMA_DBI_get_client_info(), - 'li_mysql_client_version' ); - PMA_printListItem( $strUsedPhpExtensions . ': ' . $GLOBALS['cfg']['Server']['extension'], - 'li_used_php_extension' ); +if ($server > 0) { + PMA_printListItem($strMysqlClientVersion . ': ' . PMA_DBI_get_client_info(), + 'li_mysql_client_version'); + PMA_printListItem($strUsedPhpExtensions . ': ' . $GLOBALS['cfg']['Server']['extension'], + 'li_used_php_extension'); } // Displays language selection combo if (empty($cfg['Lang'])) { echo '
    • '; - require_once('./libraries/display_select_lang.lib.php'); + require_once './libraries/display_select_lang.lib.php'; PMA_select_language(); echo '
      • '; } -if ( isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] +if (isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $server != 0 && $allow_recoding && PMA_MYSQL_INT_VERSION < 40100) { echo '
    • '; ?> @@ -269,19 +270,19 @@ if ( isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] // added by Michael Keck // ThemeManager if available -if ( $GLOBALS['cfg']['ThemeManager'] ) { +if ($GLOBALS['cfg']['ThemeManager']) { echo '
    • '; echo $_SESSION['PMA_Theme_Manager']->getHtmlSelectBox(); echo '
      • '; } -PMA_printListItem( $strPmaDocumentation, 'li_pma_docs', 'Documentation.html' ); +PMA_printListItem($strPmaDocumentation, 'li_pma_docs', 'Documentation.html'); -if ( $cfg['ShowPhpInfo'] ) { - PMA_printListItem( $strShowPHPInfo, 'li_phpinfo', './phpinfo.php?' . $common_url_query ); +if ($cfg['ShowPhpInfo']) { + PMA_printListItem($strShowPHPInfo, 'li_phpinfo', './phpinfo.php?' . $common_url_query); } // does not work if no target specified, don't know why -PMA_printListItem( $strHomepageOfficial, 'li_pma_homepage', 'http://www.phpMyAdmin.net/', null, '_blank' ); +PMA_printListItem($strHomepageOfficial, 'li_pma_homepage', 'http://www.phpMyAdmin.net/', null, '_blank'); ?>
    • [ChangeLog] @@ -304,8 +305,8 @@ PMA_printListItem( $strHomepageOfficial, 'li_pma_homepage', 'http://www.phpMyAdm
' . $error . '
' . "\n"; } } @@ -403,5 +404,5 @@ function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = nu /** * Displays the footer */ -require_once('./libraries/footer.inc.php'); +require_once './libraries/footer.inc.php'; ?>