Merge pull request pfsense#168 from bcyrill/cp_status

Fix Captive Portal status

Author: jim-p

usr/local/www/status_services.php

@@ -289,11 +289,11 @@ function get_pkg_descr($package_name) {
 $services[] = $pconfig;
 
 if (is_array($config['captiveportal'])) {
-	foreach ($config['captiveportal'] as $id => $setting) {
+	foreach ($config['captiveportal'] as $zone => $setting) {
 		if (isset($setting['enable'])) {
 			$pconfig = array();
 			$pconfig['name'] = "captiveportal";
-			$pconfig['zone'] = $setting['zone'];
+			$pconfig['zone'] = $zone;
 			$pconfig['description'] = gettext("Captive Portal") . ": ".htmlspecialchars($setting['zone']);
 			$services[] = $pconfig;
 		}

usr/local/www/widgets/widgets/services_status.widget.php

@@ -82,11 +82,11 @@ function get_pkg_descr($package_name) {
 $services[] = $svcconfig;
 
 if (is_array($config['captiveportal'])) {
-	foreach ($config['captiveportal'] as $id => $setting) {
+	foreach ($config['captiveportal'] as $zone => $setting) {
 		if (isset($setting['enable'])) {
 			$svcconfig = array();
 			$svcconfig['name'] = "captiveportal";
-			$svcconfig['zone'] = $setting['zone'];
+			$svcconfig['zone'] = $zone;
 			$svcconfig['description'] = gettext("Captive Portal") . ": ".htmlspecialchars($setting['zone']);
 			$services[] = $svcconfig;
 		}