--- loncom/interface/loncoursequeueadmin.pm 2009/08/17 04:39:15 1.4 +++ loncom/interface/loncoursequeueadmin.pm 2011/03/06 21:17:15 1.26 @@ -1,7 +1,7 @@ # The LearningOnline Network -# Utilities to administer domain course requests and course self-enroll requests +# Utilities to administer domain course requests and course self-enroll requests # -# $Id: loncoursequeueadmin.pm,v 1.4 2009/08/17 04:39:15 raeburn Exp $ +# $Id: loncoursequeueadmin.pm,v 1.26 2011/03/06 21:17:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,13 +27,17 @@ # ### +=pod + =head1 NAME Apache::loncoursequeueadmin.pm =head1 SYNOPSIS -Adminitsration utilities used by domain coordinators for queued course creation requests, and by course coordinators for queued self-enrollment requests. +Utilities used by domain coordinators to administer queued course creation requests, +and by course coordinators for queued self-enrollment requests, and by general +users to display their queued self-enrollment requests. This is part of the LearningOnline Network with CAPA project described at http://www.lon-capa.org. @@ -46,10 +50,26 @@ described at http://www.lon-capa.org. =item display_queued_requests() +=item build_queue_display() + =item update_request_queue() =item get_student_counts() +=item course_creation() + +=item build_batchcreatehash() + +=item can_clone_course() + +=item get_processtype() + +=item queued_selfenrollment() + +=item update_coursereq_status() + +=item process_official_reqs() + =back =cut @@ -57,32 +77,31 @@ described at http://www.lon-capa.org. package Apache::loncoursequeueadmin; use strict; -use Apache::Constants qw(:common :http); use Apache::lonnet; use Apache::loncommon; use Apache::lonmsg; use Apache::lonlocal; use Apache::lonuserutils; -use LONCAPA; +use LONCAPA qw(:DEFAULT :match); sub send_selfserve_notification { my ($notifylist,$textstr,$cid,$contextdesc,$timestamp,$context,$sender, - $approvedlist,$rejectedlist) = @_; + $approvedlist,$rejectedlist,$crstype) = @_; # FIXME locallocaltime needs to be able to take $sender_lh as an argument # so this can be localized to the recipients date display format/time zone $timestamp =&Apache::lonlocal::locallocaltime($timestamp); - my $msgcc; - my ($rawsubj,@rawmsg,$subject,$message,$reviewer); + my ($msgcc,$rawsubj,@rawmsg,$subject,$message,$reviewer,$msgtxt); + my ($senderuname,$senderudom) = split(':',$sender); if ($context eq 'coursemanagers') { $rawsubj = 'Self-enrollment requests processed'; push(@rawmsg,{ - mt => 'Enrollment requests in the following course: [_1]have been processed.', + mt => 'Enrollment requests in the following course: [_1] have been processed.', args => ["\n $contextdesc"], }); } elsif ($context eq 'domainmanagers') { - $rawsubj = 'Course requests reviewed'; + $rawsubj = 'Course/Community requests reviewed'; push(@rawmsg,{ - mt => 'Course creation requests in the following domain: [_1]have been reviewed.', + mt => 'Course/Community creation requests in the following domain: [_1] have been reviewed.', args => ["\n $contextdesc"], }); if (ref($textstr) eq 'ARRAY') { @@ -90,8 +109,13 @@ sub send_selfserve_notification { } } elsif ($context eq 'enroller') { $rawsubj = 'Enrollment request'; + if ($crstype eq 'community') { + $msgtxt = 'Your request for enrollment in the following community: [_1]requested on [_2]has been reviewed by a Coordinator.' + } else { + $msgtxt = 'Your request for enrollment in the following course: [_1]requested on [_2]has been reviewed by a Course Coordinator.'; + } push(@rawmsg,{ - mt => 'Your request for enrollment in the following course: [_1]requested on [_2]has been reviewed by a Course Coordinator.', + mt => $msgtxt, args => ["\n ".$contextdesc.",\n",$timestamp.",\n"], }); @@ -99,45 +123,69 @@ sub send_selfserve_notification { push(@rawmsg,@{$textstr}); } } elsif ($context eq 'courserequestor') { - $rawsubj = 'Course request'; + if ($crstype eq 'Community') { + $rawsubj = 'Community request'; + $msgtxt = 'Your request for creation of the following community: [_1]requested on [_2]has been reviewed by a Domain Coordinator.'; + } else { + $rawsubj = 'Course request'; + $msgtxt = 'Your request for creation of the following course: [_1]requested on [_2]has been reviewed by a Domain Coordinator.'; + } push(@rawmsg,{ - mt => 'Your request for creation of the following course: [_1]requested on [_2]has been reviewed by a Domain Coordinator.', + mt => $msgtxt, args => ["\n".$contextdesc.",\n",$timestamp.",\n"], }); if (ref($textstr) eq 'ARRAY') { push(@rawmsg,@{$textstr}); } + } elsif ($context eq 'pendingrequestor') { + if ($crstype eq 'Community') { + $rawsubj = 'Community request'; + } else { + $rawsubj = 'Processed course request'; + } + if (ref($textstr) eq 'ARRAY') { + push(@rawmsg,@{$textstr}); + } } elsif ($context eq 'coursereq') { - $rawsubj = 'Course request to review', + if ($crstype eq 'community') { + $rawsubj = 'Community request to review'; + $msgtxt = 'Creation of the following community: [_1]was requested by [_2] on [_3].'; + } else { + $rawsubj = 'Course request to review'; + $msgtxt = 'Creation of the following course: [_1]was requested by [_2] on [_3].'; + } push(@rawmsg,{ - mt => 'Creation of the following course: [_1]was requested by [_2] on [_3].', + mt => $msgtxt, args => ["\n $contextdesc\n",$textstr,$timestamp], }, { - mt =>'[_1]As Domain Coordinator, use: [_2]Main Menu -> Create a new course -> Approve or reject course requests[_3]to display a list of pending requests, which you can either approve or reject.', + mt =>'[_1]As Domain Coordinator, use: [_2]Main Menu -> Course and community creation -> Approve or reject requests[_3]to display a list of pending requests, which you can either approve or reject.', args => ["\n","\n\n ","\n\n"], }); } elsif ($context eq 'selfenrollreq') { $rawsubj = 'Self-enrollment request'; + if ($crstype eq 'community') { + $msgtxt = 'Enrollment in the following community: [_1] was requested by [_2] on [_3].' + } else { + $msgtxt = 'Enrollment in the following course: [_1] was requested by [_2] on [_3].' + } push(@rawmsg,{ - mt => 'Enrollment in the following course: [_1] was requested by [_2] on [_3].', + mt => $msgtxt, args => ["\n $contextdesc\n",$textstr,$timestamp."\n"], }); - if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') { - push(@rawmsg, - { - mt =>'As Coordinator, use: [_1]Main Menu -> Manage Course Users -> Enrollment Requests[_2]to display a list of pending enrollment requests, which you can either approve or reject.', - args => [" \n\n","\n"], - }); + my $directions; + if ($crstype eq 'community') { + $directions = 'As Coordinator, use: [_1]Main Menu -> Manage Community Users -> Enrollment Requests[_2]to display a list of pending enrollment requests, which you can either approve or reject.'; } else { - push(@rawmsg, + $directions = 'As Course Coordinator, use: [_1]Main Menu -> Manage Course Users -> Enrollment Requests[_2]to display a list of pending enrollment requests, which you can either approve or reject.'; + } + push(@rawmsg, { - mt =>'As Course Coordinator, use: [_1]Main Menu -> Manage Course Users -> Enrollment Requests[_2]to display a list of pending enrollment requests, which you can either approve or reject.', + mt => $directions, args => [" \n\n","\n"], }); - } } my @to_notify = split(/,/,$notifylist); my $numsent = 0; @@ -174,7 +222,7 @@ sub send_selfserve_notification { $message .= &Apache::lonlocal::mt_user($sender_lh,$item->{mt},@{$item->{args}})."\n"; } } - &Apache::lonmsg::process_sent_mail($subject,'',$numsent,$stamp,$uname,$udom,$msgcount,$cid,$$,$message,\@recusers,\@recudoms); + &Apache::lonmsg::process_sent_mail($subject,'',$numsent,$stamp,$uname,$udom,$msgcount,$cid,$$,$message,\@recusers,\@recudoms,undef,undef,undef,undef,$senderuname,$senderudom); my ($recipid,$recipstatus) = &Apache::lonmsg::store_recipients($subject,$uname,$udom,\%reciphash); my $status; foreach my $recip (sort(keys(%{$msgcc}))) { @@ -188,7 +236,7 @@ sub send_selfserve_notification { @{$item->{args}})."\n"; } } - if ($context eq 'managers') { + if ($context eq 'coursemanagers') { if ($approvedlist) { $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Approved enrollments:')."\n".$approvedlist; } @@ -220,34 +268,22 @@ sub display_queued_requests { } else { $formaction = '/adm/createcourse'; $namespace = 'courserequestqueue'; - %requesthash = &Apache::lonnet::dump_dom($namespace,$dom,undef,'_approval'); - $nextelement = ''; + my $disposition = 'approval'; + my $nextphase = 'requestchange'; + if ($context eq 'pending') { + $disposition = 'pending'; + $nextphase = 'requestvalidation'; + } + %requesthash = &Apache::lonnet::dump_dom($namespace,$dom,'_'.$disposition); + $nextelement = ''; } - my ($output,%queue_by_date,%crstypes); + my ($output,%queue_by_date); if (keys(%requesthash) > 0) { $output = '
'."\n". ''."\n". - $nextelement."\n". - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(). - ''.&mt('Action').''. - ''.&mt('Requestor').''; - if ($context eq 'course') { - $output .= ''.&mt('Section').''. - ''.&mt('Date requested').''; - %crstypes = &Apache::lonlocal::texthash ( - official => 'Official course', - unofficial => 'Unofficial course', - community => 'Community', - ); - } else { - $output .= ''.&mt('Type').''. - ''.&mt('Date requested').''. - ''.&mt('Details').''; - } - $output .= &Apache::loncommon::end_data_table_header_row(); + $nextelement."\n"; foreach my $item (keys(%requesthash)) { - my ($timestamp,$entry); + my ($timestamp,$entry,$pending); if ($context eq 'course') { ($timestamp, my $usec) = split(/:/,$requesthash{$item}); $entry = $item.':'.$usec; @@ -256,96 +292,175 @@ sub display_queued_requests { if (ref($requesthash{$item}) eq 'HASH') { my ($cnum,$disposition) = split('_',$item); $entry = $cnum.':'.$requesthash{$item}{'ownername'}.':'. - $requesthash{$item}{'ownerdom'}.':'. - $requesthash{$item}{'crstype'}.':'. - $requesthash{$item}{'description'}; + $requesthash{$item}{'ownerdom'}.':'; + if ($context eq 'pending') { + $entry .= $requesthash{$item}{'instcode'}; + } else { + $entry .= $requesthash{$item}{'crstype'}; + } + $entry .= ':'.$requesthash{$item}{'description'}; } } if ($entry ne '') { - if (exists($queue_by_date{$timestamp})) { - if (ref($queue_by_date{$timestamp}) eq 'ARRAY') { - push(@{$queue_by_date{$timestamp}},$entry); - } + if (ref($queue_by_date{$timestamp}) eq 'ARRAY') { + push(@{$queue_by_date{$timestamp}},$entry); } else { - @{$queue_by_date{$timestamp}} = ($entry); + $queue_by_date{$timestamp} = [$entry]; } } } - my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date)); - my $count = 0; - foreach my $item (@sortedtimes) { - if (ref($queue_by_date{$item}) eq 'ARRAY') { - foreach my $request (sort(@{$queue_by_date{$item}})) { - my ($row,$approve,$reject,$showtime,$showsec,$namelink, - $detailslink,$crstype); - $showtime = &Apache::lonlocal::locallocaltime($item); - if ($context eq 'course') { - my ($puname,$pudom,$pusec) = split(/:/,$request); - $approve = $count.':'.$puname.':'.$pudom.':'.$pusec; - $reject = $puname.':'.$pudom; - $showsec = $pusec; - if ($showsec eq '') { - $showsec = &mt('none'); - } - $namelink = &Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($puname,$pudom), - $puname,$pudom); + if (keys(%queue_by_date) > 0) { + if ($context eq 'course') { + $output .= '

