Added a setting for configuring the firewall log to either:

-Not load descriptions
-Show descriptions in a column
-Show descriptions on a second row (after a click on 'show descriptions')

'fixed' a few html validation issues..

1 files changed, 18 insertions, 0 deletions

diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php
index 23c4754..42cf79e 100755
--- a/usr/local/www/diag_logs_settings.php
+++ b/usr/local/www/diag_logs_settings.php
@@ -64,6 +64,7 @@ $pconfig['system'] = isset($config['syslog']['system']);
 $pconfig['enable'] = isset($config['syslog']['enable']);
 $pconfig['logdefaultblock'] = !isset($config['syslog']['nologdefaultblock']);
 $pconfig['rawfilter'] = isset($config['syslog']['rawfilter']);
+$pconfig['filterdescriptions'] = $config['syslog']['filterdescriptions'];
 $pconfig['disablelocallogging'] = isset($config['syslog']['disablelocallogging']);
 
 if (!$pconfig['nentries'])
@@ -116,6 +117,10 @@ if ($_POST) {
 		$oldnologdefaultblock = isset($config['syslog']['nologdefaultblock']);
 		$config['syslog']['nologdefaultblock'] = $_POST['logdefaultblock'] ? false : true;
 		$config['syslog']['rawfilter'] = $_POST['rawfilter'] ? true : false;
+		if (is_numeric($_POST['filterdescriptions']) && $_POST['filterdescriptions'] > 0)
+			$config['syslog']['filterdescriptions'] = $_POST['filterdescriptions'];
+		else
+			unset($config['syslog']['filterdescriptions']);
 		if($config['syslog']['enable'] == false) {
 			unset($config['syslog']['remoteserver']);
 			unset($config['syslog']['remoteserver2']);
@@ -261,6 +266,19 @@ function check_everything() {
 			<?=gettext("Hint: If this is checked, filter logs are shown as generated by the packet filter, without any formatting. This will reveal more detailed information, but it is more difficult to read.");?></td>
 		</tr>
 		<tr>
+			<td valign="top" class="vtable">Filter descriptions</td>
+			<td class="vtable">
+				<select name="filterdescriptions" id="filterdescriptions" >
+				  <option value="0"<?=!isset($pconfig['filterdescriptions'])?" selected":""?>>Dont load descriptions</option>
+				  <option value="1"<?=($pconfig['filterdescriptions'])==="1"?" selected":""?>>Display as column</option>
+				  <option value="2"<?=($pconfig['filterdescriptions'])==="2"?" selected":""?>>Display as second row</option>
+				</select>
+				<strong><?=gettext("Show the applied rule description below or in the firewall log rows.");?></strong>
+				<br/>
+				<?=gettext("Displaying rule descriptions for all lines in the log might affect performance with large rulessets.");?></td>
+			</td>
+		</tr>
+		<tr>
 			<td width="22%" valign="top" class="vtable">Local Logging</td>
 			<td width="78%" class="vtable"> <input name="disablelocallogging" type="checkbox" id="disablelocallogging" value="yes" <?php if ($pconfig['disablelocallogging']) echo "checked"; ?> onClick="enable_change(false)">
 			<?php if ($g['platform'] == "pfSense"): ?>