--- loncom/interface/resetpw.pm 2010/12/01 23:15:47 1.22.2.4 +++ loncom/interface/resetpw.pm 2010/12/06 02:40:45 1.22.2.5 @@ -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.4 2010/12/01 23:15:47 raeburn Exp $ +# $Id: resetpw.pm,v 1.22.2.5 2010/12/06 02:40:45 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -204,10 +204,11 @@ sub get_uname { $value{'uname'} = $uname; $value{'useremail'} = $useremail; } + my $inventory = uc($defdom); my $msg = '
'.&mt('To be able to reset a forgotten password:') .'
' - .&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. ').'

'; + .&mt('In most cases the [_1] WebCenter username is the same as your e-mail address, in which case you will enter the same information twice.',$inventory).'

'; $msg .= '
'. &Apache::lonhtmlcommon::start_pick_box(). &Apache::lonhtmlcommon::row_title($lt{'unam'}). @@ -317,6 +318,7 @@ sub reset_passwd { ($data{'email'} =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) && ($data{'temppasswd'} =~/^\w+$/)) { my $reqtime = &Apache::lonlocal::locallocaltime($data{'time'}); + my $inventory = uc($data{'domain'}); if ($now - $data{'time'} < 7200) { if ($env{'form.action'} eq 'verify_and_change_pass') { my $homeserver = &Apache::lonnet::homeserver($env{'form.uname'},$env{'form.udom'}); @@ -375,7 +377,7 @@ sub reset_passwd { } else { $r->print(&mt('The token included in an e-mail sent to you [_1] has been verified, so you may now proceed to reset the password for your LON-CAPA account.',$reqtime).'
'. '

'.&mt('Please enter the username and domain of the LON-CAPA account, and the associated e-mail address, for which you are setting a password.').'
'. - &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.').'

'. + &mt('In most cases the [_1] WebCenter username is the same as your e-mail address, in which case you will enter the same information twice.',$inventory).'

'. '

'.&mt('The new password must contain at least 7 characters.').' '. &mt('Your new password will be sent to the LON-CAPA server in an encrypted form.').'

'); &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token);