--- loncom/interface/loncoursequeueadmin.pm 2010/12/05 21:57:33 1.12.2.10 +++ loncom/interface/loncoursequeueadmin.pm 2023/08/19 23:32:13 1.69 @@ -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.10 2010/12/05 21:57:33 raeburn Exp $ +# $Id: loncoursequeueadmin.pm,v 1.69 2023/08/19 23:32:13 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,6 +27,8 @@ # ### +=pod + =head1 NAME Apache::loncoursequeueadmin.pm @@ -35,7 +37,7 @@ Apache::loncoursequeueadmin.pm 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. +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. @@ -48,6 +50,8 @@ described at http://www.lon-capa.org. =item display_queued_requests() +=item build_queue_display() + =item update_request_queue() =item get_student_counts() @@ -55,11 +59,25 @@ described at http://www.lon-capa.org. =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 @@ -72,7 +90,8 @@ use Apache::loncommon; use Apache::lonmsg; use Apache::lonlocal; use Apache::lonuserutils; -use LONCAPA; +use LONCAPA::batchcreatecourse; +use LONCAPA qw(:DEFAULT :match); sub send_selfserve_notification { my ($notifylist,$textstr,$cid,$contextdesc,$timestamp,$context,$sender, @@ -80,19 +99,37 @@ 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\n"], }); } 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"], + args => ["\n$contextdesc\n"], + }); + 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\n"], + }); + 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\n"], }); if (ref($textstr) eq 'ARRAY') { push(@rawmsg,@{$textstr}); @@ -107,7 +144,6 @@ sub send_selfserve_notification { push(@rawmsg,{ mt => $msgtxt, args => ["\n ".$contextdesc.",\n",$timestamp.",\n"], - }); if (ref($textstr) eq 'ARRAY') { push(@rawmsg,@{$textstr}); @@ -128,6 +164,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'; @@ -142,14 +187,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, @@ -166,7 +211,110 @@ 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 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}); + } + } elsif ($context eq 'othdomroleuser') { + my $linktext = 'Roles'; + if ($notifylist =~ /^($match_username):($match_domain)$/) { + if (&Apache::loncommon::show_course($2,$1)) { + $linktext = 'Courses'; + } + } + $rawsubj = 'Role Assignment Approval'; + push(@rawmsg,{ + mt => 'A domain different to your own LON-CAPA domain [_1]wants to assign you a role in their domain.', + args => ["\n$contextdesc\n"], + }, + { + mt =>"[_1]Click $linktext at top right, then click 'Show pending' in the gray Functions bar ". + "to display a list of pending role assignments in other domain(s), which you can either accept or reject.", + args => ["\n\n"], + }); + } elsif ($context eq 'othdomroledc') { + $rawsubj = 'Role Assignment Authorization'; + push(@rawmsg,{ + mt => 'Another LON-CAPA domain wants to assign a role in their domain to a user from your domain.', + args => [], + }, + { + mt =>'[_1]As Domain Coordinator, use: [_2]Main Menu -> Create users or modify the roles and privileges of users + -> Queued Role Assignments (this domain) [_3]to display a list of pending requests, which you can either approve or reject.', + args => ["\n","\n\n ","\n\n"], + }); + } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + $rawsubj = 'Status of Role Assignment Requests'; + if ($context eq 'othdombydc') { + push(@rawmsg,{ + mt =>'A Domain Coordinator in a domain different to your own LON-CAPA domain '. + 'has taken action on queued role assignment(s) in this domain for user(s) from that other domain [_1]', + args => ["\n$contextdesc\n"], + }); + } elsif ($context eq 'othdombyuser') { + push(@rawmsg,{ + mt => "Action has been taken by a user to whom you had assigned role(s) ". + "which had been queued, pending acceptance of the role(s).", + args => [], + }); + } + if (ref($textstr) eq 'ARRAY') { + push(@rawmsg,@{$textstr}); + } } my @to_notify = split(/,/,$notifylist); my $numsent = 0; @@ -184,9 +332,14 @@ sub send_selfserve_notification { my %reciphash = ( cc => $msgcc, ); - my ($uname,$udom); + my ($uname,$udom,$need_temp_env); if ($sender =~ /:/) { ($uname,$udom) = split(/:/,$sender); + 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); @@ -196,189 +349,849 @@ sub send_selfserve_notification { my $stamp = time; my $msgcount = &Apache::lonmsg::get_uniq(); my $sender_lh = &Apache::loncommon::user_lang($uname,$udom,$cid); - $subject = &Apache::lonlocal::mt_user($sender_lh,$rawsubj); + $subject = &mt_user($sender_lh,$rawsubj); $message = ''; foreach my $item (@rawmsg) { if (ref($item) eq 'HASH') { - $message .= &Apache::lonlocal::mt_user($sender_lh,$item->{mt},@{$item->{args}})."\n"; + if (ref($item->{args}) eq 'ARRAY') { + $message .= &mt_user($sender_lh,$item->{mt},@{$item->{args}})."\n"; + } else { + $message .= &mt_user($sender_lh,$item->{mt})."\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); - my $subject = &Apache::lonlocal::mt_user($sender_lh,$rawsubj); + my $subject = &mt_user($sender_lh,$rawsubj); my $message = ''; foreach my $item (@rawmsg) { if (ref($item) eq 'HASH') { - $message .= &Apache::lonlocal::mt_user($sender_lh,$item->{mt}, - @{$item->{args}})."\n"; + $message .= &mt_user($sender_lh,$item->{mt}, + @{$item->{args}})."\n"; } } if ($context eq 'coursemanagers') { if ($approvedlist) { - $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Approved enrollments:')."\n".$approvedlist; + $message .= "\n\n".&mt_user($sender_lh,'Approved enrollments:')."\n".$approvedlist; } if ($rejectedlist) { - $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Rejected enrollments:')."\n".$rejectedlist; + $message .= "\n\n".&mt_user($sender_lh,'Rejected enrollments:')."\n".$rejectedlist; } } elsif ($context eq 'domainmanagers') { if ($approvedlist) { - $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Approved course requests:')."\n".$approvedlist; + $message .= "\n\n".&mt_user($sender_lh,'Approved course requests:')."\n".$approvedlist; + } + if ($rejectedlist) { + $message .= "\n\n".&mt_user($sender_lh,'Rejected course requests:')."\n".$rejectedlist; + } + } elsif ($context eq 'authormanagers') { + if ($approvedlist) { + $message .= "\n\n".&mt_user($sender_lh,'Approved author role requests:')."\n".$approvedlist; } if ($rejectedlist) { - $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Rejected course requests:')."\n".$rejectedlist; + $message .= "\n\n".&mt_user($sender_lh,'Rejected author role requests:')."\n".$rejectedlist; + } + } elsif ($context eq 'usernamemanagers') { + if ($approvedlist) { + $message .= "\n\n".&mt_user($sender_lh,'Approved LON-CAPA account requests:')."\n".$approvedlist; + } + if ($rejectedlist) { + $message .= "\n\n".&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,$nextelement,%requesthash); + my ($context,$dom,$cnum,$secondary) = @_; + my ($namespace,$formaction,$nextelement,%requesthash,%reqstatus); 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 = ''; + } elsif ($context eq 'othdomqueue') { + $formaction = '/adm/createuser'; + $namespace = 'nohist_othdomqueued'; + if ($secondary eq 'domain') { + %requesthash = &Apache::lonnet::dump_dom($namespace,$dom); + foreach my $key (keys(%requesthash)) { + delete($requesthash{$key}) if ($key =~ /:(ca|aa)$/); + } + } elsif ($secondary eq 'author') { + %requesthash = &Apache::lonnet::dump($namespace,$dom,$cnum); + if ($cnum eq &Apache::lonnet::get_domainconfiguser($dom)) { + foreach my $key (keys(%requesthash)) { + delete($requesthash{$key}) if ($key !~ /:(ca|aa)$/); + } + } + } else { + %requesthash = &Apache::lonnet::dump($namespace,$dom,$cnum); + } + } elsif ($context eq 'othdomaction') { + $namespace = 'nohist_queuedrolereqs'; + if ($secondary eq 'domain') { + $formaction = '/adm/createuser'; + my $confname = &Apache::lonnet::get_domainconfiguser($dom); + %requesthash = &Apache::lonnet::dump($namespace,$dom,$confname); + } else { + $formaction = '/adm/roles'; + %requesthash = &Apache::lonnet::dump($namespace,$dom,$cnum); + } + $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'; + } elsif ($context eq 'displaypending') { + $disposition = 'pending'; + } + %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(); 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$/); + } elsif ($context eq 'othdomqueue') { + if (ref($requesthash{$item}) eq 'HASH') { + my ($puname,$pudom,$prole,$psec) = split(/:/,$item); + $timestamp = $requesthash{$item}{'timestamp'}; + my $adj = $requesthash{$item}{'adj'}; + $entry = join(':',$puname,$pudom,$prole,$adj, + &escape($requesthash{$item}{'requester'}), + $psec); + } elsif ($item =~ /^status&/) { + my ($dummy,$key) = split(/&/,$item,2); + $reqstatus{$key} = $requesthash{$item}; + } + } elsif ($context eq 'othdomaction') { + next unless ($item =~ /^pending:/); + if (ref($requesthash{$item}) eq 'HASH') { + $timestamp = $requesthash{$item}{'timestamp'}; + $entry = &escape($item).':'.&escape($requesthash{$item}{'requester'}); + } } else { - $timestamp = $requesthash{$item}{'timestamp'}; if (ref($requesthash{$item}) eq 'HASH') { + $timestamp = $requesthash{$item}{'timestamp'}; 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') || ($context eq 'displaypending')) { + $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) { + $output = ''."\n". + ''."\n". + $nextelement."\n"; + if ($context eq 'course') { + $output .= '

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

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

