From 85b7eb644dec64190b67207e09b52dcedc1344b6 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Wed, 3 Aug 2011 17:28:28 +0000
Subject: Remove uneccessary calls to write_config() and add some more checks.

---
 config/snort/snort_interfaces_global.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'config/snort/snort_interfaces_global.php')

diff --git a/config/snort/snort_interfaces_global.php b/config/snort/snort_interfaces_global.php
index 2c0d4404..d9336fd3 100644
--- a/config/snort/snort_interfaces_global.php
+++ b/config/snort/snort_interfaces_global.php
@@ -62,8 +62,16 @@ if (!$input_errors) {
 		$config['installedpackages']['snortglobal']['oinkmastercode'] = $_POST['oinkmastercode'];
 		$config['installedpackages']['snortglobal']['emergingthreats'] = $_POST['emergingthreats'] ? 'on' : 'off';
 		$config['installedpackages']['snortglobal']['rm_blocked'] = $_POST['rm_blocked'];
-		$config['installedpackages']['snortglobal']['snortloglimit'] = $_POST['snortloglimit'];
-		$config['installedpackages']['snortglobal']['snortloglimitsize'] = $_POST['snortloglimitsize'];
+		if ($_POST['snortloglimitsize']) {
+			$config['installedpackages']['snortglobal']['snortloglimit'] = $_POST['snortloglimit'];
+			$config['installedpackages']['snortglobal']['snortloglimitsize'] = $_POST['snortloglimitsize'];
+		} else {
+			$config['installedpackages']['snortglobal']['snortloglimit'] = 'on';
+
+			/* code will set limit to 21% of slice that is unused */
+			$snortloglimitDSKsize = round(exec('df -k /var | grep -v "Filesystem" | awk \'{print $4}\'') * .22 / 1024);
+			$config['installedpackages']['snortglobal']['snortloglimitsize'] = $snortloglimitDSKsize;
+		}
 		$config['installedpackages']['snortglobal']['autorulesupdate7'] = $_POST['autorulesupdate7'];
 		$config['installedpackages']['snortglobal']['snortalertlogtype'] = $_POST['snortalertlogtype'];
 		$config['installedpackages']['snortglobal']['forcekeepsettings'] = $_POST['forcekeepsettings'] ? 'on' : 'off';
@@ -323,7 +331,7 @@ enable JavaScript to view this content
 					<tr>
 						<td colspan="2"><input name="snortloglimit" type="radio"
 							id="snortloglimit" value="on" onClick="enable_change(false)"
-			<?php if($pconfig['snortloglimit']=='on' || $pconfig['snortloglimit']=='') echo 'checked'; ?>>
+			<?php if($pconfig['snortloglimit']=='on') echo 'checked'; ?>>
 						<strong>Enable</strong> directory size limit (<strong>Default</strong>)</td>
 					</tr>
 					<tr>
-- 
cgit v1.2.3