Peter M. Groen / knowledgetree

Commit eb91c8cf53283ccc1c8add4c5ddaac0c47e6da41

Authored by Conrad Vermeulen
1 parent 9205a940

KTS-1687 

"Double quote to single quote conversion"
Fixed.
Reviewed by: Kevin Fourie

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6216 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 59 additions and 59 deletions
config/dmsDefaults.php
  View file @eb91c8c
... ... @@ -86,7 +86,7 @@ class KTInit {
86 86 if (!is_numeric($logLevel)) {
87 87 $logLevel = @constant($logLevel);
88 88 if (is_null($logLevel)) {
89   - $logLevel = @constant("ERROR");
  89 + $logLevel = @constant('ERROR');
90 90 }
91 91 }
92 92 $default->log = new KTLegacyLog($oKTConfig->get('urls/logDirectory'), $logLevel);
... ... @@ -96,14 +96,14 @@ class KTInit {
96 96 // returns only in checkup
97 97 return $res;
98 98 }
99   - $default->queryLog = new KTLegacyLog($oKTConfig->get('urls/logDirectory'), $logLevel, "query");
  99 + $default->queryLog = new KTLegacyLog($oKTConfig->get('urls/logDirectory'), $logLevel, 'query');
100 100 $res = $default->queryLog->initialiseLogFile();
101 101 if (PEAR::isError($res)) {
102 102 $this->handleInitError($res);
103 103 // returns only in checkup
104 104 return $res;
105 105 }
106   - $default->timerLog = new KTLegacyLog($oKTConfig->get('urls/logDirectory'), $logLevel, "timer");
  106 + $default->timerLog = new KTLegacyLog($oKTConfig->get('urls/logDirectory'), $logLevel, 'timer');
107 107 $res = $default->timerLog->initialiseLogFile();
108 108 if (PEAR::isError($res)) {
109 109 $this->handleInitError($res);
... ... @@ -111,7 +111,7 @@ class KTInit {
111 111 return $res;
112 112 }
113 113  
114   - require_once("Log.php");
  114 + require_once('Log.php');
115 115 $default->phpErrorLog =& Log::factory('composite');
116 116  
117 117 if ($default->phpErrorLogFile) {
... ... @@ -133,7 +133,7 @@ class KTInit {
133 133 */
134 134 function setupI18n () {
135 135 require_once(KT_LIB_DIR . '/i18n/i18nutil.inc.php');
136   - require_once("HTTP.php");
  136 + require_once('HTTP.php');
137 137 global $default;
138 138 $language = KTUtil::arrayGet($_COOKIE, 'kt_language');
139 139 if ($language) {
... ... @@ -146,7 +146,7 @@ class KTInit {
146 146 function setupDB () {
147 147 global $default;
148 148  
149   - require_once("DB.php");
  149 + require_once('DB.php');
150 150  
151 151 // DBCompat allows phplib API compatibility
152 152 require_once(KT_LIB_DIR . '/database/dbcompat.inc');
... ... @@ -233,7 +233,7 @@ class KTInit {
233 233 // {{{ setupServerVariables
234 234 function setupServerVariables() {
235 235 $oKTConfig =& KTConfig::getSingleton();
236   - $bPathInfoSupport = $oKTConfig->get("KnowledgeTree/pathInfoSupport");
  236 + $bPathInfoSupport = $oKTConfig->get('KnowledgeTree/pathInfoSupport');
237 237 if ($bPathInfoSupport) {
238 238 // KTS-21: Some environments (FastCGI only?) don't set PATH_INFO
239 239 // correctly, but do set ORIG_PATH_INFO.
... ... @@ -241,12 +241,12 @@ class KTInit {
241 241 $orig_path_info = KTUtil::arrayGet($_SERVER, 'ORIG_PATH_INFO');
242 242 if (empty($path_info) && !empty($orig_path_info)) {
243 243 $_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
244   - $_SERVER["PHP_SELF"] .= $_SERVER['PATH_INFO'];
  244 + $_SERVER['PHP_SELF'] .= $_SERVER['PATH_INFO'];
245 245 }
246 246 $env_path_info = KTUtil::arrayGet($_SERVER, 'REDIRECT_kt_path_info');
247 247 if (empty($path_info) && !empty($env_path_info)) {
248 248 $_SERVER['PATH_INFO'] = $env_path_info;
249   - $_SERVER["PHP_SELF"] .= $_SERVER['PATH_INFO'];
  249 + $_SERVER['PHP_SELF'] .= $_SERVER['PATH_INFO'];
250 250 }
251 251  
252 252 // KTS-50: IIS (and probably most non-Apache web servers) don't
... ... @@ -264,8 +264,8 @@ class KTInit {
264 264  
265 265 $kt_path_info = KTUtil::arrayGet($_REQUEST, 'kt_path_info');
266 266 if (!empty($kt_path_info)) {
267   - $_SERVER["PHP_SELF"] .= "?kt_path_info=" . $kt_path_info;
268   - $_SERVER["PATH_INFO"] = $kt_path_info;
  267 + $_SERVER['PHP_SELF'] .= '?kt_path_info=' . $kt_path_info;
  268 + $_SERVER['PATH_INFO'] = $kt_path_info;
269 269 }
270 270  
271 271 $oConfig =& KTConfig::getSingleton();
... ... @@ -331,7 +331,7 @@ class KTInit {
331 331 function guessRootUrl() {
332 332 $urlpath = $_SERVER['SCRIPT_NAME'];
333 333 $bFound = false;
334   - $rootUrl = "";
  334 + $rootUrl = '';
335 335 while ($urlpath) {
336 336 if (file_exists(KT_DIR . '/' . $urlpath)) {
337 337 $bFound = true;
... ... @@ -350,7 +350,7 @@ class KTInit {
350 350 }
351 351 return $rootUrl;
352 352 }
353   - return "";
  353 + return '';
354 354 }
355 355 // }}}
356 356  
... ... @@ -359,16 +359,16 @@ class KTInit {
359 359 global $default;
360 360 $use_cache = false;
361 361 $store_cache = false;
362   - if (file_exists(KT_DIR . "/config/cache-path")) {
  362 + if (file_exists(KT_DIR . '/config/cache-path')) {
363 363 $store_cache = true;
364 364 $user = KTLegacyLog::running_user();
365 365 // handle vhosts.
366 366 $truehost = KTUtil::arrayGet($_SERVER, 'HTTP_HOST', 'default');
367 367 $trueport = KTUtil::arrayGet($_SERVER, 'SERVER_PORT', '80');
368   - $cache_file = trim(file_get_contents(KT_DIR . "/config/cache-path")) . '/configcache' . $user . $truehost . $trueport;
369   - if (!KTUtil::isAbsolutePath($cache_file)) { $cache_file = sprintf("%s/%s", KT_DIR, $cache_file); }
370   - $config_file = trim(file_get_contents(KT_DIR . "/config/config-path"));
371   - if (!KTUtil::isAbsolutePath($config_file)) { $config_file = sprintf("%s/%s", KT_DIR, $config_file); }
  368 + $cache_file = trim(file_get_contents(KT_DIR . '/config/cache-path')) . '/configcache' . $user . $truehost . $trueport;
  369 + if (!KTUtil::isAbsolutePath($cache_file)) { $cache_file = sprintf('%s/%s', KT_DIR, $cache_file); }
  370 + $config_file = trim(file_get_contents(KT_DIR . '/config/config-path'));
  371 + if (!KTUtil::isAbsolutePath($config_file)) { $config_file = sprintf('%s/%s', KT_DIR, $config_file); }
372 372  
373 373 $exists = file_exists($cache_file);
374 374 if ($exists) {
... ... @@ -394,45 +394,45 @@ class KTInit {
394 394 } else {
395 395 $oKTConfig =& KTConfig::getSingleton();
396 396  
397   - $oKTConfig->setdefaultns("KnowledgeTree", "fileSystemRoot", KT_DIR);
398   - $oKTConfig->setdefaultns("KnowledgeTree", "serverName", KTUtil::arrayGet($_SERVER, 'HTTP_HOST', 'localhost'));
399   - $oKTConfig->setdefaultns("KnowledgeTree", "sslEnabled", false);
  397 + $oKTConfig->setdefaultns('KnowledgeTree', 'fileSystemRoot', KT_DIR);
  398 + $oKTConfig->setdefaultns('KnowledgeTree', 'serverName', KTUtil::arrayGet($_SERVER, 'HTTP_HOST', 'localhost'));
  399 + $oKTConfig->setdefaultns('KnowledgeTree', 'sslEnabled', false);
400 400 if (array_key_exists('HTTPS', $_SERVER)) {
401 401 if (strtolower($_SERVER['HTTPS']) === 'on') {
402   - $oKTConfig->setdefaultns("KnowledgeTree", "sslEnabled", true);
  402 + $oKTConfig->setdefaultns('KnowledgeTree', 'sslEnabled', true);
403 403 }
404 404 }
405   - $oKTConfig->setdefaultns("KnowledgeTree", "useNewDashboard", true);
406   - $oKTConfig->setdefaultns("KnowledgeTree", "rootUrl", $this->guessRootUrl());
407   - $oKTConfig->setdefaultns("KnowledgeTree", "execSearchPath", $_SERVER['PATH']);
408   - $oKTConfig->setdefaultns("KnowledgeTree", "pathInfoSupport", false);
409   - $oKTConfig->setdefaultns("storage", "manager", 'KTOnDiskHashedStorageManager');
410   - $oKTConfig->setdefaultns("config", "useDatabaseConfiguration", false);
411   -
412   - $oKTConfig->setdefaultns("urls", "tmpDirectory", '${varDirectory}/tmp');
413   - $oKTConfig->setdefaultns("urls", 'stopwordsFile', '${fileSystemRoot}/config/stopwords.txt');
  405 + $oKTConfig->setdefaultns('KnowledgeTree', 'useNewDashboard', true);
  406 + $oKTConfig->setdefaultns('KnowledgeTree', 'rootUrl', $this->guessRootUrl());
  407 + $oKTConfig->setdefaultns('KnowledgeTree', 'execSearchPath', $_SERVER['PATH']);
  408 + $oKTConfig->setdefaultns('KnowledgeTree', 'pathInfoSupport', false);
  409 + $oKTConfig->setdefaultns('storage', 'manager', 'KTOnDiskHashedStorageManager');
  410 + $oKTConfig->setdefaultns('config', 'useDatabaseConfiguration', false);
  411 +
  412 + $oKTConfig->setdefaultns('urls', 'tmpDirectory', '${varDirectory}/tmp');
  413 + $oKTConfig->setdefaultns('urls', 'stopwordsFile', '${fileSystemRoot}/config/stopwords.txt');
414 414  
415   - $oKTConfig->setdefaultns("tweaks", "browseToUnitFolder", false);
416   - $oKTConfig->setdefaultns("tweaks", "genericMetaDataRequired", true);
417   - $oKTConfig->setdefaultns("tweaks", "phpErrorLogFile", false);
418   - $oKTConfig->setdefaultns("tweaks", "developmentWindowLog", false);
419   - $oKTConfig->setdefaultns("tweaks", "noisyBulkOperations", false);
  415 + $oKTConfig->setdefaultns('tweaks', 'browseToUnitFolder', false);
  416 + $oKTConfig->setdefaultns('tweaks', 'genericMetaDataRequired', true);
  417 + $oKTConfig->setdefaultns('tweaks', 'phpErrorLogFile', false);
  418 + $oKTConfig->setdefaultns('tweaks', 'developmentWindowLog', false);
  419 + $oKTConfig->setdefaultns('tweaks', 'noisyBulkOperations', false);
420 420  
421   - $oKTConfig->setdefaultns("user_prefs", "passwordLength", 6);
422   - $oKTConfig->setdefaultns("user_prefs", "restrictAdminPasswords", false);
  421 + $oKTConfig->setdefaultns('user_prefs', 'passwordLength', 6);
  422 + $oKTConfig->setdefaultns('user_prefs', 'restrictAdminPasswords', false);
423 423  
424   - $oKTConfig->setdefaultns("session", "allowAnonymousLogin", false);
  424 + $oKTConfig->setdefaultns('session', 'allowAnonymousLogin', false);
425 425  
426   - $oKTConfig->setdefaultns("ui", "ieGIF", true);
427   - $oKTConfig->setdefaultns("ui", "alwaysShowAll", false);
428   - $oKTConfig->setdefaultns("ui", "condensedAdminUI", false);
  426 + $oKTConfig->setdefaultns('ui', 'ieGIF', true);
  427 + $oKTConfig->setdefaultns('ui', 'alwaysShowAll', false);
  428 + $oKTConfig->setdefaultns('ui', 'condensedAdminUI', false);
429 429  
430   - $oKTConfig->setdefaultns(null, "logLevel", 'INFO');
431   - $oKTConfig->setdefaultns("import", "unzip", 'unzip');
432   - $oKTConfig->setdefaultns("cache", "cacheDirectory", '${varDirectory}/cache');
433   - $oKTConfig->setdefaultns("cache", "cacheEnabled", 'false');
434   - $oKTConfig->setdefaultns("cache", "proxyCacheDirectory", '${varDirectory}/proxies');
435   - $oKTConfig->setdefaultns("cache", "proxyCacheEnabled", 'true');
  430 + $oKTConfig->setdefaultns(null, 'logLevel', 'INFO');
  431 + $oKTConfig->setdefaultns('import', 'unzip', 'unzip');
  432 + $oKTConfig->setdefaultns('cache', 'cacheDirectory', '${varDirectory}/cache');
  433 + $oKTConfig->setdefaultns('cache', 'cacheEnabled', 'false');
  434 + $oKTConfig->setdefaultns('cache', 'proxyCacheDirectory', '${varDirectory}/proxies');
  435 + $oKTConfig->setdefaultns('cache', 'proxyCacheEnabled', 'true');
436 436  
437 437 $res = $this->readConfig();
438 438 if (PEAR::isError($res)) { return $res; }
... ... @@ -452,11 +452,11 @@ class KTInit {
452 452 function readConfig () {
453 453 global $default;
454 454 $oKTConfig =& KTConfig::getSingleton();
455   - $sConfigFile = trim(file_get_contents(KT_DIR . "/config/config-path"));
  455 + $sConfigFile = trim(file_get_contents(KT_DIR . '/config/config-path'));
456 456 if (KTUtil::isAbsolutePath($sConfigFile)) {
457 457 $res = $oKTConfig->loadFile($sConfigFile);
458 458 } else {
459   - $res = $oKTConfig->loadFile(sprintf("%s/%s", KT_DIR, $sConfigFile));
  459 + $res = $oKTConfig->loadFile(sprintf('%s/%s', KT_DIR, $sConfigFile));
460 460 }
461 461  
462 462 if (PEAR::isError($res)) {
... ... @@ -467,14 +467,14 @@ class KTInit {
467 467  
468 468 foreach (array_keys($oKTConfig->flat) as $k) {
469 469 $v = $oKTConfig->get($k);
470   - if ($v === "default") {
  470 + if ($v === 'default') {
471 471 continue;
472 472 }
473   - if ($v === "false") {
  473 + if ($v === 'false') {
474 474 $v = false;
475 475  
476 476 }
477   - if ($v === "true") {
  477 + if ($v === 'true') {
478 478 $v = true;
479 479 }
480 480 $default->$k = $v;
... ... @@ -485,12 +485,12 @@ class KTInit {
485 485 // {{{ initTesting
486 486 function initTesting() {
487 487 $oKTConfig =& KTConfig::getSingleton();
488   - $sConfigFile = trim(@file_get_contents(KT_DIR . "/config/test-config-path"));
  488 + $sConfigFile = trim(@file_get_contents(KT_DIR . '/config/test-config-path'));
489 489 if (empty($sConfigFile)) {
490 490 $sConfigFile = 'config/test.ini';
491 491 }
492 492 if (!KTUtil::isAbsolutePath($sConfigFile)) {
493   - $sConfigFile = sprintf("%s/%s", KT_DIR, $sConfigFile);
  493 + $sConfigFile = sprintf('%s/%s', KT_DIR, $sConfigFile);
494 494 }
495 495 if (!file_exists($sConfigFile)) {
496 496 $this->handleInitError(PEAR::raiseError('Test infrastructure not configured'));
... ... @@ -521,7 +521,7 @@ require_once(KT_LIB_DIR . '/util/ktutil.inc');
521 521  
522 522 require_once(KT_LIB_DIR . '/ktentity.inc');
523 523  
524   -require_once(KT_LIB_DIR . "/config/config.inc.php");
  524 +require_once(KT_LIB_DIR . '/config/config.inc.php');
525 525  
526 526 $KTInit->initConfig();
527 527 $KTInit->setupI18n();
... ... @@ -547,7 +547,7 @@ $GLOBALS['KTRootUrl'] = $oKTConfig->get('KnowledgeTree/rootUrl');
547 547 require_once(KT_LIB_DIR . '/database/lookup.inc');
548 548  
549 549 // table mapping entries
550   -include("tableMappings.inc");
  550 +include('tableMappings.inc');
551 551  
552 552 $default->systemVersion = trim(file_get_contents(KT_DIR . '/docs/VERSION.txt'));
553 553 $default->versionName = trim(file_get_contents(KT_DIR . '/docs/VERSION-NAME.txt'));
... ... @@ -556,7 +556,7 @@ $KTInit->cleanGlobals();
556 556 $KTInit->cleanMagicQuotes();
557 557  
558 558 // site map definition
559   -require_once(KT_DIR . "/config/siteMap.inc");
  559 +require_once(KT_DIR . '/config/siteMap.inc');
560 560  
561 561 require_once(KT_LIB_DIR . '/session/Session.inc');
562 562 require_once(KT_LIB_DIR . '/session/control.inc');
... ... @@ -572,7 +572,7 @@ if ($checkup !== true) {
572 572 require_once(KT_DIR . '/plugins/wintools/baobabkeyutil.inc.php');
573 573 $name = BaobabKeyUtil::getName();
574 574 if ($name) {
575   - $default->versionName = sprintf("%s %s", $default->versionName, $name);
  575 + $default->versionName = sprintf('%s %s', $default->versionName, $name);
576 576 }
577 577 }
578 578 }
... ...