'.&mt('Self-enrollment requests queued pending approval by a Coordinator').'

'; + } elsif ($context eq 'pending') { + $output .= '

'.&mt('Requests for official courses queued pending validation').'

'. + '

'.&mt('Requests are validated against institutional data to confirm that the requestor is an instructor of record.').'
'. + &mt('Validation is attempted when the request is submitted.').' '.&mt('If unvalidated, the request will be held in a queue.').' '.&mt('Validation of pending requests is automatically repeated daily.').'

'; + } else { + $output .= '

'.&mt('Course/Community requests queued pending approval by a Domain Coordinator').'

'; + } + $output .= &build_queue_display($dom,$context,\%queue_by_date). + ''; + } else { + $output .= '
'; + if ($context eq 'course') { + $output .= &mt('There are currently no enrollment requests awaiting approval.'); + } elsif ($context eq 'pending') { + $output .= &mt('There are currently no requests for official courses awaiting validation.'); + } elsif ($context eq 'domain') { + $output .= &mt('There are currently no course or community requests awaiting approval.'); + } + $output .= '
'; + } + if ($context eq 'pending') { + $output .= '

'."\n". + '

'.&mt('Any course/community requests which are successfully validated will be created immediately.').' '.&mt('Unvalidated requests will be listed for manual approval/rejection.').'

