lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow blank source port in diag_testport

Browse Source 
Reported by forum https://forum.pfsense.org/index.php?topic=86146.0
Also, if there are input validation errors, save the user-entered data and re-display it, making it easier for the user to just correct the data in error and press Test again. It was blanking out all the entered data.
This commit is contained in:
Phil Davis 2015-01-02 16:34:30 +05:45 committed by Franco Fichtner
parent ce7c30a85f
commit c9fc7a4520
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/www/diag_testport.php
View File

@ -33,10 +33,10 @@ $pgtitle = array(gettext("Diagnostics"), gettext("Test Port"));
require("guiconfig.inc");
define('NC_TIMEOUT', 10);
$do_testport = false;
if ($_POST || $_REQUEST['host']) {
unset($input_errors);
unset($do_testport);
/* input validation */
$reqdfields = explode(" ", "host port");
@ -51,7 +51,7 @@ if ($_POST || $_REQUEST['host']) {
$input_errors[] = gettext("Please enter a valid port number.");
}
if (!is_numeric($_REQUEST['srcport']) || !is_port($_REQUEST['srcport'])) {
if (($_REQUEST['srcport'] != "") && (!is_numeric($_REQUEST['srcport']) || !is_port($_REQUEST['srcport']))) {
$input_errors[] = gettext("Please enter a valid source port number, or leave the field blank.");
}
@ -64,21 +64,16 @@ if ($_POST || $_REQUEST['host']) {
if (!$input_errors) {
$do_testport = true;
$host = $_REQUEST['host'];
$sourceip = $_REQUEST['sourceip'];
$port = $_REQUEST['port'];
$srcport = $_REQUEST['srcport'];
$showtext = isset($_REQUEST['showtext']);
$ipprotocol = $_REQUEST['ipprotocol'];
$timeout = NC_TIMEOUT;
}
}
if (!isset($do_testport)) {
$do_testport = false;
$host = '';
$port = '';
$srcport = '';
unset($showtext);
/* Save these request vars even if there were input errors. Then the fields are refilled for the user to correct. */
$host = $_REQUEST['host'];
$sourceip = $_REQUEST['sourceip'];
$port = $_REQUEST['port'];
$srcport = $_REQUEST['srcport'];
$showtext = isset($_REQUEST['showtext']);
$ipprotocol = $_REQUEST['ipprotocol'];
}
include("head.inc"); ?>