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

Diff for /loncom/interface/createaccount.pm between versions 1.37.2.4 and 1.37.2.5

version 1.37.2.4, 2010/12/01 22:56:12 version 1.37.2.5, 2010/12/02 02:15:11
Line 597  sub send_token { Line 597  sub send_token {
     if ($token !~ /^error/ && $token ne 'no_such_host') {      if ($token !~ /^error/ && $token ne 'no_such_host') {
         my $esc_token = &escape($token);          my $esc_token = &escape($token);
         my $showtime = localtime(time);          my $showtime = localtime(time);
         my $mailmsg = &mt('A request was submitted on [_1] for creation of a GCI WebCenter account.',$showtime).' '.          my $mailmsg = &mt('A request was submitted on [_1] for creation of a GCI WebCenter account.',$showtime)." \n".
              &mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',               &mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',
                  &Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token);                   "\n\n".&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token);
         my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name,          my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name,
                                                  $contact_email);                                                   $contact_email);
         if ($result eq 'ok') {          if ($result eq 'ok') {
Line 1135  sub invalid_state { Line 1135  sub invalid_state {
         $msg .= &mt('The e-mail address you provided does not appear to be a valid address.');          $msg .= &mt('The e-mail address you provided does not appear to be a valid address.');
     } elsif ($error eq 'existinguser') {      } elsif ($error eq 'existinguser') {
         my $uname = &HTML::Entities::encode($useremail);          my $uname = &HTML::Entities::encode($useremail);
         $msg .= &mt('The e-mail address you provided is already in use as a username in LON-CAPA at this institution.').'<br />'.&mt('You can either:').'<ul>'.          $msg .= &mt('The e-mail address you provided is already in use as a username in LON-CAPA at this institution.').'</span><br /><br /><span class="LC_warning">'.&mt('You can either:').'<ul>'.
                 '<li>'.&mt(Return to the [_1]log-in page[_2] and enter your password.','<a href="/adm/login?username="'.$uname.'">','</a>').'</li>'.                  '<li>'.&mt('Return to the [_1]log-in page[_2] and enter your password.','<a href="/adm/login?username='.$uname.'">','</a>').'</li>'.
                 '<li>'.&mt('or, if you do not remember your password, visit the "[_1]Forgot your password?[_2]" page.','<a href="/adm/resetpw?uname="'.$uname.'&useremail='.$uname.'&referrer=createaccount">','</a>');                  '<li>'.&mt('or, if you do not remember your password, visit the "[_1]Forgot your password?[_2]" page.','<a href="/adm/resetpw?uname='.$uname.'&useremail='.$uname.'&referrer=createaccount">','</a>').
                   '</li></ul>';
     } elsif ($error eq 'userrules') {      } elsif ($error eq 'userrules') {
         $msg .= &mt('Username rules at this institution do not allow the e-mail address you provided to be used as a username.');          $msg .= &mt('Username rules at this institution do not allow the e-mail address you provided to be used as a username.');
     } elsif ($error eq 'userformat') {      } elsif ($error eq 'userformat') {
Removed from v.1.37.2.4  
changed lines
  Added in v.1.37.2.5

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