From 28dac5774b1031b4677e1d0c8d2fba3556e5a4f2 Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Mon, 28 Sep 2009 00:07:07 +0300 Subject: [PATCH] Feature #306 - Cleanin the global initialization script, part 1. --- main/inc/global.inc.php | 416 ++++++++++++++++------------------------ 1 file changed, 167 insertions(+), 249 deletions(-) diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php index d04da681df..c1f80a2438 100644 --- a/main/inc/global.inc.php +++ b/main/inc/global.inc.php @@ -22,8 +22,7 @@ */ // PHP version check -if ( !function_exists('version_compare') || version_compare( phpversion(), '5', '<' ) ) -{ +if (!function_exists('version_compare') || version_compare(phpversion(), '5', '<')) { $error_message_php_version = << @@ -67,22 +66,23 @@ $includePath = dirname(__FILE__); // @todo isn't this file renamed to configuration.inc.php yet? // include the main Dokeos platform configuration file -$main_configuration_file_path = $includePath . "/conf/configuration.php"; +$main_configuration_file_path = $includePath.'/conf/configuration.php'; $already_installed = false; -if(file_exists($main_configuration_file_path)) -{ - require_once($main_configuration_file_path); +if (file_exists($main_configuration_file_path)) { + require_once $main_configuration_file_path; $already_installed = true; -} -else -{ +} else { $_configuration = array(); } // include the main Dokeos platform library file -require_once($includePath.'/lib/main_api.lib.php'); +require_once $includePath.'/lib/main_api.lib.php'; + +// Assigning a variable to avoid several useless calls to the database setting. +// Do not over-use. This is only for this script's local use. +$lib_path = api_get_path(LIBRARY_PATH); //fix bug in IIS that doesn't fill the $_SERVER['REQUEST_URI'] api_request_uri(); @@ -91,7 +91,6 @@ api_request_uri(); api_session_start($already_installed); - $error_message_not_installed = << @@ -166,34 +165,27 @@ $error_message_db_problem .= ' '; -if (!$already_installed) -{ +if (!$already_installed) { header('Content-Type: text/html; charset=UTF-8'); //require('installedVersion.inc.php'); die($error_message_not_installed); } -//Assigning a variable to avoid several useless calls to the database setting. -// Do not over-user. This is only for this script's local use. -$lib_path = api_get_path(LIBRARY_PATH); - // Add the path to the pear packages to the include path -//ini_set('include_path',ini_get('include_path').PATH_SEPARATOR.$lib_path.'pear'); ini_set('include_path', api_create_include_path_setting()); // This is for compatibility with MAC computers. ini_set('auto_detect_line_endings', '1'); // Include the libraries that are necessary everywhere -require_once($lib_path.'database.lib.php'); -require_once($lib_path.'display.lib.php'); -require_once($lib_path.'text.lib.php'); -require_once($lib_path.'security.lib.php'); -require_once($lib_path.'events.lib.inc.php'); +require_once $lib_path.'database.lib.php'; +require_once $lib_path.'display.lib.php'; +require_once $lib_path.'text.lib.php'; +require_once $lib_path.'security.lib.php'; +require_once $lib_path.'events.lib.inc.php'; // @todo: this shouldn't be done here. It should be stored correctly during installation -if(empty($_configuration['statistics_database']) && $already_installed) -{ +if (empty($_configuration['statistics_database']) && $already_installed) { $_configuration['statistics_database'] = $_configuration['main_database']; } @@ -201,8 +193,7 @@ if(empty($_configuration['statistics_database']) && $already_installed) $dokeos_database_connection = @mysql_connect($_configuration['db_host'], $_configuration['db_user'], $_configuration['db_password']) or die ($error_message_db_problem); -if (! $_configuration['db_host']) -{ +if (!$_configuration['db_host']) { die($error_message_db_problem); } @@ -226,7 +217,7 @@ while ($row = @mysql_fetch_array($result)) { $charset = $row[0]; } if (empty($charset)) { - $charset = "ISO-8859-15"; + $charset = 'ISO-8859-15'; } // Preserving the value of the global variable $charset. $charset_initial_value = $charset; @@ -241,164 +232,123 @@ api_set_internationalization_default_encoding($charset); RETRIEVING ALL THE DOKEOS CONFIG SETTINGS -------------------------------------------- */ -if(!empty($_configuration['multiple_access_urls'])) -{ +if (!empty($_configuration['multiple_access_urls'])) { $_configuration['access_url'] = 1; $access_urls = api_get_access_urls(); - $protocol = ((!empty($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS'])!='OFF')?'https':'http').'://'; + $protocol = ((!empty($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) != 'OFF') ? 'https' : 'http').'://'; $request_url1 = $protocol.$_SERVER['SERVER_NAME'].'/'; $request_url2 = $protocol.$_SERVER['HTTP_HOST'].'/'; - foreach($access_urls as $details) - { - if($request_url1 == $details['url'] or $request_url2 == $details['url']) - { + foreach($access_urls as $details) { + if ($request_url1 == $details['url'] or $request_url2 == $details['url']) { $_configuration['access_url'] = $details['id']; } } -} -else -{ +} else { $_configuration['access_url'] = 1; } -//$sql="SELECT * FROM settings_current"; -//$result=mysql_query($sql) or die(mysql_error()); // access_url == 1 is the default dokeos location -if ($_configuration['access_url']!=1) -{ +if ($_configuration['access_url'] != 1) { $url_info = api_get_access_url($_configuration['access_url']); - if ($url_info['active']==1) - { - $settings_by_access = api_get_settings(null,'list',$_configuration['access_url'],1); - foreach($settings_by_access as $row) - { - if (empty($row['variable'])) - $row['variable']=0; - if (empty($row['subkey'])) - $row['subkey']=0; - if (empty($row['category'])) - $row['category']=0; - $settings_by_access_list[ $row['variable'] ] [ $row['subkey'] ] [ $row['category'] ] = $row; + if ($url_info['active'] == 1) { + $settings_by_access = api_get_settings(null, 'list', $_configuration['access_url'], 1); + foreach ($settings_by_access as $row) { + if (empty($row['variable'])) { + $row['variable'] = 0; + } + if (empty($row['subkey'])) { + $row['subkey'] = 0; + } + if (empty($row['category'])) { + $row['category'] = 0; + } + $settings_by_access_list[$row['variable']][$row['subkey']][$row['category']] = $row; } } } -//echo '
';print_r($result_other_site);
-$result = api_get_settings(null,'list',1);
-
-//while ($row=mysql_fetch_array($result))
-foreach($result as $row)
-{
-	if ($_configuration['access_url']!=1)
-	{
-		if ($url_info['active']==1)
-		{
-			if (empty($row['variable']))
-				$var=0;
-			else
-				$var=$row['variable'];
-
-			if (empty($row['subkey']))
-				$subkey=0;
-			else
-				$subkey=$row['subkey'];
-
-			if (empty($row['category']))
-				$category=0;
-			else
-				$category=$row['category'];
+$result = api_get_settings(null, 'list', 1);
+foreach ($result as $row) {
+	if ($_configuration['access_url'] != 1) {
+		if ($url_info['active'] == 1) {
+			if (empty($row['variable'])) {
+				$var = 0;
+			} else {
+				$var = $row['variable'];
+			}
+			if (empty($row['subkey'])) {
+				$subkey = 0;
+			} else {
+				$subkey = $row['subkey'];
+			}
+			if (empty($row['category'])) {
+				$category = 0;
+			} else {
+				$category = $row['category'];
+			}
 		}
 
-		if ($row['access_url_changeable']==1 && $url_info['active']==1)
-		{
-			if ($settings_by_access_list[ $var ] [ $subkey ] [$category ]['selected_value'] !='')
-			{
-				if ($row['subkey']==NULL)
-				{
-					$_setting[$row['variable']]= $settings_by_access_list[ $var ] [ $subkey ] [$category ]['selected_value'];
+		if ($row['access_url_changeable'] == 1 && $url_info['active'] == 1) {
+			if ($settings_by_access_list[$var][$subkey][$category]['selected_value'] != '') {
+				if ($row['subkey'] == null) {
+					$_setting[$row['variable']]= $settings_by_access_list[$var][$subkey][$category]['selected_value'];
+				} else {
+					$_setting[$row['variable']][$row['subkey']] = $settings_by_access_list[$var][$subkey][$category]['selected_value'];
 				}
-				else
-				{
-					$_setting[$row['variable']][$row['subkey']]=$settings_by_access_list[ $var ] [ $subkey ] [$category ]['selected_value'];
+			} else {
+				if ($row['subkey'] == null) {
+					$_setting[$row['variable']] = $row['selected_value'];
+				} else {
+					$_setting[$row['variable']][$row['subkey']] = $row['selected_value'];
 				}
 			}
-			else
-			{
-				if ($row['subkey']==NULL)
-				{
-					$_setting[$row['variable']]=$row['selected_value'];
-				}
-				else
-				{
-					$_setting[$row['variable']][$row['subkey']]=$row['selected_value'];
-				}
-			}
-		}
-		else
-		{
-			if ($row['subkey']==NULL)
-			{
-				$_setting[$row['variable']]=$row['selected_value'];
-			}
-			else
-			{
-				$_setting[$row['variable']][$row['subkey']]=$row['selected_value'];
+		} else {
+			if ($row['subkey'] == null) {
+				$_setting[$row['variable']] = $row['selected_value'];
+			} else {
+				$_setting[$row['variable']][$row['subkey']] = $row['selected_value'];
 			}
 		}
-
-	}
-	else
-	{
-		if ($row['subkey']==NULL)
-		{
-			$_setting[$row['variable']]=$row['selected_value'];
-		}
-		else
-		{
-			$_setting[$row['variable']][$row['subkey']]=$row['selected_value'];
+	} else {
+		if ($row['subkey'] == null) {
+			$_setting[$row['variable']] = $row['selected_value'];
+		} else {
+			$_setting[$row['variable']][$row['subkey']] = $row['selected_value'];
 		}
 	}
 }
-//echo '
';print_r($_setting);echo '
';
-// we have to store the settings for the plugins differently because it expects an array
-//$sql="SELECT * FROM settings_current WHERE category='plugins'";
-//$result=mysql_query($sql) or die(mysql_error());
-$result = api_get_settings('Plugins','list',$_configuration['access_url']);
-$_plugins=array();
-//while ($row=mysql_fetch_array($result))
-foreach($result as $row)
-{
-	$key= $row['variable'];
-	if (is_string($_setting[$key]))
-	{
+
+$result = api_get_settings('Plugins', 'list', $_configuration['access_url']);
+$_plugins = array();
+foreach ($result as $row) {
+	$key = $row['variable'];
+	if (is_string($_setting[$key])) {
 		$_setting[$key]=array();
 	}
-	$_setting[$key][]=$row['selected_value'];
-	$_plugins[$key][]=$row['selected_value'];
+	$_setting[$key][] = $row['selected_value'];
+	$_plugins[$key][] = $row['selected_value'];
 }
 
 //load array Kses for Htmlpurifier
-require_once $includePath."/lib/formvalidator/Rule/allowed_tags.inc.php";
+require_once $lib_path.'formvalidator/Rule/allowed_tags.inc.php';
 //load htmpurifier
-require_once $includePath."/lib/htmlpurifier/library/HTMLPurifier.auto.php";
+require_once $lib_path.'htmlpurifier/library/HTMLPurifier.auto.php';
 
 // include the local (contextual) parameters of this course or section
-require($includePath."/local.inc.php");
+require $includePath.'/local.inc.php';
 
 // ===== "who is logged in?" module section =====
 
-require_once($includePath."/lib/online.inc.php");
+require_once $lib_path.'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'] : '',$_configuration['statistics_database']);
+if (!$x = strpos($_SERVER['PHP_SELF'], 'whoisonline.php')) {
+	LoginCheck(isset($_user['user_id']) ? $_user['user_id'] : '', $_configuration['statistics_database']);
 }
 
 // ===== end "who is logged in?" module section =====
 
-if(api_get_setting('server_type') == 'test')
-{
+if (api_get_setting('server_type') == 'test') {
 	/*
 	--------------------------------------------
 	Server type is test
@@ -410,31 +360,23 @@ if(api_get_setting('server_type') == 'test')
 	//error_reporting(E_ALL);
 
 	//Addslashes to all $_GET variables
-	foreach($_GET as $key=>$val)
-	{
-		if(!ini_get('magic_quotes_gpc'))
-		{
-			if(is_string($val))
-			{
-				$_GET[$key]=addslashes($val);
+	foreach ($_GET as $key => $val) {
+		if (!ini_get('magic_quotes_gpc')) {
+			if (is_string($val)) {
+				$_GET[$key] = addslashes($val);
 			}
 		}
 	}
 
 	//Addslashes to all $_POST variables
-	foreach($_POST as $key=>$val)
-	{
-		if(!ini_get('magic_quotes_gpc'))
-		{
-			if(is_string($val))
-			{
-				$_POST[$key]=addslashes($val);
+	foreach ($_POST as $key => $val) {
+		if (!ini_get('magic_quotes_gpc')) {
+			if (is_string($val)) {
+				$_POST[$key] = addslashes($val);
 			}
 		}
 	}
-}
-else
-{
+} else {
 	/*
 	--------------------------------------------
 	Server type is not test
@@ -444,37 +386,32 @@ else
 	*/
 	error_reporting(E_COMPILE_ERROR | E_ERROR | E_CORE_ERROR);
 
-	if(!isset($HTTP_GET_VARS)) { $HTTP_GET_VARS=$_GET; }
-	if(!isset($HTTP_POST_VARS)) { $HTTP_POST_VARS=$_POST; }
-	if(!isset($HTTP_POST_FILES)) { $HTTP_POST_FILES=$_FILES; }
-	if(!isset($HTTP_SESSION_VARS)) { $HTTP_SESSION_VARS=$_SESSION; }
-	if(!isset($HTTP_SERVER_VARS)) { $HTTP_SERVER_VARS=$_SERVER; }
+	// TODO: These obsolete variables $HTTP_* to be check whether they are actually used.
+	if (!isset($HTTP_GET_VARS)) { $HTTP_GET_VARS = $_GET; }
+	if (!isset($HTTP_POST_VARS)) { $HTTP_POST_VARS = $_POST; }
+	if (!isset($HTTP_POST_FILES)) { $HTTP_POST_FILES = $_FILES; }
+	if (!isset($HTTP_SESSION_VARS)) { $HTTP_SESSION_VARS = $_SESSION; }
+	if (!isset($HTTP_SERVER_VARS)) { $HTTP_SERVER_VARS = $_SERVER; }
 
 	// Register SESSION variables into $GLOBALS
-	if(sizeof($HTTP_SESSION_VARS))
-	{
-		if(!is_array($_SESSION))
-		{
-			$_SESSION=array();
+	if (sizeof($HTTP_SESSION_VARS)) {
+		if (!is_array($_SESSION)) {
+			$_SESSION = array();
 		}
 
-		foreach($HTTP_SESSION_VARS as $key=>$val)
-		{
-			$_SESSION[$key]=$HTTP_SESSION_VARS[$key];
-			$GLOBALS[$key]=$HTTP_SESSION_VARS[$key];
+		foreach ($HTTP_SESSION_VARS as $key => $val) {
+			$_SESSION[$key] = $HTTP_SESSION_VARS[$key];
+			$GLOBALS[$key] = $HTTP_SESSION_VARS[$key];
 		}
 	}
 
 	// Register SERVER variables into $GLOBALS
-	if(sizeof($HTTP_SERVER_VARS))
-	{
-		$_SERVER=array();
-		foreach($HTTP_SERVER_VARS as $key=>$val)
-		{
-			$_SERVER[$key]=$HTTP_SERVER_VARS[$key];
-
-			if(!isset($_SESSION[$key]) && $key != 'includePath' && $key != 'rootSys' && $key!= 'clarolineRepositorySys' && $key!= 'lang_path' && $key!= 'extAuthSource' && $key!= 'thisAuthSource' && $key!= 'main_configuration_file_path' && $key!= 'phpDigIncCn' && $key!= 'drs')
-			{
+	if (sizeof($HTTP_SERVER_VARS)) {
+		$_SERVER = array();
+		foreach ($HTTP_SERVER_VARS as $key => $val) {
+			$_SERVER[$key] = $HTTP_SERVER_VARS[$key];
+
+			if (!isset($_SESSION[$key]) && $key != 'includePath' && $key != 'rootSys' && $key!= 'clarolineRepositorySys' && $key!= 'lang_path' && $key!= 'extAuthSource' && $key!= 'thisAuthSource' && $key!= 'main_configuration_file_path' && $key!= 'phpDigIncCn' && $key!= 'drs') {
 				$GLOBALS[$key]=$HTTP_SERVER_VARS[$key];
 			}
 		}
@@ -491,12 +428,12 @@ else
 // if we use the javascript version (without go button) we receive a get
 // if we use the non-javascript version (with the go button) we receive a post
 $user_language = '';
-if(!empty($_GET['language'])) {
-	$user_language = $_GET["language"];
+if (!empty($_GET['language'])) {
+	$user_language = $_GET['language'];
 }
 
-if (!empty($_POST["language_list"])) {
-	$user_language = str_replace("index.php?language=","",$_POST["language_list"]);
+if (!empty($_POST['language_list'])) {
+	$user_language = str_replace('index.php?language=', '', $_POST['language_list']);
 }
 
 // Include all files (first english and then current interface language)
@@ -504,17 +441,16 @@ $langpath = api_get_path(SYS_CODE_PATH).'lang/';
 
 
 /* This will only work if we are in the page to edit a sub_language */
-if (api_get_self() == '/main/admin/sub_language.php' || api_get_self() == '/main/admin/sub_language_ajax.inc.php' ) {
+if (api_get_self() == '/main/admin/sub_language.php' || api_get_self() == '/main/admin/sub_language_ajax.inc.php') {
 	require_once '../admin/sub_language.class.php';
 	// getting the arrays of files i.e notification, trad4all, etc
-	$language_files_to_load = SubLanguageManager::get_all_data_of_dokeos_folder(api_get_path(SYS_LANG_PATH).'english',true);
+	$language_files_to_load = SubLanguageManager::get_all_data_of_dokeos_folder(api_get_path(SYS_LANG_PATH).'english', true);
 	//getting parent info
-	$parent_language	= SubLanguageManager::get_all_information_of_language(intval($_REQUEST['id']));
+	$parent_language = SubLanguageManager::get_all_information_of_language(intval($_REQUEST['id']));
 	//getting sub language info
-	$sub_language		= SubLanguageManager::get_all_information_of_language(intval($_REQUEST['sub_language_id']));
+	$sub_language = SubLanguageManager::get_all_information_of_language(intval($_REQUEST['sub_language_id']));
 
-	//echo '
';
-	$english_language_array = $parent_language_array= $sub_language_array=array();
+	$english_language_array = $parent_language_array = $sub_language_array = array();
 
 	foreach ($language_files_to_load as $language_file_item) {
 		$lang_list_pre = array_keys($GLOBALS);
@@ -524,74 +460,64 @@ if (api_get_self() == '/main/admin/sub_language.php' || api_get_self() == '/main
 		unset($lang_list_pre);
 
 		// ------  english language array
-		$english_language_array[$language_file_item]= compact($lang_list_result);
+		$english_language_array[$language_file_item] = compact($lang_list_result);
 
 		//cleaning the variables
 		foreach($lang_list_result as $item) {
 			unset(${$item});
 		}
 		$parent_file = $langpath.$parent_language['dokeos_folder'].'/'.$language_file_item.'.inc.php';
-		if (is_file($parent_file))
+		if (is_file($parent_file)) {
 			include $parent_file;
+		}
 
 		// ------  parent language array
-		$parent_language_array[$language_file_item]= compact($lang_list_result);
+		$parent_language_array[$language_file_item] = compact($lang_list_result);
 
 		//cleaning the variables
 		foreach($lang_list_result as $item) {
 			unset(${$item});
 		}
 		$sub_file = $langpath.$sub_language['dokeos_folder'].'/'.$language_file_item.'.inc.php';
-		if (is_file($sub_file))
+		if (is_file($sub_file)) {
 			include $sub_file;
+		}
+
 		// ------  sub language array
-		$sub_language_array[$language_file_item]= compact($lang_list_result);
+		$sub_language_array[$language_file_item] = compact($lang_list_result);
 
 		//cleaning the variables
 		foreach($lang_list_result as $item) {
 			unset(${$item});
 		}
 	}
-	/*
-	print_r($english_language_array);
-	print_r($parent_language_array);
-	print_r($sub_language_array); exit
-	*/
 }
 
 // Checking if we have a valid language. If not we set it to the platform language.
-$valid_languages=api_get_languages();
-if (!in_array($user_language,$valid_languages['folder']))
-{
-	$user_language=api_get_setting('platformLanguage');
+$valid_languages = api_get_languages();
+if (!in_array($user_language, $valid_languages['folder'])) {
+	$user_language = api_get_setting('platformLanguage');
 }
 
-if (in_array($user_language,$valid_languages['folder']) and (isset($_GET['language']) OR isset($_POST['language_list'])))
-{
-	$user_selected_language = $user_language; // $_GET["language"];
-	$_SESSION["user_language_choice"] = $user_selected_language;
+if (in_array($user_language, $valid_languages['folder']) && (isset($_GET['language']) || isset($_POST['language_list']))) {
+	$user_selected_language = $user_language; // $_GET['language'];
+	$_SESSION['user_language_choice'] = $user_selected_language;
 	$platformLanguage = $user_selected_language;
-}else{
+} else {
 	$platformLanguage = api_get_setting('platformLanguage');
 }
 
-
-if (isset($_SESSION["user_language_choice"]))
-{
-	$language_interface = $_SESSION["user_language_choice"];
-}
-else
-{
+if (isset($_SESSION['user_language_choice'])) {
+	$language_interface = $_SESSION['user_language_choice'];
+} else {
 	$language_interface = api_get_setting('platformLanguage');
 }
 
-if (isset($_user['language']))
-{
+if (isset($_user['language'])) {
 	$language_interface = $_user['language'];
 }
 
-if ($_course['language'])
-{
+if ($_course['language']) {
 	$language_interface = $_course['language'];
 }
 
@@ -611,35 +537,31 @@ $language_files = array();
 $language_files[] = 'trad4all';
 $language_files[] = 'notification';
 $language_files[] = 'accessibility';
-if( isset($language_file) )
-{
-	if( !is_array($language_file))
-	{
+if (isset($language_file)) {
+	if (!is_array($language_file)) {
 		$language_files[] = $language_file;
-	}
-	else
-	{
-		$language_files = array_merge($language_files,$language_file);
+	} else {
+		$language_files = array_merge($language_files, $language_file);
 	}
 }
 
 
 if (is_array($language_files)) {
-	if (api_get_setting('allow_use_sub_language')=='true') {
+	if (api_get_setting('allow_use_sub_language') == 'true') {
 		foreach ($language_files as $index => $language_file) {
 			include $langpath.'english/'.$language_file.'.inc.php';
 			$langfile = $langpath.$language_interface.'/'.$language_file.'.inc.php';
 
-			$tbl_admin_languages 	= Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-			$sql_sub_language='SELECT dokeos_folder FROM '.$tbl_admin_languages.' WHERE parent_id=(SELECT id FROM '.$tbl_admin_languages.' WHERE dokeos_folder="'.Database::escape_string($language_interface).'" AND  ISNULL(parent_id))';
+			$tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
+			$sql_sub_language = 'SELECT dokeos_folder FROM '.$tbl_admin_languages.' WHERE parent_id=(SELECT id FROM '.$tbl_admin_languages.' WHERE dokeos_folder="'.Database::escape_string($language_interface).'" AND ISNULL(parent_id))';
 
-			$rs_sub_language=Database::query($sql_sub_language,__FILE__,__LINE__);
-			$num_row_sub_language=Database::num_rows($rs_sub_language);
+			$rs_sub_language = Database::query($sql_sub_language,__FILE__,__LINE__);
+			$num_row_sub_language = Database::num_rows($rs_sub_language);
 
 			if (file_exists($langfile)) {
 				include $langfile;
-				for ($i=0;$i<$num_row_sub_language;$i++) {
-					$row_sub_language=Database::result($rs_sub_language,$i,'dokeos_folder');
+				for ($i = 0; $i < $num_row_sub_language; $i++) {
+					$row_sub_language = Database::result($rs_sub_language, $i, 'dokeos_folder');
 					$sub_langfile = $langpath.$row_sub_language.'/'.$language_file.'.inc.php';
 					if (file_exists($sub_langfile)) {
 						include $sub_langfile;
@@ -659,27 +581,23 @@ if (is_array($language_files)) {
 	}
 }
 
-
 // The global variable $charset has been defined in a language file too (trad4all.inc.php), this is legacy situation.
 // So, we have to reassign this variable again in order to keep its value right.
 $charset = $charset_initial_value;
 
 //Update of the logout_date field in the table track_e_login (needed for the calculation of the total connection time)
 
-if($_configuration['tracking_enabled'] && !isset($_SESSION['login_as']) && isset($_user))
-{ // if $_SESSION['login_as'] is set, then the user is an admin logged as the user
+if ($_configuration['tracking_enabled'] && !isset($_SESSION['login_as']) && isset($_user)) {
+	// if $_SESSION['login_as'] is set, then the user is an admin logged as the user
 
 	$tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);
 
-	$sql_last_connection="SELECT login_id, login_date FROM $tbl_track_login WHERE login_user_id='".$_user["user_id"]."' ORDER BY login_date DESC LIMIT 0,1";
+	$sql_last_connection = "SELECT login_id, login_date FROM $tbl_track_login WHERE login_user_id='".$_user["user_id"]."' ORDER BY login_date DESC LIMIT 0,1";
 
-	$q_last_connection=api_sql_query($sql_last_connection);
-	if(Database::num_rows($q_last_connection) > 0)
-	{
-		$i_id_last_connection=Database::result($q_last_connection,0,"login_id");
-		$s_sql_update_logout_date="UPDATE $tbl_track_login SET logout_date=NOW() WHERE login_id='$i_id_last_connection'";
+	$q_last_connection = api_sql_query($sql_last_connection);
+	if (Database::num_rows($q_last_connection) > 0) {
+		$i_id_last_connection = Database::result($q_last_connection, 0, 'login_id');
+		$s_sql_update_logout_date = "UPDATE $tbl_track_login SET logout_date=NOW() WHERE login_id='$i_id_last_connection'";
 		api_sql_query($s_sql_update_logout_date);
 	}
-
 }
-?>