Peter M. Groen / knowledgetree

Commit 558cefe5d3a0859da01fbc700a7a2580efa2f39d

Authored by nbm
1 parent c402db61

Remove include of authenticationClass, due to new authentication system. 

Remove include of the old "configuration from database" system, pending
a new one.

Temporarily disabled accept header processing.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4389 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 3 additions and 14 deletions
config/dmsDefaults.php
  View file @558cefe
@@ -108,10 +108,11 @@ class KTInit { @@ -108,10 +108,11 @@ class KTInit {
108 global $default; 108 global $default;
109 if (in_array("gettext", get_loaded_extensions()) && function_exists('gettext') && function_exists('_')) { 109 if (in_array("gettext", get_loaded_extensions()) && function_exists('gettext') && function_exists('_')) {
110 require_once("$default->fileSystemRoot/lib/i18n/languageFunctions.inc"); 110 require_once("$default->fileSystemRoot/lib/i18n/languageFunctions.inc");
111 - require_once("$default->fileSystemRoot/lib/i18n/accept-to-gettext.inc"); 111 + // require_once("$default->fileSystemRoot/lib/i18n/accept-to-gettext.inc");
112 if ($default->useAcceptLanguageHeader) { 112 if ($default->useAcceptLanguageHeader) {
113 $aInstalledLocales = getInstalledLocales(); 113 $aInstalledLocales = getInstalledLocales();
114 - $sLocale=al2gt($aInstalledLocales, 'text/html'); 114 + //$sLocale=al2gt($aInstalledLocales, 'text/html');
  115 + $sLocale = 'en_ZA';
115 $default->defaultLanguage = $sLocale; 116 $default->defaultLanguage = $sLocale;
116 } 117 }
117 putenv('LANG=' . $default->defaultLanguage); 118 putenv('LANG=' . $default->defaultLanguage);
@@ -355,20 +356,8 @@ $KTInit->setupRandomSeed(); @@ -355,20 +356,8 @@ $KTInit->setupRandomSeed();
355 356
356 $GLOBALS['KTRootUrl'] = $oKTConfig->get('KnowledgeTree/rootUrl'); 357 $GLOBALS['KTRootUrl'] = $oKTConfig->get('KnowledgeTree/rootUrl');
357 358
358 -require_once("$default->fileSystemRoot/lib/authentication/$default->authenticationClass.inc");  
359 -  
360 // instantiate system settings class 359 // instantiate system settings class
361 require_once("$default->fileSystemRoot/lib/database/lookup.inc"); 360 require_once("$default->fileSystemRoot/lib/database/lookup.inc");
362 -require_once("$default->fileSystemRoot/lib/System.inc");  
363 -$default->system = new System();  
364 -  
365 -if ($default->useDatabaseConfiguration && $default->system->initialised()) {  
366 - $aSettings = $default->system->aSettings;  
367 -  
368 - for ($i=0; $i<count($aSettings); $i++) {  
369 - $default->$aSettings[$i] = $default->system->get($aSettings[$i]);  
370 - }  
371 -}  
372 361
373 // table mapping entries 362 // table mapping entries
374 include("tableMappings.inc"); 363 include("tableMappings.inc");