[svn r17526] Getting rid of the stupid IDE build-error because of non-quoted {} signs in template configuration file. Tested.

skala
Yannick Warnier 16 years ago
parent d8784b05f0
commit e51f2d5fc5
  1. 10
      main/install/configuration.dist.php
  2. 10
      main/install/install_upgrade.lib.php

@ -63,9 +63,9 @@ $_configuration['db_password'] = '{DATABASE_PASSWORD}';
// Database settings
//============================================================================
// Is tracking enabled?
$_configuration['tracking_enabled'] = {TRACKING_ENABLED};
$_configuration['tracking_enabled'] = TRACKING_ENABLED;
// Is single database enabled (DO NOT MODIFY THIS)
$_configuration['single_database'] = {SINGLE_DATABASE};
$_configuration['single_database'] = SINGLE_DATABASE;
// Prefix for course tables (IF NOT EMPTY, can be replaced by another prefix, else leave empty)
$_configuration['table_prefix'] = '{COURSE_TABLE_PREFIX}';
// Separator between database and table name (DO NOT MODIFY THIS)
@ -138,16 +138,16 @@ $_configuration['verbose_backup'] = false;
// security word for password recovery
$_configuration['security_key'] = '{SECURITY_KEY}';
// Settings for new and future features
$userPasswordCrypted = {ENCRYPT_PASSWORD};
$userPasswordCrypted = ENCRYPT_PASSWORD;
// You may have to restart your web server if you change this
$storeSessionInDb = false;
// Session lifetime
$_configuration['session_lifetime'] = {SESSION_LIFETIME};
$_configuration['session_lifetime'] = SESSION_LIFETIME;
// Activation for multi-url access
//$_configuration['multiple_access_urls'] = true;
// Version settings
$_configuration['dokeos_version'] = '{NEW_VERSION}';
$_configuration['dokeos_stable'] = {NEW_VERSION_STABLE};
$_configuration['dokeos_stable'] = NEW_VERSION_STABLE;
?>

@ -192,8 +192,8 @@ function write_dokeos_config_file($path)
$config['{DATABASE_HOST}'] = $dbHostForm;
$config['{DATABASE_USER}'] = $dbUsernameForm;
$config['{DATABASE_PASSWORD}'] = $dbPassForm;
$config['{TRACKING_ENABLED}'] = trueFalse($enableTrackingForm);
$config['{SINGLE_DATABASE}'] = trueFalse($singleDbForm);
$config['TRACKING_ENABLED'] = trueFalse($enableTrackingForm);
$config['SINGLE_DATABASE'] = trueFalse($singleDbForm);
$config['{COURSE_TABLE_PREFIX}'] = ($singleDbForm ? 'crs_' : '');
$config['{DATABASE_GLUE}'] = ($singleDbForm ? '_' : '`.`');
$config['{DATABASE_PREFIX}'] = $dbPrefixForm;
@ -207,10 +207,10 @@ function write_dokeos_config_file($path)
$config['{GARBAGE_DIR}'] = str_replace("\\", '/', $garbageDir);
$config['{PLATFORM_LANGUAGE}'] = $languageForm;
$config['{SECURITY_KEY}'] = md5(uniqid(rand().time()));
$config['{ENCRYPT_PASSWORD}'] = trueFalse($encryptPassForm);
$config['{SESSION_LIFETIME}'] = $session_lifetime;
$config['ENCRYPT_PASSWORD'] = trueFalse($encryptPassForm);
$config['SESSION_LIFETIME'] = $session_lifetime;
$config['{NEW_VERSION}'] = $new_version;
$config['{NEW_VERSION_STABLE}'] = trueFalse($new_version_stable);
$config['NEW_VERSION_STABLE'] = trueFalse($new_version_stable);
foreach ($config as $key => $value)
{
$content = str_replace($key, $value, $content);

Loading…
Cancel
Save