Remove all snort layout customizations since they cause issues allover and remove all unneeded files anymore.

1 files changed, 154 insertions, 168 deletions

diff --git a/config/snort/snort_interfaces_whitelist_edit.php b/config/snort/snort_interfaces_whitelist_edit.php
index a546c642..965dd4be 100644
--- a/config/snort/snort_interfaces_whitelist_edit.php
+++ b/config/snort/snort_interfaces_whitelist_edit.php
@@ -37,7 +37,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("/usr/local/pkg/snort/snort_gui.inc");
 require_once("/usr/local/pkg/snort/snort.inc");
 
 if (!is_array($config['installedpackages']['snortglobal']['whitelist']['item']))
@@ -205,7 +204,6 @@ include_once("head.inc");
 
 <?php
 include("fbegin.inc");
-echo $snort_general_css;
 ?>
 <script type="text/javascript" src="/javascript/row_helper.js"></script>
 	<input type='hidden' name='address_type' value='textbox' />
@@ -223,186 +221,174 @@ echo $snort_general_css;
 <?if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}?>
 
 <?php if ($input_errors) print_input_errors($input_errors); ?>
-<div id="inputerrors"></div>
 
-<form action="snort_interfaces_whitelist_edit.php" method="post" name="iform" id="iform">
 <?php
-	/* Display Alert message */
-	if ($input_errors)
-		print_input_errors($input_errors); // TODO: add checks
-
 	if ($savemsg)
-		print_info_box2($savemsg);
+		print_info_box($savemsg);
 
 ?>
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<form action="snort_interfaces_whitelist_edit.php" method="post" name="iform" id="iform">
+<table width="100%" border="0" cellpadding="6" cellspacing="0">
+	<tr>
+		<td colspan="2" valign="top" class="listtopic">Add the name and
+		description of the file.</td>
+	</tr>
+	<tr>
+		<td valign="top" class="vncellreq">Name</td>
+		<td class="vtable"><input name="name" type="text" id="name"
+			size="40" value="<?=htmlspecialchars($pconfig['name']);?>" /> <br />
+		<span class="vexpl"> The list name may only consist of the
+		characters a-z, A-Z and 0-9. <span class="red">Note: </span> No
+		Spaces. </span></td>
+	</tr>
+	<tr>
+		<td width="22%" valign="top" class="vncell">Description</td>
+		<td width="78%" class="vtable"><input name="descr" type="text"
+			id="descr" size="40" value="<?=$pconfig['descr'];?>" /> <br />
+		<span class="vexpl"> You may enter a description here for your
+		reference (not parsed). </span></td>
+	</tr>
+	<tr>
+		<td width="22%" valign="top" class="vncell">List Type</td>
+		<td width="78%" class="vtable">
+
+		<div
+			style="padding: 5px; margin-top: 16px; margin-bottom: 16px; border: 1px dashed #ff3333; background-color: #eee; color: #000; font-size: 8pt;"
+			id="itemhelp"><strong>WHITELIST:</strong>&nbsp;&nbsp;&nbsp;This
+		list specifies addresses that Snort Package should not block.<br>
+		<br>
+		<strong>NETLIST:</strong>&nbsp;&nbsp;&nbsp;This list is for defining
+		addresses as $HOME_NET or $EXTERNAL_NET in the snort.conf file.</div>
+
+		<select name="snortlisttype" class="formselect" id="snortlisttype">
+		<?php
+		$interfaces4 = array('whitelist' => 'WHITELIST', 'netlist' => 'NETLIST');
+		foreach ($interfaces4 as $iface4 => $ifacename4): ?>
+			<option value="<?=$iface4;?>"
+			<?php if ($iface4 == $pconfig['snortlisttype']) echo "selected"; ?>>
+				<?=htmlspecialchars($ifacename4);?></option>
+				<?php endforeach; ?>
+		</select> <span class="vexpl"> &nbsp;&nbsp;&nbsp;Choose the type of
+		list you will like see in your <span class="red">Interface Edit Tab</span>.
+		</span></td>
+	</tr>
+	<tr>
+		<td colspan="2" valign="top" class="listtopic">Add auto generated
+		ips.</td>
+	</tr>
+	<tr>
+		<td width="22%" valign="top" class="vncell">WAN IPs</td>
+		<td width="78%" class="vtable"><input name="wanips" type="checkbox"
+			id="wanips" size="40" value="yes"
+			<?php if($pconfig['wanips'] == 'yes'){ echo "checked";} if($pconfig['wanips'] == ''){ echo "checked";} ?> />
+		<span class="vexpl"> Add WAN IPs to the list. </span></td>
+	</tr>
 	<tr>
