[svn r10082] cleanup $_configuration

19 years ago · 8221774681
parent e25d6513a4
commit 8221774681
67 changed files with 462 additions and 433 deletions
--- a/index.php
+++ b/index.php
@ -108,8 +108,8 @@ if ($_GET['logout'])
 	api_sql_query($s_sql_update_logout_date);
 	

-	//LoginDelete(".$_user['user_id'].", $statsDbName);
-	LoginDelete($_GET["uid"], $statsDbName);
+	//LoginDelete(".$_user['user_id'].", $_configuration['statistics_database']);
+	LoginDelete($_GET["uid"], $_configuration['statistics_database']);
 	api_session_destroy();

 	header("Location: index.php$query_string");
--- a/main/admin/configure_homepage.php
+++ b/main/admin/configure_homepage.php
@ -1,4 +1,4 @@
-<?php // $Id: configure_homepage.php 9246 2006-09-25 13:24:53Z bmol $
+<?php // $Id: configure_homepage.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@ -176,7 +176,7 @@ if(!empty($action))

 				if(empty($link_url))
 				{
-					$link_url=$rootWeb.'index.php?include='.urlencode($filename);
+					$link_url=$_configuration['root_web'].'index.php?include='.urlencode($filename);

 					if(!file_exists($rootSys.'home/'.$filename))
 					{
@ -327,7 +327,7 @@ if(!empty($action))

 				list($link_url)=explode('"',$enreg[sizeof($enreg)-1]);

-				if(strstr($link_url,$rootWeb) && strstr($link_url,'?include='))
+				if(strstr($link_url,$_configuration['root_web']) && strstr($link_url,'?include='))
 				{
 					$link_url=explode('?include=',$link_url);

@ -335,7 +335,7 @@ if(!empty($action))

 					if(!strstr($filename,'/') && strstr($filename,'.html'))
 					{
-						$link_html=file($rootWeb.'home/'.$filename);
+						$link_html=file($_configuration['root_web'].'home/'.$filename);

 						$link_html=implode('',$link_html);

@ -674,7 +674,7 @@ else
 			$edit_link='<a href="'.$_SERVER['PHP_SELF'].'?action=edit_link&amp;link_index='.$key.'"><img src="../img/edit.gif" border="0" style="margin-top: 2px;" title="'.htmlentities(get_lang('Modify')).'"/></a>';
 			$delete_link='<a href="'.$_SERVER['PHP_SELF'].'?action=delete_link&amp;link_index='.$key.'" onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang('ConfirmYourChoice'))).'\')) return false;"><img src="../img/delete.gif" border="0" style="margin-top: 2px;" title="'.htmlentities(get_lang('Delete')).'"/></a>';

-			echo str_replace(array('href="'.$rootWeb.'index.php?include=','</li>'),array('href="'.api_get_path(WEB_CODE_PATH).'admin/'.basename($_SERVER['PHP_SELF']).'?action=open_link&link=','<br />'.$edit_link.' '.$delete_link.'</li>'),$enreg);
+			echo str_replace(array('href="'.$_configuration['root_web'].'index.php?include=','</li>'),array('href="'.api_get_path(WEB_CODE_PATH).'admin/'.basename($_SERVER['PHP_SELF']).'?action=open_link&link=','<br />'.$edit_link.' '.$delete_link.'</li>'),$enreg);
 		}
 	}
 ?>
--- a/main/admin/course_add.php
+++ b/main/admin/course_add.php
@ -1,5 +1,5 @@
 <?php
-// $Id: course_add.php 9403 2006-10-10 10:21:34Z bmol $
+// $Id: course_add.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@ -118,7 +118,7 @@ if( $form->validate())
 	{
 		$department_url = 'http://'.$department_url;
 	}
-	$keys = define_course_keys($code, "", $dbNamePrefix);
+	$keys = define_course_keys($code, "", $_configuration['db_prefix']);
 	if (sizeof($keys))
 	{
 		$currentCourseCode = $keys["currentCourseCode"];
--- a/main/admin/course_import.php
+++ b/main/admin/course_import.php
@ -105,10 +105,10 @@ function validate_data($courses)
 */
 function save_data($courses)
 {
-	global $dbNamePrefix,$firstExpirationDelay;
+	global $_configuration, $firstExpirationDelay;
 	foreach($courses as $index => $course)
 	{
-		$keys = define_course_keys($course['Code'], "", $dbNamePrefix);
+		$keys = define_course_keys($course['Code'], "", $_configuration['db_prefix']);
 		$user_table = Database::get_main_table(MAIN_USER_TABLE);
 		$sql = "SELECT user_id, CONCAT(lastname,' ',firstname) AS name FROM $user_table WHERE username = '".mysql_real_escape_string($course['Teacher'])."'";
 		$res = api_sql_query($sql,__FILE__,__LINE__);
--- a/main/admin/index.php
+++ b/main/admin/index.php
@ -1,4 +1,4 @@
-<?php // $Id: index.php 9797 2006-10-26 06:47:10Z pcool $
+<?php // $Id: index.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@ -183,7 +183,7 @@ else
 <ul>
  <li><a href="http://www.dokeos.com/"><?php echo get_lang('DokeosHomepage'); ?></a></li>
  <li><a href="http://www.dokeos.com/forum/"><?php echo get_lang('DokeosForum'); ?></a></li>
-  <li><a href="http://www.dokeos.com/community_add_portal.php?url=<?php echo $rootWeb; ?>&amp;name=<?php echo urlencode(get_setting('siteName'));?>&amp;organisation=<?php echo urlencode(get_setting('InstitutionUrl'));?>&amp;manager=<?php echo urlencode(get_setting('administratorSurname')." ".get_setting('administratorName'));?>&amp;manageremail=<?php echo urlencode(get_setting('emailAdministrator'));?>"><?php echo get_lang('RegisterYourPortal'); ?></a></li>
+  <li><a href="http://www.dokeos.com/community_add_portal.php?url=<?php echo $_configuration['root_web']; ?>&amp;name=<?php echo urlencode(get_setting('siteName'));?>&amp;organisation=<?php echo urlencode(get_setting('InstitutionUrl'));?>&amp;manager=<?php echo urlencode(get_setting('administratorSurname')." ".get_setting('administratorName'));?>&amp;manageremail=<?php echo urlencode(get_setting('emailAdministrator'));?>"><?php echo get_lang('RegisterYourPortal'); ?></a></li>
  <li><a href="http://www.dokeos.com/extensions/"><?php echo get_lang('DokeosExtensions'); ?></a></li>
  <li>
  <?php
--- a/main/admin/user_add.php
+++ b/main/admin/user_add.php
@ -1,4 +1,4 @@
-<?php // $Id: user_add.php 9972 2006-11-14 14:44:37Z pcool $
+<?php // $Id: user_add.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@ -203,7 +203,7 @@ if( $form->validate())
 		$emailsubject = '['.get_setting('siteName').'] '.get_lang('YourReg').' '.get_setting('siteName');
 		$emailheaders = 'From: '.get_setting('administratorName').' '.get_setting('administratorSurname').' <'.get_setting('emailAdministrator').">\n";
 		$emailheaders .= 'Reply-To: '.get_setting('emailAdministrator');
-		$emailbody=get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ". get_setting('siteName') ." ".get_lang('Settings')." ". $username ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .get_lang('Address') ." ". get_setting('siteName') ." ". get_lang('Is') ." : ". $rootWeb ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".get_setting('administratorName')." ".get_setting('administratorSurname')."\n". get_lang('Manager'). " ".get_setting('siteName')."\nT. ".get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".get_setting('emailAdministrator');
+		$emailbody=get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ". get_setting('siteName') ." ".get_lang('Settings')." ". $username ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .get_lang('Address') ." ". get_setting('siteName') ." ". get_lang('Is') ." : ". $_configuration['root_web'] ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".get_setting('administratorName')." ".get_setting('administratorSurname')."\n". get_lang('Manager'). " ".get_setting('siteName')."\nT. ".get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".get_setting('emailAdministrator');
 		@api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders);
 	}
 	if(isset($user['submit_plus']))
--- a/main/admin/user_edit.php
+++ b/main/admin/user_edit.php
@ -1,4 +1,4 @@
-<?php // $Id: user_edit.php 9972 2006-11-14 14:44:37Z pcool $
+<?php // $Id: user_edit.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@ -278,7 +278,7 @@ if( $form->validate())
 		{
 			$emaibody .= "\n".get_lang('Pass')." : ".stripslashes($password);
 		}
-		$emailbody .= "\n\n" .get_lang('Address') ." ". get_setting('siteName') ." ". get_lang('Is') ." : ". $rootWeb ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".get_setting('administratorName')." ".get_setting('administratorSurname')."\n". get_lang('Manager'). " ".get_setting('siteName')."\nT. ".get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".get_setting('emailAdministrator');
+		$emailbody .= "\n\n" .get_lang('Address') ." ". get_setting('siteName') ." ". get_lang('Is') ." : ". $_configuration['root_web'] ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".get_setting('administratorName')." ".get_setting('administratorSurname')."\n". get_lang('Manager'). " ".get_setting('siteName')."\nT. ".get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".get_setting('emailAdministrator');
 		@api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders);
 	}
 	header('Location: user_list.php?action=show_message&message='.urlencode(get_lang('UserUpdated')));
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
@ -1,6 +1,6 @@
 <?php

-// $Id: user_list.php 10062 2006-11-20 19:37:38Z pcool $
+// $Id: user_list.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@ -123,7 +123,7 @@ function login_user($user_id)
 			$is_platformAdmin = (bool) (!is_null($user_data['is_admin']));
 			$is_allowedCreateCourse = (bool) ($user_data['status'] == 1);
 			
-			LoginDelete($_SESSION["_user"]["user_id"], $statsDbName);
+			LoginDelete($_SESSION["_user"]["user_id"], $_configuration['statistics_database']);
 			
 			//bug: this only works if $_user is global
 			api_session_register('_user');
--- a/main/auth/courses.php
+++ b/main/auth/courses.php
@ -1,4 +1,4 @@
-<?php // $Id: courses.php 9983 2006-11-15 00:21:16Z pcool $
+<?php // $Id: courses.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@ -491,9 +491,9 @@ function search_courses($search_term)
 */
 function delete_course_category($id)
 {
-	global $_user, $user_personal_database;
+	global $_user, $_configuration;

-	$DATABASE_USER_TOOLS = $user_personal_database;
+	$DATABASE_USER_TOOLS = $_configuration['user_personal_database'];
 	$TABLE_USER_COURSE_CATEGORY = $DATABASE_USER_TOOLS."`.`user_course_category";
 	$TABLECOURSUSER=Database::get_main_table(MAIN_COURSE_USER_TABLE);

@ -513,9 +513,9 @@ function delete_course_category($id)
 */
 function store_course_category()
 {
-	global $_user, $user_personal_database;
+	global $_user, $_configuration;

-	$DATABASE_USER_TOOLS = $user_personal_database;
+	$DATABASE_USER_TOOLS = $_configuration['user_personal_database'];
 	$TABLE_USER_COURSE_CATEGORY = $DATABASE_USER_TOOLS."`.`user_course_category";

 	// step 1: we determine the max value of the user defined course categories
@ -538,7 +538,7 @@ function store_course_category()
 */
 function display_create_course_category_form()
 {
-	global $_user, $user_personal_database;
+	global $_user, $_configuration;

 	echo "<form name=\"create_course_category\" method=\"post\" action=\"".$_SERVER['PHP_SELF']."?action=sortmycourses\">\n";
 	echo "<input type=\"text\" name=\"title_course_category\" />\n";
@ -546,7 +546,7 @@ function display_create_course_category_form()
 	echo "</form>\n";

 	echo get_lang("ExistingCourseCategories");
-	$DATABASE_USER_TOOLS = $user_personal_database;
+	$DATABASE_USER_TOOLS = $_configuration['user_personal_database'];
 	$TABLE_USER_COURSE_CATEGORY = $DATABASE_USER_TOOLS."`.`user_course_category";
 	$sql="SELECT * FROM `$TABLE_USER_COURSE_CATEGORY` WHERE user_id='".$_user['user_id']."'";
 	$result=api_sql_query($sql, __LINE__, __FILE__);
@ -680,7 +680,7 @@ function move_category($direction, $category2move)

 function display_courses($user_id, $show_course_icons, $user_courses)
 {
-	global $_user, $user_personal_database;
+	global $_user, $_configuration;

 	echo "<table cellpadding=\"4\">\n";

@ -693,7 +693,7 @@ function display_courses($user_id, $show_course_icons, $user_courses)
 	display_courses_in_category(0,'true');

 	// Step 1: we get all the categories of the user
-	$DATABASE_USER_TOOLS = $user_personal_database;
+	$DATABASE_USER_TOOLS = $_configuration['user_personal_database'];
 	$TABLE_USER_COURSE_CATEGORY = $DATABASE_USER_TOOLS."`.`user_course_category";
 	$sql="SELECT * FROM `$TABLE_USER_COURSE_CATEGORY` WHERE user_id='".$_user['user_id']."' ORDER BY sort ASC";
 	$result=api_sql_query($sql);
@ -804,9 +804,9 @@ function display_courses_in_category($user_category_id, $showicons)
 */
 function get_user_course_category($id)
 {
-	global $_user, $user_personal_database;
+	global $_user, $_configuration;

-	$DATABASE_USER_TOOLS = $user_personal_database;
+	$DATABASE_USER_TOOLS = $_configuration['user_personal_database'];
 	$TABLE_USER_COURSE_CATEGORY = $DATABASE_USER_TOOLS."`.`user_course_category";

 	$sql="SELECT * FROM `".$TABLE_USER_COURSE_CATEGORY."` WHERE user_id='".$_user['user_id']."' AND id='$id'";
@ -964,9 +964,9 @@ function display_category_icons($current_category, $all_user_categories)
 */
 function display_change_course_category_form($edit_course)
 {
-	global $_user, $user_personal_database;
+	global $_user, $_configuration;

-	$DATABASE_USER_TOOLS = $user_personal_database;
+	$DATABASE_USER_TOOLS = $_configuration['user_personal_database'];
 	$TABLE_USER_COURSE_CATEGORY = $DATABASE_USER_TOOLS."`.`user_course_category";
 	$sql="SELECT * FROM `$TABLE_USER_COURSE_CATEGORY` WHERE user_id='".$_user['user_id']."'";
 	$result=api_sql_query($sql);
@ -1097,9 +1097,9 @@ function display_edit_course_category_form($edit_course_category)
 */
 function store_edit_course_category()
 {
-	global $_user, $user_personal_database;
+	global $_user, $_configuration;

-	$DATABASE_USER_TOOLS = $user_personal_database;
+	$DATABASE_USER_TOOLS = $_configuration['user_personal_database'];
 	$TABLE_USER_COURSE_CATEGORY = $DATABASE_USER_TOOLS."`.`user_course_category";

 	$sql_update="UPDATE `$TABLE_USER_COURSE_CATEGORY` SET title='".htmlentities($_POST['title_course_category'])."' WHERE id='".(int)$_POST['edit_course_category']."'";
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@ -1,5 +1,5 @@
 <?php
-// $Id: inscription.php 9983 2006-11-15 00:21:16Z pcool $
+// $Id: inscription.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@ -199,7 +199,7 @@ if ($form->validate())

 			// The body can be as long as you wish, and any combination of text and variables

-			$emailbody = get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ".get_setting('siteName')." ".get_lang('Settings')." ".$values['username']."\n".get_lang('Pass')." : ".stripslashes($values['pass1'])."\n\n".get_lang('Address')." ".get_setting('siteName')." ".get_lang('Is')." : ".$rootWeb."\n\n".get_lang('Problem')."\n\n".get_lang('Formula').",\n\n".get_setting('administratorName')." ".get_setting('administratorSurname')."\n".get_lang('Manager')." ".get_setting('siteName')."\nT. ".get_setting('administratorTelephone')."\n".get_lang('Email')." : ".get_setting('emailAdministrator');
+			$emailbody = get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ".get_setting('siteName')." ".get_lang('Settings')." ".$values['username']."\n".get_lang('Pass')." : ".stripslashes($values['pass1'])."\n\n".get_lang('Address')." ".get_setting('siteName')." ".get_lang('Is')." : ".$_configuration['root_web']."\n\n".get_lang('Problem')."\n\n".get_lang('Formula').",\n\n".get_setting('administratorName')." ".get_setting('administratorSurname')."\n".get_lang('Manager')." ".get_setting('siteName')."\nT. ".get_setting('administratorTelephone')."\n".get_lang('Email')." : ".get_setting('emailAdministrator');

 			// Here we are forming one large header line
 			// Every header must be followed by a \n except the last
--- a/main/auth/inscription_second.php
+++ b/main/auth/inscription_second.php
@ -1,4 +1,4 @@
-<?php // $Id: inscription_second.php 9983 2006-11-15 00:21:16Z pcool $ 
+<?php // $Id: inscription_second.php 10082 2006-11-21 19:08:15Z pcool $ 
 /*
 ============================================================================== 
 	Dokeos - elearning and course management software
@ -231,7 +231,7 @@ if ($_user['user_id'])

 		// The body can be as long as you wish, and any combination of text and variables

-		$emailbody=get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ". get_setting('siteName') ." ".get_lang('Settings')." ". $uname ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .get_lang('Address') ." ". api_get_setting('siteName') ." ". get_lang('Is') ." : ". $rootWeb ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".get_setting('administratorName')." ".get_setting('administratorSurname')."\n". get_lang('Manager'). " ".get_setting('siteName')."\nT. ".get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".get_setting('emailAdministrator');
+		$emailbody=get_lang('Dear')." ".stripslashes("$firstname $lastname").",\n\n".get_lang('YouAreReg')." ". get_setting('siteName') ." ".get_lang('Settings')." ". $uname ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .get_lang('Address') ." ". api_get_setting('siteName') ." ". get_lang('Is') ." : ". $_configuration['root_web'] ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".get_setting('administratorName')." ".get_setting('administratorSurname')."\n". get_lang('Manager'). " ".get_setting('siteName')."\nT. ".get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".get_setting('emailAdministrator');

 		// Here we are forming one large header line
 		// Every header must be followed by a \n except the last
--- a/main/auth/lost_password.lib.php
+++ b/main/auth/lost_password.lib.php
@ -1,5 +1,5 @@
 <?php
-// $Id: lost_password.lib.php 9973 2006-11-14 14:53:22Z pcool $ 
+// $Id: lost_password.lib.php 10082 2006-11-21 19:08:15Z pcool $ 
 /*
 ============================================================================== 
 	Dokeos - elearning and course management software
@ -40,12 +40,12 @@ function get_email_headers()
 //-----------------------------------------------------------------------------
 function get_user_account_list($user, $reset = false)
 {
-	global $rootWeb;
+	global $_configuration;
 	foreach ($user as $thisUser)
 	{
 		$secretword = get_secret_word($thisUser["email"]);
 		if ($reset)
-			$reset_link = "\tReset link : $rootWeb"."main/auth/lostPassword.php?reset=$secretword&id=$thisUser[uid]";
+			$reset_link = "\tReset link : $_configuration['root_web']"."main/auth/lostPassword.php?reset=$secretword&id=$thisUser[uid]";
 		else
 			$reset_link = "\t".get_lang('Pass')." : $thisUser[password]";
 		$userAccountList[] = $thisUser["firstName"]." ".$thisUser["lastName"]."\n\n"."\t".get_lang('Username')." : ".$thisUser["loginName"]."\n"."$reset_link\n\n";
@ -59,11 +59,11 @@ function get_user_account_list($user, $reset = false)
 function send_password_to_user($user, $success_msg)
 {
 	global $charset;
-	global $rootWeb;
+	global $_configuration;
 	$emailHeaders = get_email_headers(); // Email Headers
 	$emailSubject = "[".get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
 	$userAccountList = get_user_account_list($user); // BODY
-	$emailBody = get_lang('YourAccountParam')." $rootWeb\n\n$userAccountList";
+	$emailBody = get_lang('YourAccountParam')." ".$_configuration['root_web']."\n\n$userAccountList";
 	// SEND MESSAGE
 	$emailTo = $user[0]["email"];
 	if (@ api_send_mail($emailTo, $emailSubject, $emailBody, $emailHeaders))
@ -77,13 +77,13 @@ function handle_encrypted_password($user)
 {
 	global $security_key;
 	global $charset;
-	global $rootWeb;
+	global $_configuration;
 	$emailHeaders = get_email_headers(); // Email Headers
 	$emailSubject = "[".get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
 	$userAccountList = get_user_account_list($user, true); // BODY
 	$emailTo = $user[0]["email"];
 	$secretword = get_secret_word($emailTo);
-	$emailBody = get_lang("password_request")."\n\n\n".get_lang("YourAccountParam")." $rootWeb\n\n".$userAccountList;
+	$emailBody = get_lang("password_request")."\n\n\n".get_lang("YourAccountParam")." ".$_configuration['root_web']."\n\n".$userAccountList;
 	if (@ api_send_mail($emailTo, $emailSubject, $emailBody, $emailHeaders))
 		return get_lang('YourPasswordHasBeenEmailed');
 	else
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@ -1,4 +1,4 @@
-<?php //$Id: agenda.inc.php 10063 2006-11-20 19:52:42Z pcool $
+<?php //$Id: agenda.inc.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@ -62,7 +62,6 @@ $MonthsLong = array (get_lang("JanuaryLong"), get_lang("FebruaryLong"), get_lang
 */
 function get_kalender_items($month, $year)
 {
-	global $dbGlu;
 	global $_user, $_course;
 	global $is_allowedToEdit;

--- a/main/calendar/myagenda.php
+++ b/main/calendar/myagenda.php
@ -111,7 +111,7 @@ if (get_setting("allow_personal_agenda") == "true")
 	// I use a separate database for storing all the information of user driven tools
 	// as the Personal Agenda tool has the potential to create a large database.
 	// If you do not want a separate database for the personal agenda tool you can add the table to
-	// the main dokeos database by changing $DATABASE_USER_TOOLS above to $mainDbName
+	// the main dokeos database by changing $DATABASE_USER_TOOLS above to $_configuration['main_database']
 	$sql_create_database = "CREATE DATABASE IF NOT EXISTS `$DATABASE_USER_TOOLS`";
 	$result = api_sql_query($sql_create_database);
 	$sql_create_table = "CREATE TABLE IF NOT EXISTS $TABLE_PERSONAL_AGENDA (
@ -234,10 +234,10 @@ if (isset ($_user['user_id']))
 	echo "<tr>";
 	// output: the small calendar item on the left and the view / add links
 	echo "<td width=\"220\" valign=\"top\">";
-	$agendaitems = get_agendaitems($rootWeb, $courses_dbs, $month, $year);
+	$agendaitems = get_agendaitems($courses_dbs, $month, $year);
 	if (get_setting('allow_personal_agenda') == 'true')
 	{
-		$agendaitems = get_personal_agendaitems($rootWeb, $agendaitems, $day, $month, $year, $week, "month_view");
+		$agendaitems = get_personal_agendaitems($agendaitems, $day, $month, $year, $week, "month_view");
 	}
 	display_minimonthcalendar($agendaitems, $month, $year, $monthName);
 	echo "\n<ul id=\"agenda_select\">\n";
@ -259,26 +259,26 @@ if (isset ($_user['user_id']))
 	switch ($proces)
 	{
 		case "month_view" :
-			$agendaitems = get_agendaitems($rootWeb, $courses_dbs, $month, $year);
+			$agendaitems = get_agendaitems($courses_dbs, $month, $year);
 			if (get_setting("allow_personal_agenda") == "true")
 			{
-				$agendaitems = get_personal_agendaitems($rootWeb, $agendaitems, $day, $month, $year, $week, "month_view");
+				$agendaitems = get_personal_agendaitems($agendaitems, $day, $month, $year, $week, "month_view");
 			}
 			display_monthcalendar($agendaitems, $month, $year, $langDay_of_weekNames['long'], $monthName);
 			break;
 		case "week_view" :
-			$agendaitems = get_week_agendaitems($rootWeb, $courses_dbs, $month, $year, $week);
+			$agendaitems = get_week_agendaitems($courses_dbs, $month, $year, $week);
 			if (get_setting("allow_personal_agenda") == "true")
 			{
-				$agendaitems = get_personal_agendaitems($rootWeb, $agendaitems, $day, $month, $year, $week, "week_view");
+				$agendaitems = get_personal_agendaitems($agendaitems, $day, $month, $year, $week, "week_view");
 			}
 			display_weekcalendar($agendaitems, $month, $year, $langDay_of_weekNames['long'], $monthName);
 			break;
 		case "day_view" :
-			$agendaitems = get_day_agendaitems($rootWeb, $courses_dbs, $month, $year, $day);
+			$agendaitems = get_day_agendaitems($courses_dbs, $month, $year, $day);
 			if (get_setting("allow_personal_agenda") == "true")
 			{
-				$agendaitems = get_personal_agendaitems($rootWeb, $agendaitems, $day, $month, $year, $week, "day_view");
+				$agendaitems = get_personal_agendaitems($agendaitems, $day, $month, $year, $week, "day_view");
 			}
 			display_daycalendar($agendaitems, $day, $month, $year, $langDay_of_weekNames['long'], $monthName);
 			break;
@ -314,13 +314,14 @@ echo "</td></tr></table>";
 Display :: display_footer();

 /*============================================================================
-	 get_agendaitems($rootWeb, $courses_db, $month, $year)
+	 get_agendaitems($courses_db, $month, $year)
  ============================================================================*/
 // This function retrieves all the agenda items of all the course of the user
-function get_agendaitems($rootWeb, $courses_dbs, $month, $year)
+function get_agendaitems($courses_dbs, $month, $year)
 {
-	global $dbGlu;
 	global $_user;
+	global $_configuration;
+	
 	$items = array ();
 	// get agenda-items for every course
 	foreach ($courses_dbs as $key => $array_course_info)
@ -384,7 +385,7 @@ function get_agendaitems($rootWeb, $courses_dbs, $month, $year)
 		{
 			$agendaday = date("j",strtotime($item['start_date']));
 			$time= date("H:i",strtotime($item['start_date']));
-			$URL = $rootWeb."main/calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&amp;day=$agendaday&amp;month=$month&amp;year=$year#$agendaday"; // RH  //Patrick Cool: to highlight the relevant agenda item
+			$URL = $_configuration['root_web']."main/calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&amp;day=$agendaday&amp;month=$month&amp;year=$year#$agendaday"; // RH  //Patrick Cool: to highlight the relevant agenda item
 			$items[$agendaday][$item['start_time']] .= "<i>".$time."</i> <a href=\"$URL\" title=\"".$array_course_info["name"]."\">".$array_course_info["visual_code"]."</a>  ".$item['title']."<br />";
 		}
 	}
@ -627,11 +628,7 @@ function display_daycalendar($agendaitems, $day, $month, $year, $weekdaynames, $
 	global $DaysShort, $DaysLong;
 	global $MonthsLong;
 	global $query;
-	global $dbGlu;
-	// some debug information
-	// echo "dag: ".$day;
-	// echo "maand: ".$month;
-	// echo "jaar: ".$year;
+
 	// timestamp of today
 	$today = mktime();
 	$nextday = $today + (24 * 60 * 60);
@ -697,13 +694,14 @@ function display_daycalendar($agendaitems, $day, $month, $year, $weekdaynames, $
 	echo "</table>\n";
 }
 /*============================================================================
-	 get_day_agendaitems($rootWeb, $query, $month, $year)
+	 get_day_agendaitems($query, $month, $year)
  ============================================================================*/
 // show the monthcalender of the given month
-function get_day_agendaitems($rootWeb, $courses_dbs, $month, $year, $day)
+function get_day_agendaitems($courses_dbs, $month, $year, $day)
 {
-	global $dbGlu;
 	global $_user;
+	global $_configuration;
+	
 	$items = array ();

 	// get agenda-items for every course
@ -779,8 +777,8 @@ function get_day_agendaitems($rootWeb, $courses_dbs, $month, $year, $day)
 			{
 				$halfhour = $halfhour +1;
 			}
-			//$URL = $rootWeb.$mycours["dir"]."/";
-			$URL = $rootWeb."main/calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&amp;day=$day&amp;month=$month&amp;year=$year#$day"; // RH  //Patrick Cool: to highlight the relevant agenda item
+			//$URL = $_configuration['root_web'].$mycours["dir"]."/";
+			$URL = $_configuration['root_web']."main/calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&amp;day=$day&amp;month=$month&amp;year=$year#$day"; // RH  //Patrick Cool: to highlight the relevant agenda item
 			$items[$halfhour][] .= "<i>".$hours.":".$minutes."</i> <a href=\"$URL\" title=\"".$array_course_info['name']."\">".$array_course_info['visual_code']."</a>  ".$item['title']."<br />";
 		}
 	}
@ -799,13 +797,14 @@ function get_day_agendaitems($rootWeb, $courses_dbs, $month, $year, $day)
 	return $agendaitems;
 }
 /*============================================================================
-	 function get_week_agendaitems($rootWeb, $courses_dbs, $month, $year,$day)
+	 function get_week_agendaitems($courses_dbs, $month, $year,$day)
  ============================================================================*/
-function get_week_agendaitems($rootWeb, $courses_dbs, $month, $year, $week = '')
+function get_week_agendaitems($courses_dbs, $month, $year, $week = '')
 {
-	global $dbGlu;
 	global $TABLEAGENDA, $TABLE_ITEMPROPERTY;
 	global $_user;
+	global $_configuration;
+
 	$items = array ();
 	// The default value of the week
 	if ($week == '')
@ -918,7 +917,7 @@ function get_week_agendaitems($rootWeb, $courses_dbs, $month, $year, $week = '')
 		{
 			$agendaday = date("j",strtotime($item['start_date']));
 			$time= date("H:i",strtotime($item['start_date']));
-			$URL = $rootWeb."main/calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&amp;day=$agendaday&amp;month=$month&amp;year=$year#$agendaday"; // RH  //Patrick Cool: to highlight the relevant agenda item
+			$URL = $_configuration['root_web']."main/calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&amp;day=$agendaday&amp;month=$month&amp;year=$year#$agendaday"; // RH  //Patrick Cool: to highlight the relevant agenda item
 			$items[$agendaday][$item['start_time']] .= "<i>$time</i> <a href=\"$URL\" title=\"".$array_course_info["name"]."\">".$array_course_info["visual_code"]."</a>  ".$item['title']."<br />";
 		}
 	}
@ -1152,13 +1151,14 @@ function get_courses_of_user()
 	return $courses;
 }
 /*============================================================================
-	 get_personal_agendaitems($rootWeb, $agendaitems, $month, $year, $day, $week, $type);
+	 get_personal_agendaitems($agendaitems, $month, $year, $day, $week, $type);
  ============================================================================*/
 // This function retrieves all the personal agenda items and add them to the agenda items found by the other functions.
-function get_personal_agendaitems($rootWeb, $agendaitems, $day = "", $month = "", $year = "", $week = "", $type)
+function get_personal_agendaitems($agendaitems, $day = "", $month = "", $year = "", $week = "", $type)
 {
 	global $TABLE_PERSONAL_AGENDA;
 	global $_user;
+	global $_configuration;
 	// 1. creating the SQL statement for getting the personal agenda items in MONTH view
 	if ($type == "month_view" or $type == "") // we are in month view
 	{
@ -1214,7 +1214,7 @@ function get_personal_agendaitems($rootWeb, $agendaitems, $day = "", $month = ""
 		// if the student has specified a course we a add a link to that course
 		if ($item['course'] <> "")
 		{
-			$url = $rootWeb."main/calendar/agenda.php?cidReq=".urlencode($item['course'])."&amp;day=$day&amp;month=$month&amp;year=$year#$day"; // RH  //Patrick Cool: to highlight the relevant agenda item
+			$url = $_configuration['root_web']."main/calendar/agenda.php?cidReq=".urlencode($item['course'])."&amp;day=$day&amp;month=$month&amp;year=$year#$day"; // RH  //Patrick Cool: to highlight the relevant agenda item
 			$course_link = "<a href=\"$url\" title=\"".$item['course']."\">".$item['course']."</a>";
 		}
 		else
--- a/main/course_home/3column.php
+++ b/main/course_home/3column.php
@ -45,7 +45,7 @@ $id  = isset($_GET['id']) ? intval($_GET['id']) : null;
 include('../../main/course_home/btf_functions.php');  // RH: extra ../
 $is_AllowedToEdit = is_allowed_to_edit();  // RH: Allowed is not allowed...

-//$TABLE_TOOLS = $mainDbName."`.`course_module";
+
 $TABLE_TOOLS = Database::get_main_table(MAIN_COURSE_MODULE_TABLE);
 $TBL_ACCUEIL = Database::get_course_table(TOOL_LIST_TABLE);

--- a/main/create_course/add_course.php
+++ b/main/create_course/add_course.php
@ -1,5 +1,5 @@
 <?php
-// $Id: add_course.php 9985 2006-11-15 00:43:47Z pcool $
+// $Id: add_course.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@ -101,7 +101,7 @@ if($form->validate())
 	$category_code = $course_values['category_code'];
 	$title = $course_values['title'];
 	$course_language = $course_values['course_language'];
-	$keys = define_course_keys($wanted_code, "", $dbNamePrefix);
+	$keys = define_course_keys($wanted_code, "", $_configuration['db_prefix']);
 	if (sizeof($keys))
 	{
 		$visual_code = $keys["currentCourseCode"];
--- a/main/dropbox/dropbox_config.inc.php
+++ b/main/dropbox/dropbox_config.inc.php
@ -37,7 +37,7 @@ $dropbox_cnf["postTbl"] = $_course["dbNameGlu"] . "dropbox_post";
 $dropbox_cnf["fileTbl"] = $_course["dbNameGlu"] . "dropbox_file";
 $dropbox_cnf["personTbl"] = $_course["dbNameGlu"] . "dropbox_person";
 $dropbox_cnf["introTbl"] = $_course["dbNameGlu"] . "tool_intro";
-$dropbox_cnf["userTbl"] = $mainDbName . "`.`user";
+$dropbox_cnf["userTbl"] = $_configuration['main_database'] . "`.`user";
 $dropbox_cnf["courseUserTbl"] = Database::get_main_table(MAIN_COURSE_USER_TABLE);
 $dropbox_cnf['tbl_category'] = $_course["dbNameGlu"] . "dropbox_category";
 $dropbox_cnf['tbl_feedback'] = $_course["dbNameGlu"] . "dropbox_feedback";
--- a/main/dropbox/dropbox_submit.php
+++ b/main/dropbox/dropbox_submit.php
@ -334,7 +334,7 @@ if ( isset( $_GET['mailingIndex']))  // examine or send
 		$var = strtoupper($nameParts[2]);  // the variable part of the name
 		$course_user = Database::get_main_table(MAIN_COURSE_USER_TABLE);
 		$sel = "SELECT u.user_id, u.lastname, u.firstname, cu.status 
-				FROM `".$mainDbName."`.`user` u 
+				FROM `".$_configuration['main_database']."`.`user` u 
 				LEFT JOIN $course_user cu 
 				ON cu.user_id = u.user_id AND cu.course_code = '".$_course['sysCode']."'";
 		$sel .= " WHERE u.".dropbox_cnf("mailingWhere".$var)." = '";
@ -482,7 +482,7 @@ if ( isset( $_GET['mailingIndex']))  // examine or send
 			$course_user = Database::get_main_table(MAIN_COURSE_USER_TABLE);
 			$sql = "SELECT u.lastname, u.firstname 
 					FROM $course_user cu 
-					LEFT JOIN  `".$mainDbName."`.`user` u 
+					LEFT JOIN  `".$_configuration['main_database']."`.`user` u 
 					ON cu.user_id = u.user_id AND cu.course_code = '".$_course['sysCode']."'
 					WHERE cu.status = 5 
 					AND u.user_id NOT IN ('" . implode("', '" , $students) . "')";
--- a/main/exercice/Hpdownload.php
+++ b/main/exercice/Hpdownload.php
@ -162,7 +162,7 @@ if($content_type == 'text/html')
 		$newcontent = str_replace($mit,$js_content,$content);	
 		
 		$prehref="javascript:void(0);";
-		$posthref=$rootWeb."main/exercice/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid;
+		$posthref=$_configuration['root_web']."main/exercice/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid;
 		$newcontent = str_replace($prehref,$posthref,$newcontent);	
 		
 		
--- a/main/exercice/addlimits.php
+++ b/main/exercice/addlimits.php
@ -55,9 +55,8 @@ $TBL_QUESTIONS         = $_course['dbNameGlu'].'quiz_question';
 $TBL_REPONSES          = $_course['dbNameGlu'].'quiz_answer';
 $main_user_table = Database :: get_main_table(MAIN_USER_TABLE);
 $main_course_user_table = Database :: get_main_table(MAIN_COURSE_USER_TABLE);
-$statsdb = $statsDbName;
-$TABLETRACK_ATTEMPT = $statsDbName."`.`track_e_attempt"; 
-$TABLETRACK_EXERCICES = $statsDbName."`.`track_e_exercices";
+$TABLETRACK_ATTEMPT = $_configuration['statistics_database']."`.`track_e_attempt"; 
+$TABLETRACK_EXERCICES = $_configuration['statistics_database']."`.`track_e_exercices";

 $dsp_percent = false; 
 $debug=0;
--- a/main/exercice/exercice.php
+++ b/main/exercice/exercice.php
@ -67,10 +67,9 @@ $TBL_ITEM_PROPERTY      = Database::get_course_table(ITEM_PROPERTY_TABLE);
 $TBL_EXERCICE_QUESTION	= Database::get_course_table(QUIZ_TEST_QUESTION_TABLE);
 $TBL_EXERCICES			= Database::get_course_table(QUIZ_TEST_TABLE);
 $TBL_QUESTIONS			= Database::get_course_table(QUIZ_QUESTION_TABLE);
-$TBL_TRACK_EXERCICES   	= $statsDbName."`.`track_e_exercices";
-$TBL_TRACK_HOTPOTATOES  = $statsDbName."`.`track_e_hotpotatoes";
-$statsdb = $statsDbName;
-$TABLETRACK_ATTEMPT = $statsDbName."`.`track_e_attempt"; 
+$TBL_TRACK_EXERCICES   	= $_configuration['statistics_database']."`.`track_e_exercices";
+$TBL_TRACK_HOTPOTATOES  = $_configuration['statistics_database']."`.`track_e_hotpotatoes";
+$TABLETRACK_ATTEMPT = $_configuration['statistics_database']."`.`track_e_attempt"; 

 // document path
 $documentPath= api_get_path(SYS_COURSE_PATH).$_course['path']."/document";
--- a/main/exercice/exercise_result.php
+++ b/main/exercice/exercise_result.php
@ -1,4 +1,4 @@
-<?php // $Id: exercise_result.php 10062 2006-11-20 19:37:38Z pcool $
+<?php // $Id: exercise_result.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ============================================================================== 
 	Dokeos - elearning and course management software
@ -69,8 +69,8 @@ $TBL_EXERCICE_QUESTION = $_course['dbNameGlu'].'quiz_rel_question';
 $TBL_EXERCICES         = $_course['dbNameGlu'].'quiz';
 $TBL_QUESTIONS         = $_course['dbNameGlu'].'quiz_question';
 $TBL_REPONSES          = $_course['dbNameGlu'].'quiz_answer';
-$TABLETRACK_EXERCICES = $statsDbName."`.`track_e_exercices";
-$TABLETRACK_ATTEMPT = $statsDbName."`.`track_e_attempt"; 
+$TABLETRACK_EXERCICES = $_configuration['statistics_database']."`.`track_e_exercices";
+$TABLETRACK_ATTEMPT = $_configuration['statistics_database']."`.`track_e_attempt"; 
 $main_user_table = Database :: get_main_table(MAIN_USER_TABLE);
 $main_course_user_table = Database :: get_main_table(MAIN_COURSE_USER_TABLE);
 $table_ans = Database :: get_course_table(QUIZ_ANSWER_TABLE);
--- a/main/exercice/exercise_show.php
+++ b/main/exercice/exercise_show.php
@ -1,4 +1,8 @@
 <?php
+/**
+ * @todo remove the debug code and use the general debug library
+ * @todo use the Database:: functions
+ */
 include('exercise.class.php');
 include('question.class.php');
 include('answer.class.php');
@ -25,15 +29,18 @@ $TBL_QUESTIONS         = $_course['dbNameGlu'].'quiz_question';
 $TBL_REPONSES          = $_course['dbNameGlu'].'quiz_answer';
 $main_user_table = Database :: get_main_table(MAIN_USER_TABLE);
 $main_course_user_table = Database :: get_main_table(MAIN_COURSE_USER_TABLE);
-$statsdb = $statsDbName;
-$TABLETRACK_ATTEMPT = $statsDbName."`.`track_e_attempt"; 
-$TABLETRACK_EXERCICES = $statsDbName."`.`track_e_exercices";
+$TABLETRACK_ATTEMPT = $_configuration['statistics_database']."`.`track_e_attempt"; 
+$TABLETRACK_EXERCICES = $_configuration['statistics_database']."`.`track_e_exercices";

 $dsp_percent = false; 
 $debug=0;
-if($debug>0){echo str_repeat('&nbsp;',0).'Entered exercise_result.php'."<br />\n";var_dump($_POST);}
+if($debug>0)
+{
+	echo str_repeat('&nbsp;',0).'Entered exercise_result.php'."<br />\n";var_dump($_POST);
+}
 // general parameters passed via POST/GET
-if ( empty ( $origin ) ) {
+if ( empty ( $origin ) ) 
+{
    $origin = $_REQUEST['origin'];
 }
 if ( empty ( $learnpath_id ) ) {
--- a/main/exercice/mark_free_answer.php
+++ b/main/exercice/mark_free_answer.php
@ -112,7 +112,8 @@ if($action == 'mark'){
 	if (!empty($_POST['score']) AND $_POST['score'] < $obj_question->selectWeighting() AND $_POST['score'] >= 0){
 		
 		//mark the user mark into the database using something similar to the following function:
-		global $_configuration, $statsDbName;
+		global $_configuration;
+		
 		if($_configuration['tracking_enabled'])
 		{
 			$exercise_table = Database::get_statistic_table('track_e_exercices');
--- a/main/exercice/savescores.php
+++ b/main/exercice/savescores.php
@ -40,7 +40,7 @@ $full_file_path = $documentPath.$test;

 my_delete($full_file_path.$_user['user_id'].".t.html");

-$TABLETRACK_HOTPOTATOES = $statsDbName."`.`track_e_hotpotatoes";
+$TABLETRACK_HOTPOTATOES = $_configuration['statistics_database']."`.`track_e_hotpotatoes";
 $tbl_learnpath_user = Database::get_course_table(LEARNPATH_USER_TABLE);
 //$_course['dbNameGlu']."learnpath_user";
 $_cid = $cid;
--- a/main/exercice/showinframes.php
+++ b/main/exercice/showinframes.php
@ -100,7 +100,7 @@ else
 WriteFileCont($full_file_path.$_user['user_id'].".t.html",$newcontent);

 /*	$prehref="javascript:void(0);";
-	$posthref=$rootWeb."main/exercice/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid;
+	$posthref=$_configuration['root_web']."main/exercice/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid;
 	$newcontent = str_replace($prehref,$posthref,$newcontent);	
 		
 	$prehref="class=\"GridNum\" onclick=";
--- a/main/inc/banner.inc.php
+++ b/main/inc/banner.inc.php
@ -350,7 +350,7 @@ if (isset ($dokeos_database_connection))
 	// if multiple database, prefix table names with the course database name in SQL queries (or no prefix if the table is in
 	// the main database)
 	// (ex. SELECT * FROM `table_from_main_db`  -  SELECT * FROM `courseDB`.`table_from_course_db`)
-	mysql_select_db($mainDbName, $dokeos_database_connection);
+	mysql_select_db($_configuration['main_database'], $dokeos_database_connection);
 }
 ?>

--- a/main/inc/global.inc.php
+++ b/main/inc/global.inc.php
@ -15,7 +15,6 @@
 * @todo use the $_configuration array for all the needed variables
 * @todo remove the code that displays the button that links to the install page
 * 		but use a redirect immediately. By doing so the $already_installed variable can be removed.
-* @todo $statsDbName: rename variable and use $_configuration array
 * @todo make it possible to enable / disable the tracking through the Dokeos config page.
 * 
 ==============================================================================
@ -91,13 +90,13 @@ require_once(api_get_path(LIBRARY_PATH).'database.lib.php');
 require_once(api_get_path(LIBRARY_PATH).'display.lib.php');
 require_once(api_get_path(LIBRARY_PATH).'text.lib.php');

-
-if(empty($statsDbName) && $already_installed)
+// @todo: this shouldn't be done here. It should be stored correctly during installation
+if(empty($_configuration['statistics_database']) && $already_installed)
 {
-	$statsDbName=$mainDbName;
+	$_configuration['statistics_database'] = $_configuration['main_database'];
 }

-// connect to the server database and select the main claroline DB
+// connect to the server database and select the main dokeos database

 $dokeos_database_connection = @mysql_connect($_configuration['db_host'], $_configuration['db_user'], $_configuration['db_password']) or die ($error_message);

@ -109,7 +108,7 @@ if (! $_configuration['db_host'])

 unset($error_message);

-$selectResult = mysql_select_db($mainDbName,$dokeos_database_connection) or die ('<center>WARNING ! SYSTEM UNABLE TO SELECT THE MAIN DOKEOS DATABASE</center>');
+$selectResult = mysql_select_db($_configuration['main_database'],$dokeos_database_connection) or die ('<center>WARNING ! SYSTEM UNABLE TO SELECT THE MAIN DOKEOS DATABASE</center>');

 /*
 --------------------------------------------
@ -155,7 +154,7 @@ include_once($includePath."/lib/online.inc.php");
 // check and modify the date of user in the track.e.online table
 if (!$x=strpos($_SERVER['PHP_SELF'],'whoisonline.php')) 
 { 
-	LoginCheck(isset($_user['user_id']) ? $_user['user_id'] : '',$statsDbName); 
+	LoginCheck(isset($_user['user_id']) ? $_user['user_id'] : '',$_configuration['statistics_database']); 
 }

 // ===== end "who is logged in?" module section =====
--- a/main/inc/lib/add_course.lib.inc.php
+++ b/main/inc/lib/add_course.lib.inc.php
@ -48,9 +48,9 @@ include_once (api_get_path(LIBRARY_PATH).'database.lib.php');
 *
 * @return true if the course creation was succesful, false otherwise.
 */
-function create_course($wanted_code, $title, $tutor_name, $category_code, $course_language, $course_admin_id, $dbNamePrefix, $firstExpirationDelay)
+function create_course($wanted_code, $title, $tutor_name, $category_code, $course_language, $course_admin_id, $db_prefix, $firstExpirationDelay)
 {
-	$keys = define_course_keys($wanted_code, "", $dbNamePrefix);
+	$keys = define_course_keys($wanted_code, "", $db_prefix);

 	if(sizeof($keys))
 	{
@ -83,7 +83,7 @@ function create_course($wanted_code, $title, $tutor_name, $category_code, $cours
 */
 function define_course_keys($wantedCode, $prefix4all = "", $prefix4baseName = "", $prefix4path = "", $addUniquePrefix = false, $useCodeInDepedentKeys = true)
 {
-	global $rootSys, $coursesRepositoryAppend, $prefixAntiNumber, $_configuration, $mainDbName, $dbGlu;
+	global $rootSys, $coursesRepositoryAppend, $prefixAntiNumber, $_configuration;

 	$course_table = Database :: get_main_table(MAIN_COURSE_TABLE);

@ -156,7 +156,7 @@ function define_course_keys($wantedCode, $prefix4all = "", $prefix4baseName = ""

 		if($_configuration['single_database'])
 		{
-			$query = "SHOW TABLES FROM `$mainDbName` LIKE '".$_configuration['table_prefix']."$keysCourseDbName$dbGlu%'";
+			$query = "SHOW TABLES FROM `".$_configuration['main_database']."` LIKE '".$_configuration['table_prefix']."$keysCourseDbName".$_configuration['db_glue']."%'";
 			$result = api_sql_query($query, __FILE__, __LINE__);
 		}
 		else
@ -250,14 +250,14 @@ function prepare_course_repository($courseRepository, $courseId)

 function update_Db_course($courseDbName)
 {
-	global $_configuration, $dbGlu;
+	global $_configuration;

 	if(!$_configuration['single_database'])
 	{
 		api_sql_query("CREATE DATABASE IF NOT EXISTS `" . $courseDbName . "`", __FILE__, __LINE__);
 	}

-	$courseDbName = $_configuration['table_prefix'].$courseDbName.$dbGlu;
+	$courseDbName = $_configuration['table_prefix'].$courseDbName.$_configuration['db_glue'];

 	$tbl_course_homepage 		= $courseDbName . "tool";
 	$TABLEINTROS 				= $courseDbName . "tool_intro";
@ -1346,9 +1346,9 @@ function lang2db($string)
 */
 function fill_Db_course($courseDbName, $courseRepository, $language)
 {
-	global $_configuration, $dbGlu, $clarolineRepositoryWeb, $clarolineRepositorySys, $_user;
+	global $_configuration, $clarolineRepositoryWeb, $clarolineRepositorySys, $_user;

-	$courseDbName = $_configuration['table_prefix'].$courseDbName.$dbGlu;
+	$courseDbName = $_configuration['table_prefix'].$courseDbName.$_configuration['db_glue'];

 	$tbl_course_homepage = $courseDbName . "tool";
 	$TABLEINTROS = $courseDbName . "tool_intro";
@ -1624,11 +1624,11 @@ function string2binary($variable)
 */
 function register_course($courseSysCode, $courseScreenCode, $courseRepository, $courseDbName, $titular, $category, $title, $course_language, $uidCreator, $expiration_date = "")
 {
-	GLOBAL $defaultVisibilityForANewCourse, $langCourseDescription, $langProfessor, $langAnnouncementEx, $error_msg, $_configuration, $dbGlu;
+	GLOBAL $defaultVisibilityForANewCourse, $langCourseDescription, $langProfessor, $langAnnouncementEx, $error_msg, $_configuration;
 	$TABLECOURSE = Database :: get_main_table(MAIN_COURSE_TABLE);
 	$TABLECOURSUSER = Database :: get_main_table(MAIN_COURSE_USER_TABLE);

-	#$TABLEANNOUNCEMENTS=$_configuration['table_prefix'].$courseDbName.$dbGlu.$TABLEANNOUNCEMENTS;
+	#$TABLEANNOUNCEMENTS=$_configuration['table_prefix'].$courseDbName.$_configuration['db_glue'].$TABLEANNOUNCEMENTS;
 	$TABLEANNOUNCEMENTS = Database :: get_course_table(ANNOUNCEMENT_TABLE,$courseDbName);

 	$okForRegisterCourse = true;
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@ -1273,7 +1273,8 @@ class CourseManager
 	 */
 	function delete_course($code)
 	{
-		global $_configuration, $dbGlu;
+		global $_configuration;
+		
 		$table_course = Database :: get_main_table(MAIN_COURSE_TABLE);
 		$table_course_user = Database :: get_main_table(MAIN_COURSE_USER_TABLE);
 		$table_course_class = Database :: get_main_table(MAIN_COURSE_CLASS_TABLE);
@ -1313,7 +1314,7 @@ class CourseManager
 			}
 			else
 			{
-				$db_pattern = $_configuration['table_prefix'].$course->db_name.$dbGlu;
+				$db_pattern = $_configuration['table_prefix'].$course->db_name.$_configuration['db_glue'];
 				$sql = "SHOW TABLES LIKE '$db_pattern%'";
 				$result = api_sql_query($sql, __FILE__, __LINE__);
 				while (list ($courseTable) = mysql_fetch_row($result))
--- a/main/inc/lib/database.lib.php
+++ b/main/inc/lib/database.lib.php
@ -457,7 +457,7 @@ class Database
 		$_course['sysCode'     ]         = $cData['code'             ]; // use as key in db
 		$_course['path'        ]         = $cData['directory'        ]; // use as key in path
 		$_course['dbName'      ]         = $cData['db_name'           ]; // use as key in db list
-		$_course['dbNameGlu'   ]         = $_configuration['table_prefix'] . $cData['dbName'] . $dbGlu; // use in all queries
+		$_course['dbNameGlu'   ]         = $_configuration['table_prefix'] . $cData['dbName'] . $_configuration['db_glue']; // use in all queries
 		$_course['titular'     ]         = $cData['tutor_name'       ];
 		$_course['language'    ]         = $cData['course_language'   ];
 		$_course['extLink'     ]['url' ] = $cData['department_url'    ];
--- a/main/inc/lib/debug.lib.inc.php
+++ b/main/inc/lib/debug.lib.inc.php
@ -384,16 +384,16 @@ function printInit($selection = "*")
 */
 function printConfig()
 {
-	GLOBAL $_configuration, $mainDbName, $dokeos_version, $rootWeb, $urlAppend, $userPasswordCrypted, $userPasswordCrypted, $platformLanguage, $siteName, $rootWeb, $rootSys, $clarolineRepositoryAppend, $coursesRepositoryAppend, $rootAdminAppend, $clarolineRepositoryWeb, $clarolineRepositorySys, $coursesRepositoryWeb, $coursesRepositorySys, $rootAdminSys, $rootAdminWeb;
+	GLOBAL $_configuration, $dokeos_version, $urlAppend, $userPasswordCrypted, $userPasswordCrypted, $platformLanguage, $siteName, $clarolineRepositoryAppend, $coursesRepositoryAppend, $rootAdminAppend, $clarolineRepositoryWeb, $clarolineRepositorySys, $coursesRepositoryWeb, $coursesRepositorySys, $rootAdminSys, $rootAdminWeb;
 	echo "<table width=\"100%\" border=\"1\" cellspacing=\"1\" cellpadding=\"1\" bordercolor=\"#808080\" bgcolor=\"#C0C0C0\" lang=\"en\"><TR>";
 	echo "
 			<tr><td colspan=2><strong>Mysql</strong></td></tr>
 			<tr><td>dbHost</TD><TD>".$_configuration['db_host']."</td></tr>
 			<tr><td>dbLogin 	</TD><TD>".$_configuration['db_user']."</td></tr>
 			<tr><td>dbPass	</TD><TD>".str_repeat("*", strlen($_configuration['db_password']))."</td></tr>
-			<tr><td>mainDbName		</TD><TD>$mainDbName			</td></tr>
+			<tr><td>mainDbName		</TD><TD>".$_configuration['main_database']."			</td></tr>
 			<tr><td>clarolineVersion	</TD><TD>$dokeos_version</td></tr>
-		    <tr><td>rootWeb</TD><TD>$rootWeb</td></tr>
+		    <tr><td>rootWeb</TD><TD>".$_configuration['root_web']."</td></tr>
 			<tr><td>urlAppend </TD><TD>$urlAppend</td></tr>
 			<tr><td colspan=2><HR></td></tr>
 			<tr><td colspan=2><strong>param for new and future features</strong></td></tr>
@ -401,7 +401,7 @@ function printConfig()
 			<tr><td colspan=2></td></tr>
 			<tr><td>platformLanguage 	</TD><TD>$platformLanguage 	</td></tr>
 			<tr><td>siteName			</TD><TD>$siteName			</td></tr>
-			<tr><td>rootWeb			</TD><TD>$rootWeb			</td></tr>
+			<tr><td>rootWeb			</TD><TD>".$_configuration['root_web']."			</td></tr>
 			<tr><td>rootSys			</TD><TD>$rootSys			</td></tr>
 			<tr><td colspan=2></td></tr>
 			<tr><td>clarolineRepository<strong>Append</strong>  	</TD><TD>$clarolineRepositoryAppend </td></tr>
--- a/main/inc/lib/events.lib.inc.php
+++ b/main/inc/lib/events.lib.inc.php
@ -42,15 +42,15 @@
 ============================================================================== 
 */
 // REGROUP TABLE NAMES FOR MAINTENANCE PURPOSE
-$TABLETRACK_LOGIN = $statsDbName."`.`track_e_login";
-$TABLETRACK_OPEN = $statsDbName."`.`track_e_open";
-$TABLETRACK_ACCESS = $statsDbName."`.`track_e_access";
-$TABLETRACK_DOWNLOADS = $statsDbName."`.`track_e_downloads";
-$TABLETRACK_UPLOADS = $statsDbName."`.`track_e_uploads";
-$TABLETRACK_LINKS = $statsDbName."`.`track_e_links";
-$TABLETRACK_EXERCICES = $statsDbName."`.`track_e_exercices";
-$TABLETRACK_SUBSCRIPTIONS = $statsDbName."`.`track_e_subscriptions";
-$TABLETRACK_LASTACCESS = $statsDbName."`.`track_e_lastaccess"; //for "what's new" notification
+$TABLETRACK_LOGIN = $_configuration['statistics_database']."`.`track_e_login";
+$TABLETRACK_OPEN = $_configuration['statistics_database']."`.`track_e_open";
+$TABLETRACK_ACCESS = $_configuration['statistics_database']."`.`track_e_access";
+$TABLETRACK_DOWNLOADS = $_configuration['statistics_database']."`.`track_e_downloads";
+$TABLETRACK_UPLOADS = $_configuration['statistics_database']."`.`track_e_uploads";
+$TABLETRACK_LINKS = $_configuration['statistics_database']."`.`track_e_links";
+$TABLETRACK_EXERCICES = $_configuration['statistics_database']."`.`track_e_exercices";
+$TABLETRACK_SUBSCRIPTIONS = $_configuration['statistics_database']."`.`track_e_subscriptions";
+$TABLETRACK_LASTACCESS = $_configuration['statistics_database']."`.`track_e_lastaccess"; //for "what's new" notification


 /*
@ -65,8 +65,7 @@ $TABLETRACK_LASTACCESS = $statsDbName."`.`track_e_lastaccess"; //for "what's new
 */
 function event_open()
 {
-	global $_configuration, $_SERVER;
-	global $rootWeb;
+	global $_configuration;
 	global $TABLETRACK_OPEN;
 	
 	// if tracking is disabled record nothing
@ -80,8 +79,8 @@ function event_open()
 	// $_SERVER['HTTP_REFERER'] : provide information about refering url
 	$referer = $_SERVER['HTTP_REFERER'];
 	// record informations only if user comes from another site
-	//if(!eregi($rootWeb,$referer))
-	$pos = strpos($referer, $rootWeb);
+	//if(!eregi($_configuration['root_web'],$referer))
+	$pos = strpos($referer, $_configuration['root_web']);
 	if ($pos === false)
 	{
 		$remhost = @ getHostByAddr($_SERVER['REMOTE_ADDR']);
@ -225,7 +224,7 @@ function event_access_tool($tool, $id_session=0)
 	global $_user;
 	global $_cid;
 	global $TABLETRACK_ACCESS;
-	global $rootWeb;
+	global $_configuration;
 	global $_course;
 	global $TABLETRACK_LASTACCESS; //for "what's new" notification
 	
@ -242,11 +241,11 @@ function event_access_tool($tool, $id_session=0)
 	$user_id = $_user['user_id'] ? "'".$_user['user_id']."'" : "NULL"; // "NULL" is anonymous
 	// record information
 	// only if user comes from the course $_cid
-	//if( eregi($rootWeb.$_cid,$_SERVER['HTTP_REFERER'] ) )
-	//$pos = strpos($_SERVER['HTTP_REFERER'],$rootWeb.$_cid);
+	//if( eregi($_configuration['root_web'].$_cid,$_SERVER['HTTP_REFERER'] ) )
+	//$pos = strpos($_SERVER['HTTP_REFERER'],$_configuration['root_web'].$_cid);
 	$pos = strpos(strtolower($_SERVER['HTTP_REFERER']), strtolower(api_get_path(WEB_COURSE_PATH).$_course['path']));
 	// added for "what's new" notification
-	$pos2 = strpos(strtolower($_SERVER['HTTP_REFERER']), strtolower($rootWeb."index"));
+	$pos2 = strpos(strtolower($_SERVER['HTTP_REFERER']), strtolower($_configuration['root_web']."index"));
 	// end "what's new" notification
 	if ($_configuration['tracking_enabled'] && ($pos !== false || $pos2 !== false))
 	{
--- a/main/inc/lib/export.lib.inc.php
+++ b/main/inc/lib/export.lib.inc.php
@ -309,7 +309,7 @@ function makeTheBackup($exportedCourseId, $verboseBackup = "FALSE", $ignore = ""
 {
 		GLOBAL $error_msg, $error_no, $db, $archiveRepositorySys, $archiveRepositoryWeb, // from configs files
 		$appendCourse, $appendMainDb, //
-	$archiveName, $mainDbName, $_SESSION, $clarolineRepositorySys, $_course, $coursesRepositorySys, $TABLEUSER, $TABLECOURSUSER, $TABLECOURS, $TABLEANNOUNCEMENT, $langArchiveName, $langArchiveLocation, $langSizeOf, $langDisk_free_space, $langCreateMissingDirectories, $langBUCourseDataOfMainBase, $langBUUsersInMainBase, $langBUAnnounceInMainBase, $langCopyDirectoryCourse, $langFileCopied, $langBackupOfDataBase, $langBuildTheCompressedFile;
+	$archiveName, $_configuration, $clarolineRepositorySys, $_course, $coursesRepositorySys, $TABLEUSER, $TABLECOURSUSER, $TABLECOURS, $TABLEANNOUNCEMENT, $langArchiveName, $langArchiveLocation, $langSizeOf, $langDisk_free_space, $langCreateMissingDirectories, $langBUCourseDataOfMainBase, $langBUUsersInMainBase, $langBUAnnounceInMainBase, $langCopyDirectoryCourse, $langFileCopied, $langBackupOfDataBase, $langBuildTheCompressedFile;
 	////////////////////////////////////////////////////
 	// ****** 1° Check if all data needed are aivailable
 	// ****** 1° 1. $lang vars
@ -351,7 +351,7 @@ function makeTheBackup($exportedCourseId, $verboseBackup = "FALSE", $ignore = ""
 		$error_no["backup"][] = "1";
 		$stop = TRUE;
 	}
-	if (!isset ($mainDbName))
+	if (!isset ($_configuration['main_database']))
 	{
 		GLOBAL $error_msg, $error_no;
 		$error_msg["backup"][] = "[".basename(__FILE__)."][".__LINE__."] Main Db name is Missing";
--- a/main/inc/lib/fckeditor/editor/plugins/ImageManager/config.inc.php
+++ b/main/inc/lib/fckeditor/editor/plugins/ImageManager/config.inc.php
@ -28,7 +28,7 @@
 */
 require_once('../../../../../conf/configuration.php');

-$IMConfig['base_url'] = $rootWeb.'main/img/gallery/';
+$IMConfig['base_url'] = $_configuration['root_web'].'main/img/gallery/';
 //$IMConfig['base_dir'] = $_SERVER['DOCUMENT_ROOT'].$IMConfig['base_url'];
 $IMConfig['base_dir'] = $rootSys.'main/img/gallery/';
 $IMConfig['server_name'] = $_SERVER['SERVER_NAME'];
--- a/main/inc/lib/fckeditor/fcktemplates.xml.php
+++ b/main/inc/lib/fckeditor/fcktemplates.xml.php
@ -2,7 +2,7 @@
 echo '<?xml version="1.0" encoding="utf-8" ?>';
 require_once('../../conf/configuration.php');

-$IMConfig['base_url'] = $rootWeb.'main/img/gallery/';
+$IMConfig['base_url'] = $_configuration['root_web'].'main/img/gallery/';
 ?>
 <Templates imagesBasePath="fck_template/images/">
 	<Template title="Content" image="2.png">
@ -65,7 +65,7 @@ $IMConfig['base_url'] = $rootWeb.'main/img/gallery/';
 			<![CDATA[
 				    <div class="course">
 				    <div id="right">
- 					    <p><img class="image" src="<?php echo $rootWeb; ?>main/img/gallery/pointer-right.png" /></p>
+ 					    <p><img class="image" src="<?php echo $_configuration['root_web']; ?>main/img/gallery/pointer-right.png" /></p>
 					    <p>Some text</p>
 				    </div>
 				    
@ -96,7 +96,7 @@ $IMConfig['base_url'] = $rootWeb.'main/img/gallery/';
 						   </div>
 						   
 						   <div id="right">
-							   <p><img class="image" src="<?php echo $rootWeb; ?>main/img/gallery/pointer-right.png" /></p>
+							   <p><img class="image" src="<?php echo $_configuration['root_web']; ?>main/img/gallery/pointer-right.png" /></p>
 						   </div>
 						   
 						   <div id="content">
@ -121,7 +121,7 @@ $IMConfig['base_url'] = $rootWeb.'main/img/gallery/';
 						   <![CDATA[
 				    <div class="course">
 								  <div class="left">
-									  <p><img class="image" src="<?php echo $rootWeb; ?>main/img/gallery/pointer-left.png" /></p>
+									  <p><img class="image" src="<?php echo $_configuration['root_web']; ?>main/img/gallery/pointer-left.png" /></p>
 								  </div>
 								  
 								  <div class="right">
--- a/main/inc/lib/fileUpload.lib.php
+++ b/main/inc/lib/fileUpload.lib.php
@ -1204,7 +1204,7 @@ function get_levels($filename)
 */
 function set_default_settings($upload_path,$filename,$filetype="file")
 {
-	global $dbTable,$dbNamePrefix;
+	global $dbTable,$_configuration;
 	global $default_visibility;

 	if (!$default_visibility)
--- a/main/inc/lib/online.inc.php
+++ b/main/inc/lib/online.inc.php
@ -31,15 +31,22 @@
 *	@package dokeos.whoisonline
 ============================================================================== 
 */
-
-function LoginCheck($uid,$statsDbName)
+/**
+ * Enter description here...
+ *
+ * @param unknown_type $uid
+ * @param unknown_type $statistics_database
+ * 
+ * @todo the second parameter is of no use. 
+ */
+function LoginCheck($uid,$statistics_database)
 {
 	global $_course;
 	
 	$online_table = Database::get_statistic_table(STATISTIC_TRACK_E_ONLINE_TABLE);
 	if ($uid!="")
 	{
-		LoginDelete($uid,$statsDbName);
+		LoginDelete($uid,$statistics_database);
 		$login_ip = $_SERVER['REMOTE_ADDR'];
 		$reallyNow = time();
 		$login_date = date("Y-m-d H:i:s",$reallyNow);	
@ -58,17 +65,24 @@ function LoginCheck($uid,$statsDbName)
 	}
 }

-function LoginDelete($uid,$statsDbName)
+/**
+ * Enter description here...
+ *
+ * @param unknown_type $uid
+ * 
+ * @todo the name is not very clear. I would expect that it deletes a login from the tracking info or even it deletes a user.
+ */
+function LoginDelete($user_id)
 {
 	$online_table = Database::get_statistic_table(STATISTIC_TRACK_E_ONLINE_TABLE);
-	$query = "DELETE FROM ".$online_table ." WHERE login_user_id = '$uid'";
+	$query = "DELETE FROM ".$online_table ." WHERE login_user_id = '".mysql_real_escape_string($user_id)."'";
 	@api_sql_query($query,__FILE__,__LINE__);
 }

 /**
-* @todo remove parameter $statsDbName which is no longer necessary
+* @todo remove parameter $statistics_database which is no longer necessary
 */
-function WhoIsOnline($uid,$statsDbName,$valid)
+function WhoIsOnline($uid,$statistics_database,$valid)
 {				
 	$track_online_table = Database::get_statistic_table(STATISTIC_TRACK_E_ONLINE_TABLE);
 	$query = "SELECT login_user_id,login_date FROM ".$track_online_table ." WHERE DATE_ADD(login_date,INTERVAL $valid MINUTE) >= NOW()  ";	
--- a/main/inc/lib/session_handler.class.php
+++ b/main/inc/lib/session_handler.class.php
@ -1,4 +1,4 @@
-<?php // $Id: session_handler.class.php 10045 2006-11-20 09:25:07Z pcool $
+<?php // $Id: session_handler.class.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ===============================================================================
 	Dokeos - elearning and course management software
@ -47,11 +47,11 @@ class session_handler

 	function session_handler()
 	{
-		global $_configuration, $mainDbName;
+		global $_configuration;

 		$this->lifetime=60; // 60 minutes

-		$this->connexion=array('server' => $_configuration['db_host'],'login' => $_configuration['db_user'],'password' => $_configuration['db_password'],'base' => $mainDbName);
+		$this->connexion=array('server' => $_configuration['db_host'],'login' => $_configuration['db_user'],'password' => $_configuration['db_password'],'base' => $_configuration['main_database']);

 		$this->idConnexion=false;
 	}
--- a/main/inc/lib/stats.lib.inc.php
+++ b/main/inc/lib/stats.lib.inc.php
@ -1,4 +1,4 @@
-<?php // $Id: stats.lib.inc.php 9246 2006-09-25 13:24:53Z bmol $ 
+<?php // $Id: stats.lib.inc.php 10082 2006-11-21 19:08:15Z pcool $ 

 /*
 ============================================================================== 
@ -29,6 +29,8 @@
 *
 *	@author Sebastien Piraux
 *	@package dokeos.library
+* 
+* 	@todo use the Database libraries
 ============================================================================== 
 */

@ -66,13 +68,13 @@
 */ 

 // regroup table names for maintenance purpose
-$TABLETRACK_OPEN        = $statsDbName."`.`track_e_open";
+$TABLETRACK_OPEN        = $_configuration['statistics_database']."`.`track_e_open";

-$TABLESTATS_PROVIDERS   = $statsDbName."`.`track_c_providers";
-$TABLESTATS_COUNTRIES   = $statsDbName."`.`track_c_countries";
-$TABLESTATS_BROWSERS    = $statsDbName."`.`track_c_browsers";
-$TABLESTATS_OS          = $statsDbName."`.`track_c_os";
-$TABLESTATS_REFERERS    = $statsDbName."`.`track_c_referers";
+$TABLESTATS_PROVIDERS   = $_configuration['statistics_database']."`.`track_c_providers";
+$TABLESTATS_COUNTRIES   = $_configuration['statistics_database']."`.`track_c_countries";
+$TABLESTATS_BROWSERS    = $_configuration['statistics_database']."`.`track_c_browsers";
+$TABLESTATS_OS          = $_configuration['statistics_database']."`.`track_c_os";
+$TABLESTATS_REFERERS    = $_configuration['statistics_database']."`.`track_c_referers";


 /*
--- a/main/inc/local.inc.php
+++ b/main/inc/local.inc.php
@ -382,7 +382,7 @@ $admin_table = Database::get_main_table(MAIN_ADMIN_TABLE);
                     FROM $user_table
                     LEFT JOIN $admin_table `a`
                     ON `user`.`user_id` = `a`.`user_id`
-                     LEFT JOIN `".$statsDbName."`.`track_e_login` `login`
+                     LEFT JOIN `".$_configuration['statistics_database']."`.`track_e_login` `login`
                     ON `user`.`user_id`  = `login`.`login_user_id`
                     WHERE `user`.`user_id` = '".$_user['user_id']."'
                     ORDER BY `login`.`login_date` DESC LIMIT 1";
@ -469,7 +469,7 @@ if (isset($cidReset) && $cidReset) // course session data refresh requested or e
            $_course['sysCode'     ]         = $cData['code'             ]; // use as key in db
            $_course['path'        ]         = $cData['directory'        ]; // use as key in path
            $_course['dbName'      ]         = $cData['db_name'           ]; // use as key in db list
-            $_course['dbNameGlu'   ]         = $_configuration['table_prefix'] . $cData['db_name'] . $dbGlu; // use in all queries
+            $_course['dbNameGlu'   ]         = $_configuration['table_prefix'] . $cData['db_name'] . $_configuration['db_glue']; // use in all queries
            $_course['titular'     ]         = $cData['tutor_name'       ];
            $_course['language'    ]         = $cData['course_language'   ];
            $_course['extLink'     ]['url' ] = $cData['department_url'    ];
@ -605,8 +605,8 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) // sessi

 	    	// is it the session coach ?
 	        $sql = "SELECT 1
-					FROM `".$mainDbName."`.`session`
-					INNER JOIN `".$mainDbName."`.`session_rel_course`
+					FROM `".$_configuration['main_database']."`.`session`
+					INNER JOIN `".$_configuration['main_database']."`.`session_rel_course`
 						ON session_rel_course.id_session = session.id
 						AND session_rel_course.course_code='$_cid'
 					WHERE session.id_coach = '".$_user['user_id']."'";
@ -624,7 +624,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) // sessi
        	{
 	        	// vérifier que c pas le coach du cours
 	        	$sql = "SELECT 1
-						FROM `".$mainDbName."`.`session_rel_course`
+						FROM `".$_configuration['main_database']."`.`session_rel_course`
 						WHERE session_rel_course.course_code='$_cid'
 						AND session_rel_course.id_coach = '".$_user['user_id']."'";

@ -641,7 +641,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) // sessi
 		        else
 		        {
 	        		// vérifier que c pas un élève de la session
-			        $sql = "SELECT * FROM `".$mainDbName."`.`session_rel_course_rel_user`
+			        $sql = "SELECT * FROM `".$_configuration['main_database']."`.`session_rel_course_rel_user`
 			        		WHERE `id_user`  = '".$_user['user_id']."'
 							AND `course_code` = '$cidReq'";

@ -660,7 +660,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) // sessi
 					}
 					else
 					{
-			 			$sql = "SELECT * FROM `".$mainDbName."`.`course_rel_user`
+			 			$sql = "SELECT * FROM `".$_configuration['main_database']."`.`course_rel_user`
 			               WHERE `user_id`  = '".$_user['user_id']."'
 			               AND `course_code` = '$cidReq'";

--- a/main/install/configuration.dist.php
+++ b/main/install/configuration.dist.php
@ -69,24 +69,24 @@ $_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)
-$dbGlu              = '{DATABASE_GLUE}'; 
+$_configuration['db_glue'] = '{DATABASE_GLUE}'; 
 // prefix all created bases (for courses) with this string		
-$dbNamePrefix       = '{DATABASE_PREFIX}'; 		
+$_configuration['db_prefix']       = '{DATABASE_PREFIX}'; 		
 // main Dokeos database
-$mainDbName         = '{DATABASE_MAIN}'; 
+$_configuration['main_database'] = '{DATABASE_MAIN}'; 
 // stats Dokeos database
-$statsDbName        ='{DATABASE_STATS}'; 
+$_configuration['statistics_database']        ='{DATABASE_STATS}'; 
 // Scorm Dokeos database
-$scormDbName        ='{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)
-$user_personal_database   ='{DATABASE_PERSONAL}'; 
+$_configuration['user_personal_database']   ='{DATABASE_PERSONAL}'; 

 //============================================================================
 //   Directory settings
 //============================================================================
 // URL to the root of your Dokeos installation
-$rootWeb                     = '{ROOT_WEB}';
+$_configuration['root_web']                     = '{ROOT_WEB}';
 // Path to the root of your Dokeos installation
 $rootSys                     = '{ROOT_SYS}';
 // Path from your WWW-root to the root of your Dokeos installation
@ -100,9 +100,9 @@ $rootAdminAppend             = "admin/";
 // Do not change the following values
 // @todo should be moved to api_get_path
 $clarolineRepositorySys      = $rootSys.$clarolineRepositoryAppend;
-$clarolineRepositoryWeb      = $rootWeb.$clarolineRepositoryAppend;
+$clarolineRepositoryWeb      = $_configuration['root_web'].$clarolineRepositoryAppend;
 $coursesRepositorySys        = $rootSys.$coursesRepositoryAppend;
-$coursesRepositoryWeb        = $rootWeb.$coursesRepositoryAppend;
+$coursesRepositoryWeb        = $_configuration['root_web'].$coursesRepositoryAppend;
 $rootAdminSys                = $clarolineRepositorySys.$rootAdminAppend;
 $rootAdminWeb                = $clarolineRepositoryWeb.$rootAdminAppend;
 // directory to store archived courses
--- a/main/install/update_db.inc.php
+++ b/main/install/update_db.inc.php
@ -32,6 +32,7 @@
 * - conditional changing of tables. Currently we execute for example
 * ALTER TABLE `$dbNameForm`.`cours` instructions without checking wether this is necessary.
 * - reorganise code into functions
+* @todo use database library
 ==============================================================================
 */

@ -55,7 +56,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 		exit ();
 	}

-	$dbGlu = get_config_param('dbGlu');
+	$_configuration['db_glue'] = get_config_param('dbGlu');

 	if ($singleDbForm)
 	{
@ -449,7 +450,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 			{
 				if ($singleDbForm)
 				{
-					$prefix = $_configuration['table_prefix'].$mysql_base_course.$dbGlu;
+					$prefix = $_configuration['table_prefix'].$mysql_base_course.$_configuration['db_glue'];

 					$mysql_base_course = $dbNameForm.'`.`'.$_configuration['table_prefix'].$mysql_base_course;
 				}
@ -468,57 +469,57 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 					include ("../lang/$languageCourse/create_course.inc.php");
 				}

-				mysql_query("CREATE TABLE `$mysql_base_course".$dbGlu."chat_connected` (
+				mysql_query("CREATE TABLE `$mysql_base_course".$_configuration['db_glue']."chat_connected` (
 																 `user_id` int unsigned NOT NULL default '0',
 																 `last_connection` datetime NOT NULL default '0000-00-00 00:00:00',
 																 PRIMARY KEY (`user_id`)
 																) TYPE=MyISAM");

-				mysql_query("CREATE TABLE `$mysql_base_course".$dbGlu."online_connected` (
+				mysql_query("CREATE TABLE `$mysql_base_course".$_configuration['db_glue']."online_connected` (
 																 `user_id` int unsigned NOT NULL default '0',
 																 `last_connection` datetime NOT NULL default '0000-00-00 00:00:00',
 																 PRIMARY KEY (`user_id`)
 																) TYPE=MyISAM");

-				mysql_query("CREATE TABLE `$mysql_base_course".$dbGlu."online_link` (
+				mysql_query("CREATE TABLE `$mysql_base_course".$_configuration['db_glue']."online_link` (
 																 `id` smallint(5) unsigned NOT NULL auto_increment,
 																 `name` char(50) NOT NULL default '',
 																 `url` char(100) NOT NULL default '',
 																 PRIMARY KEY (`id`)
 																) TYPE=MyISAM");

-				mysql_query("DROP TABLE `$mysql_base_course".$dbGlu."online`");
+				mysql_query("DROP TABLE `$mysql_base_course".$_configuration['db_glue']."online`");

-				mysql_query("DROP TABLE `$mysql_base_course".$dbGlu."pages`");
+				mysql_query("DROP TABLE `$mysql_base_course".$_configuration['db_glue']."pages`");

-				mysql_query("DROP TABLE `$mysql_base_course".$dbGlu."work_student`");
+				mysql_query("DROP TABLE `$mysql_base_course".$_configuration['db_glue']."work_student`");

-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."last_tooledit` RENAME `".$prefix."item_property`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."item_property` CHANGE `last_date` `lastedit_date` DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."item_property` CHANGE `ref` `ref` INT(10) NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."item_property` CHANGE `type` `lastedit_type` VARCHAR(100) NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."item_property` CHANGE `user_id` `lastedit_user_id` INT UNSIGNED DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."item_property` CHANGE `group_id` `to_group_id` INT(10) UNSIGNED DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."item_property` ADD `to_user_id` INT UNSIGNED DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."item_property` ADD `visibility` TINYINT(1) DEFAULT '1' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."item_property` ADD `start_visible` DATETIME NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."item_property` ADD `end_visible` DATETIME NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."item_property` ADD `insert_user_id` INT UNSIGNED NOT NULL AFTER `tool`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."item_property` ADD `insert_date` DATETIME NOT NULL AFTER `insert_user_id`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."last_tooledit` RENAME `".$prefix."item_property`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."item_property` CHANGE `last_date` `lastedit_date` DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."item_property` CHANGE `ref` `ref` INT(10) NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."item_property` CHANGE `type` `lastedit_type` VARCHAR(100) NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."item_property` CHANGE `user_id` `lastedit_user_id` INT UNSIGNED DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."item_property` CHANGE `group_id` `to_group_id` INT(10) UNSIGNED DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."item_property` ADD `to_user_id` INT UNSIGNED DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."item_property` ADD `visibility` TINYINT(1) DEFAULT '1' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."item_property` ADD `start_visible` DATETIME NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."item_property` ADD `end_visible` DATETIME NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."item_property` ADD `insert_user_id` INT UNSIGNED NOT NULL AFTER `tool`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."item_property` ADD `insert_date` DATETIME NOT NULL AFTER `insert_user_id`");

 				/*
 				-----------------------------------------------------------
 				Update the announcement table
 				-----------------------------------------------------------
 				*/
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."announcement` CHANGE `contenu` `content` TEXT DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."announcement` CHANGE `id` `id` MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."announcement` CHANGE `temps` `end_date` DATE DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."announcement` DROP `code_cours`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."announcement` CHANGE `ordre` `display_order` MEDIUMINT(9) DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."announcement` ADD `title` TEXT AFTER `id`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."announcement` CHANGE `contenu` `content` TEXT DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."announcement` CHANGE `id` `id` MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."announcement` CHANGE `temps` `end_date` DATE DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."announcement` DROP `code_cours`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."announcement` CHANGE `ordre` `display_order` MEDIUMINT(9) DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."announcement` ADD `title` TEXT AFTER `id`");
 				// Set item-properties of announcements and generate a title for the announcement
-				$sql = "SELECT id,end_date,content FROM `$mysql_base_course".$dbGlu."announcement`";
+				$sql = "SELECT id,end_date,content FROM `$mysql_base_course".$_configuration['db_glue']."announcement`";
 				$res = mysql_query($sql);
 				while ($obj = mysql_fetch_object($res))
 				{
@ -528,9 +529,9 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 					{
 						$title = substr(strip_tags($title),0,50).'...';
 					}
-					$sql = "UPDATE `$mysql_base_course".$dbGlu."announcement` SET title = '".mysql_real_escape_string($title)."' WHERE id='".$obj->id."'";
+					$sql = "UPDATE `$mysql_base_course".$_configuration['db_glue']."announcement` SET title = '".mysql_real_escape_string($title)."' WHERE id='".$obj->id."'";
 					mysql_query($sql);
-					$sql = "INSERT INTO `$mysql_base_course".$dbGlu."item_property` SET ";
+					$sql = "INSERT INTO `$mysql_base_course".$_configuration['db_glue']."item_property` SET ";
 					$sql .= " tool = '".TOOL_ANNOUNCEMENT."', ";
 					$sql .= " insert_date = '".$obj->end_date." 00:00:00', ";
 					$sql .= " lastedit_date = '".$obj->end_date." 00:00:00', ";
@ -545,26 +546,26 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 				Update the bb_whosonline table
 				-----------------------------------------------------------
 				*/
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."bb_whosonline` CHANGE `date` `online_date` VARCHAR(255) DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."bb_whosonline` CHANGE `date` `online_date` VARCHAR(255) DEFAULT NULL");

 				/*
 				-----------------------------------------------------------
 				Update the calendar_event table
 				-----------------------------------------------------------
 				*/
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."calendar_event` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."calendar_event` CHANGE `titre` `title` VARCHAR(200) NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."calendar_event` CHANGE `contenu` `content` TEXT DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."calendar_event` CHANGE `day` `start_date` DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."calendar_event` DROP `hour`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."calendar_event` DROP `lasting`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."calendar_event` ADD `end_date` DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."calendar_event` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."calendar_event` CHANGE `titre` `title` VARCHAR(200) NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."calendar_event` CHANGE `contenu` `content` TEXT DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."calendar_event` CHANGE `day` `start_date` DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."calendar_event` DROP `hour`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."calendar_event` DROP `lasting`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."calendar_event` ADD `end_date` DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL");
 				// Set item-properties of calendar events
-				$sql = "SELECT id,start_date FROM `$mysql_base_course".$dbGlu."calendar_event`";
+				$sql = "SELECT id,start_date FROM `$mysql_base_course".$_configuration['db_glue']."calendar_event`";
 				$res = mysql_query($sql);
 				while ($obj = mysql_fetch_object($res))
 				{
-					$sql = "INSERT INTO `$mysql_base_course".$dbGlu."item_property` SET ";
+					$sql = "INSERT INTO `$mysql_base_course".$_configuration['db_glue']."item_property` SET ";
 					$sql .= " tool = '".TOOL_CALENDAR_EVENT."', ";
 					$sql .= " insert_date = NOW(), ";
 					$sql .= " lastedit_date = NOW(), ";
@ -579,18 +580,18 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 				Update the course_description table
 				-----------------------------------------------------------
 				*/
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."course_description` CHANGE `id` `id` TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."course_description` DROP `upDate`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."course_description` CHANGE `id` `id` TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."course_description` DROP `upDate`");

 				/*
 				-----------------------------------------------------------
 				Update the document table
 				-----------------------------------------------------------
 				*/
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."document` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."document` CHANGE `comment` `comment` TEXT DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."document` ADD `title` VARCHAR(255) AFTER `comment`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."document` ADD `size` INT(16) NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."document` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."document` CHANGE `comment` `comment` TEXT DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."document` ADD `title` VARCHAR(255) AFTER `comment`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."document` ADD `size` INT(16) NOT NULL");
 				// @note: Item properties of documents are set in update_files.inc.php

 				/*
@ -598,26 +599,26 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 				Update the dropbox tables
 				-----------------------------------------------------------
 				*/
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."dropbox_file` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."dropbox_file` CHANGE `uploaderId` `uploader_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."dropbox_file` CHANGE `filesize` `filesize` INT(10) UNSIGNED DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."dropbox_file` CHANGE `uploadDate` `upload_date` DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."dropbox_file` CHANGE `lastUploadDate` `last_upload_date` DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."dropbox_file` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."dropbox_file` CHANGE `uploaderId` `uploader_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."dropbox_file` CHANGE `filesize` `filesize` INT(10) UNSIGNED DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."dropbox_file` CHANGE `uploadDate` `upload_date` DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."dropbox_file` CHANGE `lastUploadDate` `last_upload_date` DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL");

-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."dropbox_person` CHANGE `fileId` `file_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."dropbox_person` CHANGE `personId` `user_id` INT UNSIGNED DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."dropbox_person` CHANGE `fileId` `file_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."dropbox_person` CHANGE `personId` `user_id` INT UNSIGNED DEFAULT '0' NOT NULL");

-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."dropbox_post` CHANGE `fileId` `file_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."dropbox_post` CHANGE `recipientId` `dest_user_id` INT UNSIGNED DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."dropbox_post` ADD `feedback_date` DATETIME NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."dropbox_post` ADD `feedback` TEXT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."dropbox_post` CHANGE `fileId` `file_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."dropbox_post` CHANGE `recipientId` `dest_user_id` INT UNSIGNED DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."dropbox_post` ADD `feedback_date` DATETIME NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."dropbox_post` ADD `feedback` TEXT");

 				// Set item-properties of dropbox files
-				$sql = "SELECT * FROM `$mysql_base_course".$dbGlu."dropbox_file` f, `$mysql_base_course".$dbGlu."dropbox_post` p WHERE f.id = p.file_id";
+				$sql = "SELECT * FROM `$mysql_base_course".$_configuration['db_glue']."dropbox_file` f, `".$_configuration['db_glue']."_base_course".$_configuration['db_glue']."dropbox_post` p WHERE f.id = p.file_id";
 				$res = mysql_query($sql);
 				while ($obj = mysql_fetch_object($res))
 				{
-					$sql = "INSERT INTO `$mysql_base_course".$dbGlu."item_property` SET ";
+					$sql = "INSERT INTO `$mysql_base_course".$_configuration['db_glue']."item_property` SET ";
 					$sql .= " tool = '".TOOL_DROPBOX."', ";
 					$sql .= " insert_date = '".$obj->upload_date."', ";
 					$sql .= " lastedit_date = '".$obj->last_upload_date."', ";
@ -710,7 +711,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 				Update the group tables
 				-----------------------------------------------------------
 				*/
-				mysql_query("CREATE TABLE `$mysql_base_course".$dbGlu."group_category` (
+				mysql_query("CREATE TABLE `$mysql_base_course".$_configuration['db_glue']."group_category` (
 																 `id` int(10) unsigned NOT NULL auto_increment,
 																 `title` varchar(255) NOT NULL default '',
 																 `description` text NOT NULL,
@ -725,87 +726,87 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 																) TYPE=MyISAM");

 				// Get the group-properties from old portal
-				$sql = "SELECT * FROM `$mysql_base_course".$dbGlu."group_property`";
+				$sql = "SELECT * FROM `$mysql_base_course".$_configuration['db_glue']."group_property`";
 				$res = mysql_query($sql);

 				$group_properties = mysql_fetch_array($res,MYSQL_ASSOC);

-				mysql_query("DROP TABLE `$mysql_base_course".$dbGlu."group_property`");
-
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."group_team` RENAME `".$prefix."group_info`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."group_info` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."group_info` CHANGE `tutor` `tutor_id` MEDIUMINT(8) UNSIGNED DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."group_info` CHANGE `forumId` `forum_id` INT(10) UNSIGNED DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."group_info` CHANGE `maxStudent` `max_student` SMALLINT(5) UNSIGNED DEFAULT '8' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."group_info` CHANGE `secretDirectory` `secret_directory` VARCHAR(200) DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."group_info` ADD `self_registration_allowed` ENUM('0', '1') DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."group_info` ADD `self_unregistration_allowed` ENUM('0', '1') DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."group_info` ADD `category_id` INT(10) UNSIGNED NOT NULL AFTER `name`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."group_info` ADD `forum_state` ENUM('0', '1', '2') DEFAULT '0' NOT NULL AFTER `tutor_id`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."group_info` ADD `doc_state` ENUM('0', '1', '2') DEFAULT '0' NOT NULL AFTER `max_student`");
+				mysql_query("DROP TABLE `$mysql_base_course".$_configuration['db_glue']."group_property`");
+
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."group_team` RENAME `".$prefix."group_info`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."group_info` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."group_info` CHANGE `tutor` `tutor_id` MEDIUMINT(8) UNSIGNED DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."group_info` CHANGE `forumId` `forum_id` INT(10) UNSIGNED DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."group_info` CHANGE `maxStudent` `max_student` SMALLINT(5) UNSIGNED DEFAULT '8' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."group_info` CHANGE `secretDirectory` `secret_directory` VARCHAR(200) DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."group_info` ADD `self_registration_allowed` ENUM('0', '1') DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."group_info` ADD `self_unregistration_allowed` ENUM('0', '1') DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."group_info` ADD `category_id` INT(10) UNSIGNED NOT NULL AFTER `name`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."group_info` ADD `forum_state` ENUM('0', '1', '2') DEFAULT '0' NOT NULL AFTER `tutor_id`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."group_info` ADD `doc_state` ENUM('0', '1', '2') DEFAULT '0' NOT NULL AFTER `max_student`");
 				// Update group-properties (doc_state = always private, forum_state ~ old group properties, category_id = default category)
 				$forum_state = ($group_properties['private']) == '0' ? '1' : '2';
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."group_info` SET category_id='2', doc_state='2', forum_state = '".$forum_state."', secret_directory = CONCAT('/',secret_directory)");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."group_info` SET tutor_id='0' WHERE tutor_id IS NULL");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."group_info` SET category_id='2', doc_state='2', forum_state = '".$forum_state."', secret_directory = CONCAT('/',secret_directory)");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."group_info` SET tutor_id='0' WHERE tutor_id IS NULL");

-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."group_rel_team_user` RENAME `".$prefix."group_rel_user`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."group_rel_user` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."group_rel_user` CHANGE `user` `user_id` INT UNSIGNED DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."group_rel_user` CHANGE `team` `group_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."group_rel_user` CHANGE `role` `role` CHAR(50) NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."group_rel_team_user` RENAME `".$prefix."group_rel_user`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."group_rel_user` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."group_rel_user` CHANGE `user` `user_id` INT UNSIGNED DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."group_rel_user` CHANGE `team` `group_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."group_rel_user` CHANGE `role` `role` CHAR(50) NOT NULL");

-				mysql_query("INSERT INTO `$mysql_base_course".$dbGlu."group_category` (`id`,`title`,`groups_per_user`) VALUES ('2','".get_lang('DefaultGroupCategory')."','".$group_properties['nbCoursPerUser']."')");
+				mysql_query("INSERT INTO `$mysql_base_course".$_configuration['db_glue']."group_category` (`id`,`title`,`groups_per_user`) VALUES ('2','".get_lang('DefaultGroupCategory')."','".$group_properties['nbCoursPerUser']."')");

 				/*
 				-----------------------------------------------------------
 				Update the learnpath tables
 				-----------------------------------------------------------
 				*/
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_chapters` RENAME `".$prefix."learnpath_chapter`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_chapter` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_chapter` CHANGE `learnpath_id` `learnpath_id` INT(10) UNSIGNED DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_chapter` CHANGE `ordre` `display_order` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_chapter` ADD `parent_chapter_id` INT UNSIGNED DEFAULT 0 NOT NULL AFTER `chapter_description`");
-
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_items` RENAME `".$prefix."learnpath_item`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_item` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_item` CHANGE `chapter` `chapter_id` INT(10) UNSIGNED DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_item` CHANGE `item_id` `item_id` INT(10) UNSIGNED DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_item` CHANGE `ordre` `display_order` SMALLINT(6) DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_item` CHANGE `prereq` `prereq_id` INT(10) UNSIGNED DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_item` ADD `prereq_completion_limit` VARCHAR(10) DEFAULT NULL");
-
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_main` CHANGE `learnpath_id` `learnpath_id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
-
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_users` RENAME `".$prefix."learnpath_user`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_user` CHANGE `user_id` `user_id` INT UNSIGNED DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_user` CHANGE `learnpath_id` `learnpath_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_user` CHANGE `learnpath_item_id` `learnpath_item_id` INT(10) UNSIGNED DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."learnpath_user` CHANGE `score` `score` SMALLINT(6) DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_chapters` RENAME `".$prefix."learnpath_chapter`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_chapter` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_chapter` CHANGE `learnpath_id` `learnpath_id` INT(10) UNSIGNED DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_chapter` CHANGE `ordre` `display_order` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_chapter` ADD `parent_chapter_id` INT UNSIGNED DEFAULT 0 NOT NULL AFTER `chapter_description`");
+
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_items` RENAME `".$prefix."learnpath_item`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_item` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_item` CHANGE `chapter` `chapter_id` INT(10) UNSIGNED DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_item` CHANGE `item_id` `item_id` INT(10) UNSIGNED DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_item` CHANGE `ordre` `display_order` SMALLINT(6) DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_item` CHANGE `prereq` `prereq_id` INT(10) UNSIGNED DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_item` ADD `prereq_completion_limit` VARCHAR(10) DEFAULT NULL");
+
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_main` CHANGE `learnpath_id` `learnpath_id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
+
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_users` RENAME `".$prefix."learnpath_user`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_user` CHANGE `user_id` `user_id` INT UNSIGNED DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_user` CHANGE `learnpath_id` `learnpath_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_user` CHANGE `learnpath_item_id` `learnpath_item_id` INT(10) UNSIGNED DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."learnpath_user` CHANGE `score` `score` SMALLINT(6) DEFAULT NULL");

 				/*
 				-----------------------------------------------------------
 				Update the link tables
 				-----------------------------------------------------------
 				*/
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."link` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."link` CHANGE `url` `url` TEXT NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."link` CHANGE `titre` `title` VARCHAR(150) DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."link` CHANGE `category` `category_id` SMALLINT(5) UNSIGNED DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."link` CHANGE `ordre` `display_order` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."link` ADD `on_homepage` ENUM('0', '1') DEFAULT '0' NOT NULL");
-
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."link_categories` RENAME `".$prefix."link_category`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."link_category` CHANGE `id` `id` SMALLINT(5) UNSIGNED NOT NULL AUTO_INCREMENT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."link_category` CHANGE `categoryname` `category_title` VARCHAR(255) NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."link_category` CHANGE `ordre` `display_order` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."link` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."link` CHANGE `url` `url` TEXT NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."link` CHANGE `titre` `title` VARCHAR(150) DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."link` CHANGE `category` `category_id` SMALLINT(5) UNSIGNED DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."link` CHANGE `ordre` `display_order` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."link` ADD `on_homepage` ENUM('0', '1') DEFAULT '0' NOT NULL");
+
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."link_categories` RENAME `".$prefix."link_category`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."link_category` CHANGE `id` `id` SMALLINT(5) UNSIGNED NOT NULL AUTO_INCREMENT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."link_category` CHANGE `categoryname` `category_title` VARCHAR(255) NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."link_category` CHANGE `ordre` `display_order` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL");

 				// Set item-properties of links
-				$sql = "SELECT id FROM `$mysql_base_course".$dbGlu."link`";
+				$sql = "SELECT id FROM `$mysql_base_course".$_configuration['db_glue']."link`";
 				$res = mysql_query($sql);
 				while ($obj = mysql_fetch_object($res))
 				{
-					$sql = "INSERT INTO `$mysql_base_course".$dbGlu."item_property` SET ";
+					$sql = "INSERT INTO `$mysql_base_course".$_configuration['db_glue']."item_property` SET ";
 					$sql .= " tool = '".TOOL_LINK."', ";
 					$sql .= " insert_date = NOW(), ";
 					$sql .= " lastedit_date = NOW(), ";
@ -817,24 +818,24 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 				
 				// move all the links on the course homepage to the links tool
 				// step 1: count the max display order of the 0 category_id
-				$sql="SELECT * FROM `$mysql_base_course".$dbGlu."link` WHERE category_id='0' ORDER BY display_order DESC";
+				$sql="SELECT * FROM `$mysql_base_course".$_configuration['db_glue']."link` WHERE category_id='0' ORDER BY display_order DESC";
 				$result2=mysql_query($sql);
 				$row=mysql_fetch_array($result2);
 				$maxsort=$row['display_order']; 
 				
 				// step 2: select all the links that were added to the course homepage
-				$sql="SELECT * FROM `$mysql_base_course".$dbGlu."tool` WHERE link LIKE 'http://%'";
+				$sql="SELECT * FROM `$mysql_base_course".$_configuration['db_glue']."tool` WHERE link LIKE 'http://%'";
 				$result2 = mysql_query($sql);
 				while ($row=mysql_fetch_array($result2))
 				{
 					$maxsort++;
 					// step 3: for each link on homepage: add to the links table
-					$sqlinsert="INSERT INTO `$mysql_base_course".$dbGlu."link` (url, title, category_id, display_order, on_homepage) VALUES('".$row['link']."','".$row['name']."','0','".$maxsort."','1')";
+					$sqlinsert="INSERT INTO `$mysql_base_course".$_configuration['db_glue']."link` (url, title, category_id, display_order, on_homepage) VALUES('".$row['link']."','".$row['name']."','0','".$maxsort."','1')";
 					$resultinsert=mysql_query($sqlinsert);
 					$insertid=mysql_insert_id();
 					
 					// step 4: for each link on homepage: add the link in the item_property table
-					$sql_item_property = "INSERT INTO `$mysql_base_course".$dbGlu."item_property` SET ";
+					$sql_item_property = "INSERT INTO `$mysql_base_course".$_configuration['db_glue']."item_property` SET ";
 					$sql_item_property .= " tool = '".TOOL_LINK."', ";
 					$sql_item_property .= " ref = '".$insertid."', ";
 					$sql_item_property .= " lastedit_type = 'LinkAdded', ";
@ -842,7 +843,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 					api_sql_query($sql_item_property);	

 					// step 5: for each link on homepage: delete the link in the tool table.				
-					$sqldelete="DELETE FROM `$mysql_base_course".$dbGlu."tool` WHERE id='".$row['id']."'";
+					$sqldelete="DELETE FROM `$mysql_base_course".$_configuration['db_glue']."tool` WHERE id='".$row['id']."'";
 					$resultdelete=mysql_query($sqldelete);
 					
 				}
@ -853,109 +854,109 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 				Update the quiz tables
 				-----------------------------------------------------------
 				*/
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."quiz_rel_test_question` RENAME `".$prefix."quiz_rel_question`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."quiz_rel_test_question` RENAME `".$prefix."quiz_rel_question`");

-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."quiz_test` RENAME `".$prefix."quiz`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."quiz` CHANGE `titre` `title` VARCHAR(200) NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."quiz` CHANGE `description` `description` TEXT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."quiz` CHANGE `sound` `sound` VARCHAR(50)");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."quiz` CHANGE `type` `type` TINYINT(3) UNSIGNED DEFAULT '1' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."quiz` CHANGE `active` `active` ENUM('0', '1') DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."quiz_test` RENAME `".$prefix."quiz`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."quiz` CHANGE `titre` `title` VARCHAR(200) NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."quiz` CHANGE `description` `description` TEXT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."quiz` CHANGE `sound` `sound` VARCHAR(50)");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."quiz` CHANGE `type` `type` TINYINT(3) UNSIGNED DEFAULT '1' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."quiz` CHANGE `active` `active` ENUM('0', '1') DEFAULT '0' NOT NULL");

-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."quiz_answer` CHANGE `reponse` `answer` TEXT NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."quiz_answer` CHANGE `ponderation` `ponderation` SMALLINT(6) DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."quiz_answer` CHANGE `r_position` `position` MEDIUMINT(8) UNSIGNED DEFAULT '1' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."quiz_answer` CHANGE `reponse` `answer` TEXT NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."quiz_answer` CHANGE `ponderation` `ponderation` SMALLINT(6) DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."quiz_answer` CHANGE `r_position` `position` MEDIUMINT(8) UNSIGNED DEFAULT '1' NOT NULL");

-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."quiz_question` CHANGE `description` `description` TEXT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."quiz_question` CHANGE `q_position` `position` MEDIUMINT(8) UNSIGNED DEFAULT '1' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."quiz_question` CHANGE `picture` `picture` VARCHAR(50)");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."quiz_question` CHANGE `description` `description` TEXT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."quiz_question` CHANGE `q_position` `position` MEDIUMINT(8) UNSIGNED DEFAULT '1' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."quiz_question` CHANGE `picture` `picture` VARCHAR(50)");

 				/*
 				-----------------------------------------------------------
 				Update the resource linker table
 				-----------------------------------------------------------
 				*/
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."added_resources` RENAME `".$prefix."resource`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."resource` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."resource` CHANGE `source_id` `source_id` INT(10) UNSIGNED DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."resource` CHANGE `resource_id` `resource_id` INT(10) UNSIGNED DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."added_resources` RENAME `".$prefix."resource`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."resource` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."resource` CHANGE `source_id` `source_id` INT(10) UNSIGNED DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."resource` CHANGE `resource_id` `resource_id` INT(10) UNSIGNED DEFAULT NULL");

 				/*
 				-----------------------------------------------------------
 				Update the scormdocument table
 				-----------------------------------------------------------
 				*/
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."scormdocument` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."scormdocument` ADD `name` VARCHAR(100)");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."scormdocument` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."scormdocument` ADD `name` VARCHAR(100)");

 				/*
 				-----------------------------------------------------------
 				Update the student_publication table
 				-----------------------------------------------------------
 				*/
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."assignment_doc` RENAME `".$prefix."student_publication`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."student_publication` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."student_publication` CHANGE `titre` `title` VARCHAR(200) DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."student_publication` CHANGE `auteurs` `author` VARCHAR(200) DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."student_publication` CHANGE `active` `active` TINYINT(4) DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."student_publication` CHANGE `accepted` `accepted` TINYINT(4) DEFAULT '0'");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."student_publication` CHANGE `date` `sent_date` DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."assignment_doc` RENAME `".$prefix."student_publication`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."student_publication` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."student_publication` CHANGE `titre` `title` VARCHAR(200) DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."student_publication` CHANGE `auteurs` `author` VARCHAR(200) DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."student_publication` CHANGE `active` `active` TINYINT(4) DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."student_publication` CHANGE `accepted` `accepted` TINYINT(4) DEFAULT '0'");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."student_publication` CHANGE `date` `sent_date` DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL");

 				/*
 				-----------------------------------------------------------
 				Update the tool introduction table
 				-----------------------------------------------------------
 				*/
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."tool_intro` CHANGE `id` `id` VARCHAR(50) NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."tool_intro` CHANGE `texte_intro` `intro_text` TEXT NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."tool_intro` CHANGE `id` `id` VARCHAR(50) NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."tool_intro` CHANGE `texte_intro` `intro_text` TEXT NOT NULL");

-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool_intro` SET id='".TOOL_COURSE_HOMEPAGE."' WHERE id = '1'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool_intro` SET id='".TOOL_COURSE_HOMEPAGE."' WHERE id = '1'");

 				/*
 				-----------------------------------------------------------
 				Update the user information tables
 				-----------------------------------------------------------
 				*/
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."userinfo_content` CHANGE `user_id` `user_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."userinfo_content` CHANGE `def_id` `definition_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."userinfo_content` CHANGE `ed_ip` `editor_ip` VARCHAR(39) DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."userinfo_content` CHANGE `ed_date` `edition_time` DATETIME DEFAULT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."userinfo_content` CHANGE `content` `content` TEXT NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."userinfo_content` CHANGE `user_id` `user_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."userinfo_content` CHANGE `def_id` `definition_id` INT(10) UNSIGNED DEFAULT '0' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."userinfo_content` CHANGE `ed_ip` `editor_ip` VARCHAR(39) DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."userinfo_content` CHANGE `ed_date` `edition_time` DATETIME DEFAULT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."userinfo_content` CHANGE `content` `content` TEXT NOT NULL");

-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."userinfo_def` CHANGE `nbLine` `line_count` TINYINT(3) UNSIGNED DEFAULT '5' NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."userinfo_def` CHANGE `nbLine` `line_count` TINYINT(3) UNSIGNED DEFAULT '5' NOT NULL");

 				/*
 				-----------------------------------------------------------
 				Update the tool table
 				-----------------------------------------------------------
 				*/
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."tool_list` RENAME `".$prefix."tool`");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."tool` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."tool` CHANGE `rubrique` `name` VARCHAR(100) NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."tool` CHANGE `lien` `link` VARCHAR(255) NOT NULL");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."tool` CHANGE `visible` `visibility` TINYINT(3) UNSIGNED DEFAULT '0'");
-				mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."tool` CHANGE `addedTool` `added_tool` ENUM('0', '1') DEFAULT '0'");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_COURSE_DESCRIPTION."' WHERE link LIKE 'course_description/%'");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_CALENDAR_EVENT."' WHERE link LIKE 'calendar/%'");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_DOCUMENT."' WHERE link LIKE 'document/%'");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_ANNOUNCEMENT."' WHERE link LIKE 'announcements/%'");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_BB_FORUM."' WHERE link LIKE 'phpbb/%'");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_LINK."' WHERE link = 'link/link.php'");
-				mysql_query("Update `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_DROPBOX."' WHERE link LIKE 'dropbox/%'");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_QUIZ."' WHERE link LIKE 'exercice/%'");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_USER."' WHERE link LIKE 'user/%'");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_GROUP."' WHERE link LIKE 'group/%'");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_CHAT."' WHERE link LIKE 'chat/%'");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_CONFERENCE."' WHERE link LIKE 'online/%'");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_STUDENTPUBLICATION."' WHERE link LIKE 'work/%'");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_TRACKING."' WHERE link LIKE 'tracking/%'");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_COURSE_SETTING."' WHERE link LIKE 'course_info/%'");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_LEARNPATH."' WHERE link LIKE 'scorm/%'");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET name='".TOOL_HOMEPAGE_LINK."', link='link/link.php?action=addlink' WHERE link LIKE 'external_module/%'");
-				//mysql_query("INSERT INTO `$mysql_base_course".$dbGlu."tool` (`id`, `name`, `link`, `image`, `visibility`, `admin`, `address`, `added_tool`, `target`) VALUES ('', '".TOOL_BACKUP."', 'coursecopy/backup.php', 'backup.gif', '0', '1', '', '0', '_self')");
-				mysql_query("INSERT INTO `$mysql_base_course".$dbGlu."tool` (`id`, `name`, `link`, `image`, `visibility`, `admin`, `address`, `added_tool`, `target`) VALUES ('', '".TOOL_COPY_COURSE_CONTENT."', 'coursecopy/copy_course.php', 'copy.gif', '0', '1', '', '0', '_self')");
-				//mysql_query("INSERT INTO `$mysql_base_course".$dbGlu."tool` (`id`, `name`, `link`, `image`, `visibility`, `admin`, `address`, `added_tool`, `target`) VALUES ('', '".TOOL_RECYCLE_COURSE."', 'coursecopy/recycle_course.php', 'recycle.gif', '0', '1', '', '0', '_self')");
-				mysql_query("UPDATE `$mysql_base_course".$dbGlu."tool` SET `added_tool` = '0' WHERE `added_tool` = ''");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."tool_list` RENAME `".$prefix."tool`");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."tool` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."tool` CHANGE `rubrique` `name` VARCHAR(100) NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."tool` CHANGE `lien` `link` VARCHAR(255) NOT NULL");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."tool` CHANGE `visible` `visibility` TINYINT(3) UNSIGNED DEFAULT '0'");
+				mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."tool` CHANGE `addedTool` `added_tool` ENUM('0', '1') DEFAULT '0'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_COURSE_DESCRIPTION."' WHERE link LIKE 'course_description/%'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_CALENDAR_EVENT."' WHERE link LIKE 'calendar/%'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_DOCUMENT."' WHERE link LIKE 'document/%'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_ANNOUNCEMENT."' WHERE link LIKE 'announcements/%'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_BB_FORUM."' WHERE link LIKE 'phpbb/%'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_LINK."' WHERE link = 'link/link.php'");
+				mysql_query("Update `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_DROPBOX."' WHERE link LIKE 'dropbox/%'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_QUIZ."' WHERE link LIKE 'exercice/%'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_USER."' WHERE link LIKE 'user/%'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_GROUP."' WHERE link LIKE 'group/%'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_CHAT."' WHERE link LIKE 'chat/%'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_CONFERENCE."' WHERE link LIKE 'online/%'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_STUDENTPUBLICATION."' WHERE link LIKE 'work/%'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_TRACKING."' WHERE link LIKE 'tracking/%'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_COURSE_SETTING."' WHERE link LIKE 'course_info/%'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_LEARNPATH."' WHERE link LIKE 'scorm/%'");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET name='".TOOL_HOMEPAGE_LINK."', link='link/link.php?action=addlink' WHERE link LIKE 'external_module/%'");
+				//mysql_query("INSERT INTO `$mysql_base_course".$_configuration['db_glue']."tool` (`id`, `name`, `link`, `image`, `visibility`, `admin`, `address`, `added_tool`, `target`) VALUES ('', '".TOOL_BACKUP."', 'coursecopy/backup.php', 'backup.gif', '0', '1', '', '0', '_self')");
+				mysql_query("INSERT INTO `$mysql_base_course".$_configuration['db_glue']."tool` (`id`, `name`, `link`, `image`, `visibility`, `admin`, `address`, `added_tool`, `target`) VALUES ('', '".TOOL_COPY_COURSE_CONTENT."', 'coursecopy/copy_course.php', 'copy.gif', '0', '1', '', '0', '_self')");
+				//mysql_query("INSERT INTO `$mysql_base_course".$_configuration['db_glue']."tool` (`id`, `name`, `link`, `image`, `visibility`, `admin`, `address`, `added_tool`, `target`) VALUES ('', '".TOOL_RECYCLE_COURSE."', 'coursecopy/recycle_course.php', 'recycle.gif', '0', '1', '', '0', '_self')");
+				mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."tool` SET `added_tool` = '0' WHERE `added_tool` = ''");

 				$i ++;
 			}
--- a/main/install/update_files.inc.php
+++ b/main/install/update_files.inc.php
@ -72,7 +72,7 @@
 */
 function fill_document_table($dir)
 {
-	global $newPath, $course, $mysql_base_course, $dbGlu;
+	global $newPath, $course, $mysql_base_course, $_configuration;

 	$documentPath = $newPath.'courses/'.$course.'/document';

@ -92,41 +92,41 @@ function fill_document_table($dir)
 			{
 				$file_size = filesize($dir.'/'.$readdir);

-				$result = mysql_query("SELECT id,visibility FROM `$mysql_base_course".$dbGlu."document` WHERE path='".addslashes($path)."' LIMIT 0,1");
+				$result = mysql_query("SELECT id,visibility FROM `$mysql_base_course".$_configuration['db_glue']."document` WHERE path='".addslashes($path)."' LIMIT 0,1");

 				if (list ($id, $visibility) = mysql_fetch_row($result))
 				{
-					mysql_query("UPDATE `$mysql_base_course".$dbGlu."document` SET filetype='file',title='".addslashes($readdir)."',size='$file_size' WHERE id='$id' AND path='".addslashes($path)."'");
+					mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."document` SET filetype='file',title='".addslashes($readdir)."',size='$file_size' WHERE id='$id' AND path='".addslashes($path)."'");
 				}
 				else
 				{
-					mysql_query("INSERT INTO `$mysql_base_course".$dbGlu."document`(path,filetype,title,size) VALUES('".addslashes($path)."','file','".addslashes($readdir)."','$file_size')");
+					mysql_query("INSERT INTO `$mysql_base_course".$_configuration['db_glue']."document`(path,filetype,title,size) VALUES('".addslashes($path)."','file','".addslashes($readdir)."','$file_size')");

 					$id = mysql_insert_id();
 				}

 				$visibility = ($visibility == 'v') ? 1 : 0;

-				mysql_query("INSERT INTO `$mysql_base_course".$dbGlu."item_property`(tool,ref,visibility,lastedit_type,to_group_id,insert_date,lastedit_date) VALUES('document','$id','$visibility','DocumentAdded','0','".$file_date."','".$file_date."')");
+				mysql_query("INSERT INTO `$mysql_base_course".$_configuration['db_glue']."item_property`(tool,ref,visibility,lastedit_type,to_group_id,insert_date,lastedit_date) VALUES('document','$id','$visibility','DocumentAdded','0','".$file_date."','".$file_date."')");
 			}
 			elseif (is_dir($dir.'/'.$readdir))
 			{
-				$result = mysql_query("SELECT id,visibility FROM `$mysql_base_course".$dbGlu."document` WHERE path='".addslashes($path)."' LIMIT 0,1");
+				$result = mysql_query("SELECT id,visibility FROM `$mysql_base_course".$_configuration['db_glue']."document` WHERE path='".addslashes($path)."' LIMIT 0,1");

 				if (list ($id, $visibility) = mysql_fetch_row($result))
 				{
-					mysql_query("UPDATE `$mysql_base_course".$dbGlu."document` SET filetype='folder',title='".addslashes($readdir)."' WHERE id='$id' AND path='".addslashes($path)."'");
+					mysql_query("UPDATE `$mysql_base_course".$_configuration['db_glue']."document` SET filetype='folder',title='".addslashes($readdir)."' WHERE id='$id' AND path='".addslashes($path)."'");
 				}
 				else
 				{
-					mysql_query("INSERT INTO `$mysql_base_course".$dbGlu."document`(path,filetype,title) VALUES('".addslashes($path)."','folder','".addslashes($readdir)."')");
+					mysql_query("INSERT INTO `$mysql_base_course".$_configuration['db_glue']."document`(path,filetype,title) VALUES('".addslashes($path)."','folder','".addslashes($readdir)."')");

 					$id = mysql_insert_id();
 				}

 				$visibility = ($visibility == 'v') ? 1 : 0;

-				mysql_query("INSERT INTO `$mysql_base_course".$dbGlu."item_property`(tool,ref,visibility, lastedit_type, to_group_id,insert_date,lastedit_date) VALUES('document','$id','$visibility','FolderCreated','0','".$file_date."','".$file_date."')");
+				mysql_query("INSERT INTO `$mysql_base_course".$_configuration['db_glue']."item_property`(tool,ref,visibility, lastedit_type, to_group_id,insert_date,lastedit_date) VALUES('document','$id','$visibility','FolderCreated','0','".$file_date."','".$file_date."')");

 				if (!fill_document_table($dir.'/'.$readdir))
 				{
@ -206,15 +206,15 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))

 		fill_document_table($newPath.'courses/'.$course.'/document');

-		mysql_query("ALTER TABLE `$mysql_base_course".$dbGlu."document` DROP `visibility`");
+		mysql_query("ALTER TABLE `$mysql_base_course".$_configuration['db_glue']."document` DROP `visibility`");

 		// Update item_properties of group documents
-		$sql = "SELECT d.id AS doc_id, g.id AS group_id FROM `$mysql_base_course".$dbGlu."group_info` g,`$mysql_base_course".$dbGlu."document` d WHERE path LIKE CONCAT(g.secret_directory,'%')";
+		$sql = "SELECT d.id AS doc_id, g.id AS group_id FROM `$mysql_base_course".$_configuration['db_glue']."group_info` g,`$mysql_base_course".$_configuration['db_glue']."document` d WHERE path LIKE CONCAT(g.secret_directory,'%')";
 		$res = mysql_query($sql);

 		while ($group_doc = mysql_fetch_object($res))
 		{
-			$sql = "UPDATE `$mysql_base_course".$dbGlu."item_property` SET to_group_id = '".$group_doc->group_id."', visibility = '1' WHERE ref = '".$group_doc->doc_id."' AND tool = '".TOOL_DOCUMENT."'";
+			$sql = "UPDATE `$mysql_base_course".$_configuration['db_glue']."item_property` SET to_group_id = '".$group_doc->group_id."', visibility = '1' WHERE ref = '".$group_doc->doc_id."' AND tool = '".TOOL_DOCUMENT."'";
 			mysql_query($sql);
 		}
 	}
--- a/main/metadata/importdocs.php
+++ b/main/metadata/importdocs.php
@ -89,9 +89,15 @@ if (count($idt) && file_exists($phpDigIncCn))
        }
    }
    
-    if(isset($db)) mysql_select_db($mainDbName, $db);  // back to Dokeos
+    if(isset($db))
+    {
+    	mysql_select_db($_configuration['main_database'], $db);  // back to Dokeos
+    }
+}
+else
+{
+	echo 'No documents with metadata or no PhpDig in this course...<br>';
 }
-else echo 'No documents with metadata or no PhpDig in this course...<br>';

 if (false && file_exists($phpDigIncCn))  // future: buttons for operations
 {
--- a/main/metadata/importlinks.php
+++ b/main/metadata/importlinks.php
@ -241,7 +241,10 @@ elseif ($slo == get_lang('Index') && file_exists($phpDigIncCn) && count($mceids)
        }
    }
    
-    if(isset($db)) mysql_select_db($mainDbName, $db);  // back to Dokeos
+    if(isset($db))
+    {
+    	mysql_select_db($_configuration['main_database'], $db);  // back to Dokeos
+    }
 }
 elseif ($slo == get_lang('Index'))
 {
--- a/main/metadata/importmanifest.php
+++ b/main/metadata/importmanifest.php
@ -416,7 +416,7 @@ elseif ($smo == get_lang('Index') && file_exists($phpDigIncCn) &&
    }
    // possible enhancement: UPDATE spider record for still existing pages
    
-    if(isset($db)) mysql_select_db($mainDbName, $db);  // back to Dokeos
+    if(isset($db)) mysql_select_db($_configuration['main_database'], $db);  // back to Dokeos
 }
 elseif ($smo == get_lang('Index'))
 {
--- a/main/newscorm/learnpath_functions.inc.php
+++ b/main/newscorm/learnpath_functions.inc.php
@ -1404,7 +1404,7 @@ function exporttofile($filename, $LPname, $LPid, $content)
 function export_exercise($item_id)
 {

-	global $expdir, $_course, $statsDbName, $_SESSION, $_SERVER, $language_interface, $langExerciseNotFound, $langQuestion, $langOk;
+	global $expdir, $_course, $_configuration, $_SESSION, $_SERVER, $language_interface, $langExerciseNotFound, $langQuestion, $langOk;

 	$exerciseId = $item_id;

--- a/main/newscorm/resourcelinker.inc.php
+++ b/main/newscorm/resourcelinker.inc.php
@ -366,7 +366,7 @@ function display_addedresource_link($type, $id, $style='')
 function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_path, $builder, $icon, $level = 0)
 {
 	global $_course, $learnpath_id, $tbl_learnpath_item, $items;
-	global $_course, $curDirPath, $rootWeb, $enableDocumentParsing, $_course, $_user, $_cid, $rootSys;
+	global $_course, $curDirPath, $_configuration, $enableDocumentParsing, $_course, $_user, $_cid, $rootSys;

 	$tbl_lp_item = Database::get_course_table('lp_item');
 	$hyperlink_target_parameter = ''; //or e.g. 'target="_blank"'
@ -1164,7 +1164,7 @@ function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_
 function get_addedresource_link_in_learnpath($type, $id, $id_in_path)
 {
 	global $_course, $learnpath_id, $tbl_learnpath_item, $items;
-	global $curDirPath, $rootWeb, $enableDocumentParsing, $_user, $_cid, $rootSys;
+	global $curDirPath, $_configuration, $enableDocumentParsing, $_user, $_cid, $rootSys;

 	$tbl_lp_item = Database::get_course_table('lp_item');
 	$hyperlink_target_parameter = ""; //or e.g. target='_blank'
--- a/main/online/online_links.php
+++ b/main/online/online_links.php
@ -1,4 +1,4 @@
-<?php // $Id: online_links.php 9988 2006-11-15 01:28:32Z pcool $
+<?php // $Id: online_links.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@ -101,7 +101,7 @@ if($_POST['sent'])

 		move_uploaded_file($link_file['tmp_name'],$doc_path.$link_file['name']);

-		$link_url=str_replace($rootSys,$rootWeb,$doc_path).$link_file['name'];
+		$link_url=str_replace($rootSys,$_configuration['root_web'],$doc_path).$link_file['name'];
 	}

 	if(!empty($link_name) && !empty($link_url))
--- a/main/resourcelinker/resourcelinker.inc.php
+++ b/main/resourcelinker/resourcelinker.inc.php
@ -1,4 +1,4 @@
-<?php // $Id: resourcelinker.inc.php 9988 2006-11-15 01:28:32Z pcool $
+<?php // $Id: resourcelinker.inc.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@ -362,8 +362,8 @@ function display_addedresource_link($type, $id, $style='')
 */
 function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_path, $builder, $icon, $level = 0)
 {
-	global $_course, $learnpath_id, $tbl_learnpath_item, $items;
-	global $_course, $curDirPath, $rootWeb, $enableDocumentParsing, $_course, $_user, $_cid, $rootSys;
+	global $learnpath_id, $tbl_learnpath_item, $items;
+	global $_course, $curDirPath, $_configuration, $enableDocumentParsing, $_user, $_cid, $rootSys;

 	$hyperlink_target_parameter = ''; //or e.g. 'target="_blank"'

@ -1135,7 +1135,7 @@ function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_
 function get_addedresource_link_in_learnpath($type, $id, $id_in_path)
 {
 	global $_course, $learnpath_id, $tbl_learnpath_item, $items;
-	global $curDirPath, $rootWeb, $enableDocumentParsing, $_user , $_cid, $rootSys;
+	global $curDirPath, $_configuration, $enableDocumentParsing, $_user , $_cid, $rootSys;

 	$hyperlink_target_parameter = ""; //or e.g. target='_blank'
 $builder = 'player';
--- a/main/survey/attach_existingsurvey.php
+++ b/main/survey/attach_existingsurvey.php
@ -73,7 +73,7 @@ if ($_POST['action'] == 'add_survey')
 	$surveycode=$_POST['survey_code'];
 	$surveytitle = $_POST['survey_title'];
 	$surveysubtitle = $_POST['survey_subtitle'];
-	//$cidReq = $dbNamePrefix.$_POST['cidReq'];
+	//$cidReq = $_configuration['db_prefix'].$_POST['cidReq'];
 	$author = $_POST['author'];
 	$survey_language = $_POST['survey_language'];
 	$availablefrom = $_POST['fyear']."-".$_POST['fmonth']."-".$_POST['fday'];
--- a/main/survey/attach_question.php
+++ b/main/survey/attach_question.php
@ -74,7 +74,7 @@ if ($_POST['action'] == 'add_survey')
 	$surveycode=$_POST['survey_code'];
 	$surveytitle = $_POST['survey_title'];
 	$surveysubtitle = $_POST['survey_subtitle'];
-	//$cidReq = $dbNamePrefix.$_POST['cidReq'];
+	//$cidReq = $_configuration['db_prefix'].$_POST['cidReq'];
 	$author = $_POST['author'];
 	$survey_language = $_POST['survey_language'];
 	$availablefrom = $_POST['fyear']."-".$_POST['fmonth']."-".$_POST['fday'];
--- a/main/survey/attach_survey.php
+++ b/main/survey/attach_survey.php
@ -74,7 +74,7 @@ if ($_POST['action'] == 'add_survey')
 	$surveycode=$_POST['survey_code'];
 	$surveytitle = $_POST['survey_title'];
 	$surveysubtitle = $_POST['survey_subtitle'];
-	//$cidReq = $dbNamePrefix.$_POST['cidReq'];
+	//$cidReq = $_configuration['db_prefix'].$_POST['cidReq'];
 	$author = $_POST['author'];
 	$survey_language = $_POST['survey_language'];
 	$availablefrom = $_POST['fyear']."-".$_POST['fmonth']."-".$_POST['fday'];
--- a/main/survey/create_new_survey.php
+++ b/main/survey/create_new_survey.php
@ -369,7 +369,7 @@ else
 		$surveycode=$_POST['survey_code'];
 		$surveytitle = $_POST['survey_title'];
 		$surveysubtitle = $_POST['survey_subtitle'];
-		//$cidReq = $dbNamePrefix.$_POST['cidReq'];
+		//$cidReq = $_configuration['db_prefix'].$_POST['cidReq'];
 		$author = $_POST['author'];
 		$survey_language = $_POST['survey_language'];
 		$availablefrom = $_POST['fyear']."-".$_POST['fmonth']."-".$_POST['fday'];
--- a/main/survey/question_added.php
+++ b/main/survey/question_added.php
@ -50,7 +50,7 @@ $interbredcrump[] = array ("url" => "survey.php", "name" => get_lang('CreateSurv
 $groupid=$_REQUEST['groupid'];
 $surveyid=$_REQUEST['surveyid'];
 $qdeleted=0;
-//$cidReqdb = $dbNamePrefix.$_REQUEST['cidReq'];
+//$cidReqdb = $_configuration['db_prefix'].$_REQUEST['cidReq'];
 //echo "dsfgdsgfsdgdsfg".$groupid;
 if (isset($_POST['addanother']))
 {
--- a/main/tracking/course_access_details.php
+++ b/main/tracking/course_access_details.php
@ -59,8 +59,8 @@ $htmlHeadXtra[] = "<style type='text/css'>
 td {border-bottom: thin dashed gray;}
 /*]]>*/
 </style>";
-
-$TABLETRACK_ACCESS = $statsDbName."`.`track_e_access";
+//@todo use Database library
+$TABLETRACK_ACCESS = $_configuration['statistics_database']."`.`track_e_access";
 Display::display_header($nameTools,"Tracking");
 include(api_get_path(LIBRARY_PATH)."statsUtils.lib.inc.php");

--- a/main/tracking/personnalLog.php
+++ b/main/tracking/personnalLog.php
@ -64,13 +64,12 @@ td {border-bottom: thin dashed gray;}
 */
 $view = $_REQUEST['view'];

-// regroup table names for maintenance purpose
-$TABLECOURSUSER	= Database::get_main_table(MAIN_COURSE_USER_TABLE);
-$TABLETRACK_ACCESS = $statsDbName."`.`track_e_access";
-$TABLETRACK_LINKS = $statsDbName."`.`track_e_links";
-$TABLETRACK_DOWNLOADS = $statsDbName."`.`track_e_downloads";
-$TABLETRACK_LOGIN = $statsDbName."`.`track_e_login";
-$TABLETRACK_EXERCICES   = $statsDbName."`.`track_e_exercices";
+$TABLECOURSUSER			= Database::get_main_table(MAIN_COURSE_USER_TABLE);
+$TABLETRACK_ACCESS 		= $_configuration['statistics_database']."`.`track_e_access";
+$TABLETRACK_LINKS 		= $_configuration['statistics_database']."`.`track_e_links";
+$TABLETRACK_DOWNLOADS 	= $_configuration['statistics_database']."`.`track_e_downloads";
+$TABLETRACK_LOGIN 		= $_configuration['statistics_database']."`.`track_e_login";
+$TABLETRACK_EXERCICES   = $_configuration['statistics_database']."`.`track_e_exercices";


 $limitOfDisplayedLogins = 25; // number of logins to display
--- a/main/tracking/toolaccess_details.php
+++ b/main/tracking/toolaccess_details.php
@ -1,4 +1,4 @@
-<?php // $Id: toolaccess_details.php 10062 2006-11-20 19:37:38Z pcool $
+<?php // $Id: toolaccess_details.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@ -92,7 +92,7 @@ $reqdate=$_REQUEST['reqdate'];
 <?php 
    
    
-    $TABLETRACK_ACCESS = $statsDbName."`.`track_e_access";
+    $TABLETRACK_ACCESS = $_configuration['statistics_database']."`.`track_e_access";
    
    if(isset($_cid)) //stats for the current course
    {
--- a/main/tracking/userLog.php
+++ b/main/tracking/userLog.php
@ -1,4 +1,4 @@
-<?php // $Id: userLog.php 10062 2006-11-20 19:37:38Z pcool $
+<?php // $Id: userLog.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@ -124,18 +124,18 @@ $TABLEUSER	        = Database::get_main_table(MAIN_USER_TABLE);
 $tbl_session_course_user = Database::get_main_table(MAIN_SESSION_COURSE_USER_TABLE);
 $tbl_session = Database::get_main_table(MAIN_SESSION_TABLE);

-$TABLETRACK_ACCESS      = $statsDbName."`.`track_e_access";
-$TABLETRACK_LINKS       = $statsDbName."`.`track_e_links";
-$TABLETRACK_LOGIN       = $statsDbName."`.`track_e_login";
-$TABLETRACK_DOWNLOADS   = $statsDbName."`.`track_e_downloads";
-$TABLETRACK_UPLOADS     = $statsDbName."`.`track_e_uploads";
-$TABLETRACK_EXERCICES   = $statsDbName."`.`track_e_exercices";
+$TABLETRACK_ACCESS      = $_configuration['statistics_database']."`.`track_e_access";
+$TABLETRACK_LINKS       = $_configuration['statistics_database']."`.`track_e_links";
+$TABLETRACK_LOGIN       = $_configuration['statistics_database']."`.`track_e_login";
+$TABLETRACK_DOWNLOADS   = $_configuration['statistics_database']."`.`track_e_downloads";
+$TABLETRACK_UPLOADS     = $_configuration['statistics_database']."`.`track_e_uploads";
+$TABLETRACK_EXERCICES   = $_configuration['statistics_database']."`.`track_e_exercices";

 $TABLECOURSE_LINKS		= Database::get_course_table(LINK_TABLE);
 $TABLECOURSE_WORK       = Database::get_course_table(STUDENT_PUBLICATION_TABLE);
 $TABLECOURSE_GROUPSUSER =  Database::get_course_table(GROUP_USER_TABLE);
-$TABLECOURSE_EXERCICES = Database::get_course_table(QUIZ_TEST_TABLE);
-$TBL_TRACK_HOTPOTATOES   = Database::get_statistic_table(STATISTIC_TRACK_E_HOTPOTATOES_TABLE);
+$TABLECOURSE_EXERCICES  = Database::get_course_table(QUIZ_TEST_TABLE);
+$TBL_TRACK_HOTPOTATOES  = Database::get_statistic_table(STATISTIC_TRACK_E_HOTPOTATOES_TABLE);
 /*
 $tbl_learnpath_main = Database::get_course_table(LEARNPATH_MAIN_TABLE);
 $tbl_learnpath_item = Database::get_course_table(LEARNPATH_ITEM_TABLE);
--- a/main/user/user.php
+++ b/main/user/user.php
@ -64,7 +64,7 @@ require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'
 //CHECK KEYS
 if( !isset ($_cid))
 {
-	header("location: ".$rootWeb);
+	header("location: ".$_configuration['root_web']);
 }
 /*
 -----------------------------------------------------------
--- a/main/user/userInfo.php
+++ b/main/user/userInfo.php
@ -76,7 +76,7 @@ api_display_tool_title(get_lang("Users"));
 *	$uid
 *	$isAdmin
 *	$isAdminOfCourse
- *	$mainDbName
+ *	$_configuration['main_database']
 *	$currentCourseID
 */

@ -88,7 +88,7 @@ $userIdViewed = $uInfo; // Id of the user we want to view coming from the user.p
 -----------------------------------------------------------
 */

-$mainDB = $mainDbName;
+$mainDB = $_configuration['main_database'];
 $courseCode = $currentCourseID = $_course['sysCode'];
 $tbl_coursUser = Database :: get_main_table(MAIN_COURSE_USER_TABLE);

--- a/main/user/user_add.php
+++ b/main/user/user_add.php
@ -204,13 +204,13 @@ if($register)

 		if ($courseRegSucceed)
 		{
-			$emailbody = get_lang('Dear')." ".stripslashes("$firstname_form $lastname_form").",\n".get_lang('OneResp')." $currentCourseName ".get_lang('RegYou')." ".get_setting('siteName')." ".get_lang('Settings')." $username_form\n".get_lang('Pass').": $password_form\n".get_lang('Address')." ".get_setting('siteName')." ".get_lang('Is').": $rootWeb\n".get_lang('Problem')."\n".get_lang('Formula').",\n".get_setting('administratorSurname')." ".get_setting('administratorName')."\n".get_lang('Manager')." ".get_setting('siteName')." \nT. ".get_setting('administratorTelephone')."\n".get_lang('Email').": ".get_setting('emailAdministrator')."\n";
+			$emailbody = get_lang('Dear')." ".stripslashes("$firstname_form $lastname_form").",\n".get_lang('OneResp')." $currentCourseName ".get_lang('RegYou')." ".get_setting('siteName')." ".get_lang('Settings')." $username_form\n".get_lang('Pass').": $password_form\n".get_lang('Address')." ".get_setting('siteName')." ".get_lang('Is').": ".$_configuration['root_web']."\n".get_lang('Problem')."\n".get_lang('Formula').",\n".get_setting('administratorSurname')." ".get_setting('administratorName')."\n".get_lang('Manager')." ".get_setting('siteName')." \nT. ".get_setting('administratorTelephone')."\n".get_lang('Email').": ".get_setting('emailAdministrator')."\n";

 			$message = get_lang('TheU')." ".stripslashes("$firstname_form $lastname_form")." ".get_lang('AddedToCourse')."<a href=\"user.php\">".get_lang('BackUser')."</a>\n";
 		}
 		else
 		{
-			$emailbody = get_lang('Dear')."  $firstname_form $lastname_form,\n ".get_lang('YouAreReg')."  ".get_setting('siteName')."  ".get_lang('Settings')." $username_form\n".get_lang('Pass').": $password_form\n".get_lang('Address')." ".get_setting('siteName')." ".get_lang('Is').": $rootWeb\n".get_lang('Problem')."\n".get_lang('Formula').",\n".get_setting('administratorSurname')." ".get_setting('administratorName')."\n".get_lang('Manager')." ".get_setting('siteName')." \nT. ".get_setting('administratorTelephone')."\n".get_lang('Email').": ".get_setting('emailAdministrator')."\n";
+			$emailbody = get_lang('Dear')."  $firstname_form $lastname_form,\n ".get_lang('YouAreReg')."  ".get_setting('siteName')."  ".get_lang('Settings')." $username_form\n".get_lang('Pass').": $password_form\n".get_lang('Address')." ".get_setting('siteName')." ".get_lang('Is').": ".$_configuration['root_web']."\n".get_lang('Problem')."\n".get_lang('Formula').",\n".get_setting('administratorSurname')." ".get_setting('administratorName')."\n".get_lang('Manager')." ".get_setting('siteName')." \nT. ".get_setting('administratorTelephone')."\n".get_lang('Email').": ".get_setting('emailAdministrator')."\n";

 			$message = stripslashes("$firstname_form $lastname_form")." ".get_lang('AddedU');
 		}
--- a/main/work/work.php
+++ b/main/work/work.php
@ -599,7 +599,7 @@ if ($submitWork && $succeed &&!$id) //last value is to check this is not "just"
 	
 			if ($submitGroupWorkUrl) // For user comming from group space to publish his work
 			{
-				$realUrl = str_replace ($rootSys, $rootWeb, str_replace("\\", "/", realpath($submitGroupWorkUrl) ) ) ;
+				$realUrl = str_replace ($rootSys, $_configuration['root_web'], str_replace("\\", "/", realpath($submitGroupWorkUrl) ) ) ;
 	
 				echo	"<tr>\n",
 	
--- a/plugin/messages/functions.inc.php
+++ b/plugin/messages/functions.inc.php
@ -1,4 +1,4 @@
-<?php // $Id: functions.inc.php 9992 2006-11-15 12:25:28Z pcool $
+<?php // $Id: functions.inc.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@ -32,8 +32,8 @@ define ("MESSAGES_DATABASE", "messages");
 function display_select_user_list($user_id,$_name,$width,$size)
 {
 	$MINUTE=30;
-	global $statsDbName;
-	$userlist = WhoIsOnline($user_id,$statsDbName,$MINUTE);
+	global $_configuration;
+	$userlist = WhoIsOnline($user_id,$_configuration['statistics_database'],$MINUTE);
 	echo '<select  size="'.$size.'" style="width: '.$width.'px;" name="'.$_name.'">';
 	foreach($userlist as $row)
 		echo "<option value=\"$row[0]\">".GetFullUserName($row[0]).($user_id==$row[0]?("&nbsp;(".get_lang('Myself').")"):(""))."</option>\n";
@ -43,8 +43,8 @@ function display_select_user_list($user_id,$_name,$width,$size)
 function get_online_user_list($current_user_id)
 {
 	$MINUTE=30;
-	global $statsDbName;
-	$userlist = WhoIsOnline($current_user_id,$statsDbName,$MINUTE);
+	global $_configuration;
+	$userlist = WhoIsOnline($current_user_id,$_configuration['statistics_database'],$MINUTE);
 	foreach($userlist as $row)
 	{
 		$receiver_id = $row[0];
@ -139,9 +139,9 @@ function get_new_messages()
 */
 function users_connected_by_id()
 {
-	global $statsDbName, $_user;
+	global $_configuration, $_user;
 	$MINUTE=30;
-	$user_connect = WhoIsOnline($_user['user_id'],$statsDbName,$MINUTE);
+	$user_connect = WhoIsOnline($_user['user_id'],$_configuration['statistics_database'],$MINUTE);
 	for ($i=0; $i<count($user_connect); $i++)
 	{
 		$user_id_list[$i]=$user_connect[$i][0];
--- a/user_portal.php
+++ b/user_portal.php
@ -1021,7 +1021,7 @@ else
 		// collect from agenda, but only if tool is visible for the course
 		if ($result && $thisAgenda > 0 && mysql_num_rows($result) > 0)
 		{
-			$tableCal = $courseTablePrefix.$thisCourseDbName.$dbGlu."calendar_event";
+			$tableCal = $courseTablePrefix.$thisCourseDbName.$_configuration['db_glue']."calendar_event";
 			$sqlGetNextAgendaEvent = "SELECT  start_date , title content, start_time
 									                          FROM $tableCal
 									                          WHERE start_date >= CURDATE()
--- a/whoisonline.php
+++ b/whoisonline.php
@ -1,4 +1,4 @@
-<?php // $Id: whoisonline.php 9994 2006-11-15 13:27:45Z pcool $
+<?php // $Id: whoisonline.php 10082 2006-11-21 19:08:15Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@ -229,7 +229,7 @@ if ((get_setting('showonline','world') == 'true' AND !$_user['user_id']) OR (get
 	}
 	else
 	{
-		$user_list = WhoIsOnline($_user['user_id'],$statsDbName,api_get_setting('time_limit_whosonline'));
+		$user_list = WhoIsOnline($_user['user_id'],$_configuration['statistics_database'],api_get_setting('time_limit_whosonline'));
 	}

 	$total=count($user_list);