Cleanup barnyard2/preprocessor/servers pages.

3 files changed, 41 insertions, 471 deletions

diff --git a/config/snort/snort_barnyard.php b/config/snort/snort_barnyard.php
index 2e857f22..c4ac1292 100644
--- a/config/snort/snort_barnyard.php
+++ b/config/snort/snort_barnyard.php
@@ -44,105 +44,42 @@ require_once("/usr/local/pkg/snort/snort.inc");
 
 global $g;
 
-if (!is_array($config['installedpackages']['snortglobal']['rule']))
-	$config['installedpackages']['snortglobal']['rule'] = array();
-
-$a_nat = &$config['installedpackages']['snortglobal']['rule'];
-
 $id = $_GET['id'];
 if (isset($_POST['id']))
 	$id = $_POST['id'];
+if (is_null($id)) {
+        header("Location: /snort/snort_interfaces.php");
+        exit;
+}
+
+if (!is_array($config['installedpackages']['snortglobal']['rule']))
+	$config['installedpackages']['snortglobal']['rule'] = array();
+$a_nat = &$config['installedpackages']['snortglobal']['rule'];
 
 if (isset($_GET['dup'])) {
 	$id = $_GET['dup'];
 	$after = $_GET['dup'];
 }
 
+$pconfig = array();
 if (isset($id) && $a_nat[$id]) {
 	/* old options */
-	$pconfig['def_ssl_ports_ignore'] = $a_nat[$id]['def_ssl_ports_ignore'];
-	$pconfig['flow_depth'] = $a_nat[$id]['flow_depth'];
-	$pconfig['max_queued_bytes'] = $a_nat[$id]['max_queued_bytes'];
-	$pconfig['max_queued_segs'] = $a_nat[$id]['max_queued_segs'];
-	$pconfig['perform_stat'] = $a_nat[$id]['perform_stat'];
-	$pconfig['http_inspect'] = $a_nat[$id]['http_inspect'];
-	$pconfig['other_preprocs'] = $a_nat[$id]['other_preprocs'];
-	$pconfig['ftp_preprocessor'] = $a_nat[$id]['ftp_preprocessor'];
-	$pconfig['smtp_preprocessor'] = $a_nat[$id]['smtp_preprocessor'];
-	$pconfig['sf_portscan'] = $a_nat[$id]['sf_portscan'];
-	$pconfig['dce_rpc_2'] = $a_nat[$id]['dce_rpc_2'];
-	$pconfig['dns_preprocessor'] = $a_nat[$id]['dns_preprocessor'];
-	$pconfig['def_dns_servers'] = $a_nat[$id]['def_dns_servers'];
-	$pconfig['def_dns_ports'] = $a_nat[$id]['def_dns_ports'];
-	$pconfig['def_smtp_servers'] = $a_nat[$id]['def_smtp_servers'];
-	$pconfig['def_smtp_ports'] = $a_nat[$id]['def_smtp_ports'];
-	$pconfig['def_mail_ports'] = $a_nat[$id]['def_mail_ports'];
-	$pconfig['def_http_servers'] = $a_nat[$id]['def_http_servers'];
-	$pconfig['def_www_servers'] = $a_nat[$id]['def_www_servers'];
-	$pconfig['def_http_ports'] = $a_nat[$id]['def_http_ports'];
-	$pconfig['def_sql_servers'] = $a_nat[$id]['def_sql_servers'];
-	$pconfig['def_oracle_ports'] = $a_nat[$id]['def_oracle_ports'];
-	$pconfig['def_mssql_ports'] = $a_nat[$id]['def_mssql_ports'];
-	$pconfig['def_telnet_servers'] = $a_nat[$id]['def_telnet_servers'];
-	$pconfig['def_telnet_ports'] = $a_nat[$id]['def_telnet_ports'];
-	$pconfig['def_snmp_servers'] = $a_nat[$id]['def_snmp_servers'];
-	$pconfig['def_snmp_ports'] = $a_nat[$id]['def_snmp_ports'];
-	$pconfig['def_ftp_servers'] = $a_nat[$id]['def_ftp_servers'];
-	$pconfig['def_ftp_ports'] = $a_nat[$id]['def_ftp_ports'];
-	$pconfig['def_ssh_servers'] = $a_nat[$id]['def_ssh_servers'];
-	$pconfig['def_ssh_ports'] = $a_nat[$id]['def_ssh_ports'];
-	$pconfig['def_pop_servers'] = $a_nat[$id]['def_pop_servers'];
-	$pconfig['def_pop2_ports'] = $a_nat[$id]['def_pop2_ports'];
-	$pconfig['def_pop3_ports'] = $a_nat[$id]['def_pop3_ports'];
-	$pconfig['def_imap_servers'] = $a_nat[$id]['def_imap_servers'];
-	$pconfig['def_imap_ports'] = $a_nat[$id]['def_imap_ports'];
-	$pconfig['def_sip_proxy_ip'] = $a_nat[$id]['def_sip_proxy_ip'];
-	$pconfig['def_sip_proxy_ports'] = $a_nat[$id]['def_sip_proxy_ports'];
-	$pconfig['def_auth_ports'] = $a_nat[$id]['def_auth_ports'];
-	$pconfig['def_finger_ports'] = $a_nat[$id]['def_finger_ports'];
-	$pconfig['def_irc_ports'] = $a_nat[$id]['def_irc_ports'];
-	$pconfig['def_nntp_ports'] = $a_nat[$id]['def_nntp_ports'];
-	$pconfig['def_rlogin_ports'] = $a_nat[$id]['def_rlogin_ports'];
-	$pconfig['def_rsh_ports'] = $a_nat[$id]['def_rsh_ports'];
-	$pconfig['def_ssl_ports'] = $a_nat[$id]['def_ssl_ports'];
+	$pconfig = $a_nat[$id];
 	$pconfig['barnyard_enable'] = $a_nat[$id]['barnyard_enable'];
 	$pconfig['barnyard_mysql'] = $a_nat[$id]['barnyard_mysql'];
-	$pconfig['enable'] = $a_nat[$id]['enable'];
-	$pconfig['uuid'] = $a_nat[$id]['uuid'];
-	$pconfig['interface'] = $a_nat[$id]['interface'];
-	$pconfig['descr'] = $a_nat[$id]['descr'];
-	$pconfig['whitelistname'] = $a_nat[$id]['whitelistname'];
-	$pconfig['homelistname'] = $a_nat[$id]['homelistname'];
-	$pconfig['externallistname'] = $a_nat[$id]['externallistname'];
-	$pconfig['suppresslistname'] = $a_nat[$id]['suppresslistname'];
-	$pconfig['performance'] = $a_nat[$id]['performance'];
-	$pconfig['blockoffenders7'] = $a_nat[$id]['blockoffenders7'];
-	$pconfig['alertsystemlog'] = $a_nat[$id]['alertsystemlog'];
-	$pconfig['tcpdumplog'] = $a_nat[$id]['tcpdumplog'];
-	$pconfig['snortunifiedlog'] = $a_nat[$id]['snortunifiedlog'];
-	$pconfig['configpassthru'] = $a_nat[$id]['configpassthru'];
 	$pconfig['barnconfigpassthru'] = base64_decode($a_nat[$id]['barnconfigpassthru']);
-	$pconfig['rulesets'] = $a_nat[$id]['rulesets'];
-	$pconfig['rule_sid_off'] = $a_nat[$id]['rule_sid_off'];
-	$pconfig['rule_sid_on'] = $a_nat[$id]['rule_sid_on'];
-
-
-	if (!$pconfig['interface'])
-		$pconfig['interface'] = "wan";
-} else 
-	$pconfig['interface'] = "wan";
+}
 
 if (isset($_GET['dup']))
 	unset($id);
 
 $if_real = snort_get_real_interface($pconfig['interface']);
