Widget Firewall Logs Fields

In the Firewall Log Widget view time field is of more use than source port and protocol.
Add time field and remove source port and protocol fields.
Fields: Action, Time, Interface, Source IP, Destination IP & Port

9 files changed, 104 insertions, 32 deletions

diff --git a/usr/local/www/themes/_corporate/all.css b/usr/local/www/themes/_corporate/all.css
index 537d676..8a6c639 100644
--- a/usr/local/www/themes/_corporate/all.css
+++ b/usr/local/www/themes/_corporate/all.css
@@ -943,7 +943,7 @@ div#log div.log-entry {
 div#log div.log-entry span,
 div#log div.log-header span {
 	padding: 3px 2px 3px 2px;
-	padding-left: 8px;
+	padding-left: 6px;
 }
 
 div#log div.log-entry span.log-action {
@@ -1104,10 +1104,11 @@ div#log div.log-entry-mini {
 
 div#log div.log-entry-mini span {
 	padding: 2px 2px 2px 2px;
-	padding-left: 8px;
+	padding-left: 6px;
 }
 
 div#log span.log-action-mini-header,
+div#log span.log-time-mini-header,
 div#log span.log-interface-mini-header,
 div#log span.log-source-mini-header,
 div#log span.log-destination-mini-header,
@@ -1139,14 +1140,22 @@ div#log span.log-action-mini-header {
 	width: 6%;
 }
 
+div#log span.log-time-mini,
+div#log span.log-time-mini-header {
+	width: 19%;
+}
+
 div#log span.log-interface-mini,
 div#log span.log-interface-mini-header {
 	width: 8%;
 }
 
 div#log span.log-source-mini,
+div#log span.log-source-mini-header {
+	width: 23%;
+}
+
 div#log span.log-destination-mini,
-div#log span.log-source-mini-header,
 div#log span.log-destination-mini-header {
 	width: 31%;
 }
diff --git a/usr/local/www/themes/code-red/all.css b/usr/local/www/themes/code-red/all.css
index 3b4004c..534516b 100755
--- a/usr/local/www/themes/code-red/all.css
+++ b/usr/local/www/themes/code-red/all.css
@@ -1028,7 +1028,7 @@ div#log div.log-entry {
 div#log div.log-entry span,
 div#log div.log-header span {
 	padding: 3px 2px 3px 2px;
-	padding-left: 8px;
+	padding-left: 6px;
 }
 
 div#log div.log-entry span.log-action {
@@ -1190,10 +1190,11 @@ div#log div.log-entry-mini {
 
 div#log div.log-entry-mini span {
 	padding: 2px 2px 2px 2px;
-	padding-left: 8px;
+	padding-left: 6px;
 }
 
 div#log span.log-action-mini-header,
+div#log span.log-time-mini-header,
 div#log span.log-interface-mini-header,
 div#log span.log-source-mini-header,
 div#log span.log-destination-mini-header,
@@ -1225,14 +1226,22 @@ div#log span.log-action-mini-header {
 	width: 6%;
 }
 
+div#log span.log-time-mini,
+div#log span.log-time-mini-header {
+	width: 19%;
+}
+
 div#log span.log-interface-mini,
 div#log span.log-interface-mini-header {
 	width: 8%;
 }
 
 div#log span.log-source-mini,
+div#log span.log-source-mini-header {
+	width: 23%;
+}
+
 div#log span.log-destination-mini,
-div#log span.log-source-mini-header,
 div#log span.log-destination-mini-header {
 	width: 31%;
 }
diff --git a/usr/local/www/themes/metallic/all.css b/usr/local/www/themes/metallic/all.css
index 184f7c7..30afe16 100644
--- a/usr/local/www/themes/metallic/all.css
+++ b/usr/local/www/themes/metallic/all.css
@@ -995,7 +995,7 @@ div#log div.log-entry {
 div#log div.log-entry span,
 div#log div.log-header span {
 	padding: 3px 2px 3px 2px;
-	padding-left: 8px;
+	padding-left: 6px;
 }
 
 div#log div.log-entry span.log-action {
@@ -1158,10 +1158,11 @@ div#log div.log-entry-mini {
 
 div#log div.log-entry-mini span {
 	padding: 2px 2px 2px 2px;
-	padding-left: 8px;
+	padding-left: 6px;
 }
 
 div#log span.log-action-mini-header,
