--- loncom/interface/lonpreferences.pm 2003/09/17 01:45:14 1.29 +++ loncom/interface/lonpreferences.pm 2004/03/26 20:29:35 1.41 @@ -1,7 +1,7 @@ # The LearningOnline Network # Preferences # -# $Id: lonpreferences.pm,v 1.29 2003/09/17 01:45:14 www Exp $ +# $Id: lonpreferences.pm,v 1.41 2004/03/26 20:29:35 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,18 +25,6 @@ # # http://www.lon-capa.org/ # -# (Internal Server Error Handler -# -# (Login Screen -# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14, -# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer) -# -# 3/1/1 Gerd Kortemeyer) -# -# 3/1 Gerd Kortemeyer -# -# 2/13/02 2/14 2/15 Matthew Hall -# # This package uses the "londes.js" javascript code. # # TODOs that have to be completed: @@ -51,6 +39,7 @@ use Crypt::DES; use DynaLoader; # for Crypt::DES version use Apache::loncommon(); use Apache::lonhtmlcommon(); +use Apache::lonlocal; # # Write lonnet::passwd to do the call below. @@ -62,7 +51,7 @@ use Apache::lonhtmlcommon(); ################################################## sub des_keys { # Make a new key for DES encryption. - # Each key has two parts which are returned seperately. + # Each key has two parts which are returned separately. # Please note: Each key must be passed through the &hex function # before it is output to the web browser. The hex versions cannot # be used to decrypt. @@ -108,27 +97,25 @@ sub languagechanger { my $user = $ENV{'user.name'}; my $domain = $ENV{'user.domain'}; my %userenv = &Apache::lonnet::get - ('environment',['languages','translator']); + ('environment',['languages']); my $language=$userenv{'languages'}; - my $translator=$userenv{'translator'}; - my $bodytag=&Apache::loncommon::bodytag( - 'Change Your Language Preferences'); - $r->print(< -$bodytag + my $pref=&mt('Preferred language'); + my %langchoices=('' => 'No language preference'); + foreach (&Apache::loncommon::languageids()) { + if (&Apache::loncommon::supportedlanguagecode($_)) { + $langchoices{&Apache::loncommon::supportedlanguagecode($_)} + = &Apache::loncommon::plainlanguagedescription($_); + } + } + my $selectionbox=&Apache::loncommon::select_form($language,'language', + %langchoices); + $r->print(< -
Preferred language: - +
$pref: $selectionbox ENDLSCREEN - if ($ENV{'user.adv'}) { - $r->print (<Willing to translate for language: - -ENDTRSC - } - $r->print('
'); + $r->print('
'); } @@ -149,29 +136,9 @@ sub verify_and_change_languages { &Apache::lonnet::delenv('environment\.languages'); $message='Reset preferred language'; } - if ($ENV{'user.adv'}) { - $message.='
'; - my $newtrans = $ENV{'form.translator'}; - $newtrans=~s/[^\-\w]//g; - if ($newtrans) { - &Apache::lonnet::put('environment',{'translator' => $newtrans}); - &Apache::lonnet::appenv('environment.translator' => $newtrans); - $message.='Set translator to '.$newtrans; - } else { - &Apache::lonnet::del('environment',['translator']); - &Apache::lonnet::delenv('environment\.translator'); - $message.='Reset translator'; - } - } - - my $bodytag=&Apache::loncommon::bodytag( - 'Change Your Language Preferences'); $r->print(< -$bodytag

$message - ENDVCSCREEN } @@ -187,12 +154,7 @@ sub screennamechanger { ('environment',['screenname','nickname']); my $screenname=$userenv{'screenname'}; my $nickname=$userenv{'nickname'}; - my $bodytag=&Apache::loncommon::bodytag( - 'Change Your Nickname and Anonymous Screen Name'); $r->print(< -$bodytag -

New screenname (shown if you post anonymously): @@ -201,8 +163,6 @@ $bodytag
- - ENDSCREEN } @@ -237,14 +197,9 @@ sub verify_and_change_screenname { $message.='Reset nickname'; } - my $bodytag=&Apache::loncommon::bodytag( - 'Change Your Nickname and Anonymous Screen Name'); $r->print(< -$bodytag

$message - ENDVCSCREEN } @@ -260,8 +215,6 @@ sub msgforwardchanger { my $msgforward=$userenv{'msgforward'}; my $notification=$userenv{'notification'}; my $critnotification=$userenv{'critnotification'}; - my $bodytag=&Apache::loncommon::bodytag( - 'Change Your Message Forwarding and Notification'); my $forwardingHelp = Apache::loncommon::help_open_topic("Prefs_Forwarding", "What are forwarding ". "and notification ". @@ -270,8 +223,6 @@ sub msgforwardchanger { "What are critical messages"); $r->print(< -$bodytag $forwardingHelp
@@ -283,8 +234,6 @@ New Critical Message Notification Email $criticalMessageHelp
- - ENDMSG } @@ -338,14 +287,9 @@ sub verify_and_change_msgforward { &Apache::lonnet::delenv('environment\.critnotification'); $message.='Reset critical message notification
'; } - my $bodytag=&Apache::loncommon::bodytag( - 'Change Your Message Forwarding and Notifications'); $r->print(< -$bodytag

$message - ENDVCMSG } @@ -355,9 +299,6 @@ ENDVCMSG sub colorschanger { my $r = shift; - my $bodytag=&Apache::loncommon::bodytag( - 'Change Color Scheme for Current Role Type','', - 'onUnload="pclose();"'); # figure out colors my $function='student'; if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) { @@ -390,7 +331,6 @@ sub colorschanger { } my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition(); $r->print(< -$bodytag
@@ -431,8 +370,6 @@ $chtable
- - ENDCOL } @@ -473,18 +410,12 @@ sub verify_and_change_colors { $message.='Reset '.$colortypes{$item}.'
'; } } - my $bodytag=&Apache::loncommon::bodytag( - 'Change Color Scheme for Current Role Type'); $r->print(< -$bodytag

$message
-
- ENDVCCOL } @@ -530,12 +461,7 @@ sub passwordchanger { my $jsh=Apache::File->new($include."/londes.js"); $r->print(<$jsh>); } - my $bodytag=&Apache::loncommon::bodytag('Change Password','', - 'onLoad="init();"'); $r->print(< -$bodytag -