omit "Actions" if no actions ...
This commit is contained in:
29
main.php
29
main.php
@@ -54,14 +54,18 @@ $short_server_info = (!empty($GLOBALS['cfg']['Server']['verbose'])
|
|||||||
|
|
||||||
echo '<div id="maincontainer">' . "\n";
|
echo '<div id="maincontainer">' . "\n";
|
||||||
echo '<div id="main_pane_left">';
|
echo '<div id="main_pane_left">';
|
||||||
|
|
||||||
|
if ($server > 0
|
||||||
|
|| (! $cfg['LeftDisplayServers'] && count($cfg['Servers']) > 1)) {
|
||||||
echo '<div class="group">';
|
echo '<div class="group">';
|
||||||
echo '<h2>' . $strActions . '</h2>';
|
echo '<h2>' . $strActions . '</h2>';
|
||||||
|
|
||||||
echo '<ul>';
|
echo '<ul>';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Displays the MySQL servers choice form
|
* Displays the MySQL servers choice form
|
||||||
*/
|
*/
|
||||||
if (! $cfg['LeftDisplayServers'] && (count($cfg['Servers']) > 1 || $server == 0 && count($cfg['Servers']) == 1)) {
|
if (! $cfg['LeftDisplayServers']
|
||||||
|
&& (count($cfg['Servers']) > 1 || $server == 0 && count($cfg['Servers']) == 1)) {
|
||||||
echo '<li id="li_select_server">';
|
echo '<li id="li_select_server">';
|
||||||
require_once './libraries/select_server.lib.php';
|
require_once './libraries/select_server.lib.php';
|
||||||
PMA_select_server(true, true);
|
PMA_select_server(true, true);
|
||||||
@@ -73,24 +77,12 @@ if (! $cfg['LeftDisplayServers'] && (count($cfg['Servers']) > 1 || $server == 0
|
|||||||
*/
|
*/
|
||||||
if ($server > 0) {
|
if ($server > 0) {
|
||||||
require_once './libraries/check_user_privileges.lib.php';
|
require_once './libraries/check_user_privileges.lib.php';
|
||||||
$is_superuser = PMA_isSuperuser();
|
|
||||||
|
|
||||||
if ($cfg['Server']['auth_type'] == 'config') {
|
|
||||||
$cfg['ShowChgPassword'] = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Change password
|
|
||||||
*
|
|
||||||
* @todo ? needs another message
|
|
||||||
*/
|
|
||||||
if ($cfg['ShowChgPassword']) {
|
|
||||||
PMA_printListItem($strChangePassword, 'li_change_password',
|
|
||||||
'./user_password.php?' . $common_url_query);
|
|
||||||
} // end if
|
|
||||||
|
|
||||||
// Logout for advanced authentication
|
// Logout for advanced authentication
|
||||||
if ($cfg['Server']['auth_type'] != 'config') {
|
if ($cfg['Server']['auth_type'] != 'config') {
|
||||||
|
PMA_printListItem($strChangePassword, 'li_change_password',
|
||||||
|
'./user_password.php?' . $common_url_query);
|
||||||
|
|
||||||
$http_logout = ($cfg['Server']['auth_type'] == 'http')
|
$http_logout = ($cfg['Server']['auth_type'] == 'http')
|
||||||
? '<a href="./Documentation.html#login_bug" target="documentation">'
|
? '<a href="./Documentation.html#login_bug" target="documentation">'
|
||||||
. ($cfg['ReplaceHelpImg'] ? '<img class="icon" src="' . $pmaThemeImage . 'b_info.png" width="11" height="11" alt="Info" />' : '(*)') . '</a>'
|
. ($cfg['ReplaceHelpImg'] ? '<img class="icon" src="' . $pmaThemeImage . 'b_info.png" width="11" height="11" alt="Info" />' : '(*)') . '</a>'
|
||||||
@@ -99,11 +91,12 @@ if ($server > 0) {
|
|||||||
'li_log_out',
|
'li_log_out',
|
||||||
'./index.php?' . $common_url_query . '&old_usr=' . urlencode($PHP_AUTH_USER), null, '_parent');
|
'./index.php?' . $common_url_query . '&old_usr=' . urlencode($PHP_AUTH_USER), null, '_parent');
|
||||||
} // end if
|
} // end if
|
||||||
|
|
||||||
} // end of if ($server > 0)
|
} // end of if ($server > 0)
|
||||||
|
|
||||||
echo '</ul>';
|
echo '</ul>';
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if ($server > 0) {
|
if ($server > 0) {
|
||||||
echo '<div class="group">';
|
echo '<div class="group">';
|
||||||
|
Reference in New Issue
Block a user