Sync w/ m0n0wall 1.21

8 files changed, 439 insertions, 160 deletions

diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php
index feeddfc..e1e7a36 100755
--- a/usr/local/www/services_captiveportal.php
+++ b/usr/local/www/services_captiveportal.php
@@ -3,7 +3,7 @@
 	services_captiveportal.php
 	part of m0n0wall (http://m0n0.ch/wall)
 	
-	Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
+	Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
 	All rights reserved.
 	
 	Redistribution and use in source and binary forms, with or without
@@ -28,6 +28,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+$pgtitle = "Services:Captive portal";
 require("guiconfig.inc");
 
 if (!is_array($config['captiveportal'])) {
@@ -45,11 +46,15 @@ if ($_GET['act'] == "viewhtml") {
 }
 
 $pconfig['cinterface'] = $config['captiveportal']['interface'];
+$pconfig['maxproc'] = $config['captiveportal']['maxproc'];
+$pconfig['maxprocperip'] = $config['captiveportal']['maxprocperip'];
 $pconfig['timeout'] = $config['captiveportal']['timeout'];
 $pconfig['idletimeout'] = $config['captiveportal']['idletimeout'];
 $pconfig['enable'] = isset($config['captiveportal']['enable']);
 $pconfig['auth_method'] = $config['captiveportal']['auth_method'];
 $pconfig['radacct_enable'] = isset($config['captiveportal']['radacct_enable']);
+$pconfig['radmac_enable'] = isset($config['captiveportal']['radmac_enable']);
+$pconfig['radmac_secret'] = $config['captiveportal']['radmac_secret'];
 $pconfig['reauthenticate'] = isset($config['captiveportal']['reauthenticate']);
 $pconfig['reauthenticateacct'] = $config['captiveportal']['reauthenticateacct'];
 $pconfig['httpslogin_enable'] = isset($config['captiveportal']['httpslogin']);
@@ -58,11 +63,17 @@ $pconfig['cert'] = base64_decode($config['captiveportal']['certificate']);
 $pconfig['key'] = base64_decode($config['captiveportal']['private-key']);
 $pconfig['logoutwin_enable'] = isset($config['captiveportal']['logoutwin_enable']);
 $pconfig['nomacfilter'] = isset($config['captiveportal']['nomacfilter']);
+$pconfig['noconcurrentlogins'] = isset($config['captiveportal']['noconcurrentlogins']);
 $pconfig['redirurl'] = $config['captiveportal']['redirurl'];
 $pconfig['radiusip'] = $config['captiveportal']['radiusip'];
+$pconfig['radiusip2'] = $config['captiveportal']['radiusip2'];
 $pconfig['radiusport'] = $config['captiveportal']['radiusport'];
+$pconfig['radiusport2'] = $config['captiveportal']['radiusport2'];
 $pconfig['radiusacctport'] = $config['captiveportal']['radiusacctport'];
 $pconfig['radiuskey'] = $config['captiveportal']['radiuskey'];
+$pconfig['radiuskey2'] = $config['captiveportal']['radiuskey2'];
+$pconfig['radiusvendor'] = $config['captiveportal']['radiusvendor'];
+$pconfig['radiussession_timeout'] = isset($config['captiveportal']['radiussession_timeout']);
 
 if ($_POST) {
 
@@ -76,6 +87,15 @@ if ($_POST) {
 		
 		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];
+			if (isset($coptif['enable']) && $coptif['bridge']) {
+				$input_errors[] = "The captive portal cannot be used when one or more interfaces are bridged.";
+				break;
+			}
+		}
+		
 		if ($_POST['httpslogin_enable']) {
 		 	if (!$_POST['cert'] || !$_POST['key']) {
 				$input_errors[] = "Certificate and key must be specified for HTTPS login.";
@@ -101,57 +121,56 @@ if ($_POST) {
 	if (($_POST['radiusip'] && !is_ipaddr($_POST['radiusip']))) {
 		$input_errors[] = "A valid IP address must be specified. [".$_POST['radiusip']."]";
 	}
+	if (($_POST['radiusip2'] && !is_ipaddr($_POST['radiusip2']))) {
+		$input_errors[] = "A valid IP address must be specified. [".$_POST['radiusip2']."]";
+	}
 	if (($_POST['radiusport'] && !is_port($_POST['radiusport']))) {
 		$input_errors[] = "A valid port number must be specified. [".$_POST['radiusport']."]";
 	}
+	if (($_POST['radiusport2'] && !is_port($_POST['radiusport2']))) {
+		$input_errors[] = "A valid port number must be specified. [".$_POST['radiusport2']."]";
+	}
 	if (($_POST['radiusacctport'] && !is_port($_POST['radiusacctport']))) {
-		$input_errors[] = "A valid port number must be specified. [".$_POST['radiusport']."]";
+		$input_errors[] = "A valid port number must be specified. [".$_POST['radiusacctport']."]";
+	}
+	if ($_POST['maxproc'] && (!is_numeric($_POST['maxproc']) || ($_POST['maxproc'] < 4) || ($_POST['maxproc'] > 100))) {
+		$input_errors[] = "The total maximum number of concurrent connections must be between 4 and 100.";
+	}
+	$mymaxproc = $_POST['maxproc'] ? $_POST['maxproc'] : 16;
+	if ($_POST['maxprocperip'] && (!is_numeric($_POST['maxprocperip']) || ($_POST['maxprocperip'] > $mymaxproc))) {
+		$input_errors[] = "The maximum number of concurrent connections per client IP address may not be larger than the global maximum.";
 	}
 
 	if (!$input_errors) {
 		$config['captiveportal']['interface'] = $_POST['cinterface'];
+		$config['captiveportal']['maxproc'] = $_POST['maxproc'];
+		$config['captiveportal']['maxprocperip'] = $_POST['maxprocperip'] ? $_POST['maxprocperip'] : false;
 		$config['captiveportal']['timeout'] = $_POST['timeout'];
 		$config['captiveportal']['idletimeout'] = $_POST['idletimeout'];
+		$config['captiveportal']['enable'] = $_POST['enable'] ? true : false;
 		$config['captiveportal']['auth_method'] = $_POST['auth_method'];
+		$config['captiveportal']['radacct_enable'] = $_POST['radacct_enable'] ? true : false;
+		$config['captiveportal']['reauthenticate'] = $_POST['reauthenticate'] ? true : false;
+		$config['captiveportal']['radmac_enable'] = $_POST['radmac_enable'] ? true : false;
+		$config['captiveportal']['radmac_secret'] = $_POST['radmac_secret'] ? $_POST['radmac_secret'] : false;
 		$config['captiveportal']['reauthenticateacct'] = $_POST['reauthenticateacct'];
+		$config['captiveportal']['httpslogin'] = $_POST['httpslogin_enable'] ? true : false;
 		$config['captiveportal']['httpsname'] = $_POST['httpsname'];
 		$config['captiveportal']['certificate'] = base64_encode($_POST['cert']);
 		$config['captiveportal']['private-key'] = base64_encode($_POST['key']);
+		$config['captiveportal']['logoutwin_enable'] = $_POST['logoutwin_enable'] ? true : false;
+		$config['captiveportal']['nomacfilter'] = $_POST['nomacfilter'] ? true : false;
+		$config['captiveportal']['noconcurrentlogins'] = $_POST['noconcurrentlogins'] ? true : false;
 		$config['captiveportal']['redirurl'] = $_POST['redirurl'];
 		$config['captiveportal']['radiusip'] = $_POST['radiusip'];
+		$config['captiveportal']['radiusip2'] = $_POST['radiusip2'];
 		$config['captiveportal']['radiusport'] = $_POST['radiusport'];
+		$config['captiveportal']['radiusport2'] = $_POST['radiusport2'];
 		$config['captiveportal']['radiusacctport'] = $_POST['radiusacctport'];
 		$config['captiveportal']['radiuskey'] = $_POST['radiuskey'];
-
-		if($_POST['radacct_enable'] == "yes")
-			$config['captiveportal']['radacct_enable'] = true;
-		else 
-			unset($config['captiveportal']['radacct_enable']);
-
-		if($_POST['reauthenticate'] == "yes")
-			$config['captiveportal']['reauthenticate'] = true;
-		else
-			unset($config['captiveportal']['reauthenticate']);
-		
-		if($_POST['enable'] == "yes")
-			$config['captiveportal']['enable'] = true;
-		else
-			unset($config['captiveportal']['enable']);
-			
-		if($_POST['httpslogin_enable'] == "yes")
-			$config['captiveportal']['httpslogin'] =  true;
-		else
-			unset($config['captiveportal']['httpslogin']);
-		
-		if($_POST['logoutwin_enable'] == "yes")
-			$config['captiveportal']['logoutwin_enable'] = true;
-		else
-			unset($config['captiveportal']['logoutwin_enable']);
-
-		if($_POST['nomacfilter'] == "yes")
-			$config['captiveportal']['nomacfilter'] = true;
-		else
-			unset($config['captiveportal']['nomacfilter']);
+		$config['captiveportal']['radiuskey2'] = $_POST['radiuskey2'];
+		$config['captiveportal']['radiusvendor'] = $_POST['radiusvendor'] ? $_POST['radiusvendor'] : false;
+		$config['captiveportal']['radiussession_timeout'] = $_POST['radiussession_timeout'] ? true : false;
 		
 		/* file upload? */
 		if (is_uploaded_file($_FILES['htmlfile']['tmp_name']))
@@ -162,55 +181,68 @@ if ($_POST) {
 		write_config();
 		
 		$retval = 0;
-
-		config_lock();
-		$retval = captiveportal_configure();
-		config_unlock();
-
+		if (!file_exists($d_sysrebootreqd_path)) {
+			config_lock();
+			$retval = captiveportal_configure();
+			config_unlock();
+		}
 		$savemsg = get_std_save_message($retval);
 	}
 }
-
-$pgtitle = "Services: Captive Portal";
 include("head.inc");
-
 ?>
-<body link="#000000" vlink="#000000" alink="#000000">
 <?php include("fbegin.inc"); ?>
 <script language="JavaScript">
 <!--
 function enable_change(enable_change) {
-	var endis;
+	var endis, radius_endis;
 	endis = !(document.iform.enable.checked || enable_change);
+	radius_endis = !((!endis && document.iform.auth_method[2].checked) || enable_change);
 	
 	document.iform.cinterface.disabled = endis;
+	document.iform.maxproc.disabled = endis;
+	document.iform.maxprocperip.disabled = endis;
 	document.iform.idletimeout.disabled = endis;
 	document.iform.timeout.disabled = endis;
 	document.iform.redirurl.disabled = endis;
-	document.iform.radiusip.disabled = endis;
-	document.iform.radiusport.disabled = endis;
-	document.iform.radiuskey.disabled = endis;
-	document.iform.radacct_enable.disabled = endis;
-	document.iform.radiusacctport.disabled = endis;
-	document.iform.reauthenticate.disabled = endis;
-	document.iform.reauthenticateacct.disabled = endis;
+	document.iform.radiusip.disabled = radius_endis;
+	document.iform.radiusip2.disabled = radius_endis;
+	document.iform.radiusport.disabled = radius_endis;
+	document.iform.radiusport2.disabled = radius_endis;
+	document.iform.radiuskey.disabled = radius_endis;
+	document.iform.radiuskey2.disabled = radius_endis;
+	document.iform.radacct_enable.disabled = radius_endis;
+	document.iform.reauthenticate.disabled = radius_endis;
 	document.iform.auth_method[0].disabled = endis;
 	document.iform.auth_method[1].disabled = endis;
 	document.iform.auth_method[2].disabled = endis;
+	document.iform.radmac_enable.disabled = radius_endis;
 	document.iform.httpslogin_enable.disabled = endis;
 	document.iform.httpsname.disabled = endis;
 	document.iform.cert.disabled = endis;
 	document.iform.key.disabled = endis;
 	document.iform.logoutwin_enable.disabled = endis;
 	document.iform.nomacfilter.disabled = endis;
+	document.iform.noconcurrentlogins.disabled = endis;
+	document.iform.radiusvendor.disabled = radius_endis;
+	document.iform.radiussession_timeout.disabled = radius_endis;
 	document.iform.htmlfile.disabled = endis;
 	document.iform.errfile.disabled = endis;
+	
+	document.iform.radiusacctport.disabled = (radius_endis || !document.iform.radacct_enable.checked) && !enable_change;
+	
+	document.iform.radmac_secret.disabled = (radius_endis || !document.iform.radmac_enable.checked) && !enable_change;
+	
+	var reauthenticate_dis = (radius_endis || !document.iform.reauthenticate.checked) && !enable_change;
+	document.iform.reauthenticateacct[0].disabled = reauthenticate_dis;
+	document.iform.reauthenticateacct[1].disabled = reauthenticate_dis;
+	document.iform.reauthenticateacct[2].disabled = reauthenticate_dis;
 }
 //-->
 </script>
-<p class="pgtitle">Services: Captive portal</p>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
 <form action="services_captiveportal.php" method="post" enctype="multipart/form-data" name="iform" id="iform">
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
@@ -220,9 +252,9 @@ function enable_change(enable_change) {
 	$tab_array[] = array("Pass-through MAC", false, "services_captiveportal_mac.php");
 	$tab_array[] = array("Allowed IP addresses", false, "services_captiveportal_ip.php");
 	$tab_array[] = array("Users", false, "services_captiveportal_users.php");
+	$tab_array[] = array("File Manager", true, "services_captiveportal_filemanager.php");
 	display_top_tabs($tab_array);
-?>  
-  </td></tr>
+?>    </td></tr>
   <tr>
   <td class="tabcont">
   <table width="100%" border="0" cellpadding="6" cellspacing="0">
@@ -250,6 +282,21 @@ function enable_change(enable_change) {
 		<span class="vexpl">Choose which interface to run the captive portal on.</span></td>
 	</tr>
 	<tr>
+	  <td valign="top" class="vncell">Maximum concurrent connections</td>
+	  <td class="vtable">
+		<table cellpadding="0" cellspacing="0">
+                 <tr>
+           <td><input name="maxprocperip" type="text" class="formfld" id="maxprocperip" size="5" value="<?=htmlspecialchars($pconfig['maxprocperip']);?>"> per client IP address (0 = no limit)</td>
+                 </tr>
+                 <tr>
+           <td><input name="maxproc" type="text" class="formfld" id="maxproc" size="5" value="<?=htmlspecialchars($pconfig['maxproc']);?>"> total</td>
+                 </tr>
+               </table>
+This setting limits the number of concurrent connections to the captive portal HTTP(S) server. This does not set how many users can be logged in
+to the captive portal, but rather how many users can load the portal page or authenticate at the same time!
+Default is 4 connections per client IP address, with a total maximum of 16 connections.</td>
+	</tr>
+	<tr>
 	  <td valign="top" class="vncell">Idle timeout</td>
 	  <td class="vtable">
 		<input name="idletimeout" type="text" class="formfld" id="idletimeout" size="6" value="<?=htmlspecialchars($pconfig['idletimeout']);?>">
@@ -279,69 +326,169 @@ If you provide a URL here, clients will be redirected to that URL instead of the
 to access after they've authenticated.</td>
 	</tr>
 	<tr>
+      <td valign="top" class="vncell">Concurrent user logins</td>
+      <td class="vtable">
+	<input name="noconcurrentlogins" type="checkbox" class="formfld" id="noconcurrentlogins" value="yes" <?php if ($pconfig['noconcurrentlogins']) echo "checked"; ?>>
+	<strong>Disable concurrent logins</strong><br>
+	If this option is set, only the most recent login per username will be active. Subsequent logins will cause machines previously logged in with the same username to be disconnected.</td>
+	</tr>
+	<tr>
       <td valign="top" class="vncell">MAC filtering </td>
       <td class="vtable">
         <input name="nomacfilter" type="checkbox" class="formfld" id="nomacfilter" value="yes" <?php if ($pconfig['nomacfilter']) echo "checked"; ?>>
         <strong>Disable MAC filtering</strong><br>
-    If this option is set, no attempts will be made to ensure that the MAC address of clients stays the same while they're logged in. This is required when the MAC address of cannot be determined (usually because there are routers between pfSense and the clients).</td>
+    If this option is set, no attempts will be made to ensure that the MAC address of clients stays the same while they're logged in.
+    This is required when the MAC address of the client cannot be determined (usually because there are routers between m0n0wall and the clients).
+    If this is enabled, RADIUS MAC authentication cannot be used.</td>
 	  </tr>
 	<tr> 
 	  <td width="22%" valign="top" class="vncell">Authentication</td>
 	  <td width="78%" class="vtable"> 
 		<table cellpadding="0" cellspacing="0">
 		<tr>
-		  <td colspan="2"><input name="auth_method" type="radio" id="auth_method" value="none" <?php if($pconfig['auth_method']!="local" && $pconfig['auth_method']!="radius") echo "checked"; ?>>
+		  <td colspan="2"><input name="auth_method" type="radio" id="auth_method" value="none" onClick="enable_change(false)" <?php if($pconfig['auth_method']!="local" && $pconfig['auth_method']!="radius") echo "checked"; ?>>
   No authentication</td>  
 		  </tr>
 		<tr>
-		  <td colspan="2"><input name="auth_method" type="radio" id="auth_method" value="local" <?php if($pconfig['auth_method']=="local") echo "checked"; ?>>
+		  <td colspan="2"><input name="auth_method" type="radio" id="auth_method" value="local" onClick="enable_change(false)" <?php if($pconfig['auth_method']=="local") echo "checked"; ?>>
   Local <a href="services_captiveportal_users.php">user manager</a></td>  
 		  </tr>
 		<tr>
-		  <td colspan="2"><input name="auth_method" type="radio" id="auth_method" value="radius" <?php if($pconfig['auth_method']=="radius") echo "checked"; ?>>
+		  <td colspan="2"><input name="auth_method" type="radio" id="auth_method" value="radius" onClick="enable_change(false)" <?php if($pconfig['auth_method']=="radius") echo "checked"; ?>>
   RADIUS authentication</td>  
 		  </tr><tr>
 		  <td>&nbsp;</td>
 		  <td>&nbsp;</td>
 		  </tr>
-		<tr>
-		<td>IP address:</td>
-		<td><input name="radiusip" type="text" class="formfld" id="radiusip" size="20" value="<?=htmlspecialchars($pconfig['radiusip']);?>"></td>
-		</tr><tr>
-		<td>Port:</td>
-		<td><input name="radiusport" type="text" class="formfld" id="radiusport" size="5" value="<?=htmlspecialchars($pconfig['radiusport']);?>"></td>
-		</tr><tr>
-		<td>Shared secret:&nbsp;&nbsp;</td>
-		<td><input name="radiuskey" type="text" class="formfld" id="radiuskey" size="16" value="<?=htmlspecialchars($pconfig['radiuskey']);?>"> </td>
- 		</tr>
-		<tr>
-          <td>Accounting:&nbsp;&nbsp;</td>
-          <td><input name="radacct_enable" type="checkbox" id="radacct_enable" value="yes" <?php if($pconfig['radacct_enable']) echo "checked"; ?>>
-          send RADIUS accounting packets</td>
-		  </tr>
-		<tr>
-          <td>Accounting port:&nbsp;&nbsp;</td>
-          <td><input name="radiusacctport" type="text" class="formfld" id="radiusacctport" size="5" value="<?=htmlspecialchars($pconfig['radiusacctport']);?>"></td>
-		  </tr>
-		<tr>
-          <td valign="top">Reauthentication:&nbsp;&nbsp;</td>
-          <td><input name="reauthenticate" type="checkbox" id="reauthenticate" value="yes" <?php if($pconfig['reauthenticate']) echo "checked"; ?>>
-          reauthenticate connected users every minute<br><br>
-          <input name="reauthenticateacct" type="radio" value="" <?php if(!$pconfig['reauthenticateacct']) echo "checked"; ?>> no accounting updates<br>
-          <input name="reauthenticateacct" type="radio" value="stopstart" <?php if($pconfig['reauthenticateacct'] == "stopstart") echo "checked"; ?>> stop/start accounting<br>
-          <input name="reauthenticateacct" type="radio" value="interimupdate" <?php if($pconfig['reauthenticateacct'] == "interimupdate") echo "checked"; ?>> interim update</td>
-		  </tr>
 		</table>
- 		<br>
- 	When using RADIUS authentication, enter the IP address and port of the RADIUS server which users of the captive portal have to authenticate against.  Leave port number blank to use the default port (1812). Leave the RADIUS shared secret blank to not use a RADIUS shared secret. RADIUS accounting packets will also be sent to the RADIUS server if  accounting is enabled (default port is 1813).
- 	<br><br>If reauthentication is enabled, Access-Requests will be sent to the RADIUS server for each user that is logged in every minute. If an Access-Reject is received for a user, that user is disconnected from the captive portal immediately.
+		<table width="100%" border="0" cellpadding="6" cellspacing="0">
+        	<tr> 
+            	<td colspan="2" valign="top" class="optsect_t2">Primary RADIUS server</td>
+			</tr>
+			<tr>
+				<td class="vncell" valign="top">IP address</td>
+				<td class="vtable"><input name="radiusip" type="text" class="formfld" id="radiusip" size="20" value="<?=htmlspecialchars($pconfig['radiusip']);?>"><br>
+				Enter the IP address of the RADIUS server which users of the captive portal have to authenticate against.</td>
+			</tr>
+			<tr>
+				<td class="vncell" valign="top">Port</td>
+				<td class="vtable"><input name="radiusport" type="text" class="formfld" id="radiusport" size="5" value="<?=htmlspecialchars($pconfig['radiusport']);?>"><br>
+				 Leave this field blank to use the default port (1812).</td>
+			</tr>
+			<tr>
+				<td class="vncell" valign="top">Shared secret&nbsp;&nbsp;</td>
+				<td class="vtable"><input name="radiuskey" type="text" class="formfld" id="radiuskey" size="16" value="<?=htmlspecialchars($pconfig['radiuskey']);?>"><br>
+				Leave this field blank to not use a RADIUS shared secret (not recommended).</td>
+			</tr>
+			<tr> 
+			  <td colspan="2" class="list" height="12"></td>
+			</tr>
+			<tr>
+				<td colspan="2" valign="top" class="optsect_t2">Secondary RADIUS server</td>
+			</tr>
+			<tr>
+				<td class="vncell" valign="top">IP address</td>
+				<td class="vtable"><input name="radiusip2" type="text" class="formfld" id="radiusip2" size="20" value="<?=htmlspecialchars($pconfig['radiusip2']);?>"><br>
+				If you have a second RADIUS server, you can activate it by entering its IP address here.</td>
+			</tr>
+			<tr>
+				<td class="vncell" valign="top">Port</td>
+				<td class="vtable"><input name="radiusport2" type="text" class="formfld" id="radiusport2" size="5" value="<?=htmlspecialchars($pconfig['radiusport2']);?>"></td>
+			</tr>
+			<tr>
+				<td class="vncell" valign="top">Shared secret&nbsp;&nbsp;</td>
+				<td class="vtable"><input name="radiuskey2" type="text" class="formfld" id="radiuskey2" size="16" value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td>
+			</tr>
+			<tr> 
+			  <td colspan="2" class="list" height="12"></td>
+			</tr>
+			<tr>
+				<td colspan="2" valign="top" class="optsect_t2">Accounting</td>
+			</tr>
+			<tr>
+				<td class="vncell">&nbsp;</td>
+				<td class="vtable"><input name="radacct_enable" type="checkbox" id="radacct_enable" value="yes" onClick="enable_change(false)" <?php if($pconfig['radacct_enable']) echo "checked"; ?>>
+				<strong>send RADIUS accounting packets</strong><br>
+				If this is enabled, RADIUS accounting packets will be sent to the primary RADIUS server.</td>
+			</tr>
+			<tr>
+			  <td class="vncell" valign="top">Accounting port</td>
+			  <td class="vtable"><input name="radiusacctport" type="text" class="formfld" id="radiusacctport" size="5" value="<?=htmlspecialchars($pconfig['radiusacctport']);?>"><br>
+			  Leave blank to use the default port (1813).</td>
+			  </tr>
+			<tr>
+			  <td colspan="2" class="list" height="12"></td>
+			</tr>
+			<tr>
+				<td colspan="2" valign="top" class="optsect_t2">Reauthentication</td>
+			</tr>
+			<tr>
+				<td class="vncell">&nbsp;</td>
+				<td class="vtable"><input name="reauthenticate" type="checkbox" id="reauthenticate" value="yes" onClick="enable_change(false)" <?php if($pconfig['reauthenticate']) echo "checked"; ?>>
+			  <strong>Reauthenticate connected users every minute</strong><br>
+			  If reauthentication is enabled, Access-Requests will be sent to the RADIUS server for each user that is
+			  logged in every minute. If an Access-Reject is received for a user, that user is disconnected from the captive portal immediately.</td>
+			</tr>
+			<tr>
+			  <td class="vncell" valign="top">Accounting updates</td>
+			  <td class="vtable">
+			  <input name="reauthenticateacct" type="radio" value="" <?php if(!$pconfig['reauthenticateacct']) echo "checked"; ?>> no accounting updates<br>
+			  <input name="reauthenticateacct" type="radio" value="stopstart" <?php if($pconfig['reauthenticateacct'] == "stopstart") echo "checked"; ?>> stop/start accounting<br>
+			  <input name="reauthenticateacct" type="radio" value="interimupdate" <?php if($pconfig['reauthenticateacct'] == "interimupdate") echo "checked"; ?>> interim update
+			  </td>
+			</tr>
+			<tr>
+			  <td colspan="2" class="list" height="12"></td>
+			</tr>
+			<tr>
+				<td colspan="2" valign="top" class="optsect_t2">RADIUS MAC authentication</td>
+			</tr>
+			<tr>
+				<td class="vncell">&nbsp;</td>
+				<td class="vtable">
+				<input name="radmac_enable" type="checkbox" id="radmac_enable" value="yes" onClick="enable_change(false)" <?php if ($pconfig['radmac_enable']) echo "checked"; ?>><strong>Enable RADIUS MAC authentication</strong><br>
+				If this option is enabled, the captive portal will try to authenticate users by sending their MAC address as the username and the password
+				entered below to the RADIUS server.</td>
+			</tr>
+			<tr>
+				<td class="vncell">Shared secret</td>
+				<td class="vtable"><input name="radmac_secret" type="text" class="formfld" id="radmac_secret" size="16" value="<?=htmlspecialchars($pconfig['radmac_secret']);?>"></td>
+			</tr>
+			<tr>
+			  <td colspan="2" class="list" height="12"></td>
+			</tr>
+			<tr>
+				<td colspan="2" valign="top" class="optsect_t2">RADIUS options</td>
+			</tr>
+			<tr>
+				<td class="vncell" valign="top">Session-Timeout</td>
+				<td class="vtable"><input name="radiussession_timeout" type="checkbox" id="radiussession_timeout" value="yes" <?php if ($pconfig['radiussession_timeout']) echo "checked"; ?>><strong>Use RADIUS Session-Timeout attributes</strong><br>
+				When this is enabled, clients will be disconnected after the amount of time retrieved from the RADIUS Session-Timeout attribute.</td>
+			</tr>
+			<tr>
+				<td class="vncell" valign="top">Type</td>
+				<td class="vtable"><select name="radiusvendor" id="radiusvendor">
+				<option>default</option>
+				<?php 
+				$radiusvendors = array("cisco");
+				foreach ($radiusvendors as $radiusvendor){
+					if ($pconfig['radiusvendor'] == $radiusvendor)
+						echo "<option selected value=\"$radiusvendor\">$radiusvendor</option>\n";
+					else
+						echo "<option value=\"$radiusvendor\">$radiusvendor</option>\n";
+				}
+				?></select><br>
+				If RADIUS type is set to Cisco, in Access-Requests the value of Calling-Station-Id will be set to the client's IP address and
+				the Called-Station-Id to the client's MAC address. Default behaviour is Calling-Station-Id = client's MAC address and Called-Station-Id = m0n0wall's WAN IP address.</td>
+			</tr>
+		</table>
 	</tr>
 	<tr>
       <td valign="top" class="vncell">HTTPS login</td>
       <td class="vtable">
         <input name="httpslogin_enable" type="checkbox" class="formfld" id="httpslogin_enable" value="yes" <?php if($pconfig['httpslogin_enable']) echo "checked"; ?>>
         <strong>Enable HTTPS login</strong><br>
-    If enabled, the username and password will be transmitted over an HTTPS connection to protect against eavesdroppers. This option only applies when RADIUS authentication is used. A server name, certificate and matching private key must also be specified below.</td>
+    If enabled, the username and password will be transmitted over an HTTPS connection to protect against eavesdroppers. A server name, certificate and matching private key must also be specified below.</td>
 	  </tr>
 	<tr>
       <td valign="top" class="vncell">HTTPS server name </td>
@@ -373,7 +520,9 @@ to access after they've authenticated.</td>
 		  <br>
 		<?php endif; ?>
 		  Upload an HTML file for the portal page here (leave blank to keep the current one). Make sure to include a form (POST to &quot;$PORTAL_ACTION$&quot;)
-with a submit button (name=&quot;accept&quot;) and a hidden field with name=&quot;redirurl&quot; and value=&quot;$PORTAL_REDIRURL$&quot;. Include the &quot;auth_user&quot; and &quot;auth_pass&quot; input elements if RADIUS authentication is enabled. If RADIUS is enabled and no &quot;auth_user&quot; is present, authentication will always fail. If RADIUS is not enabled, you can omit both of these input elements. Example code for the form:<br>
+with a submit button (name=&quot;accept&quot;) and a hidden field with name=&quot;redirurl&quot; and value=&quot;$PORTAL_REDIRURL$&quot;.
+Include the &quot;auth_user&quot; and &quot;auth_pass&quot; input fields if authentication is enabled, otherwise it will always fail.
+Example code for the form:<br>
 		  <br>
 		  <tt>&lt;form method=&quot;post&quot; action=&quot;$PORTAL_ACTION$&quot;&gt;<br>
 		  &nbsp;&nbsp;&nbsp;&lt;input name=&quot;auth_user&quot; type=&quot;text&quot;&gt;<br>
@@ -393,7 +542,8 @@ with a submit button (name=&quot;accept&quot;) and a hidden field with name=&quo
 		  <br>
 		  <br>
 		<?php endif; ?>
-The contents of the HTML file that you upload here are displayed when a RADIUS authentication error occurs.</td>
+The contents of the HTML file that you upload here are displayed when an authentication error occurs.
+You may include &quot;$PORTAL_MESSAGE$&quot;, which will be replaced by the error or reply messages from the RADIUS server, if any.</td>
 	</tr>
 	<tr> 
 	  <td width="22%" valign="top">&nbsp;</td>
diff --git a/usr/local/www/services_captiveportal_filemanager.php b/usr/local/www/services_captiveportal_filemanager.php
new file mode 100755
index 0000000..dc52194
--- /dev/null
+++ b/usr/local/www/services_captiveportal_filemanager.php
@@ -0,0 +1,168 @@
+<?php
+/*
+	services_captiveportal_filemanager.php
+	part of m0n0wall (http://m0n0.ch/wall)
+
+	Copyright (C) 2005-2006 Jonathan De Graeve (jonathan.de.graeve@imelda.be)
+	and Paul Taylor (paultaylor@winn-dixie.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
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+$pgtitle = "Services:Captive portal";
+
+require_once("guiconfig.inc");
+
+if (!is_array($config['captiveportal']['element']))
+	$config['captiveportal']['element'] = array();
+
+cpelements_sort();
+$a_element = &$config['captiveportal']['element'];
+
+// Calculate total size of all files
+$total_size = 0;
+foreach ($a_element as $element) {
+	$total_size += $element['size'];
+}
+
+if ($_POST) {
+    unset($input_errors);
+    
+    if (is_uploaded_file($_FILES['new']['tmp_name'])) {
+    	
+    	$name = $_FILES['new']['name'];
+    	$size = filesize($_FILES['new']['tmp_name']);
+    	
+    	// is there already a file with that name?
+    	foreach ($a_element as $element) {
+			if ($element['name'] == $name) {
+				$input_errors[] = "A file with the name '$name' already exists.";
+				break;
+			}
+		}
+		
+		// check total file size
+		if (($total_size + $size) > $g['captiveportal_element_sizelimit']) {
+			$input_errors[] = "The total size of all files uploaded may not exceed " .
+				format_bytes($g['captiveportal_element_sizelimit']) . ".";
+		}
+		
+		if (!$input_errors) {
+			$element = array();
+			$element['name'] = $name;
+			$element['size'] = $size;
+			$element['content'] = base64_encode(file_get_contents($_FILES['new']['tmp_name']));
+			
+			$a_element[] = $element;
+			
+			write_config();
+			captiveportal_write_elements();
+			header("Location: services_captiveportal_filemanager.php");
+			exit;
+		}
+    }
+} else {
+	if (($_GET['act'] == "del") && $a_element[$_GET['id']]) {
+		unset($a_element[$_GET['id']]);
+		write_config();
+		captiveportal_write_elements();
+		header("Location: services_captiveportal_filemanager.php");
+		exit;
+	}
+}
+
+include("head.inc");
+
+?>
+<?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
+<form action="services_captiveportal_filemanager.php" method="post" enctype="multipart/form-data" name="iform" id="iform">
+<?php if ($input_errors) print_input_errors($input_errors); ?>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr><td class="tabnavtbl">
+<?php
+	$tab_array = array();
+	$tab_array[] = array("Captive portal", false, "services_captiveportal.php");
+	$tab_array[] = array("Pass-through MAC", false, "services_captiveportal_mac.php");
+	$tab_array[] = array("Allowed IP addresses", false, "services_captiveportal_ip.php");
+	$tab_array[] = array("Users", false, "services_captiveportal_users.php");
+	$tab_array[] = array("File Manager", true, "services_captiveportal_filemanager.php");
+	display_top_tabs($tab_array);
+?>  </td></tr>
+  <tr>
+    <td class="tabcont">
+	<table width="80%" border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <td width="70%" class="listhdrr">Name</td>
+        <td width="20%" class="listhdr">Size</td>
+        <td width="10%" class="list"></td>
+      </tr>
+  <?php $i = 0; foreach ($a_element as $element): ?>
+  	  <tr>
+		<td class="listlr"><?=htmlspecialchars($element['name']);?></td>
+		<td class="listr" align="right"><?=format_bytes($element['size']);?></td>
+		<td valign="middle" nowrap class="list">
+		<a href="services_captiveportal_filemanager.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this file?')"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_x.gif" title="delete file" width="17" height="17" border="0"></a>
+		</td>
+	  </tr>
+  <?php $i++; endforeach; ?>
+  
+  <?php if (count($a_element) > 0): ?>
+  	  <tr>
+		<td class="listlr" style="background-color: #eee"><strong>TOTAL</strong></td>
+		<td class="listr" style="background-color: #eee" align="right"><strong><?=format_bytes($total_size);?></strong></td>
+		<td valign="middle" nowrap class="list"></td>
+	  </tr>
+  <?php endif; ?>
+  
+  <?php if ($_GET['act'] == 'add'): ?>
+	  <tr>
+		<td class="listlr" colspan="2"><input type="file" name="new" class="formfld" size="40" id="new"> 
+		<input name="Submit" type="submit" class="formbtn" value="Upload"></td>
+		<td valign="middle" nowrap class="list">
+		<a href="services_captiveportal_filemanager.php"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_x.gif" title="cancel" width="17" height="17" border="0"></a>
+		</td>
+	  </tr>
+  <?php else: ?>
+	  <tr>
+		<td class="list" colspan="2"></td>
+		<td class="list"> <a href="services_captiveportal_filemanager.php?act=add"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_plus.gif" title="add file" width="17" height="17" border="0"></a></td>
+	  </tr>
+  <?php endif; ?>
+	</table>
+	<span class="vexpl"><span class="red"><strong>
+	Note:<br>
+	</strong></span>
+	Any files that you upload here will be made available in the root directory
+	of the captive portal HTTP(S) server. You may reference them directly from
+	your portal page HTML code using relative paths. Example: you've uploaded
+	an image with the name 'test.jpg' using the file manager. Then you can
+	include it in your portal page like this:<br><br>
+	<tt>&lt;img src=&quot;test.jpg&quot; width=... height=...&gt;</tt>
+	<br><br>
+	The total size limit for all files is <?=format_bytes($g['captiveportal_element_sizelimit']);?>.</span>
+</td>
+</tr>
+</table>
+</form>
+<?php include("fend.inc"); ?>	
diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php
index 0ed1632..b0f9a40 100755
--- a/usr/local/www/services_captiveportal_ip.php
+++ b/usr/local/www/services_captiveportal_ip.php
@@ -28,7 +28,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-$pgtitle = array("Services", "Captive portal");
+$pgtitle = "Services:Captive portal";
 require("guiconfig.inc");
 
 if (!is_array($config['captiveportal']['allowedip']))
@@ -43,9 +43,9 @@ if ($_POST) {
 
 	if ($_POST['apply']) {
 		$retval = 0;
-
-		$retval = captiveportal_allowedip_configure();
-
+		if (!file_exists($d_sysrebootreqd_path)) {
+			$retval = captiveportal_allowedip_configure();
+		}
 		$savemsg = get_std_save_message($retval);
 		if ($retval == 0) {
 			if (file_exists($d_allowedipsdirty_path)) {
@@ -67,27 +67,26 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-$pgtitle = "Services: Captive Portal IP";
-include("head.inc");
 
+include("head.inc");
 ?>
-<body link="#000000" vlink="#000000" alink="#000000">
 <?php include("fbegin.inc"); ?>
-<p class="pgtitle">Services: Captive portal IP</p>
+<p class="pgtitle"><?=$pgtitle?></p>
 <form action="services_captiveportal_ip.php" method="post">
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (file_exists($d_allowedipsdirty_path)): ?><p>
 <?php print_info_box_np("The captive portal IP address configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
-</p>
+<input name="apply" type="submit" class="formbtn" id="apply" value="Apply changes"></p>
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr><td class="tabnavtbl">  
+  <tr><td class="tabnavtbl">
 <?php
 	$tab_array = array();
 	$tab_array[] = array("Captive portal", false, "services_captiveportal.php");
 	$tab_array[] = array("Pass-through MAC", false, "services_captiveportal_mac.php");
 	$tab_array[] = array("Allowed IP addresses", true, "services_captiveportal_ip.php");
 	$tab_array[] = array("Users", false, "services_captiveportal_users.php");
+	$tab_array[] = array("File Manager", true, "services_captiveportal_filemanager.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -128,14 +127,14 @@ include("head.inc");
 	  Adding allowed IP addresses will allow IP access to/from these addresses through the captive portal without being taken to the portal page. This can be used for a web server serving images for the portal page or a DNS server on another network, for example. By specifying <em>from</em> addresses, it may be used to always allow pass-through access from a client behind the captive portal.</p>
 	  <table border="0" cellspacing="0" cellpadding="0">
 		<tr>
-		  <td><span class="vexpl">any <img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_in.gif" width="11" height="11" align="absmiddle"> x.x.x.x </span></td>
+		  <td><span class="vexpl">any <img src="/themes/<=$g['theme'];?>/images/icons/icon_in.gif" width="11" height="11" align="absmiddle"> x.x.x.x </span></td>
 		  <td><span class="vexpl">All connections <strong>to</strong> the IP address are allowed</span></td>
 		</tr>
 		<tr>
 		  <td colspan="5" height="4"></td>
 		</tr>
 		<tr>
-		  <td>x.x.x.x <span class="vexpl"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_in.gif" width="11" height="11" align="absmiddle"></span> any&nbsp;&nbsp;&nbsp; </td>
+		  <td>x.x.x.x <span class="vexpl"><img src="/themes/<=$g['theme'];?>/images/icons/icon_in.gif" width="11" height="11" align="absmiddle"></span> any&nbsp;&nbsp;&nbsp; </td>
 		  <td><span class="vexpl">All connections <strong>from</strong> the IP address are allowed </span></td>
 		</tr>
 	  </table></td>
diff --git a/usr/local/www/services_captiveportal_ip_edit.php b/usr/local/www/services_captiveportal_ip_edit.php
index 6e70f2e..4478abd 100755
--- a/usr/local/www/services_captiveportal_ip_edit.php
+++ b/usr/local/www/services_captiveportal_ip_edit.php
@@ -28,7 +28,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-$pgtitle = array("Services", "Captive portal", "Edit allowed IP address");
+$pgtitle = "Services:Captive portal:Edit allowed IP address";
 require("guiconfig.inc");
 
 if (!is_array($config['captiveportal']['allowedip']))
@@ -92,15 +92,13 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = "Services: Captive Portal Edit Allowed IP Address";
 include("head.inc");
 
 ?>
-<body link="#000000" vlink="#000000" alink="#000000">
 <?php include("fbegin.inc"); ?>
-<p class="pgtitle">Services: Captive portal IP Edit</p>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
-            <form action="services_captiveportal_ip_edit.php" method="post" name="iform" id="iform">  
+<p class="pgtitle"><?=$pgtitle?></p>
+            <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>
diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php
index e793345..1a81080 100755
--- a/usr/local/www/services_captiveportal_mac.php
+++ b/usr/local/www/services_captiveportal_mac.php
@@ -28,7 +28,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-$pgtitle = array("Services", "Captive portal");
+$pgtitle = "Services:Captive portal";
 require("guiconfig.inc");
 
 if (!is_array($config['captiveportal']['passthrumac']))
@@ -43,9 +43,9 @@ if ($_POST) {
 
 	if ($_POST['apply']) {
 		$retval = 0;
-
-		$retval = captiveportal_passthrumac_configure();
-
+		if (!file_exists($d_sysrebootreqd_path)) {
+			$retval = captiveportal_passthrumac_configure();
+		}
 		$savemsg = get_std_save_message($retval);
 		if ($retval == 0) {
 			if (file_exists($d_passthrumacsdirty_path)) {
@@ -67,18 +67,16 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-$pgtitle = "Services: Captive Portal MACS";
 include("head.inc");
 
 ?>
-<body link="#000000" vlink="#000000" alink="#000000">
 <?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
 <form action="services_captiveportal_mac.php" method="post">
-<p class="pgtitle">Services: Captive portal MAC</p>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (file_exists($d_passthrumacsdirty_path)): ?><p>
 <?php print_info_box_np("The captive portal MAC address configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
-</p>
+<input name="apply" type="submit" class="formbtn" id="apply" value="Apply changes"></p>
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
@@ -88,6 +86,7 @@ include("head.inc");
 	$tab_array[] = array("Pass-through MAC", true, "services_captiveportal_mac.php");
 	$tab_array[] = array("Allowed IP addresses", false, "services_captiveportal_ip.php");
 	$tab_array[] = array("Users", false, "services_captiveportal_users.php");
+	$tab_array[] = array("File Manager", true, "services_captiveportal_filemanager.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
diff --git a/usr/local/www/services_captiveportal_mac_edit.php b/usr/local/www/services_captiveportal_mac_edit.php
index 66236a6..07719cc 100755
--- a/usr/local/www/services_captiveportal_mac_edit.php
+++ b/usr/local/www/services_captiveportal_mac_edit.php
@@ -28,7 +28,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-$pgtitle = array("Services", "Captive portal", "Edit pass-through MAC address");
+$pgtitle = "Services:Captive portal:Edit pass-through MAC address";
 require("guiconfig.inc");
 
 if (!is_array($config['captiveportal']['passthrumac']))
@@ -91,16 +91,12 @@ if ($_POST) {
 		exit;
 	}
 }
-
-$pgtitle = "Services: Captive Portal Edit MAC";
 include("head.inc");
-
 ?>
-<body link="#000000" vlink="#000000" alink="#000000">
 <?php include("fbegin.inc"); ?>
-<p class="pgtitle">Services: Captive portal MAC Edit</p>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
-            <form action="services_captiveportal_mac_edit.php" method="post" name="iform" id="iform">   
+<p class="pgtitle"><?=$pgtitle?></p>
+            <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>
diff --git a/usr/local/www/services_captiveportal_users.php b/usr/local/www/services_captiveportal_users.php
index 154abef..a55f873 100755
--- a/usr/local/www/services_captiveportal_users.php
+++ b/usr/local/www/services_captiveportal_users.php
@@ -3,7 +3,7 @@
 	services_captiveportal_users.php
 	part of m0n0wall (http://m0n0.ch/wall)
 	
-	Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
+	Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
 	All rights reserved.
 	Copyright (C) 2005 Pascal Suter <d-monodev@psuter.ch>.
 	All rights reserved. 
@@ -30,7 +30,7 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-$pgtitle = array("Services", "Captive portal");
+$pgtitle = "Services:Captive portal";
 require("guiconfig.inc");
 
 if (!is_array($config['captiveportal']['user'])) {
@@ -62,13 +62,11 @@ if ($changed) {
 	exit;
 }
 
-$pgtitle = "Services: Captive Portal";
 include("head.inc");
 
 ?>
-<body link="#000000" vlink="#000000" alink="#000000">
 <?php include("fbegin.inc"); ?>
-<p class="pgtitle">Services: Captive portal Users</p>
+<p class="pgtitle"><?=$pgtitle?></p>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td>
 <?php
@@ -77,6 +75,7 @@ include("head.inc");
 	$tab_array[] = array("Pass-through MAC", false, "services_captiveportal_mac.php");
 	$tab_array[] = array("Allowed IP addresses", false, "services_captiveportal_ip.php");
 	$tab_array[] = array("Users", true, "services_captiveportal_users.php");
+	$tab_array[] = array("File Manager", true, "services_captiveportal_filemanager.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -113,18 +112,3 @@ include("head.inc");
 </tr>
 </table>
 <?php include("fend.inc"); ?>
-
-<?php
-
-function captiveportal_users_sort() {
-        global $g, $config;
-
-        function cpusercmp($a, $b) {
-                return strcasecmp($a['name'], $b['name']);
-        }
-
-        usort($config['captiveportal']['user'], "cpusercmp");
-}
-
-
-?>
\ No newline at end of file
diff --git a/usr/local/www/services_captiveportal_users_edit.php b/usr/local/www/services_captiveportal_users_edit.php
index 1198f15..917bed1 100755
--- a/usr/local/www/services_captiveportal_users_edit.php
+++ b/usr/local/www/services_captiveportal_users_edit.php
@@ -3,7 +3,7 @@
 	services_captiveportal_users_edit.php
 	part of m0n0wall (http://m0n0.ch/wall)
 	
-	Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
+	Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
 	All rights reserved.
 	Copyright (C) 2005 Pascal Suter <d-monodev@psuter.ch>.
 	All rights reserved. 
@@ -30,7 +30,7 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-$pgtitle = array("Services", "Captive portal", "Edit user");
+$pgtitle = "Services: Captive portal: Edit user";
 require("guiconfig.inc");
 
 if (!is_array($config['captiveportal']['user'])) {
@@ -123,11 +123,10 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = "Services: Captive Portal Users Edit";
 include("head.inc");
 
 ?>
-<body link="#000000" vlink="#000000" alink="#000000">
+?>
 <?php include("fbegin.inc"); ?>
 <script language="javascript" type="text/javascript" src="datetimepicker.js">
 <!--
@@ -136,8 +135,8 @@ include("head.inc");
 //For this script, visit http://www.javascriptkit.com
 // -->
 </script>
-<p class="pgtitle">Services: Captive portal Users Edit</p>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
 <form action="services_captiveportal_users_edit.php" method="post" name="iform" id="iform">
   <table width="100%" border="0" cellpadding="6" cellspacing="0">
 	<tr> 
@@ -183,17 +182,3 @@ include("head.inc");
   </table>
  </form>
 <?php include("fend.inc"); ?>
-<?php
-
-function captiveportal_users_sort() {
-        global $g, $config;
-
-        function cpusercmp($a, $b) {
-                return strcasecmp($a['name'], $b['name']);
-        }
-
-        usort($config['captiveportal']['user'], "cpusercmp");
-}
-
-
-?>
\ No newline at end of file