version 1.579, 2007/09/05 05:09:53
|
version 1.583, 2007/09/11 20:40:23
|
Line 2531 sub preferred_languages {
|
Line 2531 sub preferred_languages {
|
@languages=(@languages, |
@languages=(@languages, |
split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'})); |
split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'})); |
} |
} |
my $browser=(split(/\;/,$ENV{'HTTP_ACCEPT_LANGUAGE'}))[0]; |
my $browser=$ENV{'HTTP_ACCEPT_LANGUAGE'}; |
if ($browser) { |
if ($browser) { |
@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$browser)); |
my @browser = |
|
map { (split(/\s*;\s*/,$_))[0] } (split(/\s*,\s*/,$browser)); |
|
push(@languages,@browser); |
} |
} |
if (&Apache::lonnet::domain($env{'user.domain'},'lang_def')) { |
if (&Apache::lonnet::domain($env{'user.domain'},'lang_def')) { |
@languages=(@languages, |
@languages=(@languages, |
Line 2555 sub preferred_languages {
|
Line 2557 sub preferred_languages {
|
my @genlanguages; |
my @genlanguages; |
foreach my $lang (@languages) { |
foreach my $lang (@languages) { |
unless ($lang=~/\w/) { next; } |
unless ($lang=~/\w/) { next; } |
push (@genlanguages,$lang); |
push(@genlanguages,$lang); |
if ($lang=~/(\-|\_)/) { |
if ($lang=~/(\-|\_)/) { |
push(@genlanguages,(split(/(\-|\_)/,$lang))[0]); |
push(@genlanguages,(split(/(\-|\_)/,$lang))[0]); |
} |
} |
} |
} |
|
#uniqueify the languages list |
|
my %count; |
|
@genlanguages = map { $count{$_}++ == 0 ? $_ : () } @genlanguages; |
return @genlanguages; |
return @genlanguages; |
} |
} |
|
|
|
sub languages { |
|
my ($possible_langs) = @_; |
|
my @preferred_langs = &preferred_languages(); |
|
if (!ref($possible_langs)) { |
|
if( wantarray ) { |
|
return @preferred_langs; |
|
} else { |
|
return $preferred_langs[0]; |
|
} |
|
} |
|
my %possibilities = map { $_ => 1 } (@$possible_langs); |
|
my @preferred_possibilities; |
|
foreach my $preferred_lang (@preferred_langs) { |
|
if (exists($possibilities{$preferred_lang})) { |
|
push(@preferred_possibilities, $preferred_lang); |
|
} |
|
} |
|
if( wantarray ) { |
|
return @preferred_possibilities; |
|
} |
|
return $preferred_possibilities[0]; |
|
} |
|
|
############################################################### |
############################################################### |
## Student Answer Attempts ## |
## Student Answer Attempts ## |
############################################################### |
############################################################### |
Line 2637 sub get_previous_attempt {
|
Line 2665 sub get_previous_attempt {
|
for ($version=1;$version<=$returnhash{'version'};$version++) { |
for ($version=1;$version<=$returnhash{'version'};$version++) { |
$prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Transaction '.$version.'</td>'; |
$prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Transaction '.$version.'</td>'; |
foreach my $key (sort(keys(%lasthash))) { |
foreach my $key (sort(keys(%lasthash))) { |
my $value; |
my $value = &format_previous_attempt_value($key, |
if ($key =~ /timestamp/) { |
$returnhash{$version.':'.$key}); |
$value=scalar(localtime($returnhash{$version.':'.$key})); |
$prevattempts.='<td>'.$value.' </td>'; |
} else { |
|
$value=$returnhash{$version.':'.$key}; |
|
} |
|
$prevattempts.='<td>'.&unescape($value).' </td>'; |
|
} |
} |
} |
} |
} |
} |
$prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Current</td>'; |
$prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Current</td>'; |
foreach my $key (sort(keys(%lasthash))) { |
foreach my $key (sort(keys(%lasthash))) { |
my $value; |
my $value = &format_previous_attempt_value($key,$lasthash{$key}); |
if ($key =~ /timestamp/) { |
|
$value=scalar(localtime($lasthash{$key})); |
|
} else { |
|
$value=$lasthash{$key}; |
|
} |
|
$value=&unescape($value); |
|
if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)} |
if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)} |
$prevattempts.='<td>'.$value.' </td>'; |
$prevattempts.='<td>'.$value.' </td>'; |
} |
} |
Line 2668 sub get_previous_attempt {
|
Line 2686 sub get_previous_attempt {
|
} |
} |
} |
} |
|
|
|
sub format_previous_attempt_value { |
|
my ($key,$value) = @_; |
|
if ($key =~ /timestamp/) { |
|
$value = &Apache::lonlocal::locallocaltime($value); |
|
} elsif (ref($value) eq 'ARRAY') { |
|
$value = '('.join(', ', @{ $value }).')'; |
|
} else { |
|
$value = &unescape($value); |
|
} |
|
return $value; |
|
} |
|
|
|
|
sub relative_to_absolute { |
sub relative_to_absolute { |
my ($url,$output)=@_; |
my ($url,$output)=@_; |
my $parser=HTML::TokeParser->new(\$output); |
my $parser=HTML::TokeParser->new(\$output); |
Line 5651 sub user_picker {
|
Line 5682 sub user_picker {
|
my $currdom = $dom; |
my $currdom = $dom; |
my %curr_selected = ( |
my %curr_selected = ( |
srchin => 'dom', |
srchin => 'dom', |
srchby => 'uname', |
srchby => 'lastname', |
); |
); |
my $srchterm; |
my $srchterm; |
if (ref($srch) eq 'HASH') { |
if (ref($srch) eq 'HASH') { |
Line 5713 sub user_picker {
|
Line 5744 sub user_picker {
|
$srchinsel .= "\n </select>\n"; |
$srchinsel .= "\n </select>\n"; |
|
|
my $srchbysel = ' <select name="srchby">'; |
my $srchbysel = ' <select name="srchby">'; |
foreach my $option ('uname','lastname','lastfirst') { |
foreach my $option ('lastname','lastfirst','uname') { |
if ($curr_selected{'srchby'} eq $option) { |
if ($curr_selected{'srchby'} eq $option) { |
$srchbysel .= ' |
$srchbysel .= ' |
<option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>'; |
<option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>'; |
Line 5725 sub user_picker {
|
Line 5756 sub user_picker {
|
$srchbysel .= "\n </select>\n"; |
$srchbysel .= "\n </select>\n"; |
|
|
my $srchtypesel = ' <select name="srchtype">'; |
my $srchtypesel = ' <select name="srchtype">'; |
foreach my $option ('exact','begins','contains') { |
foreach my $option ('begins','contains','exact') { |
if ($curr_selected{'srchtype'} eq $option) { |
if ($curr_selected{'srchtype'} eq $option) { |
$srchtypesel .= ' |
$srchtypesel .= ' |
<option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>'; |
<option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>'; |