Add some safety belts.

1 files changed, 2 insertions, 2 deletions

diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc
index bdfa7dd..487b41e 100644
--- a/etc/inc/service-utils.inc
+++ b/etc/inc/service-utils.inc
@@ -350,7 +350,7 @@ function find_service_by_name($name) {
 function find_service_by_openvpn_vpnid($vpnid) {
 	$services = get_services();
 	foreach ($services as $service)
-		if ($service["vpnid"] == $vpnid)
+		if (($service["name"] == "openvpn") && isset($service["vpnid"]) && ($service["vpnid"] == $vpnid))
 			return $service;
 	return array();
 }
@@ -358,7 +358,7 @@ function find_service_by_openvpn_vpnid($vpnid) {
 function find_service_by_cp_zone($zone) {
 	$services = get_services();
 	foreach ($services as $service)
-		if ($service["zone"] == $zone)
+		if (($service["name"] == "captiveportal") && isset($service["zone"]) && ($service["zone"] == $zone))
 			return $service;
 	return array();
 }