--- loncom/interface/lonpreferences.pm 2002/10/14 20:41:07 1.15 +++ loncom/interface/lonpreferences.pm 2003/04/01 22:21:45 1.18 @@ -1,7 +1,7 @@ # The LearningOnline Network # Preferences # -# $Id: lonpreferences.pm,v 1.15 2002/10/14 20:41:07 albertel Exp $ +# $Id: lonpreferences.pm,v 1.18 2003/04/01 22:21:45 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -148,7 +148,7 @@ sub verify_and_change_screenname { } # Nickname $message.='
'; - my $newscreen = $ENV{'form.nickname'}; + $newscreen = $ENV{'form.nickname'}; $newscreen=~s/[^ \w]//g; if ($newscreen) { &Apache::lonnet::put('environment',{'nickname' => $newscreen}); @@ -181,8 +181,10 @@ sub msgforwardchanger { my $domain = $ENV{'user.domain'}; my %userenv = &Apache::lonnet::get('environment',['msgforward']); my $msgforward=$userenv{'msgforward'}; + my $notification=$userenv{'notification'}; + my $critnotification=$userenv{'critnotification'}; my $bodytag=&Apache::loncommon::bodytag( - 'Change Your Message Forwarding'); + 'Change Your Message Forwarding and Notification'); $r->print(< $bodytag @@ -190,7 +192,11 @@ $bodytag
New Forwarding Address(es) (user:domain,user:domain,...): - +
+New Message Notification Email Address(es) (joe\@doe.com,jane\@doe.edu,...): +
+New Critical Message Notification Email Address(es) (joe\@doe.com,jane\@doe.edu,...): +
@@ -220,14 +226,36 @@ sub verify_and_change_msgforward { if ($newscreen) { &Apache::lonnet::put('environment',{'msgforward' => $newscreen}); &Apache::lonnet::appenv('environment.msgforward' => $newscreen); - $message.='Set new message forwarding to '.$newscreen; + $message.='Set new message forwarding to '.$newscreen.'
'; } else { &Apache::lonnet::del('environment',['msgforward']); &Apache::lonnet::delenv('environment\.msgforward'); - $message.='Reset message forwarding'; + $message.='Reset message forwarding
'; + } + my $notification=$ENV{'form.notification'}; + $notification=~s/\s//gs; + if ($notification) { + &Apache::lonnet::put('environment',{'notification' => $notification}); + &Apache::lonnet::appenv('environment.notification' => $notification); + $message.='Set message notification address to '.$notification.'
'; + } else { + &Apache::lonnet::del('environment',['notification']); + &Apache::lonnet::delenv('environment\.notification'); + $message.='Reset message notification
'; + } + my $critnotification=$ENV{'form.critnotification'}; + $critnotification=~s/\s//gs; + if ($critnotification) { + &Apache::lonnet::put('environment',{'critnotification' => $critnotification}); + &Apache::lonnet::appenv('environment.critnotification' => $critnotification); + $message.='Set critical message notification address to '.$critnotification; + } else { + &Apache::lonnet::del('environment',['critnotification']); + &Apache::lonnet::delenv('environment\.critnotification'); + $message.='Reset critical message notification
'; } my $bodytag=&Apache::loncommon::bodytag( - 'Change Your Message Forwarding'); + 'Change Your Message Forwarding and Notifications'); $r->print(< $bodytag @@ -378,7 +406,8 @@ ENDHEADER "Password data was blank.\n

"); return; } - # Get the keysecen my $lonhost = $r->dir_config('lonHostID'); + # Get the keys + my $lonhost = $r->dir_config('lonHostID'); my $tmpinfo = Apache::lonnet::reply('tmpget:'.$logtoken,$lonhost); if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) { # I do not a have a better idea about how to handle this @@ -393,9 +422,9 @@ ENDERROR } my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo); # - my $currentpass = &des_decrypt($ckey ,$currentpass); - my $newpass1 = &des_decrypt($n1key,$newpass1); - my $newpass2 = &des_decrypt($n2key,$newpass2); + $currentpass = &des_decrypt($ckey ,$currentpass); + $newpass1 = &des_decrypt($n1key,$newpass1); + $newpass2 = &des_decrypt($n2key,$newpass2); # if ($newpass1 ne $newpass2) { &passwordchanger($r, @@ -514,7 +543,7 @@ ENDSCREENNAMEFORM $r->print(< - + ENDMSGFORWARDFORM # The "about me" page