Update (C)

12 files changed, 142 insertions, 121 deletions

diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index 7b65071..b91cc6b 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -2,8 +2,10 @@
 <?php
 /*
 	diag_backup.php
-	part of m0n0wall (http://m0n0.ch/wall)
+	Copyright (C) 2004 Scott Ullrich
+	All rights reserved.
 
+	originially part of m0n0wall (http://m0n0.ch/wall)
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
 	All rights reserved.
 
diff --git a/usr/local/www/diag_defaults.php b/usr/local/www/diag_defaults.php
index 3ba3ea0..52ff73e 100755
--- a/usr/local/www/diag_defaults.php
+++ b/usr/local/www/diag_defaults.php
@@ -1,22 +1,24 @@
 #!/usr/local/bin/php
-<?php 
+<?php
 /*
 	diag_defaults.php
-	part of m0n0wall (http://m0n0.ch/wall)
-	
+	Copyright (C) 2004 Scott Ullrich
+	All rights reserved.
+
+	originially 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
@@ -55,14 +57,14 @@ if ($_POST) {
 <p class="pgtitle">Diagnostics: Factory defaults</p>
 <?php if ($rebootmsg): echo print_info_box($rebootmsg); else: ?>
 <form action="diag_defaults.php" method="post">
-              <p><strong>If you click &quot;Yes&quot;, the firewall will be reset 
-                to factory defaults and will reboot immediately. The entire system 
-                configuration will be overwritten. The LAN IP address will be 
-                reset to 192.168.1.1, the system will be configured as a DHCP 
+              <p><strong>If you click &quot;Yes&quot;, the firewall will be reset
+                to factory defaults and will reboot immediately. The entire system
+                configuration will be overwritten. The LAN IP address will be
+                reset to 192.168.1.1, the system will be configured as a DHCP
                 server, and the password will be set to 'mono'.<br>
                 <br>
                 Are you sure you want to proceed?</strong></p>
-        <p> 
+        <p>
           <input name="Submit" type="submit" class="formbtn" value=" Yes ">
           <input name="Submit" type="submit" class="formbtn" value=" No ">
         </p>
diff --git a/usr/local/www/diag_dhcp_leases.php b/usr/local/www/diag_dhcp_leases.php
index 4b730fa..7b84831 100755
--- a/usr/local/www/diag_dhcp_leases.php
+++ b/usr/local/www/diag_dhcp_leases.php
@@ -1,22 +1,24 @@
 #!/usr/local/bin/php
-<?php 
+<?php
 /*
 	diag_dhcp_leases.php
-	part of m0n0wall (http://m0n0.ch/wall)
-	
-	Copyright (C) 2003-2004 Björn Pålsson <bjorn@networksab.com> and Manuel Kasper <mk@neon1.net>.
+	Copyright (C) 2004 Scott Ullrich
+	All rights reserved.
+
+	originially 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
diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php
index caba9d1..a8aa0bb 100755
--- a/usr/local/www/diag_ipsec_sad.php
+++ b/usr/local/www/diag_ipsec_sad.php
@@ -1,22 +1,24 @@
 #!/usr/local/bin/php
-<?php 
+<?php
 /*
 	diag_ipsec_sad.php
-	part of m0n0wall (http://m0n0.ch/wall)
-	
+	Copyright (C) 2004 Scott Ullrich
+	All rights reserved.
+
+	originially 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
@@ -49,7 +51,7 @@ require("guiconfig.inc");
 	<li class="tabinact"><a href="diag_ipsec_spd.php">SPD</a></li>
   </ul>
   </td></tr>
-  <tr> 
+  <tr>
     <td class="tabcont">
 <?php
 
@@ -126,7 +128,7 @@ foreach ($sad as $sa): ?>
 		?>
 		  <a href="diag_ipsec_sad.php?act=del&<?=$args;?>" onclick="return confirm('Do you really want to delete this security association?')"><img src="x.gif" width="17" height="17" border="0"></a>
 		</td>
-				
+
 	</tr>
 <?php endforeach; ?>
 </table>
diff --git a/usr/local/www/diag_ipsec_spd.php b/usr/local/www/diag_ipsec_spd.php
index 80cd066..dbac72f 100755
--- a/usr/local/www/diag_ipsec_spd.php
+++ b/usr/local/www/diag_ipsec_spd.php
@@ -1,22 +1,24 @@
 #!/usr/local/bin/php
-<?php 
+<?php
 /*
 	diag_ipsec_spd.php
-	part of m0n0wall (http://m0n0.ch/wall)
-	
+	Copyright (C) 2004 Scott Ullrich
+	All rights reserved.
+
+	originially 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
@@ -49,7 +51,7 @@ require("guiconfig.inc");
 	<li class="tabact">SPD</li>
   </ul>
   </td></tr>
-  <tr> 
+  <tr>
     <td class="tabcont">
 <?php
 
@@ -128,20 +130,20 @@ foreach ($spd as $sp): ?>
 		?>
 		  <a href="diag_ipsec_spd.php?act=del&<?=$args;?>" onclick="return confirm('Do you really want to delete this security policy?')"><img src="x.gif" width="17" height="17" border="0"></a>
 		</td>
-				
+
 	</tr>
 <?php endforeach; ?>
 </table>
 <br>
 <table border="0" cellspacing="0" cellpadding="0">
-  <tr> 
+  <tr>
 	<td width="16"><img src="in.gif" width="11" height="11"></td>
 	<td>incoming (as seen by firewall)</td>
   </tr>
-  <tr> 
+  <tr>
 	<td colspan="5" height="4"></td>
   </tr>
-  <tr> 
+  <tr>
 	<td><img src="out.gif" width="11" height="11"></td>
 	<td>outgoing (as seen by firewall)</td>
   </tr>
diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php
index 088a02d..499a8ea 100755
--- a/usr/local/www/diag_logs_dhcp.php
+++ b/usr/local/www/diag_logs_dhcp.php
@@ -1,22 +1,24 @@
 #!/usr/local/bin/php
-<?php 
+<?php
 /*
 	diag_logs_dhcp.php
-	part of m0n0wall (http://m0n0.ch/wall)
-	
+	Copyright (C) 2004 Scott Ullrich
+	All rights reserved.
+
+	originially 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
@@ -45,11 +47,11 @@ function dump_clog($logfile, $tail, $withorig = true) {
 	$sor = isset($config['syslog']['reverse']) ? "-r" : "";
 
 	exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n " . $tail, $logarr);
-	
+
 	foreach ($logarr as $logent) {
 		$logent = preg_split("/\s+/", $logent, 6);
 		echo "<tr valign=\"top\">\n";
-		
+
 		if ($withorig) {
 			echo "<td class=\"listlr\" nowrap>" . htmlspecialchars(join(" ", array_slice($logent, 0, 3))) . "</td>\n";
 			echo "<td class=\"listr\">" . htmlspecialchars($logent[4] . " " . $logent[5]) . "</td>\n";
@@ -83,11 +85,11 @@ function dump_clog($logfile, $tail, $withorig = true) {
     <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li>
   </ul>
   </td></tr>
-  <tr> 
+  <tr>
     <td class="tabcont">
 		<table width="100%" border="0" cellspacing="0" cellpadding="0">
-		  <tr> 
-			<td colspan="2" class="listtopic"> 
+		  <tr>
+			<td colspan="2" class="listtopic">
 			  Last <?=$nentries;?> DHCP service log entries</td>
 		  </tr>
 		  <?php dump_clog("/var/log/dhcpd.log", $nentries); ?>
diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php
index 740e450..9272b47 100755
--- a/usr/local/www/diag_logs_settings.php
+++ b/usr/local/www/diag_logs_settings.php
@@ -1,22 +1,24 @@
 #!/usr/local/bin/php
-<?php 
+<?php
 /*
 	diag_logs_settings.php
-	part of m0n0wall (http://m0n0.ch/wall)
-	
+	Copyright (C) 2004 Scott Ullrich
+	All rights reserved.
+
+	originially 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
@@ -72,9 +74,9 @@ if ($_POST) {
 		$oldnologdefaultblock = isset($config['syslog']['nologdefaultblock']);
 		$config['syslog']['nologdefaultblock'] = $_POST['logdefaultblock'] ? false : true;
 		$config['syslog']['rawfilter'] = $_POST['rawfilter'] ? true : false;
-		
+
 		write_config();
-		
+
 		$retval = 0;
 		if (!file_exists($d_sysrebootreqd_path)) {
 			config_lock();
@@ -83,7 +85,7 @@ if ($_POST) {
 				$retval |= filter_configure();
 			config_unlock();
 		}
-		$savemsg = get_std_save_message($retval);	
+		$savemsg = get_std_save_message($retval);
 	}
 }
 
@@ -134,44 +136,44 @@ function enable_change(enable_over) {
     <li class="tabact">Settings</li>
   </ul>
   </td></tr>
-  <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="reverse" type="checkbox" id="reverse" value="yes" <?php if ($pconfig['reverse']) echo "checked"; ?>>
-                          <strong>Show log entries in reverse order (newest entries 
+                          <strong>Show log entries in reverse order (newest entries
                           on top)</strong></td>
                       </tr>
-                      <tr> 
+                      <tr>
                         <td width="22%" valign="top" class="vtable">&nbsp;</td>
-                        <td width="78%" class="vtable">Number of log entries to 
-                          show: 
+                        <td width="78%" class="vtable">Number of log entries to
+                          show:
                           <input name="nentries" id="nentries" type="text" class="formfld" size="4" value="<?=htmlspecialchars($pconfig['nentries']);?>"></td>
                       </tr>
-                      <tr> 
+                      <tr>
                         <td valign="top" class="vtable">&nbsp;</td>
                         <td class="vtable"> <input name="logdefaultblock" type="checkbox" id="logdefaultblock" value="yes" <?php if ($pconfig['logdefaultblock']) echo "checked"; ?>>
                           <strong>Log packets blocked by the default rule</strong><br>
-                          Hint: packets that are blocked by the 
-                          implicit default block rule will not be logged anymore 
+                          Hint: packets that are blocked by the
+                          implicit default block rule will not be logged anymore
                           if you uncheck this option. Per-rule logging options are not affected.</td>
                       </tr>
-                      <tr> 
+                      <tr>
                         <td valign="top" class="vtable">&nbsp;</td>
                         <td class="vtable"> <input name="rawfilter" type="checkbox" id="rawfilter" value="yes" <?php if ($pconfig['rawfilter']) echo "checked"; ?>>
                           <strong>Show raw filter logs</strong><br>
                           Hint: If this is checked, filter logs are shown as generated by the packet filter, without any formatting. This will reveal more detailed information. </td>
                       </tr>
-                      <tr> 
+                      <tr>
                         <td width="22%" valign="top" class="vtable">&nbsp;</td>
                         <td width="78%" class="vtable"> <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable']) echo "checked"; ?> onClick="enable_change(false)">
                           <strong>Enable syslog'ing to remote syslog server</strong></td>
                       </tr>
-                      <tr> 
-                        <td width="22%" valign="top" class="vncell">Remote syslog 
+                      <tr>
+                        <td width="22%" valign="top" class="vncell">Remote syslog
                           server</td>
-                        <td width="78%" class="vtable"> <input name="remoteserver" id="remoteserver" type="text" class="formfld" size="20" value="<?=htmlspecialchars($pconfig['remoteserver']);?>"> 
+                        <td width="78%" class="vtable"> <input name="remoteserver" id="remoteserver" type="text" class="formfld" size="20" value="<?=htmlspecialchars($pconfig['remoteserver']);?>">
                           <br>
                           IP address of remote syslog server<br> <br> <input name="system" id="system" type="checkbox" value="yes" onclick="enable_change(false)" <?php if ($pconfig['system']) echo "checked"; ?>>
                           system events <br> <input name="filter" id="filter" type="checkbox" value="yes" <?php if ($pconfig['filter']) echo "checked"; ?>>
@@ -180,17 +182,17 @@ function enable_change(enable_over) {
                           Portal Auth<br> <input name="vpn" id="vpn" type="checkbox" value="yes" <?php if ($pconfig['vpn']) echo "checked"; ?>>
                           PPTP VPN events</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%" height="53" valign="top">&nbsp;</td>
                         <td width="78%"><strong><span class="red">Note:</span></strong><br>
-                          syslog sends UDP datagrams to port 514 on the specified 
-                          remote syslog server. Be sure to set syslogd on the 
-                          remote server to accept syslog messages from m0n0wall. 
+                          syslog sends UDP datagrams to port 514 on the specified
+                          remote syslog server. Be sure to set syslogd on the
+                          remote server to accept syslog messages from m0n0wall.
                         </td>
                       </tr>
                     </table>
diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php
index 7e315b5..92425da 100755
--- a/usr/local/www/diag_logs_vpn.php
+++ b/usr/local/www/diag_logs_vpn.php
@@ -1,22 +1,24 @@
 #!/usr/local/bin/php
-<?php 
+<?php
 /*
 	diag_logs_vpn.php
-	part of m0n0wall (http://m0n0.ch/wall)
-	
+	Copyright (C) 2004 Scott Ullrich
+	All rights reserved.
+
+	originially 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
@@ -45,19 +47,19 @@ function dump_clog($logfile, $tail) {
 	$sor = isset($config['syslog']['reverse']) ? "-r" : "";
 
 	exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n " . $tail, $logarr);
-	
+
 	foreach ($logarr as $logent) {
 		$logent = preg_split("/\s+/", $logent, 6);
 		$llent = explode(",", $logent[5]);
-		
+
 		echo "<tr>\n";
 		echo "<td class=\"listlr\" nowrap>" . htmlspecialchars(join(" ", array_slice($logent, 0, 3))) . "</td>\n";
-		
+
 		if ($llent[0] == "login")
 			echo "<td class=\"listr\"><img src=\"in.gif\" width=\"11\" height=\"11\" title=\"login\"></td>\n";
 		else
 			echo "<td class=\"listr\"><img src=\"out.gif\" width=\"11\" height=\"11\" title=\"logout\"></td>\n";
-		
+
 		echo "<td class=\"listr\">" . htmlspecialchars($llent[3]) . "</td>\n";
 		echo "<td class=\"listr\">" . htmlspecialchars($llent[2]) . "&nbsp;</td>\n";
 		echo "</tr>\n";
@@ -90,7 +92,7 @@ function dump_clog($logfile, $tail) {
   <tr>
     <td class="tabcont">
 		<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr>
-		  <td colspan="4" class="listtopic"> 
+		  <td colspan="4" class="listtopic">
 			    Last <?=$nentries;?> firewall log entries</td>
 			</tr>
 			<tr>
diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php
index 33ad4ac..c35cabe 100755
--- a/usr/local/www/diag_ping.php
+++ b/usr/local/www/diag_ping.php
@@ -2,8 +2,10 @@
 <?php
 /*
 	diag_ping.php
-	part of m0n0wall (http://m0n0.ch/wall)
+	Copyright (C) 2004 Scott Ullrich
+	All rights reserved.
 
+	originially part of m0n0wall (http://m0n0.ch/wall)
 	Copyright (C) 2003-2004 Bob Zoller (bob@kludgebox.com) and Manuel Kasper <mk@neon1.net>.
 	All rights reserved.
 
@@ -76,7 +78,7 @@ if (!isset($do_ping)) {
 			  <table width="100%" border="0" cellpadding="6" cellspacing="0">
                 <tr>
 				  <td width="22%" valign="top" class="vncellreq">Host</td>
-				  <td width="78%" class="vtable"> 
+				  <td width="78%" class="vtable">
                     <input name="host" type="text" class="formfld" id="host" size="20" value="<?=htmlspecialchars($host);?>"></td>
 				</tr>
 				<tr>
@@ -90,7 +92,7 @@ if (!isset($do_ping)) {
 				</tr>
 				<tr>
 				  <td width="22%" valign="top">&nbsp;</td>
-				  <td width="78%"> 
+				  <td width="78%">
                     <input name="Submit" type="submit" class="formbtn" value="Ping">
 				</td>
 				</tr>
diff --git a/usr/local/www/diag_resetstate.php b/usr/local/www/diag_resetstate.php
index 3a7f028..637dd73 100755
--- a/usr/local/www/diag_resetstate.php
+++ b/usr/local/www/diag_resetstate.php
@@ -1,22 +1,24 @@
 #!/usr/local/bin/php
-<?php 
+<?php
 /*
 	diag_resetstate.php
-	part of m0n0wall (http://m0n0.ch/wall)
-	
+	Copyright (C) 2004 Scott Ullrich
+	All rights reserved.
+
+	originially 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
@@ -61,33 +63,33 @@ if ($_POST) {
 <?php if ($savemsg) print_info_box($savemsg); ?>
             <form action="diag_resetstate.php" method="post" name="iform" id="iform">
               <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"> <p> 
+                  <td width="78%" class="vtable"> <p>
                       <input name="nattable" type="checkbox" id="nattable" value="yes" checked>
                       <strong>NAT table</strong><br>
                       <input name="statetable" type="checkbox" id="statetable" value="yes" checked>
                       <strong>Firewall state table</strong><br>
                       <span class="vexpl"><br>
-                      Resetting the state tables will remove all entries from 
-                      the corresponding tables. This means that all open connections 
-                      will be broken and will have to be re-established. This 
-                      may be necessary after making substantial changes to the 
-                      firewall and/or NAT rules, especially if there are IP protocol 
+                      Resetting the state tables will remove all entries from
+                      the corresponding tables. This means that all open connections
+                      will be broken and will have to be re-established. This
+                      may be necessary after making substantial changes to the
+                      firewall and/or NAT rules, especially if there are IP protocol
                       mappings (e.g. for PPTP or IPv6) with open connections.<br>
                       <br>
-                      </span><span class="vexpl">The firewall will normally leave 
+                      </span><span class="vexpl">The firewall will normally leave
                       the state tables intact when changing rules.<br>
                       <br>
-                      NOTE: If you reset the firewall state table, the browser 
-                      session may appear to be hung after clicking &quot;Reset&quot;. 
+                      NOTE: If you reset the firewall state table, the browser
+                      session may appear to be hung after clicking &quot;Reset&quot;.
                       Simply refresh the page to continue.</span></p>
                     </td>
 				</tr>
-                <tr> 
+                <tr>
                   <td width="22%" valign="top">&nbsp;</td>
-                  <td width="78%"> 
-                    <input name="Submit" type="submit" class="formbtn" value="Reset"> 
+                  <td width="78%">
+                    <input name="Submit" type="submit" class="formbtn" value="Reset">
                   </td>
                 </tr>
               </table>
diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php
index a987019..aeead84 100755
--- a/usr/local/www/firewall_aliases.php
+++ b/usr/local/www/firewall_aliases.php
@@ -2,8 +2,10 @@
 <?php
 /*
 	firewall_aliases.php
-	part of m0n0wall (http://m0n0.ch/wall)
+	Copyright (C) 2004 Scott Ullrich
+	All rights reserved.
 
+	originially part of m0n0wall (http://m0n0.ch/wall)
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
 	All rights reserved.
 
diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index 1c24150..9d5d457 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -6,7 +6,6 @@
 	All rights reserved.
 
 	originially part of m0n0wall (http://m0n0.ch/wall)
-
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
 	All rights reserved.