--- loncom/interface/loncoursequeueadmin.pm 2014/02/12 20:47:40 1.43 +++ loncom/interface/loncoursequeueadmin.pm 2014/04/19 20:48:43 1.46 @@ -1,7 +1,7 @@ # The LearningOnline Network # Utilities to administer domain course requests and course self-enroll requests # -# $Id: loncoursequeueadmin.pm,v 1.43 2014/02/12 20:47:40 raeburn Exp $ +# $Id: loncoursequeueadmin.pm,v 1.46 2014/04/19 20:48:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -90,6 +90,7 @@ use Apache::loncommon; use Apache::lonmsg; use Apache::lonlocal; use Apache::lonuserutils; +use LONCAPA::batchcreatecourse; use LONCAPA qw(:DEFAULT :match); sub send_selfserve_notification { @@ -876,7 +877,7 @@ sub update_request_queue { if (ref($curr{$uname}) eq 'HASH') { my ($username,$logtoken,$serverid,$encpass,$courseid,$id,$firstname, - $middlename,$lastname,$generation); + $middlename,$lastname,$generation,$inststatus); $curr{$uname}{'timestamp'} = $now; $curr{$uname}{'adjudicator'} = $env{'user.name'}.':'.$env{'user.domain'}; $courseid = $curr{$uname}{'courseid'}; @@ -885,6 +886,7 @@ sub update_request_queue { $middlename = $curr{$uname}{'middlename'}; $lastname = $curr{$uname}{'lastname'}; $generation = $curr{$uname}{'generation'}; + $inststatus = $curr{$uname}{'inststatus'}; my ($key,$caller)=split(/&/,$curr{$uname}{'tmpinfo'}); if ($caller eq 'createaccount') { @@ -901,6 +903,9 @@ sub update_request_queue { if ($uhome eq 'no_host') { push(@warn_approves,$uname); } else { + unless (($inststatus eq 'default') || ($inststatus eq '')) { + &Apache::lonnet::put('environment',{inststatus => $inststatus},$cdom,$uname); + } &send_selfserve_notification($uname.':'.$cdom, $approvedmsg,undef,undef,$now, $beneficiary,$sender); @@ -2125,6 +2130,18 @@ sub process_official_reqs { 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 { if ($env{'user.role.au./'.$env{'user.domain'}.'/'} =~ /^(\d*)\.(\d*)$/) { if ((!$1 || $1 < time) &&