Restore 1.2b6's captive portal.

author: Scott Ullrich <sullrich@pfsense.org> 2005-03-14 01:37:56 +0000
committer: Scott Ullrich <sullrich@pfsense.org> 2005-03-14 01:37:56 +0000
commit: ec9202316f33fd6169756447e2c8230907ec68ab (patch)
tree: 2bfe7c6e6daa80d93b885328a06485d5f0c4ae24 /usr
parent: 27537c5a8e1989fa510e6a4fbd742d27a945a277 (diff)
download: pfsense-ec9202316f33fd6169756447e2c8230907ec68ab.zip
pfsense-ec9202316f33fd6169756447e2c8230907ec68ab.tar.gz
7 files changed, 149 insertions, 207 deletions
diff --git a/usr/local/captiveportal/index.php b/usr/local/captiveportal/index.php
index 3c8b670..1f35a57 100755
--- a/usr/local/captiveportal/index.php
+++ b/usr/local/captiveportal/index.php
@@ -1,22 +1,22 @@
 #!/usr/local/bin/php
-<?php
+<?php 
 /*
 	index.php
 	part of m0n0wall (http://m0n0.ch/wall)
-
+	
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
 	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
@@ -74,7 +74,7 @@ if ($clientmac && portal_mac_fixed($clientmac)) {
 
 	/* authenticate against radius server */
 	$radiusservers = captiveportal_get_radius_servers();
