diff options
| author | Jim P <jim@pingle.org> | 2012-07-05 15:49:35 -0700 |
|---|---|---|
| committer | Jim P <jim@pingle.org> | 2012-07-05 15:49:35 -0700 |
| commit | b7fb885c4a12e3969063272abfc20333f3172d7c (patch) | |
| tree | 3fc34ddacd31cf7ee15757e481cef7f6292856c9 | |
| parent | 7f2bd97c627fc0992d56114cd008b719cef22df3 (diff) | |
| parent | dff2ea2c2c08771fe12a422f80464475685cf52e (diff) | |
| download | pfsense-b7fb885c4a12e3969063272abfc20333f3172d7c.zip pfsense-b7fb885c4a12e3969063272abfc20333f3172d7c.tar.gz | |
Merge pull request #168 from bcyrill/cp_status
Fix Captive Portal status
| -rwxr-xr-x | usr/local/www/status_services.php | 4 | ||||
| -rw-r--r-- | usr/local/www/widgets/widgets/services_status.widget.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr/local/www/status_services.php b/usr/local/www/status_services.php index d94b610..06b52cd 100755 --- a/usr/local/www/status_services.php +++ b/usr/local/www/status_services.php @@ -289,11 +289,11 @@ $pconfig['description'] = gettext("NTP clock sync"); $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; } diff --git a/usr/local/www/widgets/widgets/services_status.widget.php b/usr/local/www/widgets/widgets/services_status.widget.php index ec24101..58538fa 100644 --- a/usr/local/www/widgets/widgets/services_status.widget.php +++ b/usr/local/www/widgets/widgets/services_status.widget.php @@ -82,11 +82,11 @@ $svcconfig['description'] = gettext("NTP clock sync"); $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; } |
