--- loncom/interface/resetpw.pm 2012/02/17 03:28:25 1.23.2.2.2.4 +++ loncom/interface/resetpw.pm 2012/10/02 18:08:12 1.28 @@ -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.23.2.2.2.4 2012/02/17 03:28:25 raeburn Exp $ +# $Id: resetpw.pm,v 1.28 2012/10/02 18:08:12 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -66,13 +66,13 @@ sub handler { return OK; } my $contact_name = &mt('LON-CAPA helpdesk'); - my $origmail = $r->dir_config('lonSupportEMail'); + my $origmail = $r->dir_config('lonSupportEMail'); my $server = $r->dir_config('lonHostID'); my $defdom = &Apache::lonnet::default_login_domain(); my $contacts = &Apache::loncommon::build_recipient_list(undef,'helpdeskmail', $defdom,$origmail); - my ($contact_email) = split(/,/,$contacts); + my ($contact_email) = split(',',$contacts); my $handle = &Apache::lonnet::check_for_valid_session($r); my $lonidsdir=$r->dir_config('lonIDsDir'); if ($handle ne '') { @@ -84,15 +84,12 @@ sub handler { } &Apache::lonacc::get_posted_cgi($r); &Apache::lonlocal::get_language_handle($r); - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token', - 'uname','useremail','referrer']); + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']); my @emailtypes = ('permanentemail','critnotification','notification'); - my $uname = $env{'form.uname'}; - my $useremail = $env{'form.useremail'}; + my $uname = &unescape($env{'form.uname'}); my $udom = $env{'form.udom'}; my $token = $env{'form.token'}; - my $case_change; my $brcrum = []; my $bread_crumbs_component = 'Forgotten Password'; if ($token) { @@ -100,7 +97,7 @@ sub handler { {href => '/adm/resetpw', text => 'Update Password'}); - $bread_crumbs_component = 'Reset Password'; + $bread_crumbs_component = 'Reset Password'; } else { push (@{$brcrum}, {href => '/adm/resetpw', @@ -111,30 +108,18 @@ sub handler { text => 'Result'}); } } - my $args = {bread_crumbs => $brcrum, - bread_crumbs_component => $bread_crumbs_component, - 'no_inline_link' => 1}; + my $args = {bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; $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 && ($env{'form.referrer'} ne 'createaccount')) { + } elsif ($uname && $udom) { my $domdesc = &Apache::lonnet::domain($udom,'description'); - my $homeserver = &Apache::lonnet::homeserver($uname,$udom); - if ($homeserver eq 'no_host') { - my $lc_uname = lc($uname); - if ($lc_uname ne $uname) { - $homeserver = &Apache::lonnet::homeserver($lc_uname,$udom); - unless ($homeserver eq 'no_host') { - $uname = $lc_uname; - $useremail = lc($env{'form.useremail'}); - $case_change = 1; - } - } - } my $authtype = &Apache::lonnet::queryauthenticate($uname,$udom); if ($authtype =~ /^internal/) { + my $useremail = $env{'form.useremail'}; if ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) { $output = &invalid_state('baduseremail',$domdesc, $contact_name,$contact_email); @@ -153,15 +138,8 @@ sub handler { } foreach my $item (@items) { if ($item =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) { - if ($case_change) { - my $lcitem = lc($item); - unless(grep(/^\Q$lcitem\E$/,@allemails)) { - push(@allemails,$lcitem); - } - } else { - unless(grep(/^\Q$item\E$/,@allemails)) { - push(@allemails,$item); - } + unless(grep(/^\Q$item\E$/,@allemails)) { + push(@allemails,$item); } } } @@ -189,7 +167,7 @@ sub handler { $contact_name,$contact_email); } } else { - $output = &get_uname($defdom,$uname,$useremail); + $output = &get_uname($defdom); } $r->print($output); $r->print(&Apache::loncommon::end_page()); @@ -197,42 +175,38 @@ sub handler { } sub get_uname { - my ($defdom,$uname,$useremail) = @_; + my ($defdom) = @_; my %lt = &Apache::lonlocal::texthash( 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 [_1] username is the same as your e-mail address, in which case you will enter the same information twice.','Mechanics Online').'

'; + + my $msg = &mt('If you use the same account for other campus services besides LON-CAPA, (e.g., e-mail, course registration, etc.), a separate centrally managed mechanism likely exists to reset a password. However, if your account is used for just LON-CAPA access you will probably be able to reset a password from this page.'); + $msg .= '

