--- loncom/interface/loncoursequeueadmin.pm 2010/01/07 17:07:45 1.12.2.4 +++ loncom/interface/loncoursequeueadmin.pm 2013/07/24 18:21:39 1.36 @@ -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.12.2.4 2010/01/07 17:07:45 raeburn Exp $ +# $Id: loncoursequeueadmin.pm,v 1.36 2013/07/24 18:21:39 bisitz 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,34 @@ 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() + +=item is_active_author() + +=item author_prompt() + +=item reqauthor_check() + +=item process_reqauthor() + =back =cut @@ -57,13 +85,12 @@ 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, @@ -71,19 +98,28 @@ sub send_selfserve_notification { # 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,$msgtxt); + 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.', - args => ["\n $contextdesc"], + args => ["\n$contextdesc"], }); } elsif ($context eq 'domainmanagers') { $rawsubj = 'Course/Community requests reviewed'; push(@rawmsg,{ - mt => 'Course/Community creation requests in the following domain: [_1] have been reviewed.', - args => ["\n $contextdesc"], + mt => 'Course/Community creation requests in the following domain: "[_1]" have been reviewed.', + args => ["\n$contextdesc"], + }); + if (ref($textstr) eq 'ARRAY') { + push(@rawmsg,@{$textstr}); + } + } elsif ($context eq 'authormanagers') { + $rawsubj = 'Authoring space requests reviewed'; + push(@rawmsg,{ + mt => 'Authoring requests in the following domain: "[_1]" have been reviewed.', + args => ["\n$contextdesc"], }); if (ref($textstr) eq 'ARRAY') { push(@rawmsg,@{$textstr}); @@ -119,6 +155,15 @@ sub send_selfserve_notification { 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') { if ($crstype eq 'community') { $rawsubj = 'Community request to review'; @@ -133,14 +178,14 @@ sub send_selfserve_notification { }, { 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"], + 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].' + $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].' + $msgtxt = 'Enrollment in the following course: [_1]was requested by [_2] on [_3].' } push(@rawmsg,{ mt => $msgtxt, @@ -157,7 +202,28 @@ sub send_selfserve_notification { mt => $directions, args => [" \n\n","\n"], }); + } elsif ($context eq 'authorreq') { + $rawsubj = 'Authoring space request to review'; + $msgtxt = 'Assignment of an author role in the [_1] domain[_2]was requested by [_3] on [_4].'; + push(@rawmsg,{ + mt => $msgtxt, + args => [$contextdesc,"\n",$textstr,$timestamp], + }, + { + mt =>'[_1]As Domain Coordinator, use: [_2]Main Menu -> Create users or modify the roles and privileges of users -> Authoring space reqests[_3]to display a list of pending requests, which you can either approve or reject.', + args => ["\n","\n\n ","\n\n"], + }); + } elsif ($context eq 'requestauthor') { + $rawsubj = 'Authoring space request'; + $msgtxt = 'Your request for an authoring space requested on [_1]has been reviewed by a Domain Coordinator.'; + push(@rawmsg,{ + mt => $msgtxt, + args => [$timestamp."\n"], + }); + if (ref($textstr) eq 'ARRAY') { + push(@rawmsg,@{$textstr}); + } } my @to_notify = split(/,/,$notifylist); my $numsent = 0; @@ -194,7 +260,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}))) { @@ -222,6 +288,13 @@ sub send_selfserve_notification { if ($rejectedlist) { $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Rejected course requests:')."\n".$rejectedlist; } + } elsif ($context eq 'authormanagers') { + if ($approvedlist) { + $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Approved author role requests:')."\n".$approvedlist; + } + if ($rejectedlist) { + $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Rejected author role requests:')."\n".$rejectedlist; + } } $status .= &Apache::lonmsg::user_normal_msg($ccname,$ccdom,$subject,$message,undef,undef,undef,1,\%sentmessage,undef,undef,undef,1,$recipid).','; } @@ -237,139 +310,242 @@ sub display_queued_requests { $namespace = 'selfenrollrequests'; %requesthash = &Apache::lonnet::dump($namespace,$dom,$cnum); $nextelement = ''; + } elsif ($context eq 'requestauthor') { + $formaction = '/adm/createuser'; + $namespace = 'requestauthorqueue'; + %requesthash = &Apache::lonnet::dump_dom($namespace,$dom); + $nextelement = ''; } else { $formaction = '/adm/createcourse'; $namespace = 'courserequestqueue'; - %requesthash = &Apache::lonnet::dump_dom($namespace,$dom,'_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').''; - } 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(); + $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; + } elsif ($context eq 'requestauthor') { + $timestamp = $requesthash{$item}; + ($entry) = ($item =~ /^($match_username)_approval$/); } else { $timestamp = $requesthash{$item}{'timestamp'}; 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.').'

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

