loncom/interface/resetpw.pm - diff

Return to resetpw.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/resetpw.pm between versions 1.18 and 1.21

-version 1.18, 2009/09/30 21:47:07
+version 1.21, 2009/10/08 22:59:18
  Line 26
  # http://www.lon-capa.org/
  #
  #
+ =pod
+ =head1 NAME
+ Apache::resetpw - pile of common routines
+ =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".
+ account is "internal".
+ =cut
  package Apache::resetpw;
  use strict;
- Line 46  sub handler {
+ Line 69  sub handler {
      my $contact_name = &mt('LON-CAPA helpdesk');
      my $contact_email =  $r->dir_config('lonSupportEMail');
      my $server = $r->dir_config('lonHostID');
-     my $defdom = $r->dir_config('lonDefDomain');
+     my $defdom = &Apache::lonnet::default_login_domain();
      &Apache::lonacc::get_posted_cgi($r);
      &Apache::lonlocal::get_language_handle($r);
      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']);
- Line 271  sub reset_passwd {
+ Line 294  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 .= &mt('A problem occurred when attempting to reset the password for your account. Please contact the [_1] - ([_2]) for assistance.'
+                     $msg .= &generic_failure_msg($contact_name,$contact_email);
-                                ,$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 />');
- Line 292  sub reset_passwd {
+ Line 329  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");

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.18
changed lines
	Added in v.1.21