--- loncom/interface/resetpw.pm	2010/09/19 15:04:40	1.22.2.2
+++ loncom/interface/resetpw.pm	2010/11/29 19:25:53	1.22.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Allow access to password changing via a token sent to user's e-mail. 
 #
-# $Id: resetpw.pm,v 1.22.2.2 2010/09/19 15:04:40 raeburn Exp $
+# $Id: resetpw.pm,v 1.22.2.3 2010/11/29 19:25:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,6 +69,15 @@ sub handler {
     my $contact_email =  $r->dir_config('lonSupportEMail');
     my $server = $r->dir_config('lonHostID');
     my $defdom = &Apache::lonnet::default_login_domain();
+    my $handle = &Apache::lonnet::check_for_valid_session($r);
+    my $lonidsdir=$r->dir_config('lonIDsDir');
+    if ($handle ne '') {
+        if ($handle=~/^publicuser\_/) {
+            unlink($r->dir_config('lonIDsDir')."/$handle.id");
+        } else {
+            &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
+        }
+    }
     &Apache::lonacc::get_posted_cgi($r);
     &Apache::lonlocal::get_language_handle($r);
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']);
@@ -79,11 +88,28 @@ sub handler {
     my $udom = $env{'form.udom'};
     my $token = $env{'form.token'};
     my $case_change;
-    my $start_page =
-        &Apache::loncommon::start_page('Reset password','',
-                                           {
-                                             'no_inline_link'   => 1,});
-    $r->print($start_page);
+    my $brcrum = [];
+    my $bread_crumbs_component = 'Forgotten Password';
+    if ($token) {
+        push (@{$brcrum},
+            {href => '/adm/resetpw',
+             text => 'Update Password'});
+
+        $bread_crumbs_component = 'Reset Password';
+    } else {
+        push (@{$brcrum},
+            {href => '/adm/resetpw',
+             text => 'Account Information'});
+        if ($uname && $udom) {
+            push (@{$brcrum},
+                {href => '/adm/resetpw',
+                 text => 'Result'});
+        }
+    }
+    my $args = {no_inline_link         => 1,
+                bread_crumbs           => $brcrum,
+                bread_crumbs_component => $bread_crumbs_component};
+    $r->print(&Apache::loncommon::start_page('Reset password','',$args));
     $r->print('<h3>'.&mt('Reset forgotten LON-CAPA password').'</h3>');
     my $output;
     if ($token) {
@@ -177,23 +203,16 @@ sub get_uname {
            .'<ul><li>'.&mt('An e-mail address must have previously been associated with your LON-CAPA username.').'</li>'
            .'<li>'.&mt('You must be able to access e-mail sent to the e-mail address associated with your WebCenter account.').'</li></ul><br />'
            .&mt('In most cases the GCI WebCenter username is the same as your e-mail address, in which case you will enter the same information twice. ').'<br />';
-    $msg .= '
-<form name="forgotpw" method="post">
-<table>
- <tr>
-  <td align="left">'.$lt{'unam'}.':</td>
-  <td><input type="text" name="uname" size="30" />
-      <input type="hidden" name="udom" value="'.$defdom.'" /></td>
- </tr>
- <tr>
-  <td align="left">'.$lt{'uemail'}.':</td>
-  <td><input type="text" name="useremail" size="30" /></td>
- </tr>
- <tr><td colspan="2" align="left"><br />
-    <input type="submit" value="'.$lt{'proc'}.'" /></td>
- </tr>
-</table>
-</form>'."\n";
+    $msg .= '<form name="forgotpw" method="post" action="/adm/resetpw">'.
+            &Apache::lonhtmlcommon::start_pick_box().
+            &Apache::lonhtmlcommon::row_title('LON-CAPA '.$lt{'unam'}).
+            '<input type="text" name="uname" size="30" />'.
+            '<input type="hidden" name="udom" value="'.$defdom.'" />'.
+            &Apache::lonhtmlcommon::row_closure(1).
+            &Apache::lonhtmlcommon::row_title($lt{'uemail'}).
+            '<input type="text" name="useremail" size="30" />'.
+            &Apache::lonhtmlcommon::end_pick_box().
+            '<br /><br /><input type="submit" name="resetter" value="'.$lt{'proc'}.'" /></form>'."\n";
     return $msg;
 }
 
@@ -216,7 +235,7 @@ sub send_token {
         my $esc_token = &escape($token);
         my $showtime = &Apache::lonlocal::locallocaltime(time);
         my $reseturl = &Apache::lonnet::absolute_url().'/adm/resetpw?token='.$esc_token;
-        my $mailmsg = &mt('A request was submitted on [_1] for reset of the password for your LON-CAPA account.',$showtime).' '.&mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',$reseturl);
+        my $mailmsg = &mt('A request was submitted on [_1] for reset of the password for your LON-CAPA account.',$showtime)." \n".&mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',"\n\n".$reseturl);
         my $result = &send_mail($domdesc,$email,$mailmsg,$contact_name,
                                 $contact_email);
         if ($result eq 'ok') {
@@ -253,8 +272,8 @@ sub invalid_state {
     my ($error,$domdesc,$contact_name,$contact_email) = @_;
     my $msg;
     if ($error eq 'invalid') {
-        $msg = &mt('The username you provided was not verified as a valid username in the LON-CAPA system for the [_1] domain.',$domdesc)
-              .' '.&mt('Please [_1]go back[_2] and try again.','<a href="javascript:history.go(-1)"><u>','</u></a>');
+        $msg = '<p class="LC_warning">'.&mt('The username you provided was not verified as a valid username in the LON-CAPA system for the [_1] domain.',$domdesc)
+              .'</p>'.&mt('Please [_1]go back[_2] and try again.','<a href="javascript:history.go(-1)"><u>','</u></a>');
     } else {
         if ($error eq 'baduseremail') {
             $msg = &mt('The e-mail address you provided does not appear to be a valid address.');
@@ -265,6 +284,7 @@ sub invalid_state {
         } elsif ($error eq 'authentication') {
             $msg = &mt('The username you provided uses an authentication type which can not be reset directly via LON-CAPA.');
         }
+        $msg = '<p class="LC_warning">'.$msg.'</p>';
         if ($contact_email ne '') {
             my $escuri = &HTML::Entities::encode('/adm/resetpw','&<>"');
             $msg .= '<br /> '.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for the [_3] domain.'