'; + } else { + $output .= '
'; + } + $output .= '
'; + } else { + $output .= '
'; + if ($context eq 'course') { + $output .= &mt('There are currently no enrollment requests awaiting approval.'); + } elsif ($context eq 'pending') { + $output .= &mt('There are currently no requests for official courses awaiting validation.'); + } else { + $output .= &mt('There are currently no course or community requests awaiting approval.'); + } + $output .= '
'; + } + return $output; +} +sub build_queue_display { + my ($dom,$context,$queue) = @_; + return unless (ref($queue) eq 'HASH'); + my %crstypes; + my $output = &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(); + unless ($context eq 'pending') { + $output .= ''.&mt('Action').''; + } + $output .= ''.&mt('Requestor').''; + if ($context eq 'course') { + $output .= ''.&mt('Section').''. + ''.&mt('Date requested').''; + } elsif ($context eq 'pending' || $context eq 'stillpending') { + $output .= ''.&mt('Institutional code').''. + ''.&mt('Date requested').''. + ''.&mt('Details').''; + } else { + %crstypes = &Apache::lonlocal::texthash ( + official => 'Official course', + unofficial => 'Unofficial course', + community => 'Community', + ); + $output .= ''.&mt('Type').''. + ''.&mt('Date requested').''. + ''.&mt('Details').''; + } + $output .= &Apache::loncommon::end_data_table_header_row(); + my @sortedtimes = sort {$a <=> $b} (keys(%{$queue})); + my $count = 0; + foreach my $item (@sortedtimes) { + if (ref($queue->{$item}) eq 'ARRAY') { + foreach my $request (sort(@{$queue->{$item}})) { + my ($row,$approve,$reject,$showtime,$showsec,$namelink, + $detailslink,$crstype,$instcode); + $showtime = &Apache::lonlocal::locallocaltime($item); + if ($context eq 'course') { + my ($puname,$pudom,$pusec) = split(/:/,$request); + $approve = $count.':'.$puname.':'.$pudom.':'.$pusec; + $reject = $puname.':'.$pudom; + $showsec = $pusec; + if ($showsec eq '') { + $showsec = &mt('none'); + } + $namelink = &Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($puname,$pudom), + $puname,$pudom); + } else { + my ($cnum,$ownername,$ownerdom,$type,$cdesc); + my $queue = 'approval'; + if ($context eq 'pending' || $context eq 'stillpending') { + ($cnum,$ownername,$ownerdom,$instcode,$cdesc)=split(/:/,$request,5); + $queue = 'pending'; } else { - my ($cnum,$ownername,$ownerdom,$type,$cdesc)=split(/:/,$request,5); - $detailslink=''.$cdesc.''; + ($cnum,$ownername,$ownerdom,$type,$cdesc)=split(/:/,$request,5); $crstype = $type; if (defined($crstypes{$type})) { $crstype = $crstypes{$type}; } - $approve = $count.':'.$cnum; - $reject = $cnum; - $namelink = &Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($ownername,$ownerdom), - $ownername,$ownerdom); } + $detailslink=''.$cdesc.''; + $approve = $count.':'.$cnum; + $reject = $cnum; + $namelink = &Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($ownername,$ownerdom), + $ownername,$ownerdom); + } + unless ($context eq 'pending') { $row = '
'. '
'. - ''.$namelink.''."\n"; - if ($context eq 'course') { - $row .= ''.$showsec.''."\n". - ''.$showtime.''."\n"; - } else { - $row .= ''.$crstype.''."\n". - ''.$showtime.''."\n". - ''.$detailslink.''."\n"; - } - $output .= &Apache::loncommon::start_data_table_row()."\n". - $row. - &Apache::loncommon::end_data_table_row()."\n"; - $count ++; + ''.&mt('Reject').'
'; } + $row .= ''.$namelink.''."\n"; + if ($context eq 'course') { + $row .= ''.$showsec.''."\n". + ''.$showtime.''."\n"; + } else { + if ($context eq 'pending' || $context eq 'stillpending') { + $row .= ''.$instcode.''."\n"; + } else { + $row .= ''.$crstype.''."\n"; + } + $row .= ''.$showtime.''."\n". + ''.$detailslink.''."\n"; + } + $output .= &Apache::loncommon::start_data_table_row()."\n". + $row. + &Apache::loncommon::end_data_table_row()."\n"; + $count ++; } } - $output .= &Apache::loncommon::end_data_table(). - ''; - } else { - if ($context eq 'course') { - $output .= &mt('There are currently no enrollment requests.'); - } else { - $output .= &mt('There are currently no course requests awaiting approval.'); - } } + $output .= &Apache::loncommon::end_data_table(); return $output; } sub update_request_queue { my ($context,$cdom,$cnum,$coursedesc) = @_; my ($output,$access_start,$access_end,$limit,$cap,$notifylist,$namespace, - $stucounts,$idx,$classlist,%requesthash,$cid,$hostname,$protocol, - $domdesc,$now,$sender,$approvedmsg,$rejectedmsg,$beneficiary, + $stucounts,$idx,$classlist,%requesthash,$cid,$domdesc,$now, + $sender,$approvedmsg,$rejectedmsg,$beneficiary, @existing,@missingreq,@invalidusers,@limitexceeded,@completed, - @processing_errors,@warn_approves,@warn_rejects,@approvals, - @rejections,@rejectionerrors,%courseroles,%communityroles,%domdefs); + @processing_errors,@warn_approves,@warn_rejects,@approvals,@warn_dels, + @rejections,@rejectionerrors,@nopermissions,%courseroles, + %communityroles,%domdefs,%approvalmsg,%rejectionmsg,$crstype,$queue,$firsturl); @approvals = &Apache::loncommon::get_env_multiple('form.approvereq'); @rejections = &Apache::loncommon::get_env_multiple('form.rejectreq'); $now = time; @@ -354,10 +469,8 @@ sub update_request_queue { $namespace = 'selfenrollrequests'; $beneficiary = 'enroller'; $cid = $env{'request.course.id'}; - my $chome = &Apache::lonnet::homeserver($cnum,$cdom); - $hostname = &Apache::lonnet::hostname($chome); - $protocol = $Apache::lonnet::protocol{$chome}; - $protocol = 'http' if ($protocol ne 'https'); + $crstype = lc(&Apache::loncommon::course_type()); + $firsturl = &course_portal_url($cnum,$cdom); %requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum); $access_start = $env{'course.'.$cid.'.internal.selfenroll_start_access'}; $access_end = $env{'course.'.$cid.'.internal.selfenroll_end_access'}; @@ -370,7 +483,7 @@ sub update_request_queue { }, { mt => 'Visit [_1], to log-in and access the course', - args => [$protocol.'://'.$hostname], + args => [$firsturl], }]; $rejectedmsg = [{ mt => 'Your request for enrollment has not been approved.', @@ -379,27 +492,45 @@ sub update_request_queue { $domdesc = &Apache::lonnet::domain($cdom); $namespace = 'courserequestqueue'; $beneficiary = 'courserequestor'; - %requesthash = &Apache::lonnet::dump_dom($namespace,$cdom,undef,'_approval'); - my $chome = &Apache::lonnet::domain($cdom,'primary'); - $hostname = &Apache::lonnet::hostname($chome); - $protocol = $Apache::lonnet::protocol{$chome}; - $protocol = 'http' if ($protocol ne 'https'); + $queue = 'approval'; + if ($env{'form.queue'} eq 'pending') { + $queue = 'pending'; + } + %requesthash = &Apache::lonnet::dump_dom($namespace,$cdom,'_'.$queue); + $firsturl= &course_portal_url($cnum,$cdom); my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$cdom); if (ref($domconfig{'requestcourses'}) eq 'HASH') { if (ref($domconfig{'requestcourses'}{'notify'}) eq 'HASH') { $notifylist = $domconfig{'requestcourses'}{'notify'}{'approval'}; } } - $approvedmsg = [{ + $approvalmsg{'course'} = + [{ mt => 'Your course request has been approved.', }, { mt => 'Visit [_1], to log-in and access the course', - args => [$protocol.'://'.$hostname], + args => [$firsturl], }]; - $rejectedmsg = [{ + $rejectionmsg{'course'} = + [{ mt => 'Your course request has not been approved.', }]; + + $approvalmsg{'community'} = + [{ + mt => 'Your community request has been approved.', + }, + { + mt => 'Visit [_1], to log-in and access the community', + args => [$firsturl], + }]; + + $rejectionmsg{'community'} = + [{ + mt => 'Your community request has not been approved.', + }]; + %domdefs = &Apache::lonnet::get_domain_defaults($cdom); my @roles = &Apache::lonuserutils::roles_by_context('course'); foreach my $role (@roles) { @@ -416,7 +547,6 @@ sub update_request_queue { my $uhome = &Apache::lonnet::homeserver($uname,$udom); if ($uhome ne 'no_host') { if (exists($requesthash{$uname.':'.$udom})) { - if (exists($classlist->{$uname.':'.$udom})) { if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') { if (($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Active') || @@ -449,7 +579,8 @@ sub update_request_queue { $stucounts->{'allstudents'} ++; $stucounts->{'selfenrolled'} ++; &send_selfserve_notification($uname.':'.$udom,$approvedmsg, - $cid,$coursedesc,$now,$beneficiary,$sender); + $cid,$coursedesc,$now,$beneficiary,$sender, + undef,undef,$crstype); my %userrequest = ( $cdom.'_'.$cnum => { timestamp => $now, @@ -472,32 +603,56 @@ sub update_request_queue { } } else { my ($num,$cnum) = split(':',$item); - if (ref($requesthash{$cnum.'_approval'}) eq 'HASH') { + if (ref($requesthash{$cnum.'_'.$queue}) eq 'HASH') { if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') { - my $ownername = $requesthash{$cnum.'_approval'}{'ownername'}; - my $ownerdom = $requesthash{$cnum.'_approval'}{'ownerdom'}; - my $crstype = $requesthash{$cnum.'_approval'}{'crstype'}; - my $coursedesc = $requesthash{$cnum.'_approval'}{'description'}; + my $ownername = $requesthash{$cnum.'_'.$queue}{'ownername'}; + my $ownerdom = $requesthash{$cnum.'_'.$queue}{'ownerdom'}; + $crstype = $requesthash{$cnum.'_'.$queue}{'crstype'}; + my $coursedesc = $requesthash{$cnum.'_'.$queue}{'description'}; my $longroles = \%courseroles; if ($crstype eq 'community') { $longroles = \%communityroles; } - if (&Apache::lonnet::usertools_access($ownername,$ownerdom,$crstype, - undef,'requestcourses')) { + my $cancreate; + if ($cdom eq $ownerdom) { + if (&Apache::lonnet::usertools_access($ownername,$ownerdom,$crstype, + undef,'requestcourses')) { + $cancreate = 1; + } + } else { + my %userenv = &Apache::lonnet::userenvironment($ownerdom,$ownername,'reqcrsotherdom.'.$crstype); + if ($userenv{'reqcrsotherdom.'.$crstype}) { + my @doms = split(',',$userenv{'reqcrsotherdom.'.$crstype}); + if (grep(/^\Q$cdom\E:/,@doms)) { + $cancreate = 1; + } + } + } + if ($cancreate) { my $requestkey = $cdom.'_'.$cnum; my %history = &Apache::lonnet::restore($requestkey,'courserequests', $ownerdom,$ownername); if ((ref($history{'details'}) eq 'HASH') && - ($history{'disposition'} eq 'approval')) { + ($history{'disposition'} eq $queue)) { my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg); my $result = &course_creation($cdom,$cnum,$context,$history{'details'},\$logmsg, \$newusermsg,\$addresult,\$enrollcount, \$response,\$keysmsg,\%domdefs,$longroles); if ($result eq 'created') { + if ($crstype eq 'community') { + $approvedmsg = $approvalmsg{'community'}; + } else { + $approvedmsg = $approvalmsg{'course'}; + } push(@completed,$cnum); - &send_selfserve_notification($ownername.':'.$ownerdom,$approvedmsg, - $cid,$coursedesc,$now,$beneficiary,$sender); + + unless (&Apache::lonnet::del_dom($namespace,[$cnum.'_'.$queue],$cdom) eq 'ok') { + push(@warn_dels,$cnum); + } + &send_selfserve_notification($ownername.':'.$ownerdom, + $approvedmsg,$cid,$coursedesc,$now, + $beneficiary,$sender,undef,undef,$crstype); my %reqhash = ( reqtime => $history{'reqtime'}, crstype => $history{'crstype'}, @@ -531,7 +686,7 @@ sub update_request_queue { push(@processing_errors,$cnum); } } else { - push(@processing_errors,$cnum); + push(@nopermissions,$cnum); } } else { push(@existing,$cnum); @@ -543,14 +698,15 @@ sub update_request_queue { } my @changes = (@completed,@rejections); if ($context eq 'domain') { - @changes = map {$_.'_approval'} (@changes); + @changes = map {$_.'_'.$queue} (@changes); } if (@rejections) { foreach my $item (@rejections) { if ($context eq 'course') { my $user = $item; &send_selfserve_notification($user,$rejectedmsg,$cid,$coursedesc, - $now,$beneficiary,$sender); + $now,$beneficiary,$sender,undef,undef, + $crstype); my ($uname,$udom) = split(/:/,$user); my %userrequest = ( $cdom.'_'.$cnum => { @@ -566,20 +722,26 @@ sub update_request_queue { } } else { my $cnum = $item; - if (ref($requesthash{$cnum.'_approval'}) eq 'HASH') { + if (ref($requesthash{$cnum.'_'.$queue}) eq 'HASH') { if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') { my $requestkey = $cdom.'_'.$cnum; - my $ownername = $requesthash{$cnum.'_approval'}{'ownername'}; - my $ownerdom = $requesthash{$cnum.'_approval'}{'ownerdom'}; - my $coursedesc = $requesthash{$cnum.'_approval'}{'description'}; + my $ownername = $requesthash{$cnum.'_'.$queue}{'ownername'}; + my $ownerdom = $requesthash{$cnum.'_'.$queue}{'ownerdom'}; + my $coursedesc = $requesthash{$cnum.'_'.$queue}{'description'}; + $crstype = $requesthash{$cnum.'_'.$queue}{'crstype'}; + if ($crstype eq 'community') { + $rejectedmsg = $rejectionmsg{'community'}; + } else { + $rejectedmsg = $rejectionmsg{'course'}; + } &send_selfserve_notification($ownername.':'.$ownerdom,$rejectedmsg, $cid,$coursedesc,$now,$beneficiary, - $sender); + $sender,undef,undef,$crstype); my %history = &Apache::lonnet::restore($requestkey,'courserequests', $ownerdom,$ownername); if ((ref($history{'details'}) eq 'HASH') && - ($history{'disposition'} eq 'approval')) { + ($history{'disposition'} eq $queue)) { my %reqhash = ( reqtime => $history{'reqtime'}, crstype => $history{'crstype'}, @@ -604,6 +766,9 @@ sub update_request_queue { } else { push(@warn_rejects,$cnum); } + unless (&Apache::lonnet::del_dom($namespace,[$cnum.'_'.$queue],$cdom) eq 'ok') { + push(@warn_dels,$cnum); + } } else { push(@warn_rejects,$cnum); } @@ -631,7 +796,11 @@ sub update_request_queue { $chgmsg = "'Action was taken on the following enrollment requests by [_1].',$namelink"; if (@completed) { $approvedlist = join("\n",@completed); - $output .= '

'.&mt('The following were enrolled in the course:').'