+div#log span.log-time-mini-header,
 div#log span.log-interface-mini-header,
 div#log span.log-source-mini-header,
 div#log span.log-destination-mini-header,
@@ -1193,14 +1194,22 @@ div#log span.log-action-mini-header {
 	width: 6%;
 }
 
+div#log span.log-time-mini,
+div#log span.log-time-mini-header {
+	width: 19%;
+}
+
 div#log span.log-interface-mini,
 div#log span.log-interface-mini-header {
 	width: 8%;
 }
 
 div#log span.log-source-mini,
+div#log span.log-source-mini-header {
+	width: 23%;
+}
+
 div#log span.log-destination-mini,
-div#log span.log-source-mini-header,
 div#log span.log-destination-mini-header {
 	width: 31%;
 }
diff --git a/usr/local/www/themes/nervecenter/all.css b/usr/local/www/themes/nervecenter/all.css
index e5bd2be..552a7db 100644
--- a/usr/local/www/themes/nervecenter/all.css
+++ b/usr/local/www/themes/nervecenter/all.css
@@ -1027,7 +1027,7 @@ div#log div.log-entry {
 div#log div.log-entry span,
 div#log div.log-header span {
 	padding: 3px 2px 3px 2px;
-	padding-left: 8px;
+	padding-left: 6px;
 }
 
 div#log div.log-entry span.log-action {
@@ -1189,10 +1189,11 @@ div#log div.log-entry-mini {
 
 div#log div.log-entry-mini span {
 	padding: 2px 2px 2px 2px;
-	padding-left: 8px;
+	padding-left: 6px;
 }
 
 div#log span.log-action-mini-header,
+div#log span.log-time-mini-header,
 div#log span.log-interface-mini-header,
 div#log span.log-source-mini-header,
 div#log span.log-destination-mini-header,
@@ -1224,14 +1225,22 @@ div#log span.log-action-mini-header {
 	width: 6%;
 }
 
+div#log span.log-time-mini,
+div#log span.log-time-mini-header {
+	width: 19%;
+}
+
 div#log span.log-interface-mini,
 div#log span.log-interface-mini-header {
 	width: 8%;
 }
 
 div#log span.log-source-mini,
+div#log span.log-source-mini-header {
+	width: 23%;
+}
+
 div#log span.log-destination-mini,
-div#log span.log-source-mini-header,
 div#log span.log-destination-mini-header {
 	width: 31%;
 }
diff --git a/usr/local/www/themes/pfsense-dropdown/all.css b/usr/local/www/themes/pfsense-dropdown/all.css
index 28e8388..e603cb7 100644
--- a/usr/local/www/themes/pfsense-dropdown/all.css
+++ b/usr/local/www/themes/pfsense-dropdown/all.css
@@ -907,10 +907,11 @@ div#log div.log-entry-mini {
 
 div#log div.log-entry-mini span {
 	padding: 2px 2px 2px 2px;
-	padding-left: 8px;
+	padding-left: 6px;
 }
 
 div#log span.log-action-mini-header,
+div#log span.log-time-mini-header,
 div#log span.log-interface-mini-header,
 div#log span.log-source-mini-header,
 div#log span.log-destination-mini-header,
@@ -942,14 +943,22 @@ div#log span.log-action-mini-header {
 	width: 6%;
 }
 
+div#log span.log-time-mini,
+div#log span.log-time-mini-header {
+	width: 19%;
+}
+
 div#log span.log-interface-mini,
 div#log span.log-interface-mini-header {
 	width: 8%;
 }
 
 div#log span.log-source-mini,
+div#log span.log-source-mini-header {
+	width: 23%;
+}
+
 div#log span.log-destination-mini,
-div#log span.log-source-mini-header,
 div#log span.log-destination-mini-header {
 	width: 31%;
 }
diff --git a/usr/local/www/themes/pfsense/all.css b/usr/local/www/themes/pfsense/all.css
index 166a8bc..15e9787 100644
--- a/usr/local/www/themes/pfsense/all.css
+++ b/usr/local/www/themes/pfsense/all.css
@@ -817,10 +817,11 @@ div#log div.log-entry-mini {
 
 div#log div.log-entry-mini span {
 	padding: 2px 2px 2px 2px;
-	padding-left: 8px;
+	padding-left: 6px;
 }
 
 div#log span.log-action-mini-header,
