Module: nagvis Branch: master Commit: 66ead64a48efe50aa3cec340093b72f8c49674d0 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=66ead64a48efe50aa3cec340093b72f8c49674d0
Author: Lars Michelsen <[email protected]> Date: Sat Jun 5 22:20:11 2010 +0200 The path to the main configuration cache file is now defined as const --- share/server/core/classes/GlobalMainCfg.php | 4 ++-- share/server/core/defines/global.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/share/server/core/classes/GlobalMainCfg.php b/share/server/core/classes/GlobalMainCfg.php index 1000d79..b52445b 100644 --- a/share/server/core/classes/GlobalMainCfg.php +++ b/share/server/core/classes/GlobalMainCfg.php @@ -78,7 +78,7 @@ class GlobalMainCfg { 'language_available' => Array('must' => 1, 'editable' => 1, 'array' => true, - 'default' => Array('de_DE', 'en_US', 'es_ES', 'fr_FR', 'pt_BR', 'ru_RU'), + 'default' => Array('de_DE', 'en_US', 'es_ES', 'fr_FR', 'pt_BR'), 'match' => MATCH_STRING_NO_SPACE), 'language' => Array('must' => 1, 'editable' => 1, @@ -862,7 +862,7 @@ class GlobalMainCfg { } // Create instance of GlobalFileCache object for caching the config - $this->CACHE = new GlobalFileCache(GlobalCore::getInstance(), $this->configFile, $this->getValue('paths','var').'nagvis.ini.php-'.CONST_VERSION.'-cache'); + $this->CACHE = new GlobalFileCache(GlobalCore::getInstance(), $this->configFile, CONST_MAINCFG_CACHE.'-'.CONST_VERSION.'-cache'); // Get the valid configuration definitions from the available backends $this->getBackendValidConf(); diff --git a/share/server/core/defines/global.php b/share/server/core/defines/global.php index dbd63ed..d3fa2e5 100644 --- a/share/server/core/defines/global.php +++ b/share/server/core/defines/global.php @@ -62,6 +62,7 @@ define('CONST_VERSION', '1.5rc3'); // Path to the main configuration file define('CONST_MAINCFG', '../../../etc/nagvis.ini.php'); +define('CONST_MAINCFG_CACHE', '../../../var/nagvis.ini.php'); // Needed minimal PHP version define('CONST_NEEDED_PHP_VERSION', '5.0'); ------------------------------------------------------------------------------ ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
