Module: nagvis Branch: master Commit: 8ecacad57a8ca71ac44beaea53b595dee854fd7f URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=8ecacad57a8ca71ac44beaea53b595dee854fd7f
Author: LaMi <[email protected]> Date: Sun Mar 21 20:50:03 2010 +0100 Removed deprecated code --- share/server/core/classes/CoreModAutoMap.php | 1 - share/server/core/classes/CoreModGeneral.php | 1 - share/server/core/classes/CoreModMap.php | 1 - share/server/core/classes/NagVisAutoMap.php | 1 - share/server/core/classes/objects/NagVisMapObj.php | 4 ++-- .../core/classes/objects/NagVisStatelessObject.php | 10 ---------- share/server/core/classes/objects/NagiosHost.php | 12 ------------ .../core/classes/objects/NagiosHostgroup.php | 12 ------------ .../server/core/classes/objects/NagiosService.php | 10 ---------- .../core/classes/objects/NagiosServicegroup.php | 12 ------------ 10 files changed, 2 insertions(+), 62 deletions(-) diff --git a/share/server/core/classes/CoreModAutoMap.php b/share/server/core/classes/CoreModAutoMap.php index 23a0dff..b6b1e61 100644 --- a/share/server/core/classes/CoreModAutoMap.php +++ b/share/server/core/classes/CoreModAutoMap.php @@ -244,7 +244,6 @@ class CoreModAutoMap extends CoreModule { // These things are already done by NagVisMap and NagVisAutoMap classes // for the NagVisMapObj objects. Does not need to be done a second time. if(get_class($OBJ) != 'NagVisMapObj') { - $OBJ->fetchMembers(); $OBJ->fetchState(); } diff --git a/share/server/core/classes/CoreModGeneral.php b/share/server/core/classes/CoreModGeneral.php index 7980f72..f72680d 100644 --- a/share/server/core/classes/CoreModGeneral.php +++ b/share/server/core/classes/CoreModGeneral.php @@ -236,7 +236,6 @@ class CoreModGeneral extends CoreModule { // These things are already done by NagVisMap and NagVisAutoMap classes // for the NagVisMapObj objects. Does not need to be done a second time. if(get_class($OBJ) != 'NagVisMapObj') { - $OBJ->fetchMembers(); $OBJ->fetchState(); } diff --git a/share/server/core/classes/CoreModMap.php b/share/server/core/classes/CoreModMap.php index f135e07..696c196 100644 --- a/share/server/core/classes/CoreModMap.php +++ b/share/server/core/classes/CoreModMap.php @@ -998,7 +998,6 @@ class CoreModMap extends CoreModule { // These things are already done by NagVisMap and NagVisAutoMap classes // for the NagVisMapObj objects. Does not need to be done a second time. if(get_class($OBJ) != 'NagVisMapObj') { - $OBJ->fetchMembers(); $OBJ->fetchState(); } diff --git a/share/server/core/classes/NagVisAutoMap.php b/share/server/core/classes/NagVisAutoMap.php index 4149f77..bdcb1b6 100644 --- a/share/server/core/classes/NagVisAutoMap.php +++ b/share/server/core/classes/NagVisAutoMap.php @@ -781,7 +781,6 @@ class NagVisAutoMap extends GlobalMap { */ private function fetchHostObjectByName($hostName) { $hostObject = new NagVisHost($this->CORE, $this->BACKEND, $this->backend_id, $hostName); - $hostObject->fetchMembers(); $hostObject->setConfiguration($this->MAPCFG->getObjectConfiguration($hostName)); $hostObject->setObjectId(0); $this->rootObject = $hostObject; diff --git a/share/server/core/classes/objects/NagVisMapObj.php b/share/server/core/classes/objects/NagVisMapObj.php index 282051d..24f4095 100644 --- a/share/server/core/classes/objects/NagVisMapObj.php +++ b/share/server/core/classes/objects/NagVisMapObj.php @@ -249,9 +249,9 @@ class NagVisMapObj extends NagVisStatefulObject { if(!$OBJ->isSummaryObject && !$this->checkLoop($OBJ)) { continue; } + + $OBJ->fetchMembers(); } - - $OBJ->fetchMembers(); } } diff --git a/share/server/core/classes/objects/NagVisStatelessObject.php b/share/server/core/classes/objects/NagVisStatelessObject.php index 1b50faa..39146cf 100644 --- a/share/server/core/classes/objects/NagVisStatelessObject.php +++ b/share/server/core/classes/objects/NagVisStatelessObject.php @@ -57,15 +57,5 @@ class NagVisStatelessObject extends NagVisObject { // Get all information of the object (configuration, state, ...) return parent::parseJson(); } - - /** - * PUBLIC fetchMembers() - * - * Just a dummy here - * - * @author Lars Michelsen <[email protected]> - */ - public function fetchMembers() { - } } ?> diff --git a/share/server/core/classes/objects/NagiosHost.php b/share/server/core/classes/objects/NagiosHost.php index 69c0ba8..5bc9ce0 100644 --- a/share/server/core/classes/objects/NagiosHost.php +++ b/share/server/core/classes/objects/NagiosHost.php @@ -92,18 +92,6 @@ class NagiosHost extends NagVisStatefulObject { } /** - * PUBLIC fetchMembers() - * - * Gets all member objects - * - * @author Lars Michelsen <[email protected]> - */ - public function fetchMembers() { - // The service objects are all fetched in fetchState() method - // Seems this is not needed anymore and only a dummy at this place - } - - /** * PUBLIC fetchSummariesFromCounts() * * Fetches the summary state and output from the already set state counts diff --git a/share/server/core/classes/objects/NagiosHostgroup.php b/share/server/core/classes/objects/NagiosHostgroup.php index de3b803..b73e139 100644 --- a/share/server/core/classes/objects/NagiosHostgroup.php +++ b/share/server/core/classes/objects/NagiosHostgroup.php @@ -58,18 +58,6 @@ class NagiosHostgroup extends NagVisStatefulObject { } /** - * PUBLIC fetchMembers() - * - * Gets all member objects - * - * @author Lars Michelsen <[email protected]> - */ - public function fetchMembers() { - // The service objects are all fetched in fetchState() method - // Seems this is not needed anymore and only a dummy at this place - } - - /** * PUBLIC fetchState() * * Fetches the state of the hostgroup and all members. It also fetches the diff --git a/share/server/core/classes/objects/NagiosService.php b/share/server/core/classes/objects/NagiosService.php index 87452ff..f4ace6d 100644 --- a/share/server/core/classes/objects/NagiosService.php +++ b/share/server/core/classes/objects/NagiosService.php @@ -82,16 +82,6 @@ class NagiosService extends NagVisStatefulObject { } /** - * PUBLIC fetchMembers() - * - * Just a dummy here - * - * @author Lars Michelsen <[email protected]> - */ - function fetchMembers() { - } - - /** * PUBLIC getNumMembers() * * Just a dummy here diff --git a/share/server/core/classes/objects/NagiosServicegroup.php b/share/server/core/classes/objects/NagiosServicegroup.php index ad3a6b5..3fb960a 100644 --- a/share/server/core/classes/objects/NagiosServicegroup.php +++ b/share/server/core/classes/objects/NagiosServicegroup.php @@ -56,18 +56,6 @@ class NagiosServicegroup extends NagVisStatefulObject { } /** - * PUBLIC fetchMembers() - * - * Gets all member objects - * - * @author Lars Michelsen <[email protected]> - */ - public function fetchMembers() { - // The service objects are all fetched in fetchState() method - // Seems this is not needed anymore and only a dummy at this place - } - - /** * PUBLIC fetchState() * * Fetches the state of the servicegroup and all members. It also fetches the ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