+div#log span.log-time-mini-header,
 div#log span.log-interface-mini-header,
 div#log span.log-source-mini-header,
 div#log span.log-destination-mini-header,
@@ -852,14 +853,22 @@ div#log span.log-action-mini-header {
 	width: 6%;
 }
 
+div#log span.log-time-mini,
+div#log span.log-time-mini-header {
+	width: 19%;
+}
+
 div#log span.log-interface-mini,
 div#log span.log-interface-mini-header {
 	width: 8%;
 }
 
 div#log span.log-source-mini,
+div#log span.log-source-mini-header {
+	width: 23%;
+}
+
 div#log span.log-destination-mini,
-div#log span.log-source-mini-header,
 div#log span.log-destination-mini-header {
 	width: 31%;
 }
diff --git a/usr/local/www/themes/pfsense_ng/all.css b/usr/local/www/themes/pfsense_ng/all.css
index 68df3d8..bcfb5b4 100644
--- a/usr/local/www/themes/pfsense_ng/all.css
+++ b/usr/local/www/themes/pfsense_ng/all.css
@@ -1138,7 +1138,7 @@ div#log div.log-entry {
 div#log div.log-entry span,
 div#log div.log-header span {
 	padding: 3px 2px 3px 2px;
-	padding-left: 8px;
+	padding-left: 6px;
 }
 
 div#log div.log-entry span.log-action {
@@ -1300,10 +1300,11 @@ div#log div.log-entry-mini {
 
 div#log div.log-entry-mini span {
 	padding: 2px 2px 2px 2px;
-	padding-left: 8px;
+	padding-left: 6px;
 }
 
 div#log span.log-action-mini-header,
+div#log span.log-time-mini-header,
 div#log span.log-interface-mini-header,
 div#log span.log-source-mini-header,
 div#log span.log-destination-mini-header,
@@ -1335,14 +1336,22 @@ div#log span.log-action-mini-header {
 	width: 6%;
 }
 
+div#log span.log-time-mini,
+div#log span.log-time-mini-header {
+	width: 19%;
+}
+
 div#log span.log-interface-mini,
 div#log span.log-interface-mini-header {
 	width: 8%;
 }
 
 div#log span.log-source-mini,
+div#log span.log-source-mini-header {
+	width: 23%;
+}
+
 div#log span.log-destination-mini,
-div#log span.log-source-mini-header,
 div#log span.log-destination-mini-header {
 	width: 31%;
 }
diff --git a/usr/local/www/themes/the_wall/all.css b/usr/local/www/themes/the_wall/all.css
index 44e2d63..5b58f08 100644
--- a/usr/local/www/themes/the_wall/all.css
+++ b/usr/local/www/themes/the_wall/all.css
@@ -1031,7 +1031,7 @@ div#log div.log-entry {
 div#log div.log-entry span,
 div#log div.log-header span {
 	padding: 3px 2px 3px 2px;
-	padding-left: 8px;
+	padding-left: 6px;
 }
 
 div#log div.log-entry span.log-action {
@@ -1197,10 +1197,11 @@ div#log div.log-entry-mini {
 
 div#log div.log-entry-mini span {
 	padding: 2px 2px 2px 2px;
-	padding-left: 8px;
+	padding-left: 6px;
 }
 
 div#log span.log-action-mini-header,
+div#log span.log-time-mini-header,
 div#log span.log-interface-mini-header,
 div#log span.log-source-mini-header,
 div#log span.log-destination-mini-header,
@@ -1232,14 +1233,22 @@ div#log span.log-action-mini-header {
 	width: 6%;
 }
 
+div#log span.log-time-mini,
+div#log span.log-time-mini-header {
+	width: 19%;
+}
+
 div#log span.log-interface-mini,
 div#log span.log-interface-mini-header {
 	width: 8%;
 }
 
 div#log span.log-source-mini,
+div#log span.log-source-mini-header {
+	width: 23%;
+}
+
 div#log span.log-destination-mini,
-div#log span.log-source-mini-header,
 div#log span.log-destination-mini-header {
 	width: 31%;
 }
