diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2011-01-25 12:31:47 -0500 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2011-01-25 12:31:47 -0500 |
| commit | 620ac186ea01e168fbae8d69ce00fffc833ba9ae (patch) | |
| tree | aca7ae5f40406b1c45f92194d090d72c5ad2cda5 /usr/local/www/services_captiveportal_hostname_edit.php | |
| parent | 79e99eb47e898159fd9e1b70e957b383326714c0 (diff) | |
| download | pfsense-620ac186ea01e168fbae8d69ce00fffc833ba9ae.zip pfsense-620ac186ea01e168fbae8d69ce00fffc833ba9ae.tar.gz | |
Misc fixups
Diffstat (limited to 'usr/local/www/services_captiveportal_hostname_edit.php')
| -rwxr-xr-x | usr/local/www/services_captiveportal_hostname_edit.php | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/usr/local/www/services_captiveportal_hostname_edit.php b/usr/local/www/services_captiveportal_hostname_edit.php index ca166d4..b6e580a 100755 --- a/usr/local/www/services_captiveportal_hostname_edit.php +++ b/usr/local/www/services_captiveportal_hostname_edit.php @@ -38,7 +38,7 @@ ##|*IDENT=page-services-captiveportal-editallowedhostnames ##|*NAME=Services: Captive portal: Edit Allowed IPs page ##|*DESCR=Allow access to the 'Services: Captive portal: Edit Allowed IPs' page. -##|*MATCH=services_captiveportal_ip_edit.php* +##|*MATCH=services_captiveportal_hostname_edit.php* ##|-PRIV function allowedhostnamescmp($a, $b) { @@ -46,9 +46,8 @@ function allowedhostnamescmp($a, $b) { } function allowedhostnames_sort() { - global $g, $config; - - usort($config['captiveportal']['allowedhostname'],"allowedhostnamescmp"); + global $g, $config; + usort($config['captiveportal']['allowedhostname'],"allowedhostname"); } $statusurl = "status_captiveportal.php"; @@ -86,18 +85,18 @@ if ($_POST) { $pconfig = $_POST; /* input validation */ - $reqdfields = explode(" ", "ip"); + $reqdfields = explode(" ", "hostname"); $reqdfieldsn = array(gettext("Allowed Hostname")); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); - if (($_POST['hostname'] && !is_hostname($_POST['hostname']))) { + if (($_POST['hostname'] && !is_hostname($_POST['hostname']))) $input_errors[] = sprintf(gettext("A valid Hostname must be specified. [%s]"), $_POST['hostname']); - } + if ($_POST['bw_up'] && !is_numeric($_POST['bw_up'])) - $input_errors[] = gettext("Upload speed needs to be an integer"); - if ($_POST['bw_down'] && !is_numeric($_POST['bw_down'])) - $input_errors[] = gettext("Download speed needs to be an integer"); + $input_errors[] = gettext("Upload speed needs to be an integer"); + if ($_POST['bw_down'] && !is_numeric($_POST['bw_down'])) + $input_errors[] = gettext("Download speed needs to be an integer"); foreach ($a_allowedhostnames as $ipent) { if (isset($id) && ($a_allowedhostnames[$id]) && ($a_allowedhostnames[$id] === $ipent)) @@ -148,7 +147,7 @@ if ($_POST) { @unlink("{$g['tmp_path']}/allowedhostname_tmp{$id}"); } - header("Location: services_captiveportal_ip.php"); + header("Location: services_captiveportal_hostname.php"); exit; } } @@ -159,7 +158,7 @@ include("head.inc"); <?php include("fbegin.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php if ($input_errors) print_input_errors($input_errors); ?> - <form action="services_captiveportal_ip_edit.php" method="post" name="iform" id="iform"> + <form action="services_captiveportal_hostname_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Direction"); ?></td> @@ -180,7 +179,7 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Hostname"); ?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="ip" type="text" class="formfld unknown" id="ip" size="17" value="<?=htmlspecialchars($pconfig['hostname']);?>"> + <?=$mandfldhtml;?><input name="hostname" type="text" class="formfld unknown" id="hostname" size="17" value="<?=htmlspecialchars($pconfig['hostname']);?>"> <br> <span class="vexpl"><?=gettext("Hostname");?>.</span></td> </tr> |
