diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2016-02-09 13:43:32 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-02-09 13:46:38 -0500 |
commit | 7d3c67dea8d1f305da586ba980489048727d5e74 (patch) | |
tree | 9d1954c383c6152e2c762be7c79627e728c48ede /src/usr/local/www/widgets | |
parent | 11439ca3d33849457dbc3b8bd2c00ac2b2667ceb (diff) | |
download | pfsense-7d3c67dea8d1f305da586ba980489048727d5e74.zip pfsense-7d3c67dea8d1f305da586ba980489048727d5e74.tar.gz |
Fixed #5858
Adds an incrementing suffix to service names when there are duplicates
Diffstat (limited to 'src/usr/local/www/widgets')
-rw-r--r-- | src/usr/local/www/widgets/widgets/services_status.widget.php | 14 |
1 files changed, 14 insertions, 0 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 a050a3e..ebe5937 100644 --- a/src/usr/local/www/widgets/widgets/services_status.widget.php +++ b/src/usr/local/www/widgets/widgets/services_status.widget.php @@ -65,6 +65,20 @@ require_once("/usr/local/www/widgets/include/services_status.inc"); $services = get_services(); +$numsvcs = count($services); + +// If there are any duplicated names, add an incrementing suffix +for ($idx=0; $idx < $numsvcs; $idx++) { + $name = $services[$idx]['name']; + + for ($chk = $idx +1, $sfx=2; $chk <$numsvcs; $chk++) { + if ($services[$chk]['name'] == $name) { + $services[$chk]['name'].= '_' . $sfx++; + } + } +} + +//print_r($services); if ($_POST) { $validNames = array(); |