From 4ebd5894dda50889cd78120198b92d95ef8f52ed Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 23 Jul 2015 16:35:58 +0000
Subject: [PATCH] (legacy) openvpn dependencies and missing vars

---
 src/etc/inc/openvpn.inc          | 4 ++--
 src/www/status_captiveportal.php | 1 +
 src/www/status_gateways.php      | 1 +
 src/www/status_upnp.php          | 1 +
 src/www/vpn_openvpn_export.php   | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc
index 366655957..302dd99ad 100644
--- a/src/etc/inc/openvpn.inc
+++ b/src/etc/inc/openvpn.inc
@@ -111,7 +111,7 @@ function openvpn_vpnid_next() {
 function openvpn_port_used($prot, $interface, $port, $curvpnid = 0) {
 	global $config;
 
-	if (is_array($config['openvpn']['openvpn-server'])) {
+	if (isset($config['openvpn']['openvpn-server'])) {
 		foreach ($config['openvpn']['openvpn-server'] as & $settings) {
 			if (isset($settings['disable']))
 				continue;
@@ -125,7 +125,7 @@ function openvpn_port_used($prot, $interface, $port, $curvpnid = 0) {
 		}
 	}
 
-	if (is_array($config['openvpn']['openvpn-client'])) {
+	if (isset($config['openvpn']['openvpn-client'])) {
 		foreach ($config['openvpn']['openvpn-client'] as & $settings) {
 			if (isset($settings['disable']))
 				continue;
diff --git a/src/www/status_captiveportal.php b/src/www/status_captiveportal.php
index f4245e66f..658f58487 100644
--- a/src/www/status_captiveportal.php
+++ b/src/www/status_captiveportal.php
@@ -30,6 +30,7 @@ require_once("guiconfig.inc");
 require_once("captiveportal.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 $cpzone = $_GET['zone'];
 if (isset($_POST['zone']))
diff --git a/src/www/status_gateways.php b/src/www/status_gateways.php
index daa1419a4..6493d4c90 100644
--- a/src/www/status_gateways.php
+++ b/src/www/status_gateways.php
@@ -28,6 +28,7 @@
 
 require_once("guiconfig.inc");
 require_once("services.inc");
+require_once("interfaces.inc");
 
 $a_gateways = return_gateways_array();
 $gateways_status = array();
diff --git a/src/www/status_upnp.php b/src/www/status_upnp.php
index 589b5b494..3e300ddd5 100644
--- a/src/www/status_upnp.php
+++ b/src/www/status_upnp.php
@@ -28,6 +28,7 @@
 
 require_once("guiconfig.inc");
 require_once("services.inc");
+require_once("interfaces.inc");
 
 if ($_POST) {
 	if ($_POST['clear'] == "Clear") {
diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php
index a97cd0b88..976b568af 100644
--- a/src/www/vpn_openvpn_export.php
+++ b/src/www/vpn_openvpn_export.php
@@ -42,7 +42,7 @@ global $current_openvpn_version, $current_openvpn_version_rev;
 
 $pgtitle = array("OpenVPN", "Client Export Utility");
 
-if (!is_array($config['openvpn']['openvpn-server'])) {
+if (!isset($config['openvpn']['openvpn-server'])) {
     $config['openvpn']['openvpn-server'] = array();
 }