version 1.513, 2007/03/03 01:40:28
|
version 1.514, 2007/03/08 01:58:44
|
Line 1270 sub create_text_file {
|
Line 1270 sub create_text_file {
|
sub domain_select { |
sub domain_select { |
my ($name,$value,$multiple)=@_; |
my ($name,$value,$multiple)=@_; |
my %domains=map { |
my %domains=map { |
$_ => $_.' '.$Apache::lonnet::domaindescription{$_} |
$_ => $_.' '. &Apache::lonnet::domain($_,'description') |
} &Apache::lonnet::all_domains(); |
} &Apache::lonnet::all_domains(); |
if ($multiple) { |
if ($multiple) { |
$domains{''}=&mt('Any domain'); |
$domains{''}=&mt('Any domain'); |
Line 1863 If target_domain is not found in domain.
|
Line 1863 If target_domain is not found in domain.
|
#------------------------------------------- |
#------------------------------------------- |
sub get_auth_defaults { |
sub get_auth_defaults { |
my $domain=shift; |
my $domain=shift; |
return ($Apache::lonnet::domain_auth_def{$domain},$Apache::lonnet::domain_auth_arg_def{$domain}); |
return (&Apache::lonnet::domain($domain,'auth_def'), |
|
&Apache::lonnet::domain($domain,'auth_arg_def')); |
|
|
} |
} |
############################################################### |
############################################################### |
## End Get Authentication Defaults for Domain ## |
## End Get Authentication Defaults for Domain ## |
Line 2447 sub preferred_languages {
|
Line 2449 sub preferred_languages {
|
if ($browser) { |
if ($browser) { |
@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$browser)); |
@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$browser)); |
} |
} |
if ($Apache::lonnet::domain_lang_def{$env{'user.domain'}}) { |
if (&Apache::lonnet::domain($env{'user.domain'},'lang_def')) { |
@languages=(@languages, |
@languages=(@languages, |
$Apache::lonnet::domain_lang_def{$env{'user.domain'}}); |
&Apache::lonnet::domain($env{'user.domain'}, |
|
'lang_def')); |
} |
} |
if ($Apache::lonnet::domain_lang_def{$env{'request.role.domain'}}) { |
if (&Apache::lonnet::domain($env{'request.role.domain'},'lang_def')) { |
@languages=(@languages, |
@languages=(@languages, |
$Apache::lonnet::domain_lang_def{$env{'request.role.domain'}}); |
&Apache::lonnet::domain($env{'request.role.domain'}, |
|
'lang_def')); |
} |
} |
if ($Apache::lonnet::domain_lang_def{ |
if (&Apache::lonnet::domain($Apache::lonnet::perlvar{'lonDefDomain'}, |
$Apache::lonnet::perlvar{'lonDefDomain'}}) { |
'lang_def')) { |
@languages=(@languages, |
@languages=(@languages, |
$Apache::lonnet::domain_lang_def{ |
&Apache::lonnet::domain($Apache::lonnet::perlvar{'lonDefDomain'}, |
$Apache::lonnet::perlvar{'lonDefDomain'}}); |
'lang_def')); |
} |
} |
# turn "en-ca" into "en-ca,en" |
# turn "en-ca" into "en-ca,en" |
my @genlanguages; |
my @genlanguages; |
Line 3198 sub domainlogo {
|
Line 3202 sub domainlogo {
|
if (-e '/home/httpd/html/adm/lonDomLogos/'.$domain.'.gif') { |
if (-e '/home/httpd/html/adm/lonDomLogos/'.$domain.'.gif') { |
my $logo=&lonhttpdurl("/adm/lonDomLogos/$domain.gif"); |
my $logo=&lonhttpdurl("/adm/lonDomLogos/$domain.gif"); |
return '<img src="'.$logo.'" alt="'.$domain.'" />'; |
return '<img src="'.$logo.'" alt="'.$domain.'" />'; |
} elsif(exists($Apache::lonnet::domaindescription{$domain})) { |
} elsif (defined(&Apache::lonnet::domain($domain,'description'))) { |
return $Apache::lonnet::domaindescription{$domain}; |
return &Apache::lonnet::domain($domain,'description'); |
} else { |
} else { |
return ''; |
return ''; |
} |
} |