diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 8e6c21594f..331f4f94b3 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,30 @@ +2013-06-06 Sergio Martin + + * include/ajax/events.php: Fix the info of the + user that validate a event in the event info that + is showed when click on a event on interactive graphs + + * include/gettext.php: Add a hack to fix the languages change + on certain machines, like TSOL one. + + * operation/events/events.build_table.php: Add a "access node" + control to column server name + + * operation/agentes/status_monitor.php + * general/header.php: Add disable possibility in autorefresh combo + + * godmode/agentes/module_manager_editor_network.php: Fix show/hide fields + in the module editor. TCP and SNMP fields were moved from advanced to main + options and javascript was broken + + * godmode/events/event_edit_filter.php + godmode/events/custom_events.php + godmode/events/event_filter.php: Fix some ACLs problems in events + filter editor + + * godmode/reporting/reporting_builder.item_editor.php: Add an absolute + path in a library inclusion to fix metaconsole bug + 2013-06-05 Miguel de Dios * include/constants.php, include/functions_agents.php, diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index a388c5d277..d94a86ebbb 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -113,6 +113,7 @@ config_check(); $ignored_params['refr'] = ''; $values = array ( + '0' => __('Disable'), '5' => __('5 seconds'), '10' => __('10 seconds'), '15' => __('15 seconds'), diff --git a/pandora_console/godmode/agentes/module_manager_editor_network.php b/pandora_console/godmode/agentes/module_manager_editor_network.php index 5d0077e0fe..69457b6d56 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_network.php +++ b/pandora_console/godmode/agentes/module_manager_editor_network.php @@ -55,8 +55,16 @@ $extra_title = __('Network server module'); $data = array (); $data[0] = __('Target IP'); $data[1] = html_print_input_text ('ip_target', $ip_target, '', 15, 60, true); -$data[2] = __('Port'); -$data[3] = html_print_input_text ('tcp_port', $tcp_port, '', 5, 20, true, $disabledBecauseInPolicy); + +// In ICMP modules, port is not configurable +if ($id_module_type >= 6 && $id_module_type <= 7) { + $data[2] = ''; + $data[3] = ''; +} +else { + $data[2] = __('Port'); + $data[3] = html_print_input_text ('tcp_port', $tcp_port, '', 5, 20, true, $disabledBecauseInPolicy); +} push_table_simple ($data, 'target_ip'); @@ -118,23 +126,18 @@ push_table_simple ($data, 'tcp_send'); $data[0] = __('TCP receive'); $data[1] = html_print_textarea ('tcp_rcv', 2, 65, $tcp_rcv, $disabledTextBecauseInPolicy, true); -$table_advanced->colspan['tcp_receive'][1] = 3; +$table_simple->colspan['tcp_receive'][1] = 3; push_table_simple ($data, 'tcp_receive'); -if ($id_module_type >= 15 && $id_module_type <= 18) { - /* SNMP */ - $table_advanced->rowstyle['tcp_send'] = 'display: none'; - $table_advanced->rowstyle['tcp_receive'] = 'display: none'; +if ($id_module_type < 8 || $id_module_type > 11) { + /* NOT TCP */ + $table_simple->rowstyle['tcp_send'] = 'display: none;'; + $table_simple->rowstyle['tcp_receive'] = 'display: none;'; } -elseif ($id_module_type >= 8 && $id_module_type <= 11) { - /* TCP or ICMP */ - $table_simple->rowstyle['snmp_1'] = 'display: none'; - $table_simple->rowstyle['snmp_2'] = 'display: none'; -} -elseif (empty ($update_module_id)) { - $table_advanced->rowstyle['tcp_send'] = 'display: none'; - $table_advanced->rowstyle['tcp_receive'] = 'display: none'; + +if ($id_module_type < 15 || $id_module_type > 18) { + /* NOT SNMP */ $table_simple->rowstyle['snmp_1'] = 'display: none'; $table_simple->rowstyle['snmp_2'] = 'display: none'; } diff --git a/pandora_console/godmode/events/custom_events.php b/pandora_console/godmode/events/custom_events.php index 1086e17b02..41c5bad097 100644 --- a/pandora_console/godmode/events/custom_events.php +++ b/pandora_console/godmode/events/custom_events.php @@ -18,9 +18,9 @@ global $config; check_login (); -if (! check_acl($config['id_user'], 0, "PM")) { +if (! check_acl($config['id_user'], 0, "EW")) { db_pandora_audit("ACL Violation", - "Trying to access Group Management"); + "Trying to access Custom events Management"); require ("general/noaccess.php"); return; } diff --git a/pandora_console/godmode/events/event_edit_filter.php b/pandora_console/godmode/events/event_edit_filter.php index 1597528716..606f8e0489 100644 --- a/pandora_console/godmode/events/event_edit_filter.php +++ b/pandora_console/godmode/events/event_edit_filter.php @@ -20,7 +20,7 @@ check_login (); if (! check_acl ($config["id_user"], 0, "EW")) { db_pandora_audit("ACL Violation", - "Trying to access event viewer"); + "Trying to access events filter editor"); require ("general/noaccess.php"); return; diff --git a/pandora_console/godmode/events/event_filter.php b/pandora_console/godmode/events/event_filter.php index 3e2b8b52e8..49659619b0 100644 --- a/pandora_console/godmode/events/event_filter.php +++ b/pandora_console/godmode/events/event_filter.php @@ -20,7 +20,7 @@ check_login (); if (! check_acl ($config["id_user"], 0, "EW")) { db_pandora_audit("ACL Violation", - "Trying to access event viewer"); + "Trying to access events filter editor"); require ("general/noaccess.php"); return; } diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 486f44bdad..05c5ed50d3 100644 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -13,7 +13,7 @@ // GNU General Public License for more details. global $config; -require_once ('include/functions_custom_graphs.php'); +require_once ($config['homedir'] . '/include/functions_custom_graphs.php'); // Login check check_login (); diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 4af7d3dd58..5d24ab62e1 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -404,7 +404,7 @@ if ($get_events_details) { $events = db_get_all_rows_filter ('tevento', array ('id_evento' => $event_ids, 'order' => 'utimestamp ASC'), - array ('evento', 'utimestamp', 'estado', 'criticity')); + array ('evento', 'utimestamp', 'estado', 'criticity', 'id_usuario')); $out = ''; $out .= ''; diff --git a/pandora_console/include/gettext.php b/pandora_console/include/gettext.php index 443316f21f..f5e5394b72 100644 --- a/pandora_console/include/gettext.php +++ b/pandora_console/include/gettext.php @@ -128,9 +128,9 @@ class gettext_reader { $magic = $this->readint(); if ($enabled64Bits) { - if ($magic == ($MAGIC1 & 0xFFFFFFFF)) { + if ($magic == ($MAGIC1 & 0xFFFFFFFF) || $magic == $MAGIC1) { $this->BYTEORDER = 0; - } elseif ($magic == ($MAGIC2 & 0xFFFFFFFF)) { + } elseif ($magic == ($MAGIC2 & 0xFFFFFFFF) || $magic == $MAGIC2) { $this->BYTEORDER = 1; } else { $this->error = 1; // not MO file diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 32d6fc14fa..ea9f7430d6 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -58,7 +58,7 @@ $refr = get_parameter('refr', 0); $sortField = get_parameter('sort_field'); $sort = get_parameter('sort', 'none'); -echo ''; +echo ''; enterprise_hook('open_meta_frame'); @@ -163,6 +163,10 @@ if ($tag_filter !== 0) { } } +if (defined('METACONSOLE')) { + $ag_group = groups_get_id($ag_group); +} + $sql_conditions_tags = tags_get_acl_tags($config['id_user'], $ag_group, 'AR', 'module_condition', 'AND', 'tagente_modulo'); // Two modes of filter. All the filters and only ACLs filter diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php index 90749b183c..771ec99215 100644 --- a/pandora_console/operation/events/events.build_table.php +++ b/pandora_console/operation/events/events.build_table.php @@ -235,7 +235,12 @@ foreach ($result as $event) { if (in_array('server_name',$show_fields)) { if ($meta) { - $data[$i] = "" . $event["server_name"] . ""; + if (can_user_access_node ()) { + $data[$i] = "" . $event["server_name"] . ""; + } + else { + $data[$i] = $event["server_name"]; + } } else { $data[$i] = db_get_value('name','tserver');