Module: nagvis Branch: master Commit: b79450c682d105e1f13c177b4a33322d325144e7 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/commit/?id=b79450c682d105e1f13c177b4a33322d325144e7
Author: Roman Kyrylych <[email protected]> Date: Thu Jul 23 11:43:48 2009 +0300 Fixed getBasePath() to work correctly when <docroot>/nagvis is a symlink to <nagvis-base>/share Signed-off-by: Roman Kyrylych <[email protected]> --- share/nagvis/includes/classes/GlobalMainCfg.php | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/share/nagvis/includes/classes/GlobalMainCfg.php b/share/nagvis/includes/classes/GlobalMainCfg.php index ccba7c1..12c8ec8 100644 --- a/share/nagvis/includes/classes/GlobalMainCfg.php +++ b/share/nagvis/includes/classes/GlobalMainCfg.php @@ -537,11 +537,14 @@ class GlobalMainCfg { * * @param Boolean $printErr * @return Boolean Is Successful? - * @author Lars Michelsen <[email protected]> + * @author Lars Michelsen <[email protected]> + * @author Roman Kyrylych <[email protected]> */ private function getBasePath() { // Go 3 levels up from nagvis/share/nagvis to nagvis base path - return realpath(dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME'])))).'/'; + return realpath(dirname($_SERVER['SCRIPT_FILENAME']) . '/../..') . '/'; + // Note: the method below causes problems when <docroot>/nagvis is a symlink to <nagvis-base>/share + // return realpath(dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME'])))).'/'; } /** ------------------------------------------------------------------------------ _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