'.&mt('Three conditions must be met:') + .''; $msg .= '
'. - &Apache::lonhtmlcommon::start_pick_box(). - &Apache::lonhtmlcommon::row_title('Mechanics Online '.$lt{'unam'}). - ''. - ''. + &Apache::lonhtmlcommon::start_pick_box(). + &Apache::lonhtmlcommon::row_title('LON-CAPA '.$lt{'unam'}). + ''. + &Apache::lonhtmlcommon::row_closure(1). + &Apache::lonhtmlcommon::row_title('LON-CAPA '.$lt{'udom'}). + &Apache::loncommon::select_dom_form($defdom,'udom'). &Apache::lonhtmlcommon::row_closure(1). &Apache::lonhtmlcommon::row_title($lt{'uemail'}). - ''. + ''. &Apache::lonhtmlcommon::end_pick_box(). - '

'."\n"; + '

'; return $msg; } sub send_token { my ($uname,$udom,$email,$server,$domdesc,$contact_name, $contact_email) = @_; - my $msg = &mt('Thank you for your request to reset the password for your Mechanics Online account.').'

'; + my $msg = &mt('Thank you for your request to reset the password for your LON-CAPA account.').'

'; my $now = time; my $temppasswd = &create_passwd(); @@ -248,29 +222,38 @@ 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 Mechanics Online 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 $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') { - $msg .= &mt('An e-mail sent to the e-mail address associated with your Mechanics Online 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.','',''); + $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.

The link included in the message will be valid for the next two hours."); } else { - $msg .= &mt("An error occurred when sending a message to the e-mail address associated with your Mechanics Online 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,$subject) = @_; - if ($subject eq '') { - $subject = &mt('Your Mechanics Online account'); - } + my ($domdesc,$email,$mailmsg,$contact_name,$contact_email) = @_; my $outcome; my $requestmail = "To: $email\n". "From: $contact_name <$contact_email>\n". - "Subject: $subject\n". + "Subject: ".&mt('Your LON-CAPA account')."\n". "Content-type: text/plain\;charset=UTF-8\n". "\n\n".$mailmsg."\n\n". &mt('[_1] LON-CAPA support team',$domdesc)."\n". @@ -331,19 +314,6 @@ sub reset_passwd { my $reqtime = &Apache::lonlocal::locallocaltime($data{'time'}); 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'}); - if ($homeserver eq 'no_host') { - my $lc_uname = lc($env{'form.uname'}); - if ($lc_uname ne $env{'form.uname'}) { - $homeserver = &Apache::lonnet::homeserver($lc_uname,$env{'form.udom'}); - unless ($homeserver eq 'no_host') { - if ($env{'form.uname'} eq $env{'form.email'}) { - $env{'form.email'} = $lc_uname; - } - $env{'form.uname'} = $lc_uname; - } - } - } unless (($env{'form.uname'} eq $data{'username'}) && ($env{'form.udom'} eq $data{'domain'}) && ($env{'form.email'} eq $data{'email'})) { $msg = &generic_failure_msg($contact_name,$contact_email); return $msg; @@ -359,11 +329,21 @@ sub reset_passwd { my $result = &send_mail($domdesc,$data{'email'},$mailmsg, $contact_name,$contact_email); 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 .= + '

' + .&mt('An e-mail confirming setting of the password' + .' for your LON-CAPA account has been sent to [_1].' + ,$data{'email'}) + .'

'; } else { - $msg .= &mt('An error occurred when sending e-mail to [_1] confirming setting of your new password.',$data{'email'}); + $msg .= + '

' + .&mt('An error occurred when sending e-mail to [_1]' + .' confirming setting of your new password.' + ,$data{'email'}) + .'

'; } - $msg .= '

' + $msg .= '
' .''.&mt('Go to the login page').'.'; } elsif ($change_failed eq 'invalid_client') { my $homeserver = &Apache::lonnet::homeserver($data{'username'},$data{'domain'}); @@ -379,34 +359,47 @@ sub reset_passwd { $opentag = ''; $closetag = ''; } - $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 .= + '

' + .&mt('A problem occurred when attempting to reset' + .' the password for your account.' + .' Please try again from your [_1]home server[_2].' + ,$opentag,$closetag) + .'

'; } } else { $msg .= &generic_failure_msg($contact_name,$contact_email); } } 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 [_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.').'

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

'); + $r->print(&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. 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); } } 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 = + '

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

'; } } 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 .= + '

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

'; } return $msg; } sub generic_failure_msg { 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.', - $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.', + $contact_name,''.$contact_email.'') + .'

'; } sub create_passwd {