mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 16:04:25 +02:00
Code Issues Projects Releases Wiki Activity

MDL-8777 Failing setup_lang_from_browser if lang contains dash; user lang preference not respected

Browse Source
This commit is contained in:
skodak 2007-03-06 23:51:34 +00:00
parent 279948083b
commit 18ceee5c25
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/moodlelib.php
View File

@ -6776,9 +6776,10 @@ function is_enabled_enrol($enrol='') {
*/
function setup_lang_from_browser() {
global $CFG, $SESSION;
global $CFG, $SESSION, $USER;
if (!empty($SESSION->lang)) { // Lang is defined in session, nothing to do
if (!empty($SESSION->lang) or !empty($USER->lang)) {
// Lang is defined in session or user profile, nothing to do
return;
}
@ -6787,14 +6788,27 @@ function setup_lang_from_browser() {
}
/// Extract and clean langs from headers
$langs = strtolower(clean_param($_SERVER['HTTP_ACCEPT_LANGUAGE'], PARAM_SAFEDIR)); /// Get String with basic clean
$langs = str_replace('-', '_', $langs); // we are using underscores
$langs = explode(',', $langs); /// Convert to array
$langs = array_unique($langs); /// Avoid duplicates
$rawlangs = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
$rawlangs = str_replace('-', '_', $rawlangs); // we are using underscores
$rawlangs = explode(',', $rawlangs); // Convert to array
$langs = array();
$order = 1.0;
foreach ($rawlangs as $lang) {
if (strpos($lang, ';') === false) {
$langs[(string)$order] = $lang;
$order = $order-0.01;
} else {
$parts = explode(';', $lang);
$pos = strpos($parts[1], '=');
$langs[substr($parts[1], $pos+1)] = $parts[0];
}
}
krsort($langs, SORT_NUMERIC);
/// Look for such langs under standard locations
foreach ($langs as $lang) {
$lang = $lang.'_utf8';
$lang = clean_param($lang.'_utf8', PARAM_SAFEDIR); // clean it properly for include
if (file_exists($CFG->dataroot .'/lang/'. $lang) or file_exists($CFG->dirroot .'/lang/'. $lang)) {
$SESSION->lang = $lang; /// Lang exists, set it in session
break; /// We have finished. Go out

10
login/index.php
View File

@ -144,6 +144,16 @@ if (!isset($CFG->auth_instructions)) {
if ($user) {
// language setup
if ($user->username == 'guest') {
// no predefined language for guests - use existing session or default site lang
unset($user->lang);
} else if (!empty($user->lang)) {
// unset previous session language - use user preference instead
unset($SESSION->lang);
}
if (empty($user->confirmed)) { // This account was never confirmed
print_header(get_string("mustconfirm"), get_string("mustconfirm") );
print_heading(get_string("mustconfirm"));