Module: nagvis Branch: master Commit: 922c55fef7b6364692a51dac036953e41ab552a5 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/nagvis;a=commit;h=922c55fef7b6364692a51dac036953e41ab552a5
Author: Lars Michelsen <[email protected]> Date: Mon Sep 7 14:45:14 2009 +0200 #8 Additional changes to make NagVis work with new directory structure --- .../frontend/nagvis-js/classes/NagVisFrontend.php | 38 ++++++++++---------- share/frontend/nagvis-js/classes/NagVisMap.php | 11 ++---- .../classes/controller/GlobalControllerMap.php | 5 +-- share/server/core/classes/GlobalMainCfg.php | 8 ++-- 4 files changed, 27 insertions(+), 35 deletions(-) diff --git a/share/frontend/nagvis-js/classes/NagVisFrontend.php b/share/frontend/nagvis-js/classes/NagVisFrontend.php index 93dfaaa..be77700 100644 --- a/share/frontend/nagvis-js/classes/NagVisFrontend.php +++ b/share/frontend/nagvis-js/classes/NagVisFrontend.php @@ -69,23 +69,23 @@ class NagVisFrontend extends GlobalPage { $this->htmlJs.'frontendEventlog.js', $this->htmlJs.'hover.js', $this->htmlJs.'frontendContext.js', - $this->htmlBase.'/nagvis/includes/js/ajax.js', - $this->htmlBase.'/nagvis/includes/js/dynfavicon.js', - $this->htmlBase.'/nagvis/includes/js/frontend.js', - $this->htmlBase.'/nagvis/includes/js/lines.js', - $this->htmlBase.'/nagvis/includes/js/overlib.js', - $this->htmlBase.'/nagvis/includes/js/NagVisObject.js', - $this->htmlBase.'/nagvis/includes/js/NagVisStatefulObject.js', - $this->htmlBase.'/nagvis/includes/js/NagVisStatelessObject.js', - $this->htmlBase.'/nagvis/includes/js/NagVisHost.js', - $this->htmlBase.'/nagvis/includes/js/NagVisService.js', - $this->htmlBase.'/nagvis/includes/js/NagVisHostgroup.js', - $this->htmlBase.'/nagvis/includes/js/NagVisServicegroup.js', - $this->htmlBase.'/nagvis/includes/js/NagVisMap.js', - $this->htmlBase.'/nagvis/includes/js/NagVisShape.js', - $this->htmlBase.'/nagvis/includes/js/NagVisTextbox.js', - $this->htmlBase.'/nagvis/includes/js/NagVisRotation.js', - $this->htmlBase.'/nagvis/includes/js/wz_jsgraphics.js'); + $this->htmlJs.'ajax.js', + $this->htmlJs.'dynfavicon.js', + $this->htmlJs.'frontend.js', + $this->htmlJs.'lines.js', + $this->htmlJs.'overlib.js', + $this->htmlJs.'NagVisObject.js', + $this->htmlJs.'NagVisStatefulObject.js', + $this->htmlJs.'NagVisStatelessObject.js', + $this->htmlJs.'NagVisHost.js', + $this->htmlJs.'NagVisService.js', + $this->htmlJs.'NagVisHostgroup.js', + $this->htmlJs.'NagVisServicegroup.js', + $this->htmlJs.'NagVisMap.js', + $this->htmlJs.'NagVisShape.js', + $this->htmlJs.'NagVisTextbox.js', + $this->htmlJs.'NagVisRotation.js', + $this->htmlJs.'wz_jsgraphics.js'); $prop['extHeader'] = '<link rel="shortcut icon" href="'.$this->htmlBase.'/nagvis/images/internal/favicon.png">'; $prop['languageRoot'] = 'nagvis'; @@ -138,8 +138,8 @@ class NagVisFrontend extends GlobalPage { public function getMap() { $this->addBodyLines('<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>'); $this->addBodyLines('<div id="map" class="map"></div>'); - $this->MAP = new NagVisMap($this->CORE, $this->MAPCFG, $this->BACKEND, false); - $this->MAP->MAPOBJ->checkMaintenance(1); + $this->MAP = new NagVisMap($this->CORE, $this->MAPCFG, null, false); + //FIXME: $this->MAP->MAPOBJ->checkMaintenance(1); $this->addBodyLines($this->parseJs($this->MAP->parseMapJson())); } diff --git a/share/frontend/nagvis-js/classes/NagVisMap.php b/share/frontend/nagvis-js/classes/NagVisMap.php index ef484a8..dce5da5 100644 --- a/share/frontend/nagvis-js/classes/NagVisMap.php +++ b/share/frontend/nagvis-js/classes/NagVisMap.php @@ -28,7 +28,6 @@ class NagVisMap extends GlobalMap { private $BACKEND; public $MAPOBJ; - private $numLineObjects; /** * Class Constructor @@ -38,18 +37,14 @@ class NagVisMap extends GlobalMap { * @param GlobalBackend $BACKEND * @author Lars Michelsen <[email protected]> */ - public function __construct($CORE, $MAPCFG, $BACKEND, $getState=1) { + public function __construct($CORE, $MAPCFG, $BACKEND = null, $getState=1) { parent::__construct($CORE, $MAPCFG); $this->BACKEND = $BACKEND; - $this->numLineObjects = 0; - - $this->MAPOBJ = new NagVisMapObj($CORE, $BACKEND, $MAPCFG); - - $this->MAPOBJ->fetchMembers(); - if($getState) { + $this->MAPOBJ = new NagVisMapObj($CORE, $BACKEND, $MAPCFG); + $this->MAPOBJ->fetchMembers(); $this->MAPOBJ->fetchState(); } } diff --git a/share/frontend/nagvis-js/classes/controller/GlobalControllerMap.php b/share/frontend/nagvis-js/classes/controller/GlobalControllerMap.php index d08edb4..ea1c322 100644 --- a/share/frontend/nagvis-js/classes/controller/GlobalControllerMap.php +++ b/share/frontend/nagvis-js/classes/controller/GlobalControllerMap.php @@ -43,11 +43,8 @@ class GlobalControllerMap { // Read the map configuration file $MAPCFG->readMapConfig(); - // Initialize backend(s) - $BACKEND = new GlobalBackendMgmt($CORE); - // Initialize the frontend - $FRONTEND = new NagVisFrontend($CORE, $MAPCFG, $BACKEND); + $FRONTEND = new NagVisFrontend($CORE, $MAPCFG, null); // Build the page $FRONTEND->addBodyLines($FRONTEND->parseJs('oRotationProperties = '.$FRONTEND->getRotationPropertiesJson(0).';')); diff --git a/share/server/core/classes/GlobalMainCfg.php b/share/server/core/classes/GlobalMainCfg.php index 95c5041..bc67250 100644 --- a/share/server/core/classes/GlobalMainCfg.php +++ b/share/server/core/classes/GlobalMainCfg.php @@ -737,16 +737,16 @@ class GlobalMainCfg { $this->validConfig['paths']['var']['default'] = $base.'var/'; $this->validConfig['paths']['sharedvar']['default'] = $base.'share/var/'; - $this->validConfig['paths']['htmlsharedvar']['default'] = $htmlBase.'/var/'; + $this->validConfig['paths']['htmlsharedvar']['default'] = $htmlBase.'/frontend/nagvis-js/var/'; $this->validConfig['paths']['language']['default'] = $base.'share/frontend/nagvis-js/locale'; $this->validConfig['paths']['class']['default'] = $base.'share/server/core/classes'; - $this->validConfig['paths']['htmlcss']['default'] = $htmlBase.'/css/'; - $this->validConfig['paths']['htmljs']['default'] = $htmlBase.'/js/'; + $this->validConfig['paths']['htmlcss']['default'] = $htmlBase.'/frontend/nagvis-js/css/'; + $this->validConfig['paths']['htmljs']['default'] = $htmlBase.'/frontend/nagvis-js/js/'; $this->validConfig['paths']['images']['default'] = $base.'share/nagvis/images/'; - $this->validConfig['paths']['htmlimages']['default'] = $htmlBase.'/nagvis/images/'; + $this->validConfig['paths']['htmlimages']['default'] = $htmlBase.'/frontend/nagvis-js/images/'; $this->validConfig['paths']['hovertemplate']['default'] = $base.'share/userfiles/templates/hover/'; $this->validConfig['paths']['headertemplate']['default'] = $base.'share/userfiles/templates/header/'; ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