-		<td class="tabcont">
-
-		<table width="100%" border="0" cellpadding="6" cellspacing="0">
-			<tr>
-				<td colspan="2" valign="top" class="listtopic">Add the name and
-				description of the file.</td>
-			</tr>
-			<tr>
-				<td valign="top" class="vncellreq2">Name</td>
-				<td class="vtable"><input name="name" type="text" id="name"
-					size="40" value="<?=htmlspecialchars($pconfig['name']);?>" /> <br />
-				<span class="vexpl"> The list name may only consist of the
-				characters a-z, A-Z and 0-9. <span class="red">Note: </span> No
-				Spaces. </span></td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncell2">Description</td>
-				<td width="78%" class="vtable"><input name="descr" type="text"
-					id="descr" size="40" value="<?=$pconfig['descr'];?>" /> <br />
-				<span class="vexpl"> You may enter a description here for your
-				reference (not parsed). </span></td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncell2">List Type</td>
-				<td width="78%" class="vtable">
-
-				<div
-					style="padding: 5px; margin-top: 16px; margin-bottom: 16px; border: 1px dashed #ff3333; background-color: #eee; color: #000; font-size: 8pt;"
-					id="itemhelp"><strong>WHITELIST:</strong>&nbsp;&nbsp;&nbsp;This
-				list specifies addresses that Snort Package should not block.<br>
-				<br>
-				<strong>NETLIST:</strong>&nbsp;&nbsp;&nbsp;This list is for defining
-				addresses as $HOME_NET or $EXTERNAL_NET in the snort.conf file.</div>
-
-				<select name="snortlisttype" class="formselect" id="snortlisttype">
-				<?php
-				$interfaces4 = array('whitelist' => 'WHITELIST', 'netlist' => 'NETLIST');
-				foreach ($interfaces4 as $iface4 => $ifacename4): ?>
-					<option value="<?=$iface4;?>"
-					<?php if ($iface4 == $pconfig['snortlisttype']) echo "selected"; ?>>
-						<?=htmlspecialchars($ifacename4);?></option>
-						<?php endforeach; ?>
-				</select> <span class="vexpl"> &nbsp;&nbsp;&nbsp;Choose the type of
-				list you will like see in your <span class="red">Interface Edit Tab</span>.
-				</span></td>
-			</tr>
-			<tr>
-				<td colspan="2" valign="top" class="listtopic">Add auto generated
-				ips.</td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncell2">WAN IPs</td>
-				<td width="78%" class="vtable"><input name="wanips" type="checkbox"
-					id="wanips" size="40" value="yes"
-					<?php if($pconfig['wanips'] == 'yes'){ echo "checked";} if($pconfig['wanips'] == ''){ echo "checked";} ?> />
-				<span class="vexpl"> Add WAN IPs to the list. </span></td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncell2">Wan Gateways</td>
-				<td width="78%" class="vtable"><input name="wangateips"
-					type="checkbox" id="wangateips" size="40" value="yes"
-					<?php if($pconfig['wangateips'] == 'yes'){ echo "checked";} if($pconfig['wangateips'] == ''){ echo "checked";} ?> />
-				<span class="vexpl"> Add WAN Gateways to the list. </span></td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncell2">Wan DNS servers</td>
-				<td width="78%" class="vtable"><input name="wandnsips"
-					type="checkbox" id="wandnsips" size="40" value="yes"
-					<?php if($pconfig['wandnsips'] == 'yes'){ echo "checked";} if($pconfig['wandnsips'] == ''){ echo "checked";} ?> />
-				<span class="vexpl"> Add WAN DNS servers to the list. </span></td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncell2">Virtual IP Addresses</td>
-				<td width="78%" class="vtable"><input name="vips" type="checkbox"
-					id="vips" size="40" value="yes"
-					<?php if($pconfig['vips'] == 'yes'){ echo "checked";} if($pconfig['vips'] == ''){ echo "checked";} ?> />
-				<span class="vexpl"> Add Virtual IP Addresses to the list. </span></td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncell2">VPNs</td>
-				<td width="78%" class="vtable"><input name="vpnips" type="checkbox"
-					id="vpnips" size="40" value="yes"
-					<?php if($pconfig['vpnips'] == 'yes'){ echo "checked";} if($pconfig['vpnips'] == ''){ echo "checked";} ?> />
-				<span class="vexpl"> Add VPN Addresses to the list. </span></td>
-			</tr>
-			<tr>
-				<td colspan="2" valign="top" class="listtopic">Add your own custom
-				ips.</td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncellreq2">
-				<div id="addressnetworkport">IP or CIDR items</div>
-				</td>
-				<td width="78%" class="vtable">
-				<table id="maintable">
-					<tbody>
-						<tr>
-							<td colspan="4">
-							<div
-								style="padding: 5px; margin-top: 16px; margin-bottom: 16px; border: 1px dashed #ff3333; background-color: #eee; color: #000; font-size: 8pt;"
-								id="itemhelp">For <strong>WHITELIST's</strong> enter <strong>ONLY
-							IPs not CIDRs</strong>. Example: 192.168.4.1<br>
-							<br>
-							For <strong>NETLIST's</strong> you may enter <strong>IPs and
-							CIDRs</strong>. Example: 192.168.4.1 or 192.168.4.0/24</div>
-							</td>
-						</tr>
-						<tr>
-							<td>
-							<div id="onecolumn">IP or CIDR</div>
-							</td>
-							<td>
-							<div id="threecolumn">Add a Description or leave blank and a date
-							will be added.</div>
-							</td>
-						</tr>
-
-					<?php
-						/* cleanup code */
-						$counter = 0;
-						$address = $pconfig['address'];
-						if ($address <> ""):
-						$item = explode(" ", $address);
-						$item3 = explode("||", $pconfig['detail']);
-						foreach($item as $ww):
-							$address = $item[$counter];
-							$item4 = $item3[$counter];
-					?>
-						<tr>
-							<td><input name="address<?php echo $counter; ?>" class="formfld unknown" type="text" id="address<?php echo $counter; ?>" size="30" value="<?=htmlspecialchars($address);?>" /></td>
-							<td><input name="detail<?php echo $counter; ?>" class="formfld unknown" type="text" id="address<?php echo $counter; ?>" size="50" value="<?=$item4;?>" /></td>
-							<td>
-								<?php echo "<input type=\"image\" src=\"/themes/".$g['theme']."/images/icons/icon_x.gif\" onclick=\"removeRow(this); return false;\" value=\"Delete\" />"; ?>
-							</td>
-						</tr>
-					<?php
-						$counter++;
-
-						endforeach; endif;
-					?>
-					</tbody>
-				</table>
-				<a onclick="javascript:addRowTo('maintable'); return false;"
-					href="#"><img border="0"
-					src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt=""
-					title="add another entry" /> </a></td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top">&nbsp;</td>
-				<td width="78%">
-					<input id="submit" name="submit" type="submit" class="formbtn" value="Save" />
-					<input id="cancelbutton" name="cancelbutton" type="button" class="formbtn" value="Cancel" onclick="history.back()" />
-					<input name="id" type="hidden" value="<?=$id;?>" />
-				</td>
-			</tr>
+		<td width="22%" valign="top" class="vncell">Wan Gateways</td>
+		<td width="78%" class="vtable"><input name="wangateips"
+			type="checkbox" id="wangateips" size="40" value="yes"
+			<?php if($pconfig['wangateips'] == 'yes'){ echo "checked";} if($pconfig['wangateips'] == ''){ echo "checked";} ?> />
+		<span class="vexpl"> Add WAN Gateways to the list. </span></td>
+	</tr>
+	<tr>
+		<td width="22%" valign="top" class="vncell">Wan DNS servers</td>
+		<td width="78%" class="vtable"><input name="wandnsips"
+			type="checkbox" id="wandnsips" size="40" value="yes"
+			<?php if($pconfig['wandnsips'] == 'yes'){ echo "checked";} if($pconfig['wandnsips'] == ''){ echo "checked";} ?> />
+		<span class="vexpl"> Add WAN DNS servers to the list. </span></td>
+	</tr>
+	<tr>
+		<td width="22%" valign="top" class="vncell">Virtual IP Addresses</td>
+		<td width="78%" class="vtable"><input name="vips" type="checkbox"
+			id="vips" size="40" value="yes"
+			<?php if($pconfig['vips'] == 'yes'){ echo "checked";} if($pconfig['vips'] == ''){ echo "checked";} ?> />
+		<span class="vexpl"> Add Virtual IP Addresses to the list. </span></td>
+	</tr>
+	<tr>
+		<td width="22%" valign="top" class="vncell">VPNs</td>
+		<td width="78%" class="vtable"><input name="vpnips" type="checkbox"
+			id="vpnips" size="40" value="yes"
+			<?php if($pconfig['vpnips'] == 'yes'){ echo "checked";} if($pconfig['vpnips'] == ''){ echo "checked";} ?> />
+		<span class="vexpl"> Add VPN Addresses to the list. </span></td>
+	</tr>
+	<tr>
+		<td colspan="2" valign="top" class="listtopic">Add your own custom
+		ips.</td>
+	</tr>
+	<tr>
+		<td width="22%" valign="top" class="vncellreq">
+		<div id="addressnetworkport">IP or CIDR items</div>
+		</td>
+		<td width="78%" class="vtable">
+		<table id="maintable">
+			<tbody>
+				<tr>
+					<td colspan="4">
+					<div
+						style="padding: 5px; margin-top: 16px; margin-bottom: 16px; border: 1px dashed #ff3333; background-color: #eee; color: #000; font-size: 8pt;"
+						id="itemhelp">For <strong>WHITELIST's</strong> enter <strong>ONLY
+					IPs not CIDRs</strong>. Example: 192.168.4.1<br>
+					<br>
+					For <strong>NETLIST's</strong> you may enter <strong>IPs and
+					CIDRs</strong>. Example: 192.168.4.1 or 192.168.4.0/24</div>
+					</td>
+				</tr>
+				<tr>
+					<td>
+					<div id="onecolumn">IP or CIDR</div>
+					</td>
+					<td>
+					<div id="threecolumn">Add a Description or leave blank and a date
+					will be added.</div>
+					</td>
+				</tr>
+
+			<?php
+				/* cleanup code */
+				$counter = 0;
+				$address = $pconfig['address'];
+				if ($address <> ""):
+				$item = explode(" ", $address);
+				$item3 = explode("||", $pconfig['detail']);
+				foreach($item as $ww):
+					$address = $item[$counter];
+					$item4 = $item3[$counter];
+			?>
+				<tr>
+					<td><input name="address<?php echo $counter; ?>" class="formfld unknown" type="text" id="address<?php echo $counter; ?>" size="30" value="<?=htmlspecialchars($address);?>" /></td>
+					<td><input name="detail<?php echo $counter; ?>" class="formfld unknown" type="text" id="address<?php echo $counter; ?>" size="50" value="<?=$item4;?>" /></td>
+					<td>
+						<?php echo "<input type=\"image\" src=\"/themes/".$g['theme']."/images/icons/icon_x.gif\" onclick=\"removeRow(this); return false;\" value=\"Delete\" />"; ?>
+					</td>
+				</tr>
+			<?php
+				$counter++;
+
+				endforeach; endif;
+			?>
+			</tbody>
 		</table>
+		<a onclick="javascript:addRowTo('maintable'); return false;"
+			href="#"><img border="0"
+			src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt=""
+			title="add another entry" /> </a></td>
+	</tr>
+	<tr>
+		<td width="22%" valign="top">&nbsp;</td>
+		<td width="78%">
+			<input id="submit" name="submit" type="submit" class="formbtn" value="Save" />
+			<input id="cancelbutton" name="cancelbutton" type="button" class="formbtn" value="Cancel" onclick="history.back()" />
+			<input name="id" type="hidden" value="<?=$id;?>" />
 		</td>
 	</tr>
 </table>
 </form>
 
 <script type="text/javascript">
-	/* row and col adjust when you add extra entries */
-	
-	field_counter_js = 3;
+/* row and col adjust when you add extra entries */
+
+field_counter_js = 3;
 	rows = 1;
 	totalrows = <?php echo $counter; ?>;
 	loaded = <?php echo $counter; ?>;