diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 7f506c5a52..eae3305b0c 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,154 @@ +2013-05-23 Sergio Martin + + * include/functions_html.php + include/styles/pandora_minimal.css + include/styles/dialog.css + include/styles/menu.css + include/styles/jquery-ui-1.10.0.custom.css + include/functions_events.php + operation/events/events_list.php + include/functions_snmp_browser.php + include/styles/pandora.css: A lot of graphic + changes including events form and snmp browser + layout + + * include/ajax/module.php + include/functions_ui.php + include/functions.php + include/functions_agents.php + include/functions_graph.php + include/graphs/functions_gd.php + include/graphs/fgraph.php + include/functions_reporting.php + include/functions_filemanager.php + include/javascript/pandora_snmp_browser.js + include/functions_treeview.php + include/constants.php + index.php + extensions/net_tools.php + extensions/pandora_logs.php + extensions/ssh_gateway.php + extensions/update_manager/settings.php + extensions/plugin_registration.php + operation/incidents/incident.php + operation/incidents/incident_detail.php + operation/visual_console/render_view.php + operation/users/user_edit.php + operation/reporting/reporting_viewer.php + operation/reporting/graph_viewer.php + operation/agentes/datos_agente.php + operation/agentes/alerts_status.php + operation/agentes/estado_generalagente.php + operation/agentes/custom_fields.php + operation/agentes/estado_agente.php + operation/agentes/estado_monitores.php + operation/agentes/agent_fields.php + operation/agentes/stat_win.php + operation/servers/recon_view.php + operation/integria_incidents/incident_detail.php + operation/netflow/nf_live_view.php + godmode/groups/configure_group.php + godmode/groups/configure_modu_group.php + godmode/groups/group_list.php + godmode/db/db_refine.php + godmode/db/db_event.php + godmode/agentes/module_manager_editor_common.php + godmode/agentes/fields_manager.php + godmode/agentes/modificar_agente.php + godmode/agentes/module_manager_editor.php + godmode/servers/recon_script.php + godmode/servers/plugin.php + godmode/servers/manage_recontask.php + godmode/servers/modificar_server.php + godmode/setup/news.php + godmode/setup/links.php + godmode/setup/gis.php + godmode/users/configure_profile.php + godmode/massive/massive_add_alerts.php + godmode/massive/massive_delete_profiles.php + godmode/modules/module_list.php + godmode/reporting/visual_console_builder.php + godmode/reporting/map_builder.php + godmode/reporting/graphs.php + godmode/tag/tag.php + godmode/tag/edit_tag.php: Changing the old way of + print errors to encapsulated UI function to unify + styles + + * images/status_sets/color_text/agent_no_monitors.png + images/status_sets/color_text/agent_no_monitors_ball.png + images/status_sets/color_text/agent_down_ball.png + images/status_sets/color_text/agent_down.png + images/status_sets/default/agent_no_monitors.png + images/status_sets/default/agent_no_monitors_ball.png + images/status_sets/default/agent_down_ball.png + images/status_sets/default/agent_down.png: Modify some + status set images + + * images/gis_map/icons/star.default.png + images/gis_map/icons/cross.warning.png + images/gis_map/icons/star.bad.png + images/gis_map/icons/cross.ok.png + images/gis_map/icons/marker.default.png + images/gis_map/icons/square_marker.warning.png + images/gis_map/icons/circle.warning.png + images/gis_map/icons/marker.bad.png + images/gis_map/icons/square_marker.ok.png + images/gis_map/icons/circle.ok.png + images/gis_map/icons/triangle.warning.png + images/gis_map/icons/cross.default.png + images/gis_map/icons/star.warning.png + images/gis_map/icons/triangle.ok.png + images/gis_map/icons/cross.bad.png + images/gis_map/icons/star.ok.png + images/gis_map/icons/square_marker.default.png + images/gis_map/icons/circle.default.png + images/gis_map/icons/marker.warning.png + images/gis_map/icons/square_marker.bad.png + images/gis_map/icons/circle.bad.png + images/gis_map/icons/triangle.default.png + images/gis_map/icons/marker.ok.png + images/gis_map/icons/triangle.bad.png: Change whole the + gis icons by new ones + + * images/os_icons/so_win.png + images/os_icons/so_linux.png + images/os_icons/so_mac.png + images/os_icons/so_cisco.png + images/os_icons/so_vmware.png + images/os_icons/so_bsd.png + images/os_icons/android.png + images/os_icons/so_aix.png + images/os_icons/so_other.png + images/os_icons/so_hpux.png + images/os_icons/network.png + images/os_icons/embedded.png: Reduce the operating + system icons size + + * images/vnc.png + images/op_inventory.png + images/refresh_mc.png + images/heart.png + images/service.png + images/go.png + images/graphmenu_arrow_hide.png + images/submenu_tree_first.png + images/config_mc.png + images/cross_double.png + images/wand.png + images/expand.png + images/submenu_tree_middle.png + images/visual_console.png + images/down.png + images/chart_curve_threshold.png + images/people_1.png + images/cancel.png + images/graphmenu_arrow.png + images/people_2.png + images/collapse.png + images/camera_mc.png: Improve a lot of + icons + 2013-05-23 Miguel de Dios * godmode/reporting/reporting_builder.item_editor.php, diff --git a/pandora_console/extensions/net_tools.php b/pandora_console/extensions/net_tools.php index 9b0b150ab2..4c5f77a2f7 100644 --- a/pandora_console/extensions/net_tools.php +++ b/pandora_console/extensions/net_tools.php @@ -85,7 +85,7 @@ function main_net_tools () { $id_agente = get_parameter ("id_agente"); $ip = db_get_sql ("SELECT direccion FROM tagente WHERE id_agente = $id_agente"); if ($ip == "") { - echo "
The agent hasn't got IP
"; + echo "
" . __('The agent hasn\'t got IP') . "
"; return; } echo "
"; diff --git a/pandora_console/extensions/pandora_logs.php b/pandora_console/extensions/pandora_logs.php index a2cd8ed975..114c669a15 100644 --- a/pandora_console/extensions/pandora_logs.php +++ b/pandora_console/extensions/pandora_logs.php @@ -29,8 +29,7 @@ function view_logfile ($file_name) { if (!file_exists($file_name)) { - echo "

".__("Cannot find file"). "(".$file_name; - echo ")

"; + ui_print_error_message(__("Cannot find file") . "(" . $file_name . ")"); } else { $file_size = filesize($file_name); diff --git a/pandora_console/extensions/plugin_registration.php b/pandora_console/extensions/plugin_registration.php index 288490c935..148e59223e 100644 --- a/pandora_console/extensions/plugin_registration.php +++ b/pandora_console/extensions/plugin_registration.php @@ -184,10 +184,10 @@ function pluginreg_extension_main () { db_process_sql_insert('tnetwork_component', $values); - echo "

".__("Module plugin registered"). " : ". $ini_array[$label]["name"] ."

"; + ui_print_success_message(__("Module plugin registered"). " : ". $ini_array[$label]["name"]); } - echo "

".__("Plugin"). " ". $ini_array["plugin_definition"]["name"] . " ". __("Registered successfully")."

"; + ui_print_success_message(__("Plugin"). " ". $ini_array["plugin_definition"]["name"] . " ". __("Registered successfully")); unlink ($config["attachment_store"] . "/plugin_definition.ini"); } diff --git a/pandora_console/extensions/ssh_gateway.php b/pandora_console/extensions/ssh_gateway.php index 698be47d7d..296b2af090 100644 --- a/pandora_console/extensions/ssh_gateway.php +++ b/pandora_console/extensions/ssh_gateway.php @@ -49,7 +49,7 @@ function ssh_gateway () { if (($HOST == "") OR ($USER == "")) { if ($COMMIT == 1) { - echo "

".__("You need to specify a user and a host address")."

"; + ui_print_error_message(__("You need to specify a user and a host address")); } echo "
"; diff --git a/pandora_console/extensions/update_manager/settings.php b/pandora_console/extensions/update_manager/settings.php index 18efa4a697..2d3cd1ab3a 100644 --- a/pandora_console/extensions/update_manager/settings.php +++ b/pandora_console/extensions/update_manager/settings.php @@ -55,7 +55,7 @@ if ($update_settings) { update_pandora_update_conf(); } - echo "

" . __('Update manager settings updated') . "

"; + ui_print_success_message(__('Update manager settings updated')); } $settings = null; diff --git a/pandora_console/godmode/agentes/fields_manager.php b/pandora_console/godmode/agentes/fields_manager.php index b77916dbea..1bb44664de 100644 --- a/pandora_console/godmode/agentes/fields_manager.php +++ b/pandora_console/godmode/agentes/fields_manager.php @@ -41,14 +41,14 @@ $display_on_front = (int) get_parameter ('display_on_front', 0); if ($create_field) { /*Check if name field is empty*/ if ($name == ""){ - echo "

".__('The name must not be empty')."

"; + ui_print_error_message(__('The name must not be empty')); } else if ($name == db_get_value ('name', 'tagent_custom_fields', 'name', $name)) { - echo "

".__('The name must be unique')."

"; + ui_print_error_message(__('The name must be unique')); } else { $result = db_process_sql_insert('tagent_custom_fields', array('name' => $name, 'display_on_front' => $display_on_front)); - echo "

".__('Field successfully created')."

"; + ui_print_success_message(__('Field successfully created')); } } @@ -65,10 +65,10 @@ if ($update_field) { } if ($result !== false) { - echo "

".__('Field successfully updated')."

"; + ui_print_success_message(__('Field successfully updated')); } else { - echo "

".__('There was a problem modifying field')."

"; + ui_print_error_message(__('There was a problem modifying field')); } } @@ -77,9 +77,9 @@ if ($delete_field) { $result = db_process_sql_delete('tagent_custom_fields', array('id_field' => $id_field)); if (!$result) - echo "

".__('There was a problem deleting field')."

"; + ui_print_error_message(__('There was a problem deleting field')); else - echo "

".__('Field successfully deleted')."

"; + ui_print_success_message(__('Field successfully deleted')); } $fields = db_get_all_fields_in_table('tagent_custom_fields'); diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index 48a71845d1..7ea48d4636 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -58,7 +58,7 @@ $viewtab['active'] = false; $onheader = array('view' => $viewtab); // Header -ui_print_page_header (__('Agent configuration')." » ".__('Agents defined in Pandora'), "images/agent_mc.png", false, "", true, $onheader); +ui_print_page_header (__('Agents defined in Pandora'), "images/agent_mc.png", false, "", true, $onheader); // Perform actions $agent_to_delete = (int)get_parameter('borrar_agente'); @@ -124,6 +124,8 @@ if ($disable_agent) { __('Successfully disabled'), __('Could not be disabled')); } +echo ""; + // Show group selector if (isset($_POST["ag_group"])) { $ag_group = get_parameter_post ("ag_group"); @@ -135,9 +137,9 @@ else { action='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente'>"; } -echo "
"; -echo ""; -echo " -
".__('Group').""; +echo ""; + +echo __('Group') . ' '; $own_info = get_user_info($config['id_user']); if (!$own_info['is_admin'] && !check_acl ($config['id_user'], 0, "PM")) $return_all_group = false; @@ -150,28 +152,28 @@ echo " "; -echo __('Group recursion') . ': '; +"; +echo __('Recursion') . ' '; html_print_checkbox ("recursion", 1, $recursion, false, false, 'this.form.submit()'); -echo ""; -echo __('Free text for search (*)'); -echo ""; +echo ""; +echo __('Search') . ' '; +html_print_input_text ("search", $search, '', 12); // Show group selector echo "
"; -echo ""; -echo "
"; +echo ""; echo ""; echo ""; echo ""; +echo "
"; +echo '
'; echo '
'; html_print_input_hidden ('new_agent', 1); html_print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"'); echo "
"; - -echo ""; +echo "
"; $selected = 'border: 1px solid black;'; $selectNameUp = ''; @@ -393,7 +395,6 @@ if (($config['dbtype'] == 'oracle') && ($agents !== false)) { // Prepare pagination ui_pagination ($total_agents, "index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id=$ag_group&recursion=$recursion&search=$search&sort_field=$sortField&sort=$sort", $offset); -echo "
"; if ($agents !== false) { diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php index 2f30b62c40..174f4b5889 100644 --- a/pandora_console/godmode/agentes/module_manager_editor.php +++ b/pandora_console/godmode/agentes/module_manager_editor.php @@ -386,9 +386,7 @@ switch ($moduletype) { /* WARNING: type 7 is reserved on enterprise */ default: if (enterprise_include ('godmode/agentes/module_manager_editor.php') === ENTERPRISE_NOT_HOOK) { - echo '

