--- loncom/interface/resetpw.pm 2010/11/29 19:25:53 1.22.2.3 +++ loncom/interface/resetpw.pm 2012/02/14 15:48:55 1.23.2.2.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.3 2010/11/29 19:25:53 raeburn Exp $ +# $Id: resetpw.pm,v 1.23.2.2.2.3 2012/02/14 15:48:55 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -80,10 +80,11 @@ sub handler { } &Apache::lonacc::get_posted_cgi($r); &Apache::lonlocal::get_language_handle($r); - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']); + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token', + 'uname','useremail','referrer']); my @emailtypes = ('permanentemail','critnotification','notification'); - my $uname = &unescape($env{'form.uname'}); + my $uname = $env{'form.uname'}; my $useremail = $env{'form.useremail'}; my $udom = $env{'form.udom'}; my $token = $env{'form.token'}; @@ -106,15 +107,15 @@ sub handler { text => 'Result'}); } } - my $args = {no_inline_link => 1, - bread_crumbs => $brcrum, - bread_crumbs_component => $bread_crumbs_component}; + my $args = {bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component, + 'no_inline_link' => 1}; $r->print(&Apache::loncommon::start_page('Reset password','',$args)); $r->print('

'.&mt('Reset forgotten LON-CAPA password').'

'); my $output; if ($token) { $output = &reset_passwd($r,$token,$contact_name,$contact_email); - } elsif ($uname && $udom) { + } elsif ($uname && $udom && ($env{'form.referrer'} ne 'createaccount')) { my $domdesc = &Apache::lonnet::domain($udom,'description'); my $homeserver = &Apache::lonnet::homeserver($uname,$udom); if ($homeserver eq 'no_host') { @@ -184,7 +185,7 @@ sub handler { $contact_name,$contact_email); } } else { - $output = &get_uname($defdom); + $output = &get_uname($defdom,$uname,$useremail); } $r->print($output); $r->print(&Apache::loncommon::end_page()); @@ -192,25 +193,33 @@ sub handler { } sub get_uname { - my ($defdom) = @_; + my ($defdom,$uname,$useremail) = @_; my %lt = &Apache::lonlocal::texthash( - unam => 'LON-CAPA username', - udom => 'LON-CAPA domain', + unam => 'username', + udom => 'domain', uemail => 'E-mail address in LON-CAPA', proc => 'Proceed'); - + my %value; + if ($env{'form.referrer'} eq 'createaccount') { + $value{'uname'} = $uname; + $value{'useremail'} = $useremail; + } + if ($env{'form.referrer'} eq 'createaccount') { + $value{'uname'} = $uname; + $value{'useremail'} = $useremail; + } 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] username is the same as your e-mail address, in which case you will enter the same information twice.','Mechanics Online').'

'; $msg .= '
'. &Apache::lonhtmlcommon::start_pick_box(). - &Apache::lonhtmlcommon::row_title('LON-CAPA '.$lt{'unam'}). - ''. + &Apache::lonhtmlcommon::row_title('Mechanics Online '.$lt{'unam'}). + ''. ''. &Apache::lonhtmlcommon::row_closure(1). &Apache::lonhtmlcommon::row_title($lt{'uemail'}). - ''. + ''. &Apache::lonhtmlcommon::end_pick_box(). '

'."\n"; return $msg; @@ -241,20 +250,24 @@ sub send_token { 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.').'

'.&mt('The link included in the message will be valid for the next [_1]two[_2] hours.','',''); } 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 .= &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); } } 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 .= &mt("An error occurred creating a token required for the password reset process. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email); } return $msg; } sub send_mail { - my ($domdesc,$email,$mailmsg,$contact_name,$contact_email) = @_; + my ($domdesc,$email,$mailmsg,$contact_name,$contact_email,$subject) = @_; + if ($subject eq '') { + $subject = &mt('Your LON-CAPA account'); + } my $outcome; my $requestmail = "To: $email\n". "From: $contact_name <$contact_email>\n". - "Subject: ".&mt('Your LON-CAPA account')."\n". + "Subject: $subject\n". + "Content-type: text/plain\;charset=UTF-8\n". "\n\n".$mailmsg."\n\n". &mt('[_1] LON-CAPA support team',$domdesc)."\n". "$contact_email\n"; @@ -370,7 +383,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] username is the same as your e-mail address, in which case you will enter the same information twice.','Mechanics Online').'

'. '

'.&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);