--- loncom/interface/resetpw.pm 2012/02/08 15:19:46 1.23.2.2.2.1
+++ loncom/interface/resetpw.pm 2010/11/29 19:15:14 1.26
@@ -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.1 2012/02/08 15:19:46 raeburn Exp $
+# $Id: resetpw.pm,v 1.26 2010/11/29 19:15:14 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -80,15 +80,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) {
@@ -96,7 +93,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',
@@ -107,30 +104,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('<h3>'.&mt('Reset forgotten LON-CAPA password').'</h3>');
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);
@@ -149,15 +134,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);
}
}
}
@@ -185,7 +163,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());
@@ -193,35 +171,31 @@ 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 = '<br />'.&mt('To be able to reset a forgotten password:')
- .'<ul><li>'.&mt('An e-mail address must have previously been associated with your [_1] username.','Learn Physics').'</li>'
- .'<li>'.&mt('You must be able to access e-mail sent to the e-mail address associated with your [_1] account.','Learn Physics').'</li></ul><br />'
- .&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.','Learn Physics').'<br /><br />';
+
+ 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 .= '<br /><br />'.&mt('Three conditions must be met:')
+ .'<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 that address.').'</li>'
+ .'<li>'.&mt('Your LON-CAPA account must be of a type for which LON-CAPA can reset a password.')
+ .'</ul>';
$msg .= '<form name="forgotpw" method="post" action="/adm/resetpw">'.
- &Apache::lonhtmlcommon::start_pick_box().
- &Apache::lonhtmlcommon::row_title('Learn Physics '.$lt{'unam'}).
- '<input type="text" name="uname" size="30" value="'.$value{'uname'}.'" />'.
- '<input type="hidden" name="udom" value="'.$defdom.'" />'.
+ &Apache::lonhtmlcommon::start_pick_box().
+ &Apache::lonhtmlcommon::row_title('LON-CAPA '.$lt{'unam'}).
+ '<input type="text" name="uname" size="20" />'.
+ &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'}).
- '<input type="text" name="useremail" size="30" value="'.$value{'useremail'}.'" />'.
+ '<input type="text" name="useremail" size="30" />'.
&Apache::lonhtmlcommon::end_pick_box().
- '<br /><br /><input type="submit" name="resetter" value="'.$lt{'proc'}.'" /></form>'."\n";
+ '<br /><br /><input type="submit" name="resetter" value="'.$lt{'proc'}.'" /></form>';
return $msg;
}
@@ -248,7 +222,7 @@ sub send_token {
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 LON-CAPA account includes the web address for the link you should use to complete the reset process.').'<br /><br />'.&mt('The link included in the message will be valid for the next [_1]two[_2] hours.','<b>','</b>');
+ $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 {
$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);
}
@@ -324,19 +298,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;
@@ -378,11 +339,8 @@ sub reset_passwd {
$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).'<br />'.
- '<p>'.&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.').'<br />'.
- &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.','Learn Physics').'</p>'.
- '<p>'.&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.').'<br /></p>');
+ $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).'<br /><br />');
+ $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.').'<br />');
&Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token);
}
} else {