From 6c0d365bdb5f4e4fdc2bf57561178573be5a36cc Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Tue, 26 Aug 2014 21:39:21 -0400
Subject: Upgrade Suricata to 2.0.3 and GUI package to v2.0

---
 config/suricata/suricata_passlist.php | 44 +++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 17 deletions(-)

(limited to 'config/suricata/suricata_passlist.php')

diff --git a/config/suricata/suricata_passlist.php b/config/suricata/suricata_passlist.php
index fc7c60e2..02aa4a3d 100644
--- a/config/suricata/suricata_passlist.php
+++ b/config/suricata/suricata_passlist.php
@@ -115,18 +115,21 @@ if ($savemsg) {
 <form action="/suricata/suricata_passlist.php" method="post">
 <input type="hidden" name="list_id" id="list_id" value=""/>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tbody>
 <tr><td>
 	<?php
 	$tab_array = array();
-	$tab_array[] = array(gettext("Suricata Interfaces"), false, "/suricata/suricata_interfaces.php");
+	$tab_array[] = array(gettext("Interfaces"), false, "/suricata/suricata_interfaces.php");
 	$tab_array[] = array(gettext("Global Settings"), false, "/suricata/suricata_global.php");
-	$tab_array[] = array(gettext("Update Rules"), false, "/suricata/suricata_download_updates.php");
+	$tab_array[] = array(gettext("Updates"), false, "/suricata/suricata_download_updates.php");
 	$tab_array[] = array(gettext("Alerts"), false, "/suricata/suricata_alerts.php");
-	$tab_array[] = array(gettext("Blocked"), false, "/suricata/suricata_blocked.php");
+	$tab_array[] = array(gettext("Blocks"), false, "/suricata/suricata_blocked.php");
 	$tab_array[] = array(gettext("Pass Lists"), true, "/suricata/suricata_passlist.php");
 	$tab_array[] = array(gettext("Suppress"), false, "/suricata/suricata_suppress.php");
-	$tab_array[] = array(gettext("Logs Browser"), false, "/suricata/suricata_logs_browser.php?instance={$instanceid}");
+	$tab_array[] = array(gettext("Logs View"), false, "/suricata/suricata_logs_browser.php?instance={$instanceid}");
 	$tab_array[] = array(gettext("Logs Mgmt"), false, "/suricata/suricata_logs_mgmt.php");
+	$tab_array[] = array(gettext("SID Mgmt"), false, "/suricata/suricata_sid_mgmt.php");
+	$tab_array[] = array(gettext("Sync"), false, "/pkg_edit.php?xml=suricata/suricata_sync.xml");
 	display_top_tabs($tab_array, true);
 	?>
 	</td>
@@ -134,6 +137,7 @@ if ($savemsg) {
 <tr>
 	<td><div id="mainarea">
 	<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
+		<tbody>
 		<tr>
 			<td width="25%" class="listhdrr">List Name</td>
 			<td width="30%" class="listhdrr">Assigned Alias</td>
@@ -142,19 +146,19 @@ if ($savemsg) {
 		</tr>
 		<?php foreach ($a_passlist as $i => $list): ?>
 		<tr>
-			<td class="listlr"
+			<td class="listlr" 
 				ondblclick="document.location='suricata_passlist_edit.php?id=<?=$i;?>';">
 				<?=htmlspecialchars($list['name']);?></td>
-			<td class="listr"
+			<td class="listr" 
 				ondblclick="document.location='suricata_passlist_edit.php?id=<?=$i;?>';" 
 				title="<?=filter_expand_alias($list['address']);?>">
 				<?php echo gettext($list['address']);?></td>
-			<td class="listbg"
+			<td class="listbg" 
 				ondblclick="document.location='suricata_passlist_edit.php?id=<?=$i;?>';">
-			<font color="#FFFFFF"> <?=htmlspecialchars($list['descr']);?>&nbsp;
-			</td>
+			<font color="#FFFFFF"><?=htmlspecialchars($list['descr']);?></font></td>
 			<td valign="middle" nowrap class="list">
 			<table border="0" cellspacing="0" cellpadding="1">
+				<tbody>
 				<tr>
 					<td valign="middle"><a href="suricata_passlist_edit.php?id=<?=$i;?>">
 					<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="<?php echo gettext("Edit pass list"); ?>"></a>
@@ -163,6 +167,7 @@ if ($savemsg) {
 					src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?php echo gettext("Delete pass list"); ?>"/>
 					</td>
 				</tr>
+				</tbody>
 			</table>
 			</td>
 		</tr>
@@ -171,6 +176,7 @@ if ($savemsg) {
 			<td class="list" colspan="3"></td>
 			<td class="list">
 			<table border="0" cellspacing="0" cellpadding="1">
+				<tbody>
 				<tr>
 					<td valign="middle" width="17">&nbsp;</td>
 					<td valign="middle"><a href="suricata_passlist_edit.php?id=<?php echo $id_gen;?> ">
@@ -178,27 +184,31 @@ if ($savemsg) {
 					width="17" height="17" border="0" title="<?php echo gettext("add a new pass list"); ?>"/></a>
 					</td>
 				</tr>
+				</tbody>
 			</table>
 				</td>
 			</tr>
+			</tbody>
 		</table>
 		</div>
 		</td>
 	</tr>
+	</tbody>
 </table>
 <br>
-<table width="100%" border="0" cellpadding="1"
-	cellspacing="1">
+<table width="100%" border="0" cellpadding="1" cellspacing="1">
+	<tbody>
 	<tr>
-	<td width="100%"><span class="vexpl"><span class="red"><strong><?php echo gettext("Notes:"); ?></strong></span>
-	<p><?php echo gettext("1. Here you can create Pass List files for your Suricata package rules.  Hosts on a Pass List are never blocked by Suricata."); ?><br/>
-	<?php echo gettext("2. Add all the IP addresses or networks (in CIDR notation) you want to protect against Suricata block decisions."); ?><br/>
-	<?php echo gettext("3. The default Pass List includes the WAN IP and gateway, defined DNS servers, VPNs and locally-attached networks."); ?><br/>
-	<?php echo gettext("4. Be careful, it is very easy to get locked out of your system by altering the default settings."); ?></p></span></td>
+		<td width="100%"><span class="vexpl"><span class="red"><strong><?php echo gettext("Notes:"); ?></strong></span>
+		<p><?php echo gettext("1. Here you can create Pass List files for your Suricata package rules.  Hosts on a Pass List are never blocked by Suricata."); ?><br/>
+		<?php echo gettext("2. Add all the IP addresses or networks (in CIDR notation) you want to protect against Suricata block decisions."); ?><br/>
+		<?php echo gettext("3. The default Pass List includes the WAN IP and gateway, defined DNS servers, VPNs and locally-attached networks."); ?><br/>
+		<?php echo gettext("4. Be careful, it is very easy to get locked out of your system by altering the default settings."); ?></p></span></td>
 	</tr>
 	<tr>
-	<td width="100%"><span class="vexpl"><?php echo gettext("Remember you must restart Suricata on the interface for changes to take effect!"); ?></span></td>
+		<td width="100%"><span class="vexpl"><?php echo gettext("Remember you must restart Suricata on the interface for changes to take effect!"); ?></span></td>
 	</tr>
+	</tbody>
 </table>
 </form>
 <?php include("fend.inc"); ?>
-- 
cgit v1.2.3