Module: nagvis
Branch: master
Commit: e9ab0174ecc4c433395a474d940fc7bfd2c44a42
URL:    
http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=e9ab0174ecc4c433395a474d940fc7bfd2c44a42

Author: Lars Michelsen <[email protected]>
Date:   Tue Oct 20 21:42:06 2009 +0200

Renamed functions: Prep for new parent object tree

---

 share/server/core/classes/NagVisAutoMap.php |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/server/core/classes/NagVisAutoMap.php 
b/share/server/core/classes/NagVisAutoMap.php
index acdb18d..436e821 100644
--- a/share/server/core/classes/NagVisAutoMap.php
+++ b/share/server/core/classes/NagVisAutoMap.php
@@ -149,13 +149,13 @@ class NagVisAutoMap extends GlobalMap {
                $this->fetchHostObjectByName($this->root);
                
                // Get all object information from backend
-               $this->getObjectTree();
+               $this->getChildObjectTree();
                
                if($this->filterGroup != '') {
                        $this->filterGroupObject = new 
NagiosHostgroup($this->CORE, $this->BACKEND, $this->backend_id, 
$this->filterGroup);
                        $this->filterGroupObject->fetchMemberHostObjects();
                        
-                       $this->filterObjectTreeByGroup();
+                       $this->filterChildObjectTreeByGroup();
                }
                
                // Create MAPOBJ object, form the object tree to map objects 
and get the
@@ -545,7 +545,7 @@ class NagVisAutoMap extends GlobalMap {
         *
         * @author      Lars Michelsen <[email protected]>
         */
-       private function getObjectTree() {
+       private function getChildObjectTree() {
                $this->rootObject->fetchChilds($this->maxLayers, 
$this->MAPCFG->getObjectConfiguration(), $this->ignoreHosts, 
$this->arrHostnames, $this->arrMapObjects);
        }
        
@@ -554,7 +554,7 @@ class NagVisAutoMap extends GlobalMap {
         *
         * @author      Lars Michelsen <[email protected]>
         */
-       private function filterObjectTreeByGroup() {
+       private function filterChildObjectTreeByGroup() {
                $hostgroupMembers = Array();
                foreach($this->filterGroupObject->getMembers() AS $OBJ1) {
                        $hostgroupMembers[] = $OBJ1->getName();


------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins

Reply via email to