chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed clarolineRepositorySys from config and global

Browse Source
skala
Yannick Warnier 14 years ago
parent 76507f0b7d
commit 64caf5be04
2 changed files with 58 additions and 45 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      main/inc/global.inc.php
  2. 101
      main/install/configuration.dist.php

2
main/inc/global.inc.php
Unescape View File

@ -367,7 +367,7 @@ if (api_get_setting('server_type') == 'test') {
$_SERVER = array();
foreach ($HTTP_SERVER_VARS as $key => $val) {
$_SERVER[$key] = $HTTP_SERVER_VARS[$key];
if (!isset($_SESSION[$key]) && $key != 'includePath' && $key != 'rootSys' && $key!= 'clarolineRepositorySys' && $key!= 'lang_path' && $key!= 'extAuthSource' && $key!= 'thisAuthSource' && $key!= 'main_configuration_file_path' && $key!= 'phpDigIncCn' && $key!= 'drs') {
if (!isset($_SESSION[$key]) && $key != 'includePath' && $key != 'rootSys' && $key!= 'lang_path' && $key!= 'extAuthSource' && $key!= 'thisAuthSource' && $key!= 'main_configuration_file_path' && $key!= 'phpDigIncCn' && $key!= 'drs') {
$GLOBALS[$key]=$HTTP_SERVER_VARS[$key];
}
}

101
main/install/configuration.dist.php
Unescape View File

@ -1,16 +1,16 @@
<?php
# Chamilo version {NEW_VERSION}
# File generated by /install/index.php script - {DATE_GENERATED}
// Chamilo version {NEW_VERSION}
// File generated by /install/index.php script - {DATE_GENERATED}
/* For licensing terms, see /license.txt */
/*
==============================================================================
Configuration of virtual campus
Virtual campus configuration
This file contains a list of variables that can be modified by the campus
site administrator. Pay attention when changing these variables, some changes
can cause Chamilo to stop working.
site's server administrator. Pay attention when changing these variables,
some changes may cause Chamilo to stop working.
If you changed some settings and want to restore them, please have a look at
configuration.php. That file is an exact copy of the config file at
configuration.dist.php. That file is an exact copy of the config file at
install time.
==============================================================================
*/
@ -32,71 +32,69 @@ install time.
// MYSQL connection settings
//============================================================================
// Your MySQL server
$_configuration['db_host'] = '{DATABASE_HOST}';
$_configuration['db_host'] = '{DATABASE_HOST}';
// Your MySQL username
$_configuration['db_user'] = '{DATABASE_USER}';
$_configuration['db_user'] = '{DATABASE_USER}';
// Your MySQL password
$_configuration['db_password'] = '{DATABASE_PASSWORD}';
$_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}';
$_configuration['table_prefix'] = '{COURSE_TABLE_PREFIX}';
// Separator between database and table name (DO NOT MODIFY THIS)
$_configuration['db_glue'] = '{DATABASE_GLUE}';
$_configuration['db_glue'] = '{DATABASE_GLUE}';
// prefix all created bases (for courses) with this string
$_configuration['db_prefix'] = '{DATABASE_PREFIX}';
$_configuration['db_prefix'] = '{DATABASE_PREFIX}';
// main Chamilo database
$_configuration['main_database'] = '{DATABASE_MAIN}';
$_configuration['main_database'] = '{DATABASE_MAIN}';
// stats Chamilo database
$_configuration['statistics_database'] ='{DATABASE_STATS}';
// Scorm Chamilo database
$_configuration['scorm_database'] ='{DATABASE_SCORM}';
$_configuration['statistics_database'] ='{DATABASE_STATS}';
// User Personal Database (where all the personal stuff of the user is stored
// (personal agenda items, course sorting)
$_configuration['user_personal_database'] ='{DATABASE_PERSONAL}';
$_configuration['user_personal_database']='{DATABASE_PERSONAL}';
//============================================================================
// Directory settings
//============================================================================
// URL to the root of your Chamilo installation, example: http://www.mychamilo.com/
$_configuration['root_web'] = '{ROOT_WEB}';
// URL to the root of your Chamilo installation, e.g.: http://www.mychamilo.com/
$_configuration['root_web'] = '{ROOT_WEB}';
// Path to the webroot of system, example: /var/www/
$_configuration['root_sys'] = '{ROOT_SYS}';
$_configuration['root_sys'] = '{ROOT_SYS}';
// Path from your WWW-root to the root of your Chamilo installation, example: chamilo (this means chamilo is installed in /var/www/chamilo/
$_configuration['url_append'] = '{URL_APPEND_PATH}';
$_configuration['url_append'] = '{URL_APPEND_PATH}';
// Directory of the Chamilo code. You could change this but it is not advised since this has not been tested yet.
$_configuration['code_append'] = "main/";
$_configuration['code_append'] = "main/";
// Directory to store all course-related files. You could change this but it is not advised since this has not been tested yet.
$_configuration['course_folder'] = "courses/";
$_configuration['course_folder'] = "courses/";
// @todo this shouldn't be here.
// Directory of the admin-area
$rootAdminAppend = "admin/";
$rootAdminAppend = "admin/";
// Do not change the following values
// @todo should be moved to api_get_path
$clarolineRepositorySys = $_configuration['root_sys'].$_configuration['code_append'];
$clarolineRepositoryWeb = $_configuration['root_web'].$_configuration['code_append'];
$rootAdminSys = $clarolineRepositorySys.$rootAdminAppend;
$rootAdminWeb = $clarolineRepositoryWeb.$rootAdminAppend;
$_configuration['sys_code_path'] = $_configuration['root_sys'].$_configuration['code_append'];
$clarolineRepositoryWeb = $_configuration['root_web'].$_configuration['code_append'];
$rootAdminSys = $clarolineRepositorySys.$rootAdminAppend;
$rootAdminWeb = $clarolineRepositoryWeb.$rootAdminAppend;
// directory to store archived courses
$archiveDirName = "archive";
$archiveDirName = "archive";
// URL to your phpMyAdmin installation.
// If not empty, a link will be available in the Platform Administration
$phpMyAdminPath = '';
$phpMyAdminPath = '';
//============================================================================
// Login modules settings
@ -110,28 +108,43 @@ $phpMyAdminPath = '';
// $extAuthSource["external_logininfo"]["newUser"] = $_configuration['root_sys'].$_configuration['code_append']."auth/external_logininfo/newUser.php";
// $extAuthSource["external_logininfo"]["updateUser"] = $_configuration['root_sys'].$_configuration['code_append']."auth/external_logininfo/updateUser.php";
//============================================================================
// Hosting settings - Allows you to set limits to the Chamilo portal when
// hosting it for a third party. These settings can be overwritten by an
// optionally-loaded extension file with only the settings (no comments).
//============================================================================
// Set a maximum number of users. Default (0) = no limit
$_configuration['hosting_limit_users'] = 0;
// Set a maximum number of teachers. Default (0) = no limit
$_configuration['hosting_limit_teachers'] = 0;
// Set a maximum number of courses. Default (0) = no limit
$_configuration['hosting_limit_courses'] = 0;
// Set a maximum number of sessions. Default (0) = no limit
$_configuration['hosting_limit_sessions'] = 0;
// Set a maximum disk space used, in MB (set to 1024 for 1GB, 5120 for 5GB).
// Default (0) = no limit
$_configuration['hosting_limit_disk_space'] = 0;
//============================================================================
// Misc. settings
//============================================================================
// Verbose backup
$_configuration['verbose_backup'] = false;
$_configuration['verbose_backup'] = false;
// security word for password recovery
$_configuration['security_key'] = '{SECURITY_KEY}';
$_configuration['security_key'] = '{SECURITY_KEY}';
// Hash function method
$userPasswordCrypted = '{ENCRYPT_PASSWORD}';
$userPasswordCrypted = '{ENCRYPT_PASSWORD}';
// You may have to restart your web server if you change this
$storeSessionInDb = false;
$storeSessionInDb = false;
// Session lifetime
$_configuration['session_lifetime'] = SESSION_LIFETIME;
$_configuration['session_lifetime'] = SESSION_LIFETIME;
// Activation for multi-url access
//$_configuration['multiple_access_urls'] = true;
$_configuration['software_name'] = 'Chamilo';
$_configuration['software_url'] = 'http://www.chamilo.org/';
$_configuration['software_name'] = 'Chamilo';
$_configuration['software_url'] = 'http://www.chamilo.org/';
//Deny the elimination of users
$_configuration['deny_delete_users'] = false;
$_configuration['deny_delete_users'] = false;
// Version settings
$_configuration['system_version'] = '{NEW_VERSION}';
$_configuration['system_stable'] = NEW_VERSION_STABLE;
$_configuration['system_version'] = '{NEW_VERSION}';
$_configuration['system_stable'] = NEW_VERSION_STABLE;
?>

Write Preview
Loading…
Cancel
Save