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

version 1.22, 2009/08/20 22:07:18 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 476  sub process_self_enroll { Line 479  sub process_self_enroll {
                 }                  }
                 &Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,                  &Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,
                                                     $area);                                                      $area);
                 &Apache::lonnet::set_userprivs(\%userroles,\%newrole,%newgroups);                  &Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups);
                 $userroles{'user.role.'.$spec} = $selfenroll_access_start.'.'.$selfenroll_access_end;                  $userroles{'user.role.'.$spec} = $selfenroll_access_start.'.'.$selfenroll_access_end;
                 &Apache::lonnet::appenv(\%userroles,[$role,'cm']);                  &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
                 $r->print('<h3>'.&mt('Enrollment process complete').'</h3>');                  $r->print('<h3>'.&mt('Enrollment process complete').'</h3>');
Line 543  sub store_selfenroll_request { Line 546  sub store_selfenroll_request {
     my %existing =       my %existing = 
         &Apache::lonnet::get($namespace,[$uname.':'.$udom],$cdom,$cnum);          &Apache::lonnet::get($namespace,[$uname.':'.$udom],$cdom,$cnum);
     if ($existing{$uname.':'.$udom}) {      if ($existing{$uname.':'.$udom}) {
         my ($timestamp,$sec) = split(/:/,$existing{$uname.':'.$udom});          $output = &mt('A self-enrollment request already exists for you for this course.').'<br />'.&mt('Your earlier request is in a queue awaiting action by a Course Coordinator.').
         $output = &mt('A self-enrollment request already exists for you for this course.').'<br />'.&mt('Your earlier request was submitted: [_1] and remains in a queue awaiting action by a Course Coordinator.',&Apache::lonlocal::locallocaltime($timestamp));                    '<br /><br />'.&Apache::loncoursequeueadmin::queued_selfenrollment();
     } else {      } else {
         my %selfenroll = (          my %selfenroll = (
                             $uname.':'.$udom => $now.':'.$usec,                              $uname.':'.$udom => $now.':'.$usec,
Line 576  sub store_selfenroll_request { Line 579  sub store_selfenroll_request {
             if ($warning) {               if ($warning) { 
                 $output .= '<span class="LC_warning">'.$warning.'</span><br />';                  $output .= '<span class="LC_warning">'.$warning.'</span><br />';
             }              }
     
               $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);
                 my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum);                  my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum);

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


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