aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rwxr-xr-xconfig/snort/snort_alerts.php5
-rw-r--r--config/snort/snort_barnyard.php10
-rw-r--r--config/snort/snort_blocked.php5
-rwxr-xr-xconfig/snort/snort_define_servers.php5
-rwxr-xr-xconfig/snort/snort_download_rules.php8
-rwxr-xr-xconfig/snort/snort_download_updates.php2
-rwxr-xr-xconfig/snort/snort_interfaces.php280
-rwxr-xr-xconfig/snort/snort_interfaces_edit.php7
-rw-r--r--config/snort/snort_interfaces_global.php11
-rw-r--r--config/snort/snort_interfaces_suppress.php5
-rw-r--r--config/snort/snort_interfaces_suppress_edit.php5
-rw-r--r--config/snort/snort_interfaces_whitelist.php5
-rw-r--r--config/snort/snort_interfaces_whitelist_edit.php5
-rwxr-xr-xconfig/snort/snort_preprocessors.php7
-rwxr-xr-xconfig/snort/snort_rules.php7
-rw-r--r--config/snort/snort_rules_flowbits.php36
-rwxr-xr-xconfig/snort/snort_rulesets.php2
17 files changed, 216 insertions, 189 deletions
diff --git a/config/snort/snort_alerts.php b/config/snort/snort_alerts.php
index 98a58863..607fba54 100755
--- a/config/snort/snort_alerts.php
+++ b/config/snort/snort_alerts.php
@@ -205,8 +205,8 @@ if ($pconfig['arefresh'] == 'on')
?>
</td></tr>
<tr>
- <td>
- <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="6">
+ <td><div id="mainarea">
+ <table id="maintable" class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="6">
<tr>
<td colspan="2" class="listtopic"><?php echo gettext("Alert Log View Settings"); ?></td>
</tr>
@@ -357,6 +357,7 @@ if (file_exists("/var/log/snort/snort_{$if_real}{$snort_uuid}/alert")) {
</td>
</tr>
</table>
+</div>
</td></tr>
</table>
</form>
diff --git a/config/snort/snort_barnyard.php b/config/snort/snort_barnyard.php
index cf9fb4bd..a7f04e39 100644
--- a/config/snort/snort_barnyard.php
+++ b/config/snort/snort_barnyard.php
@@ -161,7 +161,7 @@ function enable_change(enable_change) {
$tab_array[7] = array(gettext("Sync"), false, "/pkg_edit.php?xml=snort/snort_sync.xml");
display_top_tabs($tab_array);
echo '</td></tr>';
- echo '<tr><td class="tabnavtbl">';
+ echo '<tr><td>';
$menu_iface=($if_friendly?substr($if_friendly,0,5)." ":"Iface ");
$tab_array = array();
$tab_array[] = array($menu_iface . gettext("Settings"), false, "/snort/snort_interfaces_edit.php?id={$id}");
@@ -174,8 +174,8 @@ function enable_change(enable_change) {
?>
</td></tr>
<tr>
- <td class="tabcont">
- <table width="100%" border="0" cellpadding="6" cellspacing="0">
+ <td><div id="mainarea">
+ <table id="maintable" class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td colspan="2" valign="top" class="listtopic"><?php echo gettext("General Barnyard2 " .
"Settings"); ?></td>
@@ -225,7 +225,9 @@ function enable_change(enable_change) {
<?php echo gettext("Please save your settings before you click start."); ?> </td>
</tr>
</table>
-
+ </div>
+ </td>
+ </tr>
</table>
</form>
<script language="JavaScript">
diff --git a/config/snort/snort_blocked.php b/config/snort/snort_blocked.php
index 6feca97b..5fb7e608 100644
--- a/config/snort/snort_blocked.php
+++ b/config/snort/snort_blocked.php
@@ -146,13 +146,13 @@ if ($pconfig['brefresh'] == 'on')
$tab_array[4] = array(gettext("Blocked"), true, "/snort/snort_blocked.php");
$tab_array[5] = array(gettext("Whitelists"), false, "/snort/snort_interfaces_whitelist.php");
$tab_array[6] = array(gettext("Suppress"), false, "/snort/snort_interfaces_suppress.php");
- $tab_array[7] = array(gettext("Sync"), false, "/pkg_edit.php?xml=snort/snort_sync.xml");
+ $tab_array[7] = array(gettext("Sync"), false, "/pkg_edit.php?xml=snort/snort_sync.xml");
display_top_tabs($tab_array);
?>
</td>
</tr>
<tr>
- <td>
+ <td><div id="mainarea">
<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td colspan="2" class="listtopic"><?php echo gettext("Blocked Hosts Log View Settings"); ?></td>
@@ -280,6 +280,7 @@ if ($pconfig['brefresh'] == 'on')
</td>
</tr>
</table>
+ </div>
</td>
</tr>
</table>
diff --git a/config/snort/snort_define_servers.php b/config/snort/snort_define_servers.php
index 307dd8a8..8c19325b 100755
--- a/config/snort/snort_define_servers.php
+++ b/config/snort/snort_define_servers.php
@@ -190,8 +190,8 @@ if ($savemsg)
?>
</td></tr>
<tr>
- <td class="tabcont">
- <table width="100%" border="0" cellpadding="6" cellspacing="0">
+ <td><div id="mainarea">
+ <table id="maintable" class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td colspan="2" valign="top" class="listtopic"><?php echo gettext("Define Servers"); ?></td>
</tr>
@@ -244,6 +244,7 @@ if ($savemsg)
</td>
</tr>
</table>
+</div>
</td></tr>
</table>
</form>
diff --git a/config/snort/snort_download_rules.php b/config/snort/snort_download_rules.php
index f9fca057..e35eb983 100755
--- a/config/snort/snort_download_rules.php
+++ b/config/snort/snort_download_rules.php
@@ -46,11 +46,11 @@ include("head.inc");
<?if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}?>
<form action="/snort/snort_download_updates.php" method="GET">
-<div id="mainarea">
+
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
- <td class="tabcont" align="center">
- <table width="100%" border="0" cellpadding="6" cellspacing="0">
+ <td align="center"><div id="mainarea">
+ <table id="maintable" class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td class="tabcont" align="center">
<table width="420" border="0" cellpadding="0" cellspacing="0">
@@ -80,10 +80,10 @@ include("head.inc");
<td class="tabcont" align="center" valign="middle"><input type="submit" name="return" id="return" Value="Return"></td>
</tr>
</table>
+ </div>
</td>
</tr>
</table>
-</div>
</form>
<?php include("fend.inc");?>
</body>
diff --git a/config/snort/snort_download_updates.php b/config/snort/snort_download_updates.php
index 4e312f22..a397a7b0 100755
--- a/config/snort/snort_download_updates.php
+++ b/config/snort/snort_download_updates.php
@@ -124,7 +124,7 @@ h += 96;
</td></tr>
<tr>
<td>
- <div id="mainarea3">
+ <div id="mainarea">
<table id="maintable4" class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr align="center">
<td>
diff --git a/config/snort/snort_interfaces.php b/config/snort/snort_interfaces.php
index 4f7eaebf..ad492df2 100755
--- a/config/snort/snort_interfaces.php
+++ b/config/snort/snort_interfaces.php
@@ -194,25 +194,26 @@ if ($pfsense_stable == 'yes')
?>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr><td>
-<?php
-
- $tab_array = array();
- $tab_array[0] = array(gettext("Snort Interfaces"), true, "/snort/snort_interfaces.php");
- $tab_array[1] = array(gettext("Global Settings"), false, "/snort/snort_interfaces_global.php");
- $tab_array[2] = array(gettext("Updates"), false, "/snort/snort_download_updates.php");
- $tab_array[3] = array(gettext("Alerts"), false, "/snort/snort_alerts.php");
- $tab_array[4] = array(gettext("Blocked"), false, "/snort/snort_blocked.php");
- $tab_array[5] = array(gettext("Whitelists"), false, "/snort/snort_interfaces_whitelist.php");
- $tab_array[6] = array(gettext("Suppress"), false, "/snort/snort_interfaces_suppress.php");
- $tab_array[7] = array(gettext("Sync"), false, "/pkg_edit.php?xml=snort/snort_sync.xml");
- display_top_tabs($tab_array);
-?>
-</td></tr>
<tr>
<td>
- <div id="mainarea2">
- <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+ <?php
+ $tab_array = array();
+ $tab_array[0] = array(gettext("Snort Interfaces"), true, "/snort/snort_interfaces.php");
+ $tab_array[1] = array(gettext("Global Settings"), false, "/snort/snort_interfaces_global.php");
+ $tab_array[2] = array(gettext("Updates"), false, "/snort/snort_download_updates.php");
+ $tab_array[3] = array(gettext("Alerts"), false, "/snort/snort_alerts.php");
+ $tab_array[4] = array(gettext("Blocked"), false, "/snort/snort_blocked.php");
+ $tab_array[5] = array(gettext("Whitelists"), false, "/snort/snort_interfaces_whitelist.php");
+ $tab_array[6] = array(gettext("Suppress"), false, "/snort/snort_interfaces_suppress.php");
+ $tab_array[7] = array(gettext("Sync"), false, "/pkg_edit.php?xml=snort/snort_sync.xml");
+ display_top_tabs($tab_array);
+ ?>
+ </td>
+</tr>
+<tr>
+ <td>
+ <div id="mainarea">
+ <table id="maintable" class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr id="frheader">
<td width="3%" class="list">&nbsp;</td>
<td width="10%" class="listhdrr"><?php echo gettext("If"); ?></td>
@@ -226,82 +227,82 @@ if ($pfsense_stable == 'yes')
<tr>
<td></td>
<td align="center" valign="middle"><a href="snort_interfaces_edit.php?id=<?php echo $id_gen;?>"><img
- src="../themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif"
- width="17" height="17" border="0" title="<?php echo gettext('Add Snort interface mapping');?>"></a></td>
+ src="../themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif"
+ width="17" height="17" border="0" title="<?php echo gettext('Add Snort interface mapping');?>"></a></td>
</tr>
</table>
</td>
</tr>
-<?php $nnats = $i = 0;
-
-// Turn on buffering to speed up rendering
-ini_set('output_buffering','true');
-
-// Start buffering to fix display lag issues in IE9 and IE10
-ob_start(null, 0);
-
-/* If no interfaces are defined, then turn off the "no rules" warning */
-$no_rules_footnote = false;
-if ($id_gen == 0)
- $no_rules = false;
-else
- $no_rules = true;
-
-foreach ($a_nat as $natent): ?>
- <tr valign="top" id="fr<?=$nnats;?>">
-<?php
-
-/* convert fake interfaces to real and check if iface is up */
-/* There has to be a smarter way to do this */
- $if_real = snort_get_real_interface($natent['interface']);
- $natend_friendly= snort_get_friendly_interface($natent['interface']);
- $snort_uuid = $natent['uuid'];
- if (snort_is_running($snort_uuid, $if_real) == 'no'){
- $iconfn = 'block';
- $iconfn_msg1 = 'Snort is not running on ';
- $iconfn_msg2 = '. Click to start.';
- }
- else{
- $iconfn = 'pass';
- $iconfn_msg1 = 'Snort is running on ';
- $iconfn_msg2 = '. Click to stop.';
- }
- if (snort_is_running($snort_uuid, $if_real, 'barnyard2') == 'no'){
- $biconfn = 'block';
- $biconfn_msg1 = 'Barnyard2 is not running on ';
- $biconfn_msg2 = '. Click to start.';
- }
- else{
- $biconfn = 'pass';
- $biconfn_msg1 = 'Barnyard2 is running on ';
- $biconfn_msg2 = '. Click to stop.';
- }
+ <?php $nnats = $i = 0;
+
+ // Turn on buffering to speed up rendering
+ ini_set('output_buffering','true');
+
+ // Start buffering to fix display lag issues in IE9 and IE10
+ ob_start(null, 0);
+
+ /* If no interfaces are defined, then turn off the "no rules" warning */
+ $no_rules_footnote = false;
+ if ($id_gen == 0)
+ $no_rules = false;
+ else
+ $no_rules = true;
+
+ foreach ($a_nat as $natent): ?>
+ <tr valign="top" id="fr<?=$nnats;?>">
+ <?php
+
+ /* convert fake interfaces to real and check if iface is up */
+ /* There has to be a smarter way to do this */
+ $if_real = snort_get_real_interface($natent['interface']);
+ $natend_friendly= snort_get_friendly_interface($natent['interface']);
+ $snort_uuid = $natent['uuid'];
+ if (snort_is_running($snort_uuid, $if_real) == 'no'){
+ $iconfn = 'block';
+ $iconfn_msg1 = 'Snort is not running on ';
+ $iconfn_msg2 = '. Click to start.';
+ }
+ else{
+ $iconfn = 'pass';
+ $iconfn_msg1 = 'Snort is running on ';
+ $iconfn_msg2 = '. Click to stop.';
+ }
+ if (snort_is_running($snort_uuid, $if_real, 'barnyard2') == 'no'){
+ $biconfn = 'block';
+ $biconfn_msg1 = 'Barnyard2 is not running on ';
+ $biconfn_msg2 = '. Click to start.';
+ }
+ else{
+ $biconfn = 'pass';
+ $biconfn_msg1 = 'Barnyard2 is running on ';
+ $biconfn_msg2 = '. Click to stop.';
+ }
- /* See if interface has any rules defined and set boolean flag */
- $no_rules = true;
- if (isset($natent['customrules']) && !empty($natent['customrules']))
- $no_rules = false;
- if (isset($natent['rulesets']) && !empty($natent['rulesets']))
- $no_rules = false;
- if (isset($natent['ips_policy']) && !empty($natent['ips_policy']))
- $no_rules = false;
- /* Do not display the "no rules" warning if interface disabled */
- if ($natent['enable'] == "off")
- $no_rules = false;
- if ($no_rules)
- $no_rules_footnote = true;
-?>
- <td class="listt">
+ /* See if interface has any rules defined and set boolean flag */
+ $no_rules = true;
+ if (isset($natent['customrules']) && !empty($natent['customrules']))
+ $no_rules = false;
+ if (isset($natent['rulesets']) && !empty($natent['rulesets']))
+ $no_rules = false;
+ if (isset($natent['ips_policy']) && !empty($natent['ips_policy']))
+ $no_rules = false;
+ /* Do not display the "no rules" warning if interface disabled */
+ if ($natent['enable'] == "off")
+ $no_rules = false;
+ if ($no_rules)
+ $no_rules_footnote = true;
+ ?>
+ <td class="listt">
<input type="checkbox" id="frc<?=$nnats;?>" name="rule[]" value="<?=$i;?>" onClick="fr_bgcolor('<?=$nnats;?>')" style="margin: 0; padding: 0;">
</td>
- <td class="listr"
+ <td class="listr"
id="frd<?=$nnats;?>"
ondblclick="document.location='snort_interfaces_edit.php?id=<?=$nnats;?>';">
<?php
echo $natend_friendly;
?>
- </td>
- <td class="listr"
+ </td>
+ <td class="listr"
id="frd<?=$nnats;?>"
ondblclick="document.location='snort_interfaces_edit.php?id=<?=$nnats;?>';">
<?php
@@ -316,8 +317,8 @@ foreach ($a_nat as $natent): ?>
} else
echo strtoupper("disabled");
?>
- </td>
- <td class="listr"
+ </td>
+ <td class="listr"
id="frd<?=$nnats;?>"
ondblclick="document.location='snort_interfaces_edit.php?id=<?=$nnats;?>';">
<?php
@@ -328,8 +329,8 @@ foreach ($a_nat as $natent): ?>
$check_performance = "lowmem";
}
?> <?=strtoupper($check_performance);?>
- </td>
- <td class="listr"
+ </td>
+ <td class="listr"
id="frd<?=$nnats;?>"
ondblclick="document.location='snort_interfaces_edit.php?id=<?=$nnats;?>';">
<?php
@@ -341,8 +342,8 @@ foreach ($a_nat as $natent): ?>
$check_blockoffenders = disabled;
}
?> <?=strtoupper($check_blockoffenders);?>
- </td>
- <td class="listr"
+ </td>
+ <td class="listr"
id="frd<?=$nnats;?>"
ondblclick="document.location='snort_interfaces_edit.php?id=<?=$nnats;?>';">
<?php
@@ -356,12 +357,12 @@ foreach ($a_nat as $natent): ?>
} else
echo strtoupper("disabled");
?>
- </td>
- <td class="listbg"
+ </td>
+ <td class="listbg"
ondblclick="document.location='snort_interfaces_edit.php?id=<?=$nnats;?>';">
<font color="#ffffff"> <?=htmlspecialchars($natent['descr']);?>&nbsp;
- </td>
- <td valign="middle" class="list" nowrap>
+ </td>
+ <td valign="middle" class="list" nowrap>
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td><a href="snort_interfaces_edit.php?id=<?=$i;?>"><img
@@ -370,46 +371,42 @@ foreach ($a_nat as $natent): ?>
</td>
</tr>
</table>
- </td>
+ </td>
</tr>
<?php $i++; $nnats++; endforeach; ob_end_flush(); ?>
- <tr>
- <td class="list"></td>
- <td class="list" colspan="6">
- <?php if ($no_rules_footnote): ?><br><img src="../themes/<?= $g['theme']; ?>/images/icons/icon_frmfld_imp.png" width="15" height="15" border="0">
- <span class="red">&nbsp;&nbsp <?php echo gettext("WARNING: Marked interface currently has no rules defined for Snort"); ?></span>
- <?php else: ?>&nbsp;
- <?php endif; ?>
- </td>
- <td class="list" valign="middle" nowrap>
- <table border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td><?php if ($nnats == 0): ?><img
- src="../themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif"
- width="17" height="17" " border="0">
- <?php else: ?>
- <input name="del" type="image"
- src="../themes/<?= $g['theme']; ?>/images/icons/icon_x.gif"
- width="17" height="17" title="<?php echo gettext("Delete selected Snort interface mapping(s)"); ?>"
- onclick="return intf_del()">
- <?php endif; ?></td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </div>
- </td>
- </tr>
-</table>
-
-<br>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td>
- <table class="tabcont" width="100%" border="0" cellpadding="1" cellspacing="1">
+ <tr>
+ <td class="list"></td>
+ <td class="list" colspan="6">
+ <?php if ($no_rules_footnote): ?><br><img src="../themes/<?= $g['theme']; ?>/images/icons/icon_frmfld_imp.png" width="15" height="15" border="0">
+ <span class="red">&nbsp;&nbsp <?php echo gettext("WARNING: Marked interface currently has no rules defined for Snort"); ?></span>
+ <?php else: ?>&nbsp;
+ <?php endif; ?>
+ </td>
+ <td class="list" valign="middle" nowrap>
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td><?php if ($nnats == 0): ?><img
+ src="../themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif"
+ width="17" height="17" " border="0">
+ <?php else: ?>
+ <input name="del" type="image"
+ src="../themes/<?= $g['theme']; ?>/images/icons/icon_x.gif"
+ width="17" height="17" title="<?php echo gettext("Delete selected Snort interface mapping(s)"); ?>"
+ onclick="return intf_del()">
+ <?php endif; ?></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="8">&nbsp;</td>
+ </tr>
+ <tr>
+ <td>&nbsp;</td>
+ <td colspan="6">
+ <table class="tabcont" width="100%" border="0" cellpadding="1" cellspacing="0">
<tr>
- <td colspan="3"><span class="red"><strong><?php echo gettext("Note:"); ?></strong></span> <br>
+ <td colspan="3" class="vexpl"><span class="red"><strong><?php echo gettext("Note:"); ?></strong></span> <br>
<?php echo gettext("This is the ") . "<strong>" . gettext("Snort Menu ") .
"</strong>" . gettext("where you can see an overview of all your interface settings.");
if (empty($a_nat)) {
@@ -419,26 +416,26 @@ foreach ($a_nat as $natent): ?>
</td>
</tr>
<tr>
- <td colspan="3"><br>
+ <td colspan="3" class="vexpl"><br>
</td>
</tr>
<tr>
- <td colspan="3"><span class="red"><strong><?php echo gettext("Warning:"); ?></strong></span><br>
+ <td colspan="3" class="vexpl"><span class="red"><strong><?php echo gettext("Warning:"); ?></strong></span><br>
<strong><?php echo gettext("New settings will not take effect until interface restart."); ?></strong>
</td>
</tr>
<tr>
- <td colspan="3"><br>
+ <td colspan="3" class="vexpl"><br>
</td>
</tr>
<tr>
- <td><strong>Click</strong> on the <img src="../themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif"
+ <td class="vexpl"><strong>Click</strong> on the <img src="../themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif"
width="17" height="17" border="0" title="<?php echo gettext("Add Icon"); ?>"> icon to add
an interface.
</td>
- <td width="3%">&nbsp;
+ <td width="3%" class="vexpl">&nbsp;
</td>
- <td><img src="../themes/<?= $g['theme']; ?>/images/icons/icon_pass.gif"
+ <td class="vexpl"><img src="../themes/<?= $g['theme']; ?>/images/icons/icon_pass.gif"
width="13" height="13" border="0" title="<?php echo gettext("Running"); ?>">
<img src="../themes/<?= $g['theme']; ?>/images/icons/icon_block.gif"
width="13" height="13" border="0" title="<?php echo gettext("Not Running"); ?>"> icons will show current
@@ -446,23 +443,28 @@ foreach ($a_nat as $natent): ?>
</td>
</tr>
<tr>
- <td><strong>Click</strong> on the <img src="../themes/<?= $g['theme']; ?>/images/icons/icon_e.gif"
+ <td class="vexpl"><strong>Click</strong> on the <img src="../themes/<?= $g['theme']; ?>/images/icons/icon_e.gif"
width="17" height="17" border="0" title="<?php echo gettext("Edit Icon"); ?>"> icon to edit
an interface and settings.
<td width="3%">&nbsp;
</td>
- <td><strong>Click</strong> on the status icons to <strong>toggle</strong> snort and barnyard2 status.
+ <td class="vexpl"><strong>Click</strong> on the status icons to <strong>toggle</strong> snort and barnyard2 status.
</td>
</tr>
<tr>
- <td colspan="3"><strong> Click</strong> on the <img src="../themes/<?= $g['theme']; ?>/images/icons/icon_x.gif"
+ <td colspan="3" class="vexpl"><strong> Click</strong> on the <img src="../themes/<?= $g['theme']; ?>/images/icons/icon_x.gif"
width="17" height="17" border="0" title="<?php echo gettext("Delete Icon"); ?>"> icon to
delete an interface and settings.
</td>
</tr>
</table>
- </td>
- </tr>
+ </td>
+ <td>&nbsp;</td>
+ </tr>
+ </table>
+ </div>
+ </td>
+</tr>
</table>
</form>
diff --git a/config/snort/snort_interfaces_edit.php b/config/snort/snort_interfaces_edit.php
index 0010ec40..08d7d2ba 100755
--- a/config/snort/snort_interfaces_edit.php
+++ b/config/snort/snort_interfaces_edit.php
@@ -207,7 +207,7 @@ include_once("head.inc");
<form action="snort_interfaces_edit.php<?php echo "?id=$id";?>" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr><td class="tabnavtbl">
+<tr><td>
<?php
$tab_array = array();
$tab_array[0] = array(gettext("Snort Interfaces"), true, "/snort/snort_interfaces.php");
@@ -232,8 +232,8 @@ include_once("head.inc");
display_top_tabs($tab_array);
?>
</td></tr>
-<tr><td class="tabcont">
-<table width="100%" border="0" cellpadding="6" cellspacing="0">
+<tr><td><div id="mainarea">
+<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td colspan="2" valign="top" class="listtopic"><?php echo gettext("General Settings"); ?></td>
</tr>
@@ -494,6 +494,7 @@ include_once("head.inc");
</td>
</tr>
</table>
+</div>
</td></tr>
</table>
</form>
diff --git a/config/snort/snort_interfaces_global.php b/config/snort/snort_interfaces_global.php
index 29217604..0b9c5f2d 100644
--- a/config/snort/snort_interfaces_global.php
+++ b/config/snort/snort_interfaces_global.php
@@ -132,7 +132,7 @@ function enable_snort_vrt(btn) {
<form action="snort_interfaces_global.php" method="post" enctype="multipart/form-data" name="iform" id="iform">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr><td class="tabnavtbl">
+<tr><td>
<?php
$tab_array = array();
$tab_array[0] = array(gettext("Snort Interfaces"), false, "/snort/snort_interfaces.php");
@@ -145,11 +145,11 @@ function enable_snort_vrt(btn) {
$tab_array[7] = array(gettext("Sync"), false, "/pkg_edit.php?xml=snort/snort_sync.xml");
display_top_tabs($tab_array);
?>
-</td>
-</tr>
+</td></tr>
<tr>
- <td class="tabcont">
- <table width="100%" border="0" cellpadding="6" cellspacing="0">
+ <td>
+ <div id="mainarea">
+ <table id="maintable" class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td colspan="2" valign="top" class="listtopic"><?php echo gettext("Please Choose The " .
"Type Of Rules You Wish To Download"); ?></td>
@@ -309,6 +309,7 @@ function enable_snort_vrt(btn) {
"type of Snort.org account you hold."); ?></span></td>
</tr>
</table>
+</div><br/>
</td></tr>
</table>
</form>
diff --git a/config/snort/snort_interfaces_suppress.php b/config/snort/snort_interfaces_suppress.php
index 30c5c2c0..8095ff37 100644
--- a/config/snort/snort_interfaces_suppress.php
+++ b/config/snort/snort_interfaces_suppress.php
@@ -84,8 +84,8 @@ if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}
?>
</td>
</tr>
-<tr><td class="tabcont">
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr><td><div id="mainarea">
+<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td width="30%" class="listhdrr"><?php echo gettext("File Name"); ?></td>
<td width="60%" class="listhdr"><?php echo gettext("Description"); ?></td>
@@ -130,6 +130,7 @@ if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}
width="17" height="17" border="0" title="<?php echo gettext("add a new list"); ?>"></a></td>
</tr>
</table>
+ </div>
</td>
</tr>
</table>
diff --git a/config/snort/snort_interfaces_suppress_edit.php b/config/snort/snort_interfaces_suppress_edit.php
index 0042863c..5e12f656 100644
--- a/config/snort/snort_interfaces_suppress_edit.php
+++ b/config/snort/snort_interfaces_suppress_edit.php
@@ -155,8 +155,8 @@ if ($savemsg)
display_top_tabs($tab_array);
?>
</td></tr>
-<tr><td class="tabcont">
-<table width="100%" border="0" cellpadding="6" cellspacing="0">
+<tr><td><div id="mainarea">
+<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td colspan="2" class="listtopic">Add the name and description of the file.</td>
</tr>
@@ -219,6 +219,7 @@ if ($savemsg)
</td>
</tr>
</table>
+</div>
</td></tr>
</table>
</form>
diff --git a/config/snort/snort_interfaces_whitelist.php b/config/snort/snort_interfaces_whitelist.php
index 27f48e16..73c9efda 100644
--- a/config/snort/snort_interfaces_whitelist.php
+++ b/config/snort/snort_interfaces_whitelist.php
@@ -91,8 +91,8 @@ if ($savemsg) print_info_box($savemsg);
</td>
</tr>
<tr>
- <td class="tabcont">
- <table width="100%" border="0" cellpadding="6" cellspacing="0">
+ <td><div id="mainarea">
+ <table id="maintable" class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td width="20%" class="listhdrr">File Name</td>
<td width="40%" class="listhdrr">Values</td>
@@ -151,6 +151,7 @@ if ($savemsg) print_info_box($savemsg);
</td>
</tr>
</table>
+ </div>
</td>
</tr>
</table>
diff --git a/config/snort/snort_interfaces_whitelist_edit.php b/config/snort/snort_interfaces_whitelist_edit.php
index 4559f1b5..fc157375 100644
--- a/config/snort/snort_interfaces_whitelist_edit.php
+++ b/config/snort/snort_interfaces_whitelist_edit.php
@@ -185,8 +185,8 @@ if ($savemsg)
?>
</td>
</tr>
-<tr><td class="tabcont">
-<table width="100%" border="0" cellpadding="6" cellspacing="0">
+<tr><td><div id="mainarea">
+<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td colspan="2" valign="top" class="listtopic"><?php echo gettext("Add the name and " .
"description of the file."); ?></td>
@@ -273,6 +273,7 @@ if ($savemsg)
</td>
</tr>
</table>
+</div>
</td></tr>
</table>
</form>
diff --git a/config/snort/snort_preprocessors.php b/config/snort/snort_preprocessors.php
index e3b84854..e300621a 100755
--- a/config/snort/snort_preprocessors.php
+++ b/config/snort/snort_preprocessors.php
@@ -405,7 +405,7 @@ include_once("head.inc");
$tab_array[7] = array(gettext("Sync"), false, "/pkg_edit.php?xml=snort/snort_sync.xml");
display_top_tabs($tab_array);
echo '</td></tr>';
- echo '<tr><td class="tabnavtbl">';
+ echo '<tr><td>';
$menu_iface=($if_friendly?substr($if_friendly,0,5)." ":"Iface ");
$tab_array = array();
$tab_array[] = array($menu_iface . gettext("Settings"), false, "/snort/snort_interfaces_edit.php?id={$id}");
@@ -417,8 +417,8 @@ include_once("head.inc");
display_top_tabs($tab_array);
?>
</td></tr>
-<tr><td class="tabcont">
-<table width="100%" border="0" cellpadding="6" cellspacing="0">
+<tr><td><div id="mainarea">
+<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td colspan="2" align="left" valign="middle">
<?php echo gettext("Rules may be dependent on preprocessors! Disabling preprocessors may result in "); ?>
@@ -1146,6 +1146,7 @@ include_once("head.inc");
</br><?php echo gettext("may take several seconds. Snort must also be restarted to activate any changes made on this screen."); ?></td>
</tr>
</table>
+</div>
</td></tr></table>
</form>
<script type="text/javascript">
diff --git a/config/snort/snort_rules.php b/config/snort/snort_rules.php
index c5ccb018..2ef529b9 100755
--- a/config/snort/snort_rules.php
+++ b/config/snort/snort_rules.php
@@ -352,7 +352,7 @@ h += 96;
<form action="/snort/snort_rules.php" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr><td class="tabnavtbl">
+ <tr><td>
<?php
$tab_array = array();
$tab_array[0] = array(gettext("Snort Interfaces"), true, "/snort/snort_interfaces.php");
@@ -377,8 +377,8 @@ h += 96;
display_top_tabs($tab_array);
?>
</td></tr>
- <tr><td class="tabcont">
- <table width="100%" border="0" cellpadding="4" cellspacing="0">
+ <tr><td><div id="mainarea">
+ <table id="maintable" class="tabcont" width="100%" border="0" cellpadding="4" cellspacing="0">
<tr>
<td class="listtopic"><?php echo gettext("Available Rule Categories"); ?></td>
</tr>
@@ -612,6 +612,7 @@ h += 96;
</tr>
<?php endif;?>
</table>
+ </div>
</td>
</tr>
</table>
diff --git a/config/snort/snort_rules_flowbits.php b/config/snort/snort_rules_flowbits.php
index 104163f2..0b836813 100644
--- a/config/snort/snort_rules_flowbits.php
+++ b/config/snort/snort_rules_flowbits.php
@@ -142,8 +142,10 @@ if ($savemsg)
print_info_box($savemsg);
?>
<form action="snort_rules_flowbits.php" method="post" name="iform" id="iform">
+<div id="mainarea">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr><td class="tabcont">
+<tr>
+<td class="tabcont">
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td valign="middle" class="listtopic"><?php echo gettext("Auto-Generated Flowbit-Required Rules"); ?></td>
@@ -186,12 +188,20 @@ if ($savemsg)
<tr>
<td>
<table id="myTable" width="100%" class="sortable" border="1" cellpadding="0" cellspacing="0">
+ <colgroup>
+ <col width="11%" axis="number">
+ <col width="10%" axis="string">
+ <col width="14%" axis="string">
+ <col width="14%" axis="string">
+ <col width="20%" axis="string">
+ <col axis="string">
+ </colgroup>
<thead>
- <th width="12%" class="listhdrr" axis="number"><?php echo gettext("SID"); ?></th>
- <td width="10%" class="listhdrr" axis="string"><?php echo gettext("Proto"); ?></th>
- <th width="14%" class="listhdrr" axis="string"><?php echo gettext("Source"); ?></th>
- <th width="14%" class="listhdrr" axis="string"><?php echo gettext("Destination"); ?></th>
- <th width="20%" class="listhdrr" axis="string"><?php echo gettext("Flowbits"); ?></th>
+ <th class="listhdrr" axis="number"><?php echo gettext("SID"); ?></th>
+ <td class="listhdrr" axis="string"><?php echo gettext("Proto"); ?></th>
+ <th class="listhdrr" axis="string"><?php echo gettext("Source"); ?></th>
+ <th class="listhdrr" axis="string"><?php echo gettext("Destination"); ?></th>
+ <th class="listhdrr" axis="string"><?php echo gettext("Flowbits"); ?></th>
<th class="listhdrr" axis="string"><?php echo gettext("Message"); ?></th>
<thead>
<tbody>
@@ -231,11 +241,11 @@ if ($savemsg)
// Use "echo" to write the table HTML row-by-row.
echo "<tr>" .
- "<td width=\"12%\" class=\"listr\">{$sid}&nbsp;{$supplink}</td>" .
- "<td width=\"10%\" class=\"listr\">{$protocol}</td>" .
- "<td width=\"14%\" class=\"listr\">{$source}</td>" .
- "<td width=\"14%\" class=\"listr\">{$destination}</td>" .
- "<td width=\"20%\" class=\"listr\" style=\"word-wrap:break-word; word-break:normal;\">{$flowbits}</td>" .
+ "<td class=\"listr\">{$sid}&nbsp;{$supplink}</td>" .
+ "<td class=\"listr\">{$protocol}</td>" .
+ "<td class=\"listr\"><span title=\"{$rule_content[2]}\">{$source}</span></td>" .
+ "<td class=\"listr\"><span title=\"{$rule_content[5]}\">{$destination}</span></td>" .
+ "<td class=\"listr\" style=\"word-wrap:break-word; word-break:normal;\">{$flowbits}</td>" .
"<td class=\"listr\" style=\"word-wrap:break-word; word-break:normal;\">{$message}</td>" .
"</tr>";
$count++;
@@ -257,8 +267,10 @@ if ($savemsg)
</tr>
<?php endif; ?>
</table>
-</td></tr>
+</td>
+</tr>
</table>
+</div>
</form>
<?php include("fend.inc"); ?>
</body>
diff --git a/config/snort/snort_rulesets.php b/config/snort/snort_rulesets.php
index 3005a9eb..fce1616b 100755
--- a/config/snort/snort_rulesets.php
+++ b/config/snort/snort_rulesets.php
@@ -255,7 +255,7 @@ function enable_change()
<form action="snort_rulesets.php" method="post" name="iform" id="iform">
<input type="hidden" name="id" id="id" value="<?=$id;?>" />
-<table width="99%" border="0" cellpadding="0" cellspacing="0">
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td>
<?php
$tab_array = array();