diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2016-02-09 19:48:45 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-02-09 19:49:08 -0500 |
commit | 095edfebea77da7f3a05af7f83ba5d8726f849c4 (patch) | |
tree | 2ce85ffbc6ea5c3a345301a6b32fb9b521a7d022 /src/usr/local/www/widgets | |
parent | d9901ff473dc86e70ae59b3070164ec6e99c7df9 (diff) | |
download | pfsense-095edfebea77da7f3a05af7f83ba5d8726f849c4.zip pfsense-095edfebea77da7f3a05af7f83ba5d8726f849c4.tar.gz |
Further revision to service hiding system
Diffstat (limited to 'src/usr/local/www/widgets')
-rw-r--r-- | src/usr/local/www/widgets/widgets/services_status.widget.php | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/usr/local/www/widgets/widgets/services_status.widget.php b/src/usr/local/www/widgets/widgets/services_status.widget.php index b2e98a0..130ccfc 100644 --- a/src/usr/local/www/widgets/widgets/services_status.widget.php +++ b/src/usr/local/www/widgets/widgets/services_status.widget.php @@ -67,25 +67,27 @@ $services = get_services(); $numsvcs = count($services); +for ($idx=0; $idx<$numsvcs; $idx++) { + $services[$idx]['dispname'] = $services[$idx]['name']; +} + // If there are any duplicated names, add an incrementing suffix -for ($idx=0; $idx < $numsvcs; $idx++) { +for ($idx=1; $idx < $numsvcs; $idx++) { $name = $services[$idx]['name']; for ($chk = $idx +1, $sfx=2; $chk <$numsvcs; $chk++) { - if ($services[$chk]['name'] == $name) { - $services[$chk]['dispname'] = $services[$chk]['name'] .'_' . $sfx++; - } else { - $services[$chk]['dispname'] = $services[$chk]['name']; - } + if ($services[$chk]['dispname'] == $name) { + $services[$chk]['dispname'] .= '_' . $sfx++; + } } } -//print_r($services); if ($_POST) { + $validNames = array(); foreach ($services as $service) { - array_push($validNames, $service['name']); + array_push($validNames, $service['dispname']); } if (isset($_POST['servicestatusfilter'])) { @@ -113,7 +115,7 @@ if ($_POST) { $skipservices = explode(",", $config['widgets']['servicestatusfilter']); if (count($services) > 0) { - uasort($services, "service_name_compare"); + uasort($services, "service_dispname_compare"); foreach ($services as $service) { if ((!$service['dispname']) || (in_array($service['dispname'], $skipservices)) || (!is_service_enabled($service['dispname']))) { continue; |