Synchornize with m0n0wall 1.2b3. These files have not really been

modified too much so a straight copy works.   9 files remain to be
patched by hand.

1 files changed, 7 insertions, 7 deletions

diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php
index 9edaf95..d38c58c 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
@@ -106,13 +106,13 @@ if ($_GET['act'] == "del") {
 		<?=strtolower($mac['mac']);?>
 	  </td>
 	  <td class="listbg">
-		<font color="#FFFFFF"><?=htmlspecialchars($mac['descr']);?>&nbsp;
+		<?=htmlspecialchars($mac['descr']);?>&nbsp;
 	  </td>
 	  <td valign="middle" nowrap class="list"> <a href="services_captiveportal_mac_edit.php?id=<?=$i;?>"><img src="e.gif" width="17" height="17" border="0"></a>
 		 &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>