[svn r10114] cleanup and use of $_configuration

skala
Patrick Cool 19 years ago
parent 969df7da39
commit 545ee1f37c
  1. 7
      main/auth/lost_password.lib.php
  2. 74
      main/install/configuration.dist.php

@ -1,5 +1,5 @@
<?php
// $Id: lost_password.lib.php 10082 2006-11-21 19:08:15Z pcool $
// $Id: lost_password.lib.php 10114 2006-11-22 15:32:30Z pcool $
/*
==============================================================================
Dokeos - elearning and course management software
@ -75,7 +75,6 @@ function send_password_to_user($user, $success_msg)
/*** By Olivier Cauberghe, UGent ***/
function handle_encrypted_password($user)
{
global $security_key;
global $charset;
global $_configuration;
$emailHeaders = get_email_headers(); // Email Headers
@ -93,8 +92,8 @@ function handle_encrypted_password($user)
//-----------------------------------------------------------------------------
function get_secret_word($add)
{
global $security_key;
return $secretword = md5($security_key.$add);
global $_configuration;
return $secretword = md5($_configuration['security_key'].$add);
}
//-----------------------------------------------------------------------------
function reset_password($secret, $id)

@ -53,74 +53,74 @@ 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 Dokeos database
$_configuration['main_database'] = '{DATABASE_MAIN}';
$_configuration['main_database'] = '{DATABASE_MAIN}';
// stats Dokeos database
$_configuration['statistics_database'] ='{DATABASE_STATS}';
$_configuration['statistics_database'] ='{DATABASE_STATS}';
// Scorm Dokeos database
$_configuration['scorm_database'] ='{DATABASE_SCORM}';
$_configuration['scorm_database'] ='{DATABASE_SCORM}';
// 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 Dokeos installation, example: http://www.mydokeos.com
$_configuration['root_web'] = '{ROOT_WEB}';
$_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 Dokeos installation, example: dokeos (this means dokeos is installed in /var/www/dokeos/
$_configuration['url_append'] = '{URL_APPEND_PATH}';
$_configuration['url_append'] = '{URL_APPEND_PATH}';
// Directory of the Dokeos 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;
$clarolineRepositorySys = $_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";
// change this to a place out of web if you can
$garbageRepositorySys = '{GARBAGE_DIR}';
$garbageRepositorySys = '{GARBAGE_DIR}';
// URL to your phpMyAdmin installation.
// If not empty, a link will be available in the Platform Administration
$phpMyAdminPath = '';
$phpMyAdminPath = '';
//============================================================================
// Login modules settings
@ -134,26 +134,26 @@ $phpMyAdminPath = '';
// Language settings
//============================================================================
// Available Languages : look at the "lang" directory
$platformLanguage = '{PLATFORM_LANGUAGE}';
$language = $platformLanguage;
$platformLanguage = '{PLATFORM_LANGUAGE}';
$language = $platformLanguage;
//============================================================================
// Misc. settings
//============================================================================
// Verbose backup
$verboseBackup = false;
$verboseBackup = false;
// security word for password recovery
$security_key = '{SECURITY_KEY}';
$_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;
$storeSessionInDb = false;
$openoffice_conf = array();
$openoffice_conf['javacommand'] = 'java';
$openoffice_conf['host'] = 'ns6077.ovh.net';
$openoffice_conf['port'] = '2002';
$openoffice_conf['ftpuser'] = '****';
$openoffice_conf['ftppasswd'] = '****';
$openoffice_conf = array();
$openoffice_conf['javacommand'] = 'java';
$openoffice_conf['host'] = 'ns6077.ovh.net';
$openoffice_conf['port'] = '2002';
$openoffice_conf['ftpuser'] = '****';
$openoffice_conf['ftppasswd'] = '****';
?>
Loading…
Cancel
Save