'; - echo sprintf(__('DEBUG: Invalid module type specified in %s:%s'), __FILE__, __LINE__); - echo '

'; + ui_print_error_message(sprintf(__('DEBUG: Invalid module type specified in %s:%s'), __FILE__, __LINE__)); echo __('Most likely you have recently upgraded from an earlier version of Pandora and either
1) forgot to use the database converter
2) used a bad version of the database converter (see Bugreport #2124706 for the solution)
@@ -407,6 +405,7 @@ if ($config['enterprise_installed'] && $id_agent_module) { echo ''; +// TODO: Change to the ui_print_error system echo '
'; html_print_table ($table_simple); diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index e59188b16e..621a60b7b6 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -87,7 +87,7 @@ function add_component_selection ($id_network_component_type) { $data[1] .= ''; $table_simple->colspan['module_component'][1] = 3; - $table_simple->rowstyle['module_component'] = 'background-color: #D4DDC6'; + $table_simple->rowstyle['module_component'] = 'background-color: #cfcfcf'; prepend_table_simple ($data, 'module_component'); } diff --git a/pandora_console/godmode/db/db_event.php b/pandora_console/godmode/db/db_event.php index a42c3da000..f669120227 100644 --- a/pandora_console/godmode/db/db_event.php +++ b/pandora_console/godmode/db/db_event.php @@ -35,10 +35,10 @@ if (isset ($_POST["date_purge"])){ $deleted = db_process_sql_delete('tevento', array('utimestamp' => '< ' . $from_date)); if ($deleted !== false) { - echo '

'.__('Successfully deleted old events').'

'; + ui_print_success_message(__('Successfully deleted old events')); } else { - echo '

'.__('Error deleting old events').'

'; + ui_print_error_message(__('Error deleting old events')); } } # End of get parameters block diff --git a/pandora_console/godmode/db/db_refine.php b/pandora_console/godmode/db/db_refine.php index 5022d78591..7da1f997bf 100644 --- a/pandora_console/godmode/db/db_refine.php +++ b/pandora_console/godmode/db/db_refine.php @@ -39,12 +39,12 @@ if ((isset ($_GET["operacion"])) && (!isset ($_POST["update_agent"]))) { $max = get_parameter_post ("max", 0); $min = get_parameter_post ("min", 0); if ($max == $min) { - echo '

'.__('Error').': '.__('Maximum is equal to minimum').'

'; + ui_print_error_message(__('Error').': '.__('Maximum is equal to minimum')); return; } $origen_modulo = get_parameter_post ("origen_modulo", array ()); if (empty ($origen_modulo)) { - echo '

'.__('Error').': '.__('No modules have been selected').'

'; + ui_print_success_message(__('Error').': '.__('No modules have been selected')); return; } @@ -58,7 +58,9 @@ if ((isset ($_GET["operacion"])) && (!isset ($_POST["update_agent"]))) { db_process_sql ($sql); } } //if copy modules or alerts - echo '

'.__('Filtering completed').'

'; + + echo '

'; + ui_print_success_message(__('Filtering completed')); } echo ''; echo ""; diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php index fc0e36b9f9..4b1c0026c8 100644 --- a/pandora_console/godmode/groups/configure_group.php +++ b/pandora_console/godmode/groups/configure_group.php @@ -63,7 +63,7 @@ if ($id_group) { $other = $group["other"]; } else { - echo "

".__('There was a problem loading group')."

"; + ui_print_error_message(__('There was a problem loading group')); echo "
"; echo '
'; echo '
 
'; diff --git a/pandora_console/godmode/groups/configure_modu_group.php b/pandora_console/godmode/groups/configure_modu_group.php index 5f920fa352..5a70111a09 100644 --- a/pandora_console/godmode/groups/configure_modu_group.php +++ b/pandora_console/godmode/groups/configure_modu_group.php @@ -44,7 +44,7 @@ if ($id_group) { $name = $group["name"]; } else { - echo "

".__('There was a problem loading group')."

"; + ui_print_error_message(__('There was a problem loading group')); echo ""; echo ''; echo '
 
'; diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index 6ab6deb252..d7538792db 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -156,19 +156,19 @@ if ($create_group) { $result = db_process_sql_insert('tgrupo', $values); if ($result) { - echo "

".__('Group successfully created')."

"; + ui_print_success_message(__('Group successfully created')); } else { - echo "

".__('There was a problem creating group')."

"; + ui_print_error_message(__('There was a problem creating group')); } } else { - echo "

".__('Each group must have a different name')."

"; + ui_print_error_message(__('Each group must have a different name')); } } else { //$result = false; - echo "

".__('Group must have a name')."

"; + ui_print_error_message(__('Group must have a name')); } } @@ -211,10 +211,10 @@ if ($update_group) { } if ($result !== false) { - echo "

".__('Group successfully updated')."

"; + ui_print_success_message(__('Group successfully updated')); } else { - echo "

".__('There was a problem modifying group')."

"; + ui_print_error_message(__('There was a problem modifying group')); } } @@ -235,15 +235,14 @@ if ($delete_group) { $result = db_process_sql_delete('tgrupo', array('id_grupo' => $id_group)); } else { - echo "

" . - sprintf(__('The group is not empty. It is use in %s.'), implode(', ', $usedGroup['tables'])) . "

"; + ui_print_error_message(sprintf(__('The group is not empty. It is use in %s.'), implode(', ', $usedGroup['tables']))); } if ($result && (!$usedGroup['return'])) { - echo "

".__('Group successfully deleted')."

"; + ui_print_success_message(__('Group successfully deleted')); } else { - echo "

".__('There was a problem deleting group')."

"; + ui_print_error_message(__('There was a problem deleting group')); } } db_clean_cache(); diff --git a/pandora_console/godmode/massive/massive_add_alerts.php b/pandora_console/godmode/massive/massive_add_alerts.php index 3cdc61012d..f1b2a694e4 100644 --- a/pandora_console/godmode/massive/massive_add_alerts.php +++ b/pandora_console/godmode/massive/massive_add_alerts.php @@ -46,12 +46,12 @@ if (is_ajax ()) { function process_manage_add ($id_alert_template, $id_agents, $module_names) { if (empty ($id_agents) || $id_agents[0] == 0) { - echo '

'.__('No agents selected').'

'; + ui_print_error_message(__('No agents selected')); return false; } if (empty ($id_alert_template)) { - echo '

'.__('No alert selected').'

'; + ui_print_error_message(__('No alert selected')); return false; } @@ -155,6 +155,7 @@ html_print_submit_button (__('Add'), 'go', false, 'class="sub add"'); echo ''; echo ''; +// TODO: Change to iu_print_error system echo ''; //Hack to translate text "none" in PHP to javascript diff --git a/pandora_console/godmode/massive/massive_delete_profiles.php b/pandora_console/godmode/massive/massive_delete_profiles.php index d344c3b103..1a0b743c24 100644 --- a/pandora_console/godmode/massive/massive_delete_profiles.php +++ b/pandora_console/godmode/massive/massive_delete_profiles.php @@ -58,7 +58,7 @@ if ($delete_profiles) { foreach ($groups_id as $group) { foreach ($users_id as $id_up) { if ($id_up == 0) { - echo '

'.__('Not deleted. You must select an existing user').'

'; + ui_print_error_message(__('Not deleted. You must select an existing user')); $result=""; } else { @@ -135,6 +135,7 @@ echo ''; unset ($table); +// TODO: Change to iu_print_error system echo ''; ui_require_jquery_file ('form'); diff --git a/pandora_console/godmode/modules/module_list.php b/pandora_console/godmode/modules/module_list.php index 216b2da9e8..07c5da3049 100644 --- a/pandora_console/godmode/modules/module_list.php +++ b/pandora_console/godmode/modules/module_list.php @@ -47,9 +47,9 @@ if ($update_module) { $result = db_process_sql_update('ttipo_modulo', $values, array('id_tipo' => $id_type)); if (! $result) - echo "

".__('Problem modifying module')."

"; + ui_print_error_message(__('Problem modifying module')); else - echo "

".__('Module updated successfully')."

"; + ui_print_success_message(__('Module updated successfully')); } diff --git a/pandora_console/godmode/reporting/graphs.php b/pandora_console/godmode/reporting/graphs.php index 4719a737a6..1f7404222a 100644 --- a/pandora_console/godmode/reporting/graphs.php +++ b/pandora_console/godmode/reporting/graphs.php @@ -76,19 +76,19 @@ if ($delete_graph) { $result = db_process_sql_delete("tgraph_source", array('id_graph' =>$id)); if ($result) - $result = "

".__('Successfully deleted')."

"; + $result = ui_print_success_message(__('Successfully deleted')); else - $result = "

".__('Not deleted. Error deleting data')."

"; + $result = ui_print_error_message(__('Not deleted. Error deleting data')); $result = db_process_sql_delete("tgraph", array('id_graph' =>$id)); if ($result) { db_pandora_audit("Report management", "Delete graph #$id"); - $result = "

".__('Successfully deleted')."

"; + $result = ui_print_success_message(__('Successfully deleted')); } else { db_pandora_audit("Report management", "Fail try to delete graph #$id"); - $result = "

".__('Not deleted. Error deleting data')."

"; + $result = ui_print_error_message(__('Not deleted. Error deleting data')); } echo $result; diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index 640619f3ec..49ebd19862 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -36,12 +36,12 @@ if ($delete_layout) { $result = db_process_sql_delete ('tlayout', array ('id' => $id_layout)); if ($result) { db_pandora_audit( "Visual console builder", "Delete visual console #$id_layout"); - echo '

'.__('Successfully deleted').'

'; + ui_print_success_message(__('Successfully deleted')); db_clean_cache(); } else { db_pandora_audit( "Visual console builder", "Fail try to delete visual console #$id_layout"); - echo '

'.__('Not deleted. Error deleting data').'

'; + ui_print_error_message(__('Not deleted. Error deleting data')); } $id_layout = 0; } @@ -118,21 +118,21 @@ if ($copy_layout) { } - echo '

'.__('Successfully copied').'

'; + ui_print_success_message(__('Successfully copied')); db_clean_cache(); } else { - echo '

'.__('Not copied. Error copying data').'

'; + ui_print_error_message(__('Not copied. Error copying data')); } } else{ // If the array is empty the copy is completed - echo '

'.__('Successfully copied').'

'; + ui_print_success_message(__('Successfully copied')); db_clean_cache(); } } else { - echo '

'.__('Not copied. Error copying data').'

'; + ui_print_error_message(__('Not copied. Error copying data')); } } diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php index 2fd917ce0c..76f7556709 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.php +++ b/pandora_console/godmode/reporting/visual_console_builder.php @@ -87,11 +87,11 @@ switch ($activeTab) { if ($result !== false && $values['background']) { db_pandora_audit( "Visual console builder", "Update visual console #$idVisualConsole"); $action = 'edit'; - $statusProcessInDB = array('flag' => true, 'message' => '

'.__('Successfully update.').'

'); + $statusProcessInDB = array('flag' => true, 'message' => ui_print_success_message(__('Successfully update.'), '', true)); } else { db_pandora_audit( "Visual console builder", "Fail update visual console #$idVisualConsole"); - $statusProcessInDB = array('flag' => false, 'message' => '

'.__('Could not be update.').'

'); + $statusProcessInDB = array('flag' => false, 'message' => ui_print_error_message(__('Could not be update.'), '', true)); } break; @@ -104,11 +104,11 @@ switch ($activeTab) { if ($idVisualConsole !== false) { db_pandora_audit( "Visual console builder", "Create visual console #$idVisualConsole"); $action = 'edit'; - $statusProcessInDB = array('flag' => true, 'message' => '

'.__('Successfully created.').'

'); + $statusProcessInDB = array('flag' => true, 'message' => ui_print_success_message(__('Successfully created.'), '', true)); } else { db_pandora_audit( "Visual console builder", "Fail try to create visual console"); - $statusProcessInDB = array('flag' => false, 'message' => '

'.__('Could not be created.').'

'); + $statusProcessInDB = array('flag' => false, 'message' => ui_print_error_message(__('Could not be created.'), '', true)); } break; } @@ -199,7 +199,7 @@ switch ($activeTab) { $id_element = get_parameter('id_element'); $result = db_process_sql_delete('tlayout_data', array('id' => $id_element)); if ($result !== false) { - $statusProcessInDB = array('flag' => true, 'message' => '

'.__('Successfully delete.').'

'); + $statusProcessInDB = array('flag' => true, 'message' => ui_print_success_message(__('Successfully delete.'), '', true)); } break; } @@ -441,7 +441,7 @@ if ($action == 'new' || $idVisualConsole === false) { $buttons[$activeTab]['active'] = true; if (!defined('METACONSOLE')) { - ui_print_page_header(__('Visual console') . " » " . $visualConsoleName, "images/op_reporting.png", false, "visual_console_editor_" . $activeTab . "_tab", false, $buttons); + ui_print_page_header($visualConsoleName, "images/visual_console.png", false, "visual_console_editor_" . $activeTab . "_tab", false, $buttons); } //The source code for PAINT THE PAGE diff --git a/pandora_console/godmode/servers/manage_recontask.php b/pandora_console/godmode/servers/manage_recontask.php index f6c625c8f6..3c4a45dffe 100644 --- a/pandora_console/godmode/servers/manage_recontask.php +++ b/pandora_console/godmode/servers/manage_recontask.php @@ -40,10 +40,10 @@ if (isset ($_GET["delete"])) { $result = db_process_sql_delete('trecon_task', array('id_rt' => $id)); if ($result !== false) { - echo '

'.__('Successfully deleted recon task').'

'; + ui_print_success_message(__('Successfully deleted recon task')); } else { - echo '

'.__('Error deleting recon task').'

'; + ui_print_error_message(__('Error deleting recon task')); } } else if(isset($_GET["disabled"])) { @@ -53,14 +53,14 @@ else if(isset($_GET["disabled"])) { $result = db_process_sql_update('trecon_task', array('disabled' => $disabled), array('id_rt' => $id)); if ($result !== false) { - echo '

'.__('Successfully updated recon task').'

'; + ui_print_success_message(__('Successfully updated recon task')); // If the action is enabled, we force recon_task to be queued asap if($disabled == 0) { servers_force_recon_task($id); } } else { - echo '

'.__('Error updating recon task').'

'; + ui_print_error_message(__('Error updating recon task')); } } @@ -143,10 +143,10 @@ if (isset($_GET["update"])) { $result = false; if ($result !== false) { - echo '

'.__('Successfully updated recon task').'

'; + ui_print_success_message(__('Successfully updated recon task')); } else { - echo '

'.__('Error updating recon task').'

'; + ui_print_error_message(__('Error updating recon task')); echo $reason; } } @@ -198,10 +198,10 @@ if (isset($_GET["create"])) { $result = false; if ($result !== false) { - echo '

'.__('Successfully created recon task').'

'; + ui_print_success_message(__('Successfully created recon task')); } else { - echo '

'.__('Error creating recon task').'

'; + ui_print_error_message(__('Error creating recon task')); echo $reason; } } diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index 0b57a76cc1..3206126a3f 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -86,10 +86,10 @@ else { $result = db_process_sql_delete('tserver', array('id_server' => $id_server)); if ($result !== false) { - echo '

'.__('Server deleted successfully').'

'; + ui_print_success_message(__('Server deleted successfully')); } else { - echo '

'.__('There was a problem deleting the server').'

'; + ui_print_error_message(__('There was a problem deleting the server')); } } elseif (isset($_GET["update"])) { @@ -100,10 +100,10 @@ else { $values = array('ip_address' => $address, 'description' => $description); $result = db_process_sql_update('tserver', $values, array('id_server' => $id_server)); if ($result !== false) { - echo '

'.__('Server updated successfully').'

'; + ui_print_success_message(__('Server updated successfully')); } else { - echo '

'.__('There was a problem updating the server').'

'; + ui_print_error_message(__('There was a problem updating the server')); } } diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php index 91dd2848c8..bac3f086d1 100644 --- a/pandora_console/godmode/servers/plugin.php +++ b/pandora_console/godmode/servers/plugin.php @@ -351,10 +351,10 @@ else { $result = db_process_sql_update('tplugin', $values, array('id' => $plugin_id)); if (! $result) { - echo "

".__('Problem updating plugin')."

"; + ui_print_error_message(__('Problem updating plugin')); } else { - echo "

".__('Plugin updated successfully')."

"; + ui_print_success_message(__('Plugin updated successfully')); } } @@ -405,12 +405,10 @@ else { $result = db_process_sql_insert('tplugin', $values); if (! $result) { - echo "

" . - __('Problem creating plugin') . "

"; + ui_print_error_message(__('Problem creating plugin')); } else { - echo "

" . - __('Plugin created successfully') . "

"; + ui_print_success_message(__('Plugin created successfully')); } } @@ -420,10 +418,10 @@ else { $result = db_process_sql_delete('tplugin', array('id' => $plugin_id)); if (! $result) { - echo "

".__('Problem deleting plugin')."

"; + ui_print_error_message(__('Problem deleting plugin')); } else { - echo "

".__('Plugin deleted successfully')."

"; + ui_print_success_message(__('Plugin deleted successfully')); } if ($plugin_id != 0) { // Delete all the modules with this plugin diff --git a/pandora_console/godmode/servers/recon_script.php b/pandora_console/godmode/servers/recon_script.php index 691655b7b8..f2376ea4e1 100644 --- a/pandora_console/godmode/servers/recon_script.php +++ b/pandora_console/godmode/servers/recon_script.php @@ -126,10 +126,10 @@ else { if ($reconscript_name != '' && $reconscript_script != '') $result = db_process_sql ($sql_update); if (! $result) { - echo "

" . __('Problem updating') . "

"; + ui_print_error_message(__('Problem updating')); } else { - echo "

" . __('Updated successfully') . "

"; + ui_print_success_message(__('Updated successfully')); } } @@ -147,10 +147,10 @@ else { if ($values['name'] != '' && $values['script'] != '') $result = db_process_sql_insert('trecon_script', $values); if (! $result) { - echo "

" . __('Problem creating') . "

"; + ui_print_error_message(__('Problem creating')); } else { - echo "

" . __('Created successfully') . "

"; + ui_print_success_message(__('Created successfully')); } } @@ -161,10 +161,10 @@ else { array('id_recon_script' => $reconscript_id)); if (! $result) { - echo "

" . __('Problem deleting reconscript') . "

"; + ui_print_error_message(__('Problem deleting reconscript')); } else { - echo "

" . __('reconscript deleted successfully') . "

"; + ui_print_success_message(__('reconscript deleted successfully')); } if ($reconscript_id != 0){ $result = db_process_sql_delete('trecon_task', diff --git a/pandora_console/godmode/setup/gis.php b/pandora_console/godmode/setup/gis.php index c5716b2cd9..0982db3de1 100755 --- a/pandora_console/godmode/setup/gis.php +++ b/pandora_console/godmode/setup/gis.php @@ -36,15 +36,15 @@ $action = get_parameter('action'); switch ($action) { case 'save_edit_map_connection': if(!$errorfill) - echo '

'.__('Successfully updated').'

'; + ui_print_success_message(__('Successfully updated')); else - echo '

'.__('Could not be updated').'

'; + ui_print_error_message(__('Could not be updated')); break; case 'save_map_connection': if(!$errorfill) - echo '

'.__('Successfully created').'

'; + ui_print_success_message(__('Successfully created')); else - echo '

'.__('Could not be created').'

'; + ui_print_error_message(__('Could not be created')); break; case 'delete_connection': $idConnectionMap = get_parameter('id_connection_map'); @@ -52,9 +52,9 @@ switch ($action) { $result = gis_delete_map_connection($idConnectionMap); if($result === false) - echo '

'.__('Could not be deleted').'

'; + ui_print_error_message(__('Could not be deleted')); else - echo '

'.__('Successfully deleted').'

'; + ui_print_success_message(__('Successfully deleted')); break; } diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php index 9faf287d36..7527eecdfb 100644 --- a/pandora_console/godmode/setup/links.php +++ b/pandora_console/godmode/setup/links.php @@ -36,9 +36,9 @@ if (isset($_POST["create"])) { // If create $result = db_process_sql_insert("tlink", array('name' => $name, 'link' => $link)); if (! $result) - echo "

".__('There was a problem creating link')."

"; + ui_print_error_message(__('There was a problem creating link')); else { - echo "

".__('Successfully created')."

"; + ui_print_success_message(__('Successfully created')); $id_link = $result; } } @@ -53,9 +53,9 @@ if (isset($_POST["update"])) { // if update $result = db_process_sql_update("tlink", array('name' => $name, 'link' => $link), array('id_link' => $id_link)); if (! $result) - echo "

".__('There was a problem modifying link')."

"; + ui_print_error_message(__('There was a problem modifying link')); else - echo "

".__('Successfully updated')."

"; + ui_print_success_message(__('Successfully updated')); } if (isset($_GET["borrar"])) { // if delete @@ -64,9 +64,9 @@ if (isset($_GET["borrar"])) { // if delete $result = db_process_sql_delete("tlink", array("id_link" => $id_link)); if (! $result) - echo "

".__('There was a problem deleting link')."

"; + ui_print_error_message(__('There was a problem deleting link')); else - echo "

".__('Successfully deleted')."

"; + ui_print_success_message(__('Successfully deleted')); } @@ -82,7 +82,9 @@ if ((isset($_GET["form_add"])) or (isset($_GET["form_edit"]))) { $nombre = $row["name"]; $link = $row["link"]; } - else echo "

".__('Name error')."

"; + else { + ui_print_error_message(__('Name error')); + } } else { // form_add $creation_mode =1; diff --git a/pandora_console/godmode/setup/news.php b/pandora_console/godmode/setup/news.php index b8af39bad8..25920966ee 100644 --- a/pandora_console/godmode/setup/news.php +++ b/pandora_console/godmode/setup/news.php @@ -87,7 +87,7 @@ if ((isset ($_GET["form_add"])) || (isset ($_GET["form_edit"]))) { $timestamp = $result["timestamp"]; } else { - echo "

".__('Name error')."

"; + ui_print_error_message(__('Name error')); } } else { // form_add diff --git a/pandora_console/godmode/tag/edit_tag.php b/pandora_console/godmode/tag/edit_tag.php index 2e8e358d60..5d1f69252f 100644 --- a/pandora_console/godmode/tag/edit_tag.php +++ b/pandora_console/godmode/tag/edit_tag.php @@ -80,11 +80,11 @@ if ($update_tag && $id_tag != 0) { if ($result === false) { db_pandora_audit("Tag management", "Fail try to update tag #$id_tag"); - echo '

'.__('Error updating tag').'

'; + ui_print_error_message(__('Error updating tag')); } else { db_pandora_audit("Tag management", "Update tag #$id_tag"); - echo '

'.__('Successfully updated tag').'

'; + ui_print_success_message(__('Successfully updated tag')); } } @@ -109,13 +109,13 @@ if ($create_tag) { if ($return_create === false) { db_pandora_audit("Tag management", "Fail try to create tag"); - echo '

'.__('Error creating tag').'

'; + ui_print_error_message(__('Error creating tag')); $action = "new"; // If create action ends successfully then current action is update } else { db_pandora_audit("Tag management", "Create tag #$return_create"); - echo '

'.__('Successfully created tag').'

'; + ui_print_success_message(__('Successfully created tag')); $id_tag = $return_create; $action = "update"; } diff --git a/pandora_console/godmode/tag/tag.php b/pandora_console/godmode/tag/tag.php index a8293ea692..4f3be23535 100644 --- a/pandora_console/godmode/tag/tag.php +++ b/pandora_console/godmode/tag/tag.php @@ -92,11 +92,11 @@ if ($delete != 0) { if ($return_delete === false) { db_pandora_audit("Tag management", "Fail try to delete tag #$delete"); - echo '

'.__('Error deleting tag').'

'; + ui_print_error_message(__('Error deleting tag')); } else { db_pandora_audit("Tag management", "Delete tag #$delete"); - echo '

'.__('Successfully deleted tag').'

'; + ui_print_success_message(__('Successfully deleted tag')); } } diff --git a/pandora_console/godmode/users/configure_profile.php b/pandora_console/godmode/users/configure_profile.php index c3d17e743e..38b79f228d 100644 --- a/pandora_console/godmode/users/configure_profile.php +++ b/pandora_console/godmode/users/configure_profile.php @@ -88,7 +88,7 @@ if ($id_profile || $new_profile) { $profile = db_get_row ('tperfil', 'id_perfil', $id_profile); if ($profile === false) { - echo '

'.__('There was a problem loading profile').'

'; + ui_print_error_message(__('There was a problem loading profile')) . ''; echo ''; echo '
 
'; echo ''; diff --git a/pandora_console/images/camera_mc.png b/pandora_console/images/camera_mc.png index 60ff258b94..2d9db652e6 100755 Binary files a/pandora_console/images/camera_mc.png and b/pandora_console/images/camera_mc.png differ diff --git a/pandora_console/images/cancel.png b/pandora_console/images/cancel.png deleted file mode 100644 index 33c876b23a..0000000000 Binary files a/pandora_console/images/cancel.png and /dev/null differ diff --git a/pandora_console/images/chart_curve_threshold.png b/pandora_console/images/chart_curve_threshold.png index b018dc6b6a..9cc53bad0b 100644 Binary files a/pandora_console/images/chart_curve_threshold.png and b/pandora_console/images/chart_curve_threshold.png differ diff --git a/pandora_console/images/collapse.png b/pandora_console/images/collapse.png new file mode 100644 index 0000000000..9e40be5038 Binary files /dev/null and b/pandora_console/images/collapse.png differ diff --git a/pandora_console/images/config_mc.png b/pandora_console/images/config_mc.png new file mode 100644 index 0000000000..0b6d58f96f Binary files /dev/null and b/pandora_console/images/config_mc.png differ diff --git a/pandora_console/images/cross_double.png b/pandora_console/images/cross_double.png index 72c50fbd85..593057841c 100644 Binary files a/pandora_console/images/cross_double.png and b/pandora_console/images/cross_double.png differ diff --git a/pandora_console/images/down.png b/pandora_console/images/down.png index 691f6e0c7c..5eaef82dc1 100644 Binary files a/pandora_console/images/down.png and b/pandora_console/images/down.png differ diff --git a/pandora_console/images/expand.png b/pandora_console/images/expand.png new file mode 100644 index 0000000000..3e537a47dc Binary files /dev/null and b/pandora_console/images/expand.png differ diff --git a/pandora_console/images/gis_map/icons/circle.bad.png b/pandora_console/images/gis_map/icons/circle.bad.png index 778431ca17..667ec61f79 100644 Binary files a/pandora_console/images/gis_map/icons/circle.bad.png and b/pandora_console/images/gis_map/icons/circle.bad.png differ diff --git a/pandora_console/images/gis_map/icons/circle.default.png b/pandora_console/images/gis_map/icons/circle.default.png index b4519310d5..f6f313bdcd 100644 Binary files a/pandora_console/images/gis_map/icons/circle.default.png and b/pandora_console/images/gis_map/icons/circle.default.png differ diff --git a/pandora_console/images/gis_map/icons/circle.ok.png b/pandora_console/images/gis_map/icons/circle.ok.png index b1c75077db..18c1a93fc2 100644 Binary files a/pandora_console/images/gis_map/icons/circle.ok.png and b/pandora_console/images/gis_map/icons/circle.ok.png differ diff --git a/pandora_console/images/gis_map/icons/circle.warning.png b/pandora_console/images/gis_map/icons/circle.warning.png index d54bba260b..d693acd7e2 100644 Binary files a/pandora_console/images/gis_map/icons/circle.warning.png and b/pandora_console/images/gis_map/icons/circle.warning.png differ diff --git a/pandora_console/images/gis_map/icons/cross.bad.png b/pandora_console/images/gis_map/icons/cross.bad.png index c6aabf3694..3dee50c369 100644 Binary files a/pandora_console/images/gis_map/icons/cross.bad.png and b/pandora_console/images/gis_map/icons/cross.bad.png differ diff --git a/pandora_console/images/gis_map/icons/cross.default.png b/pandora_console/images/gis_map/icons/cross.default.png index dc5337447b..fbfcc7f076 100644 Binary files a/pandora_console/images/gis_map/icons/cross.default.png and b/pandora_console/images/gis_map/icons/cross.default.png differ diff --git a/pandora_console/images/gis_map/icons/cross.ok.png b/pandora_console/images/gis_map/icons/cross.ok.png index c3c3e0615e..3e28a8ac83 100644 Binary files a/pandora_console/images/gis_map/icons/cross.ok.png and b/pandora_console/images/gis_map/icons/cross.ok.png differ diff --git a/pandora_console/images/gis_map/icons/cross.warning.png b/pandora_console/images/gis_map/icons/cross.warning.png index b91475efdc..ebc6f3a0d0 100644 Binary files a/pandora_console/images/gis_map/icons/cross.warning.png and b/pandora_console/images/gis_map/icons/cross.warning.png differ diff --git a/pandora_console/images/gis_map/icons/marker.bad.png b/pandora_console/images/gis_map/icons/marker.bad.png index 96a3422cd9..c2af1c6bd9 100644 Binary files a/pandora_console/images/gis_map/icons/marker.bad.png and b/pandora_console/images/gis_map/icons/marker.bad.png differ diff --git a/pandora_console/images/gis_map/icons/marker.default.png b/pandora_console/images/gis_map/icons/marker.default.png index 36480858af..b8d2946e2a 100644 Binary files a/pandora_console/images/gis_map/icons/marker.default.png and b/pandora_console/images/gis_map/icons/marker.default.png differ diff --git a/pandora_console/images/gis_map/icons/marker.ok.png b/pandora_console/images/gis_map/icons/marker.ok.png index 536bcf5a78..16dd844116 100644 Binary files a/pandora_console/images/gis_map/icons/marker.ok.png and b/pandora_console/images/gis_map/icons/marker.ok.png differ diff --git a/pandora_console/images/gis_map/icons/marker.warning.png b/pandora_console/images/gis_map/icons/marker.warning.png index 37710cf833..7ad6053c10 100644 Binary files a/pandora_console/images/gis_map/icons/marker.warning.png and b/pandora_console/images/gis_map/icons/marker.warning.png differ diff --git a/pandora_console/images/gis_map/icons/square_marker.bad.png b/pandora_console/images/gis_map/icons/square_marker.bad.png index 1a60089180..be3775e6e3 100644 Binary files a/pandora_console/images/gis_map/icons/square_marker.bad.png and b/pandora_console/images/gis_map/icons/square_marker.bad.png differ diff --git a/pandora_console/images/gis_map/icons/square_marker.default.png b/pandora_console/images/gis_map/icons/square_marker.default.png index 73c78d1908..edfa14b61a 100644 Binary files a/pandora_console/images/gis_map/icons/square_marker.default.png and b/pandora_console/images/gis_map/icons/square_marker.default.png differ diff --git a/pandora_console/images/gis_map/icons/square_marker.ok.png b/pandora_console/images/gis_map/icons/square_marker.ok.png index 81b6491fbc..4286eb9e30 100644 Binary files a/pandora_console/images/gis_map/icons/square_marker.ok.png and b/pandora_console/images/gis_map/icons/square_marker.ok.png differ diff --git a/pandora_console/images/gis_map/icons/square_marker.warning.png b/pandora_console/images/gis_map/icons/square_marker.warning.png index 58416f4610..194bfc0c4d 100644 Binary files a/pandora_console/images/gis_map/icons/square_marker.warning.png and b/pandora_console/images/gis_map/icons/square_marker.warning.png differ diff --git a/pandora_console/images/gis_map/icons/star.bad.png b/pandora_console/images/gis_map/icons/star.bad.png index 084092bd79..869ee25574 100644 Binary files a/pandora_console/images/gis_map/icons/star.bad.png and b/pandora_console/images/gis_map/icons/star.bad.png differ diff --git a/pandora_console/images/gis_map/icons/star.default.png b/pandora_console/images/gis_map/icons/star.default.png index f750a292e3..198f7529d3 100644 Binary files a/pandora_console/images/gis_map/icons/star.default.png and b/pandora_console/images/gis_map/icons/star.default.png differ diff --git a/pandora_console/images/gis_map/icons/star.ok.png b/pandora_console/images/gis_map/icons/star.ok.png index cef94e8be6..54454159b2 100644 Binary files a/pandora_console/images/gis_map/icons/star.ok.png and b/pandora_console/images/gis_map/icons/star.ok.png differ diff --git a/pandora_console/images/gis_map/icons/star.warning.png b/pandora_console/images/gis_map/icons/star.warning.png index 6854621700..e2c599ec46 100644 Binary files a/pandora_console/images/gis_map/icons/star.warning.png and b/pandora_console/images/gis_map/icons/star.warning.png differ diff --git a/pandora_console/images/gis_map/icons/triangle.bad.png b/pandora_console/images/gis_map/icons/triangle.bad.png index 4790f33fd9..10f282fc8b 100644 Binary files a/pandora_console/images/gis_map/icons/triangle.bad.png and b/pandora_console/images/gis_map/icons/triangle.bad.png differ diff --git a/pandora_console/images/gis_map/icons/triangle.default.png b/pandora_console/images/gis_map/icons/triangle.default.png index ddee3a453d..533b962fe3 100644 Binary files a/pandora_console/images/gis_map/icons/triangle.default.png and b/pandora_console/images/gis_map/icons/triangle.default.png differ diff --git a/pandora_console/images/gis_map/icons/triangle.ok.png b/pandora_console/images/gis_map/icons/triangle.ok.png index 37008b191b..3af63adf6b 100644 Binary files a/pandora_console/images/gis_map/icons/triangle.ok.png and b/pandora_console/images/gis_map/icons/triangle.ok.png differ diff --git a/pandora_console/images/gis_map/icons/triangle.warning.png b/pandora_console/images/gis_map/icons/triangle.warning.png index cc49039021..adee54beb3 100644 Binary files a/pandora_console/images/gis_map/icons/triangle.warning.png and b/pandora_console/images/gis_map/icons/triangle.warning.png differ diff --git a/pandora_console/images/go.png b/pandora_console/images/go.png index 8d204afeb0..206bc2e3bd 100644 Binary files a/pandora_console/images/go.png and b/pandora_console/images/go.png differ diff --git a/pandora_console/images/graphmenu_arrow.png b/pandora_console/images/graphmenu_arrow.png index f1054005f6..b4acdf302b 100644 Binary files a/pandora_console/images/graphmenu_arrow.png and b/pandora_console/images/graphmenu_arrow.png differ diff --git a/pandora_console/images/graphmenu_arrow_hide.png b/pandora_console/images/graphmenu_arrow_hide.png index 3b24937e6b..52312984d5 100644 Binary files a/pandora_console/images/graphmenu_arrow_hide.png and b/pandora_console/images/graphmenu_arrow_hide.png differ diff --git a/pandora_console/images/heart.png b/pandora_console/images/heart.png index 00b2578f3c..f7249d8705 100644 Binary files a/pandora_console/images/heart.png and b/pandora_console/images/heart.png differ diff --git a/pandora_console/images/op_inventory.png b/pandora_console/images/op_inventory.png index 52c379c967..91ef514618 100755 Binary files a/pandora_console/images/op_inventory.png and b/pandora_console/images/op_inventory.png differ diff --git a/pandora_console/images/os_icons/android.png b/pandora_console/images/os_icons/android.png index 9ef26c4ab8..07d620a20d 100644 Binary files a/pandora_console/images/os_icons/android.png and b/pandora_console/images/os_icons/android.png differ diff --git a/pandora_console/images/os_icons/embedded.png b/pandora_console/images/os_icons/embedded.png index f16c28f37f..b218ab191d 100644 Binary files a/pandora_console/images/os_icons/embedded.png and b/pandora_console/images/os_icons/embedded.png differ diff --git a/pandora_console/images/os_icons/network.png b/pandora_console/images/os_icons/network.png index 09c160ec86..a7392bda2c 100755 Binary files a/pandora_console/images/os_icons/network.png and b/pandora_console/images/os_icons/network.png differ diff --git a/pandora_console/images/os_icons/so_aix.png b/pandora_console/images/os_icons/so_aix.png index df8a1ad08d..1a886fc637 100755 Binary files a/pandora_console/images/os_icons/so_aix.png and b/pandora_console/images/os_icons/so_aix.png differ diff --git a/pandora_console/images/os_icons/so_bsd.png b/pandora_console/images/os_icons/so_bsd.png index e8cec55c36..25fae404af 100755 Binary files a/pandora_console/images/os_icons/so_bsd.png and b/pandora_console/images/os_icons/so_bsd.png differ diff --git a/pandora_console/images/os_icons/so_cisco.png b/pandora_console/images/os_icons/so_cisco.png index 33c8ee482c..48b95cb90d 100755 Binary files a/pandora_console/images/os_icons/so_cisco.png and b/pandora_console/images/os_icons/so_cisco.png differ diff --git a/pandora_console/images/os_icons/so_hpux.png b/pandora_console/images/os_icons/so_hpux.png index 82609741b3..5c932c8b21 100755 Binary files a/pandora_console/images/os_icons/so_hpux.png and b/pandora_console/images/os_icons/so_hpux.png differ diff --git a/pandora_console/images/os_icons/so_linux.png b/pandora_console/images/os_icons/so_linux.png index 93946803a5..780b6ed45f 100755 Binary files a/pandora_console/images/os_icons/so_linux.png and b/pandora_console/images/os_icons/so_linux.png differ diff --git a/pandora_console/images/os_icons/so_mac.png b/pandora_console/images/os_icons/so_mac.png index 66b78bff8a..cee8666d51 100755 Binary files a/pandora_console/images/os_icons/so_mac.png and b/pandora_console/images/os_icons/so_mac.png differ diff --git a/pandora_console/images/os_icons/so_other.png b/pandora_console/images/os_icons/so_other.png index 3116067c83..cd5a995443 100755 Binary files a/pandora_console/images/os_icons/so_other.png and b/pandora_console/images/os_icons/so_other.png differ diff --git a/pandora_console/images/os_icons/so_vmware.png b/pandora_console/images/os_icons/so_vmware.png index 9cd49834c7..dcf159580c 100644 Binary files a/pandora_console/images/os_icons/so_vmware.png and b/pandora_console/images/os_icons/so_vmware.png differ diff --git a/pandora_console/images/os_icons/so_win.png b/pandora_console/images/os_icons/so_win.png index 654f82b812..cb62742172 100755 Binary files a/pandora_console/images/os_icons/so_win.png and b/pandora_console/images/os_icons/so_win.png differ diff --git a/pandora_console/images/people_1.png b/pandora_console/images/people_1.png index dff7714bbc..19ad0f4e6a 100755 Binary files a/pandora_console/images/people_1.png and b/pandora_console/images/people_1.png differ diff --git a/pandora_console/images/people_2.png b/pandora_console/images/people_2.png index ff8971af41..dd38b8d758 100755 Binary files a/pandora_console/images/people_2.png and b/pandora_console/images/people_2.png differ diff --git a/pandora_console/images/refresh_mc.png b/pandora_console/images/refresh_mc.png new file mode 100644 index 0000000000..da63bfe37a Binary files /dev/null and b/pandora_console/images/refresh_mc.png differ diff --git a/pandora_console/images/service.png b/pandora_console/images/service.png new file mode 100644 index 0000000000..6bae941ecd Binary files /dev/null and b/pandora_console/images/service.png differ diff --git a/pandora_console/images/status_sets/color_text/agent_down.png b/pandora_console/images/status_sets/color_text/agent_down.png index 31481cf8e2..8c7261cdcf 100755 Binary files a/pandora_console/images/status_sets/color_text/agent_down.png and b/pandora_console/images/status_sets/color_text/agent_down.png differ diff --git a/pandora_console/images/status_sets/color_text/agent_down_ball.png b/pandora_console/images/status_sets/color_text/agent_down_ball.png index f917726f31..15cbf3933c 100755 Binary files a/pandora_console/images/status_sets/color_text/agent_down_ball.png and b/pandora_console/images/status_sets/color_text/agent_down_ball.png differ diff --git a/pandora_console/images/status_sets/color_text/agent_no_monitors.png b/pandora_console/images/status_sets/color_text/agent_no_monitors.png index e3355c62df..16c533abbb 100755 Binary files a/pandora_console/images/status_sets/color_text/agent_no_monitors.png and b/pandora_console/images/status_sets/color_text/agent_no_monitors.png differ diff --git a/pandora_console/images/status_sets/color_text/agent_no_monitors_ball.png b/pandora_console/images/status_sets/color_text/agent_no_monitors_ball.png index 15cbf3933c..c43a779932 100644 Binary files a/pandora_console/images/status_sets/color_text/agent_no_monitors_ball.png and b/pandora_console/images/status_sets/color_text/agent_no_monitors_ball.png differ diff --git a/pandora_console/images/status_sets/default/agent_down.png b/pandora_console/images/status_sets/default/agent_down.png index 3e98c58f19..f0881fc8a9 100755 Binary files a/pandora_console/images/status_sets/default/agent_down.png and b/pandora_console/images/status_sets/default/agent_down.png differ diff --git a/pandora_console/images/status_sets/default/agent_down_ball.png b/pandora_console/images/status_sets/default/agent_down_ball.png index 89dca60f90..0b1a4efee8 100755 Binary files a/pandora_console/images/status_sets/default/agent_down_ball.png and b/pandora_console/images/status_sets/default/agent_down_ball.png differ diff --git a/pandora_console/images/status_sets/default/agent_no_monitors.png b/pandora_console/images/status_sets/default/agent_no_monitors.png index f0881fc8a9..1cca1058c8 100644 Binary files a/pandora_console/images/status_sets/default/agent_no_monitors.png and b/pandora_console/images/status_sets/default/agent_no_monitors.png differ diff --git a/pandora_console/images/status_sets/default/agent_no_monitors_ball.png b/pandora_console/images/status_sets/default/agent_no_monitors_ball.png index 0b1a4efee8..fa0f98195d 100644 Binary files a/pandora_console/images/status_sets/default/agent_no_monitors_ball.png and b/pandora_console/images/status_sets/default/agent_no_monitors_ball.png differ diff --git a/pandora_console/images/submenu_tree_first.png b/pandora_console/images/submenu_tree_first.png index 6a6c517af7..82b83455b7 100644 Binary files a/pandora_console/images/submenu_tree_first.png and b/pandora_console/images/submenu_tree_first.png differ diff --git a/pandora_console/images/submenu_tree_middle.png b/pandora_console/images/submenu_tree_middle.png index 54252d33f4..eab21fd71b 100644 Binary files a/pandora_console/images/submenu_tree_middle.png and b/pandora_console/images/submenu_tree_middle.png differ diff --git a/pandora_console/images/visual_console.png b/pandora_console/images/visual_console.png index d55197af0b..8d9470ef3f 100644 Binary files a/pandora_console/images/visual_console.png and b/pandora_console/images/visual_console.png differ diff --git a/pandora_console/images/vnc.png b/pandora_console/images/vnc.png index ad363682ff..e4d32af960 100644 Binary files a/pandora_console/images/vnc.png and b/pandora_console/images/vnc.png differ diff --git a/pandora_console/images/wand.png b/pandora_console/images/wand.png index c7e3dc5564..c566aebd79 100644 Binary files a/pandora_console/images/wand.png and b/pandora_console/images/wand.png differ diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index c770c48e76..eb117c9e59 100644 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -237,7 +237,7 @@ if ($get_module_detail) { } if (empty ($table->data)) { - echo '

'.__('No available data to show').'

'; + ui_print_error_message(__('No available data to show')); } else { ui_pagination($count, false, $offset); diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php index 03b28f0571..424d209286 100644 --- a/pandora_console/include/constants.php +++ b/pandora_console/include/constants.php @@ -209,6 +209,7 @@ define ('STATUS_AGENT_UNKNOWN', 'agent_unknown.png'); define ('STATUS_AGENT_OK', 'agent_ok.png'); define ('STATUS_AGENT_NO_DATA', 'agent_no_data.png'); define ('STATUS_AGENT_NO_MONITORS', 'agent_no_monitors.png'); +define ('STATUS_AGENT_NOT_INIT', 'agent_notinit.png'); //For alerts define ('STATUS_ALERT_FIRED', 'alert_fired.png'); define ('STATUS_ALERT_NOT_FIRED', 'alert_not_fired.png'); @@ -280,4 +281,4 @@ define ('REPORT_EXCEPTION_CONDITION_E', 7); define ('REPORT_EXCEPTION_CONDITION_NE', 8); define ('REPORT_EXCEPTION_CONDITION_OK', 3); define ('REPORT_EXCEPTION_CONDITION_NOT_OK', 4); -?> \ No newline at end of file +?> diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 7d36525617..30ec9a73a4 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -145,7 +145,7 @@ function safe_url_extraclean ($string, $default_string = '') { function no_permission () { require ("config.php"); - echo "

".__('You don\'t have access')."

"; + ui_print_error_message(__('You don\'t have access')); echo html_print_image('images/noaccess.png', true, array("alt" => 'No access', "width" => '120')) . "

"; echo ""; echo "
"; @@ -166,7 +166,7 @@ function no_permission () { function unmanaged_error ($error = "") { require_once ("config.php"); - echo "

".__('Unmanaged error')."

"; + ui_print_error_message(__('Unmanaged error')); echo html_print_image('images/error.png', true, array("alt" => 'error')) . "

"; echo ""; echo "
"; diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index ed37e520ef..529e16c3a2 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -454,12 +454,12 @@ function agents_process_manage_config ($source_id_agent, $destiny_id_agents, $co global $config; if (empty ($source_id_agent)) { - echo '

'.__('No source agent to copy').'

'; + ui_print_error_message(__('No source agent to copy')); return false; } if (empty ($destiny_id_agents)) { - echo '

'.__('No destiny agent(s) to copy').'

'; + ui_print_error_message(__('No destiny agent(s) to copy')); return false; } @@ -1996,7 +1996,11 @@ function agents_tree_view_alert_img ($alert_fired) { //Returns the status image to display tree view -function agents_tree_view_status_img ($critical, $warning, $unknown) { +function agents_tree_view_status_img ($critical, $warning, $unknown, $total, $notinit) { + if ($total == 0 || $total == $notinit) { + return ui_print_status_image (STATUS_AGENT_NO_MONITORS, + __('No Monitors'), true); + } if ($critical > 0) { return ui_print_status_image (STATUS_AGENT_CRITICAL, __('At least one module in CRITICAL status'), true); @@ -2016,8 +2020,12 @@ function agents_tree_view_status_img ($critical, $warning, $unknown) { //Returns the status image to display agent detail view -function agents_detail_view_status_img ($critical, $warning, $unknown) { - if ($critical > 0) { +function agents_detail_view_status_img ($critical, $warning, $unknown, $total, $notinit) { + if ($total == 0 || $total == $notinit) { + return ui_print_status_image (STATUS_AGENT_NOT_INIT, + __('No Monitors'), true, false, 'images'); + } + else if ($critical > 0) { return ui_print_status_image (STATUS_AGENT_CRITICAL, __('At least one module in CRITICAL status'), true, false, 'images'); } diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 681ba3884e..14d9490a7c 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -925,7 +925,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret } // Timestamp - $data[5] = ui_print_timestamp ($event["timestamp"], true, array('style' => 'font-size: 7px')); + $data[5] = ui_print_timestamp ($event["timestamp"], true, array('style' => 'font-size: 8px')); $class = get_priority_class ($event["criticity"]); $cell_classes[3] = $cell_classes[4] = $cell_classes[5] = $class; @@ -941,7 +941,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret if ($agent_id != 0) { $out .= '		'; $out .= '
'; - $out .= '
+ $out .= '
' . __('Events -by module-') . '' . @@ -951,12 +951,12 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret else { $out .= '
'; $out .= '
'; - $out .= '
+ $out .= '
' . __('Event graph') . '' . grafico_eventos_total("", 180, 60) . '
'; - $out .= '
+ $out .= '
' . __('Event graph by agent') . '' . diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php index 906dcb3c33..8f9fcd0067 100644 --- a/pandora_console/include/functions_filemanager.php +++ b/pandora_console/include/functions_filemanager.php @@ -312,7 +312,7 @@ if ($create_dir) { $testHash = md5($directory . $config['dbpass']); if ($hash != $testHash) { - echo "

".__('Security error.')."

"; + ui_print_error_message(__('Security error.')); } else { $dirname = (string) get_parameter ('dirname'); @@ -673,7 +673,7 @@ function filemanager_box_upload_file_complex($real_directory, $relative_director $table->data = array (); if (! filemanager_is_writable_dir ($real_directory)) { - echo "

".__('Current directory is not writable by HTTP Server')."

"; + ui_print_error_message(__('Current directory is not writable by HTTP Server')); echo '

'; echo __('Please check that current directory has write rights for HTTP server'); echo '

'; @@ -711,7 +711,7 @@ function filemanager_box_upload_file_explorer($real_directory, $relative_directo $table->data = array (); if (! filemanager_is_writable_dir ($real_directory)) { - echo "

".__('Current directory is not writable by HTTP Server')."

"; + ui_print_error_message(__('Current directory is not writable by HTTP Server')); echo '

'; echo __('Please check that current directory has write rights for HTTP server'); echo '

'; @@ -747,7 +747,7 @@ function filemanager_box_upload_zip_explorer($real_directory, $relative_director $table->data = array (); if (! filemanager_is_writable_dir ($real_directory)) { - echo "

".__('Current directory is not writable by HTTP Server')."

"; + ui_print_error_message(__('Current directory is not writable by HTTP Server')); echo '

'; echo __('Please check that current directory has write rights for HTTP server'); echo '

'; @@ -783,7 +783,7 @@ function filemanager_box_create_text_explorer($real_directory, $relative_directo $table->data = array (); if (! filemanager_is_writable_dir ($real_directory)) { - echo "

".__('Current directory is not writable by HTTP Server')."

"; + ui_print_error_message(__('Current directory is not writable by HTTP Server')); echo '

'; echo __('Please check that current directory has write rights for HTTP server'); echo '

'; diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index c8c04778e9..74b7af424a 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -1418,6 +1418,10 @@ function graph_agent_status ($id_agent = false, $width = 300, $height = 200, $re $colors[] = COL_NOTINIT; } + if (array_sum($data) == 0) { + $data = array(); + } + $out = pie2d_graph($config['flash_charts'], $data, $width, $height, __("other"), '', '', $config['fontpath'], $config['font_size'], 1, "hidden", $colors); @@ -3884,7 +3888,7 @@ function graph_nodata_image($width = 300, $height = 110, $type = 'area') { $image_div = '
' . $text_div . '
'; - $div = '
' . + $div = '
' . $image_div . '
'; return $div; diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 3b4d46600a..ce1c0496e1 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -171,7 +171,7 @@ function html_print_side_layer ($params) { $top = '
' . $params['top_text'] . '
'; - $button = '
'; + $button = '
'; $button .= html_print_image($params['position'] == 'left' ? $params['icon_open'] : $params['icon_closed'], true, array('id' => 'graph_menu_arrow')); $button .= '
'; @@ -636,18 +636,18 @@ function html_print_extended_select_for_time ($name, $selected = '', $script = ' ob_start(); echo ''; echo '
'; - echo ' '.html_print_image('images/default_list.png',true,array('class' => $uniq_name . '_toggler', 'alt' => __('List'), 'title' => __('List'), 'style' => 'width: 18px;')).''; html_print_input_text ($uniq_name . '_text', $selected, '', $size); html_print_input_hidden ($name, $selected, false, $uniq_name); html_print_select ($units, $uniq_name . '_units', 1, "" . $script, $nothing, $nothing_value, false, false, false, '', false, 'font-size: xx-small;'.$select_style); + echo ' '.html_print_image('images/default_list.png',true,array('class' => $uniq_name . '_toggler', 'alt' => __('List'), 'title' => __('List'), 'style' => 'width: 18px;')).''; echo '
'; echo "