diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index b8062771c1..3ee9ad6e55 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -27,7 +27,7 @@ $_SESSION["alert_msg"] = "";
// Global errors/warnings checking.
config_check();
-$login = get_parameter('login', 0);
+
?>
@@ -82,9 +82,6 @@ $login = get_parameter('login', 0);
$servers["up"] = (int) servers_check_status ();
$servers["down"] = $servers["all"] - $servers["up"];
if ($servers["up"] == 0) {
- if (!$login){
- $server_clippy = clippy_context_help("servers_down");
- }
//All Servers down or no servers at all
$servers_check_img = html_print_image("images/header_down.png", true, array("alt" => 'cross', "class" => 'bot', 'title' => __('All systems').': '.__('Down')));
}
@@ -235,40 +232,39 @@ $login = get_parameter('login', 0);
}
$table->data[0][3] = $maintenance_img;
- $table->data[0][4] = $server_clippy;
// Main help icon
- $table->data[0][5] = ui_print_help_icon ("main_help", true, '', 'images/header_help.png');
+ $table->data[0][4] = ui_print_help_icon ("main_help", true, '', 'images/header_help.png');
// Logout
- $table->data[0][6] = '';
- $table->data[0][6] .= html_print_image("images/header_logout.png", true, array("alt" => __('Logout'), "class" => 'bot', "title" => __('Logout')));
- $table->data[0][6] .= '';
+ $table->data[0][5] = '';
+ $table->data[0][5] .= html_print_image("images/header_logout.png", true, array("alt" => __('Logout'), "class" => 'bot', "title" => __('Logout')));
+ $table->data[0][5] .= '';
// User
if (is_user_admin ($config["id_user"]) == 1)
- $table->data[0][7] = html_print_image("images/header_user_admin.png" , true, array("title" => __('Edit my user'), "class" => 'bot', "alt" => 'user'));
+ $table->data[0][6] = html_print_image("images/header_user_admin.png" , true, array("title" => __('Edit my user'), "class" => 'bot', "alt" => 'user'));
else
- $table->data[0][7] = html_print_image("images/header_user.png" , true, array("title" => __('Edit my user'), "class" => 'bot', "alt" => 'user'));
+ $table->data[0][6] = html_print_image("images/header_user.png" , true, array("title" => __('Edit my user'), "class" => 'bot', "alt" => 'user'));
- $table->data[0][7] = '' . $table->data[0][7] . '';
+ $table->data[0][6] = '' . $table->data[0][7] . '';
- $table->data[0][8] = ' (' . $config["id_user"] . ')';
+ $table->data[0][7] = ' (' . $config["id_user"] . ')';
// Chat messages
- $table->data[0][9] = "";
- $table->data[0][9] .= "";
- $table->data[0][9] .= html_print_image('images/header_chat.png', true, array("title" => __('New chat message')));
- $table->data[0][9] .= "";
- $table->data[0][9] .= "";
+ $table->data[0][8] = "";
+ $table->data[0][8] .= "";
+ $table->data[0][8] .= html_print_image('images/header_chat.png', true, array("title" => __('New chat message')));
+ $table->data[0][8] .= "";
+ $table->data[0][8] .= "";
// Messages
$msg_cnt = messages_get_count ($config["id_user"]);
if ($msg_cnt > 0) {
echo '';
- $table->data[0][10] = '';
- $table->data[0][10] .= html_print_image ("images/header_email.png", true, array ("title" => __('You have %d unread message(s)', $msg_cnt), "id" => "yougotmail", "class" => "bot", 'style' => 'width:24px;'));
- $table->data[0][10] .= '';
+ $table->data[0][9] = '';
+ $table->data[0][9] .= html_print_image ("images/header_email.png", true, array ("title" => __('You have %d unread message(s)', $msg_cnt), "id" => "yougotmail", "class" => "bot", 'style' => 'width:24px;'));
+ $table->data[0][9] .= '';
}
@@ -304,7 +300,7 @@ $login = get_parameter('login', 0);
$table->data[0]['searchbar'] = $search_bar;
- $table->data[0][12] = ui_print_help_tip (__("Blank characters are used as AND conditions"), true);
+ $table->data[0][11] = ui_print_help_tip (__("Blank characters are used as AND conditions"), true);
html_print_table($table);
diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index 78a6da3621..c2f3274361 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -14,6 +14,9 @@
// GNU General Public License for more details.
// Load global vars
+
+require_once ('include/functions_clippy.php');
+
global $config;
check_login();
@@ -29,7 +32,8 @@ global $tiny;
$servers = servers_get_info();
if ($servers === false) {
- echo "".__('There are no servers configured into the database')."
";
+ $server_clippy = clippy_context_help("servers_down");
+ echo "".__('There are no servers configured into the database').$server_clippy."
";
return;
}
@@ -109,6 +113,9 @@ foreach ($servers as $server) {
}
$data[6] = $server['threads'].' : '.$server['queued_modules'];
+ if ($server['queued_modules'] > 200){
+ $data[6] .= clippy_context_help("server_queued_modules");
+ }
$data[7] = ui_print_timestamp ($server['keepalive'], true);
//Only Pandora Administrator can delete servers