Minor style code

skala
Julio Montoya 14 years ago
parent 99b61db879
commit 2ff3b0c84a
  1. 81
      main/inc/global.inc.php

@ -437,51 +437,49 @@ $valid_languages = api_get_languages();
if (!empty($valid_languages)) { if (!empty($valid_languages)) {
if (!in_array($user_language, $valid_languages['folder'])) { if (!in_array($user_language, $valid_languages['folder'])) {
$user_language = api_get_setting('platformLanguage'); $user_language = api_get_setting('platformLanguage');
} }
$language_priority1 = api_get_setting('languagePriority1'); $language_priority1 = api_get_setting('languagePriority1');
$language_priority2 = api_get_setting('languagePriority2'); $language_priority2 = api_get_setting('languagePriority2');
$language_priority3 = api_get_setting('languagePriority3'); $language_priority3 = api_get_setting('languagePriority3');
$language_priority4 = api_get_setting('languagePriority4'); $language_priority4 = api_get_setting('languagePriority4');
if (in_array($user_language, $valid_languages['folder']) && (isset($_GET['language']) || isset($_POST['language_list']))) { if (in_array($user_language, $valid_languages['folder']) && (isset($_GET['language']) || isset($_POST['language_list']))) {
$user_selected_language = $user_language; // $_GET['language']; $user_selected_language = $user_language; // $_GET['language'];
$_SESSION['user_language_choice'] = $user_selected_language; $_SESSION['user_language_choice'] = $user_selected_language;
$platformLanguage = $user_selected_language; $platformLanguage = $user_selected_language;
}
if (!empty($language_priority4) && api_get_language_from_type($language_priority4) !== false ) {
$language_interface = api_get_language_from_type($language_priority4);
}
else {
$language_interface = api_get_setting('platformLanguage');
}
if (!empty($language_priority3) && api_get_language_from_type($language_priority3) !== false ) {
$language_interface = api_get_language_from_type($language_priority3);
}else {
if (isset($_SESSION['user_language_choice'])) {
$language_interface = $_SESSION['user_language_choice'];
} }
}
if (!empty($language_priority2) && api_get_language_from_type($language_priority2) !== false ) { if (!empty($language_priority4) && api_get_language_from_type($language_priority4) !== false ) {
$language_interface = api_get_language_from_type($language_priority2); $language_interface = api_get_language_from_type($language_priority4);
}else { } else {
if (isset($_user['language'])) { $language_interface = api_get_setting('platformLanguage');
$language_interface = $_user['language'];
} }
}
if (!empty($language_priority1) && api_get_language_from_type($language_priority1) !== false ) { if (!empty($language_priority3) && api_get_language_from_type($language_priority3) !== false ) {
$language_interface = api_get_language_from_type($language_priority1); $language_interface = api_get_language_from_type($language_priority3);
}else { } else {
if ($_course['language']) { if (isset($_SESSION['user_language_choice'])) {
$language_interface = $_course['language']; $language_interface = $_SESSION['user_language_choice'];
}
} }
}
}
if (!empty($language_priority2) && api_get_language_from_type($language_priority2) !== false ) {
$language_interface = api_get_language_from_type($language_priority2);
} else {
if (isset($_user['language'])) {
$language_interface = $_user['language'];
}
}
if (!empty($language_priority1) && api_get_language_from_type($language_priority1) !== false ) {
$language_interface = api_get_language_from_type($language_priority1);
} else {
if ($_course['language']) {
$language_interface = $_course['language'];
}
}
}
// Sometimes the variable $language_interface is changed // Sometimes the variable $language_interface is changed
// temporarily for achieving translation in different language. // temporarily for achieving translation in different language.
@ -499,6 +497,7 @@ $language_files = array();
$language_files[] = 'trad4all'; $language_files[] = 'trad4all';
$language_files[] = 'notification'; $language_files[] = 'notification';
$language_files[] = 'accessibility'; $language_files[] = 'accessibility';
if (isset($language_file)) { if (isset($language_file)) {
if (!is_array($language_file)) { if (!is_array($language_file)) {
$language_files[] = $language_file; $language_files[] = $language_file;
@ -578,4 +577,4 @@ if (!isset($_SESSION['login_as']) && isset($_user)) {
$s_sql_update_logout_date = "UPDATE $tbl_track_login SET logout_date=NOW() WHERE login_id='$i_id_last_connection'"; $s_sql_update_logout_date = "UPDATE $tbl_track_login SET logout_date=NOW() WHERE login_id='$i_id_last_connection'";
Database::query($s_sql_update_logout_date); Database::query($s_sql_update_logout_date);
} }
} }
Loading…
Cancel
Save