Diff for /loncom/interface/selfenroll.pm between versions 1.27 and 1.28

version 1.27, 2012/05/16 21:19:39 version 1.28, 2014/03/31 02:31:05
Line 35  use Apache::loncommon; Line 35  use Apache::loncommon;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::createaccount;  use Apache::createaccount;
 use Apache::loncoursequeueadmin;  use Apache::loncoursequeueadmin;
   use Apache::lonuserutils;
 use LONCAPA qw(:DEFAULT :match);  use LONCAPA qw(:DEFAULT :match);
   
 sub handler {  sub handler {
Line 83  sub handler { Line 84  sub handler {
         $knownuser,$selfenroll_access_start,$selfenroll_access_end,          $knownuser,$selfenroll_access_start,$selfenroll_access_end,
         $selfenroll_section,$selfenroll_future,%curr_role,$cdomdesc,          $selfenroll_section,$selfenroll_future,%curr_role,$cdomdesc,
         $selfenroll_approval,$selfenroll_limit,$selfenroll_cap,          $selfenroll_approval,$selfenroll_limit,$selfenroll_cap,
         $selfenroll_notifylist,$owner);          $selfenroll_notifylist,$owner,$crstype);
     $selfenroll_types = $coursehash{'internal.selfenroll_types'};      $selfenroll_types = $coursehash{'internal.selfenroll_types'};
     $selfenroll_registered =  $coursehash{'internal.selfenroll_registered'};      $selfenroll_registered =  $coursehash{'internal.selfenroll_registered'};
     $selfenroll_section = $coursehash{'internal.selfenroll_section'};      $selfenroll_section = $coursehash{'internal.selfenroll_section'};
Line 94  sub handler { Line 95  sub handler {
     $selfenroll_approval = $coursehash{'internal.selfenroll_approval'};      $selfenroll_approval = $coursehash{'internal.selfenroll_approval'};
     $selfenroll_notifylist = $coursehash{'internal.selfenroll_notifylist'};      $selfenroll_notifylist = $coursehash{'internal.selfenroll_notifylist'};
     $owner = $coursehash{'internal.courseowner'};      $owner = $coursehash{'internal.courseowner'};
       $crstype = $coursehash{'internal.type'};
       if ($crstype eq '') {
           $crstype = 'Course';
       }
     my $nospace;      my $nospace;
     if ($selfenroll_types ne '') {      if ($selfenroll_types ne '') {
         my $start = $coursehash{'internal.selfenroll_start_date'};          my $start = $coursehash{'internal.selfenroll_start_date'};
Line 227  sub handler { Line 232  sub handler {
         &process_self_enroll($r,$cdom,$cnum,$selfenroll_types,$selfenroll_registered,          &process_self_enroll($r,$cdom,$cnum,$selfenroll_types,$selfenroll_registered,
                              $selfenroll_access_start,$selfenroll_access_end,                               $selfenroll_access_start,$selfenroll_access_end,
                              $selfenroll_section,$now,$selfenroll_approval,                               $selfenroll_section,$now,$selfenroll_approval,
                              $selfenroll_notifylist,$owner);                               $selfenroll_notifylist,$owner,$crstype,$lonhost);
     } elsif ($env{'form.phase'} eq 'login') {      } elsif ($env{'form.phase'} eq 'login') {
         my $submit_text = &mt('Log in');          my $submit_text = &mt('Log in');
         $r->print('<h3>'.&mt('Log-in to LON-CAPA').'</h3>');          $r->print('<h3>'.&mt('Log-in to LON-CAPA').'</h3>');
Line 405  sub has_role { Line 410  sub has_role {
 sub process_self_enroll {  sub process_self_enroll {
     my ($r,$cdom,$cnum,$selfenroll_types,$selfenroll_registered,      my ($r,$cdom,$cnum,$selfenroll_types,$selfenroll_registered,
         $selfenroll_access_start,$selfenroll_access_end,$selfenroll_section,          $selfenroll_access_start,$selfenroll_access_end,$selfenroll_section,
         $now,$selfenroll_approval,$selfenroll_notifylist,$owner) = @_;          $now,$selfenroll_approval,$selfenroll_notifylist,$owner,$crstype,$lonhost) = @_;
     my $udom = $env{'user.domain'};      my $udom = $env{'user.domain'};
     my $uname = $env{'user.name'};      my $uname = $env{'user.name'};
     my $selfenroll = 0;      my $selfenroll = 0;
Line 436  sub process_self_enroll { Line 441  sub process_self_enroll {
             my ($registered,$instsec,$message) = &check_registered($cdom,$cnum);              my ($registered,$instsec,$message) = &check_registered($cdom,$cnum);
             $usec = $instsec;              $usec = $instsec;
             if (!$registered) {              if (!$registered) {
                 $r->print('<h3>'.&mt('Self-enrollment unavailable').'</h3>'.&mt('Self-enrollment is restricted to students officially registered for this course.').'<br />');                  $r->print('<h3>'.&mt('Self-enrollment unavailable').'</h3>'.
                             &mt('Self-enrollment is restricted to students officially registered for this course.').'<br />');
                 if ($message) {                  if ($message) {
                     $r->print($message);                      $r->print($message);
                 } else {                  } else {
Line 448  sub process_self_enroll { Line 454  sub process_self_enroll {
         if ($selfenroll_approval) {          if ($selfenroll_approval) {
             my $outcome =               my $outcome = 
                 &store_selfenroll_request($udom,$uname,$usec,$cdom,$cnum,                  &store_selfenroll_request($udom,$uname,$usec,$cdom,$cnum,
                                           $selfenroll_notifylist,$owner);                                            $selfenroll_notifylist,$owner,
                                             $selfenroll_approval,$crstype,$lonhost);
             $r->print($outcome);              $r->print($outcome);
         } else {          } else {
             my $enrollresult =               my $enrollresult = 
Line 526  sub user_can_selfenroll { Line 533  sub user_can_selfenroll {
 }  }
   
 sub store_selfenroll_request {  sub store_selfenroll_request {
     my ($udom,$uname,$usec,$cdom,$cnum,$selfenroll_notifylist,$owner) = @_;      my ($udom,$uname,$usec,$cdom,$cnum,$selfenroll_notifylist,$owner,
           $selfenroll_approval,$crstype,$lonhost) = @_;
     my $namespace = 'selfenrollrequests';      my $namespace = 'selfenrollrequests';
     my $output;      my $output;
     my $now = time;      my $now = time;
     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}) {
         $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 is in a queue awaiting action by a Course Coordinator.').
                   '<br /><br />'.&Apache::loncoursequeueadmin::queued_selfenrollment();                    '<br /><br />'.&Apache::loncoursequeueadmin::queued_selfenrollment();
     } else {      } else {
         my %selfenroll = (          my %selfenroll = (
                             $uname.':'.$udom => $now.':'.$usec,                              $uname.':'.$udom => $now.':'.$usec,
                          );                           );
         my $putresult = &Apache::lonnet::put($namespace,\%selfenroll,$cdom,$cnum);          my $putresult = &Apache::lonnet::put($namespace,\%selfenroll,$cdom,$cnum);
           my $status = 'request';
           if ($selfenroll_approval eq '2') {
               $status = 'pending';
           } 
         if ($putresult eq 'ok') {          if ($putresult eq 'ok') {
             my %userenroll = (              my %userenroll = (
                                $cdom.'_'.$cnum =>  {                                 $cdom.'_'.$cnum =>  {
                                                       timestamp => $now,                                                        timestamp => $now,
                                                       section   => $usec,                                                        section   => $usec,
                                                       status    => 'request',                                                         status    => $status,
                                                    });                                                     });
               my $token;
               if ($status eq 'pending') {
                   $token = &Apache::lonnet::tmpput(\%selfenroll,$lonhost);;
                   $userenroll{$cdom.'_'.$cnum}{'token'} = $token;
               } 
             my $warning;              my $warning;
             my $userresult = &Apache::lonnet::put($namespace,\%userenroll,$udom,$uname);              my $userresult = &Apache::lonnet::put($namespace,\%userenroll,$udom,$uname);
             if ($userresult ne 'ok') {              if ($userresult ne 'ok') {
                 $warning = &mt('An error occurred saving a personal record of your request.');                  $warning = &mt('An error occurred saving a personal record of your 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 />'.              if ($status eq 'pending') {
                       &mt('To access your LON-CAPA message, go to the Main Menu and click on "Send and Receive Messages".').'<br />';                  my $coursetype = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$crstype); 
             my %emails = &Apache::loncommon::getemails($uname,$udom);                  my %postvalues = (
             if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) {                                     'username'   => $env{'user.name'},
                 my $address = $emails{'permanentemail'};                                     'domain'     => $env{'user.domain'},
                 if ($address eq '') {                                     'course'     => $cdom.'_'.$cnum,
                     $address = $emails{'notification'};                                     'coursetype' => $coursetype,
                 }                                     'token'      => $token,
                 $output.= &mt('An e-mail will also be sent to: [_1] when this occurs.',$address).'<br />';                                   );
             }                  my %domconfig = &Apache::lonnet::get_dom('configuration',['selfenrollment'],$cdom);
             if ($warning) {                   if (ref($domconfig{'selfenrollment'}) eq 'HASH') {
                 $output .= '<span class="LC_warning">'.$warning.'</span><br />';                      my ($url,$buttontext,$code,@fields);
             }                      if (ref($domconfig{'selfenrollment'}{'validation'}) eq 'HASH') {
                           my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum,{ 'one_time' => 1});
             $output .= &Apache::loncoursequeueadmin::queued_selfenrollment();                          $postvalues{'uniquecode'} = $courseinfo{'internal.uniquecode'};
                           $url = $domconfig{'selfenrollment'}{'validation'}{'url'};
             if ($selfenroll_notifylist) {                          if (ref($domconfig{'selfenrollment'}{'validation'}{'fields'}) eq 'ARRAY') {
                 my $fullname = &Apache::loncommon::plainname($uname,$udom);                              @fields = @{$domconfig{'selfenrollment'}{'validation'}{'fields'}};
                 my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum);                          }
                 my $coursedesc = $courseinfo{'description'};                          $buttontext = $domconfig{'selfenrollment'}{'validation'}{'button'};
                 &Apache::loncoursequeueadmin::send_selfserve_notification(  
                     $selfenroll_notifylist,$fullname,$cdom.'_'.$cnum,                          $output .= $domconfig{'selfenrollment'}{'validation'}{'markup'};
                     $coursedesc,$now,'selfenrollreq',$owner);                          if (($url =~ m{^(https?\://|/)}) && (@fields > 0)) {
                               $output .= '<form name="selfenrollvalidation" action="'.$url.'" method="post">'."\n";
                               foreach my $field (@fields) {
                                   if ($postvalues{$field}) {
                                       $output .= '<input type="hidden" name="'.$field.'" value="'.$postvalues{$field}.'" />'."\n";
                                   }
                               }
                           }
                           if ($buttontext eq '') {
                               $buttontext = &mt('Complete my enrollment');
                           }
                           $output .= '<input type="submit" name="validate" value="'.$buttontext.'" />'."\n".
                                      '</form>'."\n";
                       }
                   } else {
                       $status eq 'request';
                   }
               }
               if ($status eq 'request') {
                   $output .= &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".').'<br />';
                   my %emails = &Apache::loncommon::getemails($uname,$udom);
                   if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) {
                       my $address = $emails{'permanentemail'};
                       if ($address eq '') {
                           $address = $emails{'notification'};
                       }
                       $output.= &mt('An e-mail will also be sent to: [_1] when this occurs.',$address).'<br />';
                   }
                   if ($warning) { 
                       $output .= '<span class="LC_warning">'.$warning.'</span><br />';
                   }
                   $output .= &Apache::loncoursequeueadmin::queued_selfenrollment();
   
                   if ($selfenroll_notifylist) {
                       my $fullname = &Apache::loncommon::plainname($uname,$udom);
                       my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum);
                       my $coursedesc = $courseinfo{'description'};
                       &Apache::loncoursequeueadmin::send_selfserve_notification(
                           $selfenroll_notifylist,$fullname,$cdom.'_'.$cnum,
                           $coursedesc,$now,'selfenrollreq',$owner);
                   }
             }              }
         } else {          } else {
             $output = '<span class="LC_error">'.&mt('An error occurred when recording your request.').'</span>';              $output = '<span class="LC_error">'.&mt('An error occurred when recording your request.').'</span>';

Removed from v.1.27  
changed lines
  Added in v.1.28


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