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

1 files changed, 68 insertions, 130 deletions

diff --git a/config/snort/snort_interfaces_suppress_edit.php b/config/snort/snort_interfaces_suppress_edit.php
index 7bb7efd1..ce81a270 100644
--- a/config/snort/snort_interfaces_suppress_edit.php
+++ b/config/snort/snort_interfaces_suppress_edit.php
@@ -36,7 +36,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']['suppress']))
@@ -66,8 +65,6 @@ if (is_array($config['installedpackages']['snortglobal']['suppress']['item'][$id
 	}
 }
 
-$d_snort_suppress_dirty_path = '/var/run/snort_suppress.dirty';
-
 /* returns true if $name is a valid name for a whitelist file name or ip */
 function is_validwhitelistname($name) {
 	if (!is_string($name))
@@ -150,145 +147,86 @@ include_once("head.inc");
 
 <?php
 include("fbegin.inc");
-echo $snort_general_css;
 ?>
 
-<div class="body2"><?if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}?>
+<?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/snort_interfaces_suppress_edit.php?id=<?=$id?>"
-	method="post" name="iform" id="iform"><?php
-	/* Display Alert message */
-	if ($input_errors) {
-		print_input_errors($input_errors); // TODO: add checks
-	}
-
+<?php
 	if ($savemsg) {
-		print_info_box2($savemsg);
+		print_info_box($savemsg);
 	}
 
-	//if (file_exists($d_snortconfdirty_path)) {
-	if (file_exists($d_snort_suppress_dirty_path)) {
-		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">
-	<tr>
-		<td class="tabnavtbl">
-
-		<div class="newtabmenu" style="margin: 1px 0px; width: 775px;"><!-- Tabbed bar code-->
-		<ul class="newtabmenu">
-			<li><a href="/snort/snort_interfaces.php"><span>Snort Interfaces</span></a></li>
-			<li><a href="/snort/snort_interfaces_global.php"><span>Global
-			Settings</span></a></li>
-			<li><a href="/snort/snort_download_updates.php"><span>Updates</span></a></li>
-			<li><a href="/snort/snort_alerts.php"><span>Alerts</span></a></li>
-			<li><a href="/snort/snort_blocked.php"><span>Blocked</span></a></li>
-			<li><a href="/snort/snort_interfaces_whitelist.php"><span>Whitelists</span></a></li>
-			<li class="newtabmenu_active"><a
-				href="/snort/snort_interfaces_suppress.php"><span>Suppress</span></a></li>
-		</ul>
-		</div>
-
-		</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>
+?>
+<form action="/snort/snort_interfaces_suppress_edit.php?id=<?=$id?>" name="iform" id="iform">
+<table width="100%" border="0" cellpadding="6" cellspacing="0">
+<tr>
+	<td colspan="2" class="listtopic">Add the name and description of the file.</td>
+</tr>
+<tr>
+	<td width="22%" valign="top" class="vncellreq">Name</td>
+	<td width="78%" 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 colspan="2">
+		<div style='background-color: #E0E0E0' id='redbox'>
+		<table width='100%'>
 			<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>
+				<td width='8%'>&nbsp;&nbsp;&nbsp;</td>
+				<td width='70%'><font size="2" color='#FF850A'><b>NOTE:</b></font>
+				<font size="2" color='#000000'>&nbsp;&nbsp;The threshold keyword
+				is deprecated as of version 2.8.5. Use the event_filter keyword
+				instead.</font></td>
 			</tr>
 		</table>
-		<table width="100%" border="0" cellpadding="6" cellspacing="0">
-			<table height="32" width="100%">
-				<tr>
-					<td>
-					<div style='background-color: #E0E0E0' id='redbox'>
-					<table width='100%'>
-						<tr>
-							<td width='8%'>&nbsp;&nbsp;&nbsp;<img
-								style='vertical-align: middle'
-								src="/snort/images/icon_excli.png" width="40" height="32"></td>
-							<td width='70%'><font size="2" color='#FF850A'><b>NOTE:</b></font>
-							<font size="2" color='#000000'>&nbsp;&nbsp;The threshold keyword
-							is deprecated as of version 2.8.5. Use the event_filter keyword
-							instead.</font></td>
-						</tr>
-					</table>
-					</div>
-					</td>
-				</tr>
-				<script type="text/javascript">
-	NiftyCheck();
-	Rounded("div#redbox","all","#FFF","#E0E0E0","smooth");
-	Rounded("td#blackbox","all","#FFF","#000000","smooth");
-	</script>
-				<tr>
-					<td colspan="2" valign="top" class="listtopic">Apply suppression or
-					filters to rules. Valid keywords are 'suppress', 'event_filter' and
-					'rate_filter'.</td>
-				</tr>
-				<tr>
-					<td colspan="2" valign="top" class="vncell"><b>Example 1;</b>
-					suppress gen_id 1, sig_id 1852, track by_src, ip 10.1.1.54<br>
-					<b>Example 2;</b> event_filter gen_id 1, sig_id 1851, type limit,
-					track by_src, count 1, seconds 60<br>
-					<b>Example 3;</b> rate_filter gen_id 135, sig_id 1, track by_src,
-					count 100, seconds 1, new_action log, timeout 10</td>
-				</tr>
-				<tr>
-					<td width="100%" class="vtable"><textarea wrap="off"
-						name="suppresspassthru" cols="142" rows="28" id="suppresspassthru"
-						class="formpre"><?=htmlspecialchars($pconfig['suppresspassthru']);?></textarea>
-					</td>
-				</tr>
-				<tr>
-					<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()" /> <?php if (isset($id) && $a_suppress[$id]): ?>
+		</div>
+	</td>
+</tr>
+<tr>
+	<td colspan="2" valign="top" class="listtopic">Apply suppression or
+	filters to rules. Valid keywords are 'suppress', 'event_filter' and
+	'rate_filter'.</td>
+</tr>
+<tr>
+	<td colspan="2" valign="top" class="vncell"><b>Example 1;</b>
+		suppress gen_id 1, sig_id 1852, track by_src, ip 10.1.1.54<br>
+		<b>Example 2;</b> event_filter gen_id 1, sig_id 1851, type limit,
+		track by_src, count 1, seconds 60<br>
+		<b>Example 3;</b> rate_filter gen_id 135, sig_id 1, track by_src,
+		count 100, seconds 1, new_action log, timeout 10</td>
+</tr>
+<tr>
+	<td colspan="2" width="100%" class="vtable"><textarea wrap="off"
+		name="suppresspassthru" cols="100" rows="28" id="suppresspassthru"
+		class="formpre"><?=htmlspecialchars($pconfig['suppresspassthru']);?></textarea>
+	</td>
+</tr>
+<tr>
+	<td width="22%">&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()" /> <?php if (isset($id) && $a_suppress[$id]): ?>
 					<input name="id" type="hidden" value="<?=$id;?>" /> <?php endif; ?>
-					</td>
-				</tr>
-			</table>
-		</table>
-		</td>
-	</tr>
+	</td>
+</tr>
 </table>
 </form>
-
-</div>
-
-	<?php include("fend.inc"); ?>
-
+<?php include("fend.inc"); ?>
+<script type="text/javascript">
+Rounded("div#redbox","all","#FFF","#E0E0E0","smooth");
+Rounded("td#blackbox","all","#FFF","#000000","smooth");
+</script>
 </body>
 </html>