From c980716edb28b33e6340f00ab37ab36f5b860950 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Tue, 13 Sep 2005 18:34:39 +0000 Subject: Sync with m0n0wall 1.2b10: TODO: * Add back sexy curved tabs, etc * Change image locations to themes * Add back pfSense header information and set page titles --- usr/local/www/services_captiveportal_mac_edit.php | 47 +++++++++-------------- 1 file changed, 19 insertions(+), 28 deletions(-) (limited to 'usr/local/www/services_captiveportal_mac_edit.php') diff --git a/usr/local/www/services_captiveportal_mac_edit.php b/usr/local/www/services_captiveportal_mac_edit.php index 1f7cf56..f204d0f 100755 --- a/usr/local/www/services_captiveportal_mac_edit.php +++ b/usr/local/www/services_captiveportal_mac_edit.php @@ -1,23 +1,22 @@ #!/usr/local/bin/php - All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -30,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. */ +$pgtitle = array("Services", "Captive portal", "Edit pass-through MAC address"); require("guiconfig.inc"); if (!is_array($config['captiveportal']['passthrumac'])) @@ -55,12 +55,11 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "mac"); $reqdfieldsn = explode(",", "MAC address"); - + do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); - - /* normalize MAC addresses - lowercase and convert Windows-ized hyphenated MACs to colon delimited */ - $_POST['mac'] = strtolower(str_replace("-", ":", $_POST['mac'])); - + + $_POST['mac'] = str_replace("-", ":", $_POST['mac']); + if (($_POST['mac'] && !is_macaddr($_POST['mac']))) { $input_errors[] = "A valid MAC address must be specified. [".$_POST['mac']."]"; } @@ -68,11 +67,11 @@ if ($_POST) { foreach ($a_passthrumacs as $macent) { if (isset($id) && ($a_passthrumacs[$id]) && ($a_passthrumacs[$id] === $macent)) continue; - + if ($macent['mac'] == $_POST['mac']){ $input_errors[] = "[" . $_POST['mac'] . "] already allowed." ; break; - } + } } if (!$input_errors) { @@ -84,45 +83,37 @@ if ($_POST) { $a_passthrumacs[$id] = $mac; else $a_passthrumacs[] = $mac; - + write_config(); touch($d_passthrumacsdirty_path) ; - + header("Location: services_captiveportal_mac.php"); exit; } } - -$pgtitle = "Services: Captive Portal: MACs: Edit"; -include("head.inc"); - ?> - - -

MAC address	+	- + MAC address (6 hex octets separated by colons)
Description	+	You may enter a description here for your reference (not parsed).
	+	-- cgit v1.1