Diff for /loncom/interface/loncoursequeueadmin.pm between versions 1.44 and 1.47

version 1.44, 2014/03/03 17:11:41 version 1.47, 2014/04/30 17:17:35
Line 90  use Apache::loncommon; Line 90  use Apache::loncommon;
 use Apache::lonmsg;  use Apache::lonmsg;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonuserutils;  use Apache::lonuserutils;
   use LONCAPA::batchcreatecourse;
 use LONCAPA qw(:DEFAULT :match);  use LONCAPA qw(:DEFAULT :match);
   
 sub send_selfserve_notification {  sub send_selfserve_notification {
Line 885  sub update_request_queue { Line 886  sub update_request_queue {
                 $middlename = $curr{$uname}{'middlename'};                  $middlename = $curr{$uname}{'middlename'};
                 $lastname   = $curr{$uname}{'lastname'};                  $lastname   = $curr{$uname}{'lastname'};
                 $generation = $curr{$uname}{'generation'};                  $generation = $curr{$uname}{'generation'};
                 $inststatus = $curr{$uname}{'usertype'};                  $inststatus = $curr{$uname}{'inststatus'};
   
                 my ($key,$caller)=split(/&/,$curr{$uname}{'tmpinfo'});                  my ($key,$caller)=split(/&/,$curr{$uname}{'tmpinfo'});
                 if ($caller eq 'createaccount') {                  if ($caller eq 'createaccount') {
Line 1604  sub course_creation { Line 1605  sub course_creation {
     my ($result,$ownername,$ownerdom);      my ($result,$ownername,$ownerdom);
     my $crstype = $details->{'crstype'};      my $crstype = $details->{'crstype'};
     my $coursedesc = $details->{'cdescr'};      my $coursedesc = $details->{'cdescr'};
     my %domconfig = &Apache::lonnet::get_dom('configuration',['requestauthor'],$dom);      my $accessstart = $details->{'accessstart'};
       my $accessend = $details->{'accessend'};
       my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$dom);
     if (ref($domconfig{'requestcourses'}) eq 'HASH') {      if (ref($domconfig{'requestcourses'}) eq 'HASH') {
         if (ref($domconfig{'requestcourses'}{'uniquecode'}) eq 'HASH') {          if (ref($domconfig{'requestcourses'}{'uniquecode'}) eq 'HASH') {
             if ($domconfig{'requestcourses'}{'uniquecode'}{$crstype}) {              if ($domconfig{'requestcourses'}{'uniquecode'}{$crstype}) {
Line 1638  sub course_creation { Line 1641  sub course_creation {
             $code = $$coderef;              $code = $$coderef;
         }          }
         $postprocess = &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,$result,$ownername,          $postprocess = &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,$result,$ownername,
                                                            $ownerdom,$fullname,$coursedesc,$code,$customhash);                                                             $ownerdom,$fullname,$coursedesc,$code,
                                                              $accessstart,$accessend,$customhash);
     } else {      } else {
         $result = 'error: '.$cid;          $result = 'error: '.$cid;
     }      }
Line 2129  sub process_official_reqs { Line 2133  sub process_official_reqs {
     return $output;      return $output;
 }  }
   
   sub requestcourses_validation_types {
       my @items = ('url','fields','button','markup');
       my %names =  &Apache::lonlocal::texthash (
               url      => 'Web address of validation server/script',
               fields   => 'Form fields to send to validator',
               button   => 'Text for validation button',
               markup   => 'Validation description (HTML)',
       );
       my @fields = ('owner','course','coursetype','description');
       return (\@items,\%names,\@fields);
   }
   
 sub is_active_author {  sub is_active_author {
     if ($env{'user.role.au./'.$env{'user.domain'}.'/'} =~ /^(\d*)\.(\d*)$/) {      if ($env{'user.role.au./'.$env{'user.domain'}.'/'} =~ /^(\d*)\.(\d*)$/) {
         if ((!$1 || $1 < time) &&          if ((!$1 || $1 < time) &&

Removed from v.1.44  
changed lines
  Added in v.1.47


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