[BACK]Return to resetpw.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/resetpw.pm between versions 1.19 and 1.20

version 1.19, 2009/10/01 17:22:13 version 1.20, 2009/10/08 19:54:37
Line 271  sub reset_passwd { Line 271  sub reset_passwd {
                     }                      }
                     $msg .= '<br /><br />'                      $msg .= '<br /><br />'
                            .'<a href="/adm/login">'.&mt('Go to the login page').'</a>.';                             .'<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 {                  } 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 {              } 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 />');                  $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 306  sub reset_passwd {
     return $msg;      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 {  sub create_passwd {
     my $passwd = '';      my $passwd = '';
     my @letts = ("a".."z");      my @letts = ("a".."z");
Removed from v.1.19  
changed lines
  Added in v.1.20

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