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

Diff for /loncom/interface/createaccount.pm between versions 1.16 and 1.17

version 1.16, 2008/07/11 15:44:32 version 1.17, 2008/07/12 14:08:58
Line 127  sub handler { Line 127  sub handler {
   
     if ($sso_username ne '') {      if ($sso_username ne '') {
         &print_header($r,$start_page);          &print_header($r,$start_page);
         my ($output,$msg);          my $msg;
         if (grep(/^sso$/,@cancreate)) {          if (grep(/^sso$/,@cancreate)) {
             $msg = '<h3>'.&mt('Account creation').'</h3>'.              $msg = '<h3>'.&mt('Account creation').'</h3>'.
                    &mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account at this institution.").'<br /><br />';                     &mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account at this institution.").'<br />';
             ($output, my $checkfail) = &username_check($sso_username,$domain,              my ($output,$checkfail) = &username_check($sso_username,$domain,
                                                        $domdesc,$courseid,                                                        $domdesc,$courseid,
                                                        $lonhost,$contact_email);                                                        $lonhost,$contact_email);
             if ($checkfail) {              if ($checkfail) {
                 $msg .= '<h4>'.&mt('Account creation unavailable');'</h4>';                  $msg .= '<h4>'.&mt('Account creation unavailable').'</h4>';
                 if ($checkfail eq 'username') {                  if ($checkfail eq 'username') {
                     $msg .= '<span class="LC_warning">'.                      $msg .= '<span class="LC_warning">'.
                             &mt('A LON-CAPA account may not be created with the username you use.').'</span>';                              &mt('A LON-CAPA account may not be created with the username you use.').
                               '</span><br /><br />'.$output;
                 } elsif ($checkfail eq 'authtoken') {                  } elsif ($checkfail eq 'authtoken') {
                     $msg .= '<span class="LC_error">'.&mt('Error creating token.').'</span>';                      $msg .= '<span class="LC_error">'.&mt('Error creating token.').'</span>'.
                               '<br />'.$output;
                 }                  }
                 $msg .= '<br /><br />'.                  $msg .= &mt('Please contact the [_1] ([_2]) for assistance.',
                         &mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);                              $contact_name,$contact_email).'<br /><hr />'.
                           &sso_logout_frag($r,$domain);    
   
             } else {              } else {
                 $msg .= &mt('To create one, use the table below to provide information about yourself (if appropriate), then click the "Create LON-CAPA account" button.');                  $msg .= '<br />'.&mt('To create one, use the table below to provide information about yourself (if appropriate), then click the "Create LON-CAPA account" button.').'<br />'.$output;
             }              }
         } else {          } else {
             $msg .= '<h3>'.&mt('Account creation unavailable').'</h3>'.              $msg = '<h3>'.&mt('Account creation unavailable').'</h3>'.
                     '<span class="LC_warning">'.&mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account at this institution, and you are not permitted to create one.").'</span><br /><br />'.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);                     '<span class="LC_warning">'.&mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account at this institution, and you are not permitted to create one.").'</span><br /><br />'.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email).'<hr />'.
                      &sso_logout_frag($r,$domain);
         }          }
         $r->print($msg.'<br />'.$output);          $r->print($msg);
         $r->print(&Apache::loncommon::end_page());          $r->print(&Apache::loncommon::end_page());
         return OK;          return OK;
     }      }
Line 524  sub process_mailtoken { Line 529  sub process_mailtoken {
                                                        $data{'username'},$domdesc);                                                         $data{'username'},$domdesc);
                 if ($result eq 'ok') {                  if ($result eq 'ok') {
                     $msg = $output;                       $msg = $output; 
                     my $shownow = localtime($now);                      my $shownow = &Apache::lonlocal::locallocaltime($now);
                     my $mailmsg = &mt('A LON-CAPA account for the institution: [_1] has been created [_2] from IP address: [_3].  If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$shownow,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";                      my $mailmsg = &mt('A LON-CAPA account for the institution: [_1] has been created [_2] from IP address: [_3].  If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$shownow,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
                     my $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'},                      my $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'},
                                                                  $mailmsg,$contact_name,                                                                   $mailmsg,$contact_name,
Line 771  sub username_check { Line 776  sub username_check {
                 my ($userchkmsg,$checkfail);                  my ($userchkmsg,$checkfail);
                 if (ref($curr_rules{$domain}) eq 'HASH') {                  if (ref($curr_rules{$domain}) eq 'HASH') {
                     $userchkmsg =                      $userchkmsg =
                         &Apache::loncommon::instrule_disallow_msg('username',$domdesc,1).                          &Apache::loncommon::instrule_disallow_msg('username',$domdesc,1,
                                                                     'selfcreate').
                         &Apache::loncommon::user_rule_formats($domain,$domdesc,                          &Apache::loncommon::user_rule_formats($domain,$domdesc,
                                 $curr_rules{$domain}{'username'},'username');                                  $curr_rules{$domain}{'username'},'username');
                     if ($userchkmsg) {                      if ($userchkmsg) {
Line 934  sub linkto_email_help { Line 940  sub linkto_email_help {
     my $msg;      my $msg;
     if ($contact_email ne '') {      if ($contact_email ne '') {
         my $escuri = &HTML::Entities::encode('/adm/createaccount','&<>"');          my $escuri = &HTML::Entities::encode('/adm/createaccount','&<>"');
         $msg .= '<br />'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for [_3].','<a href="/adm/helpdesk?origurl='.$escuri.'">','</a>',$domdesc);          $msg .= '<br />'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for [_3].','<a href="/adm/helpdesk?origurl='.$escuri.'">','</a>',$domdesc).'<br />';
     } else {      } else {
         $msg .= '<br />'.&mt('You may wish to send an e-mail to the LON-CAPA server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc);          $msg .= '<br />'.&mt('You may wish to send an e-mail to the server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc).'<br />';
     }      }
     return $msg;      return $msg;
 }  }
Line 1050  sub guest_format_check { Line 1056  sub guest_format_check {
     return $format_msg;      return $format_msg;
 }  }
   
   sub sso_logout_frag {
       my ($r,$domain) = @_;
       my $endsessionmsg;
       if (defined($r->dir_config('lonSSOUserLogoutMessageFile_'.$domain))) {
           my $msgfile = $r->dir_config('lonSSOUserLogoutMessageFile_'.$domain);
           if (-e $msgfile) {
               open(my $fh,"<$msgfile");
               $endsessionmsg = join('',<$fh>);
               close($fh);
           }
       } elsif (defined($r->dir_config('lonSSOUserLogoutMessageFile'))) {
           my $msgfile = $r->dir_config('lonSSOUserLogoutMessageFile');
           if (-e $msgfile) {     
               open(my $fh,"<$msgfile");
               $endsessionmsg = join('',<$fh>);
               close($fh);
           }
       }
       return $endsessionmsg;
   }
   
 1;  1;
Removed from v.1.16  
changed lines
  Added in v.1.17

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