Implement 'Save' button

- Restore some filtering functions
- Replace legacy jQuery unbind/bind with off/on
- Simplify the values saved to the session
- Make pace actions more consistent for long running queries especially

Author: TheWitness

CHANGELOG.md

@@ -35,6 +35,7 @@
 * feature: Support IPv4 and IPv6
 * feature: Support daily and hourly partitioning
 * feature: Run Schedules in Background
+* feature: Allow Saving of some Filter Information from Flowview
 
 --- 2.1 ---
 * issue: Prepare for sunrise theme in 1.1.17

flowview.php

@@ -36,6 +36,9 @@
 	case 'save':
 		save_filter();
 		break;
+	case 'savefilter':
+		save_filter_form();
+		break;
 	case 'sort_filter':
 		sort_filter();
 		break;
@@ -183,20 +186,8 @@ function load_session_for_filter() {
 function flowview_request_vars() {
     /* ================= input validation and session storage ================= */
     $filters = array(
-		'includeif' => array(
-			'filter' => FILTER_VALIDATE_INT,
-			'default' => '1'
-		),
-		'statistics' => array(
-			'filter' => FILTER_VALIDATE_INT,
-			'default' => '0'
-		),
-		'printed' => array(
-			'filter' => FILTER_VALIDATE_INT,
-			'default' => '0'
-		),
 		'sortfield' => array(
-			'filter' => FILTER_DEFAULT,
+			'filter' => FILTER_VALIDATE_INT,
 			'default' => ''
 		),
 		'sortvalue' => array(
@@ -217,11 +208,6 @@ function flowview_request_vars() {
 			'filter' => FILTER_VALIDATE_INT,
 			'default' => '1000000'
 		),
-		'device' => array(
-			'filter' => FILTER_CALLBACK,
-			'options' => array('options' => 'sanitize_search_string'),
-			'default' => '0'
-		),
 		'predefined_timespan' => array(
 			'filter' => FILTER_VALIDATE_INT,
 			'default' => read_user_setting('default_timespan')
@@ -240,56 +226,6 @@ function flowview_request_vars() {
 			'options' => array('options' => 'sanitize_search_string'),
 			'default' => ''
 		),
-		'protocols' => array(
-			'filter' => FILTER_VALIDATE_IS_NUMERIC_ARRAY,
-			'default' => array()
-		),
-		'includeif' => array(
-			'filter' => FILTER_VALIDATE_INT,
-			'default' => ''
-		),
-		'tcpflags' => array(
-			'filter' => FILTER_VALIDATE_IS_NUMERIC_LIST,
-			'default' => ''
-		),
-		'tosfields' => array(
-			'filter' => FILTER_VALIDATE_IS_NUMERIC_LIST,
-			'default' => ''
-		),
-		'sourceip' => array(
-			'filter' => FILTER_CALLBACK,
-			'options' => array('options' => 'sanitize_search_string'),
-			'default' => ''
-		),
-		'sourceport' => array(
-			'filter' => FILTER_VALIDATE_IS_NUMERIC_LIST,
-			'default' => ''
-		),
-		'sourceinterface' => array(
-			'filter' => FILTER_VALIDATE_IS_NUMERIC_LIST,
-			'default' => ''
-		),
-		'sourceas' => array(
-			'filter' => FILTER_VALIDATE_IS_NUMERIC_LIST,
-			'default' => ''
-		),
-		'destip' => array(
-			'filter' => FILTER_CALLBACK,
-			'options' => array('options' => 'sanitize_search_string'),
-			'default' => ''
-		),
-		'destport' => array(
-			'filter' => FILTER_VALIDATE_IS_NUMERIC_LIST,
-			'default' => ''
-		),
-		'destinterface' => array(
-			'filter' => FILTER_VALIDATE_IS_NUMERIC_LIST,
-			'default' => ''
-		),
-		'destas' => array(
-			'filter' => FILTER_VALIDATE_IS_NUMERIC_LIST,
-			'default' => ''
-		),
 		'domains' => array(
 			'filter' => FILTER_VALIDATE_REGEXP,
 			'options' => array('options' => array('regexp' => '(true|false)')),
@@ -314,11 +250,6 @@ function flowview_request_vars() {
 			'filter' => FILTER_VALIDATE_REGEXP,
 			'options' => array('options' => array('regexp' => '(true|false)')),
 			'default' => 'false'
-		),
-		'resolve' => array(
-			'filter' => FILTER_VALIDATE_REGEXP,
-			'options' => array('options' => array('regexp' => '(Y|N|true|false)')),
-			'default' => 'true'
 		)
 	);