-
+	
 	if ($_POST['auth_user'] && $_POST['auth_pass']) {
 		$auth_val = RADIUS_AUTHENTICATION($_POST['auth_user'],
 										  $_POST['auth_pass'],
@@ -128,7 +128,7 @@ if ($clientmac && portal_mac_fixed($clientmac)) {
 <HEAD><TITLE>Disconnecting...</TITLE></HEAD>
 <BODY BGCOLOR="#435370">
 <SPAN STYLE="color: #ffffff; font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif; font-size: 11px;">
-<B>You have been disconnected.</B>
+<B>You've been disconnected.</B>
 </SPAN>
 <SCRIPT LANGUAGE="JavaScript">
 <!--
@@ -145,19 +145,19 @@ EOD;
 } else {
 	/* display captive portal page */
 	$htmltext = file_get_contents("{$g['varetc_path']}/captiveportal.html");
-
+	
 	/* substitute variables */
 	if (isset($config['captiveportal']['httpslogin']))
 		$htmltext = str_replace("\$PORTAL_ACTION\$", "https://{$config['captiveportal']['httpsname']}:8001/", $htmltext);
 	else
 		$htmltext = str_replace("\$PORTAL_ACTION\$", "", $htmltext);
-
+	
 	if (preg_match("/redirurl=(.*)/", $orig_request, $matches))
 		$redirurl = urldecode($matches[1]);
 	else
 		$redirurl = "http://{$orig_host}{$orig_request}";
 	$htmltext = str_replace("\$PORTAL_REDIRURL\$", htmlspecialchars($redirurl), $htmltext);
-
+	
 	echo $htmltext;
 }
 
@@ -165,7 +165,7 @@ exit;
 
 function portal_mac_fixed($clientmac) {
 	global $g ;
-
+	
 	/* open captive portal mac db */
 	if (file_exists("{$g['vardb_path']}/captiveportal_mac.db")) {
 		$fd = @fopen("{$g['vardb_path']}/captiveportal_mac.db","r") ;
@@ -182,7 +182,7 @@ function portal_mac_fixed($clientmac) {
 		fclose($fd) ;
 	}
 	return FALSE ;
-}
+}	
 
 function portal_allow($clientip,$clientmac,$clientuser,$bw_up,$bw_down) {
 
@@ -190,7 +190,7 @@ function portal_allow($clientip,$clientmac,$clientuser,$bw_up,$bw_down) {
 
 	/* user has accepted AUP - let him in */
 	portal_lock();
-
+	
 	/* get next ipfw rule number */
 	if (file_exists("{$g['vardb_path']}/captiveportal.nextrule"))
 		$ruleno = trim(file_get_contents("{$g['vardb_path']}/captiveportal.nextrule"));
@@ -198,11 +198,11 @@ function portal_allow($clientip,$clientmac,$clientuser,$bw_up,$bw_down) {
 		$ruleno = 10000;	/* first rule number */
 
 	$saved_ruleno = $ruleno;
-
+	
 	/* generate unique session ID */
 	$tod = gettimeofday();
 	$sessionid = substr(md5(mt_rand() . $tod['sec'] . $tod['usec'] . $clientip . $clientmac), 0, 16);
-
+	
 	/* add ipfw rules for layer 3 */
 	exec("/sbin/ipfw add $ruleno set 2 skipto 50000 ip from $clientip to any in");
 	exec("/sbin/ipfw add $ruleno set 2 skipto 50000 ip from any to $clientip out");
@@ -226,14 +226,14 @@ function portal_allow($clientip,$clientmac,$clientuser,$bw_up,$bw_down) {
 		exec("/sbin/ipfw pipe $down_rule_number config bw " . trim($bw_down) . "Kbit/s queue 10");
 	}
 	/* done */
-
+	
 	/* add ipfw rules for layer 2 */
 	if (!isset($config['captiveportal']['nomacfilter'])) {
 		$l2ruleno = $ruleno + 10000;
 		exec("/sbin/ipfw add $l2ruleno set 3 deny all from $clientip to any not MAC any $clientmac layer2 in");
 		exec("/sbin/ipfw add $l2ruleno set 3 deny all from any to $clientip not MAC $clientmac any layer2 out");
 	}
-
+	
 	/* read in client database */
 	$cpdb = array();
 
@@ -243,11 +243,11 @@ function portal_allow($clientip,$clientmac,$clientuser,$bw_up,$bw_down) {
 			$line = trim(fgets($fd)) ;
 			if($line) {
 				$cpdb[] = explode(",",$line);
-			}
+			}	
 		}
 		fclose($fd);
 	}
-
+	
 	$radiusservers = captiveportal_get_radius_servers();
 
 	/* find an existing entry and delete it */
@@ -274,7 +274,7 @@ function portal_allow($clientip,$clientmac,$clientuser,$bw_up,$bw_down) {
 			unset($cpdb[$i]);
 			break;
 		}
-	}
+	}	
 
 	/* rewrite information to database */
 	$fd = @fopen("{$g['vardb_path']}/captiveportal.db", "w");
@@ -286,7 +286,7 @@ function portal_allow($clientip,$clientmac,$clientuser,$bw_up,$bw_down) {
 		fwrite($fd, time().",{$ruleno},{$clientip},{$clientmac},{$clientuser},{$sessionid}\n") ;
 		fclose($fd);
 	}
-
+	
 	/* write next rule number */
 	$fd = @fopen("{$g['vardb_path']}/captiveportal.nextrule", "w");
 	if ($fd) {
@@ -296,9 +296,9 @@ function portal_allow($clientip,$clientmac,$clientuser,$bw_up,$bw_down) {
 		fwrite($fd, $ruleno);
 		fclose($fd);
 	}
-
+	
 	portal_unlock();
-
+	
 	/* redirect user to desired destination */
 	if ($config['captiveportal']['redirurl'])
 		$redirurl = $config['captiveportal']['redirurl'];
@@ -306,14 +306,14 @@ function portal_allow($clientip,$clientmac,$clientuser,$bw_up,$bw_down) {
 		$redirurl = $_POST['redirurl'];
 	else
 		$redirurl = "http://{$orig_host}{$orig_request}";
-
+	
 	if(isset($config['captiveportal']['logoutwin_enable'])) {
-
+		
 		if (isset($config['captiveportal']['httpslogin']))
 			$logouturl = "https://{$config['captiveportal']['httpsname']}:8001/";
 		else
 			$logouturl = "http://{$config['interfaces'][$config['captiveportal']['interface']]['ipaddr']}:8000/";
-
+		
 		echo <<<EOD
 <HTML>
 <HEAD><TITLE>Redirecting...</TITLE></HEAD>
@@ -347,17 +347,17 @@ document.location.href="{$redirurl}";
 
 EOD;
 	} else {
-		header("Location: " . $redirurl);
+		header("Location: " . $redirurl); 
 	}
-
+	
 	return $sessionid;
 }
 
 /* read RADIUS servers into array */
 function captiveportal_get_radius_servers() {
-
+	
 	global $g;
-
+	
 	if (file_exists("{$g['vardb_path']}/captiveportal_radius.db")) {
 	   	$fd = @fopen("{$g['vardb_path']}/captiveportal_radius.db","r");
 		if ($fd) {
@@ -371,20 +371,20 @@ function captiveportal_get_radius_servers() {
 				}
 			}
 			fclose($fd);
-
+			
 			return $radiusservers;
 		}
 	}
-
+	
 	return false;
 }
 
 /* lock captive portal information, decide that the lock file is stale after
    10 seconds */
 function portal_lock() {
-
+	
 	global $lockfile;
-
+	
 	$n = 0;
 	while ($n < 10) {
 		/* open the lock file in append mode to avoid race condition */
@@ -402,9 +402,9 @@ function portal_lock() {
 
 /* unlock captive portal information file */
 function portal_unlock() {
-
+	
 	global $lockfile;
-
+	
 	if (file_exists($lockfile))
 		unlink($lockfile);
 }
@@ -413,11 +413,11 @@ function portal_unlock() {
    by Dinesh Nair
  */
 function disconnect_client($sessionid) {
-
+	
 	global $g, $config;
-
+	
 	portal_lock();
-
+	
 	/* read database */
 	$cpdb = array() ;
 	$fd = @fopen("{$g['vardb_path']}/captiveportal.db", "r");
@@ -426,14 +426,14 @@ function disconnect_client($sessionid) {
 			$line = trim(fgets($fd)) ;
 			if($line) {
 				$cpdb[] = explode(",",$line);
-			}
+			}	
 		}
 		fclose($fd);
 	}
-
+	
 	$radiusservers = captiveportal_get_radius_servers();
-
-	/* find entry */
+	
+	/* find entry */	
 	for ($i = 0; $i < count($cpdb); $i++) {
 		if ($cpdb[$i][5] == $sessionid) {
 			/* this client needs to be deleted - remove ipfw rules */
@@ -457,7 +457,7 @@ function disconnect_client($sessionid) {
 			break;
 		}
 	}
-
+	
 	/* rewrite information to database */
 	$fd = @fopen("{$g['vardb_path']}/captiveportal.db", "w");
 	if ($fd) {
@@ -466,7 +466,7 @@ function disconnect_client($sessionid) {
 		}
 		fclose($fd);
 	}
-
+	
 	portal_unlock();
 }
 ?>
diff --git a/usr/local/captiveportal/radius_accounting.inc b/usr/local/captiveportal/radius_accounting.inc
index 7f309cb..1aac92d 100644
--- a/usr/local/captiveportal/radius_accounting.inc
+++ b/usr/local/captiveportal/radius_accounting.inc
@@ -1,21 +1,21 @@
 <?php
 /*
-	radius_accounting.inc 
+	radius_accounting.inc
 	part of m0n0wall (http://m0n0.ch/wall)
-
+	
 	Copyright (C) 2004 Dinesh Nair <dinesh@alphaque.com>
 	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
@@ -44,9 +44,9 @@ function RADIUS_ACCOUNTING_START($username,$sessionid,$radiusip,$radiusport,$rad
 		$nasHostname[0] = "m0n0wall" ;
 
 	$fd = @fsockopen("udp://$radiusip",$radiusport,$errno,$errstr,3) ;
-	if(!$fd)
+	if(!$fd) 
 		return 1 ; /* error return */
-
+	
 	/* set 5 second timeout on socket i/o */
 	stream_set_timeout($fd, 5) ;
 
@@ -113,10 +113,10 @@ function RADIUS_ACCOUNTING_START($username,$sessionid,$radiusip,$radiusport,$rad
 	if($debug) {
 		echo "username is $username with len " . strlen($username) ."\n" ;
 		echo "nasHostname is {$nasHostname[0]} with len " . strlen($nasHostname[0]) ."\n" ;
-	}
+	}	
 
 	$ret = fwrite($fd,$data) ;
-	if( !$ret || ($ret != $length) )
+	if( !$ret || ($ret != $length) ) 
 		return 1; /* error return */
 
 	if ($debug)
@@ -148,7 +148,7 @@ function RADIUS_ACCOUNTING_STOP($ruleno,$username,$sessionid,$start_time,$radius
 
 	$input_pkts = $input_bytes = $output_pkts = $output_bytes = 0 ;
 
-	exec("/sbin/ipfw show {$ruleno}", $ipfw) ;
+	exec("/sbin/ipfw show {$ruleno}", $ipfw) ;	
 	preg_match("/(\d+)\s+(\d+)\s+(\d+)\s+skipto/", $ipfw[0], $matches) ;
 	$output_pkts = $matches[2] ;
 	$output_bytes = $matches[3] ;
@@ -159,9 +159,9 @@ function RADIUS_ACCOUNTING_STOP($ruleno,$username,$sessionid,$start_time,$radius
 	$input_bytes = $matches[3] ;
 
 	$fd = @fsockopen("udp://$radiusip",$radiusport,$errno,$errstr,3) ;
-	if(!$fd)
+	if(!$fd) 
 		return 1 ; /* error return */
-
+	
 	/* set 5 second timeout on socket i/o */
 	stream_set_timeout($fd, 5) ;
 
@@ -249,10 +249,10 @@ function RADIUS_ACCOUNTING_STOP($ruleno,$username,$sessionid,$start_time,$radius
 	if($debug) {
 		echo "username is $username with len " . strlen($username) ."\n" ;
 		echo "nasHostname is {$nasHostname[0]} with len " . strlen($nasHostname[0]) ."\n" ;
-	}
+	}	
 
 	$ret = fwrite($fd,$data) ;
-	if( !$ret || ($ret != $length) )
+	if( !$ret || ($ret != $length) ) 
 		return 1; /* error return */
 
 	if ($debug)
diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php
index 934aeb9..01459fa 100755
--- a/usr/local/www/services_captiveportal.php
+++ b/usr/local/www/services_captiveportal.php
@@ -1,22 +1,22 @@
 #!/usr/local/bin/php
-<?php
+<?php 
 /*
 	services_captiveportal.php
 	part of m0n0wall (http://m0n0.ch/wall)
-
+	
 	Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
 	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
@@ -79,9 +79,9 @@ if ($_POST) {
 	if ($_POST['enable']) {
 		$reqdfields = explode(" ", "cinterface");
 		$reqdfieldsn = explode(",", "Interface");
-
+		
 		do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
-
+		
 		/* make sure no interfaces are bridged */
 		for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) {
 			$coptif = &$config['interfaces']['opt' . $i];
@@ -90,7 +90,7 @@ if ($_POST) {
 				break;
 			}
 		}
-
+		
 		if ($_POST['httpslogin_enable']) {
 		 	if (!$_POST['cert'] || !$_POST['key']) {
 				$input_errors[] = "Certificate and key must be specified for HTTPS login.";
@@ -100,13 +100,13 @@ if ($_POST) {
 				if (!strstr($_POST['key'], "BEGIN RSA PRIVATE KEY") || !strstr($_POST['key'], "END RSA PRIVATE KEY"))
 					$input_errors[] = "This key does not appear to be valid.";
 			}
-
+			
 			if (!$_POST['httpsname'] || !is_domain($_POST['httpsname'])) {
 				$input_errors[] = "The HTTPS server name must be specified for HTTPS login.";
 			}
 		}
 	}
-
+	
 	if ($_POST['timeout'] && (!is_numeric($_POST['timeout']) || ($_POST['timeout'] < 1))) {
 		$input_errors[] = "The timeout must be at least 1 minute.";
 	}
@@ -147,15 +147,15 @@ if ($_POST) {
 		$config['captiveportal']['radiusport'] = $_POST['radiusport'];
 		$config['captiveportal']['radiusacctport'] = $_POST['radiusacctport'];
 		$config['captiveportal']['radiuskey'] = $_POST['radiuskey'];
-
+		
 		/* file upload? */
 		if (is_uploaded_file($_FILES['htmlfile']['tmp_name']))
 			$config['captiveportal']['page']['htmltext'] = base64_encode(file_get_contents($_FILES['htmlfile']['tmp_name']));
 		if (is_uploaded_file($_FILES['errfile']['tmp_name']))
 			$config['captiveportal']['page']['errtext'] = base64_encode(file_get_contents($_FILES['errfile']['tmp_name']));
-
+			
 		write_config();
-
+		
 		$retval = 0;
 		if (!file_exists($d_sysrebootreqd_path)) {
 			config_lock();
@@ -166,30 +166,19 @@ if ($_POST) {
 	}
 }
 ?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("pfSense webGUI");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
-
-<form>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
 <script language="JavaScript">
 <!--
 function radacct_change() {
 	if (document.iform.radacct_enable.checked) {
 		document.iform.logoutwin_enable.checked = 1;
-	}
+	} 
 }
 
 function enable_change(enable_change) {
 	var endis;
 	endis = !(document.iform.enable.checked || enable_change);
-
+	
 	document.iform.cinterface.disabled = endis;
 	document.iform.idletimeout.disabled = endis;
 	document.iform.timeout.disabled = endis;
@@ -206,7 +195,7 @@ function enable_change(enable_change) {
 	document.iform.nomacfilter.disabled = endis;
 	document.iform.htmlfile.disabled = endis;
 	document.iform.errfile.disabled = endis;
-
+	
 	if (enable_change && document.iform.radacct_enable.checked) {
 		document.iform.logoutwin_enable.checked = 1;
 	}
@@ -222,19 +211,18 @@ function enable_change(enable_change) {
 	<li class="tabact">Captive portal</li>
 	<li class="tabinact"><a href="services_captiveportal_mac.php">Pass-through MAC</a></li>
 	<li class="tabinact"><a href="services_captiveportal_ip.php">Allowed IP addresses</a></li>
-	<li class="tabinact"><a href="services_usermanager.php">User Manager</a></li>
   </ul>
   </td></tr>
   <tr>
   <td class="tabcont">
   <table width="100%" border="0" cellpadding="6" cellspacing="0">
-	<tr>
+	<tr> 
 	  <td width="22%" valign="top" class="vtable">&nbsp;</td>
 	  <td width="78%" class="vtable">
 		<input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked"; ?> onClick="enable_change(false)">
 		<strong>Enable captive portal </strong></td>
 	</tr>
-	<tr>
+	<tr> 
 	  <td width="22%" valign="top" class="vncellreq">Interface</td>
 	  <td width="78%" class="vtable">
 		<select name="cinterface" class="formfld" id="cinterface">
@@ -244,7 +232,7 @@ function enable_change(enable_change) {
 				$interfaces['opt' . $i] = $config['interfaces']['opt' . $i]['descr'];
 		  }
 		  foreach ($interfaces as $iface => $ifacename): ?>
-		  <option value="<?=$iface;?>" <?php if ($iface == $pconfig['cinterface']) echo "selected"; ?>>
+		  <option value="<?=$iface;?>" <?php if ($iface == $pconfig['cinterface']) echo "selected"; ?>> 
 		  <?=htmlspecialchars($ifacename);?>
 		  </option>
 		  <?php endforeach; ?>
@@ -258,16 +246,16 @@ function enable_change(enable_change) {
 minutes<br>
 Clients will be disconnected after this amount of inactivity. They may log in again immediately, though. Leave this field blank for no idle timeout.</td>
 	</tr>
-	<tr>
+	<tr> 
 	  <td width="22%" valign="top" class="vncell">Hard timeout</td>
-	  <td width="78%" class="vtable">
-		<input name="timeout" type="text" class="formfld" id="timeout" size="6" value="<?=htmlspecialchars($pconfig['timeout']);?>">
+	  <td width="78%" class="vtable"> 
+		<input name="timeout" type="text" class="formfld" id="timeout" size="6" value="<?=htmlspecialchars($pconfig['timeout']);?>"> 
 		minutes<br>
 	  Clients will be disconnected after this amount of time, regardless of activity. They may log in again immediately, though. Leave this field blank for no hard timeout (not recommended unless an idle timeout is set).</td>
 	</tr>
-	<tr>
+	<tr> 
 	  <td width="22%" valign="top" class="vncell">Logout popup window</td>
-	  <td width="78%" class="vtable">
+	  <td width="78%" class="vtable"> 
 		<input name="logoutwin_enable" type="checkbox" class="formfld" id="logoutwin_enable" value="yes" <?php if($pconfig['logoutwin_enable']) echo "checked"; ?>>
 		<strong>Enable logout popup window</strong><br>
 	  If enabled, a popup window will appear when clients are allowed through the captive portal. This allows clients to explicitly disconnect themselves before the idle or hard timeout occurs. When RADIUS accounting is  enabled, this option is implied.</td>
@@ -315,9 +303,9 @@ to access after they've authenticated.</td>
         <br>
     If this option is set, the captive portal will restrict each user who logs in to a specific bandwidth as set in RADIUS. Your RADIUS server must return the attributes Nomadix-Bw-Up and Nomadix-Bw-Down (1 and 2 VSAs from Vendor 3309, Nomadix) along with Access-Accept for this to work. Bandwidth is set in Kbit/s. You can control pass-through and default bandwidths above.</td>
 	  </tr>
-	<tr>
+	<tr> 
 	  <td width="22%" valign="top" class="vncell">RADIUS server</td>
-	  <td width="78%" class="vtable">
+	  <td width="78%" class="vtable"> 
 		<table cellpadding="0" cellspacing="0">
 		<tr>
 		<td>IP address:</td>
@@ -367,12 +355,12 @@ to access after they've authenticated.</td>
         <br>
     Paste an RSA private key in PEM format here.</td>
 	  </tr>
-	<tr>
+	<tr> 
 	  <td width="22%" valign="top" class="vncellreq">Portal page contents</td>
-	  <td width="78%" class="vtable">
+	  <td width="78%" class="vtable">    
 		<?=$mandfldhtml;?><input type="file" name="htmlfile" class="formfld" id="htmlfile"><br>
 		<?php if ($config['captiveportal']['page']['htmltext']): ?>
-		<a href="?act=viewhtml" target="_blank">View current page</a>
+		<a href="?act=viewhtml" target="_blank">View current page</a>                      
 		  <br>
 		  <br>
 		<?php endif; ?>
@@ -393,19 +381,19 @@ with a submit button (name=&quot;accept&quot;) and a hidden field with name=&quo
 	  <td class="vtable">
 		<input name="errfile" type="file" class="formfld" id="errfile"><br>
 		<?php if ($config['captiveportal']['page']['errtext']): ?>
-		<a href="?act=viewerrhtml" target="_blank">View current page</a>
+		<a href="?act=viewerrhtml" target="_blank">View current page</a>                      
 		  <br>
 		  <br>
 		<?php endif; ?>
 The contents of the HTML file that you upload here are displayed when a RADIUS authentication error occurs.</td>
 	</tr>
-	<tr>
+	<tr> 
 	  <td width="22%" valign="top">&nbsp;</td>
-	  <td width="78%">
-		<input name="Submit" type="submit" class="formbtn" value="Save" onClick="enable_change(true)">
+	  <td width="78%"> 
+		<input name="Submit" type="submit" class="formbtn" value="Save" onClick="enable_change(true)"> 
 	  </td>
 	</tr>
-	<tr>
+	<tr> 
 	  <td width="22%" valign="top">&nbsp;</td>
 	  <td width="78%"><span class="vexpl"><span class="red"><strong>Note:<br>
 		</strong></span>Changing any settings on this page will disconnect all clients! Don't forget to enable the DHCP server on your captive portal interface! Make sure that the default/maximum DHCP lease time is higher than the timeout entered on this page. Also, the DNS forwarder needs to be enabled for DNS lookups by unauthenticated clients to work. </span></td>
diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php
index edb727a..1b7c68a 100755
--- a/usr/local/www/services_captiveportal_ip.php
+++ b/usr/local/www/services_captiveportal_ip.php
@@ -3,20 +3,20 @@
 /*
 	services_captiveportal_ip.php
 	part of m0n0wall (http://m0n0.ch/wall)
-
+	
 	Copyright (C) 2004 Dinesh Nair <dinesh@alphaque.com>
 	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
@@ -68,17 +68,6 @@ if ($_GET['act'] == "del") {
 	}
 }
 ?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("pfSense webGUI");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
-
-<form>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
 <form action="services_captiveportal_ip.php" method="post">
 <?php if ($savemsg) print_info_box($savemsg); ?>
@@ -92,7 +81,6 @@ if ($_GET['act'] == "del") {
 	<li class="tabinact1"><a href="services_captiveportal.php">Captive portal</a></li>
 	<li class="tabinact"><a href="services_captiveportal_mac.php">Pass-through MAC</a></li>
 	<li class="tabact">Allowed IP addresses</li>
-	<li class="tabinact"><a href="services_usermanager.php">User Manager</a></li>
   </ul>
   </td></tr>
   <tr>
@@ -106,13 +94,13 @@ if ($_GET['act'] == "del") {
   <?php $i = 0; foreach ($a_allowedips as $ip): ?>
 	<tr>
 	  <td class="listlr">
-		<?php if($ip['dir'] == "to")
+		<?php if($ip['dir'] == "to") 
 			echo "any <img src=\"in.gif\" width=\"11\" height=\"11\" align=\"absmiddle\">";
-		?>
+		?>	
 		<?=strtolower($ip['ip']);?>
-		<?php if($ip['dir'] == "from")
+		<?php if($ip['dir'] == "from") 
 			echo "<img src=\"in.gif\" width=\"11\" height=\"11\" align=\"absmiddle\"> any";
-		?>
+		?>	
 	  </td>
 	  <td class="listbg">
 		<?=htmlspecialchars($ip['descr']);?>&nbsp;
@@ -121,7 +109,7 @@ if ($_GET['act'] == "del") {
 		 &nbsp;<a href="services_captiveportal_ip.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this address?')"><img src="x.gif" width="17" height="17" border="0"></a></td>
 	</tr>
   <?php $i++; endforeach; ?>
-	<tr>
+	<tr> 
 	  <td class="list" colspan="2">&nbsp;</td>
 	  <td class="list"> <a href="services_captiveportal_ip_edit.php"><img src="plus.gif" width="17" height="17" border="0"></a></td>
 	</tr>
diff --git a/usr/local/www/services_captiveportal_ip_edit.php b/usr/local/www/services_captiveportal_ip_edit.php
index 38f7559..85911e6 100755
--- a/usr/local/www/services_captiveportal_ip_edit.php
+++ b/usr/local/www/services_captiveportal_ip_edit.php
@@ -1,22 +1,22 @@
 #!/usr/local/bin/php
-<?php
+<?php 
 /*
 	services_captiveportal_ip_edit.php
 	part of m0n0wall (http://m0n0.ch/wall)
-
+	
 	Copyright (C) 2004 Dinesh Nair <dinesh@alphaque.com>
 	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
@@ -56,9 +56,9 @@ if ($_POST) {
 	/* input validation */
 	$reqdfields = explode(" ", "ip dir");
 	$reqdfieldsn = explode(",", "Allowed IP address,Direction");
-
+	
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
-
+	
 	if (($_POST['ip'] && !is_ipaddr($_POST['ip']))) {
 		$input_errors[] = "A valid IP address must be specified. [".$_POST['ip']."]";
 	}
@@ -66,11 +66,11 @@ if ($_POST) {
 	foreach ($a_allowedips as $ipent) {
 		if (isset($id) && ($a_allowedips[$id]) && ($a_allowedips[$id] === $ipent))
 			continue;
-
+		
 		if (($ipent['dir'] == $_POST['dir']) && ($ipent['ip'] == $_POST['ip'])){
 			$input_errors[] = "[" . $_POST['ip'] . "] already allowed." ;
 			break ;
-		}
+		}	
 	}
 
 	if (!$input_errors) {
@@ -83,36 +83,25 @@ if ($_POST) {
 			$a_allowedips[$id] = $ip;
 		else
 			$a_allowedips[] = $ip;
-
+		
 		write_config();
 
 		touch($d_allowedipsdirty_path) ;
-
+		
 		header("Location: services_captiveportal_ip.php");
 		exit;
 	}
 }
 ?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("pfSense webGUI");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
-
-<form>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
             <form action="services_captiveportal_ip_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">Direction</td>
-                  <td width="78%" class="vtable">
+                  <td width="78%" class="vtable"> 
 					<select name="dir" class="formfld">
-					<?php
+					<?php 
 					$dirs = explode(" ", "From To") ;
 					foreach ($dirs as $dir): ?>
 					<option value="<?=strtolower($dir);?>" <?php if (strtolower($dir) == strtolower($pconfig['dir'])) echo "selected";?> >
@@ -120,27 +109,27 @@ if ($_POST) {
 					</option>
 					<?php endforeach; ?>
 					</select>
-                    <br>
-                    <span class="vexpl">Use <em>From</em> to always allow an IP address through the captive portal (without authentication).
+                    <br> 
+                    <span class="vexpl">Use <em>From</em> to always allow an IP address through the captive portal (without authentication). 
                     Use <em>To</em> to allow access from all clients (even non-authenticated ones) behind the portal to this IP address.</span></td>
                 </tr>
 				<tr>
                   <td width="22%" valign="top" class="vncellreq">IP address</td>
-                  <td width="78%" class="vtable">
+                  <td width="78%" class="vtable"> 
                     <?=$mandfldhtml;?><input name="ip" type="text" class="formfld" id="ip" size="17" value="<?=htmlspecialchars($pconfig['ip']);?>">
-                    <br>
+                    <br> 
                     <span class="vexpl">IP address</span></td>
                 </tr>
 				<tr>
                   <td width="22%" valign="top" class="vncell">Description</td>
-                  <td width="78%" class="vtable">
+                  <td width="78%" class="vtable"> 
                     <input name="descr" type="text" class="formfld" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
                     <br> <span class="vexpl">You may enter a description here
                     for your reference (not parsed).</span></td>
                 </tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
-                  <td width="78%">
+                  <td width="78%"> 
                     <input name="Submit" type="submit" class="formbtn" value="Save">
                     <?php if (isset($id) && $a_allowedips[$id]): ?>
                     <input name="id" type="hidden" value="<?=$id;?>">
diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php
index 87241e6..69cf90a 100755
--- a/usr/local/www/services_captiveportal_mac.php
+++ b/usr/local/www/services_captiveportal_mac.php
@@ -3,20 +3,20 @@
 /*
 	services_captiveportal_mac.php
 	part of m0n0wall (http://m0n0.ch/wall)
-
+	
 	Copyright (C) 2004 Dinesh Nair <dinesh@alphaque.com>
 	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
@@ -68,17 +68,6 @@ if ($_GET['act'] == "del") {
 	}
 }
 ?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("pfSense webGUI");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
-
-<form>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
 <form action="services_captiveportal_mac.php" method="post">
 <?php if ($savemsg) print_info_box($savemsg); ?>
@@ -92,7 +81,6 @@ if ($_GET['act'] == "del") {
 	<li class="tabinact1"><a href="services_captiveportal.php">Captive portal</a></li>
 	<li class="tabact">Pass-through MAC</li>
 	<li class="tabinact"><a href="services_captiveportal_ip.php">Allowed IP addresses</a></li>
-	<li class="tabinact"><a href="services_usermanager.php">User Manager</a></li>
   </ul>
   </td></tr>
   <tr>
@@ -115,7 +103,7 @@ if ($_GET['act'] == "del") {
 		 &nbsp;<a href="services_captiveportal_mac.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this host?')"><img src="x.gif" width="17" height="17" border="0"></a></td>
 	</tr>
   <?php $i++; endforeach; ?>
-	<tr>
+	<tr> 
 	  <td class="list" colspan="2">&nbsp;</td>
 	  <td class="list"> <a href="services_captiveportal_mac_edit.php"><img src="plus.gif" width="17" height="17" border="0"></a></td>
 	</tr>
diff --git a/usr/local/www/services_captiveportal_mac_edit.php b/usr/local/www/services_captiveportal_mac_edit.php
index f736582..f204d0f 100755
--- a/usr/local/www/services_captiveportal_mac_edit.php
+++ b/usr/local/www/services_captiveportal_mac_edit.php
@@ -1,22 +1,22 @@
 #!/usr/local/bin/php
-<?php
+<?php 
 /*
 	services_captiveportal_mac_edit.php
 	part of m0n0wall (http://m0n0.ch/wall)
-
+	
 	Copyright (C) 2004 Dinesh Nair <dinesh@alphaque.com>
 	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
@@ -55,11 +55,11 @@ if ($_POST) {
 	/* input validation */
 	$reqdfields = explode(" ", "mac");
 	$reqdfieldsn = explode(",", "MAC address");
-
+	
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
-
+	
 	$_POST['mac'] = str_replace("-", ":", $_POST['mac']);
-
+	
 	if (($_POST['mac'] && !is_macaddr($_POST['mac']))) {
 		$input_errors[] = "A valid MAC address must be specified. [".$_POST['mac']."]";
 	}
@@ -67,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) {
@@ -83,48 +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;
 	}
 }
 ?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("pfSense webGUI");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
-
-<form>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
             <form action="services_captiveportal_mac_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">MAC address</td>
-                  <td width="78%" class="vtable">
+                  <td width="78%" class="vtable"> 
                     <?=$mandfldhtml;?><input name="mac" type="text" class="formfld" id="mac" size="17" value="<?=htmlspecialchars($pconfig['mac']);?>">
-                    <br>
+                    <br> 
                     <span class="vexpl">MAC address (6 hex octets separated by colons)</span></td>
                 </tr>
 				<tr>
                   <td width="22%" valign="top" class="vncell">Description</td>
-                  <td width="78%" class="vtable">
+                  <td width="78%" class="vtable"> 
                     <input name="descr" type="text" class="formfld" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
                     <br> <span class="vexpl">You may enter a description here
                     for your reference (not parsed).</span></td>
                 </tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
-                  <td width="78%">
+                  <td width="78%"> 
                     <input name="Submit" type="submit" class="formbtn" value="Save">
                     <?php if (isset($id) && $a_passthrumacs[$id]): ?>
                     <input name="id" type="hidden" value="<?=$id;?>">
author	Scott Ullrich <sullrich@pfsense.org>	2005-03-14 01:37:56 +0000
committer	Scott Ullrich <sullrich@pfsense.org>	2005-03-14 01:37:56 +0000
commit	ec9202316f33fd6169756447e2c8230907ec68ab (patch)
tree	2bfe7c6e6daa80d93b885328a06485d5f0c4ae24 /usr
parent	27537c5a8e1989fa510e6a4fbd742d27a945a277 (diff)
download	pfsense-ec9202316f33fd6169756447e2c8230907ec68ab.zip pfsense-ec9202316f33fd6169756447e2c8230907ec68ab.tar.gz