--- loncom/interface/lonpreferences.pm	2002/03/30 23:27:00	1.6
+++ loncom/interface/lonpreferences.pm	2002/08/19 13:10:55	1.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.6 2002/03/30 23:27:00 www Exp $
+# $Id: lonpreferences.pm,v 1.9 2002/08/19 13:10:55 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -98,13 +98,14 @@ sub des_decrypt {
 ################################################################
 #                       Handler subroutines                    #
 ################################################################
+
+################################################################
+#         Anonymous Discussion Name Change Subroutines         #
+################################################################
 sub screennamechanger {
     my $r = shift;
-    my $errormessage = shift;
-    $errormessage = ($errormessage || '');
     my $user       = $ENV{'user.name'};
     my $domain     = $ENV{'user.domain'};
-    my $homeserver = $ENV{'user.home'};
     my %userenv = &Apache::lonnet::get('environment',['screenname']);
     my $screenname=$userenv{'screenname'};
     $r->print(<<ENDSCREEN);
@@ -112,11 +113,9 @@ sub screennamechanger {
 <body bgcolor="#FFFFFF">
 <h1>Preferences for $user</h1>
 <h3>$user is a member of domain $domain</h3>
-$errormessage
 <p>
 Change anonymous discussion screen name for $user
 </p>
-
 <form name="server" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_screenname" />
 New screenname:
@@ -132,17 +131,16 @@ sub verify_and_change_screenname {
     my $r = shift;
     my $user       = $ENV{'user.name'};
     my $domain     = $ENV{'user.domain'};
-    my $homeserver = $ENV{'user.home'};
     my $newscreen  = $ENV{'form.screenname'};
     $newscreen=~s/\W//g;
     my $message='';
     if ($newscreen) {
-	my %tmp;
-        $tmp{'screenname'}=$newscreen;
-        &Apache::lonnet::put('environment',\%tmp);
+        &Apache::lonnet::put('environment',{'screenname' => $newscreen});
+        &Apache::lonnet::appenv('environment.screenname' => $newscreen);
         $message='Set new screenname to '.$newscreen;
     } else {
         &Apache::lonnet::del('environment',['screenname']);
+        &Apache::lonnet::delenv('environment\.screenname');
         $message='Reset screenname';
     }
     $r->print(<<ENDVCSCREEN);
@@ -194,13 +192,14 @@ sub passwordchanger {
     $lkey_npass2= hex($lkey_npass2);
     # Output javascript to deal with passwords
     # Output DES javascript
+    $r->print("<html><head>");
     {
 	my $include = $r->dir_config('lonIncludes');
 	my $jsh=Apache::File->new($include."/londes.js");
 	$r->print(<$jsh>);
     }
     $r->print(<<ENDFORM);
-
+</head>
 <body bgcolor="#FFFFFF" onLoad="init();">
 
 <script language="JavaScript">
@@ -359,14 +358,13 @@ ENDERROR
     # Inform the user the password has (not?) been changed
     if ($result =~ /^ok$/) {
 	$r->print(<<"ENDTEXT");
-<h2>Password for $user was successfully changed</h2>
+<h2>The password for $user was successfully changed</h2>
 ENDTEXT
     } else {
 	# error error: run in circles, scream and shout
         $r->print(<<ENDERROR);
-<h2><font color="#ff0000">Password for $user was not changed</font></h2>
-There was an internal error when attempting to change your password.
-Please contact your instructor or the domain coordinator.
+<h2><font color="#ff0000">The password for $user was not changed</font></h2>
+Please make sure your old password was entered correctly.
 ENDERROR
     }
     return;
@@ -376,7 +374,6 @@ ENDERROR
 #            other handler subroutines               #
 ######################################################
 
-
 ################################################################
 #                          Main handler                        #
 ################################################################
@@ -389,7 +386,7 @@ sub handler {
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     return OK if $r->header_only;
-    # Spit out the header
+    #
     if ($ENV{'form.action'} eq 'changepass') {
 	&passwordchanger($r);
     } elsif ($ENV{'form.action'} eq 'verify_and_change_pass') {
