From c9d7920e6b68e01fa2f92ff0c0f19e0b924ecba4 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Tue, 30 Oct 2012 11:48:28 +0000 Subject: [PATCH] 2012-10-30 Sergio Martin * include/functions_events.php include/ajax/events.php include/functions_api.php godmode/alerts/alert_commands.php: Fix some event viewer bugs and command editor little aesthetic issues * pandoradb.sql pandoradb.postgreSQL.sql pandoradb.oracle.sql: Delete ttag_event table git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7113 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 13 ++++++++ .../godmode/alerts/alert_commands.php | 6 ++-- pandora_console/include/ajax/events.php | 12 ++----- pandora_console/include/functions_api.php | 2 +- pandora_console/include/functions_events.php | 31 ++++++------------- pandora_console/pandoradb.oracle.sql | 12 ------- pandora_console/pandoradb.postgreSQL.sql | 12 ------- pandora_console/pandoradb.sql | 11 ------- 8 files changed, 29 insertions(+), 70 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index a9c1453876..d7a7798f51 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,16 @@ +2012-10-30 Sergio Martin + + * include/functions_events.php + include/ajax/events.php + include/functions_api.php + godmode/alerts/alert_commands.php: Fix some + event viewer bugs and command editor little + aesthetic issues + + * pandoradb.sql + pandoradb.postgreSQL.sql + pandoradb.oracle.sql: Delete ttag_event table + 2012-10-30 Vanessa Gil * include/functions_reporting.php: Changed format of agent diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index c6eee0d70a..e27ca14910 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.php @@ -42,15 +42,15 @@ if (is_ajax ()) { // Get the html rows of the fields form // Descriptions are stored in json - $fields_descriptions = empty($command['fields_descriptions']) ? '' : json_decode($command['fields_descriptions'], true); + $fields_descriptions = empty($command['fields_descriptions']) ? '' : json_decode(io_safe_output($command['fields_descriptions']), true); // Fields values are stored in json - $fields_values = empty($command['fields_values']) ? '' : json_decode($command['fields_values'], true); + $fields_values = empty($command['fields_values']) ? '' : json_decode(io_safe_output($command['fields_values']), true); $fields_rows = array(); for($i=1;$i<=10;$i++) { if(!empty($fields_descriptions[$i-1])) { - $fdesc = $fields_descriptions[$i-1].' ('.sprintf(__('Field %s'), $i).')'; + $fdesc = $fields_descriptions[$i-1].'
'.sprintf(__('Field %s'), $i).''; } else { $fdesc = sprintf(__('Field %s'), $i); diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 5fd0bd5d57..f1d0140f57 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -151,9 +151,8 @@ if($dialogue_event_response) { if($add_comment) { $comment = get_parameter ('comment'); $event_id = get_parameter ('event_id'); - $similars = true; - - $return = events_comment_event ($event_id, $similars, $comment); + + $return = events_comment ($event_id, $comment); if ($return) echo 'comment_ok'; @@ -213,7 +212,6 @@ if($get_extended_event) { $similar_ids = get_parameter('similar_ids', $event_id); $group_rep = get_parameter('group_rep',false); $event_rep = get_parameter('event_rep',1); - $user_comment = base64_decode(get_parameter('user_comment',false)); $timestamp_first = get_parameter('timestamp_first', $event['utimestamp']); $timestamp_last = get_parameter('timestamp_last', $event['utimestamp']); @@ -221,11 +219,7 @@ if($get_extended_event) { $event['timestamp_first'] = $timestamp_first; $event['timestamp_last'] = $timestamp_last; $event['event_rep'] = $event_rep; - - if($user_comment !== false) { - $event['user_comment'] = $user_comment; - } - + // Check ACLs if (is_user_admin ($config["id_user"])) { //Do nothing if you're admin, you get full access diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index 895ab20b00..7cc24baa2b 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -5646,7 +5646,7 @@ function api_set_validate_event_by_id ($id, $trash1, $trash2, $returnType) { } else { $ack_utimestamp = time(); - events_comment_event($id, '', '', "Change status to validated"); + events_comment($id, '', "Change status to validated"); $values = array( 'ack_utimestamp' => $ack_utimestamp, diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 6b3456ca27..3238e73b50 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -242,7 +242,7 @@ function events_validate_event ($id_event, $similars = true, $new_status = 1) { break; } - events_comment_event($id_event, $similars, '', "Change status to $status_string"); + events_comment($id_event, '', "Change status to $status_string"); db_process_sql_begin (); @@ -426,7 +426,7 @@ function events_comment ($id_event, $comment = '', $action = 'Added comment') { // If the event hasn't owner, assign the user as owner events_change_owner ($id_event, $similars); - + // Give old ugly format to comment. TODO: Change this method for aux table or json $comment = str_replace(array("\r\n", "\r", "\n"), '
', $comment); @@ -437,16 +437,14 @@ function events_comment ($id_event, $comment = '', $action = 'Added comment') { $commentbox = ''; } - $comment = '-- '.$action.' by '.$config['id_user'].' '.'['.date ($config["date_format"]).'] --
'.$commentbox; + $comment = '-- ' . $action . ' by '.$config['id_user'].' '.'['.date ($config["date_format"]).'] --
'.$commentbox.'
'; // Update comment switch ($config['dbtype']) { // Oldstyle SQL to avoid innecesary PHP foreach case 'mysql': $sql_validation = "UPDATE tevento - SET estado = " . $new_status .", - id_usuario = '" . $config['id_user'] . "', - user_comment = concat(user_comment, '" . $comment . "') + SET user_comment = concat('" . $comment . "', user_comment) WHERE id_evento in (" . implode(',', $id_event) . ")"; $ret = db_process_sql($sql_validation); @@ -454,9 +452,7 @@ function events_comment ($id_event, $comment = '', $action = 'Added comment') { case 'postgresql': case 'oracle': $sql_validation = "UPDATE tevento - SET estado = " . $new_status . ", - id_usuario = '" . $config['id_user'] . "', - user_comment=user_comment || '" . $comment . "') + SET user_comment='" . $comment . "' || user_comment) WHERE id_evento in (" . implode(',', $id_event) . ")"; $ret = db_process_sql($sql_validation); @@ -1735,19 +1731,9 @@ function events_page_general ($event) { $data[0] = __('Tags'); if ($event["tags"] != '') { - $tag_array = explode(',', $event["tags"]); - $data[1] = ''; - foreach ($tag_array as $tag_element){ - $blank_char_pos = strpos($tag_element, ' '); - $tag_name = substr($tag_element, 0, $blank_char_pos); - $tag_url = substr($tag_element, $blank_char_pos + 1); - $data[1] .= ' ' .$tag_name; - if (!empty($tag_url)){ - $data[1] .= ' ' . html_print_image('images/lupa.png', true, array('title' => __('Click here to open a popup window with URL tag'))) . ' '; - } - $data[1] .= ','; - } - $data[1] = rtrim($table_general, ','); + $tags = str_replace(' ','',$event["tags"]); + $tags = str_replace(',',' , ',$tags); + $data[1] = $tags; } else { $data[1] = '' . __('N/A') . ''; @@ -1776,6 +1762,7 @@ function events_page_comments ($event) { // Split comments and put in table $col = 0; $data = array(); + foreach($comments_array as $c) { switch($col) { case 0: diff --git a/pandora_console/pandoradb.oracle.sql b/pandora_console/pandoradb.oracle.sql index 8c919ad250..46e4a0259a 100644 --- a/pandora_console/pandoradb.oracle.sql +++ b/pandora_console/pandoradb.oracle.sql @@ -1626,18 +1626,6 @@ CREATE TABLE ttag_policy_module ( CREATE INDEX ttag_poli_mod_id_pol_mo_idx ON ttag_policy_module(id_policy_module); --- ----------------------------------------------------- --- Table "ttag_event" --- ----------------------------------------------------- - -CREATE TABLE ttag_event ( - id_tag NUMBER(10, 0) NOT NULL, - id_evento NUMBER(19, 0) DEFAULT 0 NOT NULL, - PRIMARY KEY (id_tag, id_evento) -); - -CREATE INDEX ttag_event_id_evento_idx ON ttag_event(id_evento); - -- ----------------------------------------------------- -- Table "tnetflow_filter" -- ----------------------------------------------------- diff --git a/pandora_console/pandoradb.postgreSQL.sql b/pandora_console/pandoradb.postgreSQL.sql index 9671c475a7..85f633ab56 100644 --- a/pandora_console/pandoradb.postgreSQL.sql +++ b/pandora_console/pandoradb.postgreSQL.sql @@ -1378,18 +1378,6 @@ CREATE TABLE "ttag_policy_module" ( CREATE INDEX "ttag_poli_mod_id_pol_mo_idx" ON "ttag_policy_module"("id_policy_module"); --- ----------------------------------------------------- --- Table "ttag_event" --- ----------------------------------------------------- - -CREATE TABLE "ttag_event" ( - id_tag INTEGER NOT NULL, - id_evento BIGINT NOT NULL DEFAULT 0, - PRIMARY KEY (id_tag, id_evento) -); - -CREATE INDEX "ttag_event_id_evento_idx" ON "ttag_event"("id_evento"); - -- ----------------------------------------------------- -- Table `tnetflow_filter` -- ----------------------------------------------------- diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 869d4f5cf9..f411521933 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -1547,17 +1547,6 @@ CREATE TABLE IF NOT EXISTS `ttag_policy_module` ( KEY `idx_id_policy_module` (`id_policy_module`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- ----------------------------------------------------- --- Table `ttag_event` --- ----------------------------------------------------- - -CREATE TABLE IF NOT EXISTS `ttag_event` ( - `id_tag` int(10) NOT NULL, - `id_evento` bigint(20) NOT NULL DEFAULT 0, - PRIMARY KEY (id_tag, id_evento), - KEY `idx_id_evento` (`id_evento`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -- ----------------------------------------------------- -- Table `tnetflow_filter` -- -----------------------------------------------------