diff options
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/hosts.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/include/services.inc.php | 22 |
2 files changed, 21 insertions, 3 deletions
diff --git a/frontends/php/include/hosts.inc.php b/frontends/php/include/hosts.inc.php index f7d7dd33..5ccae673 100644 --- a/frontends/php/include/hosts.inc.php +++ b/frontends/php/include/hosts.inc.php @@ -482,6 +482,8 @@ require_once "include/items.inc.php"; if(in_array("monitored_hosts",$options)) $with_host_status = " and h.status=".HOST_STATUS_MONITORED; + elseif(in_array('real_hosts',$options)) + $with_host_status = " and h.status<>".HOST_STATUS_TEMPLATE; else $with_host_status = ""; diff --git a/frontends/php/include/services.inc.php b/frontends/php/include/services.inc.php index 1cce729c..b54eb79b 100644 --- a/frontends/php/include/services.inc.php +++ b/frontends/php/include/services.inc.php @@ -588,7 +588,9 @@ $dt = 0; if(!isset($services[$nodeid['id']])){ continue; } - createServiceTree($services,$temp,$nodeid['id'],$services[$nodeid['id']]['serviceupid'],$rows['serviceid'],$nodeid['soft'], $nodeid['linkid']); + if(isset($services[$nodeid['id']]['serviceupid'])){ + createServiceTree($services,$temp,$nodeid['id'],$services[$nodeid['id']]['serviceupid'],$rows['serviceid'],$nodeid['soft'], $nodeid['linkid']); + } } } } else { @@ -616,7 +618,8 @@ $dt = 0; if(!isset($services[$nodeid['id']])){ continue; } - createShowServiceTree($services,$temp,$nodeid['id'],$services[$nodeid['id']]['serviceupid'],$rows['serviceid'],$nodeid['soft'], $nodeid['linkid']); + if(isset($services[$nodeid['id']]['serviceupid'])){ + createShowServiceTree($services,$temp,$nodeid['id'],$services[$nodeid['id']]['serviceupid'],$rows['serviceid'],$nodeid['soft'], $nodeid['linkid']); } } } } else { @@ -628,7 +631,20 @@ $dt = 0; } function closeform(){ - zbx_add_post_js('closeform();'); } + + function del_empty_nodes($services){ + do{ + unset($retry); + foreach($services as $id => $data){ + if(isset($data['serviceupid']) && !isset($services[$data['serviceupid']])){ + unset($services[$id]); + $retry = true; + //break; + } + } + } while(isset($retry)); + return $services; + } ?> |