--- loncom/interface/loncoursequeueadmin.pm 2022/11/23 02:55:37 1.63
+++ 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.63 2022/11/23 02:55:37 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.64 2022/12/01 01:28:26 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -295,6 +295,13 @@ sub send_selfserve_notification {
-> 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;
@@ -383,6 +390,13 @@ sub send_selfserve_notification {
if ($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).',';
@@ -415,7 +429,7 @@ sub display_queued_requests {
$nextelement = ' ';
} elsif ($context eq 'othdomqueue') {
$formaction = '/adm/createuser';
- $namespace = 'othdomqueued';
+ $namespace = 'nohist_othdomqueued';
if ($secondary eq 'domain') {
%requesthash = &Apache::lonnet::dump_dom($namespace,$dom);
foreach my $key (keys(%requesthash)) {
@@ -433,7 +447,7 @@ sub display_queued_requests {
}
} elsif ($context eq 'othdomaction') {
$formaction = '/adm/createuser';
- $namespace = 'queuedrolereqs';
+ $namespace = 'nohist_queuedrolereqs';
if ($secondary eq 'domain') {
my $confname = &Apache::lonnet::get_domainconfiguser($dom);
%requesthash = &Apache::lonnet::dump($namespace,$dom,$confname);
@@ -457,9 +471,6 @@ sub display_queued_requests {
}
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') {
@@ -473,6 +484,7 @@ sub display_queued_requests {
($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'};
@@ -481,6 +493,7 @@ sub display_queued_requests {
$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'});
@@ -507,71 +520,44 @@ 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') || ($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.').' ';
- }
- } else {
- $output .= ''.&mt('Course/Community requests queued pending approval by a Domain Coordinator').' ';
- }
- $output .= &build_queue_display($dom,$context,\%queue_by_date,$secondary).
- ' ';
- } else {
- $output .= '';
- if ($context eq 'course') {
- $output .= &mt('There are currently no enrollment requests awaiting approval.');
- } elsif ($context eq 'pending') {
- $output .= &mt('There are currently no requests for official courses awaiting validation.');
- } elsif ($context eq 'requestauthor') {
- $output .= &mt('There are currently no requests for Authoring Space awaiting approval.');
- } elsif ($context eq 'requestusername') {
- $output .= &mt('There are currently no requests for LON-CAPA accounts awaiting approval.');
- } elsif ($context eq 'domain') {
- $output .= &mt('There are currently no course or community requests awaiting approval.');
- } 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.');
- }
+ }
+ 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').' ';
}
- $output .= '
';
- }
+ } 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.').' ';
+ }
+ } 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".
@@ -618,9 +604,12 @@ sub display_queued_requests {
sub build_queue_display {
my ($dom,$context,$queue,$secondary) = @_;
return unless (ref($queue) eq 'HASH');
- my (%crstypes,%roles_by_context);
- my $output = &Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_header_row();
+ 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').' ';
@@ -729,14 +718,14 @@ sub build_queue_display {
}
}
} elsif ($context eq 'othdomaction') {
- my ($extent,$role,$crstype);
+ my ($status,$extent,$role,$crstype);
my ($info,$requester) = map { &unescape($_); } split(/:/,$request);
if ($secondary eq 'user') {
- ($extent,$role) = split(/:/,$info);
+ ($status,$extent,$role) = split(/:/,$info);
$approve = $count.':'.$extent.':'.$role;
$reject = $extent.':'.$role;
} elsif ($secondary eq 'domain') {
- (my $uname,$extent,$role) = split(/:/,$info);
+ ($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') {
@@ -765,7 +754,7 @@ sub build_queue_display {
$crstype = $info{'type'};
$location = &mt($crstype).': '.$info{'description'};
if ($csec ne '') {
- $location .= ' '.&mt('Section').': '.$csec;
+ $location .= ' '.&mt('Section').': '.$csec;
}
}
} else {
@@ -778,7 +767,7 @@ sub build_queue_display {
$crstype = $info{'type'};
$location = &mt($crstype).': '.$info{'description'};
if ($csec ne '') {
- $location .= ' '.&mt('Section').': '.$csec;
+ $location .= ' '.&mt('Section').': '.$csec;
}
}
} else {
@@ -885,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,
@@ -895,7 +889,7 @@ sub update_request_queue {
@rejections,@rejectionerrors,@nopermissions,%courseroles,@toremove,
%communityroles,%domdefs,%approvalmsg,%rejectionmsg,$crstype,$queue,
$firsturl,$uniquecode,%codes,%roles_by_context,%requesteractive,
- %gotroles);
+ %gotroles,$confname,%requestedby,@rejectedreqs,$dbname);
my $count=0;
while (my $item = $env{'form.'.$count.'radioreq'}) {
if ($item =~ /^\d+:/) {
@@ -978,32 +972,21 @@ sub update_request_queue {
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 = 'queuedrolereqs';
- $beneficiary = 'requester';
+ $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') {
- my $confname = &Apache::lonnet::get_domainconfiguser($cdom);
+ $confname = &Apache::lonnet::get_domainconfiguser($cdom);
%requesthash = &Apache::lonnet::dump($namespace,$cdom,$confname);
- $approvedmsg = [{
- mt => 'The role assignment you requested for a user from another domain has been approved and the role assigned.',
- }];
- $rejectedmsg = [{
- mt => 'The role assignment you requested for a user from another domain has not been approved.',
- }];
} else {
%requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum);
- $approvedmsg = [{
- mt => 'The role assignment you requested for a user from another domain has been has been agreed to by the user.',
- }];
- $rejectedmsg = [{
- mt => 'The role assignment you requested for a user from another domain has not been agreed to by the user.',
- }];
}
$domdesc = &Apache::lonnet::domain($cdom);
+ $dbname = 'nohist_othdomqueued';
} else {
$domdesc = &Apache::lonnet::domain($cdom);
$namespace = 'courserequestqueue';
@@ -1158,7 +1141,6 @@ sub update_request_queue {
push(@toremove,(@invalidusers,@nopermissions));
} elsif ($context eq 'requestusername') {
my ($num,$uname) = split(/:/,$item);
- my $dbname = 'nohist_requestedusernames';
my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom);
my %curr = &Apache::lonnet::get($dbname,[$uname],$cdom,$domconfiguser);
@@ -1234,7 +1216,7 @@ sub update_request_queue {
my ($num,$extent,$role,$uname,$udom) = split(/:/,$item);
my ($logmsg,$result);
if ($udom eq $cdom) {
- my $key = $uname.':'.$extent.':'.$role;
+ my $key = 'pending:'.$uname.':'.$extent.':'.$role;
if (exists($requesthash{$key})) {
if (ref($requesthash{$key}) eq 'HASH') {
my $requester = $requesthash{$key}->{'requester'};
@@ -1274,7 +1256,7 @@ sub update_request_queue {
}
if (ref($requesteractive{$requester}) eq 'HASH') {
if ($requesteractive{$requester}{"$crsnum:$crsdom:$role"}) {
- $result =
+ ($logmsg,$result) =
&Apache::loncommon::commit_standardrole($udom,$uname,$extent,$role,$start,
$end,$crsdom,$crsnum,'',
$reqcontext);
@@ -1297,8 +1279,9 @@ sub update_request_queue {
}
if (ref($requesteractive{$requester}) eq 'HASH') {
if (&requester_has_perm($crsdom,$crsnum,$mrole,$requesteractive{$requester})) {
- $result = &Apache::loncommon::commit_customrole($udom,$uname,$extent,$crudom,$cruname,
- $rolename,$start,$end,$reqcontext);
+ ($logmsg,$result) =
+ &Apache::loncommon::commit_customrole($udom,$uname,$extent,$crudom,$cruname,
+ $rolename,$start,$end,$reqcontext);
}
}
}
@@ -1326,7 +1309,7 @@ sub update_request_queue {
}
if (ref($requesteractive{$requester}) eq 'HASH') {
if (&requester_has_perm($crsdom,$crsnum,$role,$requesteractive{$requester})) {
- $result =
+ ($logmsg,$result) =
&Apache::loncommon::commit_standardrole($udom,$uname,$extent,$role,$start,
$end,$crsdom,$crsnum,$csec,
$reqcontext,$credits);
@@ -1335,7 +1318,7 @@ sub update_request_queue {
}
}
} else {
- my ($domain) = ($extent =~ m{^/($match_domain)/});
+ my ($domain) = ($extent =~ m{^/($match_domain)/});
if (&Apache::lonnet::domain($domain) ne '') {
unless ($gotroles{$requester}) {
&requester_roles($requname,$requdom,\%requesteractive);
@@ -1352,12 +1335,33 @@ sub update_request_queue {
}
}
}
+ 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);
+ }
+ }
}
}
}
- if ($result eq 'ok') {
- push(@completed,$item);
- }
} else {
my ($num,$extent,$role) = split(/:/,$item);
if (exists($requesthash{$extent.':'.$role})) {
@@ -1514,8 +1518,6 @@ sub update_request_queue {
@changes = map {$_.'_approval'} (@changes);
} elsif ($context eq 'requestusername') {
@changes = map {&escape($_).'_approval'} (@changes);
- } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) {
- @changes = ();
}
if (@rejections) {
foreach my $item (@rejections) {
@@ -1571,7 +1573,39 @@ sub update_request_queue {
push(@warn_rejects,$uname);
}
} elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) {
-#FIXME
+ 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') {
@@ -1658,13 +1692,22 @@ sub update_request_queue {
}
}
}
- @toremove = map {$_.'_approval'} (@toremove);
+ unless ($context eq 'othdombydc') {
+ @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);
}
@@ -1711,7 +1754,6 @@ sub update_request_queue {
my $userlink =
&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$cdom),$uname,$cdom);
$output .= ''.$userlink.' ';
-
}
$output .= '';
}
@@ -1755,7 +1797,36 @@ sub update_request_queue {
$approvedlist,$rejectedlist);
}
} elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) {
-#FIXME
+ $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:').'
'.
+ &get_othdombydc_results('approved',\@completed,\%approvals_by_requester,\%requestedby,\%for_requester).
+ ' ';
+ }
+ if (@rejectedreqs) {
+ $output .= ''.&mt('The following role assignments in other domain(s) for user(s) in this domain were rejected:').'
'.
+ &get_othdombydc_results('rejected',\@rejectedreqs,\%rejections_by_requester,\%requestedby,\%for_requester).
+ ' ';
+ }
+ 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) {
@@ -1798,7 +1869,7 @@ sub update_request_queue {
}
}
} else {
- if (($context eq 'requestauthor') || ($context eq 'requestusername')) {
+ if (($context eq 'requestauthor') || ($context eq 'requestusername') || ($context eq 'othdombydc')) {
push(@warn_dels,@changes);
}
}
@@ -1974,6 +2045,8 @@ sub update_request_queue {
$output .= ''.$uname.' ';
}
$output .= '';
+ } elsif ($context eq 'othdombydc') {
+
} else {
$output .= ''.&mt("For the following course/community requests an error occurred when updating the requestor's own requests record:").'
';
foreach my $cnum (@warn_approves,@warn_rejects) {
@@ -2003,7 +2076,12 @@ sub update_request_queue {
my ($escuname) = split(/_/,$item);
$output .= ''.&unescape($escuname).' ';
}
- $output .= ' ';
+ $output .= '';
+ } elsif ($context eq 'othdombydc') {
+ $output .= ''.
+ &mt("For the following queued role assignments an error occurred when removing the item from the queue:").
+ '
'.&get_othdombydc_results('dequeue_error',\@warn_dels).' '.
+ '';
} else {
$output .= ''.&mt("For the following course/community requests an error occurred when removing requests from the pending queue:").'
';
foreach my $cnum (@warn_dels) {
@@ -2019,6 +2097,61 @@ sub update_request_queue {
}
}
return $output;
+}
+
+sub get_othdombydc_results {
+ my ($action,$items,$results,$requestedby,$for_requester) = @_;
+ return unless (ref($items) eq 'ARRAY');
+ unless ($action eq 'dequeue_error') {
+ return unless ((ref($results) eq 'HASH') && (ref($requestedby) eq 'HASH') &&
+ (ref($for_requester) eq 'HASH'));
+ }
+ my $output;
+ foreach my $item (@{$items}) {
+ my ($extent,$role,$uname,$udom);
+ if ($action eq 'approved') {
+ (my $num,$extent,$role,$uname,$udom) = split(/:/,$item);
+ } elsif ($action eq 'rejected') {
+ ($extent,$role,$uname,$udom) = split(/:/,$item);
+ } elsif ($action eq 'dequeue_error') {
+ (my $oldstatus,$uname,$extent,$role) = split(/:/,$item);
+ $udom = $env{'request.role.domain'};
+ }
+ my @text = (&mt('User: [_1]',$uname));
+ if (($role eq 'ca') || ($role eq 'aa')) {
+ my $plainrole = &Apache::lonnet::plaintext($role);
+ my ($audom,$auname) = ($extent =~ m{^/($match_domain)/($match_username)$});
+ my $title = &Apache::loncommon::plainname($auname,$audom);
+ push(@text,(&mt('Role: [_1]',$plainrole),
+ &mt('Domain: [_1]',&Apache::lonnet::domain($audom)),
+ &mt('Authoring Space belonging to: [_1]',$title)));
+ } elsif ($extent =~ m{^/($match_domain)/$}) {
+ my $domain = $1;
+ my $plainrole = &Apache::lonnet::plaintext($role);
+ if (&Apache::lonnet::domain($domain) ne '') {
+ push(@text,(&mt('Role: [_1]',$plainrole),
+ &mt('Domain: [_1]',&Apache::lonnet::domain($domain))));
+ }
+ } else {
+ my ($crsdom,$crsnum,$csec) = ($extent =~ m{^/($match_domain)/($match_courseid)(?:|/([^/]+)$)});
+ if (($crsdom ne '') && ($crsnum ne '')) {
+ my %info = &Apache::lonnet::coursedescription("$crsdom/$crsnum");
+ my $plainrole = &Apache::lonnet::plaintext($role,$info{'type'});
+ push(@text,(&mt('Role: [_1]',$plainrole),
+ &mt('Domain: [_1]',&Apache::lonnet::domain($crsdom)),
+ &mt("$info{'type'}: [_1]",$info{'description'})));
+ if ($csec ne '') {
+ push(@text,&mt('Section: [_1]',$csec));
+ }
+ }
+ }
+ $output .= ' ';
+ unless ($action eq 'dequeue_error') {
+ push(@{$results->{$requestedby->{$item}}},join("\n",@text));
+ $for_requester->{$requestedby->{$item}} = 1;
+ }
+ }
+ return $output;
}
sub requester_roles {