'.&mt('Requests for authoring space queued pending approval by a Domain Coordinator').'

'; + } 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 'requestauthor') { + $output .= &mt('There are currently no requests for authoring space awaiting approval.'); + } 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 'requestauthor') { + $output .= ''.&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); + } elsif ($context eq 'requestauthor') { + if (&Apache::lonnet::homeserver($request,$dom) ne 'no_host') { + $approve = $count.':'.$request; + $reject = $request; + $namelink = &Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($request,$dom), + $request,$dom); + } + } 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('Approve').''. + ''. + '
'; } + $row .= ''.$namelink.''."\n"; + if ($context eq 'course') { + $row .= ''.$showsec.''."\n". + ''.$showtime.''."\n"; + } elsif ($context eq 'requestauthor') { + $row .= ''.$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 or community 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,@nopermissions,%courseroles, - %communityroles,%domdefs,%approvalmsg,%rejectionmsg,$crstype, - @warn_coursereqs); - @approvals = &Apache::loncommon::get_env_multiple('form.approvereq'); - @rejections = &Apache::loncommon::get_env_multiple('form.rejectreq'); + @processing_errors,@warn_approves,@warn_rejects,@approvals,@warn_dels, + @rejections,@rejectionerrors,@nopermissions,%courseroles,@toremove, + %communityroles,%domdefs,%approvalmsg,%rejectionmsg,$crstype,$queue, + $firsturl); + my $count=0; + while (my @course = &Apache::loncommon::get_env_multiple('form.'.$count.'radioreq')) { + if ($course[0] =~ /^\d+:.*/) { + push(@approvals,$course[0]); + } elsif ($course[0] =~ /^later:.*/) { + #decide later + } else { + push(@rejections,$course[0]); + } + $count+=1; + } + $now = time; $sender = $env{'user.name'}.':'.$env{'user.domain'}; if ($context eq 'course') { @@ -377,10 +553,7 @@ sub update_request_queue { $beneficiary = 'enroller'; $cid = $env{'request.course.id'}; $crstype = lc(&Apache::loncommon::course_type()); - my $chome = &Apache::lonnet::homeserver($cnum,$cdom); - $hostname = &Apache::lonnet::hostname($chome); - $protocol = $Apache::lonnet::protocol{$chome}; - $protocol = 'http' if ($protocol ne 'https'); + $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'}; @@ -392,21 +565,44 @@ sub update_request_queue { mt => 'Your request for enrollment has been approved.', }, { - mt => 'Visit [_1], to log-in and access the course', - args => [$protocol.'://'.$hostname], + mt => 'Visit [_1] to log-in and access the course', + args => [$firsturl], }]; $rejectedmsg = [{ mt => 'Your request for enrollment has not been approved.', }]; + } elsif ($context eq 'requestauthor') { + $namespace = 'requestauthorqueue'; + $beneficiary = 'requestauthor'; + %requesthash = &Apache::lonnet::dump_dom($namespace,$cdom); + my %domdefs = &Apache::lonnet::get_domain_defaults($cdom); + if (ref($domdefs{'requestauthor'}) eq 'HASH') { + if (ref($domdefs{'requestauthor'}{'notify'}) eq 'HASH') { + $notifylist = $domdefs{'requestauthor'}{'notify'}{'approval'}; + } + } + my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom); + $firsturl = &course_portal_url($domconfiguser,$cdom); + $approvedmsg = [{ + mt => 'Your request for authoring space has been approved.', + }, + { + mt => 'Visit [_1] to log-in and select your author role', + args => [$firsturl], + }]; + $rejectedmsg = [{ + mt => 'Your request for authoring space has not been approved.', + }]; + $domdesc = &Apache::lonnet::domain($cdom); } else { $domdesc = &Apache::lonnet::domain($cdom); $namespace = 'courserequestqueue'; $beneficiary = 'courserequestor'; - %requesthash = &Apache::lonnet::dump_dom($namespace,$cdom,'_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); my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$cdom); if (ref($domconfig{'requestcourses'}) eq 'HASH') { if (ref($domconfig{'requestcourses'}{'notify'}) eq 'HASH') { @@ -418,8 +614,8 @@ sub update_request_queue { mt => 'Your course request has been approved.', }, { - mt => 'Visit [_1], to log-in and access the course', - args => [$protocol.'://'.$hostname], + mt => 'Visit [_1] to log-in and access the course', + args => [], }]; $rejectionmsg{'course'} = [{ @@ -431,8 +627,8 @@ sub update_request_queue { mt => 'Your community request has been approved.', }, { - mt => 'Visit [_1], to log-in and access the community', - args => [$protocol.'://'.$hostname], + mt => 'Visit [_1] to log-in and access the community', + args => [], }]; $rejectionmsg{'community'} = @@ -448,7 +644,6 @@ sub update_request_queue { foreach my $role (@roles) { $communityroles{$role}=&Apache::lonnet::plaintext($role,'Community'); } - } foreach my $item (sort {$a <=> $b} @approvals) { if ($context eq 'course') { @@ -456,10 +651,6 @@ sub update_request_queue { my $uhome = &Apache::lonnet::homeserver($uname,$udom); if ($uhome ne 'no_host') { if (exists($requesthash{$uname.':'.$udom})) { - if ($cdom eq 'gci' && $cnum eq '9615072b469884921gcil1') { - my $enresult = &enable_gci_submission($udom,$uname, - $access_end,$access_start); - } if (exists($classlist->{$uname.':'.$udom})) { if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') { if (($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Active') || @@ -492,7 +683,8 @@ sub update_request_queue { $stucounts->{'allstudents'} ++; $stucounts->{'selfenrolled'} ++; &send_selfserve_notification($uname.':'.$udom,$approvedmsg, - $cid,$coursedesc,$now,$beneficiary,$sender,undef,undef,$crstype); + $cid,$coursedesc,$now,$beneficiary,$sender, + undef,undef,$crstype); my %userrequest = ( $cdom.'_'.$cnum => { timestamp => $now, @@ -505,15 +697,6 @@ sub update_request_queue { &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname); if ($userresult ne 'ok') { push(@warn_approves,$uname.':'.$udom); - } elsif ($udom eq 'gci') { - my %changehash = ( - 'reqcrsotherdom.unofficial' => 'gcitest:autolimit=', - ); - my $reqresult = &Apache::lonnet::put('environment',\%changehash, - $udom,$uname); - if ($reqresult ne 'ok') { - push(@warn_coursereqs,$uname.':'.$udom); - } } } else { push(@processing_errors,$uname.':'.$udom); @@ -522,14 +705,58 @@ sub update_request_queue { } else { push(@invalidusers,$uname.':'.$udom); } + } elsif ($context eq 'requestauthor') { + my ($num,$uname) = split(/:/,$item); + my $uhome = &Apache::lonnet::homeserver($uname,$cdom); + if ($uhome ne 'no_host') { + my ($user_is_adv,$user_is_author) = &Apache::lonnet::is_advanced_user($cdom,$uname); + if ($user_is_author) { + push(@existing,$uname); + } elsif (&Apache::lonnet::usertools_access($uname,$cdom,'requestauthor', + undef,'requestauthor')) { + if (&Apache::lonnet::allowed('cau',$cdom)) { + if (&Apache::lonnet::assignrole($cdom,$uname,'/'.$cdom.'/','au',undef,time,undef,undef,'requestauthor') eq 'ok') { + push(@completed,$uname); + unless (&Apache::lonnet::del_dom($namespace,[$uname.'_approval'],$cdom) eq 'ok') { + push(@warn_dels,$uname); + } + &send_selfserve_notification($uname.':'.$cdom, + $approvedmsg,undef,undef,$now, + $beneficiary,$sender); + my %userrequest = ( + author => { + timestamp => $now, + adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, + status => 'approved', + }, + author_status => 'approved', + ); + my $userresult = + &Apache::lonnet::put('requestauthor',\%userrequest,$cdom,$uname); + if ($userresult ne 'ok') { + push(@warn_approves,$item); + } + } else { + push(@processing_errors,$uname); + } + } else { + push(@nopermissions,$uname); + } + } else { + push(@nopermissions,$uname); + } + } else { + push(@invalidusers,$uname.':'.$cdom); + } + push(@toremove,(@invalidusers,@nopermissions)); } 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'}; - $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; @@ -555,7 +782,7 @@ sub update_request_queue { &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, @@ -566,9 +793,20 @@ sub update_request_queue { } else { $approvedmsg = $approvalmsg{'course'}; } + my $firsturl = &course_portal_url($cnum,$cdom); + if (ref($approvedmsg) eq 'ARRAY') { + if (ref($approvedmsg->[1]) eq 'HASH') { + $approvedmsg->[1]->{'args'} = [$firsturl]; + } + } push(@completed,$cnum); - &send_selfserve_notification($ownername.':'.$ownerdom,$approvedmsg, - $cid,$coursedesc,$now,$beneficiary,$sender,undef,undef,$crstype); + + 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'}, @@ -614,36 +852,51 @@ sub update_request_queue { } my @changes = (@completed,@rejections); if ($context eq 'domain') { + @changes = map {$_.'_'.$queue} (@changes); + } elsif ($context eq 'requestauthor') { @changes = map {$_.'_approval'} (@changes); } if (@rejections) { foreach my $item (@rejections) { - if ($context eq 'course') { - my $user = $item; + if (($context eq 'course') || ($context eq 'requestauthor')) { + my ($user,$uname,$udom,%userrequest,$key); + if ($context eq 'requestauthor') { + $uname = $item; + $udom = $cdom; + $user = $uname.':'.$udom; + $key = 'author'; + } else { + $user = $item; + ($uname,$udom) = split(/:/,$user); + $key = $cdom.'_'.$cnum; + } &send_selfserve_notification($user,$rejectedmsg,$cid,$coursedesc, - $now,$beneficiary,$sender,undef,undef,$crstype); - my ($uname,$udom) = split(/:/,$user); - my %userrequest = ( - $cdom.'_'.$cnum => { + $now,$beneficiary,$sender,undef,undef, + $crstype); + %userrequest = ( + $key => { timestamp => $now, adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, - status => 'rejected', + status => 'rejection', } ); + if ($context eq 'requestauthor') { + $userrequest{'author_status'} = 'rejection'; + } my $userresult = - &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname); + &Apache::lonnet::put('requestauthor',\%userrequest,$udom,$uname); if ($userresult ne 'ok') { - push(@warn_rejects,$user); + push(@warn_rejects,$item); } } 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'}; - $crstype = $requesthash{$cnum.'_approval'}{'crstype'}; + 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 { @@ -656,7 +909,7 @@ sub update_request_queue { &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'}, @@ -681,6 +934,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); } @@ -693,6 +949,21 @@ sub update_request_queue { } } } + if (@toremove) { + foreach my $item (@toremove) { + my %userrequest = ( + author => { + timestamp => $now, + adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, + status => 'deleted', + }, + author_status => 'deleted', + ); + &Apache::lonnet::put('requestauthor',\%userrequest,$cdom,$item); + } + @toremove = map {$_.'_approval'} (@toremove); + my $delresult = &Apache::lonnet::del_dom($namespace,\@toremove,$cdom); + } if (@changes) { my $delresult; if ($context eq 'course') { @@ -734,6 +1005,34 @@ sub update_request_queue { $now,'coursemanagers',$sender, $approvedlist,$rejectedlist,$crstype); } + } elsif ($context eq 'requestauthor') { + $chgmsg = "'Action was taken on the following authoring space requests by [_1].',$namelink"; + if (@completed) { + $approvedlist = join("\n",@completed); + $output .= '

'.&mt('The following requests were approved:').'

'; + } + if (@rejections) { + $rejectedlist = join("\n",@rejections); + $output .= '

'.&mt('The following requests were rejected:').'

'; + } + if ($notifylist ne '') { + &send_selfserve_notification($notifylist,$chgmsg,undef,$domdesc, + $now,'authormanagers',$sender, + $approvedlist,$rejectedlist); + } } else { $chgmsg = "'Action was taken on the following course and community requests by [_1].',$namelink"; if (@completed) { @@ -741,8 +1040,8 @@ sub update_request_queue { $output .= '

'.&mt('The following courses/communities were created:').'

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

'.&mt('The following authoring space requests were deleted because the requestor does not have a LON-CAPA account:').'

'; } } if (@limitexceeded) { @@ -831,17 +1153,27 @@ sub update_request_queue { } } if (@nopermissions) { - $output .= '

'.&mt('The following course/community creation requests could not be processed because the owner does not have rights to create this type of course:').'

'; } if (@processing_errors) { if ($context eq 'course') { @@ -850,12 +1182,20 @@ sub update_request_queue { $output .= '
  • '.$user.'
    • '; } $output .= '

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

    '.&mt('The following requests could not be processed because an error occurred:').'

    '; } else { $output .= '

    '.&mt('The following course/community creation requests could not be processed because an error occurred:').'