--- loncom/interface/loncoursequeueadmin.pm	2022/11/23 02:55:37	1.63
+++ loncom/interface/loncoursequeueadmin.pm	2025/03/18 18:57:28	1.70
@@ -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.70 2025/03/18 18:57:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -271,16 +271,18 @@ sub send_selfserve_notification {
         }
     } elsif ($context eq 'othdomroleuser') {
         my $linktext = 'Roles';
-        if (&Apache::loncommon::show_course()) {
-            $linktext = 'Courses';
+        if ($notifylist =~ /^($match_username):($match_domain)$/) {
+            if (&Apache::loncommon::show_course($2,$1)) {
+                $linktext = 'Courses';
+            }
         }
         $rawsubj = 'Role Assignment Approval';
         push(@rawmsg,{
-                      mt  => 'A domain different to your own LON-CAPA domain ([_1]) wants to assign you a role in their domain.',
+                      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 ".
+                      mt =>"[_1]Click $linktext at top right, then click 'Show pending' in the gray Functions bar ".
                            "to display a list of pending role assignments in other domain(s), which you can either accept or reject.",
                       args => ["\n\n"],
                      });
@@ -295,6 +297,24 @@ 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') || ($context eq 'othdombyuser')) {
+        $rawsubj = 'Status of Role Assignment Requests';
+        if ($context eq 'othdombydc') {
+            push(@rawmsg,{
+                          mt =>'A Domain Coordinator in a domain different to your own LON-CAPA domain '.
+                               'has taken action on queued role assignment(s) in this domain for user(s) from that other domain [_1]',
+                          args => ["\n$contextdesc\n"],
+                          });
+        } elsif ($context eq 'othdombyuser') {
+            push(@rawmsg,{
+                          mt => "Action has been taken by a user to whom you had assigned role(s) ".
+                                "which had been queued, pending acceptance of the role(s).",
+                          args => [],
+                         });
+        }
+        if (ref($textstr) eq 'ARRAY') {
+            push(@rawmsg,@{$textstr});
+        }
     }
     my @to_notify = split(/,/,$notifylist);
     my $numsent = 0;
@@ -333,7 +353,11 @@ sub send_selfserve_notification {
     $message = '';
     foreach my $item (@rawmsg) {
         if (ref($item) eq 'HASH') {
-            $message .= &mt_user($sender_lh,$item->{mt},@{$item->{args}})."\n";
+            if (ref($item->{args}) eq 'ARRAY') {
+                $message .= &mt_user($sender_lh,$item->{mt},@{$item->{args}})."\n";
+            } else {
+                $message .= &mt_user($sender_lh,$item->{mt})."\n";
+            }
         }
     }
     &Apache::lonmsg::process_sent_mail($subject,'',$numsent,$stamp,$uname,$udom,$msgcount,$cid,$$,$message,
@@ -397,7 +421,7 @@ sub send_selfserve_notification {
 
 sub display_queued_requests {
     my ($context,$dom,$cnum,$secondary) = @_;
-    my ($namespace,$formaction,$nextelement,%requesthash);
+    my ($namespace,$formaction,$nextelement,%requesthash,%reqstatus);
     if ($context eq 'course') {
         $formaction = '/adm/createuser';
         $namespace = 'selfenrollrequests';
@@ -415,7 +439,7 @@ sub display_queued_requests {
         $nextelement = '<input type="hidden" name="state" value="done" />';
     } 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)) {
@@ -432,12 +456,13 @@ sub display_queued_requests {
             %requesthash = &Apache::lonnet::dump($namespace,$dom,$cnum);
         }
     } elsif ($context eq 'othdomaction') {
-        $formaction = '/adm/createuser';
-        $namespace = 'queuedrolereqs';
+        $namespace = 'nohist_queuedrolereqs';
         if ($secondary eq 'domain') {
+            $formaction = '/adm/createuser';
             my $confname = &Apache::lonnet::get_domainconfiguser($dom);
             %requesthash = &Apache::lonnet::dump($namespace,$dom,$confname);
         } else {
+            $formaction = '/adm/roles';
             %requesthash = &Apache::lonnet::dump($namespace,$dom,$cnum);
         }
         $nextelement = '<input type="hidden" name="state" value="done" />';
@@ -457,9 +482,6 @@ sub display_queued_requests {
     }
     my ($output,%queue_by_date);
     if (keys(%requesthash) > 0) {
-        $output = '<form method="post" name="changequeue" action="'.$formaction.'" />'."\n".
-                  '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
-                  $nextelement."\n";
         foreach my $item (keys(%requesthash)) {
             my ($timestamp,$entry,$pending);
             if ($context eq 'course') {
@@ -479,8 +501,12 @@ sub display_queued_requests {
                     $entry = join(':',$puname,$pudom,$prole,$adj,
                                       &escape($requesthash{$item}{'requester'}),
                                       $psec);
+                } elsif ($item =~ /^status&/) {
+                    my ($dummy,$key) = split(/&/,$item,2);
+                    $reqstatus{$key} = $requesthash{$item};
                 }
             } elsif ($context eq 'othdomaction') {
+               next unless ($item =~ /^pending:/);
                if (ref($requesthash{$item}) eq 'HASH') {
                    $timestamp = $requesthash{$item}{'timestamp'};
                    $entry = &escape($item).':'.&escape($requesthash{$item}{'requester'});
@@ -507,70 +533,48 @@ sub display_queued_requests {
                 }
             }
         }
-        if (keys(%queue_by_date) > 0) {
-            if ($context eq 'course') {
-                $output .=  '<h3>'.&mt('Self-enrollment requests queued pending approval by a Coordinator').'</h3>';
-            } elsif (($context eq 'pending') || ($context eq 'displaypending')) {
-                $output .= '<h3>'.&mt('Requests for official courses queued pending validation').'</h3>'.
-                           '<p>'.&mt('Requests are validated against institutional data to confirm that the requestor is an instructor of record.').'<br />'.
-                           &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.').'</p>';
-            } elsif ($context eq 'requestauthor') {
-                $output .= '<h3>'.&mt('Requests for Authoring Space queued pending approval by a Domain Coordinator').'</h3>';
-            } elsif ($context eq 'requestusername') {
-                $output .= '<h3>'.&mt('Requests for LON-CAPA accounts queued pending approval by a Domain Coordinator').'</h3>';
-            } elsif ($context eq 'othdomqueue') {
-                if ($secondary eq 'domain') {
-                    $output .= '<h3>'.&mt('Domain role assignments for users from another domain, queued pending approval').'</h3>';
-                } elsif ($secondary eq 'author') {
-                    $output .= '<h3>'.&mt('Co-author role assignments for users from another domain, queued pending approval').'</h3>';
-                } elsif ($secondary eq 'course') {
-                    $output .= '<h3>'.&mt('Course role assignments for users from another domain, queued pending approval').'</h3>';
-                } elsif ($secondary eq 'community') {
-                    $output .= '<h3>'.&mt('Community role assignments for users from another domain, queued pending approval').'</h3>';
-                }
-            } elsif ($context eq 'othdomaction') {
-                if ($secondary eq 'user') {
-                    $output .= '<h3>'.&mt('Role assignments for you in other domains, queued pending your acceptance of the role.').'</h3>';
-                } elsif ($secondary eq 'domain') {
-                    $output .= '<h3>'.&mt('Role assignments in other domains, queued pending domain coordinator approval in this domain.').'</h3>';
-                }
-            } else {
-                $output .= '<h3>'.&mt('Course/Community requests queued pending approval by a Domain Coordinator').'</h3>';
-            } 
+    }
+    if (keys(%queue_by_date) > 0) {
+        $output = '<form method="post" name="changequeue" action="'.$formaction.'" />'."\n".
+                  '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
+                  $nextelement."\n";
+        if ($context eq 'course') {
+            $output .=  '<h3>'.&mt('Self-enrollment requests queued pending approval by a Coordinator').'</h3>';
+        } elsif (($context eq 'pending') || ($context eq 'displaypending')) {
+            $output .= '<h3>'.&mt('Requests for official courses queued pending validation').'</h3>'.
+                       '<p>'.&mt('Requests are validated against institutional data to confirm that the requestor is an instructor of record.').'<br />'.
+                       &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.').'</p>';
+        } elsif ($context eq 'requestauthor') {
+            $output .= '<h3>'.&mt('Requests for Authoring Space queued pending approval by a Domain Coordinator').'</h3>';
+        } elsif ($context eq 'requestusername') {
+            $output .= '<h3>'.&mt('Requests for LON-CAPA accounts queued pending approval by a Domain Coordinator').'</h3>';
+        } elsif ($context eq 'othdomqueue') {
+            if ($secondary eq 'domain') {
+                $output .= '<h3>'.&mt('Domain role assignments for users from another domain which were/are queued for approval').'</h3>';
+            } elsif ($secondary eq 'author') {
+                $output .= '<h3>'.&mt('Co-author role assignments for users from another domain which were/are queued for approval').'</h3>';
+            } elsif ($secondary eq 'course') {
+                $output .= '<h3>'.&mt('Course role assignments for users from another domain which were/are queued for approval').'</h3>';
+            } elsif ($secondary eq 'community') {
+                $output .= '<h3>'.&mt('Community role assignments for users from another domain which were/are queued for approval').'</h3>';
+            }
+        } elsif ($context eq 'othdomaction') {
+            unless ($secondary eq 'user') {
+                $output .= '<h3>'.&mt('Role assignments in other domains, queued pending domain coordinator approval in this domain.').'</h3>';
+            }
+        } else {
+            $output .= '<h3>'.&mt('Course/Community requests queued pending approval by a Domain Coordinator').'</h3>';
+        }
+        if ($context eq 'othdomqueue') {
+            $output .= &queued_role_display($secondary,\%queue_by_date,\%reqstatus);
+        } else {
             $output .= &build_queue_display($dom,$context,\%queue_by_date,$secondary).
                        '<input type="hidden" name="queue" value="approval" />';
-        } else {
-            $output .= '<div class="LC_info">';
-            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".'<input type="hidden" name="approvals" value="show" />'."\n";
             }
-            $output .= '</div>';
         }
         if ($context eq 'pending') {
             $output .= '<br /><input type="submit" name="validationcheck" value="'.
@@ -582,7 +586,11 @@ sub display_queued_requests {
         }
         $output .= '</form>';
     } else {
-        $output .= '<div class="LC_info">';
+        if (($context eq 'othdomaction') && ($secondary eq 'user')) { 
+            $output .= '<span class="LC_info">';
+        } else {
+            $output .= '<div class="LC_info">';
+        }
         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 .= '</div>';
+        if (($context eq 'othdomaction') && ($secondary eq 'user')) {
+            $output .= '</span>';
+        } else {
+            $output .= '</div>';
+        }
     }
     return $output;
 }
@@ -618,14 +630,14 @@ 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);
+    $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')) {
+            ($context eq 'helpdesk')) {
         $output .= '<th>'.&mt('Action').'</th>';
     }
-    unless (($context eq 'othdomqueue') || (($context eq 'othdomaction') && ($secondary eq 'user'))) {
+    unless (($context eq 'othdomaction') && ($secondary eq 'user')) {
         $output .= '<th>'.&mt('Requestor').'</th>';
     }
     if ($context eq 'course') {
@@ -636,14 +648,6 @@ sub build_queue_display {
     } elsif ($context eq 'requestusername') {
         $output .= '<th>'.&mt('Date requested').'</th>'.
                    '<th>'.&mt('Details').'</th>';
-    } elsif ($context eq 'othdomqueue') {
-        $output .= '<th>'.&mt('Date requested').'</th>'.
-                   '<th>'.&mt('Role').'</th>';
-        if ($secondary eq 'course') {
-            $output .= '<th>'.&mt('Section').'</th>';
-        }
-        $output .= '<th>'.&mt('Requested for').'</th>'.
-                   '<th>'.&mt('Approval needed from').'</th>';
     } elsif ($context eq 'othdomaction') {
         $output .= '<th>'.&mt('Date requested').'</th>'.
                    '<th>'.&mt('Role type').'</th>'.
@@ -709,34 +713,15 @@ sub build_queue_display {
                                      "'$dom','$request','$queued'".');">'.$request.'</a>';
                         $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 ($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') {
@@ -748,13 +733,15 @@ sub build_queue_display {
                     }
                     if (($role eq 'ca') || ($role eq 'aa')) {
                         my ($audom,$auname) = ($extent =~ m{^/($match_domain)/($match_username)$});
-                        $location = &mt('Author').': '.&Apache::loncommon::plainname($auname,$audom);
+                        $location = &mt('Domain').': '.&Apache::lonnet::domain($audom,'description').'<br />'.
+                                    &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'};
+                            $location = &mt('Domain').': '.&Apache::lonnet::domain($cdom,'description').'<br />'.
+                                        &mt('Community').': '.$info{'description'};
                             $showrole = &Apache::lonnet::plaintext($role,'Community');
                         }
                     } elsif ($role =~ m{^cr/}) {
@@ -763,9 +750,10 @@ sub build_queue_display {
                         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'};
+                            $location = &mt('Domain').': '.&Apache::lonnet::domain($cdom,'description').'<br />'. 
+                                        &mt($crstype).': '.$info{'description'};
                             if ($csec ne '') {
-                                $location .= ' '.&mt('Section').': '.$csec;
+                                $location .= '<br />'.&mt('Section').': '.$csec;
                             }
                         }
                     } else {
@@ -776,13 +764,14 @@ sub build_queue_display {
                                     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'};
+                                        $location = &mt('Domain').': '.&Apache::lonnet::domain($cdom,'description').'<br />'.
+                                                    &mt($crstype).': '.$info{'description'};
                                         if ($csec ne '') {
-                                            $location .= ' '.&mt('Section').': '.$csec;
+                                            $location .= '<br />'.&mt('Section').': '.$csec;
                                         }
                                     }
                                 } else {
-                                    my ($domain)  = ($extent =~ m{^/($match_domain)/});
+                                    my ($domain)  = ($extent =~ m{^/($match_domain)/$});
                                     $location = &mt('Domain').': '.&Apache::lonnet::domain($domain,'description');
                                 }
                                 last;
@@ -827,7 +816,7 @@ sub build_queue_display {
                                 $ownername,$ownerdom);
                 }
                 unless (($context eq 'pending') || ($context eq 'displaypending') || 
-                        ($context eq 'helpdesk') || ($context eq 'othdomqueue')) {
+                        ($context eq 'helpdesk')) {
                     $row = '<td><span class="LC_nobreak"><label>'.
                            '<input type="radio" value="'.$approve.'" name="'.$count.'radioreq" />'.&mt('Approve').'</label>'.
                            '<label>'.('&nbsp;'x2).
@@ -836,7 +825,7 @@ sub build_queue_display {
                            '<input type="radio" value="'."later:".$reject.'" name="'.$count.'radioreq" checked />'.&mt('Decide Later').
                            '</label></span><br /></td>';
                 }
-                unless (($context eq 'othdomqueue') || ($context eq 'othdomaction')) {
+                unless ($context eq 'othdomaction') {
                     $row .= '<td>'.$namelink.'</td>'."\n";
                 }
                 if ($context eq 'course') {
@@ -847,14 +836,6 @@ sub build_queue_display {
                 } elsif ($context eq 'requestusername') {
                     $row .= '<td>'.$showtime.'</td>'."\n".
                             '<td>'.$detailslink.'</td>'."\n";
-                } elsif ($context eq 'othdomqueue') {
-                    $row .= '<td>'.$showtime.'</td>'."\n".
-                            '<td>'.$showrole.'</td>'."\n";
-                    if ($secondary eq 'course') {
-                        $row .= '<td>'.$showsec.'</td>'."\n";
-                    }
-                    $row .= '<td>'.$namelink.'</td>'."\n".
-                            '<td>'.$adjudicator.'</td>'."\n";
                 } elsif ($context eq 'othdomaction') {
                     if ($secondary eq 'domain') {
                         $row .= '<td>'.$showrequester.'</td>'."\n";
@@ -885,6 +866,312 @@ sub build_queue_display {
     return $output;
 }
 
+sub queued_role_display {
+    my ($context,$queue,$status) = @_;
+    return unless ((ref($queue) eq 'HASH') && (ref($status) eq 'HASH'));
+    my (%curr,$minshown,$maxshown,$more_records,$crstype,$viewablesec,$output);
+    my $formname = 'changequeue';
+    if ($context eq 'course') {
+        $crstype = &Apache::loncommon::course_type();
+        my ($permission,$allowed) =
+            &Apache::lonuserutils::get_permission($context,$crstype);
+        $viewablesec = &Apache::lonuserutils::viewable_section($permission);
+        my %saveable_parameters = ('show' => 'scalar',);
+        &Apache::loncommon::store_course_settings('roles_req',
+                                                  \%saveable_parameters);
+        &Apache::loncommon::restore_course_settings('roles_req',
+                                                    \%saveable_parameters);
+    }
+
+# Create navigation javascript
+    my $jsnav = &queued_log_js($formname);
+
+    $output = (<<ENDSCRIPT);
+<script type="text/javascript">
+// <![CDATA[
+$jsnav
+// ]]>
+</script>
+ENDSCRIPT
+
+    my $now = time();
+    my $defstart = $now - (7*24*3600); #7 days ago
+    my %defaults = (
+                     page               => '1',
+                     show               => '10',
+                     role               => 'any',
+                     chgstatus          => 'any',
+                     chgadj             => 'any',
+                     rolereq_start_date => $defstart,
+                     rolereq_end_date   => $now,
+                   );
+    $more_records = 0;
+    my %lt = &othdomrole_contexts();
+
+    foreach my $item ('show','page','role','chgstatus','chgadj') {
+        $curr{$item} = $env{'form.'.$item};
+    }
+    ($curr{'rolereq_start_date'},$curr{'rolereq_end_date'}) =
+        &Apache::lonuserutils::get_dates_from_form('rolereq_start_date','rolereq_end_date');
+    foreach my $key (keys(%defaults)) {
+        if ($curr{$key} eq '') {
+            $curr{$key} = $defaults{$key};
+        }
+    }
+    $minshown = 1;
+    my $count = 0;
+    if ($curr{'show'} =~ /\D/) {
+        $curr{'page'} = 1;
+    } else {
+        $maxshown = $curr{'page'} * $curr{'show'};
+        if ($curr{'page'} > 1) {
+            $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
+        }
+    }
+    $output .= &print_filter_menu($context,'changequeue',\%curr,$crstype);
+
+    my $showntableheader = 0;
+
+    # Table Header
+    my $tableheader =
+              &Apache::loncommon::start_data_table().
+              &Apache::loncommon::start_data_table_header_row().
+              '<th>'.&mt('Date requested').'</th>'.
+              '<th>'.&mt('Role').'</th>';
+    if ($context eq 'course') {
+        $tableheader .= '<th>'.&mt('Section').'</th>';
+    }
+    $tableheader .= '<th>'.&mt('Requested for').'</th>'.
+                    '<th>'.&mt('Request status').'</th>'.
+                    '<th>'.&mt('Adjudicator').'</th>'.
+                    &Apache::loncommon::end_data_table_header_row();
+
+    my @sortedtimes = sort {$a <=> $b} (keys(%{$queue}));
+    my $count = 0;
+    foreach my $item (@sortedtimes) {
+        next if (($item < $curr{'rolereq_start_date'}) ||
+                 ($item > $curr{'rolereq_end_date'}));
+        if (ref($queue->{$item}) eq 'ARRAY') {
+            foreach my $request (sort(@{$queue->{$item}})) {
+                if ($curr{'show'} !~ /\D/) {
+                    if ($count >= $curr{'page'} * $curr{'show'}) {
+                        $more_records = 1;
+                        last;
+                    }
+                }
+                my ($showtime,$showsec,$namelink,$showrole,$showadj,
+                    $showstatus,$id);
+                $showtime = &Apache::lonlocal::locallocaltime($item);
+                my ($uname,$udom,$role,$adj,$requester,$sec) = split(/:/,$request);
+                $id = join(':',($uname,$udom,$role));
+                if ($context eq 'course') {
+                    $id .= ':'.$sec;
+                }
+                if ($curr{'role'} ne 'any') {
+                    if ($curr{'role'} eq 'cr') {
+                        next unless ($role =~ m{^cr/});
+                    } else {
+                        next unless ($role eq $curr{'role'});
+                    }
+                }
+                if ($curr{'chgstatus'} ne 'any') {
+                    next if ($status->{$id} ne $curr{'chgstatus'});
+                }
+                if ($curr{'chgadj'} ne 'any') {
+                    next if ($adj ne $curr{'chgadj'});
+                }
+                if (($context eq 'course') && ($viewablesec ne '')) {
+                    next if ($sec ne $viewablesec);
+                }
+                $count ++;
+                next if ($count < $minshown);
+                unless ($showntableheader) {
+                    $output .= $tableheader;
+                    $showntableheader = 1;
+                }
+                $showrole = &Apache::lonnet::plaintext($role,$crstype);
+                $showstatus = $lt{$status->{$id}};
+                $showadj = $lt{$adj};
+                unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                    $namelink = &Apache::loncommon::plainname($uname,$udom)." ($uname:$udom)";
+                }
+                if ($context eq 'course') {
+                    $showsec = $sec;
+                    if ($showsec eq '') {
+                        $showsec = &mt('none');
+                    }
+                }
+                $output .= &Apache::loncommon::start_data_table_row()."\n".
+                          '<td>'.$showtime.'</td>'."\n".
+                          '<td>'.$showrole.'</td>'."\n";
+                if ($context eq 'course') {
+                    $output .= '<td>'.$showsec.'</td>'."\n";
+                }
+                $output .= '<td>'.$namelink.'</td>'."\n".
+                           '<td>'.$showstatus.'</td>'."\n".
+                           '<td>'.$showadj.'</td>'."\n".
+                           &Apache::loncommon::end_data_table_row()."\n";
+            }
+        }
+    }
+
+    if ($showntableheader) { # Table footer, if content displayed above
+        $output .= &Apache::loncommon::end_data_table().
+                   &queued_role_navlinks(\%curr,$more_records);
+    } else { # No content displayed above
+        $output .= '<p class="LC_info">'.
+                   &mt('There are no records to display.').
+                   '</p>';
+    }
+    $output .= '<input type="hidden" name="page" value="'.$curr{'page'}.'" />';
+    return $output;
+}
+
+sub queued_log_js {
+    my ($formname) = @_;
+    return <<"ENDSCRIPT";
+
+function chgPage(caller) {
+    if (caller == 'previous') {
+        document.$formname.page.value --;
+    }
+    if (caller == 'next') {
+        document.$formname.page.value ++;
+    }
+    document.$formname.submit();
+    return;
+}
+ENDSCRIPT
+}
+
+sub queued_role_navlinks {
+    my ($curr,$more_records) = @_;
+    return unless(ref($curr) eq 'HASH');
+    # Navigation Buttons
+    my $nav_links;
+    if (($curr->{'page'} > 1) || ($more_records)) {
+        $nav_links = '<p>';
+        if (($curr->{'page'} > 1) && ($curr->{'show'} !~ /\D/)) {
+            $nav_links .= '<input type="button"'
+                         .' onclick="javascript:chgPage('."'previous'".');"'
+                         .' value="'.&mt('Previous [_1] changes',$curr->{'show'})
+                         .'" /> ';
+        }
+        if ($more_records) {
+            $nav_links .= '<input type="button"'
+                         .' onclick="javascript:chgPage('."'next'".');"'
+                         .' value="'.&mt('Next [_1] changes',$curr->{'show'})
+                         .'" />';
+        }
+        $nav_links .= '</p>';
+    }
+    return $nav_links;
+}
+
+sub print_filter_menu {
+    my ($context,$formname,$curr,$crstype) = @_;
+
+    my $nolink = 1;
+    my $output = '<table><tr><td valign="top">'.
+                 '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b></span><br />'.
+                 &Apache::lonmeta::selectbox('show',$curr->{'show'},'','',undef,
+                                              (&mt('all'),5,10,20,50,100,1000,10000)).
+                 '</td><td>&nbsp;&nbsp;</td>';
+    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 .= '<td valign="top"><b>'.&mt('Time window in which role was requested').':</b><br />'.
+               '<table><tr><td>'.&mt('After:').
+               '</td><td>'.$startform.'</td></tr>'.
+               '<tr><td>'.&mt('Before:').'</td>'.
+               '<td>'.$endform.'</td></tr></table>'.
+               '</td>'.
+               '<td>&nbsp;&nbsp;</td>'.
+               '<td valign="top"><b>'.&mt('Requested role').':</b><br />'.
+               '<select name="role"><option value="any"';
+    if ($curr->{'role'} eq 'any') {
+        $output .= ' selected="selected"';
+    }
+    $output .= '>'.&mt('Any').'</option>'."\n";
+    my @roles = &Apache::lonuserutils::roles_by_context($context,1,$crstype);
+    foreach my $role (@roles) {
+        my $plrole;
+        if ($role eq 'cr') {
+            $plrole = &mt('Custom Role');
+        } else {
+            $plrole=&Apache::lonnet::plaintext($role,$crstype);
+        }
+        my $selstr = '';
+        if ($role eq $curr->{'role'}) {
+            $selstr = ' selected="selected"';
+        }
+        $output .= '  <option value="'.$role.'"'.$selstr.'>'.$plrole.'</option>';
+    }
+    $output .= '</select></td>'.
+               '<td>&nbsp;&nbsp;</td>'.
+               '<td valign="top"><b>'.
+               &mt('Request status').':</b><br />'.
+               '<select name="chgstatus">'.
+               '<option value="any"';
+    if ($curr->{'chgstatus'} eq 'any') {
+        $output .= ' selected="selected"';
+    }
+    $output .= '>'.&mt('Any').'</option>'."\n";
+    my @possstatus = ('pending','approved','rejected');
+    foreach my $statustype (@possstatus) {
+        my $selstr = '';
+        if ($curr->{'chgstatus'} eq $statustype) {
+            $selstr = ' selected="selected"';
+        }
+        $output .= '<option value="'.$statustype.'"'.$selstr.'>'.$lt{$statustype}.'</option>'."\n";
+    }
+    $output .= '</select></td>'.
+               '<td>&nbsp;&nbsp;</td>'.
+               '<td valign="top"><b>'.
+               &mt('Adjudicator').':</b><br />'.
+               '<select name="chgadj">'.
+               '<option value="any"';
+    if ($curr->{'adj'} eq 'any') {
+        $output .= ' selected="selected"';
+    }
+    $output .= '>'.&mt('Any').'</option>'."\n";
+    my @possadj = ('domain','user');
+    foreach my $adjtype (@possadj) {
+        my $selstr = '';
+        if ($curr->{'chgadj'} eq $adjtype) {
+            $selstr = ' selected="selected"';
+        }
+        $output .= '<option value="'.$adjtype.'"'.$selstr.'>'.$lt{$adjtype}.'</option>'."\n";
+    }
+    $output .= '</select></td>'
+              .'</tr></table>';
+
+    # Update Display button
+    $output .= '<p>'.
+               '<input type="submit" value="'.&mt('Update Display').'" />'.
+               '</p>'.
+               '<hr />';
+    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 .= '<li>'.$userlink.'</li>';
-                        
                     }
                     $output .= '</ul></p>';
                 }
@@ -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 .= '<p>'.$msg.'<ul>'.
+                               &get_othdomby_results($context,'approved',\@completed,\%approvals_by_requester,\%requestedby,\%for_requester).
+                               '</ul></p>';
+                }
+                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 .= '<p>'.$msg.'<ul>'.
+                               &get_othdomby_results($context,'rejected',\@rejectedreqs,\%rejections_by_requester,\%requestedby,\%for_requester).
+                               '</ul></p>';
+                }
+                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 .= '<li>'.$uname.'</li>';
             }
             $output .= '</ul></p>';
+        } 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 .= '<p>'.$msg.'<ul>';
+            if (@warn_approves) {
+                $output .= &get_othdomby_results($context,'dequeue_error',\@warn_approves);
+            }
+            if (@warn_rejects) {
+                $output .= &get_othdomby_results($context,'dequeue_error',\@warn_rejects);
+            }
+            $output .= '</ul></p>';
         } else {
             $output .= '<p>'.&mt("For the following course/community requests an error occurred when updating the requestor's own requests record:").'<ul>';
             foreach my $cnum (@warn_approves,@warn_rejects) {
@@ -2003,7 +2440,17 @@ sub update_request_queue {
                 my ($escuname) = split(/_/,$item);
                 $output .= '<li>'.&unescape($escuname).'</li>';
             }
-            $output .= '</ul></p>';            
+            $output .= '</ul></p>';
+        } 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 .= '<p>'.$msg.
+                       '<ul>'.&get_othdomby_results($context,'dequeue_error',\@warn_dels).'</ul>'.
+                       '</p>';
         } else {
             $output .= '<p>'.&mt("For the following course/community requests an error occurred when removing requests from the pending queue:").'<ul>';
             foreach my $cnum (@warn_dels) {
@@ -2021,6 +2468,128 @@ sub update_request_queue {
     return $output;
 }
 
+sub get_othdomby_results {
+    my ($context,$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') {
+            if ($context eq 'othdombydc') {
+                (my $num,$extent,$role,$uname,$udom) = split(/:/,$item);
+            } elsif ($context eq 'othdombyuser') {
+                (my $num,$extent,$role) = split(/:/,$item);
+            }
+        } elsif ($action eq 'rejected') {
+            if ($context eq 'othdombydc') {
+                ($extent,$role,$uname,$udom) = split(/:/,$item);
+            } elsif ($context eq 'othdombyuser') {
+                ($extent,$role) = split(/:/,$item);
+            }
+        } elsif ($action eq 'dequeue_error') {
+            if ($context eq 'othdombydc') {
+                if ($item =~ /^\d+:/) {
+                   (my $num,$extent,$role,$uname,$udom) = split(/:/,$item);
+                } elsif ($item =~ /^pending:/) {
+                    (my $oldstatus,$uname,$extent,$role) = split(/:/,$item);
+                    $udom = $env{'request.role.domain'};
+                } else {
+                    ($extent,$role,$uname,$udom) = split(/:/,$item);
+                }
+            } elsif ($context eq 'othdombyuser') {
+                if ($item =~ /^\d+:/) {
+                    (my $num,$extent,$role) = split(/:/,$item);
+                } elsif ($item =~ /^pending:/) {
+                    (my $oldstatus,$extent,$role) = split(/:/,$item);
+                } else {
+                    ($extent,$role) = split(/:/,$item);
+                }
+            }
+        }
+        if ($context eq 'othdombyuser') {
+            $uname = $env{'user.name'};
+            $udom = $env{'user.domain'};
+        }
+        my (@text,@msgs);
+        if ($context eq 'othdombydc') {
+            push(@text,&mt('User: [_1]',$uname));
+            push(@msgs,{ mt => '[_1]User: [_2]',
+                         args => ["\n",$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);
+            my $domdesc = &Apache::lonnet::domain($audom);
+            push(@text,(&mt('Role: [_1]',$plainrole),
+                        &mt('Domain: [_1]',$domdesc),
+                        &mt('Authoring Space belonging to: [_1]',$title)));
+            push(@msgs,{ mt => 'Role: [_1]',
+                         args => [$plainrole],
+                       },
+                       { mt => 'Domain: [_1]',
+                         args => [$domdesc],
+                       },
+                       { mt => 'Authoring Space belonging to: [_1]',
+                         args => ["$title\n"],
+                       });
+        } elsif ($extent =~ m{^/($match_domain)/$}) {
+            my $domain = $1;
+            my $domdesc = &Apache::lonnet::domain($domain);
+            my $plainrole = &Apache::lonnet::plaintext($role);
+            if ($domdesc ne '') {
+                push(@text,(&mt('Role: [_1]',$plainrole),
+                            &mt('Domain: [_1]',$domdesc)));
+                push(@msgs,{ mt => 'Role: [_1]',
+                             args => [$plainrole],
+                           },
+                           { mt => 'Domain: [_1]',
+                             args => ["$domdesc\n"],
+                           });
+            }
+        } 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'});
+                my $domdesc = &Apache::lonnet::domain($crsdom);
+                push(@text,(&mt('Role: [_1]',$plainrole),
+                            &mt('Domain: [_1]',$domdesc),
+                            &mt("$info{'type'}: [_1]",$info{'description'})));
+                push(@msgs,{ mt => 'Role: [_1]',
+                             args => [$plainrole],
+                           },
+                           { mt => 'Domain: [_1]',
+                             args => [$domdesc],
+                           });
+                if ($csec ne '') {
+                    push(@text,&mt('Section: [_1]',$csec));
+                    push(@msgs,{ mt => "$info{'type'}: [_1]",
+                                 args => [$info{'description'}],
+                               },
+                               { mt => 'Section: [_1]',
+                                 args => ["$info{'description'}\n"],
+                               });
+                } else {
+                    push(@msgs,{ mt => "$info{'type'}: [_1]",
+                                 args => ["$info{'description'}\n"],
+                               });
+                }
+            }
+        }
+        $output .= '<li><ul><li>'.join('</li><li>',@text).'</li></ul></li>';
+        unless ($action eq 'dequeue_error') {
+            push(@{$results->{$requestedby->{$item}}},@msgs);
+            $for_requester->{$requestedby->{$item}} = 1;
+        }
+    }
+    return $output;
+}
+
 sub requester_roles {
     my ($requname,$requdom,$activeroles) = @_;
     if (ref($activeroles) eq 'HASH') {
@@ -2084,12 +2653,12 @@ sub course_creation {
             (ref($longroles) eq 'HASH')) {
         return ('error: Invalid request');
     }
-    my ($result,$ownername,$ownerdom);
+    my ($result,$ownername,$ownerdom,$autocoowner);
     my $crstype = $details->{'crstype'};
     my $coursedesc = $details->{'cdescr'};
     my $accessstart = $details->{'accessstart'};
     my $accessend = $details->{'accessend'};
-    my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$dom);
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses','autoenroll'],$dom);
     if (ref($domconfig{'requestcourses'}) eq 'HASH') {
         if (ref($domconfig{'requestcourses'}{'uniquecode'}) eq 'HASH') {
             if ($domconfig{'requestcourses'}{'uniquecode'}{$crstype}) {
@@ -2097,6 +2666,9 @@ sub course_creation {
             }
         }
     }
+    if (ref($domconfig{'autoenroll'}) eq 'HASH') {
+        $autocoowner = $domconfig{'autoenroll'}{'co-owners'};
+    }
     if ($context eq 'domain') {
         $ownername = $details->{'owner'};
         $ownerdom  = $details->{'domain'};
@@ -2126,6 +2698,66 @@ sub course_creation {
         $postprocess = &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,$result,$ownername,
                                                            $ownerdom,$fullname,$coursedesc,$code,
                                                            $accessstart,$accessend,$customhash);
+        if ($autocoowner) {
+            my $instcode = $details->{'instcode'};
+            if (($instcode ne '') && (ref($reqdetails{'users'}) eq 'HASH')) {
+                my @posscoowners;
+                my $now = time;
+                foreach my $person (keys(%{$reqdetails{'users'}})) {
+                    my ($uname,$udom) = split(/:/,$person);
+                    next if (($udom ne $dom) || (($uname eq $ownername) && ($udom eq $ownerdom)));
+                    if ((&Apache::lonnet::homeserver($uname,$udom,1) ne 'no_host') &&
+                        (ref($reqdetails{'users'}{$person}) eq 'HASH')) {
+                        if ((grep(/^cc$/,keys(%{$reqdetails{'users'}{$person}}))) &&
+                            (ref($reqdetails{'users'}{$person}{'cc'}) eq 'HASH')) {
+                            my $start = $reqdetails{'users'}{$person}{'cc'}{'start'};
+                            my $end = $reqdetails{'users'}{$person}{'cc'}{'end'};
+                            if ((($start eq '') || ($start <= $now)) &&
+                                (($end eq '') || ($end >= $now))) {
+                                push(@posscoowners,$person);
+                            }
+                        }
+                    }
+                }
+                my @coowners;
+                if (@posscoowners) {
+                    foreach my $user (@posscoowners) {
+                        my ($checkcc,$desc) =
+                            &Apache::lonnet::auto_validate_instcode($cnum,$dom,$instcode,$user);
+                        unless ($checkcc eq 'valid') {
+                            if (ref($reqdetails{'crosslists'}) eq 'HASH') {
+                                foreach my $key (keys(%{$reqdetails{'crosslists'}})) {
+                                    if (ref($reqdetails{'crosslists'}{$key}) eq 'HASH') {
+                                        my $inst_crosslist = $reqdetails{'crosslists'}{$key}{'inst'};
+                                        if ($inst_crosslist ne '') {
+                                            $checkcc =
+                                                &Apache::lonnet::auto_validate_inst_crosslist($cnum,$dom,$instcode,
+                                                                                              $inst_crosslist,$user);
+                                            last if ($checkcc eq 'valid');
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        if ($checkcc eq 'valid') {
+                            if (@coowners > 0) {
+                                unless (grep(/^\Q$user\E$/,@coowners)) {
+                                    push(@coowners,$user);
+                                }
+                            } else {
+                                push(@coowners,$user);
+                            }
+                        }
+                    }
+                }
+                if (@coowners > 0) {
+                    my $chome = &Apache::lonnet::homeserver($cnum,$dom);
+                    unless ($chome eq 'no_host') {
+                        &Apache::lonnet::store_coowners($dom,$cnum,$chome,'',@coowners);
+                    }
+                }
+            }
+        }
     } else {
         $result = 'error: '.$cid;
     }
@@ -2722,7 +3354,7 @@ sub postprocess_crsenv {
         my %needcrsidput = (
                               'internal.selfenroll_types'      => 1,
                               'internal.selfenroll_start_date' => 1,
-                              'internal. selfenroll_end_date'  => 1,
+                              'internal.selfenroll_end_date'   => 1,
                            );
         my (@needupdate,%newcrsenv);
         foreach my $key (keys(%{$postprocessenv})) {