aboutsummaryrefslogtreecommitdiffstats
path: root/config/snort/snort_interfaces_global.php
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2011-08-03 17:28:28 +0000
committerErmal <eri@pfsense.org>2011-08-03 17:28:45 +0000
commit85b7eb644dec64190b67207e09b52dcedc1344b6 (patch)
tree64fe9aa78fc8e277d4bcaa3a2d7bca0f801c1790 /config/snort/snort_interfaces_global.php
parent794bd94453aec3f5f1b34b7e4951b21c5af820e8 (diff)
downloadpfsense-packages-85b7eb644dec64190b67207e09b52dcedc1344b6.tar.gz
pfsense-packages-85b7eb644dec64190b67207e09b52dcedc1344b6.tar.bz2
pfsense-packages-85b7eb644dec64190b67207e09b52dcedc1344b6.zip
Remove uneccessary calls to write_config() and add some more checks.
Diffstat (limited to 'config/snort/snort_interfaces_global.php')
-rw-r--r--config/snort/snort_interfaces_global.php14
1 files changed, 11 insertions, 3 deletions
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>