--- loncom/interface/loncoursequeueadmin.pm 2009/08/11 00:39:45 1.1 +++ loncom/interface/loncoursequeueadmin.pm 2016/06/19 00:19:31 1.54 @@ -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.1 2009/08/11 00:39:45 raeburn Exp $ +# $Id: loncoursequeueadmin.pm,v 1.54 2016/06/19 00:19:31 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,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,78 +85,191 @@ 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 LONCAPA; +use Apache::lonuserutils; +use LONCAPA::batchcreatecourse; +use LONCAPA qw(:DEFAULT :match); sub send_selfserve_notification { - my ($notifylist,$textstr,$cid,$coursedesc,$timestamp,$context,$sender, - $approvedlist,$rejectedlist) = @_; + my ($notifylist,$textstr,$cid,$contextdesc,$timestamp,$context,$sender, + $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,$namelink); - $namelink = &Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'})); + 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$coursedesc\n"], + args => ["\n$contextdesc"], }); } elsif ($context eq 'domainmanagers') { - $rawsubj = 'Course request'; + $rawsubj = 'Course/Community requests reviewed'; push(@rawmsg,{ - mt => 'Your request for creation of the following course: [_1], requested on [_2], has been reviewed by a Domain Coordinator.', - args => ["\n$coursedesc\n","$timestamp\n"], - + 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}); + } + } elsif ($context eq 'usernamemanagers') { + $rawsubj = 'LON-CAPA account requests reviewed'; + push(@rawmsg,{ + mt => 'Account requests in the following domain: "[_1]" have been reviewed.', + args => ["\n$contextdesc"], }); if (ref($textstr) eq 'ARRAY') { push(@rawmsg,@{$textstr}); } } 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.', - args => ["\n$coursedesc\n","$timestamp\n"], + mt => $msgtxt, + args => ["\n ".$contextdesc.",\n",$timestamp.",\n"], }); if (ref($textstr) eq 'ARRAY') { 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.', - args => ["\n$coursedesc\n","$timestamp\n"], + 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') { + 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].', - args => ["\n$coursedesc\n",$textstr,$timestamp], + mt => $msgtxt, + args => ["\n $contextdesc\n",$textstr,$timestamp], }, { - mt =>'As Domain Coordinator, use: [_1]Main Menu -> Create a new course -> Manage Course Requests[_1] to display a list of pending course requests,[_1] which you can either approve or reject.', - args => ["\n"], + 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].', - args => ["\n$coursedesc\n",$textstr,$timestamp], + mt => $msgtxt, + args => ["\n $contextdesc\n",$textstr,$timestamp."\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 { + $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 => $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 =>'As Course Coordinator, use: [_1]Main Menu -> Manage Course Users -> Enrollment Requests[_1] to display a list of pending enrollment requests,[_1] which you can either approve or reject.', - args => ["\n"], + mt =>'[_1]As Domain Coordinator, use: [_2]Main Menu -> Create users or modify the roles and privileges of users -> Authoring Space 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 '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}); + } + } elsif ($context eq 'usernamereq') { + $rawsubj = 'LON-CAPA account request'; + $msgtxt = 'Creation of a LON-CAPA account 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 + -> LON-CAPA account 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 'requestusername') { + $rawsubj = 'LON-CAPA account request'; + $msgtxt = 'Your request for a LON-CAPA account 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}); + } + } elsif ($context eq 'uniquecode') { + $rawsubj = 'Course Identifier'; + if (ref($textstr) eq 'ARRAY') { + push(@rawmsg,@{$textstr}); + } + } elsif ($context eq 'queuedcrsreq') { + $rawsubj = 'Course Request Queued'; + if (ref($textstr) eq 'ARRAY') { + push(@rawmsg,@{$textstr}); + } + } elsif ($context eq 'createdcrsreq') { + $rawsubj = 'Course Creation Information'; + if (ref($textstr) eq 'ARRAY') { + push(@rawmsg,@{$textstr}); + } } my @to_notify = split(/,/,$notifylist); my $numsent = 0; @@ -146,10 +287,15 @@ sub send_selfserve_notification { my %reciphash = ( cc => $msgcc, ); - my ($uname,$udom); + my ($uname,$udom,$need_temp_env); if ($sender =~ /:/) { ($uname,$udom) = split(/:/,$sender); - } else { + if ($context eq 'usernamereq') { + unless ($env{'user.name'} && $env{'user.domain'}) { + $need_temp_env = 1; + } + } + } elsif ($context eq 'course') { $uname = $sender; my %courseinfo = &Apache::lonnet::coursedescription($cid); $udom = $courseinfo{'num'}; @@ -165,9 +311,14 @@ 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; + if ($need_temp_env) { + $env{'user.name'} = $uname; + $env{'user.domain'} = $udom; + } foreach my $recip (sort(keys(%{$msgcc}))) { my ($ccname,$ccdom) = split(/:/,$recip); my $recip_lh = &Apache::loncommon::user_lang($ccname,$ccdom,$cid); @@ -179,7 +330,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; } @@ -193,179 +344,430 @@ 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; + } + } elsif ($context eq 'usernamemanagers') { + if ($approvedlist) { + $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Approved LON-CAPA account requests:')."\n".$approvedlist; + } + if ($rejectedlist) { + $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Rejected LON-CAPA account requests:')."\n".$rejectedlist; + } } - $status .= &Apache::lonmsg::user_normal_msg($ccname,$ccdom,$subject,$message,undef,undef,undef,1,\%sentmessage,undef,undef,undef,1,$recipid).','; + $status .= &Apache::lonmsg::user_normal_msg($ccname,$ccdom,$subject,$message,undef,undef,undef,1, + \%sentmessage,undef,undef,undef,1,$recipid).','; } $status =~ s/,$//; + if ($need_temp_env) { + undef($env{'user.name'}); + undef($env{'user.domain'}); + } return ($recipstatus,$status); } sub display_queued_requests { my ($context,$dom,$cnum) = @_; - my ($namespace,$formaction,%requesthash); + my ($namespace,$formaction,$nextelement,%requesthash); if ($context eq 'course') { $formaction = '/adm/createuser'; $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 = ''; + } elsif ($context eq 'requestusername') { + $formaction = '/adm/createuser'; + $namespace = 'usernamequeue'; + %requesthash = &Apache::lonnet::dump_dom($namespace,$dom); + $nextelement = ''; } else { $formaction = '/adm/createcourse'; $namespace = 'courserequestqueue'; - %requesthash = &Apache::lonnet::dump_dom($namespace,$dom,undef,'_approval'); + 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 = '
'. - ''. - ''. - &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(); + $output = ''."\n". + ''."\n". + $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$/); + } elsif ($context eq 'requestusername') { + $timestamp = $requesthash{$item}; + ($entry) = (&unescape($item) =~ /^($match_username)_approval$/); } else { $timestamp = $requesthash{$item}{'timestamp'}; if (ref($requesthash{$item}) eq 'HASH') { - $entry = $item.':'.$requesthash{$item}{'ownername'}.':'. - $requesthash{$item}{'ownerdom'}.':'. - $requesthash{$item}{'crstype'}.':'. - $requesthash{$item}{'description'}; + my ($cnum,$disposition) = split('_',$item); + $entry = $cnum.':'.$requesthash{$item}{'ownername'}.':'. + $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); - } - } else { - @{$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]; } } } - 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').'

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

