'.&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.').'
'.&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.').'
';
- 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 ($secondary eq 'user') {
+ $output .= "\n".''."\n";
}
- $output .= '
';
+ }
if ($context eq 'course') {
$output .= &mt('There are currently no enrollment requests awaiting approval.');
} elsif (($context eq 'pending') || ($context eq 'displaypending')) {
@@ -593,24 +601,28 @@ sub display_queued_requests {
$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');
+ $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 queued pending approval');
+ $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 queued pending approval');
+ $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 queued pending approval');
+ $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('There are currently no pending role assignments for you in other domains, queued pending your acceptance of the role.');
+ $output .= &mt('No role assignments for you in other domains currently awaiting your acceptance');
} elsif ($secondary eq 'domain') {
- $output .= &mt('There are currently no pending role assignments in other domains, queued pending domain coordinator approval in this 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.');
}
- $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('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,
@@ -895,7 +1182,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 +1265,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.',
- }];
+ } 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';
@@ -1158,7 +1434,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);
@@ -1230,144 +1505,176 @@ sub update_request_queue {
}
push(@toremove,@invalidusers);
} elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) {
+ my ($num,$extent,$role,$uname,$udom,$key,$logmsg,$result);
if ($context eq 'othdombydc') {
- my ($num,$extent,$role,$uname,$udom) = split(/:/,$item);
- my ($logmsg,$result);
+ ($num,$extent,$role,$uname,$udom) = split(/:/,$item);
if ($udom eq $cdom) {
- my $key = $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);
- }
- }
+ $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;
}
- }
- } 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"}) {
- $result =
- &Apache::loncommon::commit_standardrole($udom,$uname,$extent,$role,$start,
- $end,$crsdom,$crsnum,'',
- $reqcontext);
- }
- }
+ 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 =~ 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 '')) {
+ }
+ } 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 (&requester_has_perm($crsdom,$crsnum,$mrole,$requesteractive{$requester})) {
- $result = &Apache::loncommon::commit_customrole($udom,$uname,$extent,$crudom,$cruname,
- $rolename,$start,$end,$reqcontext);
+ if ($requesteractive{$requester}{"$crsnum:$crsdom:$role"}) {
+ ($logmsg,$result) =
+ &Apache::loncommon::commit_standardrole($udom,$uname,$extent,$role,$start,
+ $end,$crsdom,$crsnum,'',
+ $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 {
+ }
+ } 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;
}
- 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})) {
- $result =
- &Apache::loncommon::commit_standardrole($udom,$uname,$extent,$role,$start,
- $end,$crsdom,$crsnum,$csec,
- $reqcontext,$credits);
- }
- }
- }
+ } else {
+ $typeok = 1;
}
- } else {
- my ($domain) = ($extent =~ m{^/($match_domain)/});
- if (&Apache::lonnet::domain($domain) ne '') {
+ if ($typeok) {
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);
+ 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);
+ }
}
}
}
- last;
+ } 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);
}
}
}
}
- if ($result eq 'ok') {
- 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);
@@ -1514,8 +1821,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 +1876,48 @@ sub update_request_queue {
push(@warn_rejects,$uname);
}
} elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) {
-#FIXME
+ 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.'_'.$queue}) eq 'HASH') {
@@ -1658,13 +2004,31 @@ sub update_request_queue {
}
}
}
- @toremove = map {$_.'_approval'} (@toremove);
- my $delresult = &Apache::lonnet::del_dom($namespace,\@toremove,$cdom);
+ 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);
}
@@ -1711,7 +2075,6 @@ sub update_request_queue {
my $userlink =
&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$cdom),$uname,$cdom);
$output .= '
'.$userlink.'
';
-
}
$output .= '';
}
@@ -1755,7 +2118,65 @@ sub update_request_queue {
$approvedlist,$rejectedlist);
}
} elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) {
-#FIXME
+ 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 .= '
';
+ }
+ 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 .= '
';
+ }
+ 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) {
@@ -1798,7 +2219,8 @@ sub update_request_queue {
}
}
} else {
- if (($context eq 'requestauthor') || ($context eq 'requestusername')) {
+ if (($context eq 'requestauthor') || ($context eq 'requestusername') ||
+ ($context eq 'othdombydc') || ($context eq 'othdombyuser')) {
push(@warn_dels,@changes);
}
}
@@ -1974,6 +2396,21 @@ sub update_request_queue {
$output .= '
'.$uname.'
';
}
$output .= '';
+ } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) {
+ my $msg;
+ if ($context eq 'othdombydc') {
+ $msg = &mt("For the following assignments of roles in other domain(s) for users from this domain, an error occurred when updating status in the pending queue");
+ } elsif ($context eq 'othdombyuser') {
+ $msg = &mt("For the following assignments of roles in other domain(s), an error occurred when updating status in the pending queue");
+ }
+ $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 +2440,17 @@ sub update_request_queue {
my ($escuname) = split(/_/,$item);
$output .= '
'.&unescape($escuname).'
';
}
- $output .= '
';
+ $output .= '';
+ } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) {
+ my $msg;
+ if ($context eq 'othdombydc') {
+ $msg = &mt("For the following queued role assignments an error occurred when removing the item from the queue:");
+ } elsif ($context eq 'othdombyuser') {
+ $msg = &mt("For the following role assignments pending approval an error occurred when removing the item from the queue:");
+ }
+ $output .= '