--- loncom/interface/loncoursequeueadmin.pm 2013/08/17 00:34:29 1.37 +++ loncom/interface/loncoursequeueadmin.pm 2022/12/01 01:28:26 1.64 @@ -1,7 +1,7 @@ # The LearningOnline Network # Utilities to administer domain course requests and course self-enroll requests # -# $Id: loncoursequeueadmin.pm,v 1.37 2013/08/17 00:34:29 raeburn Exp $ +# $Id: loncoursequeueadmin.pm,v 1.64 2022/12/01 01:28:26 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -90,6 +90,7 @@ use Apache::loncommon; use Apache::lonmsg; use Apache::lonlocal; use Apache::lonuserutils; +use LONCAPA::batchcreatecourse; use LONCAPA qw(:DEFAULT :match); sub send_selfserve_notification { @@ -104,22 +105,31 @@ sub send_selfserve_notification { $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"], + mt => 'Course/Community creation requests in the following domain: [_1] have been reviewed.', + args => ["\n$contextdesc\n"], }); if (ref($textstr) eq 'ARRAY') { push(@rawmsg,@{$textstr}); } } elsif ($context eq 'authormanagers') { - $rawsubj = 'Authoring space requests reviewed'; + $rawsubj = 'Authoring Space requests reviewed'; push(@rawmsg,{ - mt => 'Authoring requests in the following domain: "[_1]" have been reviewed.', - args => ["\n$contextdesc"], + 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}); @@ -134,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}); @@ -203,20 +212,41 @@ sub send_selfserve_notification { args => [" \n\n","\n"], }); } elsif ($context eq 'authorreq') { - $rawsubj = 'Authoring space request to review'; + $rawsubj = 'Authoring Space request to review'; $msgtxt = 'Assignment of an author role in the [_1] domain[_2]was requested by [_3] on [_4].'; push(@rawmsg,{ mt => $msgtxt, args => [$contextdesc,"\n",$textstr,$timestamp], }, { - mt =>'[_1]As Domain Coordinator, use: [_2]Main Menu -> Create users or modify the roles and privileges of users -> Authoring space reqests[_3]to display a list of pending requests, which you can either approve or reject.', + 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.'; + $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"], @@ -224,6 +254,54 @@ sub send_selfserve_notification { 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 (&Apache::loncommon::show_course()) { + $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 'Manage Role Requests' 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') { + $rawsubj = 'Status of Role Assignment Requests'; + 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"], + }); } my @to_notify = split(/,/,$notifylist); my $numsent = 0; @@ -241,9 +319,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); @@ -253,57 +336,81 @@ 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"; + $message .= &mt_user($sender_lh,$item->{mt},@{$item->{args}})."\n"; } } - &Apache::lonmsg::process_sent_mail($subject,'',$numsent,$stamp,$uname,$udom,$msgcount,$cid,$$,$message,\@recusers,\@recudoms,undef,undef,undef,undef,$senderuname,$senderudom); + &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".&Apache::lonlocal::mt_user($sender_lh,'Rejected course requests:')."\n".$rejectedlist; + $message .= "\n\n".&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; + $message .= "\n\n".&mt_user($sender_lh,'Approved author role requests:')."\n".$approvedlist; + } + if ($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".&Apache::lonlocal::mt_user($sender_lh,'Rejected author role requests:')."\n".$rejectedlist; + $message .= "\n\n".&mt_user($sender_lh,'Rejected LON-CAPA account requests:')."\n".$rejectedlist; + } + } elsif ($context eq 'othdombydc') { + if ($approvedlist) { + $message .= "\n\n".&mt_user($sender_lh,'Approved LON-CAPA role assignments:')."\n".$approvedlist; + } + if ($rejectedlist) { + $message .= "\n\n".&mt_user($sender_lh,'Rejected LON-CAPA role assignments:')."\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 ($context,$dom,$cnum,$secondary) = @_; my ($namespace,$formaction,$nextelement,%requesthash); if ($context eq 'course') { $formaction = '/adm/createuser'; @@ -315,6 +422,39 @@ sub display_queued_requests { $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') { + $formaction = '/adm/createuser'; + $namespace = 'nohist_queuedrolereqs'; + if ($secondary eq 'domain') { + my $confname = &Apache::lonnet::get_domainconfiguser($dom); + %requesthash = &Apache::lonnet::dump($namespace,$dom,$confname); + } else { + %requesthash = &Apache::lonnet::dump($namespace,$dom,$cnum); + } + $nextelement = ''; } else { $formaction = '/adm/createcourse'; $namespace = 'courserequestqueue'; @@ -323,15 +463,14 @@ sub display_queued_requests { 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); if (keys(%requesthash) > 0) { - $output = '
'."\n". - ''."\n". - $nextelement."\n"; foreach my $item (keys(%requesthash)) { my ($timestamp,$entry,$pending); if ($context eq 'course') { @@ -340,13 +479,32 @@ sub display_queued_requests { } 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') { + next unless ($requesthash{'status&'.$item} eq 'pending'); + 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 ($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'}.':'; - if ($context eq 'pending') { + if (($context eq 'pending') || ($context eq 'displaypending')) { $entry .= $requesthash{$item}{'instcode'}; } else { $entry .= $requesthash{$item}{'crstype'}; @@ -362,38 +520,50 @@ sub display_queued_requests { } } } - if (keys(%queue_by_date) > 0) { - if ($context eq 'course') { - $output .= '

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

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

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

'. - '

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

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

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

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

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

'; - } - $output .= &build_queue_display($dom,$context,\%queue_by_date). - ''; - } else { - $output .= '
'; - if ($context eq 'course') { - $output .= &mt('There are currently no enrollment requests awaiting approval.'); - } elsif ($context eq 'pending') { - $output .= &mt('There are currently no requests for official courses awaiting validation.'); - } elsif ($context eq 'requestauthor') { - $output .= &mt('There are currently no requests for authoring space awaiting approval.'); - } elsif ($context eq 'domain') { - $output .= &mt('There are currently no course or community requests awaiting approval.'); + } + 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, queued pending approval').'

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

'.&mt('Co-author role assignments for users from another domain, queued pending approval').'

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

'.&mt('Course role assignments for users from another domain, queued pending approval').'

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

'.&mt('Community role assignments for users from another domain, queued pending approval').'

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

'.&mt('Role assignments for you in other domains, queued pending your acceptance of the role.').'

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

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

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

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

'; + } + $output .= &build_queue_display($dom,$context,\%queue_by_date,$secondary). + ''; 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 { + '

'.&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 .= '
'; @@ -401,8 +571,28 @@ sub display_queued_requests { $output .= '
'; if ($context eq 'course') { $output .= &mt('There are currently no enrollment requests awaiting approval.'); - } elsif ($context eq 'pending') { + } 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 queued pending approval'); + } elsif ($secondary eq 'author') { + $output .= &mt('There are currently no co-author role assignment(s) for user(s) from another domain queued pending approval'); + } elsif ($secondary eq 'course') { + $output .= &mt('There are currently no course role assignment(s) for user(s) from another domain queued pending approval'); + } elsif ($secondary eq 'community') { + $output .= &mt('There are currently no community role assignment(s) for user(s) from another domain queued pending approval'); + } + } elsif ($context eq 'othdomaction') { + if ($secondary eq 'user') { + $output .= &mt('There are currently no pending role assignments for you in other domains, queued pending your acceptance of the role.'); + } elsif ($secondary eq 'domain') { + $output .= &mt('There are currently no pending role assignments in other domains, queued pending domain coordinator approval in this domain.'); + } } else { $output .= &mt('There are currently no course or community requests awaiting approval.'); } @@ -412,21 +602,49 @@ sub display_queued_requests { } sub build_queue_display { - my ($dom,$context,$queue) = @_; + my ($dom,$context,$queue,$secondary) = @_; 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') { + my (%crstypes,%roles_by_context,$output); + if ($context eq 'othdomqueue') { + $output = &print_filter_menu($context); + } + $output .= &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(); + unless (($context eq 'pending') || ($context eq 'displaypending') || + ($context eq 'helpdesk') || ($context eq 'othdomqueue')) { $output .= ''.&mt('Action').''; } - $output .= ''.&mt('Requestor').''; + unless (($context eq 'othdomqueue') || (($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 'pending' || $context eq 'stillpending') { + } elsif ($context eq 'requestusername') { + $output .= ''.&mt('Date requested').''. + ''.&mt('Details').''; + } elsif ($context eq 'othdomqueue') { + $output .= ''.&mt('Date requested').''. + ''.&mt('Role').''; + if ($secondary eq 'course') { + $output .= ''.&mt('Section').''; + } + $output .= ''.&mt('Requested for').''. + ''.&mt('Approval needed from').''; + } 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').''; @@ -435,6 +653,8 @@ sub build_queue_display { official => 'Official course', unofficial => 'Unofficial course', community => 'Community', + textbook => 'Textbook course', + placement => 'Placement test', ); $output .= ''.&mt('Type').''. ''.&mt('Date requested').''. @@ -447,7 +667,8 @@ sub build_queue_display { if (ref($queue->{$item}) eq 'ARRAY') { foreach my $request (sort(@{$queue->{$item}})) { my ($row,$approve,$reject,$showtime,$showsec,$namelink, - $detailslink,$crstype,$instcode); + $detailslink,$crstype,$instcode,$showrole,$adjudicator, + $location,$showrequester); $showtime = &Apache::lonlocal::locallocaltime($item); if ($context eq 'course') { my ($puname,$pudom,$pusec) = split(/:/,$request); @@ -463,17 +684,122 @@ sub build_queue_display { } elsif ($context eq 'requestauthor') { if (&Apache::lonnet::homeserver($request,$dom) ne 'no_host') { $approve = $count.':'.$request; - $reject = $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 'othdomqueue') { + my ($uname,$udom,$role,$adj,$requester,$sec) = split(/:/,$request); + if ($adj eq 'user') { + $adjudicator = &mt('Role Assignee'); + } elsif ($adj eq 'domain') { + $adjudicator = &mt("[_1] in user's domain", + &Apache::lonnet::plaintext('dc')); + } + my $crstype; + $showrole = &Apache::lonnet::plaintext($role,$crstype); + unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') { + $namelink = &Apache::loncommon::plainname($uname,$udom)." ($uname:$udom)"; + } + if ($secondary eq 'course') { + $showsec = $sec; + if ($showsec eq '') { + $showsec = &mt('none'); + } + } + } 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('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('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($crstype).': '.$info{'description'}; + if ($csec ne '') { + $location .= '
'.&mt('Section').': '.$csec; + } + } + } else { + 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($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 $queue = 'approval'; - if ($context eq 'pending' || $context eq 'stillpending') { + my $queued = 'approval'; + if ($context eq 'pending' || $context eq 'displaypending' || $context eq 'stillpending') { ($cnum,$ownername,$ownerdom,$instcode,$cdesc)=split(/:/,$request,5); - $queue = 'pending'; + $queued = 'pending'; } else { ($cnum,$ownername,$ownerdom,$type,$cdesc)=split(/:/,$request,5); $crstype = $type; @@ -482,14 +808,15 @@ sub build_queue_display { } } $detailslink=''.$cdesc.''; + "'$dom','$cnum','$queued'".');">'.$cdesc.''; $approve = $count.':'.$cnum; $reject = $cnum; $namelink = &Apache::loncommon::aboutmewrapper( &Apache::loncommon::plainname($ownername,$ownerdom), $ownername,$ownerdom); } - unless ($context eq 'pending') { + unless (($context eq 'pending') || ($context eq 'displaypending') || + ($context eq 'helpdesk') || ($context eq 'othdomqueue')) { $row = ''. '
'; } - $row .= ''.$namelink.''."\n"; + unless (($context eq 'othdomqueue') || ($context eq 'othdomaction')) { + $row .= ''.$namelink.''."\n"; + } if ($context eq 'course') { $row .= ''.$showsec.''."\n". ''.$showtime.''."\n"; } elsif ($context eq 'requestauthor') { $row .= ''.$showtime.''."\n"; - } else { - if ($context eq 'pending' || $context eq 'stillpending') { + } elsif ($context eq 'requestusername') { + $row .= ''.$showtime.''."\n". + ''.$detailslink.''."\n"; + } elsif ($context eq 'othdomqueue') { + $row .= ''.$showtime.''."\n". + ''.$showrole.''."\n"; + if ($secondary eq 'course') { + $row .= ''.$showsec.''."\n"; + } + $row .= ''.$namelink.''."\n". + ''.$adjudicator.''."\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"; @@ -524,6 +874,11 @@ sub build_queue_display { return $output; } +sub print_filter_menu { + my ($context) = @_; + return; +} + sub update_request_queue { my ($context,$cdom,$cnum,$coursedesc) = @_; my ($output,$access_start,$access_end,$limit,$cap,$notifylist,$namespace, @@ -533,19 +888,17 @@ sub update_request_queue { @processing_errors,@warn_approves,@warn_rejects,@approvals,@warn_dels, @rejections,@rejectionerrors,@nopermissions,%courseroles,@toremove, %communityroles,%domdefs,%approvalmsg,%rejectionmsg,$crstype,$queue, - $firsturl); + $firsturl,$uniquecode,%codes,%roles_by_context,%requesteractive, + %gotroles,$confname,%requestedby,@rejectedreqs,$dbname); my $count=0; - while (my @course = &Apache::loncommon::get_env_multiple('form.'.$count.'radioreq')) { - if ($course[0] =~ /^\d+:.*/) { - push(@approvals,$course[0]); - } elsif ($course[0] =~ /^later:.*/) { - #decide later - } else { - push(@rejections,$course[0]); + while (my $item = $env{'form.'.$count.'radioreq'}) { + if ($item =~ /^\d+:/) { + push(@approvals,$item); + } elsif ($item !~ /^later:/) { + push(@rejections,$item); } - $count+=1; + $count ++; } - $now = time; $sender = $env{'user.name'}.':'.$env{'user.domain'}; if ($context eq 'course') { @@ -553,7 +906,7 @@ sub update_request_queue { $beneficiary = 'enroller'; $cid = $env{'request.course.id'}; $crstype = lc(&Apache::loncommon::course_type()); - $firsturl = &course_portal_url($cnum,$cdom); + $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'}; @@ -582,18 +935,58 @@ sub update_request_queue { } } my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom); - $firsturl = &course_portal_url($domconfiguser,$cdom); + $firsturl = &Apache::lonnet::course_portal_url($domconfiguser,$cdom); $approvedmsg = [{ - mt => 'Your request for authoring space has been approved.', + 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.', + 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); + } else { + %requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum); + } + $domdesc = &Apache::lonnet::domain($cdom); + $dbname = 'nohist_othdomqueued'; } else { $domdesc = &Apache::lonnet::domain($cdom); $namespace = 'courserequestqueue'; @@ -717,9 +1110,6 @@ sub update_request_queue { if (&Apache::lonnet::allowed('cau',$cdom)) { if (&Apache::lonnet::assignrole($cdom,$uname,'/'.$cdom.'/','au',undef,time,undef,undef,'requestauthor') eq 'ok') { push(@completed,$uname); - unless (&Apache::lonnet::del_dom($namespace,[$uname.'_approval'],$cdom) eq 'ok') { - push(@warn_dels,$uname); - } &send_selfserve_notification($uname.':'.$cdom, $approvedmsg,undef,undef,$now, $beneficiary,$sender); @@ -734,7 +1124,7 @@ sub update_request_queue { my $userresult = &Apache::lonnet::put('requestauthor',\%userrequest,$cdom,$uname); if ($userresult ne 'ok') { - push(@warn_approves,$item); + push(@warn_approves,$uname.':'.$cdom); } } else { push(@processing_errors,$uname); @@ -749,6 +1139,240 @@ sub update_request_queue { 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')) { + if ($context eq 'othdombydc') { + my ($num,$extent,$role,$uname,$udom) = split(/:/,$item); + my ($logmsg,$result); + if ($udom eq $cdom) { + my $key = 'pending:'.$uname.':'.$extent.':'.$role; + if (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 ((&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') && + (&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); + } + } + } + } + } 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); + } + } + } + } + } + } 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); + } + } + } + } + } 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); + } + } + } + } + } 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); + } + } + } + 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 = 'approved:'.$uname.':'.$extent.':'.$role; + $requesthash{$newkey} = $requesthash{$key}; + delete($requesthash{$key}); + push(@toremove,$key); + push(@completed,$item); + } + } + } + } + } + } else { + my ($num,$extent,$role) = split(/:/,$item); + if (exists($requesthash{$extent.':'.$role})) { + if (ref($requesthash{$extent.':'.$role}) eq 'HASH') { +#FIXME +#check if extent is valid +#check if role is valid +#check requester privs + } + } + } } else { my ($num,$cnum) = split(':',$item); if (ref($requesthash{$cnum.'_'.$queue}) eq 'HASH') { @@ -783,21 +1407,58 @@ sub update_request_queue { $ownerdom,$ownername); if ((ref($history{'details'}) eq 'HASH') && ($history{'disposition'} eq $queue)) { - my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg); - my $result = &course_creation($cdom,$cnum,$context,$history{'details'},\$logmsg, - \$newusermsg,\$addresult,\$enrollcount, - \$response,\$keysmsg,\%domdefs,$longroles); + 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 = &course_portal_url($cnum,$cdom); + 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); @@ -855,20 +1516,24 @@ sub update_request_queue { @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') || ($context eq 'requestauthor')) { - my ($user,$uname,$udom,%userrequest,$key); + 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, @@ -884,10 +1549,63 @@ sub update_request_queue { $userrequest{'author_status'} = 'rejection'; } my $userresult = - &Apache::lonnet::put('requestauthor',\%userrequest,$udom,$uname); + &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($dbname,\%curr,$cdom,$domconfiguser); + if ($userresult ne 'ok') { + push(@warn_rejects,$uname); + } + } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + if ($context eq 'othdombydc') { + my ($extent,$role,$uname,$udom) = split(/:/,$item); + my $oldkey = 'pending:'.$uname.':'.$extent.':'.$role; + my $newkey = 'rejected:'.$uname.':'.$extent.':'.$role; + my $dbname = 'nohist_othdomqueued'; + if (exists($requesthash{$oldkey})) { + if (ref($requesthash{$oldkey}) eq 'HASH') { + $requesthash{$newkey} = $requesthash{$oldkey}; + delete($requesthash{$oldkey}); + push(@toremove,$oldkey); + $requesthash{$newkey}->{'timestamp'} = $now; + $requesthash{$newkey}->{'adjudicator'} = $env{'user.name'}.':'.$env{'user.domain'}; + 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)/$}) { + 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') { + $requestedby{$item} = $requesthash{$newkey}->{'requester'}; + push(@rejectedreqs,$item); + } + } + } + } } else { my $cnum = $item; if (ref($requesthash{$cnum.'_'.$queue}) eq 'HASH') { @@ -950,24 +1668,46 @@ sub update_request_queue { } } if (@toremove) { + my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom); foreach my $item (@toremove) { - my %userrequest = ( - author => { - timestamp => $now, - adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, - status => 'deleted', - }, - author_status => 'deleted', - ); - &Apache::lonnet::put('requestauthor',\%userrequest,$cdom,$item); + 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') { + @toremove = map {$_.'_approval'} (@toremove); } - @toremove = map {$_.'_approval'} (@toremove); my $delresult = &Apache::lonnet::del_dom($namespace,\@toremove,$cdom); + if (($delresult ne 'ok') && ($context eq 'othdombydc')) { + 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); + } } else { $delresult = &Apache::lonnet::del_dom($namespace,\@changes,$cdom); } @@ -1006,7 +1746,7 @@ sub update_request_queue { $approvedlist,$rejectedlist,$crstype); } } elsif ($context eq 'requestauthor') { - $chgmsg = "'Action was taken on the following authoring space requests by [_1].',$namelink"; + $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:').'

'; } @@ -1033,6 +1772,61 @@ sub update_request_queue { $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')) { + $chgmsg = "'Action was taken on the following role requests by [_1].',$namelink"; + my (%approvals_by_requester,%rejections_by_requester,%for_requester); + my $sender = $env{'user.name'}.':'.$env{'user.domain'}; + if (@completed) { + $output .= '

'.&mt('The following roles in other domain(s) were assigned for user(s) in this domain:').'

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

'.&mt('The following role assignments in other domain(s) for user(s) in this domain were rejected:').'

'; + } + foreach my $key (sort(keys(%for_requester))) { + if (ref($approvals_by_requester{$key}) eq 'ARRAY') { + if (@{$approvals_by_requester{$key}} > 0) { + $approvedlist = join("\n\n",@{$approvals_by_requester{$key}}); + } + } + if (ref($rejections_by_requester{$key}) eq 'ARRAY') { + if (@{$rejections_by_requester{$key}} > 0) { + $rejectedlist = join("\n\n",@{$rejections_by_requester{$key}}); + } + } + if (($approvedlist ne '') || ($rejectedlist ne '')) { + &send_selfserve_notification($key,$chgmsg,'',$domdesc,$now, + $context,$sender,$approvedlist, + $rejectedlist); + } + } } else { $chgmsg = "'Action was taken on the following course and community requests by [_1].',$namelink"; if (@completed) { @@ -1047,6 +1841,9 @@ sub update_request_queue { } my $syllabuslink = &Apache::loncommon::syllabuswrapper($showcourse,$cnum,$cdom); + if ($codes{$cnum}) { + $syllabuslink .= ' '.&mt('Unique code: [_1]',$codes{$cnum}); + } $output .= '
  • '.$syllabuslink.'
    • '; } $output .= '

    '; @@ -1071,6 +1868,10 @@ sub update_request_queue { $approvedlist,$rejectedlist,$crstype); } } + } else { + if (($context eq 'requestauthor') || ($context eq 'requestusername') || ($context eq 'othdombydc')) { + push(@warn_dels,@changes); + } } } if (@existing) { @@ -1081,7 +1882,7 @@ sub update_request_queue { } $output .= '

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

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