version 1.62, 2011/03/28 21:10:41
|
version 1.63, 2011/08/03 18:25:16
|
Line 264 sub preferred_languages {
|
Line 264 sub preferred_languages {
|
|
|
my $defdom = &Apache::lonnet::default_login_domain(); |
my $defdom = &Apache::lonnet::default_login_domain(); |
foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},$defdom) { |
foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},$defdom) { |
if ($domtype ne '') { |
if (($domtype ne '') && ($domtype ne 'public')) { |
my %domdefs = &Apache::lonnet::get_domain_defaults($domtype); |
my %domdefs = &Apache::lonnet::get_domain_defaults($domtype); |
if ($domdefs{'lang_def'} ne '') { |
if ($domdefs{'lang_def'} ne '') { |
push(@languages,$domdefs{'lang_def'}); |
push(@languages,$domdefs{'lang_def'}); |
Line 382 sub gettimezone {
|
Line 382 sub gettimezone {
|
if ($uroledomdefs{'timezone_def'} ne '') { |
if ($uroledomdefs{'timezone_def'} ne '') { |
$timezone = $uroledomdefs{'timezone_def'}; |
$timezone = $uroledomdefs{'timezone_def'}; |
} |
} |
} elsif ($Apache::lonnet::env{'user.domain'} ne '') { |
} elsif (($Apache::lonnet::env{'user.domain'} ne '') && |
|
($Apache::lonnet::env{'user.domain'} ne 'public')) { |
my %udomdefaults = |
my %udomdefaults = |
&Apache::lonnet::get_domain_defaults($Apache::lonnet::env{'user.domain'}); |
&Apache::lonnet::get_domain_defaults($Apache::lonnet::env{'user.domain'}); |
if ($udomdefaults{'timezone_def'} ne '') { |
if ($udomdefaults{'timezone_def'} ne '') { |