tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't reverse IPv4 addresses

Browse Source
This commit is contained in:
Korbinian Rosenegger 2023-01-24 22:42:30 +01:00
parent 29861769eb
commit b070213f33
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/monitoring/application/controllers/ListController.php
View File

@ -756,7 +756,12 @@ class ListController extends Controller
foreach ($header as $key => $val) {
$hostnameElements = explode('.', $key);
if (count($hostnameElements) > 2) {
array_shift($hostnameElements);
if (filter_var($key, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
array_pop($hostnameElements);
}
else {
array_shift($hostnameElements);
}
$group = join('.', $hostnameElements);
if (is_null($previousGroup) || $previousGroup != $group) {
$newHeader['GROUP:' . $group] = $group;
@ -774,10 +779,14 @@ class ListController extends Controller
private function compareByDnsHierarchy($a, $b) {
$keysA = explode('.', $a);
$keysA = array_reverse($keysA);
if (!filter_var($a, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
$keysA = array_reverse($keysA);
}
$keysB = explode('.', $b);
$keysB = array_reverse($keysB);
if (!filter_var($b, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
$keysB = array_reverse($keysB);
}
$cnt = min([$cntA = count($keysA), $cntB = count($keysB)]);