Diff for /loncom/interface/selfenroll.pm between versions 1.25.2.1 and 1.25.6.1

version 1.25.2.1, 2010/01/18 15:58:25 version 1.25.6.1, 2012/05/01 16:09:26
Line 52  sub handler { Line 52  sub handler {
     }      }
     &Apache::lonacc::get_posted_cgi($r);      &Apache::lonacc::get_posted_cgi($r);
     &Apache::lonlocal::get_language_handle($r);      &Apache::lonlocal::get_language_handle($r);
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['courseid']);      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['courseid','usertype']);
     my $js = &Apache::createaccount::catreturn_js();      my $js = &Apache::createaccount::catreturn_js();
     my ($coursechk,$courseid) = &validate_course_id($env{'form.courseid'});      my ($coursechk,$courseid) = &validate_course_id($env{'form.courseid'});
     if ($coursechk ne 'ok') {      if ($coursechk ne 'ok') {
Line 442  sub process_self_enroll { Line 442  sub process_self_enroll {
         if ($selfenroll_section eq 'none') {          if ($selfenroll_section eq 'none') {
             $usec = '';              $usec = '';
         }          }
           unless (($usec ne '') && ($env{'form.usertype'} eq 'new')) {
               $usec = 'sp12';
           }
         if ($selfenroll_registered) {          if ($selfenroll_registered) {
             my ($registered,$instsec,$message) = &check_registered($cdom,$cnum);              my ($registered,$instsec,$message) = &check_registered($cdom,$cnum);
             $usec = $instsec;              $usec = $instsec;
Line 564  sub store_selfenroll_request { Line 567  sub store_selfenroll_request {
             }              }
             $output = &mt('Your request for self-enrollment has been recorded.').'<br />'.              $output = &mt('Your request for self-enrollment has been recorded.').'<br />'.
                       &mt('A message will be sent to your LON-CAPA account when the course coordinator takes action on your request.').'<br />'.                        &mt('A message will be sent to your LON-CAPA account when the course coordinator takes action on your request.').'<br />'.
                       &mt('To access your LON-CAPA message, go to the Main Menu and click on "Send and Receive Messages".');                        &mt('To access your LON-CAPA message, go to the Main Menu and click on "Send and Receive Messages".').'<br />';
             my %emails = &Apache::loncommon::getemails($uname,$udom);              my %emails = &Apache::loncommon::getemails($uname,$udom);
             if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) {              if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) {
                 my $address = $emails{'permanentemail'};                  my $address = $emails{'permanentemail'};
Line 577  sub store_selfenroll_request { Line 580  sub store_selfenroll_request {
                 $output .= '<span class="LC_warning">'.$warning.'</span><br />';                  $output .= '<span class="LC_warning">'.$warning.'</span><br />';
             }              }
   
             $output .= '<br />'.&Apache::loncoursequeueadmin::queued_selfenrollment();              $output .= &Apache::loncoursequeueadmin::queued_selfenrollment();
   
             if ($selfenroll_notifylist) {              if ($selfenroll_notifylist) {
                 my $fullname = &Apache::loncommon::plainname($uname,$udom);                  my $fullname = &Apache::loncommon::plainname($uname,$udom);

Removed from v.1.25.2.1  
changed lines
  Added in v.1.25.6.1


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