diff --git a/usr/local/www/widgets/widgets/log.widget.php b/usr/local/www/widgets/widgets/log.widget.php
index bb38d8d..64a02fa 100644
--- a/usr/local/www/widgets/widgets/log.widget.php
+++ b/usr/local/www/widgets/widgets/log.widget.php
@@ -108,10 +108,10 @@ else
 /* Called by the AJAX updater */
 function format_log_line(row) {
 	var line = '<td class="listMRlr" align="center">' + row[0] + '<\/td>' +
+		'<td class="listMRr ellipsis" title="' + row[1] + '">' + row[1].slice(0,-3) + '<\/td>' +
 		'<td class="listMRr ellipsis" title="' + row[2] + '">' + row[2] + '<\/td>' +
 		'<td class="listMRr ellipsis" title="' + row[3] + '">' + row[3] + '<\/td>' +
-		'<td class="listMRr ellipsis" title="' + row[4] + '">' + row[4] + '<\/td>' +
-		'<td class="listMRr ellipsis" title="' + row[5] + '">' + row[5] + '<\/td>';
+ 		'<td class="listMRr ellipsis" title="' + row[4] + '">' + row[4] + '<\/td>';
 
 	var nentriesacts = "<?php echo $nentriesacts; ?>";
 	var nentriesinterfaces = "<?php echo $nentriesinterfaces; ?>";
@@ -156,19 +156,19 @@ function format_log_line(row) {
 
 <table width="100%" border="0" cellpadding="0" cellspacing="0" style="table-layout: fixed;" summary="logs">
 	<colgroup>
-		<col style='width: 8%;' />
-		<col style='width: 10%;' />
-		<col style='width: 35%;' />
-		<col style='width: 35%;' />
-		<col style='width: 12%;' />
+		<col style='width:  7%;' />
+		<col style='width: 23%;' />
+		<col style='width: 11%;' />
+		<col style='width: 28%;' />
+		<col style='width: 31%;' />
 	</colgroup>
 	<thead>
 		<tr>
 			<td class="listhdrr"><?=gettext("Act");?></td>
+			<td class="listhdrr"><?=gettext("Time");?></td>
 			<td class="listhdrr"><?=gettext("IF");?></td>
 			<td class="listhdrr"><?=gettext("Source");?></td>
 			<td class="listhdrr"><?=gettext("Destination");?></td>
-			<td class="listhdrr"><?=gettext("Prot");?></td>
 		</tr>
 	</thead>
 	<tbody id='filter-log-entries'>
@@ -184,10 +184,11 @@ function format_log_line(row) {
 			<img border="0" src="<?php echo find_action_image($filterent['act']);?>" width="11" height="11" alt="<?php echo $filterent['act'];?>" title="<?php echo $filterent['act'];?>" />
 			</a>
 			</td>
+			<td class="listMRr ellipsis nowrap" title="<?php echo htmlspecialchars($filterent['time']);?>"><?php echo substr(htmlspecialchars($filterent['time']),0,-3);?></td>
 			<td class="listMRr ellipsis nowrap" title="<?php echo htmlspecialchars($filterent['interface']);?>"><?php echo htmlspecialchars($filterent['interface']);?></td>
 			<td class="listMRr ellipsis nowrap" title="<?php echo htmlspecialchars($filterent['src']);?>">
 				<a href="#" onclick="javascript:getURL('diag_dns.php?host=<?php echo "{$filterent['srcip']}"; ?>&dialog_output=true', outputrule);" title="<?=gettext("Reverse Resolve with DNS");?>">
-				<?php echo htmlspecialchars($filterent['srcip']);?></a><?php echo ":" . htmlspecialchars($filterent['srcport']);?></td>
+				<?php echo htmlspecialchars($filterent['srcip']);?></a></td>
 			<td class="listMRr ellipsis nowrap" title="<?php echo htmlspecialchars($filterent['dst']);?>">
 				<a href="#" onclick="javascript:getURL('diag_dns.php?host=<?php echo "{$filterent['dstip']}"; ?>&dialog_output=true', outputrule);" title="<?=gettext("Reverse Resolve with DNS");?>">
 				<?php echo htmlspecialchars($filterent['dstip']);?></a><?php echo ":" . htmlspecialchars($filterent['dstport']);?></td>
@@ -195,7 +196,6 @@ function format_log_line(row) {
 				if ($filterent['proto'] == "TCP")
 					$filterent['proto'] .= ":{$filterent['tcpflags']}";
 			?>
-			<td class="listMRr ellipsis nowrap" title="<?php echo htmlspecialchars($filterent['proto']);?>"><?php echo htmlspecialchars($filterent['proto']);?></td>
 		</tr>
 	<?php endforeach; ?>
 	</tbody>