Peter M. Groen / knowledgetree

Commit 1ecfe6393b95b054f3514be66856fcb12eb9dc3e

Authored by Neil Blakey-Milner
1 parent f4b7cfcb

Always use KTConfig::getSingleton - don't abuse the fact it is in the 

global namespace currently.  Move legacy functions and utility function
includes earlier in the file.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3594 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 25 additions and 23 deletions
config/dmsDefaults.php
  View file @1ecfe63
... ... @@ -286,10 +286,10 @@ class KTInit {
286 286 // {{{ readConfig
287 287 function readConfig () {
288 288 global $default;
289   - global $KTConfig;
290   - $KTConfig->loadFile(KT_DIR . "/config/config.ini");
291   - foreach (array_keys($KTConfig->flat) as $k) {
292   - $v = $KTConfig->get($k);
  289 + $oKTConfig =& KTConfig::getSingleton();
  290 + $oKTConfig->loadFile(KT_DIR . "/config/config.ini");
  291 + foreach (array_keys($oKTConfig->flat) as $k) {
  292 + $v = $oKTConfig->get($k);
293 293 if ($v === "default") {
294 294 continue;
295 295 }
... ... @@ -312,26 +312,34 @@ $KTInit->prependPath(KT_DIR . '/thirdparty/pear');
312 312 $KTInit->prependPath(KT_DIR . '/thirdparty/Smarty');
313 313 require_once('PEAR.php');
314 314  
  315 +// Give everyone access to legacy PHP functions
  316 +require_once(KT_LIB_DIR . '/util/legacy.inc');
  317 +
  318 +// Give everyone access to KTUtil utility functions
  319 +require_once(KT_LIB_DIR . '/util/ktutil.inc');
  320 +
315 321 require_once(KT_LIB_DIR . "/config/config.inc.php");
316 322  
317   -$KTConfig->setdefaultns("KnowledgeTree", "fileSystemRoot", KT_DIR);
318   -$KTConfig->setdefaultns("KnowledgeTree", "serverName", $_SERVER['HTTP_HOST']);
319   -$KTConfig->setdefaultns("KnowledgeTree", "sslEnabled", false);
  323 +$oKTConfig =& KTConfig::getSingleton();
  324 +
  325 +$oKTConfig->setdefaultns("KnowledgeTree", "fileSystemRoot", KT_DIR);
  326 +$oKTConfig->setdefaultns("KnowledgeTree", "serverName", $_SERVER['HTTP_HOST']);
  327 +$oKTConfig->setdefaultns("KnowledgeTree", "sslEnabled", false);
320 328 if (array_key_exists('HTTPS', $_SERVER)) {
321 329 if (strtolower($_SERVER['HTTPS']) === 'on') {
322   - $KTConfig->setdefaultns("KnowledgeTree", "sslEnabled", true);
  330 + $oKTConfig->setdefaultns("KnowledgeTree", "sslEnabled", true);
323 331 }
324 332 }
325   -$KTConfig->setdefaultns("KnowledgeTree", "rootUrl", $KTInit->guessRootUrl());
326   -$KTConfig->setdefaultns("config", "useDatabaseConfiguration", false);
327   -$KTConfig->setdefaultns("tweaks", "browseToRoot", false);
328   -$KTConfig->setdefaultns("tweaks", "genericMetaDataRequired", true);
329   -$KTConfig->setdefaultns("tweaks", "phpErrorLogFile", false);
330   -$KTConfig->setdefaultns("tweaks", "developmentWindowLog", false);
  333 +$oKTConfig->setdefaultns("KnowledgeTree", "rootUrl", $KTInit->guessRootUrl());
  334 +$oKTConfig->setdefaultns("config", "useDatabaseConfiguration", false);
  335 +$oKTConfig->setdefaultns("tweaks", "browseToRoot", false);
  336 +$oKTConfig->setdefaultns("tweaks", "genericMetaDataRequired", true);
  337 +$oKTConfig->setdefaultns("tweaks", "phpErrorLogFile", false);
  338 +$oKTConfig->setdefaultns("tweaks", "developmentWindowLog", false);
331 339  
332   -$KTConfig->setdefaultns(null, "logLevel", 'INFO');
333   -$KTConfig->setdefaultns(null, "unzipCommand", 'unzip');
334   -$KTConfig->setdefaultns(null, "execSearchPath", $_SERVER['PATH']);
  340 +$oKTConfig->setdefaultns(null, "logLevel", 'INFO');
  341 +$oKTConfig->setdefaultns(null, "unzipCommand", 'unzip');
  342 +$oKTConfig->setdefaultns(null, "execSearchPath", $_SERVER['PATH']);
335 343  
336 344 $KTInit->readConfig();
337 345  
... ... @@ -341,12 +349,6 @@ $loggingSupport = $KTInit->setupLogging();
341 349 // Send all PHP errors to a file (and maybe a window)
342 350 set_error_handler(array('KTInit', 'handlePHPError'));
343 351  
344   -// Give everyone access to legacy PHP functions
345   -require_once(KT_LIB_DIR . '/util/legacy.inc');
346   -
347   -// Give everyone access to KTUtil utility functions
348   -require_once(KT_LIB_DIR . '/util/ktutil.inc');
349   -
350 352 $dbSupport = $KTInit->setupDB();
351 353 $KTInit->setupRandomSeed();
352 354  
... ...