Module: nagvis Branch: master Commit: 62caaebd4b1a2eb3e8757251b638c6c165ec80e9 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=62caaebd4b1a2eb3e8757251b638c6c165ec80e9
Author: Lars Michelsen <[email protected]> Date: Sat Oct 2 19:40:20 2010 +0200 Made hardcoded share directory dynamic via constant in global.php --- share/server/core/classes/GlobalMainCfg.php | 54 +++++++++++++------------- share/server/core/defines/global.php | 3 + 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/share/server/core/classes/GlobalMainCfg.php b/share/server/core/classes/GlobalMainCfg.php index 38e3f46..4effd35 100644 --- a/share/server/core/classes/GlobalMainCfg.php +++ b/share/server/core/classes/GlobalMainCfg.php @@ -976,45 +976,45 @@ class GlobalMainCfg { * @return Boolean Is Successful? * @author Lars Michelsen <[email protected]> */ - private function setPathsByBase($base,$htmlBase) { - $this->validConfig['paths']['cfg']['default'] = $base.'etc/'; - $this->validConfig['paths']['mapcfg']['default'] = $base.'etc/maps/'; - $this->validConfig['paths']['automapcfg']['default'] = $base.'etc/automaps/'; + private function setPathsByBase($base, $htmlBase) { + $this->validConfig['paths']['cfg']['default'] = $base.'etc/'; + $this->validConfig['paths']['mapcfg']['default'] = $base.'etc/maps/'; + $this->validConfig['paths']['automapcfg']['default'] = $base.'etc/automaps/'; - $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']['var']['default'] = $base.'var/'; + $this->validConfig['paths']['sharedvar']['default'] = $base.HTDOCS_DIR.'/var/'; + $this->validConfig['paths']['htmlsharedvar']['default'] = $htmlBase.'/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']['language']['default'] = $base.HTDOCS_DIR.'/frontend/nagvis-js/locale'; + $this->validConfig['paths']['class']['default'] = $base.HTDOCS_DIR.'/server/core/classes/'; - $this->validConfig['paths']['htmlcss']['default'] = $htmlBase.'/frontend/nagvis-js/css/'; + $this->validConfig['paths']['htmlcss']['default'] = $htmlBase.'/frontend/nagvis-js/css/'; - $this->validConfig['paths']['js']['default'] = $base.'share/frontend/nagvis-js/js/'; - $this->validConfig['paths']['htmljs']['default'] = $htmlBase.'/frontend/nagvis-js/js/'; + $this->validConfig['paths']['js']['default'] = $base.HTDOCS_DIR.'/frontend/nagvis-js/js/'; + $this->validConfig['paths']['htmljs']['default'] = $htmlBase.'/frontend/nagvis-js/js/'; - $this->validConfig['paths']['images']['default'] = $base.'share/frontend/nagvis-js/images/'; - $this->validConfig['paths']['htmlimages']['default'] = $htmlBase.'/frontend/nagvis-js/images/'; + $this->validConfig['paths']['images']['default'] = $base.HTDOCS_DIR.'/frontend/nagvis-js/images/'; + $this->validConfig['paths']['htmlimages']['default'] = $htmlBase.'/frontend/nagvis-js/images/'; - $this->validConfig['paths']['templates']['default'] = $base.'share/userfiles/templates/'; - $this->validConfig['paths']['htmltemplates']['default'] = $htmlBase.'/userfiles/templates/'; + $this->validConfig['paths']['templates']['default'] = $base.HTDOCS_DIR.'/userfiles/templates/'; + $this->validConfig['paths']['htmltemplates']['default'] = $htmlBase.'/userfiles/templates/'; - $this->validConfig['paths']['htmlsounds']['default'] = $htmlBase.'/userfiles/sounds/'; - $this->validConfig['paths']['htmlstyles']['default'] = $htmlBase.'/userfiles/styles/'; + $this->validConfig['paths']['htmlsounds']['default'] = $htmlBase.'/userfiles/sounds/'; + $this->validConfig['paths']['htmlstyles']['default'] = $htmlBase.'/userfiles/styles/'; - $this->validConfig['paths']['gadget']['default'] = $base.'share/userfiles/gadgets/'; - $this->validConfig['paths']['htmlgadgets']['default'] = $htmlBase.'/userfiles/gadgets/'; + $this->validConfig['paths']['gadget']['default'] = $base.HTDOCS_DIR.'/userfiles/gadgets/'; + $this->validConfig['paths']['htmlgadgets']['default'] = $htmlBase.'/userfiles/gadgets/'; - $this->validConfig['paths']['icon']['default'] = $base.'share/userfiles/images/iconsets/'; - $this->validConfig['paths']['shape']['default'] = $base.'share/userfiles/images/shapes/'; - $this->validConfig['paths']['map']['default'] = $base.'share/userfiles/images/maps/'; - $this->validConfig['paths']['htmlicon']['default'] = $htmlBase.'/userfiles/images/iconsets/'; - $this->validConfig['paths']['htmlshape']['default'] = $htmlBase.'/userfiles/images/shapes/'; - $this->validConfig['paths']['htmlmap']['default'] = $htmlBase.'/userfiles/images/maps/'; + $this->validConfig['paths']['icon']['default'] = $base.HTDOCS_DIR.'/userfiles/images/iconsets/'; + $this->validConfig['paths']['shape']['default'] = $base.HTDOCS_DIR.'/userfiles/images/shapes/'; + $this->validConfig['paths']['map']['default'] = $base.HTDOCS_DIR.'/userfiles/images/maps/'; + $this->validConfig['paths']['htmlicon']['default'] = $htmlBase.'/userfiles/images/iconsets/'; + $this->validConfig['paths']['htmlshape']['default'] = $htmlBase.'/userfiles/images/shapes/'; + $this->validConfig['paths']['htmlmap']['default'] = $htmlBase.'/userfiles/images/maps/'; $this->validConfig['paths']['htmltemplateimages']['default'] = $htmlBase.'/userfiles/images/templates/'; // This option directly relies on the configured htmlBase by default - $this->validConfig['global']['sesscookiepath']['default'] = $htmlBase; + $this->validConfig['global']['sesscookiepath']['default'] = $htmlBase; } /** diff --git a/share/server/core/defines/global.php b/share/server/core/defines/global.php index f699605..4cf1bd3 100644 --- a/share/server/core/defines/global.php +++ b/share/server/core/defines/global.php @@ -84,6 +84,9 @@ define('CONST_MAINCFG_CACHE', '../../../var/nagvis.ini.php'); // Path to "site" main configuration file //define('CONST_MAINCFG_SITE', '../../../etc/nagvis-site.ini.php'); +// The directory below the NagVis root which is shared by the webserver +define('HTDOCS_DIR', 'share'); + // Needed minimal PHP version define('CONST_NEEDED_PHP_VERSION', '5.0'); ------------------------------------------------------------------------------ Start uncovering the many advantages of virtual appliances and start using them to simplify application deployment and accelerate your shift to cloud computing. http://p.sf.net/sfu/novell-sfdev2dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
