diff --git a/filter_inputs.php b/filter_inputs.php index 341687b..98f60a2 100644 --- a/filter_inputs.php +++ b/filter_inputs.php @@ -68,21 +68,22 @@ if ($preset && isset($presets[$preset])) { '-O' => FILTER_VALIDATE_BOOLEAN, '--osscan-limit' => FILTER_VALIDATE_BOOLEAN, '--osscan-guess' => FILTER_VALIDATE_BOOLEAN, -// SERVICE/VERSION DETECTION: + '--max-os-tries' => ['filter' => FILTER_VALIDATE_INT, 'options' => ['min_range' => 0]], +// TIMING AND PERFORMANCE: '-T0' => FILTER_VALIDATE_BOOLEAN, '-T1' => FILTER_VALIDATE_BOOLEAN, '-T2' => FILTER_VALIDATE_BOOLEAN, '-T3' => FILTER_VALIDATE_BOOLEAN, '-T4' => FILTER_VALIDATE_BOOLEAN, '-T5' => FILTER_VALIDATE_BOOLEAN, - '--min-hostgroup' => FILTER_VALIDATE_INT, - '--max-hostgroup' => FILTER_VALIDATE_INT, - '--min-parallelism' => FILTER_VALIDATE_INT, - '--max-parallelism' => FILTER_VALIDATE_INT, + '--min-hostgroup' => ['filter' => FILTER_VALIDATE_INT, 'options' => ['min_range' => 0]], + '--max-hostgroup' => ['filter' => FILTER_VALIDATE_INT, 'options' => ['min_range' => 0]], + '--min-parallelism' => ['filter' => FILTER_VALIDATE_INT, 'options' => ['min_range' => 0]], + '--max-parallelism' => ['filter' => FILTER_VALIDATE_INT, 'options' => ['min_range' => 0]], '--min-rtt-timeout' => ['filter' => FILTER_VALIDATE_REGEXP, 'options' => ['regexp' => $tempoRegex]], '--max-rtt-timeout' => ['filter' => FILTER_VALIDATE_REGEXP, 'options' => ['regexp' => $tempoRegex]], '--initial-rtt-timeout' => ['filter' => FILTER_VALIDATE_REGEXP, 'options' => ['regexp' => $tempoRegex]], - '--max-retries' => FILTER_VALIDATE_INT, + '--max-retries' => ['filter' => FILTER_VALIDATE_INT, 'options' => ['min_range' => 0]], '--host-timeout' => ['filter' => FILTER_VALIDATE_REGEXP, 'options' => ['regexp' => $tempoRegex]], '--scan-delay' => ['filter' => FILTER_VALIDATE_REGEXP, 'options' => ['regexp' => $tempoRegex]], '--max-scan-delay' => ['filter' => FILTER_VALIDATE_REGEXP, 'options' => ['regexp' => $tempoRegex]], @@ -109,9 +110,9 @@ if ($preset && isset($presets[$preset])) { '-h' => FILTER_VALIDATE_BOOLEAN, '--stylesheet' => FILTER_VALIDATE_URL, // lanScan - 'saveAs' => ["filter" => FILTER_VALIDATE_REGEXP, 'options' => ['regexp' => $fileNameRegex]], + 'saveAs' => ['filter' => FILTER_VALIDATE_REGEXP, 'options' => ['regexp' => $fileNameRegex]], 'compareWith' => FILTER_VALIDATE_URL, - 'refreshPeriod' => ["filter" => FILTER_VALIDATE_INT, 'options' => ['min_range' => 0]], + 'refreshPeriod' => ['filter' => FILTER_VALIDATE_INT, 'options' => ['min_range' => 0]], 'sudo' => FILTER_VALIDATE_BOOLEAN, ], false); } \ No newline at end of file diff --git a/options.php b/options.php index a602273..ed1c970 100755 --- a/options.php +++ b/options.php @@ -56,10 +56,7 @@ Exemples: = $_SERVER['REMOTE_ADDR']; ?>/24 = $_SERVER['SERVER_NAME']; ?> 10.