From c6dfd2892306623d5b988a0955abb6eb343f9766 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Mon, 28 Mar 2011 12:16:08 -0400
Subject: [PATCH] In IPsec, s/mobileclients/client/, this was changed long ago
 in the config but not everywhere followed.

---
 etc/inc/easyrule.inc                     | 2 +-
 etc/inc/filter.inc                       | 4 ++--
 usr/local/www/firewall_nat_1to1_edit.php | 2 +-
 usr/local/www/firewall_nat_edit.php      | 2 +-
 usr/local/www/firewall_nat_out_edit.php  | 2 +-
 usr/local/www/firewall_rules.php         | 2 +-
 usr/local/www/firewall_rules_edit.php    | 2 +-
 usr/local/www/status_graph.php           | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/etc/inc/easyrule.inc b/etc/inc/easyrule.inc
index 8ef72f4540..7b1c2b19a5 100644
--- a/etc/inc/easyrule.inc
+++ b/etc/inc/easyrule.inc
@@ -53,7 +53,7 @@ function easyrule_find_rule_interface($int) {
                 $iflist['l2tp'] = "L2TP VPN";
 
 	/* add ipsec interfaces */
-	if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable'])){
+	if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])){
 		$iflist["enc0"] = "IPSEC";
 	}
 
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index a7c490fa7a..4ba78b361f 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -792,7 +792,7 @@ function filter_generate_optcfg_array() {
 		$FilterIflist['pppoe'] = $oic;
 	}
 	/* add ipsec interfaces */
-	if(isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable'])) {
+	if(isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) {
 		$oic = array();
 		$oic['if'] = 'enc0';
 		$oic['descr'] = 'IPsec';
@@ -2227,7 +2227,7 @@ EOD;
 
 
 	/* add ipsec interfaces */
-	if(isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable']))
+	if(isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
 		$ipfrules .= <<<EOD
 pass out on \$IPsec all keep state label "IPsec internal host to host"
 
diff --git a/usr/local/www/firewall_nat_1to1_edit.php b/usr/local/www/firewall_nat_1to1_edit.php
index 135dd999cc..e9f45771da 100755
--- a/usr/local/www/firewall_nat_1to1_edit.php
+++ b/usr/local/www/firewall_nat_1to1_edit.php
@@ -288,7 +288,7 @@ function typesel_change() {
 						$interfaces['pppoe'] = "PPPoE VPN";
 
 					/* add ipsec interfaces */
-					if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable']))
+					if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
 						if(have_ruleint_access("enc0"))
 							$interfaces["enc0"] = "IPsec";
 
diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php
index 361d3244f5..3dc1d839aa 100755
--- a/usr/local/www/firewall_nat_edit.php
+++ b/usr/local/www/firewall_nat_edit.php
@@ -482,7 +482,7 @@ include("fbegin.inc"); ?>
 							$interfaces['pppoe'] = "PPPoE VPN";
 
 						/* add ipsec interfaces */
-						if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable']))
+						if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
 							if(have_ruleint_access("enc0"))
 								$interfaces["enc0"] = "IPsec";
 
diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php
index db6d03d79d..4d960f2fa0 100755
--- a/usr/local/www/firewall_nat_out_edit.php
+++ b/usr/local/www/firewall_nat_out_edit.php
@@ -416,7 +416,7 @@ function poolopts_change() {
 					$interfaces['pppoe'] = "PPPoE VPN";
 
 				/* add ipsec interfaces */
-				if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable']))
+				if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
 					if(have_ruleint_access("enc0"))
 						$interfaces["enc0"] = "IPsec";
 
diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index 8fa4670a8c..daf577a850 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -169,7 +169,7 @@ if (is_array($config['pppoes']['pppoe'])) {
 }
 
 /* add ipsec interfaces */
-if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable']))
+if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
 	if(have_ruleint_access("enc0")) 
 		$iflist["enc0"] = "IPsec";
 
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index 29b0336ac1..c05151895e 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -692,7 +692,7 @@ include("head.inc");
 					if (is_pppoe_server_enabled() && have_ruleint_access("pppoe"))
 						$interfaces['pppoe'] = "PPPoE VPN";
 					/* add ipsec interfaces */
-					if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable']))
+					if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
 						if(have_ruleint_access("enc0")) 
 							$interfaces["enc0"] = "IPsec";
 					/* add openvpn/tun interfaces */
diff --git a/usr/local/www/status_graph.php b/usr/local/www/status_graph.php
index 4527a71f2c..6c00da4242 100755
--- a/usr/local/www/status_graph.php
+++ b/usr/local/www/status_graph.php
@@ -163,7 +163,7 @@ function updateBandwidthHosts(data){
 <?php
 
 /* link the ipsec interface magically */
-if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable'])) 
+if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) 
 	$ifdescrs['enc0'] = "IPsec";
 
 ?>