From 112e2b9b304fc3695d6e746d0560a2196afc01ea Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Tue, 17 Jan 2012 15:37:50 +0000 Subject: [PATCH] 2012-01-17 Ramon Novoa * include/functions_netflow.php: Clean \r and \n from advanced filters. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5383 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ pandora_console/include/functions_netflow.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index daeaf3d9ba..fafbf466f8 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2012-01-17 Ramon Novoa + + * include/functions_netflow.php: Clean \r and \n from advanced + filters. + 2012-01-17 Ramon Novoa * include/functions_graph.php, include/functions_netflow.php, diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php index aaef8e9e01..fd8a6453a4 100644 --- a/pandora_console/include/functions_netflow.php +++ b/pandora_console/include/functions_netflow.php @@ -449,7 +449,7 @@ function netflow_get_command ($filter) { // Advanced filter $filter_args = ''; if ($filter['advanced_filter'] != '') { - $filter_args = preg_replace('/"/','', io_safe_output ($filter['advanced_filter'])); + $filter_args = preg_replace('/["\r\n]/','', io_safe_output ($filter['advanced_filter'])); $command .= ' "(' . $filter_args . ')"'; return $command; }