Git still doesn't like the whitespace in these files...

author: jim-p <jim@pingle.org> 2010-06-22 18:36:15 -0400
committer: jim-p <jim@pingle.org> 2010-06-22 18:36:15 -0400
commit: e3aaa143c79c0fd1ad18537316b22fc475fbffaa (patch)
tree: afa3db9db8ce5e39779f00ff65596549e44bc296 /config/snort/snort_interfaces_suppress.php
parent: 3edf82c8beb2e032a2f82250f6d5011856ddf62c (diff)
download: pfsense-packages-e3aaa143c79c0fd1ad18537316b22fc475fbffaa.tar.gz
pfsense-packages-e3aaa143c79c0fd1ad18537316b22fc475fbffaa.tar.bz2
pfsense-packages-e3aaa143c79c0fd1ad18537316b22fc475fbffaa.zip
1 files changed, 170 insertions, 170 deletions
diff --git a/config/snort/snort_interfaces_suppress.php b/config/snort/snort_interfaces_suppress.php
index 65bf1d4c..9bde781d 100644
--- a/config/snort/snort_interfaces_suppress.php
+++ b/config/snort/snort_interfaces_suppress.php
@@ -1,170 +1,170 @@
-<?php
-/* $Id$ */
-/*
-	firewall_aliases.php
-	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.
-	
-	modified for the pfsense snort package
-	Copyright (C) 2009-2010 Robert Zelaya.
-	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
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require("guiconfig.inc");
-
-
-if (!is_array($config['installedpackages']['snortglobal']['suppress']['item']))
-	$config['installedpackages']['snortglobal']['suppress']['item'] = array();
-
-//aliases_sort(); << what ?
-$a_suppress = &$config['installedpackages']['snortglobal']['suppress']['item'];
-
-if (isset($config['installedpackages']['snortglobal']['suppress']['item'])) {
-$id_gen = count($config['installedpackages']['snortglobal']['suppress']['item']);
-}else{
-$id_gen = '0';
-}
-
-$d_suppresslistdirty_path = '/var/run/snort_suppress.dirty';
-
-if ($_POST) {
-
-	$pconfig = $_POST;
-
-	if ($_POST['apply']) {
-		$retval = 0;
-
-		if(stristr($retval, "error") <> true)
-		    $savemsg = get_std_save_message($retval);
-		else
-		    $savemsg = $retval;
-		if ($retval == 0) {
-			if (file_exists($d_suppresslistdirty_path))
-				unlink($d_suppresslistdirty_path);
-		}
-	}
-}
-
-if ($_GET['act'] == "del") {
-	if ($a_suppress[$_GET['id']]) {
-		/* make sure rule is not being referenced by any nat or filter rules */
-
-			unset($a_suppress[$_GET['id']]);
-			write_config();
-			filter_configure();
-			touch($d_suppresslistdirty_path);
-			header("Location: /snort/snort_interfaces_suppress.php");
-			exit;
-	}
-}
-
-$pgtitle = "Services: Snort: Suppression";
-include("head.inc");
-
-?>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("./snort_fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
-<form action="/snort/snort_interfaces_suppress.php" method="post">
-<?php if ($savemsg) print_info_box($savemsg); ?>
-<?php if (file_exists($d_suppresslistdirty_path)): ?><p>
-<?php print_info_box_np("The white list has been changed.<br>You must apply the changes in order for them to take effect.");?>
-<?php endif; ?>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr><td class="tabnavtbl">
-<?php
-	$tab_array = array();
-	$tab_array[] = array("Snort Interfaces", false, "/snort/snort_interfaces.php");
-	$tab_array[] = array("Global Settings", false, "/snort/snort_interfaces_global.php");
-	$tab_array[] = array("Rule Updates", false, "/snort/snort_download_rules.php");
-	$tab_array[] = array("Alerts", false, "/snort/snort_alerts.php");
-    $tab_array[] = array("Blocked", false, "/snort/snort_blocked.php");
-	$tab_array[] = array("Whitelists", false, "/snort/snort_interfaces_whitelist.php");
-	$tab_array[] = array("Suppress", true, "/snort/snort_interfaces_suppress.php");
-	$tab_array[] = array("Help", false, "/snort/snort_help_info.php");
-	display_top_tabs($tab_array);
-?>    </td></tr>
-<tr>
-<td class="tabcont">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-
-<tr>
-  <td width="30%" class="listhdrr">File Name</td>
-  <td width="70%" class="listhdr">Description</td>
-
-  <td width="10%" class="list">
-  </td>
-</tr>
-	  <?php $i = 0; foreach ($a_suppress as $list): ?>
-<tr>
-  <td class="listlr" ondblclick="document.location='snort_interfaces_suppress_edit.php?id=<?=$i;?>';">
-    <?=htmlspecialchars($list['name']);?>
-  </td>
-  <td class="listbg" ondblclick="document.location='snort_interfaces_suppress_edit.php?id=<?=$i;?>';">
-    <font color="#FFFFFF">
-    <?=htmlspecialchars($list['descr']);?>&nbsp;
-  </td>
-
-  <td valign="middle" nowrap class="list">
-    <table border="0" cellspacing="0" cellpadding="1">
-      <tr>
-        <td valign="middle"><a href="snort_interfaces_suppress_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="edit whitelist"></a></td>
-        <td><a href="/snort/snort_interfaces_suppress.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this whitelist? All elements that still use it will become invalid (e.g. snort rules will fall back to the default whitelist)!')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="delete whitelist"></a></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-	  <?php $i++; endforeach; ?>
-<tr>
-  <td class="list" colspan="2"></td>
-  <td class="list">
-    <table border="0" cellspacing="0" cellpadding="1">
-      <tr>
-	<td valign="middle" width="17">&nbsp;</td>
-        <td valign="middle"><a href="snort_interfaces_suppress_edit.php?id=<?php echo $id_gen;?> "><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="add a new list"></a></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-</table>
-  </td>
-  </tr>
-  </table>
-<br>
-<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-<td width="100%"><span class="vexpl"><span class="red"><strong>Note:</strong></span>
-   <p><span class="vexpl">Here you can create event filtering and suppression for your snort package rules.<br>Please note that you must restart a running rule so that changes can take effect.</span></p>
-</td>
-</table>
-</form>
-<?php include("fend.inc"); ?>
-</body>
-</html>
+<?php
+/* $Id$ */
+/*
+	firewall_aliases.php
+	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.
+	
+	modified for the pfsense snort package
+	Copyright (C) 2009-2010 Robert Zelaya.
+	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
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require("guiconfig.inc");
+
+
+if (!is_array($config['installedpackages']['snortglobal']['suppress']['item']))
+	$config['installedpackages']['snortglobal']['suppress']['item'] = array();
+
+//aliases_sort(); << what ?
+$a_suppress = &$config['installedpackages']['snortglobal']['suppress']['item'];
+
+if (isset($config['installedpackages']['snortglobal']['suppress']['item'])) {
+$id_gen = count($config['installedpackages']['snortglobal']['suppress']['item']);
+}else{
+$id_gen = '0';
+}
+
+$d_suppresslistdirty_path = '/var/run/snort_suppress.dirty';
+
+if ($_POST) {
+
+	$pconfig = $_POST;
+
+	if ($_POST['apply']) {
+		$retval = 0;
+
+		if(stristr($retval, "error") <> true)
+		    $savemsg = get_std_save_message($retval);
+		else
+		    $savemsg = $retval;
+		if ($retval == 0) {
+			if (file_exists($d_suppresslistdirty_path))
+				unlink($d_suppresslistdirty_path);
+		}
+	}
+}
+
+if ($_GET['act'] == "del") {
+	if ($a_suppress[$_GET['id']]) {
+		/* make sure rule is not being referenced by any nat or filter rules */
+
+			unset($a_suppress[$_GET['id']]);
+			write_config();
+			filter_configure();
+			touch($d_suppresslistdirty_path);
+			header("Location: /snort/snort_interfaces_suppress.php");
+			exit;
+	}
+}
+
+$pgtitle = "Services: Snort: Suppression";
+include("head.inc");
+
+?>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("./snort_fbegin.inc"); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
+<form action="/snort/snort_interfaces_suppress.php" method="post">
+<?php if ($savemsg) print_info_box($savemsg); ?>
+<?php if (file_exists($d_suppresslistdirty_path)): ?><p>
+<?php print_info_box_np("The white list has been changed.<br>You must apply the changes in order for them to take effect.");?>
+<?php endif; ?>
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr><td class="tabnavtbl">
+<?php
+	$tab_array = array();
+	$tab_array[] = array("Snort Interfaces", false, "/snort/snort_interfaces.php");
+	$tab_array[] = array("Global Settings", false, "/snort/snort_interfaces_global.php");
+	$tab_array[] = array("Rule Updates", false, "/snort/snort_download_rules.php");
+	$tab_array[] = array("Alerts", false, "/snort/snort_alerts.php");
+    $tab_array[] = array("Blocked", false, "/snort/snort_blocked.php");
+	$tab_array[] = array("Whitelists", false, "/snort/snort_interfaces_whitelist.php");
+	$tab_array[] = array("Suppress", true, "/snort/snort_interfaces_suppress.php");
+	$tab_array[] = array("Help", false, "/snort/snort_help_info.php");
+	display_top_tabs($tab_array);
+?>    </td></tr>
+<tr>
+<td class="tabcont">
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+
+<tr>
+  <td width="30%" class="listhdrr">File Name</td>
+  <td width="70%" class="listhdr">Description</td>
+
+  <td width="10%" class="list">
+  </td>
+</tr>
+	  <?php $i = 0; foreach ($a_suppress as $list): ?>
+<tr>
+  <td class="listlr" ondblclick="document.location='snort_interfaces_suppress_edit.php?id=<?=$i;?>';">
+    <?=htmlspecialchars($list['name']);?>
+  </td>
+  <td class="listbg" ondblclick="document.location='snort_interfaces_suppress_edit.php?id=<?=$i;?>';">
+    <font color="#FFFFFF">
+    <?=htmlspecialchars($list['descr']);?>&nbsp;
+  </td>
+
+  <td valign="middle" nowrap class="list">
+    <table border="0" cellspacing="0" cellpadding="1">
+      <tr>
+        <td valign="middle"><a href="snort_interfaces_suppress_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="edit whitelist"></a></td>
+        <td><a href="/snort/snort_interfaces_suppress.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this whitelist? All elements that still use it will become invalid (e.g. snort rules will fall back to the default whitelist)!')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="delete whitelist"></a></td>
+      </tr>
+    </table>
+  </td>
+</tr>
+	  <?php $i++; endforeach; ?>
+<tr>
+  <td class="list" colspan="2"></td>
+  <td class="list">
+    <table border="0" cellspacing="0" cellpadding="1">
+      <tr>
+	<td valign="middle" width="17">&nbsp;</td>
+        <td valign="middle"><a href="snort_interfaces_suppress_edit.php?id=<?php echo $id_gen;?> "><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="add a new list"></a></td>
+      </tr>
+    </table>
+  </td>
+</tr>
+</table>
+  </td>
+  </tr>
+  </table>
+<br>
+<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+<td width="100%"><span class="vexpl"><span class="red"><strong>Note:</strong></span>
+   <p><span class="vexpl">Here you can create event filtering and suppression for your snort package rules.<br>Please note that you must restart a running rule so that changes can take effect.</span></p>
+</td>
+</table>
+</form>
+<?php include("fend.inc"); ?>
+</body>
+</html>
author	jim-p <jim@pingle.org>	2010-06-22 18:36:15 -0400
committer	jim-p <jim@pingle.org>	2010-06-22 18:36:15 -0400
commit	e3aaa143c79c0fd1ad18537316b22fc475fbffaa (patch)
tree	afa3db9db8ce5e39779f00ff65596549e44bc296 /config/snort/snort_interfaces_suppress.php
parent	3edf82c8beb2e032a2f82250f6d5011856ddf62c (diff)
download	pfsense-packages-e3aaa143c79c0fd1ad18537316b22fc475fbffaa.tar.gz pfsense-packages-e3aaa143c79c0fd1ad18537316b22fc475fbffaa.tar.bz2 pfsense-packages-e3aaa143c79c0fd1ad18537316b22fc475fbffaa.zip