Peter M. Groen / knowledgetree

Commit d2db6f87167a080188228131c496b4f226f549f3

Authored by Megan Watson
1 parent 8035779b

KTS-3244 

"Problem with stack installer and providing a trailing backslash"
Fixed. Added a str_replace on double slashes - forward and back.

Committed by: Megan Watson
Reviewed by: Jonathan Byrne



git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@8365 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 13 additions and 12 deletions
config/dmsDefaults.php
  View file @d2db6f8
... ... @@ -449,6 +449,9 @@ function catchFatalErrors($p_OnOff='On'){
449 449 $cache_file = trim(file_get_contents(KT_DIR . '/config/cache-path')) . '/configcache' . $user . $truehost . $trueport;
450 450 if (!KTUtil::isAbsolutePath($cache_file)) { $cache_file = sprintf('%s/%s', KT_DIR, $cache_file); }
451 451 $config_file = trim(file_get_contents(KT_DIR . '/config/config-path'));
  452 + // Remove any double slashes
  453 + $config_file = str_replace('//', '/', $config_file);
  454 + $config_file = str_replace('\\\\', '\\', $config_file);
452 455 if (!KTUtil::isAbsolutePath($config_file)) { $config_file = sprintf('%s/%s', KT_DIR, $config_file); }
453 456  
454 457 $exists = file_exists($cache_file);
... ... @@ -461,8 +464,6 @@ function catchFatalErrors($p_OnOff='On'){
461 464 $use_cache = true;
462 465 }
463 466 }
464   -
465   -
466 467 }
467 468  
468 469 if ($use_cache) {
... ... @@ -489,8 +490,8 @@ function catchFatalErrors($p_OnOff='On'){
489 490 $oKTConfig->setdefaultns('KnowledgeTree', 'execSearchPath', $_SERVER['PATH']);
490 491 $oKTConfig->setdefaultns('KnowledgeTree', 'pathInfoSupport', false);
491 492 $oKTConfig->setdefaultns('KnowledgeTree', 'magicDatabase', KTInit::detectMagicFile());
492   - $oKTConfig->setdefaultns('KnowledgeTree', 'schedulerInterval', 30);
493   -
  493 + $oKTConfig->setdefaultns('KnowledgeTree', 'schedulerInterval', 30);
  494 +
494 495 $oKTConfig->setdefaultns('dashboard', 'alwaysShowYCOD', true);
495 496  
496 497 $oKTConfig->setdefaultns('storage', 'manager', 'KTOnDiskHashedStorageManager');
... ... @@ -510,7 +511,7 @@ function catchFatalErrors($p_OnOff='On'){
510 511 $oKTConfig->setdefaultns('tweaks', 'phpErrorLogFile', false);
511 512 $oKTConfig->setdefaultns('tweaks', 'developmentWindowLog', false);
512 513 $oKTConfig->setdefaultns('tweaks', 'noisyBulkOperations', false);
513   -
  514 +
514 515 $oKTConfig->setdefaultns('email', 'emailServer', 'none');
515 516 $oKTConfig->setdefaultns('email', 'emailPort', '');
516 517 $oKTConfig->setdefaultns('email', 'emailAuthentication', false);
... ... @@ -540,14 +541,14 @@ function catchFatalErrors($p_OnOff='On'){
540 541 $oKTConfig->setdefaultns('ui', 'fakeMimetype', false);
541 542 $oKTConfig->setdefaultns('ui', 'dot', 'dot');
542 543 $oKTConfig->setdefaultns('ui', 'metadata_sort', true);
543   -
  544 +
544 545 $oKTConfig->setdefaultns('i18n', 'useLike', false);
545 546  
546 547 $oKTConfig->setdefaultns(null, 'logLevel', 'INFO');
547 548 $oKTConfig->setdefaultns('import', 'unzip', 'unzip');
548 549 $oKTConfig->setdefaultns('export', 'zip', 'zip');
549 550 $oKTConfig->setdefaultns('export', 'encoding', 'UTF-8');
550   -
  551 +
551 552 $oKTConfig->setdefaultns('externalBinary', 'xls2csv', 'xls2csv');
552 553 $oKTConfig->setdefaultns('externalBinary', 'pdftotext', 'pdftotext');
553 554 $oKTConfig->setdefaultns('externalBinary', 'catppt', 'catppt');
... ... @@ -558,16 +559,16 @@ function catchFatalErrors($p_OnOff='On'){
558 559 $oKTConfig->setdefaultns('externalBinary', 'java', 'java');
559 560 $oKTConfig->setdefaultns('externalBinary', 'php', 'php');
560 561 $oKTConfig->setdefaultns('externalBinary', 'df', 'df');
561   -
  562 +
562 563 $oKTConfig->setdefaultns('cache', 'cacheDirectory', '${varDirectory}/cache');
563 564 $oKTConfig->setdefaultns('cache', 'cacheEnabled', 'false');
564 565 $oKTConfig->setdefaultns('cache', 'proxyCacheDirectory', '${varDirectory}/proxies');
565 566 $oKTConfig->setdefaultns('cache', 'proxyCacheEnabled', 'true');
566 567 $oKTConfig->setdefaultns('cache', 'cachePlugins', 'true');
567   -
  568 +
568 569 $oKTConfig->setdefaultns('KTWebDAVSettings', 'debug', 'off');
569 570 $oKTConfig->setdefaultns('KTWebDAVSettings', 'safemode', 'on');
570   -
  571 +
571 572 $oKTConfig->setdefaultns('BaobabSettings', 'debug', 'off');
572 573 $oKTConfig->setdefaultns('BaobabSettings', 'safemode', 'on');
573 574  
... ... @@ -576,7 +577,7 @@ function catchFatalErrors($p_OnOff='On'){
576 577 $oKTConfig->setdefaultns('search', 'resultsDisplayFormat', 'searchengine');
577 578 $oKTConfig->setdefaultns('search', 'resultsPerPage', 25);
578 579 $oKTConfig->setdefaultns('search', 'dateFormat', 'Y-m-d');
579   -
  580 +
580 581 $oKTConfig->setdefaultns('browse', 'previewActivation', 'mouse-over');
581 582  
582 583 $oKTConfig->setdefaultns('indexer', 'coreClass', 'JavaXMLRPCLuceneIndexer');
... ... @@ -611,7 +612,7 @@ function catchFatalErrors($p_OnOff='On'){
611 612 $oKTConfig->setdefaultns('clientToolPolicies', 'allowRememberPassword', true);
612 613  
613 614 $oKTConfig->setdefaultns('DiskUsage', 'warningThreshold', 10);
614   - $oKTConfig->setdefaultns('DiskUsage', 'urgentThreshold', 5);
  615 + $oKTConfig->setdefaultns('DiskUsage', 'urgentThreshold', 5);
615 616  
616 617 $res = $this->readConfig();
617 618 if (PEAR::isError($res)) { return $res; }
... ...