-if (!empty($config['installedpackages']['snortglobal']['rule'][$id]))
-	$snort_uuid = $config['installedpackages']['snortglobal']['rule'][$id]['uuid'];
+$snort_uuid = $pconfig['uuid'];
 
 /* alert file */
 $d_snortconfdirty_path = "/var/run/snort_conf_{$snort_uuid}_{$if_real}.dirty";
 
-if ($_POST["Submit"]) {
+if ($_POST) {
 
 	/* XXX: Mising error reporting?! 
 	 * check for overlaps 
@@ -160,70 +97,6 @@ if ($_POST["Submit"]) {
 		/* repost the options already in conf */
 		$natent = $pconfig;
 
-		/* post new options */
-		if ($_POST['interface'] != "") { $natent['interface'] = $_POST['interface']; } else unset($natent['interface']);
-		if ($_POST['enable'] != "") { $natent['enable'] = $_POST['enable']; } else unset($natent['enable']);
-		if ($_POST['uuid'] != "") { $natent['uuid'] = $_POST['uuid']; } else unset($natent['uuid']);
-		if ($_POST['descr'] != "") { $natent['descr'] = $_POST['descr']; } else unset($natent['descr']);
-		if ($_POST['performance'] != "") { $natent['performance'] = $_POST['performance']; } else unset($natent['descr']);
-		if ($_POST['blockoffenders7'] != "") { $natent['blockoffenders7'] = $_POST['blockoffenders7']; } else unset($natent['blockoffenders7']);
-		if ($_POST['alertsystemlog'] != "") { $natent['alertsystemlog'] = $_POST['alertsystemlog']; } else unset($natent['alertsystemlog']);
-		if ($_POST['tcpdumplog'] != "") { $natent['tcpdumplog'] = $_POST['tcpdumplog']; } else unset($natent['tcpdumplog']);
-		if ($_POST['snortunifiedlog'] != "") { $natent['snortunifiedlog'] = $_POST['snortunifiedlog']; } else unset($natent['snortunifiedlog']);
-		if ($_POST['def_ssl_ports_ignore'] != "") { $natent['def_ssl_ports_ignore'] = $_POST['def_ssl_ports_ignore']; } else unset($natent['def_ssl_ports_ignore']);
-		if ($_POST['flow_depth'] != "") { $natent['flow_depth'] = $_POST['flow_depth']; } else unset($natent['flow_depth']);
-		if ($_POST['max_queued_bytes'] != "") { $natent['max_queued_bytes'] = $_POST['max_queued_bytes']; } else unset($natent['max_queued_bytes']);
-		if ($_POST['max_queued_segs'] != "") { $natent['max_queued_segs'] = $_POST['max_queued_segs']; } else unset($natent['max_queued_segs']);
-		if ($_POST['perform_stat'] != "") { $natent['perform_stat'] = $_POST['perform_stat']; } else unset($natent['perform_stat']);
-		if ($_POST['http_inspect'] != "") { $natent['http_inspect'] = $_POST['http_inspect']; } else unset($natent['http_inspect']);
-		if ($_POST['other_preprocs'] != "") { $natent['other_preprocs'] = $_POST['other_preprocs']; } else unset($natent['other_preprocs']);
-		if ($_POST['ftp_preprocessor'] != "") { $natent['ftp_preprocessor'] = $_POST['ftp_preprocessor']; } else unset($natent['ftp_preprocessor']);
-		if ($_POST['smtp_preprocessor'] != "") { $natent['smtp_preprocessor'] = $_POST['smtp_preprocessor']; } else unset($natent['smtp_preprocessor']);
-		if ($_POST['sf_portscan'] != "") { $natent['sf_portscan'] = $_POST['sf_portscan']; } else unset($natent['sf_portscan']);
-		if ($_POST['dce_rpc_2'] != "") { $natent['dce_rpc_2'] = $_POST['dce_rpc_2']; } else unset($natent['dce_rpc_2']);
-		if ($_POST['dns_preprocessor'] != "") { $natent['dns_preprocessor'] = $_POST['dns_preprocessor']; } else unset($natent['dns_preprocessor']);
-		if ($_POST['def_dns_servers'] != "") { $natent['def_dns_servers'] = $_POST['def_dns_servers']; } else unset($natent['def_dns_servers']);
-		if ($_POST['def_dns_ports'] != "") { $natent['def_dns_ports'] = $_POST['def_dns_ports']; } else unset($natent['def_dns_ports']);
-		if ($_POST['def_smtp_servers'] != "") { $natent['def_smtp_servers'] = $_POST['def_smtp_servers']; } else unset($natent['def_smtp_servers']);
-		if ($_POST['def_smtp_ports'] != "") { $natent['def_smtp_ports'] = $_POST['def_smtp_ports']; } else unset($natent['def_mail_ports']);
-		if ($_POST['def_mail_ports'] != "") { $natent['def_mail_ports'] = $_POST['def_mail_ports']; } else unset($natent['def_mail_ports']);
-		if ($_POST['def_http_servers'] != "") { $natent['def_http_servers'] = $_POST['def_http_servers']; } else unset($natent['def_http_servers']);
-		if ($_POST['def_www_servers'] != "") { $natent['def_www_servers'] = $_POST['def_www_servers']; } else unset($natent['def_www_servers']);
-		if ($_POST['def_http_ports'] != "") { $natent['def_http_ports'] = $_POST['def_http_ports'];	} else unset($natent['def_http_ports']);
-		if ($_POST['def_sql_servers'] != "") { $natent['def_sql_servers'] = $_POST['def_sql_servers']; } else unset($natent['def_sql_servers']);
-		if ($_POST['def_oracle_ports'] != "") { $natent['def_oracle_ports'] = $_POST['def_oracle_ports']; } else unset($natent['def_oracle_ports']);
-		if ($_POST['def_mssql_ports'] != "") { $natent['def_mssql_ports'] = $_POST['def_mssql_ports']; } else unset($natent['def_mssql_ports']);
-		if ($_POST['def_telnet_servers'] != "") { $natent['def_telnet_servers'] = $_POST['def_telnet_servers']; } else unset($natent['def_telnet_ports']);
-		if ($_POST['def_telnet_ports'] != "") { $natent['def_telnet_ports'] = $_POST['def_telnet_ports']; } else unset($natent['def_telnet_ports']);
-		if ($_POST['def_snmp_servers'] != "") { $natent['def_snmp_servers'] = $_POST['def_snmp_servers']; } else unset($natent['def_snmp_servers']);
-		if ($_POST['def_snmp_ports'] != "") { $natent['def_snmp_ports'] = $_POST['def_snmp_ports']; } else unset($natent['def_snmp_ports']);
-		if ($_POST['def_ftp_servers'] != "") { $natent['def_ftp_servers'] = $_POST['def_ftp_servers']; } else unset($natent['def_ftp_servers']);
-		if ($_POST['def_ftp_ports'] != "") { $natent['def_ftp_ports'] = $_POST['def_ftp_ports']; } else unset($natent['def_ftp_ports']);
-		if ($_POST['def_ssh_servers'] != "") { $natent['def_ssh_servers'] = $_POST['def_ssh_servers']; } else unset($natent['def_ssh_servers']);
-		if ($_POST['def_ssh_ports'] != "") { $natent['def_ssh_ports'] = $_POST['def_ssh_ports']; } else unset($natent['def_ssh_ports']);
-		if ($_POST['def_pop_servers'] != "") { $natent['def_pop_servers'] = $_POST['def_pop_servers']; } else unset($natent['def_pop_servers']);
-		if ($_POST['def_pop2_ports'] != "") { $natent['def_pop2_ports'] = $_POST['def_pop2_ports']; } else unset($natent['def_pop2_ports']);
-		if ($_POST['def_pop3_ports'] != "") { $natent['def_pop3_ports'] = $_POST['def_pop3_ports']; } else unset($natent['def_pop3_ports']);
-		if ($_POST['def_imap_servers'] != "") { $natent['def_imap_servers'] = $_POST['def_imap_servers']; } else unset($natent['def_imap_servers']);
-		if ($_POST['def_imap_ports'] != "") { $natent['def_imap_ports'] = $_POST['def_imap_ports']; } else unset($natent['def_imap_ports']);
-		if ($_POST['def_sip_proxy_ip'] != "") { $natent['def_sip_proxy_ip'] = $_POST['def_sip_proxy_ip']; } else unset($natent['def_sip_proxy_ip']);
-		if ($_POST['def_sip_proxy_ports'] != "") { $natent['def_sip_proxy_ports'] = $_POST['def_sip_proxy_ports']; } else unset($natent['def_sip_proxy_ports']);
-		if ($_POST['def_auth_ports'] != "") { $natent['def_auth_ports'] = $_POST['def_auth_ports']; } else unset($natent['def_auth_ports']);
-		if ($_POST['def_finger_ports'] != "") { $natent['def_finger_ports'] = $_POST['def_finger_ports']; } else unset($natent['def_finger_ports']);
-		if ($_POST['def_irc_ports'] != "") { $natent['def_irc_ports'] = $_POST['def_irc_ports']; } else unset($natent['def_irc_ports']);
-		if ($_POST['def_nntp_ports'] != "") { $natent['def_nntp_ports'] = $_POST['def_nntp_ports']; } else unset($natent['def_nntp_ports']);
-		if ($_POST['def_rlogin_ports'] != "") { $natent['def_rlogin_ports'] = $_POST['def_rlogin_ports']; } else unset($natent['def_rlogin_ports']);
-		if ($_POST['def_rsh_ports'] != "") { $natent['def_rsh_ports'] = $_POST['def_rsh_ports']; } else unset($natent['def_rsh_ports']);
-		if ($_POST['def_ssl_ports'] != "") { $natent['def_ssl_ports'] = $_POST['def_ssl_ports']; } else unset($natent['def_ssl_ports']);
-		if ($_POST['snortunifiedlog'] != "") { $natent['snortunifiedlog'] = $_POST['snortunifiedlog'];	} else unset($natent['snortunifiedlog']);
-		if ($_POST['configpassthru'] != "") { $natent['configpassthru'] = $_POST['configpassthru'];	} else unset($natent['configpassthru']);
-		if ($_POST['rulesets'] != "") { $natent['rulesets'] = $_POST['rulesets']; } else unset($natent['rulesets']);
-		if ($_POST['rule_sid_off'] != "") { $natent['rule_sid_off'] = $_POST['rule_sid_off']; } else unset($natent['rule_sid_off']);
-		if ($_POST['rule_sid_on'] != "") { $natent['rule_sid_on'] = $_POST['rule_sid_on']; } else unset($natent['rule_sid_on']);
-		if ($_POST['whitelistname'] != "") { $natent['whitelistname'] = $_POST['whitelistname']; } else unset($natent['whitelistname']);
-		if ($_POST['homelistname'] != "") { $natent['homelistname'] = $_POST['homelistname']; } else unset($natent['homelistname']);
-		if ($_POST['externallistname'] != "") { $natent['externallistname'] = $_POST['externallistname']; } else unset($natent['externallistname']);
-		if ($_POST['suppresslistname'] != "") { $natent['suppresslistname'] = $_POST['suppresslistname']; } else unset($natent['suppresslistname']);
 		$natent['barnyard_enable'] = $_POST['barnyard_enable'] ? 'on' : 'off';
 		$natent['barnyard_mysql'] = $_POST['barnyard_mysql'] ? $_POST['barnyard_mysql'] : $pconfig['barnyard_mysql'];
 		$natent['barnconfigpassthru'] = $_POST['barnconfigpassthru'] ? base64_encode($_POST['barnconfigpassthru']) : $pconfig['barnconfigpassthru'];
@@ -231,8 +104,6 @@ if ($_POST["Submit"]) {
 			$natent['snortunifiedlog'] = 'on';
 		else
 			$natent['snortunifiedlog'] = 'off';
-		if (empty($_POST['barnyard_enable']))
-			$natent['snortunifiedlog'] = 'off';
 
 		if (isset($id) && $a_nat[$id])
 			$a_nat[$id] = $natent;
@@ -252,7 +123,6 @@ if ($_POST["Submit"]) {
 		header( 'Cache-Control: no-store, no-cache, must-revalidate' );
 		header( 'Cache-Control: post-check=0, pre-check=0', false );
 		header( 'Pragma: no-cache' );
-		sleep(2);
 		header("Location: snort_barnyard.php?id=$id");
 		exit;
 	}
@@ -334,73 +204,16 @@ function enable_change(enable_change) {
 	<tr>
 		<td class="tabcont">
 		<table width="100%" border="0" cellpadding="6" cellspacing="0">
-		<?php
-		/* display error code if there is no id */
-		if($id == "")
-		{
-			echo "
-				<style type=\"text/css\">
-				.noid {
-				position:absolute;
-				top:10px;
-				left:0px;
-				width:94%;
-				background:#FCE9C0;
-				background-position: 15px; 
-				border-top:2px solid #DBAC48;
-				border-bottom:2px solid #DBAC48;
-				padding: 15px 10px 85% 50px;
-				}
-				</style> 
-				<div class=\"alert\" ALIGN=CENTER><img src=\"/themes/{$g['theme']}/images/icons/icon_alert.gif\"/><strong>You can not edit options without an interface ID.</CENTER></div>\n";
-
-		}
-		?>
 			<tr>
 				<td colspan="2" valign="top" class="listtopic">General Barnyard2
 				Settings</td>
 			</tr>
 			<tr>
 				<td width="22%" valign="top" class="vncellreq2">Enable</td>
-				<td width="78%" class="vtable"><?php
-				// <input name="enable" type="checkbox" value="yes" checked onClick="enable_change(false)">
-				// care with spaces
-				if ($pconfig['barnyard_enable'] == "on")
-				$checked = checked;
-				if($id != "")
-				{
-					$onclick_enable = "onClick=\"enable_change(false)\">";
-				}
-				echo "
-					<input name=\"barnyard_enable\" type=\"checkbox\" value=\"on\" $checked $onclick_enable
-					<strong>Enable Barnyard2 on this Interface</strong><br>
-					This will enable barnyard2 for this interface. You will also have to set the database credentials.</td>\n\n";
-				?>
-			
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncell2">Interface</td>
-				<td width="78%" class="vtable"><select name="interface"
-					class="formfld">
-				<?php
-					if (function_exists('get_configured_interface_with_descr'))
-						$interfaces = get_configured_interface_with_descr();
-					else {
-						$interfaces = array('wan' => 'WAN', 'lan' => 'LAN', 'pptp' => 'PPTP', 'pppoe' => 'PPPOE');
-						for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) {
-							$interfaces['opt' . $i] = $config['interfaces']['opt' . $i]['descr'];
-						}
-					}
-					foreach ($interfaces as $iface => $ifacename):
-						if ($iface != $pconfig['interface'])
-							continue;
-				?>
-					<option value="<?=$iface;?>" selected><?=htmlspecialchars($ifacename);?></option>
-
-				<?php	endforeach; ?>
-				</select><br>
-				<span class="vexpl">The interface this rule applies to.</span><br/>
-				</td>
+				<td width="78%" class="vtable">
+					<input name="barnyard_enable" type="checkbox" value="on" <?php if ($pconfig['barnyard_enable'] == "on") echo "checked"; ?>  onClick="enable_change(false)">
+					<strong>Enable Barnyard2 </strong><br>
+					This will enable barnyard2 for this interface. You will also have to set the database credentials.</td>
 			</tr>
 			<tr>
 				<td colspan="2" valign="top" class="listtopic">Mysql Settings</td>
@@ -431,8 +244,7 @@ function enable_change(enable_change) {
 				<td width="22%" valign="top">&nbsp;</td>
 				<td width="78%">
 					<input name="Submit" type="submit" class="formbtn" value="Save">
-					<?php if (isset($id) && $a_nat[$id]): ?>
-						<input name="id" type="hidden" value="<?=$id;?>"> <?php endif; ?></td>
+					<input name="id" type="hidden" value="<?=$id;?>"> </td>
 			</tr>
 			<tr>
 				<td width="22%" valign="top">&nbsp;</td>
@@ -452,6 +264,6 @@ function enable_change(enable_change) {
 enable_change(false);
 //-->
 </script>
-					<?php include("fend.inc"); ?>
+<?php include("fend.inc"); ?>
 </body>
 </html>
diff --git a/config/snort/snort_define_servers.php b/config/snort/snort_define_servers.php
index 68b5710a..ddb1e378 100644
--- a/config/snort/snort_define_servers.php
+++ b/config/snort/snort_define_servers.php
@@ -1,7 +1,7 @@
 <?php
 /* $Id$ */
 /*
- snort_interfaces.php
+ snort_define_servers.php
  part of m0n0wall (http://m0n0.ch/wall)
 
  Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
@@ -45,38 +45,24 @@ require_once("/usr/local/pkg/snort/snort.inc");
 
 global $g;
 
-if (!is_array($config['installedpackages']['snortglobal']['rule'])) {
-	$config['installedpackages']['snortglobal']['rule'] = array();
-}
-
-//nat_rules_sort();
-$a_nat = &$config['installedpackages']['snortglobal']['rule'];
-
 $id = $_GET['id'];
 if (isset($_POST['id']))
 	$id = $_POST['id'];
-
-if (isset($_GET['dup'])) {
-	$id = $_GET['dup'];
-	$after = $_GET['dup'];
+if (is_null($id)) {
+        header("Location: /snort/snort_interfaces.php");
+        exit;
 }
 
+if (!is_array($config['installedpackages']['snortglobal']['rule'])) {
+	$config['installedpackages']['snortglobal']['rule'] = array();
+}
+$a_nat = &$config['installedpackages']['snortglobal']['rule'];
 
+$pconfig = array();
 if (isset($id) && $a_nat[$id]) {
+	$pconfig = $a_nat[$id];
 
 	/* old options */
-	$pconfig['def_ssl_ports_ignore'] = $a_nat[$id]['def_ssl_ports_ignore'];
-	$pconfig['flow_depth'] = $a_nat[$id]['flow_depth'];
-	$pconfig['max_queued_bytes'] = $a_nat[$id]['max_queued_bytes'];
-	$pconfig['max_queued_segs'] = $a_nat[$id]['max_queued_segs'];
-	$pconfig['perform_stat'] = $a_nat[$id]['perform_stat'];
-	$pconfig['http_inspect'] = $a_nat[$id]['http_inspect'];
-	$pconfig['other_preprocs'] = $a_nat[$id]['other_preprocs'];
-	$pconfig['ftp_preprocessor'] = $a_nat[$id]['ftp_preprocessor'];
-	$pconfig['smtp_preprocessor'] = $a_nat[$id]['smtp_preprocessor'];
-	$pconfig['sf_portscan'] = $a_nat[$id]['sf_portscan'];
-	$pconfig['dce_rpc_2'] = $a_nat[$id]['dce_rpc_2'];
-	$pconfig['dns_preprocessor'] = $a_nat[$id]['dns_preprocessor'];
 	$pconfig['def_dns_servers'] = $a_nat[$id]['def_dns_servers'];
 	$pconfig['def_dns_ports'] = $a_nat[$id]['def_dns_ports'];
 	$pconfig['def_smtp_servers'] = $a_nat[$id]['def_smtp_servers'];
@@ -110,82 +96,22 @@ if (isset($id) && $a_nat[$id]) {
 	$pconfig['def_rlogin_ports'] = $a_nat[$id]['def_rlogin_ports'];
 	$pconfig['def_rsh_ports'] = $a_nat[$id]['def_rsh_ports'];
 	$pconfig['def_ssl_ports'] = $a_nat[$id]['def_ssl_ports'];
-	$pconfig['barnyard_enable'] = $a_nat[$id]['barnyard_enable'];
-	$pconfig['barnyard_mysql'] = $a_nat[$id]['barnyard_mysql'];
-	$pconfig['enable'] = $a_nat[$id]['enable'];
-	$pconfig['uuid'] = $a_nat[$id]['uuid'];
-	$pconfig['interface'] = $a_nat[$id]['interface'];
-	$pconfig['whitelistname'] = $a_nat[$id]['whitelistname'];
-	$pconfig['homelistname'] = $a_nat[$id]['homelistname'];
-	$pconfig['externallistname'] = $a_nat[$id]['externallistname'];
-	$pconfig['suppresslistname'] = $a_nat[$id]['suppresslistname'];
-	$pconfig['descr'] = $a_nat[$id]['descr'];
-	$pconfig['performance'] = $a_nat[$id]['performance'];
-	$pconfig['blockoffenders7'] = $a_nat[$id]['blockoffenders7'];
-	$pconfig['alertsystemlog'] = $a_nat[$id]['alertsystemlog'];
-	$pconfig['tcpdumplog'] = $a_nat[$id]['tcpdumplog'];
-	$pconfig['snortunifiedlog'] = $a_nat[$id]['snortunifiedlog'];
-	$pconfig['configpassthru'] = $a_nat[$id]['configpassthru'];
-	$pconfig['barnconfigpassthru'] = $a_nat[$id]['barnconfigpassthru'];
-	$pconfig['rulesets'] = $a_nat[$id]['rulesets'];
-	$pconfig['rule_sid_off'] = $a_nat[$id]['rule_sid_off'];
-	$pconfig['rule_sid_on'] = $a_nat[$id]['rule_sid_on'];
-
-	if (isset($_GET['dup']))
-	unset($id);
 }
 
 /* convert fake interfaces to real */
 $if_real = snort_get_real_interface($pconfig['interface']);
-
 $snort_uuid = $config['installedpackages']['snortglobal']['rule'][$id]['uuid'];
 
 /* alert file */
 $d_snortconfdirty_path = "/var/run/snort_conf_{$snort_uuid}_{$if_real}.dirty";
 
+if ($_POST) {
 
-if ($_POST["Submit"]) {
-
-	/* check for overlaps */
+	$natent = array();
+	$natent = $pconfig;
 
 	/* if no errors write to conf */
 	if (!$input_errors) {
-		$natent = array();
-		/* repost the options already in conf */
-		if ($pconfig['interface'] != "") { $natent['interface'] = $pconfig['interface']; }
-		if ($pconfig['enable'] != "") { $natent['enable'] = $pconfig['enable']; }
-		if ($pconfig['uuid'] != "") { $natent['uuid'] = $pconfig['uuid']; }
-		if ($pconfig['descr'] != "") { $natent['descr'] = $pconfig['descr']; }
-		if ($pconfig['performance'] != "") { $natent['performance'] = $pconfig['performance']; }
-		if ($pconfig['blockoffenders7'] != "") { $natent['blockoffenders7'] = $pconfig['blockoffenders7']; }
-		if ($pconfig['alertsystemlog'] != "") { $natent['alertsystemlog'] = $pconfig['alertsystemlog']; }
-		if ($pconfig['tcpdumplog'] != "") { $natent['tcpdumplog'] = $pconfig['tcpdumplog']; }
-		if ($pconfig['snortunifiedlog'] != "") { $natent['snortunifiedlog'] = $pconfig['snortunifiedlog']; }
-		if ($pconfig['def_ssl_ports_ignore'] != "") { $natent['def_ssl_ports_ignore'] = $pconfig['def_ssl_ports_ignore']; }
-		if ($pconfig['flow_depth'] != "") { $natent['flow_depth'] = $pconfig['flow_depth']; }
-		if ($pconfig['max_queued_bytes'] != "") { $natent['max_queued_bytes'] = $pconfig['max_queued_bytes']; }
-		if ($pconfig['max_queued_segs'] != "") { $natent['max_queued_segs'] = $pconfig['max_queued_segs']; }
-		if ($pconfig['perform_stat'] != "") { $natent['perform_stat'] = $pconfig['perform_stat']; }
-		if ($pconfig['http_inspect'] != "") { $natent['http_inspect'] = $pconfig['http_inspect']; }
-		if ($pconfig['other_preprocs'] != "") { $natent['other_preprocs'] = $pconfig['other_preprocs']; }
-		if ($pconfig['ftp_preprocessor'] != "") { $natent['ftp_preprocessor'] = $pconfig['ftp_preprocessor']; }
-		if ($pconfig['smtp_preprocessor'] != "") { $natent['smtp_preprocessor'] = $pconfig['smtp_preprocessor']; }
-		if ($pconfig['sf_portscan'] != "") { $natent['sf_portscan'] = $pconfig['sf_portscan']; }
-		if ($pconfig['dce_rpc_2'] != "") { $natent['dce_rpc_2'] = $pconfig['dce_rpc_2']; }
-		if ($pconfig['dns_preprocessor'] != "") { $natent['dns_preprocessor'] = $pconfig['dns_preprocessor']; }
-		if ($pconfig['barnyard_enable'] != "") { $natent['barnyard_enable'] = $pconfig['barnyard_enable']; }
-		if ($pconfig['barnyard_mysql'] != "") { $natent['barnyard_mysql'] = $pconfig['barnyard_mysql']; }
-		if ($pconfig['rulesets'] != "") { $natent['rulesets'] = $pconfig['rulesets']; }
-		if ($pconfig['rule_sid_off'] != "") { $natent['rule_sid_off'] = $pconfig['rule_sid_off']; }
-		if ($pconfig['rule_sid_on'] != "") { $natent['rule_sid_on'] = $pconfig['rule_sid_on']; }
-		if ($pconfig['configpassthru'] != "") { $natent['configpassthru'] = $pconfig['configpassthru'];	}
-		if ($pconfig['barnconfigpassthru'] != "") { $natent['barnconfigpassthru'] = $pconfig['barnconfigpassthru'];	}
-		if ($pconfig['whitelistname'] != "") { $natent['whitelistname'] = $pconfig['whitelistname']; }
-		if ($pconfig['homelistname'] != "") { $natent['homelistname'] = $pconfig['homelistname'];	}
-		if ($pconfig['externallistname'] != "") { $natent['externallistname'] = $pconfig['externallistname'];	}
-		if ($pconfig['suppresslistname'] != "") { $natent['suppresslistname'] = $pconfig['suppresslistname'];	}
-
-
 		/* post new options */
 		if ($_POST['def_dns_servers'] != "") { $natent['def_dns_servers'] = $_POST['def_dns_servers']; }else{ $natent['def_dns_servers'] = ""; }
 		if ($_POST['def_dns_ports'] != "") { $natent['def_dns_ports'] = $_POST['def_dns_ports']; }else{ $natent['def_dns_ports'] = ""; }
@@ -241,9 +167,7 @@ if ($_POST["Submit"]) {
 		header( 'Cache-Control: no-store, no-cache, must-revalidate' );
 		header( 'Cache-Control: post-check=0, pre-check=0', false );
 		header( 'Pragma: no-cache' );
-
 		header("Location: snort_define_servers.php?id=$id");
-
 		exit;
 	}
 }
@@ -262,15 +186,6 @@ if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}
 echo "{$snort_general_css}\n";
 ?>
 
-<div class="body2">
-
-<noscript>
-<div class="alert" ALIGN=CENTER><img
-	src="../themes/<?php echo $g['theme']; ?>/images/icons/icon_alert.gif" /><strong>Please
-enable JavaScript to view this content
-</CENTER></div>
-</noscript>
-
 <form action="snort_define_servers.php" method="post"
 	enctype="multipart/form-data" name="iform" id="iform"><?php
 
@@ -284,20 +199,6 @@ enable JavaScript to view this content
 		print_info_box2($savemsg);
 	}
 
-	//if (file_exists($d_snortconfdirty_path)) {
-	if (file_exists($d_snortconfdirty_path) || file_exists("/var/run/snort_conf_{$snort_uuid}_.dirty")) {
-		echo '<p>';
-
-		if($savemsg) {
-			print_info_box_np2("{$savemsg}");
-		}else{
-			print_info_box_np2('
-			The Snort configuration has changed and snort needs to be restarted on this interface.<br>
-			You must apply the changes in order for them to take effect.<br>
-			');
-		}
-	}
-
 	?>
 
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
@@ -324,28 +225,6 @@ enable JavaScript to view this content
 <tr>
 		<td class="tabcont">
 		<table width="100%" border="0" cellpadding="6" cellspacing="0">
-		<?php
-		/* display error code if there is no id */
-		if($id == "")
-		{
-			echo "
-				<style type=\"text/css\">
-				.noid {
-				position:absolute;
-				top:10px;
-				left:0px;
-				width:94%;
-				background:#FCE9C0;
-				background-position: 15px; 
-				border-top:2px solid #DBAC48;
-				border-bottom:2px solid #DBAC48;
-				padding: 15px 10px 85% 50px;
-				}
-				</style> 
-				<div class=\"alert\" ALIGN=CENTER><img src=\"/themes/{$g['theme']}/images/icons/icon_alert.gif\"/><strong>You can not edit options without an interface ID.</CENTER></div>\n";
-
-		}
-		?>
 			<tr>
 				<td width="22%" valign="top">&nbsp;</td>
 				<td width="78%"><span class="vexpl"><span class="red"><strong>Note:</strong></span><br>
@@ -624,9 +503,8 @@ enable JavaScript to view this content
 				<td width="22%" valign="top">&nbsp;</td>
 				<td width="78%">
 					<input name="Submit" type="submit" class="formbtn" value="Save"> 
-					<?php if (isset($id) && $a_nat[$id]): ?>
-						<input name="id" type="hidden" value="<?=$id;?>">
-					<?php endif; ?></td>
+					<input name="id" type="hidden" value="<?=$id;?>">
+				</td>
 			</tr>
 			<tr>
 				<td width="22%" valign="top">&nbsp;</td>
@@ -638,10 +516,6 @@ enable JavaScript to view this content
 
 </table>
 </form>
-
-</div>
-
-
-		<?php include("fend.inc"); ?>
+<?php include("fend.inc"); ?>
 </body>
 </html>
diff --git a/config/snort/snort_preprocessors.php b/config/snort/snort_preprocessors.php
index 80a72628..c5c7a4a8 100644
--- a/config/snort/snort_preprocessors.php
+++ b/config/snort/snort_preprocessors.php
@@ -50,14 +50,13 @@ if (is_null($id)) {
         header("Location: /snort/snort_interfaces.php");
         exit;
 }
-if (isset($_GET['dup'])) {
-	$id = $_GET['dup'];
-	$after = $_GET['dup'];
-}
 
+$pconfig = array();
 if (isset($id) && $a_nat[$id]) {
+	$pconfig = $a_nat[$id];
 
 	/* new options */
+	$pconfig['perform_stat'] = $a_nat[$id]['perform_stat'];
 	$pconfig['def_ssl_ports_ignore'] = $a_nat[$id]['def_ssl_ports_ignore'];
 	$pconfig['flow_depth'] = $a_nat[$id]['flow_depth'];
 	$pconfig['max_queued_bytes'] = $a_nat[$id]['max_queued_bytes'];
@@ -70,65 +69,6 @@ if (isset($id) && $a_nat[$id]) {
 	$pconfig['sf_portscan'] = $a_nat[$id]['sf_portscan'];
 	$pconfig['dce_rpc_2'] = $a_nat[$id]['dce_rpc_2'];
 	$pconfig['dns_preprocessor'] = $a_nat[$id]['dns_preprocessor'];
-
-	/* old options */
-	$pconfig['def_dns_servers'] = $a_nat[$id]['def_dns_servers'];
-	$pconfig['def_dns_ports'] = $a_nat[$id]['def_dns_ports'];
-	$pconfig['def_smtp_servers'] = $a_nat[$id]['def_smtp_servers'];
-	$pconfig['def_smtp_ports'] = $a_nat[$id]['def_smtp_ports'];
-	$pconfig['def_mail_ports'] = $a_nat[$id]['def_mail_ports'];
-	$pconfig['def_http_servers'] = $a_nat[$id]['def_http_servers'];
-	$pconfig['def_www_servers'] = $a_nat[$id]['def_www_servers'];
-	$pconfig['def_http_ports'] = $a_nat[$id]['def_http_ports'];
-	$pconfig['def_sql_servers'] = $a_nat[$id]['def_sql_servers'];
-	$pconfig['def_oracle_ports'] = $a_nat[$id]['def_oracle_ports'];
-	$pconfig['def_mssql_ports'] = $a_nat[$id]['def_mssql_ports'];
-	$pconfig['def_telnet_servers'] = $a_nat[$id]['def_telnet_servers'];
-	$pconfig['def_telnet_ports'] = $a_nat[$id]['def_telnet_ports'];
-	$pconfig['def_snmp_servers'] = $a_nat[$id]['def_snmp_servers'];
-	$pconfig['def_snmp_ports'] = $a_nat[$id]['def_snmp_ports'];
-	$pconfig['def_ftp_servers'] = $a_nat[$id]['def_ftp_servers'];
-	$pconfig['def_ftp_ports'] = $a_nat[$id]['def_ftp_ports'];
-	$pconfig['def_ssh_servers'] = $a_nat[$id]['def_ssh_servers'];
-	$pconfig['def_ssh_ports'] = $a_nat[$id]['def_ssh_ports'];
-	$pconfig['def_pop_servers'] = $a_nat[$id]['def_pop_servers'];
-	$pconfig['def_pop2_ports'] = $a_nat[$id]['def_pop2_ports'];
-	$pconfig['def_pop3_ports'] = $a_nat[$id]['def_pop3_ports'];
-	$pconfig['def_imap_servers'] = $a_nat[$id]['def_imap_servers'];
-	$pconfig['def_imap_ports'] = $a_nat[$id]['def_imap_ports'];
-	$pconfig['def_sip_proxy_ip'] = $a_nat[$id]['def_sip_proxy_ip'];
-	$pconfig['def_sip_proxy_ports'] = $a_nat[$id]['def_sip_proxy_ports'];
-	$pconfig['def_auth_ports'] = $a_nat[$id]['def_auth_ports'];
-	$pconfig['def_finger_ports'] = $a_nat[$id]['def_finger_ports'];
-	$pconfig['def_irc_ports'] = $a_nat[$id]['def_irc_ports'];
-	$pconfig['def_nntp_ports'] = $a_nat[$id]['def_nntp_ports'];
-	$pconfig['def_rlogin_ports'] = $a_nat[$id]['def_rlogin_ports'];
-	$pconfig['def_rsh_ports'] = $a_nat[$id]['def_rsh_ports'];
-	$pconfig['def_ssl_ports'] = $a_nat[$id]['def_ssl_ports'];
-	$pconfig['barnyard_enable'] = $a_nat[$id]['barnyard_enable'];
-	$pconfig['barnyard_mysql'] = $a_nat[$id]['barnyard_mysql'];
-	$pconfig['enable'] = $a_nat[$id]['enable'];
-	$pconfig['uuid'] = $a_nat[$id]['uuid'];
-	$pconfig['interface'] = $a_nat[$id]['interface'];
-	$pconfig['descr'] = $a_nat[$id]['descr'];
-	$pconfig['whitelistname'] = $a_nat[$id]['whitelistname'];
-	$pconfig['homelistname'] = $a_nat[$id]['homelistname'];
-	$pconfig['externallistname'] = $a_nat[$id]['externallistname'];
-	$pconfig['suppresslistname'] = $a_nat[$id]['suppresslistname'];
-	$pconfig['performance'] = $a_nat[$id]['performance'];
-	$pconfig['blockoffenders7'] = $a_nat[$id]['blockoffenders7'];
-	$pconfig['alertsystemlog'] = $a_nat[$id]['alertsystemlog'];
-	$pconfig['tcpdumplog'] = $a_nat[$id]['tcpdumplog'];
-	$pconfig['snortunifiedlog'] = $a_nat[$id]['snortunifiedlog'];
-	$pconfig['flow_depth'] = $a_nat[$id]['flow_depth'];
-	$pconfig['configpassthru'] = $a_nat[$id]['configpassthru'];
-	$pconfig['barnconfigpassthru'] = $a_nat[$id]['barnconfigpassthru'];
-	$pconfig['rulesets'] = $a_nat[$id]['rulesets'];
-	$pconfig['rule_sid_off'] = $a_nat[$id]['rule_sid_off'];
-	$pconfig['rule_sid_on'] = $a_nat[$id]['rule_sid_on'];
-
-	if (isset($_GET['dup']))
-		unset($id);
 }
 
 /* convert fake interfaces to real */
@@ -138,68 +78,13 @@ $snort_uuid = $pconfig['uuid'];
 /* alert file */
 $d_snortconfdirty_path = "/var/run/snort_conf_{$snort_uuid}_{$if_real}.dirty";
 
-if ($_POST["Submit"]) {
+if ($_POST) {
 
 	$natent = array();
+	$natent = $pconfig;
 
 	/* if no errors write to conf */
 	if (!$input_errors) {
-		/* repost the options already in conf */
-		$natent['uuid'] = $pconfig['uuid'];
-		$natent['interface'] = $pconfig['interface'];
-		if ($pconfig['enable'] != "") { $natent['enable'] = $pconfig['enable']; }
-		if ($pconfig['descr'] != "") { $natent['descr'] = $pconfig['descr']; }
-		if ($pconfig['performance'] != "") { $natent['performance'] = $pconfig['performance']; }
-		if ($pconfig['blockoffenders7'] != "") { $natent['blockoffenders7'] = $pconfig['blockoffenders7']; }
-		if ($pconfig['alertsystemlog'] != "") { $natent['alertsystemlog'] = $pconfig['alertsystemlog']; }
-		if ($pconfig['tcpdumplog'] != "") { $natent['tcpdumplog'] = $pconfig['tcpdumplog']; }
-		if ($pconfig['snortunifiedlog'] != "") { $natent['snortunifiedlog'] = $pconfig['snortunifiedlog']; }
-		if ($pconfig['barnyard_enable'] != "") { $natent['barnyard_enable'] = $pconfig['barnyard_enable']; }
-		if ($pconfig['barnyard_mysql'] != "") { $natent['barnyard_mysql'] = $pconfig['barnyard_mysql']; }
-		if ($pconfig['def_dns_servers'] != "") { $natent['def_dns_servers'] = $pconfig['def_dns_servers']; }
-		if ($pconfig['def_dns_ports'] != "") { $natent['def_dns_ports'] = $pconfig['def_dns_ports']; }
-		if ($pconfig['def_smtp_servers'] != "") { $natent['def_smtp_servers'] = $pconfig['def_smtp_servers']; }
-		if ($pconfig['def_smtp_ports'] != "") { $natent['def_smtp_ports'] = $pconfig['def_smtp_ports']; }
-		if ($pconfig['def_mail_ports'] != "") { $natent['def_mail_ports'] = $pconfig['def_mail_ports']; }
-		if ($pconfig['def_http_servers'] != "") { $natent['def_http_servers'] = $pconfig['def_http_servers']; }
-		if ($pconfig['def_www_servers'] != "") { $natent['def_www_servers'] = $pconfig['def_www_servers']; }
-		if ($pconfig['def_http_ports'] != "") { $natent['def_http_ports'] = $pconfig['def_http_ports'];	}
-		if ($pconfig['def_sql_servers'] != "") { $natent['def_sql_servers'] = $pconfig['def_sql_servers']; }
-		if ($pconfig['def_oracle_ports'] != "") { $natent['def_oracle_ports'] = $pconfig['def_oracle_ports']; }
-		if ($pconfig['def_mssql_ports'] != "") { $natent['def_mssql_ports'] = $pconfig['def_mssql_ports']; }
-		if ($pconfig['def_telnet_servers'] != "") { $natent['def_telnet_servers'] = $pconfig['def_telnet_servers']; }
-		if ($pconfig['def_telnet_ports'] != "") { $natent['def_telnet_ports'] = $pconfig['def_telnet_ports']; }
-		if ($pconfig['def_snmp_servers'] != "") { $natent['def_snmp_servers'] = $pconfig['def_snmp_servers']; }
-		if ($pconfig['def_snmp_ports'] != "") { $natent['def_snmp_ports'] = $pconfig['def_snmp_ports']; }
-		if ($pconfig['def_ftp_servers'] != "") { $natent['def_ftp_servers'] = $pconfig['def_ftp_servers']; }
-		if ($pconfig['def_ftp_ports'] != "") { $natent['def_ftp_ports'] = $pconfig['def_ftp_ports']; }
-		if ($pconfig['def_ssh_servers'] != "") { $natent['def_ssh_servers'] = $pconfig['def_ssh_servers']; }
-		if ($pconfig['def_ssh_ports'] != "") { $natent['def_ssh_ports'] = $pconfig['def_ssh_ports']; }
-		if ($pconfig['def_pop_servers'] != "") { $natent['def_pop_servers'] = $pconfig['def_pop_servers']; }
-		if ($pconfig['def_pop2_ports'] != "") { $natent['def_pop2_ports'] = $pconfig['def_pop2_ports']; }
-		if ($pconfig['def_pop3_ports'] != "") { $natent['def_pop3_ports'] = $pconfig['def_pop3_ports']; }
-		if ($pconfig['def_imap_servers'] != "") { $natent['def_imap_servers'] = $pconfig['def_imap_servers']; }
-		if ($pconfig['def_imap_ports'] != "") { $natent['def_imap_ports'] = $pconfig['def_imap_ports']; }
-		if ($pconfig['def_sip_proxy_ip'] != "") { $natent['def_sip_proxy_ip'] = $pconfig['def_sip_proxy_ip']; }
-		if ($pconfig['def_sip_proxy_ports'] != "") { $natent['def_sip_proxy_ports'] = $pconfig['def_sip_proxy_ports']; }
-		if ($pconfig['def_auth_ports'] != "") { $natent['def_auth_ports'] = $pconfig['def_auth_ports']; }
-		if ($pconfig['def_finger_ports'] != "") { $natent['def_finger_ports'] = $pconfig['def_finger_ports']; }
-		if ($pconfig['def_irc_ports'] != "") { $natent['def_irc_ports'] = $pconfig['def_irc_ports']; }
-		if ($pconfig['def_nntp_ports'] != "") { $natent['def_nntp_ports'] = $pconfig['def_nntp_ports']; }
-		if ($pconfig['def_rlogin_ports'] != "") { $natent['def_rlogin_ports'] = $pconfig['def_rlogin_ports']; }
-		if ($pconfig['def_rsh_ports'] != "") { $natent['def_rsh_ports'] = $pconfig['def_rsh_ports']; }
-		if ($pconfig['def_ssl_ports'] != "") { $natent['def_ssl_ports'] = $pconfig['def_ssl_ports']; }
-		if ($pconfig['configpassthru'] != "") { $natent['configpassthru'] = $pconfig['configpassthru'];	}
-		if ($pconfig['barnconfigpassthru'] != "") { $natent['barnconfigpassthru'] = $pconfig['barnconfigpassthru']; }
-		if ($pconfig['rulesets'] != "") { $natent['rulesets'] = $pconfig['rulesets']; }
-		if ($pconfig['rule_sid_off'] != "") { $natent['rule_sid_off'] = $pconfig['rule_sid_off']; }
-		if ($pconfig['rule_sid_on'] != "") { $natent['rule_sid_on'] = $pconfig['rule_sid_on']; }
-		if ($pconfig['whitelistname'] != "") { $natent['whitelistname'] = $pconfig['whitelistname']; }
-		if ($pconfig['homelistname'] != "") { $natent['homelistname'] = $pconfig['homelistname']; }
-		if ($pconfig['externallistname'] != "") { $natent['externallistname'] = $pconfig['externallistname']; }
-		if ($pconfig['suppresslistname'] != "") { $natent['suppresslistname'] = $pconfig['suppresslistname']; }
-
-
 		/* post new options */
 		$natent['perform_stat'] = $_POST['perform_stat'];
 		if ($_POST['def_ssl_ports_ignore'] != "") { $natent['def_ssl_ports_ignore'] = $_POST['def_ssl_ports_ignore']; }else{ $natent['def_ssl_ports_ignore'] = ""; }
@@ -486,8 +371,7 @@ enable JavaScript to view this content
 				<td width="22%" valign="top">&nbsp;</td>
 				<td width="78%">
 					<input name="Submit" type="submit" class="formbtn" value="Save">
-					<?php if (isset($id) && $a_nat[$id]): ?>
-						<input name="id" type="hidden" value="<?=$id;?>"> <?php endif; ?></td>
+					<input name="id" type="hidden" value="<?=$id;?>"></td>
 			</tr>
 			<tr>
 				<td width="22%" valign="top">&nbsp;</td>