Upgrade Suricata to 2.0.3 and GUI package to v2.0

1 files changed, 43 insertions, 20 deletions

diff --git a/config/suricata/suricata_logs_browser.php b/config/suricata/suricata_logs_browser.php
index cbe5ee7b..d4475625 100644
--- a/config/suricata/suricata_logs_browser.php
+++ b/config/suricata/suricata_logs_browser.php
@@ -85,7 +85,6 @@ include_once("head.inc");
 
 <?php
 include_once("fbegin.inc");
-if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}
 if ($input_errors) {
 	print_input_errors($input_errors);
 }
@@ -95,8 +94,8 @@ if ($input_errors) {
 <script type="text/javascript">	
 	function loadFile() {
 		jQuery("#fileStatus").html("<?=gettext("Loading file"); ?> ...");
-		jQuery("#fileStatusBox").show(500);
-		jQuery("#filePathBox").show(500);
+		jQuery("#fileStatusBox").show(250);
+		jQuery("#filePathBox").show(250);
 		jQuery("#fbTarget").html("");
 
 		jQuery.ajax(
@@ -109,7 +108,7 @@ if ($input_errors) {
 	}
 
 	function loadComplete(req) {
-		jQuery("#fileContent").show(1000);
+		jQuery("#fileContent").show(250);
 		var values = req.responseText.split("|");
 		values.shift(); values.pop();
 
@@ -118,14 +117,17 @@ if ($input_errors) {
 			var fileContent = Base64.decode(values.join("|"));
 			jQuery("#fileStatus").html("<?=gettext("File successfully loaded"); ?>.");
 			jQuery("#fbTarget").html(file);
+			jQuery("#fileRefreshBtn").show();
+			jQuery("#fileContent").prop("disabled", false);
 			jQuery("#fileContent").val(fileContent);
 		}
 		else {
 			jQuery("#fileStatus").html(values[0]);
 			jQuery("#fbTarget").html("");
+			jQuery("#fileRefreshBtn").hide();
 			jQuery("#fileContent").val("");
+			jQuery("#fileContent").prop("disabled", true);
 		}
-		jQuery("#fileContent").show(1000);
 	}
 
 </script>
@@ -134,18 +136,21 @@ if ($input_errors) {
 <input type="hidden" id="instance" value="<?=$instanceid;?>"/>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <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?instance={$instanceid}");
-		$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"), false, "/suricata/suricata_passlist.php");
 		$tab_array[] = array(gettext("Suppress"), false, "/suricata/suricata_suppress.php");
-		$tab_array[] = array(gettext("Logs Browser"), true, "/suricata/suricata_logs_browser.php");
+		$tab_array[] = array(gettext("Logs View"), true, "/suricata/suricata_logs_browser.php");
 		$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>
@@ -153,6 +158,7 @@ if ($input_errors) {
 	<tr>
 	<td><div id="mainarea">
 		<table id="maintable" class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="6">
+			<tbody>
 			<tr>
 				<td colspan="2" class="listtopic"><?php echo gettext("Logs Browser Selections"); ?></td>
 			</tr>
@@ -176,7 +182,7 @@ if ($input_errors) {
 				<td width="78%" class="vtable">
 					<select name="logFile" id="logFile" class="formselect" onChange="loadFile();">
 			<?php
-				$logs = array( "alerts.log", "block.log", "files-json.log", "http.log", "stats.log", "suricata.log", "tls.log" );
+				$logs = array( "alerts.log", "block.log", "dns.log", "eve.json", "files-json.log", "http.log", "sid_changes.log", "stats.log", "suricata.log", "tls.log" );
 				foreach ($logs as $log) {
 					$selected = "";
 					if ($log == basename($logfile))
@@ -192,34 +198,51 @@ if ($input_errors) {
 			</tr>
 			<tr>
 				<td colspan="2">
-					<div style="display:none; " id="fileStatusBox">
-						<div class="list" style="padding-left:15px;">
-							<strong id="fileStatus"></strong>
-						</div>
-					</div>
-					<div style="padding-left:15px; display:none;" id="filePathBox">
-						<strong><?=gettext("Log File Path"); ?>:</strong>
-						<div class="list" style="display:inline;" id="fbTarget"></div>
-					</div>
+					<table width="100%">
+						<tbody>
+						<tr>
+							<td width="75%">
+								<div style="display:none; " id="fileStatusBox">
+									<div class="list" style="padding-left:15px;">
+									<strong id="fileStatus"></strong>
+									</div>
+								</div>
+								<div style="padding-left:15px; display:none;" id="filePathBox">
+									<strong><?=gettext("Log File Path"); ?>:</strong>
+									<div class="list" style="display:inline;" id="fbTarget"></div>
+								</div>
+							</td>
+							<td align="right">
+								<div style="padding-right:15px; display:none;" id="fileRefreshBtn">
+									<input type="button" name="refresh" id="refresh" value="Refresh" class="formbtn" onclick="loadFile();" title="<?=gettext("Refresh current display");?>" />
+								</div>
+							</td>
+						</tr>
+						</tbody>
+					</table>
 				</td>
 			</tr>
 			<tr>
 				<td colspan="2">
 					<table width="100%">
+						<tbody>
 						<tr>
 							<td valign="top" class="label">
 							<div style="background:#eeeeee;" id="fileOutput">
-							<textarea id="fileContent" name="fileContent" style="width:100%;" rows="30" wrap="off"></textarea>
+							<textarea id="fileContent" name="fileContent" style="width:100%;" rows="30" wrap="off" disabled></textarea>
 							</div>
 							</td>
 						</tr>
+						</tbody>
 					</table>
 				</td>
 			</tr>
+			</tbody>
 		</table>
 	</div>
 	</td>
 	</tr>
+	</tbody>
 </table>
 </form>