[BACK]Return to resetpw.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/resetpw.pm between versions 1.27 and 1.28

version 1.27, 2012/02/16 22:18:07 version 1.28, 2012/10/02 18:08:12
Line 228  sub send_token { Line 228  sub send_token {
         if ($result eq 'ok') {          if ($result eq 'ok') {
             $msg .= &mt("An e-mail sent to the e-mail address associated with your LON-CAPA account includes the web address for the link you should use to complete the reset process.<br /><br />The link included in the message will be valid for the next <b>two</b> hours.");              $msg .= &mt("An e-mail sent to the e-mail address associated with your LON-CAPA account includes the web address for the link you should use to complete the reset process.<br /><br />The link included in the message will be valid for the next <b>two</b> hours.");
         } else {          } else {
             $msg .= &mt("An error occurred when sending a message to the e-mail address associated with your LON-CAPA account. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email);              $msg .=
                   '<p class="LC_warning">'
                  .&mt("An error occurred when sending a message to the e-mail address"
                      ." associated with your LON-CAPA account."
                      ." Please contact the [_1] ([_2]) for assistance."
                       ,$contact_name,$contact_email)
                  .'</p>';
         }          }
     } else {      } else {
         $msg .= &mt("An error occurred creating a token required for the password reset process. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email);          $msg .=
               '<p class="LC_warning">'
              .&mt("An error occurred creating a token required for the"
                  ." password reset process."
                  ." Please contact the [_1] ([_2]) for assistance."
                   ,$contact_name,$contact_email)
              .'</p>';
     }      }
     return $msg;      return $msg;
 }  }
Line 317  sub reset_passwd { Line 329  sub reset_passwd {
                     my $result = &send_mail($domdesc,$data{'email'},$mailmsg,                      my $result = &send_mail($domdesc,$data{'email'},$mailmsg,
                                             $contact_name,$contact_email);                                              $contact_name,$contact_email);
                     if ($result eq 'ok') {                      if ($result eq 'ok') {
                         $msg .= &mt('An e-mail confirming setting of the password for your LON-CAPA account has been sent to [_1].',$data{'email'});                          $msg .=
                               '<p class="LC_success">'
                              .&mt('An e-mail confirming setting of the password'
                                  .' for your LON-CAPA account has been sent to [_1].'
                                   ,$data{'email'})
                              .'</p>';
                     } else {                      } else {
                         $msg .= &mt('An error occurred when sending e-mail to [_1] confirming setting of your new password.',$data{'email'});                          $msg .=
                               '<p class="LC_error">'
                              .&mt('An error occurred when sending e-mail to [_1]'
                                  .' confirming setting of your new password.'
                                   ,$data{'email'})
                              .'</p>';
                     }                      }
                     $msg .= '<br /><br />'                      $msg .= '<br />'
                            .'<a href="/adm/login">'.&mt('Go to the login page').'</a>.';                             .'<a href="/adm/login">'.&mt('Go to the login page').'</a>.';
                 } elsif ($change_failed eq 'invalid_client') {                  } elsif ($change_failed eq 'invalid_client') {
                     my $homeserver = &Apache::lonnet::homeserver($data{'username'},$data{'domain'});                      my $homeserver = &Apache::lonnet::homeserver($data{'username'},$data{'domain'});
Line 337  sub reset_passwd { Line 359  sub reset_passwd {
                            $opentag = '<a href="'.$url.'">';                             $opentag = '<a href="'.$url.'">';
                            $closetag = '</a>';                             $closetag = '</a>';
                         }                          }
                         $msg .= &mt('A problem occurred when attempting to reset the password for your account. Please try again from your [_1]home server[_2].',$opentag,$closetag);                          $msg .=
                               '<p class="LC_warning">'
                              .&mt('A problem occurred when attempting to reset'
                                  .' the password for your account.'
                                  .' Please try again from your [_1]home server[_2].'
                                   ,$opentag,$closetag)
                              .'</p>';
                     }                      }
                 } else {                  } else {
                     $msg .= &generic_failure_msg($contact_name,$contact_email);                      $msg .= &generic_failure_msg($contact_name,$contact_email);
Line 348  sub reset_passwd { Line 376  sub reset_passwd {
                 &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token);                  &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token);
             }              }
         } else {          } else {
             $msg = &mt('Sorry, the token generated when you requested a password reset has expired. Please submit a [_1]new request[_2], and follow the link to the web page included in the new e-mail that will be sent to you, to allow you to enter a new password.'              $msg =
                       ,'<a href="/adm/resetpw">','</a>');                  '<p class="LC_warning">'
                  .&mt('Sorry, the token generated when you requested a password reset has expired. Please submit a [_1]new request[_2], and follow the link to the web page included in the new e-mail that will be sent to you, to allow you to enter a new password.'
                       ,'<a href="/adm/resetpw">','</a>')
                  .'</p>';
         }          }
     } else {      } else {
         $msg .= &mt('Sorry, the URL generated when you requested reset of your password contained incomplete information. Please submit a [_1]new request[_2] for a password reset, and use the new URL that will be sent to your e-mail account to complete the process.'          $msg .=
                    ,'<a href="/adm/resetpw">','</a>');              '<p class="LC_warning">'
              .&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information. Please submit a [_1]new request[_2] for a password reset, and use the new URL that will be sent to your e-mail account to complete the process.'
                   ,'<a href="/adm/resetpw">','</a>')
              .'</p>';
     }      }
     return $msg;      return $msg;
 }  }
   
 sub generic_failure_msg {  sub generic_failure_msg {
     my ($contact_name,$contact_email) = @_;      my ($contact_name,$contact_email) = @_;
     return &mt('A problem occurred when attempting to reset the password for your account. Please contact the [_1] - ([_2]) for assistance.',      return
               $contact_name,'<a href="mailto:'.$contact_email.'">'.$contact_email.'</a>');          '<p class="LC_warning">'
          .&mt('A problem occurred when attempting to reset the password for your account.'
              .' Please contact the [_1] - ([_2]) for assistance.',
                 $contact_name,'<a href="mailto:'.$contact_email.'">'.$contact_email.'</a>')
          .'</p>';
 }  }
   
 sub create_passwd {  sub create_passwd {
Removed from v.1.27  
changed lines
  Added in v.1.28

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>