diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index aa26dd67a9..15318bc953 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,43 @@ +2010-03-02 Sancho Leren + + * include/functions_ui.php: Fixes default icon for operation + mode in the title. + + * operation/incidents/incident.php + operation/incidents/incident_detail.php + operation/incidents/incident_statistics.php + operation/snmpconsole/snmp_view.php + operation/users/user.php + operation/users/user_edit.php + operation/users/user_statistics.php + operation/events/event_statistics.php + operation/events/export_csv.php + operation/events/events_marquee.php + operation/events/events.php + operation/agentes/export_csv.php + operation/agentes/datos_agente.php + operation/agentes/estado_ultimopaquete.php + operation/agentes/estado_generalagente.php + operation/agentes/estado_agente.php + operation/agentes/sla_view.php + operation/agentes/gis_view.php + operation/agentes/ver_agente.php + operation/agentes/tactical.php + operation/agentes/group_view.php + operation/agentes/networkmap.php + operation/messages/message.php + operation/reporting/reporting_viewer.php + operation/servers/view_server.php + operation/servers/view_server_detail.php + operation/search_results.php + godmode/groups/configure_group.php + godmode/groups/group_list.php + godmode/agentes/agent_manager.php + godmode/alerts/alert_list.php: Fixes with include(Config.php) in + enterprise mode.: + + * general/header.php: Detection of Metaconsole to show less options. + 2010-03-02 Raúl Mateos * godmode/agentes/*.php, godmode/group/*.php, godmode/modules/*.php: diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index e5184b2708..1d66d4eeb9 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -14,6 +14,8 @@ require_once ("include/functions_messages.php"); +$msg_cnt = 0; + ?> @@ -33,17 +35,20 @@ require_once ("include/functions_messages.php"); .png" class="bot" alt="user" /> [] 0) { - echo ''; - require_css_file ('dialog'); - require_jquery_file ('ui.core'); - require_jquery_file ('ui.dialog'); - echo ''; - print_image ("images/email.png", false, - array ("title" => __('You have %d unread message(s)', $msg_cnt), "id" => "yougotmail", "class" => "bot")); - echo ''; + if ($config["metaconsole"] == 0){ + $msg_cnt = get_message_count ($config["id_user"]); + if ($msg_cnt > 0) { + echo ''; + + require_css_file ('dialog'); + require_jquery_file ('ui.core'); + require_jquery_file ('ui.dialog'); + echo ''; + print_image ("images/email.png", false, + array ("title" => __('You have %d unread message(s)', $msg_cnt), "id" => "yougotmail", "class" => "bot")); + echo ''; + } } ?>   @@ -51,8 +56,11 @@ require_once ("include/functions_messages.php");
- - '; + $servers["all"] = (int) get_db_value ('COUNT(id_server)','tserver'); $servers["up"] = (int) check_server_status (); $servers["down"] = $servers["all"] - $servers["up"]; @@ -69,8 +77,13 @@ require_once ("include/functions_messages.php"); echo 'ok '.__('All systems').': '.__('Ready'); } unset ($servers); // Since this is the header, we don't like to trickle down variables. - ?> - + echo ''; + } else { + // TODO: Put here to remark this is a metaconsole + echo ""; + + } +?>
+ +