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

Diff for /loncom/interface/selfenroll.pm between versions 1.35 and 1.36

version 1.35, 2018/12/27 18:14:25 version 1.36, 2021/05/04 18:47:36
Line 455  sub process_self_enroll { Line 455  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($r,$udom,$uname,$usec,$cdom,$cnum,
                                           $selfenroll_notifylist,$owner,                                            $selfenroll_notifylist,$owner,
                                           $selfenroll_approval,$crstype,$lonhost,$handle);                                            $selfenroll_approval,$crstype,$lonhost,$handle);
             $r->print($outcome);              $r->print($outcome);
Line 535  sub user_can_selfenroll { Line 535  sub user_can_selfenroll {
 }  }
   
 sub store_selfenroll_request {  sub store_selfenroll_request {
     my ($udom,$uname,$usec,$cdom,$cnum,$selfenroll_notifylist,$owner,      my ($r,$udom,$uname,$usec,$cdom,$cnum,$selfenroll_notifylist,$owner,
         $selfenroll_approval,$crstype,$lonhost,$handle) = @_;          $selfenroll_approval,$crstype,$lonhost,$handle) = @_;
     my $namespace = 'selfenrollrequests';      my $namespace = 'selfenrollrequests';
     my $output;      my $output;
Line 551  sub store_selfenroll_request { Line 551  sub store_selfenroll_request {
         }          }
         if ($status eq 'pending') {          if ($status eq 'pending') {
             my $token = $info{$cdom.'_'.$cnum}{'token'};              my $token = $info{$cdom.'_'.$cnum}{'token'};
             my ($statusupdate,$pendingform) = &pending_selfenrollment_form($cdom,$cnum,$crstype,$token,$lonhost);              my ($statusupdate,$pendingform) = &pending_selfenrollment_form($r,$cdom,$cnum,$crstype,$token,$lonhost);
             if ($statusupdate eq 'pending') {              if ($statusupdate eq 'pending') {
                 $output .= $pendingform;                  $output .= $pendingform;
             }              }
Line 589  sub store_selfenroll_request { Line 589  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 />';
             if ($status eq 'pending') {              if ($status eq 'pending') {
                 my ($statusupdate,$pendingform) = &pending_selfenrollment_form($cdom,$cnum,$crstype,$token,$lonhost);                  my ($statusupdate,$pendingform) = &pending_selfenrollment_form($r,$cdom,$cnum,$crstype,$token,$lonhost);
                 if ($statusupdate eq 'request') {                  if ($statusupdate eq 'request') {
                     $status = $statusupdate;                      $status = $statusupdate;
                 } else {                  } else {
Line 630  sub store_selfenroll_request { Line 630  sub store_selfenroll_request {
 }  }
   
 sub pending_selfenrollment_form {  sub pending_selfenrollment_form {
     my ($cdom,$cnum,$crstype,$token,$lonhost) = @_;      my ($r,$cdom,$cnum,$crstype,$token,$lonhost) = @_;
     my ($status,$output);      my ($status,$output);
     my $coursetype = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$crstype);      my $coursetype = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$crstype);
     my %postvalues = (      my %postvalues = (
Line 667  sub pending_selfenrollment_form { Line 667  sub pending_selfenrollment_form {
                 my $hostname = &Apache::lonnet::hostname($lonhost);                  my $hostname = &Apache::lonnet::hostname($lonhost);
                 my $protocol = $Apache::lonnet::protocol{$lonhost};                  my $protocol = $Apache::lonnet::protocol{$lonhost};
                 $protocol = 'http' if ($protocol ne 'https');                  $protocol = 'http' if ($protocol ne 'https');
                   my $alias = &Apache::lonnet::use_proxy_alias($r,$lonhost);
                   $hostname = $alias if ($alias ne '');
                 my $enroller = $protocol.'://'.$hostname.'/cgi-bin/enrollqueued.pl';                  my $enroller = $protocol.'://'.$hostname.'/cgi-bin/enrollqueued.pl';
                 $output .= '<input type="hidden" name="enroller" value="'.$enroller.'" />'."\n".                  $output .= '<input type="hidden" name="enroller" value="'.$enroller.'" />'."\n".
                            '<input type="hidden" name="token" value="'.$token.'" />'."\n".                             '<input type="hidden" name="token" value="'.$token.'" />'."\n".
Removed from v.1.35  
changed lines
  Added in v.1.36

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