aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2011-08-03 21:02:49 +0000
committerErmal <eri@pfsense.org>2011-08-03 21:02:49 +0000
commit1f8a72fbf8f59482b4b7d471417d965b945fb361 (patch)
tree94ffacd3690a2d7f2ae3dab3590a13957eebad5a /config
parent6d7a47aeac855ffac2b9c2fbbc0e6b75908da8a1 (diff)
downloadpfsense-packages-1f8a72fbf8f59482b4b7d471417d965b945fb361.tar.gz
pfsense-packages-1f8a72fbf8f59482b4b7d471417d965b945fb361.tar.bz2
pfsense-packages-1f8a72fbf8f59482b4b7d471417d965b945fb361.zip
Correct the whitelist selection saving
Diffstat (limited to 'config')
-rw-r--r--config/snort/snort.inc2
-rw-r--r--config/snort/snort_interfaces_edit.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index f6c49ffd..52b61ade 100644
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -1150,7 +1150,7 @@ function create_snort_suppress($id, $if_real) {
$suppress_file_name = $config['installedpackages']['snortglobal']['suppress']['item'][$whitelist_key_s]['name'];
/* Message */
- $s_data .= '# This file is auto generated by the snort package. Please do not edit this file by hand.' . "\n\n";
+ $s_data = '# This file is auto generated by the snort package. Please do not edit this file by hand.' . "\n\n";
/* user added arguments */
$s_data .= str_replace("\r", "", base64_decode($config['installedpackages']['snortglobal']['suppress']['item'][$whitelist_key_s]['suppresspassthru']));
diff --git a/config/snort/snort_interfaces_edit.php b/config/snort/snort_interfaces_edit.php
index 7a2e5db4..c843a3f7 100644
--- a/config/snort/snort_interfaces_edit.php
+++ b/config/snort/snort_interfaces_edit.php
@@ -597,14 +597,14 @@ function enable_change(enable_change) {
<tr>
<td width="22%" valign="top" class="vncell2">Whitelist</td>
<td width="78%" class="vtable">
- <select name="whitelist" class="formfld" id="whitelistname">
+ <select name="whitelistname" class="formfld" id="whitelistname">
<?php
/* find whitelist names and filter by type, make sure to track by uuid */
echo "<option value='default' >default</option>\n";
if (is_array($config['installedpackages']['snortglobal']['whitelist']['item'])) {
foreach ($config['installedpackages']['snortglobal']['whitelist']['item'] as $value) {
if ($value['snortlisttype'] == 'whitelist') {
- if ($value['name'] == $pconfig['whitelist'])
+ if ($value['name'] == $pconfig['whitelistname'])
echo "<option value='{$value['name']}' selected>";
else
echo "<option value='{$value['name']}'>";