'.&mt('Requests for LON-CAPA accounts 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 'requestusername') { + $output .= &mt('There are currently no requests for LON-CAPA accounts 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.'); + } elsif ($context eq 'requestauthor') { + $output .= &mt('There are currently no requests for Authoring Space awaiting approval.'); + } elsif ($context eq 'requestusername') { + $output .= &mt('There are currently no requests for LON-CAPA accounts awaiting approval.'); + } 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 'requestusername') { + $output .= ''.&mt('Date requested').''. + ''.&mt('Details').''; + } 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', + textbook => 'Textbook course', + placement => 'Placement test', + ); + $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); + } + } elsif ($context eq 'requestusername') { + if (&Apache::lonnet::homeserver($request,$dom) eq 'no_host') { + my $queued = 'approval'; + $approve = $count.':'.$request; + $reject = $request; + $detailslink=''.$request.''; + $namelink = $request; + } + } else { + my ($cnum,$ownername,$ownerdom,$type,$cdesc); + my $queued = 'approval'; + if ($context eq 'pending' || $context eq 'stillpending') { + ($cnum,$ownername,$ownerdom,$instcode,$cdesc)=split(/:/,$request,5); + $queued = 'pending'; } else { - my ($cnum,$ownername,$ownerdom,$type,$cdesc)=split(/:/,$request); - $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"; + } elsif ($context eq 'requestusername') { + $row .= ''.$showtime.''."\n". + ''.$detailslink.''."\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,$coursedesc,$cid,$hostname, - $protocol,$now,$sender,$approvedmsg,$rejectedmsg,$beneficiary, - @existing,@missingreq,@invalidusers,@limitexceeded,@enrolled,@created, - @enrollerrors,@create_errors,@warn_approves,@warn_rejects,@approvals, - @rejections); - @approvals = &Apache::loncommon::get_env_multiple('form.approvereq'); - @rejections = &Apache::loncommon::get_env_multiple('form.rejectreq'); + $stucounts,$idx,$classlist,%requesthash,$cid,$domdesc,$now, + $sender,$approvedmsg,$rejectedmsg,$beneficiary, + @existing,@missingreq,@invalidusers,@limitexceeded,@completed, + @processing_errors,@warn_approves,@warn_rejects,@approvals,@warn_dels, + @rejections,@rejectionerrors,@nopermissions,%courseroles,@toremove, + %communityroles,%domdefs,%approvalmsg,%rejectionmsg,$crstype,$queue, + $firsturl,$uniquecode,%codes); + my $count=0; + while (my $item = $env{'form.'.$count.'radioreq'}) { + if ($item =~ /^\d+:/) { + push(@approvals,$item); + } elsif ($item !~ /^later:/) { + push(@rejections,$item); + } + $count ++; + } + $now = time; $sender = $env{'user.name'}.':'.$env{'user.domain'}; if ($context eq 'course') { $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 = &Apache::lonnet::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'}; $limit = $env{'course.'.$cid.'.internal.selfenroll_limit'}; $cap = $env{'course.'.$cid.'.internal.selfenroll_cap'}; $notifylist = $env{'course.'.$cid.'.internal.selfenroll_notifylist'}; - $namespace = 'selfenrollrequests'; ($stucounts,$idx,$classlist) = &get_student_counts($cdom,$cnum); $approvedmsg = [{ 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 = &Apache::lonnet::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); + } elsif ($context eq 'requestusername') { + $namespace = 'usernamequeue'; + $beneficiary = 'requestusername'; + %requesthash = &Apache::lonnet::dump_dom($namespace,$cdom); + my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$cdom); + if (ref($domconfig{'usercreation'}) eq 'HASH') { + if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') { + if (ref($domconfig{'usercreation'}{'cancreate'}{'notify'}) eq 'HASH') { + $notifylist = $domconfig{'usercreation'}{'cancreate'}{'notify'}{'approval'}; + } + } + } + my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom); + $firsturl = &Apache::lonnet::course_portal_url($domconfiguser,$cdom); + $approvedmsg = [{ + mt => 'Your request for a LON-CAPA account has been approved.', + }, + { + mt => 'Visit [_1] to log-in.', + args => [$firsturl], + }]; + $rejectedmsg = [{ + mt => 'Your request for a LON-CAPA account has not been approved.', + }]; + $domdesc = &Apache::lonnet::domain($cdom); } else { - $beneficiary = 'requestor'; + $domdesc = &Apache::lonnet::domain($cdom); + $namespace = 'courserequestqueue'; + $beneficiary = 'courserequestor'; + $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') { + $notifylist = $domconfig{'requestcourses'}{'notify'}{'approval'}; + } + } + $approvalmsg{'course'} = + [{ + mt => 'Your course request has been approved.', + }, + { + mt => 'Visit [_1] to log-in and access the course', + args => [], + }]; + $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 => [], + }]; + + $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) { + $courseroles{$role}=&Apache::lonnet::plaintext($role,'Course'); + } + foreach my $role (@roles) { + $communityroles{$role}=&Apache::lonnet::plaintext($role,'Community'); + } } foreach my $item (sort {$a <=> $b} @approvals) { if ($context eq 'course') { @@ -373,7 +775,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') || @@ -402,64 +803,410 @@ sub update_request_queue { my $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$usec,$access_end,$access_start,'selfenroll',undef,$cdom.'_'.$cnum,1); if ($result eq 'ok') { - push(@enrolled,$uname.':'.$udom); + push(@completed,$uname.':'.$udom); $stucounts->{'allstudents'} ++; $stucounts->{'selfenrolled'} ++; &send_selfserve_notification($uname.':'.$udom,$approvedmsg, - $cid,$coursedesc,$now,$beneficiary,$sender); - my %userrequest; - if ($context eq 'course') { - %userrequest = ( - $cdom.'_'.$cnum => { - timestamp => $now, - section => $usec, - adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, - status => 'approved', - } - ); - } else { - %userrequest = (); - } + $cid,$coursedesc,$now,$beneficiary,$sender, + undef,undef,$crstype); + my %userrequest = ( + $cdom.'_'.$cnum => { + timestamp => $now, + section => $usec, + adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, + status => 'approved', + } + ); my $userresult = &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname); if ($userresult ne 'ok') { push(@warn_approves,$uname.':'.$udom); } } else { - push(@enrollerrors,$uname.':'.$udom); + push(@processing_errors,$uname.':'.$udom); } } } 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); + &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,$uname.':'.$cdom); + } + } else { + push(@processing_errors,$uname); + } + } else { + push(@nopermissions,$uname); + } + } else { + push(@nopermissions,$uname); + } + } else { + push(@invalidusers,$uname.':'.$cdom); + } + push(@toremove,(@invalidusers,@nopermissions)); + } elsif ($context eq 'requestusername') { + my ($num,$uname) = split(/:/,$item); + my $dbname = 'nohist_requestedusernames'; + my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom); + my %curr = &Apache::lonnet::get($dbname,[$uname],$cdom,$domconfiguser); + + if (ref($curr{$uname}) eq 'HASH') { + my ($username,$logtoken,$serverid,$encpass,$courseid,$id,$firstname, + $middlename,$lastname,$generation,$inststatus); + $curr{$uname}{'timestamp'} = $now; + $curr{$uname}{'adjudicator'} = $env{'user.name'}.':'.$env{'user.domain'}; + $courseid = $curr{$uname}{'courseid'}; + $id = $curr{$uname}{'id'}; + $firstname = $curr{$uname}{'firstname'}; + $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') { + my $upass = &Apache::loncommon::des_decrypt($key,$curr{$uname}{'upass'}); + undef($curr{$uname}{'upass'}); + my $result = + &Apache::lonnet::modifyuser($cdom,$uname,$id,'internal',$upass, + $firstname,$middlename,$lastname, + $generation,undef,undef,$uname); + if ($result eq 'ok') { + $curr{$uname}{'status'} = 'created'; + push(@completed,$uname); + my $uhome = &Apache::lonnet::homeserver($uname,$cdom); + 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); + if (&Apache::lonnet::put($dbname,\%curr,$cdom,$domconfiguser) ne 'ok') { + push(@warn_approves,$uname); + } + } + } else { + push(@processing_errors,$uname); + } + } else { + push(@processing_errors,$uname); + } + } else { + push(@invalidusers,$uname); + } + push(@toremove,@invalidusers); } else { - + my ($num,$cnum) = split(':',$item); + if (ref($requesthash{$cnum.'_'.$queue}) eq 'HASH') { + if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') { + 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; + } + 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 $queue)) { + my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,$code,%customitems); + my $fullname = ''; + my $inprocess = &Apache::lonnet::auto_crsreq_update($cdom,$cnum,$crstype,'process',$ownername, + $ownerdom,$fullname,$coursedesc); + if (ref($inprocess) eq 'HASH') { + foreach my $key (keys(%{$inprocess})) { + if (exists($history{'details'}{$key})) { + $customitems{$key} = $history{'details'}{$key}; + } + } + } + if ($history{'details'}{'clonecrs'}) { + $customitems{'_LC_clonefrom'} = $history{'details'}{'clonedom'}.'_'.$history{'details'}{'clonecrs'}; + } + my ($result,$postprocess) = &course_creation($cdom,$cnum,$context,$history{'details'},\$logmsg, + \$newusermsg,\$addresult,\$enrollcount, + \$response,\$keysmsg,\%domdefs,$longroles,\$code,\%customitems); + if ($result eq 'created') { + if ($crstype eq 'community') { + $approvedmsg = $approvalmsg{'community'}; + } else { + $approvedmsg = $approvalmsg{'course'}; + } + my $firsturl = &Apache::lonnet::course_portal_url($cnum,$cdom); + if (ref($approvedmsg) eq 'ARRAY') { + if (ref($approvedmsg->[1]) eq 'HASH') { + $approvedmsg->[1]->{'args'} = [$firsturl]; + } + if ($code) { + push(@{$approvedmsg}, + { + mt => 'Students can automatically select your course by entering this code: [_1]', + args => [$code], + }); + $codes{$cnum} = $code; + } + if (ref($postprocess) eq 'HASH') { + if (ref($postprocess->{'createdmsg'}) eq 'ARRAY') { + foreach my $item (@{$postprocess->{'createdmsg'}}) { + if (ref($item) eq 'HASH') { + if ($item->{'mt'} ne '') { + push(@{$approvedmsg},$item); + } + } + } + } + } + } + push(@completed,$cnum); + + 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'}, + details => $history{'details'}, + disposition => $history{'disposition'}, + status => 'created', + adjudicator => $env{'user.name'}.':'. + $env{'user.domain'}, + ); + my $userresult = + &Apache::lonnet::store_userdata(\%reqhash,$requestkey, + 'courserequests',$ownerdom,$ownername); + if ($userresult eq 'ok') { + my %status = ( + 'status:'.$cdom.':'.$cnum => 'created' + ); + my $statusresult = + &Apache::lonnet::put('courserequests',\%status, + $ownerdom,$ownername); + if ($statusresult ne 'ok') { + push(@warn_approves,$cnum); + } + } + if ($userresult ne 'ok') { + push(@warn_approves,$cnum); + } + } else { + push(@processing_errors,$cnum); + } + } else { + push(@processing_errors,$cnum); + } + } else { + push(@nopermissions,$cnum); + } + } else { + push(@existing,$cnum); + } + } else { + push(@missingreq,$cnum); + } } } - my @changes = (@enrolled,@rejections); + my @changes = (@completed,@rejections); + if ($context eq 'domain') { + @changes = map {$_.'_'.$queue} (@changes); + } elsif ($context eq 'requestauthor') { + @changes = map {$_.'_approval'} (@changes); + } elsif ($context eq 'requestusername') { + @changes = map {&escape($_).'_approval'} (@changes); + } if (@rejections) { - foreach my $user (@rejections) { - &send_selfserve_notification($user,$rejectedmsg,$cid,$coursedesc, - $now,$beneficiary,$sender); - if ($context eq 'course') { - my ($uname,$udom) = split(/:/,$user); - my %userrequest = ( - $cdom.'_'.$cnum => { + foreach my $item (@rejections) { + if (($context eq 'course') || ($context eq 'requestauthor')) { + my ($user,$uname,$udom,%userrequest,$key,$dbname); + if ($context eq 'requestauthor') { + $uname = $item; + $udom = $cdom; + $user = $uname.':'.$udom; + $key = 'author'; + $dbname = 'requestauthor'; + } else { + $user = $item; + ($uname,$udom) = split(/:/,$user); + $key = $cdom.'_'.$cnum; + $dbname = $namespace; + } + &send_selfserve_notification($user,$rejectedmsg,$cid,$coursedesc, + $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($dbname,\%userrequest,$udom,$uname); + if ($userresult ne 'ok') { + push(@warn_rejects,$item); + } + } elsif ($context eq 'requestusername') { + my ($uname,$udom,$dbname); + $uname = $item; + $udom = $cdom; + $dbname = 'nohist_requestedusernames'; + my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom); + my %curr = &Apache::lonnet::get($dbname,[$uname],$cdom,$domconfiguser); + if (ref($curr{$uname}) eq 'HASH') { + $curr{$uname}{'status'} = 'rejected'; + $curr{$uname}{'timestamp'} = $now; + $curr{$uname}{'adjudicator'} = $env{'user.name'}.':'.$env{'user.domain'}; + undef($curr{$uname}{'tmpinfo'}); + undef($curr{$uname}{'upass'}); + } my $userresult = - &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname); + &Apache::lonnet::put($dbname,\%curr,$cdom,$domconfiguser); if ($userresult ne 'ok') { - push(@warn_rejects,$user); + push(@warn_rejects,$uname); } } else { - + my $cnum = $item; + if (ref($requesthash{$cnum.'_'.$queue}) eq 'HASH') { + if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') { + my $requestkey = $cdom.'_'.$cnum; + 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,undef,undef,$crstype); + my %history = + &Apache::lonnet::restore($requestkey,'courserequests', + $ownerdom,$ownername); + if ((ref($history{'details'}) eq 'HASH') && + ($history{'disposition'} eq $queue)) { + my %reqhash = ( + reqtime => $history{'reqtime'}, + crstype => $history{'crstype'}, + details => $history{'details'}, + disposition => $history{'disposition'}, + status => 'rejected', + adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, + ); + my $userresult = + &Apache::lonnet::store_userdata(\%reqhash,$requestkey, + 'courserequests',$ownerdom,$ownername); + if ($userresult eq 'ok') { + my %status = ( + 'status:'.$cdom.':'.$cnum => 'rejected' + ); + my $statusresult = + &Apache::lonnet::put('courserequests',\%status, + $ownerdom,$ownername); + if ($statusresult ne 'ok') { + push(@warn_rejects,$cnum); + } + } 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); + } + } else { + push(@existing,$cnum); + } + } else { + push(@rejectionerrors,$cnum); + } } } } + if (@toremove) { + my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom); + foreach my $item (@toremove) { + if ($context eq 'requestauthor') { + my %userrequest = ( + author => { + timestamp => $now, + adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, + status => 'deleted', + }, + author_status => 'deleted', + ); + &Apache::lonnet::put('requestauthor',\%userrequest,$cdom,$item); + } elsif ($context eq 'requestusername') { + my $dbname = 'nohist_requestedusernames'; + my %curr = &Apache::lonnet::get($dbname,[$item],$cdom,$domconfiguser); + if (ref($curr{$item}) eq 'HASH') { + $curr{$item}{'status'} = 'deleted'; + $curr{$item}{'timestamp'} = $now; + $curr{$item}{'adjudicator'} = $env{'user.name'}.':'.$env{'user.domain'}; + undef($curr{$item}{'upass'}); + undef($curr{$item}{'tmpinfo'}); + } + } + } + @toremove = map {$_.'_approval'} (@toremove); + my $delresult = &Apache::lonnet::del_dom($namespace,\@toremove,$cdom); + } if (@changes) { my $delresult; if ($context eq 'course') { @@ -473,10 +1220,14 @@ sub update_request_queue { my ($chgmsg,$approvedlist,$rejectedlist); if ($context eq 'course') { $chgmsg = "'Action was taken on the following enrollment requests by [_1].',$namelink"; - if (@enrolled) { - $approvedlist = join("\n",@enrolled); - $output .= '

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

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

'.&mt('The following requests were ignored because the request is no longer in the queue:').'

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

'.&mt('The following course/community creation requests were ignored because the request is no longer in the queue:').'

'; } } if (@invalidusers) { @@ -528,8 +1407,14 @@ sub update_request_queue { $output .= '
  • '.$user.'
    • '; } $output .= '

    '; - } else { - + } 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) { @@ -539,41 +1424,142 @@ sub update_request_queue { $output .= '
  • '.$user.'
    • '; } $output .= '

    '; - } else { - } } - if (@enrollerrors) { + if (@nopermissions) { + if ($context eq 'course') { + $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:').'

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

    '.&mt('The following requests could not be processed because the requestor does not have rights to request an Authoring Space:').'

    '; + } + } + if (@processing_errors) { if ($context eq 'course') { $output .= '

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

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

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

    '; + } elsif ($context eq 'requestusername') { + $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:').'

    '; + } + } + if (@rejectionerrors) { + $output .= '

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

    '; } - if (@warn_approves) { + if (@warn_approves || @warn_rejects) { if ($context eq 'course') { $output .= '

    '.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'

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

    '.&mt("For the following users, an error occurred when updating the user's own author request record:").'

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

    '.&mt("For the following users, an error occurred when updating the account request record for the user:").'

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

    '.&mt("For the following course/community requests an error occurred when updating the requestor's own requests record:").'

    '; } } - if (@warn_rejects) { - if ($context eq 'course') { - $output .= '

    '.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'