--- loncom/interface/resetpw.pm	2009/11/19 16:08:25	1.17.10.3
+++ loncom/interface/resetpw.pm	2009/09/30 21:47:07	1.18
@@ -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.17.10.3 2009/11/19 16:08:25 raeburn Exp $
+# $Id: resetpw.pm,v 1.18 2009/09/30 21:47:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,28 +26,6 @@
 # http://www.lon-capa.org/
 #
 #
-
-=pod
-
-=head1 NAME
-
-Apache::resetpw: reset user password.
-
-=head1 SYNOPSIS
-
-Handles resetting of forgotten passwords.
-
-This is part of the LearningOnline Network with CAPA project
-described at http://www.lon-capa.org.
-
-=head1 OVERVIEW
-
-A user with an e-mail address associated with his/her LON-CAPA username
-can reset a forgotten password, using a link sent to the e-mail address
-if the authentication type for the account is "internal".
-
-=cut
-
 package Apache::resetpw;
 
 use strict;
@@ -68,7 +46,7 @@ sub handler {
     my $contact_name = &mt('LON-CAPA helpdesk');
     my $contact_email =  $r->dir_config('lonSupportEMail');
     my $server = $r->dir_config('lonHostID');
-    my $defdom = &Apache::lonnet::default_login_domain();
+    my $defdom = $r->dir_config('lonDefDomain');
     &Apache::lonacc::get_posted_cgi($r);
     &Apache::lonlocal::get_language_handle($r);
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']);
@@ -109,7 +87,7 @@ sub handler {
                     }
                     foreach my $item (@items) {
                         if ($item =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {
-                            unless(grep(/^\Q$item\E$/,@allemails)) {
+                            unless(grep(/^\Q$item\E$/,@allemails)) { 
                                 push(@allemails,$item);
                             }
                         }
@@ -148,8 +126,8 @@ sub handler {
 sub get_uname {
     my ($defdom) = @_;
     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');
 
@@ -163,9 +141,9 @@ sub get_uname {
 <form name="forgotpw" method="post">
 <table>
 <tr><td>
-<tr><td align="left">$lt{'unam'}:</td>
+<tr><td align="left">LON-CAPA $lt{'unam'}:                      </td>
     <td><input type="text" name="uname" size="15" /></td></tr>
-<tr><td align="left">$lt{'udom'}:</td>
+<tr><td align="left">LON-CAPA $lt{'udom'}:                      </td>
     <td>|;
     $msg .= &Apache::loncommon::select_dom_form($defdom,'udom');
     $msg .= qq|</td></tr>
@@ -276,10 +254,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') {
-                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;
-                }
                 my $change_failed = 
 		    &Apache::lonpreferences::verify_and_change_password($r,'reset_by_email',$token);
                 if (!$change_failed) {
@@ -297,24 +271,10 @@ sub reset_passwd {
                     }
                     $msg .= '<br /><br />'
                            .'<a href="/adm/login">'.&mt('Go to the login page').'</a>.';
-                } elsif ($change_failed eq 'invalid_client') {
-                    my $homeserver = &Apache::lonnet::homeserver($data{'username'},$data{'domain'});
-                    if ($homeserver eq 'no_host') {
-                        $msg .= &generic_failure_msg($contact_name,$contact_email);
-                    } else {
-                        my $protocol = $Apache::lonnet::protocol{$homeserver};
-                        $protocol = 'http' if ($protocol ne 'https');
-                        my $url = $protocol.'://'.&Apache::lonnet::hostname($homeserver).
-                                  '/adm/resetpw';
-                        my ($opentag,$closetag);
-                        if ($url) {
-                           $opentag = '<a href="'.$url.'">';
-                           $closetag = '</a>';
-                        }
-                        $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);
+                    $msg .= &mt('A problem occurred when attempting to reset the password for your account. Please contact the [_1] - ([_2]) for assistance.'
+                               ,$contact_name
+                               ,'<a href="mailto:'.$contact_email.'">'.$contact_email.'</a>');
                 }
             } 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 /><br />');
@@ -332,12 +292,6 @@ sub reset_passwd {
     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,'<a href="mailto:'.$contact_email.'">'.$contact_email.'</a>');
-}
-
 sub create_passwd {
     my $passwd = '';
     my @letts = ("a".."z");