diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index fdde306cd1..e69f413722 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2012-09-19 Vanessa Gil + + * gomode/netflow/nf_item_list.php + godmode/netflow/nf_report_form.php + godmode/netflow/nf_report_item.php: Fixed bug adding items + to reports. + 2012-09-19 Vanessa Gil * include/functions_api.php: Added functions: event_info diff --git a/pandora_console/godmode/netflow/nf_item_list.php b/pandora_console/godmode/netflow/nf_item_list.php index 9a3859cfa8..5f234ec8c3 100644 --- a/pandora_console/godmode/netflow/nf_item_list.php +++ b/pandora_console/godmode/netflow/nf_item_list.php @@ -30,7 +30,10 @@ if (! check_acl ($config["id_user"], 0, "IW")) { require ("general/noaccess.php"); return; } - + +//id report +$id = (int)get_parameter('id'); + $buttons['report_list']['active'] = false; $buttons['report_list'] = '' . html_print_image ("images/edit.png", true, array ("title" => __('Report list'))) @@ -52,8 +55,7 @@ ui_print_page_header (__('Report items'), "images/networkmap/so_cisco_new.png", $delete = (bool) get_parameter ('delete'); $multiple_delete = (bool)get_parameter('multiple_delete', 0); $order = get_parameter('order'); -//id report -$id = (int) get_parameter ('id'); + //id item $id_rc = (int) get_parameter ('id_rc'); diff --git a/pandora_console/godmode/netflow/nf_report_form.php b/pandora_console/godmode/netflow/nf_report_form.php index dd9906982d..aa97b834d1 100644 --- a/pandora_console/godmode/netflow/nf_report_form.php +++ b/pandora_console/godmode/netflow/nf_report_form.php @@ -30,10 +30,29 @@ if (! check_acl ($config["id_user"], 0, "IW")) { return; } -$id = (int)get_parameter('id'); +$result_ins = -1; $update = (string)get_parameter('update', 0); $create = (string)get_parameter('create', 0); +if ($create){ + $name = (string) get_parameter ('name'); + $group = (int) get_parameter ('id_group'); + $description = get_parameter('description',''); + + $values = array ( + 'id_name' => $name, + 'id_group' => $group, + 'description' => $description, + ); + + $result_ins = db_process_sql_insert('tnetflow_report', $values); + + $id = $result_ins; + +} else { + $id = (int)get_parameter('id'); +} + $buttons['report_list']['active'] = false; $buttons['report_list'] = '' . html_print_image ("images/edit.png", true, array ("title" => __('Report list'))) @@ -52,6 +71,14 @@ $buttons['edit_report']['text'] = ' $name, - 'id_group' => $group, - 'description' => $description, - ); - - $id = db_process_sql_insert('tnetflow_report', $values); - if ($id === false) { - ui_print_error_message ('Error creating report'); - } - else { - ui_print_success_message ('Report created successfully'); - } -} - $table->width = '80%'; $table->border = 0; $table->cellspacing = 3; diff --git a/pandora_console/godmode/netflow/nf_report_item.php b/pandora_console/godmode/netflow/nf_report_item.php index 549044a1c1..0e015e0608 100644 --- a/pandora_console/godmode/netflow/nf_report_item.php +++ b/pandora_console/godmode/netflow/nf_report_item.php @@ -89,10 +89,10 @@ if ($update) { } if ($create){ - $id_filter = get_parameter('id_filter'); + $id_filter = (int)get_parameter('id_filter', 0); $name_filter = db_get_value('id_name', 'tnetflow_filter', 'id_sg', $id_filter); - $max_val = get_parameter('max','2'); - $show_graph = get_parameter('show_graph',''); + $max_val = (int)get_parameter('max',2); + $show_graph = (string)get_parameter('show_graph',''); //insertion order $sql = "SELECT max(`order`) as max_order FROM tnetflow_report_content where id_report=$id"; @@ -114,7 +114,10 @@ if ($create){ ); $id_rc = db_process_sql_insert('tnetflow_report_content', $values); if ($id_rc === false) { - echo '

'.__ ('Error creating item').'

'; + if ($id_filter == 0) + echo '

'.__ ('Error creating item. No filter.').'

'; + else + echo '

'.__ ('Error creating item').'

'; } else { echo '

'.__ ('Item created successfully').'

';