Module: nagvis Branch: master Commit: efd06bf24edca06f1668c2697ef0794e475406a8 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=efd06bf24edca06f1668c2697ef0794e475406a8
Author: Lars Michelsen <[email protected]> Date: Fri May 7 22:40:42 2010 +0200 Code formating and cleanup --- share/server/core/classes/CoreModOverview.php | 33 +++++------------------- 1 files changed, 7 insertions(+), 26 deletions(-) diff --git a/share/server/core/classes/CoreModOverview.php b/share/server/core/classes/CoreModOverview.php index 3f5eefd..fa5338b 100644 --- a/share/server/core/classes/CoreModOverview.php +++ b/share/server/core/classes/CoreModOverview.php @@ -34,9 +34,9 @@ class CoreModOverview extends CoreModule { $this->aActions = Array( 'getOverviewProperties' => REQUIRES_AUTHORISATION, - 'getOverviewMaps' => REQUIRES_AUTHORISATION, - 'getOverviewAutomaps' => REQUIRES_AUTHORISATION, - 'getOverviewRotations' => REQUIRES_AUTHORISATION + 'getOverviewMaps' => REQUIRES_AUTHORISATION, + 'getOverviewAutomaps' => REQUIRES_AUTHORISATION, + 'getOverviewRotations' => REQUIRES_AUTHORISATION ); } @@ -44,45 +44,26 @@ class CoreModOverview extends CoreModule { $sReturn = ''; if($this->offersAction($this->sAction)) { - - // Initialize backends $this->BACKEND = new CoreBackendMgmt($this->CORE); - $this->OVERVIEW = new GlobalIndexPage($this->CORE, $this->BACKEND, $this->AUTHORISATION); switch($this->sAction) { case 'getOverviewProperties': - $sReturn = $this->getOverviewProperties(); + $sReturn = $this->OVERVIEW->parseIndexPropertiesJson(); break; case 'getOverviewMaps': - $sReturn = $this->getOverviewMaps(); + $sReturn = $this->OVERVIEW->parseMapsJson(); break; case 'getOverviewAutomaps': - $sReturn = $this->getOverviewAutomaps(); + $sReturn = $this->OVERVIEW->parseAutomapsJson(); break; case 'getOverviewRotations': - $sReturn = $this->getOverviewRotations(); + $sReturn = $this->OVERVIEW->parseRotationsJson(); break; } } return $sReturn; } - - private function getOverviewProperties() { - return $this->OVERVIEW->parseIndexPropertiesJson(); - } - - private function getOverviewMaps() { - return $this->OVERVIEW->parseMapsJson(); - } - - private function getOverviewAutomaps() { - return $this->OVERVIEW->parseAutomapsJson(); - } - - private function getOverviewRotations() { - return $this->OVERVIEW->parseRotationsJson(); - } } ?> ------------------------------------------------------------------------------ _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