'; + } elsif ($context eq 'othdomqueue') { + if ($secondary eq 'domain') { + $output .= '

'.&mt('Domain role assignments for users from another domain which were/are queued for approval').'

'; + } elsif ($secondary eq 'author') { + $output .= '

'.&mt('Co-author role assignments for users from another domain which were/are queued for approval').'

'; + } elsif ($secondary eq 'course') { + $output .= '

'.&mt('Course role assignments for users from another domain which were/are queued for approval').'

'; + } elsif ($secondary eq 'community') { + $output .= '

'.&mt('Community role assignments for users from another domain which were/are queued for approval').'

'; + } + } elsif ($context eq 'othdomaction') { + unless ($secondary eq 'user') { + $output .= '

'.&mt('Role assignments in other domains, queued pending domain coordinator approval in this domain.').'

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

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

'; + } + if ($context eq 'othdomqueue') { + $output .= &queued_role_display($secondary,\%queue_by_date,\%reqstatus); + } else { + $output .= &build_queue_display($dom,$context,\%queue_by_date,$secondary). + ''; + if ($secondary eq 'user') { + $output .= "\n".''."\n"; + } + } + 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.').'

'; + } elsif (($context ne 'helpdesk') && ($context ne 'displaypending') && ($context ne 'othdomqueue')) { + $output .= '
'; + } + $output .= '
'; + } else { + if (($context eq 'othdomaction') && ($secondary eq 'user')) { + $output .= ''; + } else { + $output .= '
'; + } + if ($context eq 'course') { + $output .= &mt('There are currently no enrollment requests awaiting approval.'); + } elsif (($context eq 'pending') || ($context eq 'displaypending')) { + $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 'othdomqueue') { + if ($secondary eq 'domain') { + $output .= &mt('There are currently no domain role assignment(s) for user(s) from another domain which were/are queued for approval'); + } elsif ($secondary eq 'author') { + $output .= &mt('There are currently no co-author role assignment(s) for user(s) from another domain which were/are queued for approval'); + } elsif ($secondary eq 'course') { + $output .= &mt('There are currently no course role assignment(s) for user(s) from another domain which were/are queued for approval'); + } elsif ($secondary eq 'community') { + $output .= &mt('There are currently no community role assignment(s) for user(s) from another domain which were/are queued for approval'); + } + } elsif ($context eq 'othdomaction') { + if ($secondary eq 'user') { + $output .= &mt('No role assignments for you in other domains currently awaiting your acceptance'); + } elsif ($secondary eq 'domain') { + $output .= &mt('No role assignments in other domains currently awaiting domain coordinator approval'); + } + } else { + $output .= &mt('There are currently no course or community requests awaiting approval.'); + } + if (($context eq 'othdomaction') && ($secondary eq 'user')) { + $output .= ''; + } else { + $output .= '
'; + } + } + return $output; +} +sub build_queue_display { + my ($dom,$context,$queue,$secondary) = @_; + return unless (ref($queue) eq 'HASH'); + my (%crstypes,%roles_by_context,$output); + $output .= &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(); + unless (($context eq 'pending') || ($context eq 'displaypending') || + ($context eq 'helpdesk')) { + $output .= ''.&mt('Action').''; + } + unless (($context eq 'othdomaction') && ($secondary eq 'user')) { + $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 'othdomaction') { + $output .= ''.&mt('Date requested').''. + ''.&mt('Role type').''. + ''.&mt('Location').''; + if ($secondary eq 'domain') { + $output .= ''.&mt('Affected User').''; + } + foreach my $type ('domain','course') { + my @possroles = &Apache::lonuserutils::roles_by_context($type); + $roles_by_context{$type} = \@possroles; + } + } elsif ($context eq 'pending' || $context eq 'displaypending' || $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,$showrole,$adjudicator, + $location,$showrequester); + $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; + } + } elsif ($context eq 'othdomaction') { + my ($status,$extent,$role,$crstype); + my ($info,$requester) = map { &unescape($_); } split(/:/,$request); + if ($secondary eq 'user') { + ($status,$extent,$role) = split(/:/,$info); + $approve = $count.':'.$extent.':'.$role; + $reject = $extent.':'.$role; + } elsif ($secondary eq 'domain') { + ($status,my $uname,$extent,$role) = split(/:/,$info); + $approve = $count.':'.$extent.':'.$role.':'.$uname.':'.$dom; + $reject = $extent.':'.$role.':'.$uname.':'.$dom; + unless (&Apache::lonnet::homeserver($uname,$dom) eq 'no_host') { + $namelink = &Apache::loncommon::plainname($uname,$dom); + unless ($namelink eq $uname.':'.$dom) { + $namelink .= ' ('.$uname.':'.$dom.')'; + } + } + } + if (($role eq 'ca') || ($role eq 'aa')) { + my ($audom,$auname) = ($extent =~ m{^/($match_domain)/($match_username)$}); + $location = &mt('Domain').': '.&Apache::lonnet::domain($audom,'description').'
'. + &mt('Author').': '.&Apache::loncommon::plainname($auname,$audom); + } elsif ($role eq 'co') { + my ($cdom,$cnum) = ($extent =~ m{^/($match_domain)/($match_courseid)}); + if (&Apache::lonnet::is_course($cdom,$cnum)) { + my %info = &Apache::lonnet::coursedescription("$cdom/$cnum",{'one_time' => 1}); + $crstype = $info{'type'}; + $location = &mt('Domain').': '.&Apache::lonnet::domain($cdom,'description').'
'. + &mt('Community').': '.$info{'description'}; + $showrole = &Apache::lonnet::plaintext($role,'Community'); + } + } elsif ($role =~ m{^cr/}) { + $showrole = &Apache::lonnet::plaintext($role,$crstype); + my ($cdom,$cnum,$csec) = ($extent =~ m{^/($match_domain)/($match_courseid)(?:|/(\w+))$}); + if (&Apache::lonnet::is_course($cdom,$cnum)) { + my %info = &Apache::lonnet::coursedescription("$cdom/$cnum",{'one_time' => 1}); + $crstype = $info{'type'}; + $location = &mt('Domain').': '.&Apache::lonnet::domain($cdom,'description').'
'. + &mt($crstype).': '.$info{'description'}; + if ($csec ne '') { + $location .= '
'.&mt('Section').': '.$csec; + } + } } else { - my ($cnum,$ownername,$ownerdom,$type,$cdesc)=split(/:/,$request,5); - $detailslink=''.$cdesc.''; + foreach my $type ('course','domain') { + if (grep(/^\Q$role\E$/,@{$roles_by_context{$type}})) { + if ($type eq 'course') { + my ($cdom,$cnum,$csec) = ($extent =~ m{^/($match_domain)/($match_courseid)(?:|/(\w+))$}); + if (&Apache::lonnet::is_course($cdom,$cnum)) { + my %info = &Apache::lonnet::coursedescription("$cdom/$cnum",{'one_time' => 1}); + $crstype = $info{'type'}; + $location = &mt('Domain').': '.&Apache::lonnet::domain($cdom,'description').'
'. + &mt($crstype).': '.$info{'description'}; + if ($csec ne '') { + $location .= '
'.&mt('Section').': '.$csec; + } + } + } else { + my ($domain) = ($extent =~ m{^/($match_domain)/$}); + $location = &mt('Domain').': '.&Apache::lonnet::domain($domain,'description'); + } + last; + } + } + } + if ($role =~ m{^cr/($match_domain)/($match_username)/(\w+)$}) { + my ($crudom,$cruname,$rolename) = ($1,$2,$3); + my $creator = &Apache::loncommon::plainname($cruname,$crudom); + unless ($creator eq $cruname.':'.$crudom) { + $creator .= ' ('.$cruname.':'.$crudom.')'; + } + $showrole = &mt('Custom role').': '.$rolename.'
'. + &mt('Created by').' '.$creator; + } else { + $showrole = &Apache::lonnet::plaintext($role,$crstype); + } + my ($requname,$requdom) = split(/:/,$requester); + $showrequester = &Apache::loncommon::plainname($requname,$requdom); + unless ($showrequester eq $requname.':'.$requdom) { + $showrequester .= ' ('.$requname.':'.$requdom.')'; + } + } else { + my ($cnum,$ownername,$ownerdom,$type,$cdesc); + my $queued = 'approval'; + if ($context eq 'pending' || $context eq 'displaypending' || $context eq 'stillpending') { + ($cnum,$ownername,$ownerdom,$instcode,$cdesc)=split(/:/,$request,5); + $queued = 'pending'; + } else { + ($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') || ($context eq 'displaypending') || + ($context eq 'helpdesk')) { $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').''. + ''. + '

'; + } + unless ($context eq 'othdomaction') { + $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"; + } elsif ($context eq 'othdomaction') { + if ($secondary eq 'domain') { + $row .= ''.$showrequester.''."\n"; + } + $row .= ''.$showtime.''."\n". + ''.$showrole.''."\n". + ''.$location.''."\n"; + if ($secondary eq 'domain') { + $row .= ''.$namelink.''."\n"; + } + } else { + if ($context eq 'pending' || $context eq 'displaypending' || $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(). - ''; + } + $output .= &Apache::loncommon::end_data_table(); + return $output; +} + +sub queued_role_display { + my ($context,$queue,$status) = @_; + return unless ((ref($queue) eq 'HASH') && (ref($status) eq 'HASH')); + my (%curr,$minshown,$maxshown,$more_records,$crstype,$viewablesec,$output); + my $formname = 'changequeue'; + if ($context eq 'course') { + $crstype = &Apache::loncommon::course_type(); + my ($permission,$allowed) = + &Apache::lonuserutils::get_permission($context,$crstype); + $viewablesec = &Apache::lonuserutils::viewable_section($permission); + my %saveable_parameters = ('show' => 'scalar',); + &Apache::loncommon::store_course_settings('roles_req', + \%saveable_parameters); + &Apache::loncommon::restore_course_settings('roles_req', + \%saveable_parameters); + } + +# Create navigation javascript + my $jsnav = &queued_log_js($formname); + + $output = (< +// + +ENDSCRIPT + + my $now = time(); + my $defstart = $now - (7*24*3600); #7 days ago + my %defaults = ( + page => '1', + show => '10', + role => 'any', + chgstatus => 'any', + chgadj => 'any', + rolereq_start_date => $defstart, + rolereq_end_date => $now, + ); + $more_records = 0; + my %lt = &othdomrole_contexts(); + + foreach my $item ('show','page','role','chgstatus','chgadj') { + $curr{$item} = $env{'form.'.$item}; + } + ($curr{'rolereq_start_date'},$curr{'rolereq_end_date'}) = + &Apache::lonuserutils::get_dates_from_form('rolereq_start_date','rolereq_end_date'); + foreach my $key (keys(%defaults)) { + if ($curr{$key} eq '') { + $curr{$key} = $defaults{$key}; + } + } + $minshown = 1; + my $count = 0; + if ($curr{'show'} =~ /\D/) { + $curr{'page'} = 1; } 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.'); + $maxshown = $curr{'page'} * $curr{'show'}; + if ($curr{'page'} > 1) { + $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'}; } } + $output .= &print_filter_menu($context,'changequeue',\%curr,$crstype); + + my $showntableheader = 0; + + # Table Header + my $tableheader = + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + ''.&mt('Date requested').''. + ''.&mt('Role').''; + if ($context eq 'course') { + $tableheader .= ''.&mt('Section').''; + } + $tableheader .= ''.&mt('Requested for').''. + ''.&mt('Request status').''. + ''.&mt('Adjudicator').''. + &Apache::loncommon::end_data_table_header_row(); + + my @sortedtimes = sort {$a <=> $b} (keys(%{$queue})); + my $count = 0; + foreach my $item (@sortedtimes) { + next if (($item < $curr{'rolereq_start_date'}) || + ($item > $curr{'rolereq_end_date'})); + if (ref($queue->{$item}) eq 'ARRAY') { + foreach my $request (sort(@{$queue->{$item}})) { + if ($curr{'show'} !~ /\D/) { + if ($count >= $curr{'page'} * $curr{'show'}) { + $more_records = 1; + last; + } + } + my ($showtime,$showsec,$namelink,$showrole,$showadj, + $showstatus,$id); + $showtime = &Apache::lonlocal::locallocaltime($item); + my ($uname,$udom,$role,$adj,$requester,$sec) = split(/:/,$request); + $id = join(':',($uname,$udom,$role)); + if ($context eq 'course') { + $id .= ':'.$sec; + } + if ($curr{'role'} ne 'any') { + if ($curr{'role'} eq 'cr') { + next unless ($role =~ m{^cr/}); + } else { + next unless ($role eq $curr{'role'}); + } + } + if ($curr{'chgstatus'} ne 'any') { + next if ($status->{$id} ne $curr{'chgstatus'}); + } + if ($curr{'chgadj'} ne 'any') { + next if ($adj ne $curr{'chgadj'}); + } + if (($context eq 'course') && ($viewablesec ne '')) { + next if ($sec ne $viewablesec); + } + $count ++; + next if ($count < $minshown); + unless ($showntableheader) { + $output .= $tableheader; + $showntableheader = 1; + } + $showrole = &Apache::lonnet::plaintext($role,$crstype); + $showstatus = $lt{$status->{$id}}; + $showadj = $lt{$adj}; + unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') { + $namelink = &Apache::loncommon::plainname($uname,$udom)." ($uname:$udom)"; + } + if ($context eq 'course') { + $showsec = $sec; + if ($showsec eq '') { + $showsec = &mt('none'); + } + } + $output .= &Apache::loncommon::start_data_table_row()."\n". + ''.$showtime.''."\n". + ''.$showrole.''."\n"; + if ($context eq 'course') { + $output .= ''.$showsec.''."\n"; + } + $output .= ''.$namelink.''."\n". + ''.$showstatus.''."\n". + ''.$showadj.''."\n". + &Apache::loncommon::end_data_table_row()."\n"; + } + } + } + + if ($showntableheader) { # Table footer, if content displayed above + $output .= &Apache::loncommon::end_data_table(). + &queued_role_navlinks(\%curr,$more_records); + } else { # No content displayed above + $output .= '

'. + &mt('There are no records to display.'). + '

'; + } + $output .= ''; + return $output; +} + +sub queued_log_js { + my ($formname) = @_; + return <<"ENDSCRIPT"; + +function chgPage(caller) { + if (caller == 'previous') { + document.$formname.page.value --; + } + if (caller == 'next') { + document.$formname.page.value ++; + } + document.$formname.submit(); + return; +} +ENDSCRIPT +} + +sub queued_role_navlinks { + my ($curr,$more_records) = @_; + return unless(ref($curr) eq 'HASH'); + # Navigation Buttons + my $nav_links; + if (($curr->{'page'} > 1) || ($more_records)) { + $nav_links = '

'; + if (($curr->{'page'} > 1) && ($curr->{'show'} !~ /\D/)) { + $nav_links .= ' '; + } + if ($more_records) { + $nav_links .= ''; + } + $nav_links .= '

'; + } + return $nav_links; +} + +sub print_filter_menu { + my ($context,$formname,$curr,$crstype) = @_; + + my $nolink = 1; + my $output = ''; + my $startform = + &Apache::lonhtmlcommon::date_setter($formname,'rolereq_start_date', + $curr->{'rolereq_start_date'},undef, + undef,undef,undef,undef,undef,undef,$nolink); + my $endform = + &Apache::lonhtmlcommon::date_setter($formname,'rolereq_end_date', + $curr->{'rolereq_end_date'},undef, + undef,undef,undef,undef,undef,undef,$nolink); + my %lt = &othdomrole_contexts(); + $output .= ''. + ''. + ''. + ''. + ''. + ''. + '' + .'
'. + ''.&mt('Changes/page:').'
'. + &Apache::lonmeta::selectbox('show',$curr->{'show'},'',undef, + (&mt('all'),5,10,20,50,100,1000,10000)). + '
  '.&mt('Time window in which role was requested').':
'. + ''. + ''. + '
'.&mt('After:'). + ''.$startform.'
'.&mt('Before:').''.$endform.'
'. + '
  '.&mt('Requested role').':
'. + '
  '. + &mt('Request status').':
'. + '
  '. + &mt('Adjudicator').':
'. + '
'; + + # Update Display button + $output .= '

'. + ''. + '

'. + '
'; return $output; } +sub othdomrole_contexts { + my %lt = &Apache::lonlocal::texthash( + pending => 'Queued', + approved => 'Approved', + rejected => 'Rejected', + user => 'User who acquires role', + ); + $lt{'domain'} = &mt("[_1] in user's domain", + &Apache::lonnet::plaintext('dc')); + return %lt; +} + 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,$uniquecode,%codes,%roles_by_context,%requesteractive, + %gotroles,$confname,%requestedby,@rejectedreqs,$dbname); + 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') { @@ -386,10 +1199,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 = &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'}; @@ -401,21 +1211,84 @@ 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 = &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); + $dbname = 'nohist_requestedusernames'; + } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + $namespace = 'nohist_queuedrolereqs'; + foreach my $type ('domain','course') { + my @possroles = &Apache::lonuserutils::roles_by_context($type); + $roles_by_context{$type} = \@possroles; + } + if ($context eq 'othdombydc') { + $confname = &Apache::lonnet::get_domainconfiguser($cdom); + %requesthash = &Apache::lonnet::dump($namespace,$cdom,$confname); + } elsif ($context eq 'othdombyuser') { + %requesthash = &Apache::lonnet::dump($namespace); + } + $domdesc = &Apache::lonnet::domain($cdom); + $dbname = 'nohist_othdomqueued'; } 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') { @@ -427,8 +1300,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'} = [{ @@ -440,8 +1313,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'} = @@ -457,32 +1330,13 @@ sub update_request_queue { foreach my $role (@roles) { $communityroles{$role}=&Apache::lonnet::plaintext($role,'Community'); } - } - my %allnums = &Apache::loncommon::get_faculty_cnums(); foreach my $item (sort {$a <=> $b} @approvals) { if ($context eq 'course') { my ($num,$uname,$udom,$usec) = split(/:/,$item); my $uhome = &Apache::lonnet::homeserver($uname,$udom); if ($uhome ne 'no_host') { if (exists($requesthash{$uname.':'.$udom})) { - if ($cdom ne '' && ref($allnums{$cdom} eq 'HASH') { - my ($addothers,@others); - foreach my $key (%{$allnums{$cdom}}) { - if ($key eq $cnum) { - $addothers = 1; - } else { - push(@others,$key); - } - } - if ($addothers) { - foreach my $crs (@others) { - my $enresult = - &enable_additional_roles($cdom,$crs,$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') || @@ -515,7 +1369,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, @@ -528,15 +1383,6 @@ sub update_request_queue { &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname); if ($userresult ne 'ok') { push(@warn_approves,$uname.':'.$udom); - } elsif (ref($allnums{$udom}) eq 'HASH') { - my %changehash = ( - 'reqcrsotherdom.unofficial' => $udom.'test: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); @@ -545,14 +1391,299 @@ 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); + &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 $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom); + my %curr = &Apache::lonnet::get($dbname,[$uname],$cdom,$domconfiguser); + + if (ref($curr{$uname}) eq 'HASH') { + my ($logtoken,$serverid,$encpass,$courseid,$id,$firstname, + $middlename,$lastname,$generation,$inststatus,$email); + $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'}; + + if ($curr{$uname}{'email'} ne '') { + $email = $curr{$uname}{'email'}; + } elsif ($uname =~ /^[^\@]+\@[^\@]+$/) { + $email = $uname; + } + + my $upass; + if ($curr{$uname}{'tmpinfo'}) { + my ($key,$caller)=split(/&/,$curr{$uname}{'tmpinfo'}); + if ($caller eq 'createaccount') { + if ($curr{$uname}{'upass'} eq '') { + $upass = $curr{$uname}{'upass'}; + } else { + $upass = &Apache::loncommon::des_decrypt($key,$curr{$uname}{'upass'}); + } + } else { + push(@processing_errors,$uname); + } + } else { + $upass = $curr{$uname}{'upass'}; + } + if ($upass eq '') { + push(@processing_errors,$uname); + } else { + undef($curr{$uname}{'upass'}); + my $result = + &Apache::lonnet::modifyuser($cdom,$uname,$id,'internal',$upass, + $firstname,$middlename,$lastname, + $generation,undef,undef,$email); + 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(@invalidusers,$uname); + } + push(@toremove,@invalidusers); + } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + my ($num,$extent,$role,$uname,$udom,$key,$logmsg,$result); + if ($context eq 'othdombydc') { + ($num,$extent,$role,$uname,$udom) = split(/:/,$item); + if ($udom eq $cdom) { + $key = 'pending:'.$uname.':'.$extent.':'.$role; + } + } elsif ($context eq 'othdombyuser') { + ($num,$extent,$role) = split(/:/,$item); + $key = 'pending:'.$extent.':'.$role; + $uname = $env{'user.name'}; + $udom = $env{'user.domain'}; + } + if (($key) && (exists($requesthash{$key}))) { + if (ref($requesthash{$key}) eq 'HASH') { + my $requester = $requesthash{$key}->{'requester'}; + my ($requname,$requdom) = split(/:/,$requester); + my $start = $requesthash{$key}->{'start'}; + my $end = $requesthash{$key}->{'end'}; + my $credits = $requesthash{$key}->{'credits'}; + my $reqcontext = $requesthash{$key}->{'context'}; + if ((($context eq 'othdombydc') && + (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host')) || + ($context eq 'othdombyuser')) { + if (&Apache::lonnet::homeserver($requname,$requdom) ne 'no_host') { + if (($role eq 'ca') || ($role eq 'aa')) { + my ($audom,$auname) = ($extent =~ m{^/($match_domain)/($match_username)$}); + if (&Apache::lonnet::homeserver($auname,$audom) ne 'no_host') { + if ($requester eq $auname.':'.$audom) { + unless ($gotroles{$requester}) { + &requester_roles($auname,$audom,\%requesteractive); + $gotroles{$requester} = 1; + } + if (ref($requesteractive{$requester}) eq 'HASH') { + if ($requesteractive{$requester}{':'.$audom.':au'}) { + $result = &Apache::lonnet::assignrole($udom,$uname,$extent,$role, + $end,$start,'','',$reqcontext, + $context,$requester); + } + } + } + } + } elsif (($role eq 'co') || ($role eq 'cc')) { + my ($crsdom,$crsnum) = ($extent =~ m{^/($match_domain)/($match_courseid)}); + if (&Apache::lonnet::is_course($crsdom,$crsnum)) { + my %info = &Apache::lonnet::coursedescription("$crsdom/$crsnum",{'one_time' => 1}); + if ((($role eq 'co') && ($info{'type'} eq 'Community')) || + (($role eq 'cc') && ($info{'type'} ne 'Community'))) { + if ($info{'internal.courseowner'} eq $requester) { + unless ($gotroles{$requester}) { + &requester_roles($requname,$requdom,\%requesteractive); + $gotroles{$requester} = 1; + } + if (ref($requesteractive{$requester}) eq 'HASH') { + if ($requesteractive{$requester}{"$crsnum:$crsdom:$role"}) { + ($logmsg,$result) = + &Apache::loncommon::commit_standardrole($udom,$uname,$extent,$role,$start, + $end,$crsdom,$crsnum,'', + $reqcontext,'',$context, + $requester); + } + } + } + } + } + } elsif ($role =~ m{^(cr)/($match_domain)/($match_username)/(\w+)$}) { + my ($mrole,$crudom,$cruname,$rolename) = ($1,$2,$3,$4); + my ($crsdom,$crsnum,$csec) = + ($extent =~ m{^/($match_domain)/($match_courseid)(?:|/(\w+))$}); + if (&Apache::lonnet::is_course($crsdom,$crsnum)) { + my ($rdummy,$roledef) = + &Apache::lonnet::get('roles',["rolesdef_$rolename"],$crudom,$cruname); + if (($rdummy ne 'con_lost') && ($roledef ne '')) { + unless ($gotroles{$requester}) { + &requester_roles($requname,$requdom,\%requesteractive); + $gotroles{$requester} = 1; + } + if (ref($requesteractive{$requester}) eq 'HASH') { + if (&requester_has_perm($crsdom,$crsnum,$mrole,$requesteractive{$requester})) { + ($logmsg,$result) = + &Apache::loncommon::commit_customrole($udom,$uname,$extent,$crudom,$cruname, + $rolename,$start,$end,$reqcontext, + $context,$requester); + } + } + } + } + } else { + my $process; + foreach my $type ('course','domain') { + if (grep(/^\Q$role\E$/,@{$roles_by_context{$type}})) { + if ($type eq 'course') { + my ($crsdom,$crsnum,$csec) = ($extent =~ m{^/($match_domain)/($match_courseid)(?:|/(\w+))$}); + if (&Apache::lonnet::is_course($crsdom,$crsnum)) { + my $typeok; + if ($role eq 'cc') { + my %info = &Apache::lonnet::coursedescription("$crsdom/$crsnum",{'one_time' => 1}); + if ($info{'type'} eq 'Course') { + $typeok = 1; + } + } else { + $typeok = 1; + } + if ($typeok) { + unless ($gotroles{$requester}) { + &requester_roles($requname,$requdom,\%requesteractive); + $gotroles{$requester} = 1; + } + if (ref($requesteractive{$requester}) eq 'HASH') { + if (&requester_has_perm($crsdom,$crsnum,$role,$requesteractive{$requester})) { + ($logmsg,$result) = + &Apache::loncommon::commit_standardrole($udom,$uname,$extent,$role,$start, + $end,$crsdom,$crsnum,$csec, + $reqcontext,$credits,$context, + $requester); + } + } + } + } + } else { + my ($domain) = ($extent =~ m{^/($match_domain)/}); + if (&Apache::lonnet::domain($domain) ne '') { + unless ($gotroles{$requester}) { + &requester_roles($requname,$requdom,\%requesteractive); + $gotroles{$requester} = 1; + } + if (&requester_has_perm($domain,'',$role,$requesteractive{$requester})) { + $result = &Apache::lonnet::assignrole($udom,$uname,$extent,$role, + $end,$start,'','',$reqcontext, + $context,$requester); + } + } + } + last; + } + } + } + if ($result eq 'ok') { + $requestedby{$item} = $requester; + my $statusres; + my $id = $uname.':'.$udom.':'.$role; + if (($role eq 'ca') || ($role eq 'aa')) { + my ($audom,$auname) = ($extent =~ m{^/($match_domain)/($match_username)$}); + $statusres = &Apache::lonnet::put($dbname,{'status&'.$id => 'approved'},$audom,$auname); + } elsif ($extent =~ m{^/($match_domain)/$}) { + my $domain = $1; + my $configuser = &Apache::lonnet::get_domainconfiguser($domain); + $statusres = &Apache::lonnet::put($dbname,{'status&'.$id => 'approved'},$domain,$configuser); + } else { + my ($crsdom,$crsnum,$csec) = ($extent =~ m{^/($match_domain)/($match_courseid)(?:|/([^/]+))$}); + $id .= ':'.$csec; + $statusres = &Apache::lonnet::put($dbname,{'status&'.$id => 'approved'},$crsdom,$crsnum); + } + if ($statusres eq 'ok') { + my $newkey; + if ($context eq 'othdombydc') { + $newkey = 'approved:'.$uname.':'.$extent.':'.$role; + } elsif ($context eq 'othdombyuser') { + $newkey = 'approved:'.$extent.':'.$role; + } + $requesthash{$newkey} = $requesthash{$key}; + delete($requesthash{$key}); + push(@toremove,$key); + push(@completed,$item); + } + } else { + push(@warn_approves,$key); + } + } + } + } + } } 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; @@ -578,20 +1709,68 @@ sub update_request_queue { &Apache::lonnet::restore($requestkey,'courserequests', $ownerdom,$ownername); if ((ref($history{'details'}) eq 'HASH') && - ($history{'disposition'} eq 'approval')) { - my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg); - my $result = &course_creation($cdom,$cnum,$context,$history{'details'},\$logmsg, - \$newusermsg,\$addresult,\$enrollcount, - \$response,\$keysmsg,\%domdefs,$longroles); + ($history{'disposition'} eq $queue)) { + my ($logmsg,$newusermsg,$addresult,$enrollcount,$response, + $keysmsg,$code,%customitems); + my $clonemsg = []; + 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,$clonemsg,\$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 ((ref($clonemsg) eq 'ARRAY') && (@{$clonemsg})) { + push(@{$approvedmsg},@{$clonemsg}); + } + 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); - &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'}, @@ -637,36 +1816,117 @@ sub update_request_queue { } 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 $item (@rejections) { - if ($context eq 'course') { - my $user = $item; + 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); - 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($dbname,\%userrequest,$udom,$uname); if ($userresult ne 'ok') { - push(@warn_rejects,$user); + 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($dbname,\%curr,$cdom,$domconfiguser); + if ($userresult ne 'ok') { + push(@warn_rejects,$uname); + } + } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + my ($extent,$role,$uname,$udom,$oldkey,$newkey); + my $dbname = 'nohist_othdomqueued'; + if ($context eq 'othdombydc') { + ($extent,$role,$uname,$udom) = split(/:/,$item); + $oldkey = 'pending:'.$uname.':'.$extent.':'.$role; + $newkey = 'rejected:'.$uname.':'.$extent.':'.$role; + } elsif ($context eq 'othdombyuser') { + ($extent,$role) = split(/:/,$item); + $oldkey = 'pending:'.$extent.':'.$role; + $newkey = 'rejected:'.$extent.':'.$role; + $uname = $env{'user.name'}; + $udom = $env{'user.domain'}; + } + if (exists($requesthash{$oldkey})) { + if (ref($requesthash{$oldkey}) eq 'HASH') { + my $statusres; + my $id = $uname.':'.$udom.':'.$role; + if (($role eq 'ca') || ($role eq 'aa')) { + my ($audom,$auname) = ($extent =~ m{^/($match_domain)/($match_username)$}); + $statusres = &Apache::lonnet::put($dbname,{'status&'.$id => 'rejected'},$audom,$auname); + } elsif ($extent =~ m{^/($match_domain)/\Q$role\E$}) { + my $domain = $1; + my $configuser = &Apache::lonnet::get_domainconfiguser($domain); + $statusres = &Apache::lonnet::put($dbname,{'status&'.$id => 'rejected'},$domain,$configuser); + } else { + my ($crsdom,$crsnum,$csec) = ($extent =~ m{^/($match_domain)/($match_courseid)(?:|/([^/]+))$}); + $id .= ':'.$csec; + $statusres = &Apache::lonnet::put($dbname,{'status&'.$id => 'rejected'},$crsdom,$crsnum); + } + if ($statusres eq 'ok') { + $requesthash{$newkey} = $requesthash{$oldkey}; + delete($requesthash{$oldkey}); + push(@toremove,$oldkey); + $requesthash{$newkey}->{'timestamp'} = $now; + $requesthash{$newkey}->{'adjudicator'} = $env{'user.name'}.':'.$env{'user.domain'}; + $requestedby{$item} = $requesthash{$newkey}->{'requester'}; + push(@rejectedreqs,$item); + } else { + push(@warn_rejects,$oldkey); + } + } } } 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 { @@ -679,7 +1939,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'}, @@ -704,6 +1964,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); } @@ -716,10 +1979,56 @@ sub update_request_queue { } } } + 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'}); + } + } + } + unless (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + @toremove = map {$_.'_approval'} (@toremove); + } + if (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + my $delresult; + if ($context eq 'othdombyuser') { + $delresult = &Apache::lonnet::del($namespace,\@toremove,$env{'user.domain'},$env{'user.name'}); + } else { + $delresult = &Apache::lonnet::del_dom($namespace,\@toremove,$cdom); + } + unless ($delresult eq 'ok') { + push(@warn_dels,@toremove); + } + } + } if (@changes) { my $delresult; if ($context eq 'course') { $delresult = &Apache::lonnet::del($namespace,\@changes,$cdom,$cnum); + } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + if ($context eq 'othdombydc') { + $delresult = &Apache::lonnet::put($namespace,\%requesthash,$cdom,$confname); + } elsif ($context eq 'othdombyuser') { + $delresult = &Apache::lonnet::put($namespace,\%requesthash,$env{'user.domain'},$env{'user.name'}); + } } else { $delresult = &Apache::lonnet::del_dom($namespace,\@changes,$cdom); } @@ -757,6 +2066,117 @@ 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); + } + } elsif ($context eq 'requestusername') { + $chgmsg = "'Action was taken on the following LON-CAPA account 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,'usernamemanagers',$sender, + $approvedlist,$rejectedlist); + } + } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + my @chgmsgs = ({ mt => 'Action was taken by [_1].', + args => [$namelink] }); + my (%approvals_by_requester,%rejections_by_requester,%for_requester); + my $sender = $env{'user.name'}.':'.$env{'user.domain'}; + if (@completed) { + my $msg; + if ($context eq 'othdombydc') { + $msg = &mt('The following roles in other domain(s) were assigned for user(s) in this domain:'); + } elsif ($context eq 'othdombyuser') { + $msg = &mt('The following roles in other domain(s) were assigned:'); + } + $output .= '

'.$msg.'

'; + } + if (@rejectedreqs) { + my $msg; + if ($context eq 'othdombydc') { + $msg = &mt('The following role assignments in other domain(s) for user(s) in this domain were rejected:'); + } elsif ($context eq 'othdombyuser') { + $msg = &mt('The following role assignments in other domain(s) were rejected:'); + } + $output .= '

'.$msg.'

'; + } + foreach my $key (sort(keys(%for_requester))) { + if (ref($approvals_by_requester{$key}) eq 'ARRAY') { + if (@{$approvals_by_requester{$key}} > 0) { + if ($context eq 'othdombydc') { + push(@chgmsgs,{ mt => '[_1]The following roles in other domain(s) were assigned:', + args => ["\n"]}); + } elsif ($context eq 'othdombyuser') { + push(@chgmsgs,{ mt => '[_1]The following roles in other domain(s) were accepted:', + args => ["\n"]}); + } + push(@chgmsgs,@{$approvals_by_requester{$key}}); + $approvedlist = $key; + } + } + if (ref($rejections_by_requester{$key}) eq 'ARRAY') { + if (@{$rejections_by_requester{$key}} > 0) { + if ($context eq 'othdombydc') { + push(@chgmsgs,{ mt => '[_1]The following roles in other domain(s) were rejected:', + args => ["\n"]}); + } elsif ($context eq 'othdombyuser') { + push(@chgmsgs,{ mt => '[_1]The following roles in other domain(s) were declined:', + args => ["\n"]}); + } + push(@chgmsgs,@{$rejections_by_requester{$key}}); + $rejectedlist = $key; + } + } + if (($approvedlist ne '') || ($rejectedlist ne '')) { + &send_selfserve_notification($key,\@chgmsgs,'',$domdesc,$now, + $context,$sender,$approvedlist, + $rejectedlist); + } + } } else { $chgmsg = "'Action was taken on the following course and community requests by [_1].',$namelink"; if (@completed) { @@ -764,13 +2184,16 @@ sub update_request_queue { $output .= '

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

'; @@ -780,8 +2203,8 @@ sub update_request_queue { $output .= '

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

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

'.&mt('Authoring Space requests from the following users were deleted because one already exists:').'

'; } else { $output .= '

'.&mt('The following course/community creation requests were deleted because the course or community has already been created:').'

'; + } 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) { @@ -842,6 +2285,14 @@ sub update_request_queue { $output .= '
  • '.$user.'
  • '; } $output .= '

    '; + } 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) { @@ -854,17 +2305,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') { @@ -873,12 +2334,26 @@ sub update_request_queue { $output .= '
  • '.$user.'
  • '; } $output .= '

    '; + } 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:').'