--- loncom/interface/resetpw.pm 2010/11/29 19:25:53 1.22.2.3
+++ 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.3 2010/11/29 19:25:53 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
#
@@ -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'};
@@ -114,7 +115,7 @@ sub handler {
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,30 @@ sub handler {
}
sub get_uname {
- my ($defdom) = @_;
+ my ($defdom,$uname,$useremail) = @_;
my %lt = &Apache::lonlocal::texthash(
unam => 'LON-CAPA username',
udom => 'LON-CAPA domain',
uemail => 'E-mail address in LON-CAPA',
proc => 'Proceed');
-
+ my %value;
+ if ($env{'form.referrer'} eq 'createaccount') {
+ $value{'uname'} = $uname;
+ $value{'useremail'} = $useremail;
+ }
+ my $inventory = uc($defdom);
my $msg = '
'.&mt('To be able to reset a forgotten password:')
.'
'.&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('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.').'