From 9a36dc9d241e004e7bcdec25def3b7b0c9d94cff Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Wed, 6 Apr 2011 18:22:27 +0000
Subject: Resolves #1391. Bring back VPN auto rule disable advanced setting.

---
 usr/local/www/system_advanced_firewall.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'usr/local/www/system_advanced_firewall.php')

diff --git a/usr/local/www/system_advanced_firewall.php b/usr/local/www/system_advanced_firewall.php
index 8165922..12a7ba2 100644
--- a/usr/local/www/system_advanced_firewall.php
+++ b/usr/local/www/system_advanced_firewall.php
@@ -66,6 +66,7 @@ $pconfig['reflectiontimeout'] = $config['system']['reflectiontimeout'];
 $pconfig['bypassstaticroutes'] = isset($config['filter']['bypassstaticroutes']);
 $pconfig['disablescrub'] = isset($config['system']['disablescrub']);
 $pconfig['tftpinterface'] = explode(",", $config['system']['tftpinterface']);
+$pconfig['disablevpnrules'] = isset($config['system']['disablevpnrules']);
 
 if ($_POST) {
 
@@ -96,6 +97,10 @@ if ($_POST) {
 		else
 			unset($config['system']['disablefilter']);
 
+		if($_POST['disablevpnrules'] == "yes")
+			$config['system']['disablevpnrules'] = true;
+		else
+			unset($config['system']['disablevpnrules']);
 		if($_POST['rfc959workaround'] == "yes")
 			$config['system']['rfc959workaround'] = "enabled";
 		else
@@ -331,6 +336,16 @@ function update_description(itemnum) {
 								</td>
 							</tr>
 							<tr>
+								<td width="22%" valign="top" class="vncell">Disable Auto-added VPN rules</td>
+								<td width="78%" class="vtable">
+									<input name="disablevpnrules" type="checkbox" id="disablevpnrules" value="yes" <?php if (isset($config['system']['disablevpnrules'])) echo "checked"; ?> />
+									<strong><?=gettext("Disable all auto-added VPN rules.");?></strong>
+									<br />
+									<span class="vexpl"><?=gettext("Note: This disables automatically added rules for IPsec.");?> 
+									</span>
+								</td>
+							</tr>
+							<tr>
 								<td width="22%" valign="top" class="vncell">Disable reply-to</td>
 								<td width="78%" class="vtable">
 									<input name="disablereplyto" type="checkbox" id="disablereplyto" value="yes" <?php if ($pconfig['disablereplyto']) echo "checked"; ?> />
-- 
cgit v1.1