--- loncom/interface/loncreateuser.pm	2020/09/09 02:16:05	1.406.2.19
+++ loncom/interface/loncreateuser.pm	2025/01/13 01:00:58	1.483
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.406.2.19 2020/09/09 02:16:05 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.483 2025/01/13 01:00:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -70,7 +70,9 @@ use Apache::lonlocal;
 use Apache::longroup;
 use Apache::lonuserutils;
 use Apache::loncoursequeueadmin;
+use Apache::lonviewcoauthors;
 use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities;
 
 my $loginscript; # piece of javascript used in two separate instances
 my $authformnop;
@@ -78,9 +80,10 @@ my $authformkrb;
 my $authformint;
 my $authformfsys;
 my $authformloc;
+my $authformlti;
 
 sub initialize_authen_forms {
-    my ($dom,$formname,$curr_authtype,$mode) = @_;
+    my ($dom,$formname,$curr_authtype,$mode,$readonly) = @_;
     my ($krbdef,$krbdefdom) = &Apache::loncommon::get_kerberos_defaults($dom);
     my %param = ( formname => $formname,
                   kerb_def_dom => $krbdefdom,
@@ -88,7 +91,7 @@ sub initialize_authen_forms {
                   domain => $dom,
                 );
     my %abv_auth = &auth_abbrev();
-    if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix):(.*)$/) {
+    if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix|lti):(.*)$/) {
         my $long_auth = $1;
         my $curr_autharg = $2;
         my %abv_auth = &auth_abbrev();
@@ -101,12 +104,16 @@ sub initialize_authen_forms {
             $param{'mode'} = $mode;
         }
     }
+    if ($readonly) {
+        $param{'readonly'} = 1;
+    }
     $loginscript  = &Apache::loncommon::authform_header(%param);
     $authformkrb  = &Apache::loncommon::authform_kerberos(%param);
     $authformnop  = &Apache::loncommon::authform_nochange(%param);
     $authformint  = &Apache::loncommon::authform_internal(%param);
     $authformfsys = &Apache::loncommon::authform_filesystem(%param);
     $authformloc  = &Apache::loncommon::authform_local(%param);
+    $authformlti  = &Apache::loncommon::authform_lti(%param);
 }
 
 sub auth_abbrev {
@@ -116,6 +123,7 @@ sub auth_abbrev {
                      internal  => 'int',
                      localauth => 'loc',
                      unix      => 'fsys',
+                     lti       => 'lti',
                    );
     return %abv_auth;
 }
@@ -123,14 +131,82 @@ sub auth_abbrev {
 # ====================================================
 
 sub user_quotas {
-    my ($ccuname,$ccdomain) = @_;
+    my ($ccuname,$ccdomain,$name) = @_;
     my %lt = &Apache::lonlocal::texthash(
-                   'usrt'      => "User Tools",
                    'cust'      => "Custom quota",
                    'chqu'      => "Change quota",
     );
-   
-    my $quota_javascript = <<"END_SCRIPT";
+    my ($output,$longinsttype);
+    my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($ccdomain);
+    my %titles = &Apache::lonlocal::texthash (
+                    portfolio => "Disk space allocated to user's portfolio files",
+                    author    => "Disk space allocated to user's Authoring Space",
+                 );
+    my ($currquota,$quotatype,$inststatus,$defquota) =
+        &Apache::loncommon::get_user_quota($ccuname,$ccdomain,$name);
+    if ($longinsttype eq '') {
+        if ($inststatus ne '') {
+            if ($usertypes->{$inststatus} ne '') {
+                $longinsttype = $usertypes->{$inststatus};
+            }
+        }
+    }
+    my ($showquota,$custom_on,$custom_off,$defaultinfo,$colspan);
+    $custom_on = ' ';
+    $custom_off = ' checked="checked" ';
+    $colspan = ' colspan="2"';
+    if ($quotatype eq 'custom') {
+        $custom_on = $custom_off;
+        $custom_off = ' ';
+        $showquota = $currquota;
+        if ($longinsttype eq '') {
+            $defaultinfo = &mt('For this user, the default quota would be [_1]'
+                              .' MB.',$defquota);
+        } else {
+            $defaultinfo = &mt("For this user, the default quota would be [_1]".
+                               " MB,[_2]as determined by the user's institutional".
+                               " affiliation ([_3]).",$defquota,'<br />',$longinsttype);
+        }
+    } else {
+        if ($longinsttype eq '') {
+            $defaultinfo = &mt('For this user, the default quota is [_1]'
+                              .' MB.',$defquota);
+        } else {
+            $defaultinfo = &mt("For this user, the default quota of [_1]".
+                               " MB,[_2]is determined by the user's institutional".
+                               " affiliation ([_3]).",$defquota,'<br />'.$longinsttype);
+        }
+    }
+
+    if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
+        $output .= '<tr class="LC_info_row">'."\n".
+                   '    <td'.$colspan.'>'.$titles{$name}.'</td>'."\n".
+                   '  </tr>'."\n".
+                   &Apache::loncommon::start_data_table_row()."\n".
+                   '  <td'.$colspan.'><span class="LC_nobreak">'.
+                   &mt('Current quota: [_1] MB',$currquota).'</span>&nbsp;&nbsp;'.
+                   $defaultinfo.'</td>'."\n".
+                   &Apache::loncommon::end_data_table_row()."\n".
+                   &Apache::loncommon::start_data_table_row()."\n".
+                   '<td'.$colspan.'><span class="LC_nobreak">'.$lt{'chqu'}.
+                   ': <label>'.
+                   '<input type="radio" name="custom_'.$name.'quota" id="custom_'.$name.'quota_off" '.
+                   'value="0" '.$custom_off.' onchange="javascript:quota_changes('."'custom','$name'".');"'.
+                   ' /><span class="LC_nobreak">'.
+                   &mt('Default ([_1] MB)',$defquota).'</span></label>&nbsp;'.
+                   '&nbsp;<label><input type="radio" name="custom_'.$name.'quota" id="custom_'.$name.'quota_on" '.
+                   'value="1" '.$custom_on.'  onchange="javascript:quota_changes('."'custom','$name'".');"'.
+                   ' />'.$lt{'cust'}.':</label>&nbsp;'.
+                   '<input type="text" name="'.$name.'quota" id="'.$name.'quota" size ="5" '.
+                   'value="'.$showquota.'" onfocus="javascript:quota_changes('."'quota','$name'".');"'.
+                   ' />&nbsp;'.&mt('MB').'</span></td>'."\n".
+                   &Apache::loncommon::end_data_table_row()."\n";
+    }
+    return $output;
+}
+
+sub user_quota_js {
+    return  <<"END_SCRIPT";
 <script type="text/javascript">
 // <![CDATA[
 function quota_changes(caller,context) {
@@ -154,95 +230,65 @@ function quota_changes(caller,context) {
 // ]]>
 </script>
 END_SCRIPT
-    my $longinsttype;
-    my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($ccdomain);
-    my $output = $quota_javascript."\n".
-                 '<h3>'.$lt{'usrt'}.'</h3>'."\n".
-                 &Apache::loncommon::start_data_table();
-
-    if ((&Apache::lonnet::allowed('mut',$ccdomain)) ||
-        (&Apache::lonnet::allowed('udp',$ccdomain))) {
-        $output .= &build_tools_display($ccuname,$ccdomain,'tools');
-    }
 
-    my %titles = &Apache::lonlocal::texthash (
-                    portfolio => "Disk space allocated to user's portfolio files",
-                    author    => "Disk space allocated to user's Authoring Space (if role assigned)",
-                 );
-    foreach my $name ('portfolio','author') {
-        my ($currquota,$quotatype,$inststatus,$defquota) =
-            &Apache::loncommon::get_user_quota($ccuname,$ccdomain,$name);
-        if ($longinsttype eq '') { 
-            if ($inststatus ne '') {
-                if ($usertypes->{$inststatus} ne '') {
-                    $longinsttype = $usertypes->{$inststatus};
+}
+
+sub set_custom_js {
+    return  <<"END_SCRIPT";
+
+<script type="text/javascript">
+// <![CDATA[
+function toggleCustom(form,item,name) {
+    if (document.getElementById(item)) {
+        var divid = document.getElementById(item);
+        var radioname = form.elements[name];
+        if (radioname) {
+            if (radioname.length > 0) {
+                var setvis;
+                var RegExp = /^customtext_(aboutme|blog|portfolio|portaccess|timezone|webdav|archive)\$/;
+                for (var i=0; i<radioname.length; i++) {
+                    if (radioname[i].checked == true) {
+                        if (radioname[i].value == 1) {
+                            if (RegExp.test(item)) {
+                                divid.style.display = 'inline';
+                            } else {
+                                divid.style.display = 'block';
+                            }
+                            setvis = 1;
+                        }
+                        break;
+                    }
+                }
+                if (!setvis) {
+                    divid.style.display = 'none';
                 }
             }
         }
-        my ($showquota,$custom_on,$custom_off,$defaultinfo);
-        $custom_on = ' ';
-        $custom_off = ' checked="checked" ';
-        if ($quotatype eq 'custom') {
-            $custom_on = $custom_off;
-            $custom_off = ' ';
-            $showquota = $currquota;
-            if ($longinsttype eq '') {
-                $defaultinfo = &mt('For this user, the default quota would be [_1]'
-                              .' MB.',$defquota);
-            } else {
-                $defaultinfo = &mt("For this user, the default quota would be [_1]".
-                                   " MB, as determined by the user's institutional".
-                                   " affiliation ([_2]).",$defquota,$longinsttype);
-            }
-        } else {
-            if ($longinsttype eq '') {
-                $defaultinfo = &mt('For this user, the default quota is [_1]'
-                              .' MB.',$defquota);
-            } else {
-                $defaultinfo = &mt("For this user, the default quota of [_1]".
-                                   " MB, is determined by the user's institutional".
-                                   " affiliation ([_2]).",$defquota,$longinsttype);
-            }
-        }
-
-        if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
-            $output .= '<tr class="LC_info_row">'."\n".
-                       '    <td>'.$titles{$name}.'</td>'."\n".
-                       '  </tr>'."\n".
-                       &Apache::loncommon::start_data_table_row()."\n".
-                       '  <td><span class="LC_nobreak">'.
-                       &mt('Current quota: [_1] MB',$currquota).'</span>&nbsp;&nbsp;'.
-                       $defaultinfo.'</td>'."\n".
-                       &Apache::loncommon::end_data_table_row()."\n".
-                       &Apache::loncommon::start_data_table_row()."\n".
-                       '  <td><span class="LC_nobreak">'.$lt{'chqu'}.
-                       ': <label>'.
-                       '<input type="radio" name="custom_'.$name.'quota" id="custom_'.$name.'quota_off" '.
-                       'value="0" '.$custom_off.' onchange="javascript:quota_changes('."'custom','$name'".');"'.
-                       ' /><span class="LC_nobreak">'.
-                       &mt('Default ([_1] MB)',$defquota).'</span></label>&nbsp;'.
-                       '&nbsp;<label><input type="radio" name="custom_'.$name.'quota" id="custom_'.$name.'quota_on" '.
-                       'value="1" '.$custom_on.'  onchange="javascript:quota_changes('."'custom','$name'".');"'.
-                       ' />'.$lt{'cust'}.':</label>&nbsp;'.
-                       '<input type="text" name="'.$name.'quota" id="'.$name.'quota" size ="5" '.
-                       'value="'.$showquota.'" onfocus="javascript:quota_changes('."'quota','$name'".');"'.
-                       ' />&nbsp;'.&mt('MB').'</span></td>'."\n".
-                       &Apache::loncommon::end_data_table_row()."\n";
-        }
     }
-    $output .= &Apache::loncommon::end_data_table();
-    return $output;
+    return;
+}
+// ]]>
+</script>
+
+END_SCRIPT
+
 }
 
 sub build_tools_display {
     my ($ccuname,$ccdomain,$context) = @_;
     my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay,
-        $colspan,$isadv,%domconfig);
+        $colspan,$isadv,%domconfig,@defaulteditors,@customeditors,@custommanagers,
+        @possmanagers);
     my %lt = &Apache::lonlocal::texthash (
                    'blog'       => "Personal User Blog",
                    'aboutme'    => "Personal Information Page",
-                   'webdav'     => "WebDAV access to Authoring Spaces (if SSL and author/co-author)",
+                   'webdav'     => "WebDAV access to Authoring Spaces (https)",
+                   'editors'    => "Available Editors",
+                   'managers'   => "Co-authors who can add/revoke roles",
+                   'archive'    => "Managers can download tar.gz file of Authoring Space",
                    'portfolio'  => "Personal User Portfolio",
+                   'portaccess' => "Portfolio Shareable",
+                   'timezone'   => "Can set Time Zone",
                    'avai'       => "Available",
                    'cusa'       => "availability",
                    'chse'       => "Change setting",
@@ -252,50 +298,91 @@ sub build_tools_display {
                    'unofficial' => 'Can request creation of unofficial courses',
                    'community'  => 'Can request creation of communities',
                    'textbook'   => 'Can request creation of textbook courses',
+                   'placement'  => 'Can request creation of placement tests',
+                   'lti'        => 'Can request creation of LTI courses',
                    'requestauthor'  => 'Can request author space',
+                   'edit'       => 'Standard editor (Edit)',
+                   'xml'        => 'Text editor (EditXML)',
+                   'daxe'       => 'Daxe editor (Daxe)',
     );
+    $isadv = &Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
     if ($context eq 'requestcourses') {
         %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
                       'requestcourses.official','requestcourses.unofficial',
-                      'requestcourses.community','requestcourses.textbook');
-        @usertools = ('official','unofficial','community','textbook');
+                      'requestcourses.community','requestcourses.textbook',
+                      'requestcourses.placement','requestcourses.lti');
+        @usertools = ('official','unofficial','community','textbook','placement','lti');
         @options =('norequest','approval','autolimit','validate');
         %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
         %reqtitles = &courserequest_titles();
         %reqdisplay = &courserequest_display();
-        $colspan = ' colspan="2"';
         %domconfig =
             &Apache::lonnet::get_dom('configuration',['requestcourses'],$ccdomain);
-        $isadv = &Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
     } elsif ($context eq 'requestauthor') {
-        %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
-                                                    'requestauthor');
+        %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,'requestauthor');
         @usertools = ('requestauthor');
         @options =('norequest','approval','automatic');
         %reqtitles = &requestauthor_titles();
         %reqdisplay = &requestauthor_display();
-        $colspan = ' colspan="2"';
         %domconfig =
             &Apache::lonnet::get_dom('configuration',['requestauthor'],$ccdomain);
+    } elsif ($context eq 'authordefaults') {
+        %domconfig =
+            &Apache::lonnet::get_dom('configuration',['quotas','authordefaults'],$ccdomain);
+        %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,'tools.webdav',
+                                                    'authoreditors','authormanagers',
+                                                    'authorarchive','domcoord.author');
+        @usertools = ('webdav','editors','managers','archive');
+        $colspan = ' colspan="2"';
     } else {
         %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
                           'tools.aboutme','tools.portfolio','tools.blog',
-                          'tools.webdav');
-        @usertools = ('aboutme','blog','webdav','portfolio');
+                          'tools.timezone','tools.portaccess');
+        @usertools = ('aboutme','blog','portfolio','portaccess','timezone');
+        $colspan = ' colspan="2"';
     }
     foreach my $item (@usertools) {
         my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off,
-            $currdisp,$custdisp,$custradio);
+            $currdisp,$custdisp,$custradio,$onclick,$customsty,$editorsty);
         $cust_off = 'checked="checked" ';
         $tool_on = 'checked="checked" ';
-        $curr_access =  
-            &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
-                                              $context);
+        unless (($context eq 'authordefaults') || ($item eq 'webdav')) {
+            $curr_access =
+                &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
+                                                  $context,\%userenv,'',
+                                                  {'is_adv' => $isadv});
+        }
         if ($context eq 'requestauthor') {
             if ($userenv{$context} ne '') {
                 $cust_on = ' checked="checked" ';
                 $cust_off = '';
-            }  
+            }
+        } elsif ($context eq 'authordefaults') {
+            if (($item eq 'editors') || ($item eq 'archive')) {
+                if ($userenv{'author'.$item} ne '') {
+                    $cust_on = ' checked="checked" ';
+                    $cust_off = '';
+                    if ($item eq 'archive') {
+                        $curr_access = $userenv{'author'.$item};
+                    }
+                } elsif ($item eq 'archive') {
+                    $curr_access = 0;
+                    if (ref($domconfig{'authordefaults'}) eq 'HASH') {
+                        $curr_access = $domconfig{'authordefaults'}{'archive'};
+                    }
+                }
+            } elsif ($item eq 'webdav') {
+                if ($userenv{'tools.'.$item} ne '') {
+                    $cust_on = ' checked="checked" ';
+                    $cust_off = '';
+                    $curr_access = $userenv{'tools.'.$item};
+                } else {
+                    $curr_access =
+                        &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,'reload',
+                                                          undef,\%userenv,'',
+                                                          {'is_adv' => $isadv});
+                }
+            }
         } elsif ($userenv{$context.'.'.$item} ne '') {
             $cust_on = ' checked="checked" ';
             $cust_off = '';
@@ -303,30 +390,107 @@ sub build_tools_display {
         if ($context eq 'requestcourses') {
             if ($userenv{$context.'.'.$item} eq '') {
                 $custom_access = &mt('Currently from default setting.');
+                $customsty = ' style="display:none;"';
             } else {
                 $custom_access = &mt('Currently from custom setting.');
+                $customsty = ' style="display:block;"';
             }
         } elsif ($context eq 'requestauthor') {
             if ($userenv{$context} eq '') {
                 $custom_access = &mt('Currently from default setting.');
+                $customsty = ' style="display:none;"';
             } else {
                 $custom_access = &mt('Currently from custom setting.');
+                $customsty = ' style="display:block;"';
+            }
+        } elsif ($item eq 'editors') {
+            if ($userenv{'author'.$item} eq '') {
+                if (ref($domconfig{'authordefaults'}{'editors'}) eq 'ARRAY') {
+                    @defaulteditors = @{$domconfig{'authordefaults'}{'editors'}};
+                } else {
+                    @defaulteditors = ('edit','xml');
+                }
+                $custom_access = &mt('Can use: [_1]',
+                                               join(', ', map { $lt{$_} } @defaulteditors));
+                $editorsty = ' style="display:none;"';
+            } else {
+                $custom_access = &mt('Currently from custom setting.');
+                foreach my $editor (split(/,/,$userenv{'author'.$item})) {
+                    if ($editor =~ /^(edit|daxe|xml)$/) {
+                        push(@customeditors,$editor);
+                    }
+                }
+                if (@customeditors) {
+                    if (@customeditors > 1) {
+                        $custom_access .= '<br /><span>';
+                    } else {
+                        $custom_access .= ' <span class="LC_nobreak">';
+                    }
+                    $custom_access .= &mt('Can use: [_1]',
+                                          join(', ', map { $lt{$_} } @customeditors)).
+                                      '</span>';
+                } else {
+                    $custom_access .= ' '.&mt('No available editors');
+                }
+                $editorsty = ' style="display:block;"';
+            }
+        } elsif ($item eq 'managers') {
+            my %ca_roles = &Apache::lonnet::get_my_roles($ccuname,$ccdomain,undef,
+                                                         ['active','future'],['ca']);
+            if (keys(%ca_roles)) {
+                foreach my $entry (sort(keys(%ca_roles))) {
+                    if ($entry =~ /^($match_username\:$match_domain):ca$/) {
+                        my $user = $1;
+                        unless ($user eq "$ccuname:$ccdomain") {
+                            push(@possmanagers,$user);
+                        }
+                    }
+                }
+            }
+            if ($userenv{'author'.$item} eq '') {
+                $custom_access = &mt('Currently author manages co-author roles');
+            } else {
+                if (keys(%ca_roles)) {
+                    foreach my $user (split(/,/,$userenv{'author'.$item})) {
+                        if ($user =~ /^($match_username):($match_domain)$/) {
+                            if (exists($ca_roles{$user.':ca'})) {
+                                unless ($user eq "$ccuname:$ccdomain") {
+                                    push(@custommanagers,$user);
+                                }
+                            }
+                        }
+                    }
+                }
+                if (@custommanagers) {
+                    $custom_access = &mt('Co-authors who manage co-author roles: [_1]',
+                                         join(', ',@custommanagers));
+                } else {
+                    $custom_access = &mt('Currently author manages co-author roles');
+                }
             }
         } else {
-            if ($userenv{$context.'.'.$item} eq '') {
+            my $current = $userenv{$context.'.'.$item};
+            if ($item eq 'webdav') {
+                $current = $userenv{'tools.webdav'};
+            } elsif ($item eq 'archive') {
+                $current = $userenv{'author'.$item};
+            }
+            if ($current eq '') {
                 $custom_access =
                     &mt('Availability determined currently from default setting.');
                 if (!$curr_access) {
                     $tool_off = 'checked="checked" ';
                     $tool_on = '';
                 }
+                $customsty = ' style="display:none;"';
             } else {
                 $custom_access =
                     &mt('Availability determined currently from custom setting.');
-                if ($userenv{$context.'.'.$item} == 0) {
+                if ($current == 0) {
                     $tool_off = 'checked="checked" ';
                     $tool_on = '';
                 }
+                $customsty = ' style="display:inline;"';
             }
         }
         $output .= '  <tr class="LC_info_row">'."\n".
@@ -358,6 +522,11 @@ sub build_tools_display {
             if (!$curroption) {
                 $curroption = 'norequest';
             }
+            my $name = 'crsreq_'.$item;
+            if ($context eq 'requestauthor') {
+                $name = $item;
+            }
+            $onclick = ' onclick="javascript:toggleCustom(this.form,'."'customtext_$item','custom$item'".');"';
             if ($curroption =~ /^autolimit=(\d*)$/) {
                 $currlimit = $1;
                 if ($currlimit eq '') {
@@ -368,7 +537,7 @@ sub build_tools_display {
             } else {
                 $currdisp = $reqdisplay{$curroption};
             }
-            $custdisp = '<table>';
+            $custdisp = '<fieldset id="customtext_'.$item.'"'.$customsty.'>';
             foreach my $option (@options) {
                 my $val = $option;
                 if ($option eq 'norequest') {
@@ -391,53 +560,114 @@ sub build_tools_display {
                         $checked = ' checked="checked"';
                     }
                 }
-                my $name = 'crsreq_'.$item;
-                if ($context eq 'requestauthor') {
-                    $name = $item;
+                if ($option eq 'autolimit') {
+                    $custdisp .= '<br />';
                 }
-                $custdisp .= '<tr><td><span class="LC_nobreak"><label>'.
+                $custdisp .= '<span class="LC_nobreak"><label>'.
                              '<input type="radio" name="'.$name.'" '.
                              'value="'.$val.'"'.$checked.' />'.
                              $reqtitles{$option}.'</label>&nbsp;';
                 if ($option eq 'autolimit') {
                     $custdisp .= '<input type="text" name="'.$name.
                                  '_limit" size="1" '.
-                                 'value="'.$currlimit.'" /></span><br />'.
-                                 $reqtitles{'unlimited'};
+                                 'value="'.$currlimit.'" />&nbsp;'.
+                                 $reqtitles{'unlimited'}.'</span>';
                 } else {
                     $custdisp .= '</span>';
                 }
-                $custdisp .= '</td></tr>';
+                $custdisp .= ' ';
+            }
+            $custdisp .= '</fieldset>';
+            $custradio = '<br />'.$custdisp;
+        } elsif ($item eq 'editors') {
+            $output .= '<td'.$colspan.'>'.$custom_access.'</td>'."\n".
+                       &Apache::loncommon::end_data_table_row()."\n";
+            unless (&Apache::lonnet::allowed('udp',$ccdomain)) {
+                $output .= &Apache::loncommon::start_data_table_row()."\n".
+                          '<td'.$colspan.'><span class="LC_nobreak">'.
+                          $lt{'chse'}.': <label>'.
+                          '<input type="radio" name="custom'.$item.'" value="0" '.
+                          $cust_off.' onclick="toggleCustom(this.form,'."'customtext_$item','custom$item'".');" />'.
+                          $lt{'usde'}.'</label>'.('&nbsp;' x3).
+                          '<label><input type="radio" name="custom'.$item.'" value="1" '.
+                          $cust_on.' onclick="toggleCustom(this.form,'."'customtext_$item','custom$item'".');" />'.
+                          $lt{'uscu'}.'</label></span><br />'.
+                          '<fieldset id="customtext_'.$item.'"'.$editorsty.'>';
+                foreach my $editor ('edit','xml','daxe') {
+                    my $checked;
+                    if ($userenv{'author'.$item} eq '') {
+                        if (grep(/^\Q$editor\E$/,@defaulteditors)) {
+                            $checked = ' checked="checked"';
+                        }
+                    } elsif (grep(/^\Q$editor\E$/,@customeditors)) {
+                        $checked = ' checked="checked"';
+                    }
+                    $output .= '<span style="LC_nobreak"><label>'.
+                               '<input type="checkbox" name="custom_editor" '.
+                               'value="'.$editor.'"'.$checked.' />'.
+                               $lt{$editor}.'</label></span> ';
+                }
+                $output .= '</fieldset></td>'.
+                           &Apache::loncommon::end_data_table_row()."\n";
+            }
+        } elsif ($item eq 'managers') {
+            $output .= '<td'.$colspan.'>'.$custom_access.'</td>'."\n".
+                       &Apache::loncommon::end_data_table_row()."\n";
+            unless ((&Apache::lonnet::allowed('udp',$ccdomain)) ||
+                    (($userenv{'domcoord.author'} eq 'blocked') &&
+                     (($env{'user.name'} ne $ccuname) || ($env{'user.domain'} ne $ccdomain)))) {
+                $output .=
+                    &Apache::loncommon::start_data_table_row()."\n".
+                    '<td'.$colspan.'>';
+                if (@possmanagers) {
+                    $output .= &mt('Select manager(s)').': ';
+                    foreach my $user (@possmanagers) {
+                        my $checked;
+                        if (grep(/^\Q$user\E$/,@custommanagers)) {
+                            $checked = ' checked="checked"';
+                        }
+                        $output .= '<span style="LC_nobreak"><label>'.
+                                   '<input type="checkbox" name="custommanagers" '.
+                                   'value="'.&HTML::Entities::encode($user,'\'<>"&').'"'.$checked.' />'.
+                                   $user.'</label></span> ';
+                    }
+                } else {
+                    $output .= &mt('No co-author roles assignable as manager');
+                }
+                $output .= '</td>'.
+                           &Apache::loncommon::end_data_table_row()."\n";
             }
-            $custdisp .= '</table>';
-            $custradio = '</span></td><td>'.&mt('Custom setting').'<br />'.$custdisp;
         } else {
             $currdisp = ($curr_access?&mt('Yes'):&mt('No'));
             my $name = $context.'_'.$item;
-            if ($context eq 'requestauthor') {
-                $name = $context;
-            }
+            $onclick = 'onclick="javascript:toggleCustom(this.form,'."'customtext_$item','custom$item'".');" ';
             $custdisp = '<span class="LC_nobreak"><label>'.
                         '<input type="radio" name="'.$name.'"'.
-                        ' value="1" '.$tool_on.'/>'.&mt('On').'</label>&nbsp;<label>'.
+                        ' value="1" '.$tool_on.$onclick.'/>'.&mt('On').'</label>&nbsp;<label>'.
                         '<input type="radio" name="'.$name.'" value="0" '.
-                        $tool_off.'/>'.&mt('Off').'</label></span>';
-            $custradio = ('&nbsp;'x2).'--'.$lt{'cusa'}.':&nbsp;'.$custdisp.
-                          '</span>';
-        }
-        $output .= '  <td'.$colspan.'>'.$custom_access.('&nbsp;'x4).
-                   $lt{'avai'}.': '.$currdisp.'</td>'."\n".
-                   &Apache::loncommon::end_data_table_row()."\n";
-        unless (&Apache::lonnet::allowed('udp',$ccdomain)) {
-            $output .=
+                        $tool_off.$onclick.'/>'.&mt('Off').'</label></span>';
+            $custradio = '<span id="customtext_'.$item.'"'.$customsty.' class="LC_nobreak">'.
+                         '--'.$lt{'cusa'}.':&nbsp;'.$custdisp.'</span>';
+        }
+        unless (($item eq 'editors') || ($item eq 'managers')) {
+            $output .= '  <td'.$colspan.'>'.$custom_access.('&nbsp;'x4).
+                       $lt{'avai'}.': '.$currdisp.'</td>'."\n".
+                       &Apache::loncommon::end_data_table_row()."\n";
+            unless (&Apache::lonnet::allowed('udp',$ccdomain)) {
+                $output .=
                    &Apache::loncommon::start_data_table_row()."\n".
-                   '  <td style="vertical-align:top;"><span class="LC_nobreak">'.
+                   '<td><span class="LC_nobreak">'.
                    $lt{'chse'}.': <label>'.
                    '<input type="radio" name="custom'.$item.'" value="0" '.
-                   $cust_off.'/>'.$lt{'usde'}.'</label>'.('&nbsp;' x3).
+                   $cust_off.$onclick.'/>'.$lt{'usde'}.'</label>'.('&nbsp;' x3).
                    '<label><input type="radio" name="custom'.$item.'" value="1" '.
-                   $cust_on.'/>'.$lt{'uscu'}.'</label>'.$custradio.'</td>'.
-                   &Apache::loncommon::end_data_table_row()."\n";
+                   $cust_on.$onclick.'/>'.$lt{'uscu'}.'</label></span>';
+                if ($colspan) {
+                    $output .= '</td><td>';
+                }
+                $output .= $custradio.'</td>'.
+                           &Apache::loncommon::end_data_table_row()."\n";
+            }
         }
     }
     return $output;
@@ -451,12 +681,14 @@ sub coursereq_externaluser {
                    'unofficial' => 'Can request creation of unofficial courses',
                    'community'  => 'Can request creation of communities',
                    'textbook'   => 'Can request creation of textbook courses',
+                   'placement'  => 'Can request creation of placement tests',
     );
 
     %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
                       'reqcrsotherdom.official','reqcrsotherdom.unofficial',
-                      'reqcrsotherdom.community','reqcrsotherdom.textbook');
-    @usertools = ('official','unofficial','community','textbook');
+                      'reqcrsotherdom.community','reqcrsotherdom.textbook',
+                      'reqcrsotherdom.placement');
+    @usertools = ('official','unofficial','community','textbook','placement');
     @options = ('approval','validate','autolimit');
     %validations = &Apache::lonnet::auto_courserequest_checks($cdom);
     my $optregex = join('|',@options);
@@ -523,7 +755,7 @@ sub coursereq_externaluser {
 sub domainrole_req {
     my ($ccuname,$ccdomain) = @_;
     return '<br /><h3>'.
-           &mt('User Can Request Assignment of Domain Roles?').
+           &mt('Can Request Assignment of Domain Roles?').
            '</h3>'."\n".
            &Apache::loncommon::start_data_table().
            &build_tools_display($ccuname,$ccdomain,
@@ -531,12 +763,26 @@ sub domainrole_req {
            &Apache::loncommon::end_data_table();
 }
 
+sub authoring_defaults {
+    my ($ccuname,$ccdomain) = @_;
+    return '<br /><h3>'.
+           &mt('Authoring Space defaults (if role assigned)').
+           '</h3>'."\n".
+           &Apache::loncommon::start_data_table().
+           &build_tools_display($ccuname,$ccdomain,
+                                'authordefaults').
+           &user_quotas($ccuname,$ccdomain,'author').
+           &Apache::loncommon::end_data_table();
+}
+
 sub courserequest_titles {
     my %titles = &Apache::lonlocal::texthash (
                                    official   => 'Official',
                                    unofficial => 'Unofficial',
                                    community  => 'Communities',
                                    textbook   => 'Textbook',
+                                   placement  => 'Placement Tests',
+                                   lti        => 'LTI Provider',
                                    norequest  => 'Not allowed',
                                    approval   => 'Approval by Dom. Coord.',
                                    validate   => 'With validation',
@@ -880,7 +1126,15 @@ ENDBLOCK
         (!(($env{'form.action'} eq 'singleuser') && ($context eq 'domain') &&
         (!&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))))) {
         my $defdom=$env{'request.role.domain'};
-        my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
+        my ($trusted,$untrusted);
+        if ($context eq 'course') {
+            ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$defdom);
+        } elsif ($context eq 'author') {
+            ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('othcoau',$defdom);
+        } elsif ($context eq 'domain') {
+            ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('domroles',$defdom); 
+        }
+        my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain',undef,undef,undef,$trusted,$untrusted);
         my %lt=&Apache::lonlocal::texthash(
                   'enro' => 'Enroll one student',
                   'enrm' => 'Enroll one member',
@@ -1241,8 +1495,9 @@ sub print_user_modification_page {
 
     my $groupslist = &Apache::lonuserutils::get_groupslist();
 
-    my $js = &validation_javascript($context,$ccdomain,$pjump_def,$crstype,
-                               $groupslist,$newuser,$formname,\%loaditem);
+    my $js = &validation_javascript($context,$ccdomain,$pjump_def,
+                                    $crstype,$groupslist,$newuser,
+                                    $formname,\%loaditem,$permission);
     my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$ccdomain);
     my $helpitem = 'Course_Change_Privileges';
     if ($env{'form.action'} eq 'singlestudent') {
@@ -1251,6 +1506,7 @@ sub print_user_modification_page {
         $helpitem = 'Author_Change_Privileges';
     } elsif ($context eq 'domain') {
         $helpitem = 'Domain_Change_Privileges';
+        $js .= &set_custom_js();
     }
     push (@{$brcrum},
         {href => "javascript:backPage($form)",
@@ -1275,6 +1531,33 @@ sub print_user_modification_page {
                 'bread_crumbs_component' => 'User Management'};
     if ($env{'form.popup'}) {
         $args->{'no_nav_bar'} = 1;
+        $args->{'add_modal'} = 1;
+    }
+    if (($context eq 'domain') && ($env{'request.role.domain'} eq $ccdomain)) {
+        my @toggles;
+        if (&Apache::lonnet::allowed('cau',$ccdomain)) {
+            my ($isadv,$isauthor) =
+                &Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
+            unless ($isauthor) {
+                push(@toggles,'requestauthor');
+            }
+            push(@toggles,('webdav','editors','archive'));
+        }
+        if (&Apache::lonnet::allowed('mut',$ccdomain)) {
+            push(@toggles,('aboutme','blog','portfolio','portaccess','timezone'));
+        }
+        if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
+            push(@toggles,('official','unofficial','community','textbook','placement','lti'));
+        }
+        if (@toggles) {
+            my $onload;
+            foreach my $item (@toggles) {
+                $onload .= "toggleCustom(document.cu,'customtext_$item','custom$item');";
+            }
+            $args->{'add_entries'} = {
+                                       'onload' => $onload,
+                                     };
+        }
     }
     my $start_page =
         &Apache::loncommon::start_page('User Management',$js,$args);
@@ -1312,18 +1595,36 @@ ENDFORMINFO
         }
     }
     my $title = '';
+    my $need_quota_js;
     if ($newuser) {
         my ($portfolioform,$domroleform);
         if ((&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) ||
             (&Apache::lonnet::allowed('mut',$env{'request.role.domain'}))) {
             # Current user has quota or user tools modification privileges
-            $portfolioform = '<br />'.&user_quotas($ccuname,$ccdomain);
+            $portfolioform = '<br /><h3>'.
+                             &mt('User Tools').
+                             '</h3>'."\n".
+                             &Apache::loncommon::start_data_table();
+            if (&Apache::lonnet::allowed('mut',$ccdomain)) {
+                $portfolioform .= &build_tools_display($ccuname,$ccdomain,'tools');
+            }
+            if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
+                $portfolioform .= &user_quotas($ccuname,$ccdomain,'portfolio');
+                $need_quota_js = 1;
+            }
+            $portfolioform .= &Apache::loncommon::end_data_table();
         }
         if ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) &&
             ($ccdomain eq $env{'request.role.domain'})) {
-            $domroleform = '<br />'.&domainrole_req($ccuname,$ccdomain);
+            $domroleform = &domainrole_req($ccuname,$ccdomain).
+                           &authoring_defaults($ccuname,$ccdomain);
+            $need_quota_js = 1;
+        }
+        my $readonly;
+        unless ($permission->{'cusr'}) {
+            $readonly = 1;
         }
-        &initialize_authen_forms($ccdomain,$formname);
+        &initialize_authen_forms($ccdomain,$formname,'','',$readonly);
         my %lt=&Apache::lonlocal::texthash(
                 'lg'             => 'Login Data',
                 'hs'             => "Home Server",
@@ -1354,7 +1655,7 @@ ENDTITLE
         $r->print('<h2>'.$title.'</h2>'."\n");
         $r->print('<div class="LC_left_float">');
         $r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context,
-                                         $inst_results{$ccuname.':'.$ccdomain}));
+                                         $inst_results{$ccuname.':'.$ccdomain},$readonly));
         # Option to disable student/employee ID conflict checking not offerred for new users.
         my ($home_server_pick,$numlib) = 
             &Apache::loncommon::home_server_form_item($ccdomain,'hserver',
@@ -1369,7 +1670,7 @@ $lt{'hs'}: $home_server_pick
         }
         if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
             $r->print('<br /><h3>'.
-                      &mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
+                      &mt('Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
                       &Apache::loncommon::start_data_table().
                       &build_tools_display($ccuname,$ccdomain,
                                            'requestcourses').
@@ -1465,39 +1766,61 @@ ENDAUTH
                                          $inst_results{$ccuname.':'.$ccdomain}));
         if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) ||
             (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) {
-            $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
-                      &Apache::loncommon::start_data_table());
-            if ($env{'request.role.domain'} eq $ccdomain) {
-                $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
+            $r->print('<br /><h3>'.&mt('Can Request Creation of Courses/Communities in this Domain?').'</h3>'."\n");
+            if (($env{'request.role.domain'} eq $ccdomain) ||
+                (&Apache::lonnet::will_trust('reqcrs',$ccdomain,$env{'request.role.domain'}))) {
+                $r->print(&Apache::loncommon::start_data_table());
+                if ($env{'request.role.domain'} eq $ccdomain) {
+                    $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
+                } else {
+                    $r->print(&coursereq_externaluser($ccuname,$ccdomain,
+                                                      $env{'request.role.domain'}));
+                }
+                $r->print(&Apache::loncommon::end_data_table());
             } else {
-                $r->print(&coursereq_externaluser($ccuname,$ccdomain,
-                                                  $env{'request.role.domain'}));
+                $r->print(&mt('Domain configuration for this domain prohibits course creation by users from domain: "[_1]"',
+                              &Apache::lonnet::domain($ccdomain,'description')));
             }
-            $r->print(&Apache::loncommon::end_data_table());
         }
         $r->print('</div>');
-        my @order = ('auth','quota','tools','requestauthor');
+        my @order = ('auth','quota','tools','requestauthor','authordefaults');
         my %user_text;
         my ($isadv,$isauthor) = 
             &Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
-        if ((!$isauthor) && 
-            ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) ||
+        if (((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) ||
              (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) &&
-             ($env{'request.role.domain'} eq $ccdomain)) {
-            $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);
+            ($env{'request.role.domain'} eq $ccdomain)) {
+            if (!$isauthor) {
+                $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);
+            }
+            $user_text{'authordefaults'} = &authoring_defaults($ccuname,$ccdomain);
+            if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) {
+                $need_quota_js = 1;
+            }
         }
         $user_text{'auth'} =  &user_authentication($ccuname,$ccdomain,$formname,$crstype,$permission);
         if ((&Apache::lonnet::allowed('mpq',$ccdomain)) ||
             (&Apache::lonnet::allowed('mut',$ccdomain)) ||
             (&Apache::lonnet::allowed('udp',$ccdomain))) {
+            $user_text{'quota'} = '<br /><h3>'.&mt('User Tools').'</h3>'."\n".
+                                  &Apache::loncommon::start_data_table();
+            if ((&Apache::lonnet::allowed('mut',$ccdomain)) ||
+                (&Apache::lonnet::allowed('udp',$ccdomain))) {
+                $user_text{'quota'} .= &build_tools_display($ccuname,$ccdomain,'tools');
+            }
             # Current user has quota modification privileges
-            $user_text{'quota'} = &user_quotas($ccuname,$ccdomain);
+            if ((&Apache::lonnet::allowed('mpq',$ccdomain)) ||
+                (&Apache::lonnet::allowed('udp',$ccdomain))) {
+                $user_text{'quota'} .= &user_quotas($ccuname,$ccdomain,'portfolio');
+                $need_quota_js = 1;
+            }
+            $user_text{'quota'} .= &Apache::loncommon::end_data_table();
         }
         if (!&Apache::lonnet::allowed('mpq',$ccdomain)) {
             if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
                 my %lt=&Apache::lonlocal::texthash(
-                    'dska'  => "Disk quotas for user's portfolio and Authoring Space",
-                    'youd'  => "You do not have privileges to modify the portfolio and/or Authoring Space quotas for this user.",
+                    'dska'  => "Disk quotas for user's portfolio",
+                    'youd'  => "You do not have privileges to modify the portfolio quota for this user.",
                     'ichr'  => "If a change is required, contact a domain coordinator for the domain",
                 );
                 $user_text{'quota'} = <<ENDNOPORTPRIV;
@@ -1510,7 +1833,7 @@ ENDNOPORTPRIV
             if (&Apache::lonnet::allowed('mut',$env{'request.role.domain'})) {
                 my %lt=&Apache::lonlocal::texthash(
                     'utav'  => "User Tools Availability",
-                    'yodo'  => "You do not have privileges to modify Portfolio, Blog, WebDAV, or Personal Information Page settings for this user.",
+                    'yodo'  => "You do not have privileges to modify Portfolio, Blog, Personal Information Page, or Time Zone settings for this user.",
                     'ifch'  => "If a change is required, contact a domain coordinator for the domain",
                 );
                 $user_text{'tools'} = <<ENDNOTOOLSPRIV;
@@ -1591,7 +1914,7 @@ ENDNOTOOLSPRIV
                 if ($newuser) {
                     $r->print(' onclick="auth_check()" \>'."\n");
                 } else {
-                    $r->print('onclick="this.form.submit()" \>'."\n");
+                    $r->print(' onclick="this.form.submit()" \>'."\n");
                 }
             } else {
                 $r->print('</fieldset></div>'.
@@ -1608,6 +1931,9 @@ ENDNOTOOLSPRIV
     $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
     $r->print('<input type="hidden" name="currstate" value="" />');
     $r->print('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" /></form><br /><br />');
+    if ($need_quota_js) {
+        $r->print(&user_quota_js());
+    }
     return;
 }
 
@@ -1666,14 +1992,16 @@ sub date_sections_select {
 
 sub validation_javascript {
     my ($context,$ccdomain,$pjump_def,$crstype,$groupslist,$newuser,$formname,
-        $loaditem) = @_;
+        $loaditem,$permission) = @_;
     my $dc_setcourse_code = '';
     my $nondc_setsection_code = '';
     if ($context eq 'domain') {
-        my $dcdom = $env{'request.role.domain'};
-        $loaditem->{'onload'} = "document.cu.coursedesc.value='';";
-        $dc_setcourse_code = 
-            &Apache::lonuserutils::dc_setcourse_js('cu','singleuser',$context);
+        if ((ref($permission) eq 'HASH') && ($permission->{'cusr'})) {
+            my $dcdom = $env{'request.role.domain'};
+            $loaditem->{'onload'} = "document.cu.coursedesc.value='';";
+            $dc_setcourse_code =
+                &Apache::lonuserutils::dc_setcourse_js('cu','singleuser',$context);
+        }
     } else {
         my $checkauth; 
         if (($newuser) || (&Apache::lonnet::allowed('mau',$ccdomain))) {
@@ -1745,7 +2073,12 @@ sub display_existing_roles {
                 next unless (($rnum eq $env{'course.'.$env{'request.course.id'}.'.num'})
                              && ($rdom eq $env{'course.'.$env{'request.course.id'}.'.domain'}));
             } elsif ($context eq 'author') {
-                next unless (($rnum eq $env{'user.name'}) && ($rdom eq $env{'request.role.domain'}));
+                if ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) {
+                    my ($audom,$auname) = ($1,$2);
+                    next unless (($rnum eq $auname) && ($rdom eq $audom));
+                } else {
+                    next unless (($rnum eq $env{'user.name'}) && ($rdom eq $env{'request.role.domain'}));
+                }
             }
             my ($newkey,$newvalue,$newrole);
             $newkey = '/'.$rdom.'/'.$rnum;
@@ -1905,6 +2238,8 @@ sub display_existing_roles {
             $area=~m{/($match_domain)/($match_username)};
             if (&Apache::lonuserutils::authorpriv($2,$1)) {
                 $allowed=1;
+            } elsif (&Apache::lonuserutils::coauthorpriv($2,$1)) {
+                $allowed=1;
             } else {
                 $allowed=0;
             }
@@ -2007,6 +2342,9 @@ sub display_existing_roles {
             }
         } elsif ($env{'request.role'} =~ /^au\./) {
             $contextrole = &mt('Existing Co-Author Roles in your Authoring Space');
+        } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)/$}) {
+            $contextrole = &mt('Existing Co-Author Roles in [_1] Authoring Space',
+                               '<i>'.$1.'_'.$2.'</i>');
         } else {
             if ($showall) {
                 $contextrole = &mt('Existing Roles in this Domain');
@@ -2048,13 +2386,25 @@ sub new_coauthor_roles {
     #
     # Co-Author
     #
-    if (&Apache::lonuserutils::authorpriv($env{'user.name'},
-                                          $env{'request.role.domain'}) &&
-        ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain)) {
+    my ($cuname,$cudom);
+    if (($env{'request.role'} eq "au./$env{'user.domain'}/") ||
+        ($env{'request.role'} eq "dc./$env{'user.domain'}/")) {
+        $cuname=$env{'user.name'};
+        $cudom=$env{'request.role.domain'};
         # No sense in assigning co-author role to yourself
-        $addrolesdisplay = 1;
-        my $cuname=$env{'user.name'};
-        my $cudom=$env{'request.role.domain'};
+        if ((&Apache::lonuserutils::authorpriv($cuname,$cudom)) &&
+            ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain)) {
+            $addrolesdisplay = 1;
+        }
+    } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) {
+        ($cudom,$cuname) = ($1,$2);
+        if ((&Apache::lonuserutils::coauthorpriv($cuname,$cudom)) &&
+            ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain) &&
+            ($cudom ne $ccdomain || $cuname ne $ccuname)) {
+            $addrolesdisplay = 1;
+        }
+    }
+    if ($addrolesdisplay) {
         my %lt=&Apache::lonlocal::texthash(
                     'cs'   => "Authoring Space",
                     'act'  => "Activate",
@@ -2109,6 +2459,17 @@ sub new_coauthor_roles {
              ($env{'user.domain'} eq $ccdomain)) {
             $r->print(&mt('Assigning yourself a co-author or assistant co-author role in your own author area in Authoring Space is not permitted'));
         }
+    } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) {
+        if (!(&Apache::lonuserutils::coauthorpriv($2,$1))) {
+            $r->print('<span class="LC_error">'.
+                      &mt('You do not have privileges to assign co-author roles.').
+                      '</span>');
+        } elsif (($env{'user.name'} eq $ccuname) &&
+             ($env{'user.domain'} eq $ccdomain)) {
+            $r->print(&mt('Assigning yourself a co-author or assistant co-author role in an author area in Authoring Space in which you already have a co-author role is not permitted'));
+        } elsif (($cudom eq $ccdomain) && ($cuname eq $ccuname)) {
+            $r->print(&mt("Assigning a co-author or assistant co-author role to an Authoring Space's author is not permitted"));
+        }
     }
     return $addrolesdisplay;;
 }
@@ -2129,11 +2490,20 @@ sub new_domain_roles {
     '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'.
     &Apache::loncommon::end_data_table_header_row();
     my @allroles = &Apache::lonuserutils::roles_by_context('domain');
+    my $uprimary = &Apache::lonnet::domain($env{'request.role.domain'},'primary');
+    my $uintdom = &Apache::lonnet::internet_dom($uprimary);
     foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) {
         foreach my $role (@allroles) {
             next if ($role eq 'ad');
             next if (($role eq 'au') && ($ccdomain ne $thisdomain));
             if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) {
+               if ($role eq 'dc') {
+                   unless ($thisdomain eq $env{'request.role.domain'}) {
+                       my $domprim = &Apache::lonnet::domain($thisdomain,'primary');
+                       my $intdom = &Apache::lonnet::internet_dom($domprim);
+                       next unless ($uintdom eq $intdom);
+                   }
+               }
                my $plrole=&Apache::lonnet::plaintext($role);
                my %lt=&Apache::lonlocal::texthash(
                     'ssd'  => "Set Start Date",
@@ -2175,7 +2545,7 @@ sub user_authentication {
                    'ld'    => "Login Data"
     );
     # Check for a bad authentication type
-    if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) {
+    if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth|lti):/) {
         # bad authentication scheme
         if (&Apache::lonnet::allowed('mau',$ccdomain)) {
             &initialize_authen_forms($ccdomain,$formname);
@@ -2202,6 +2572,7 @@ $lt{'uuas'} ($currentauth). $lt{'adcs'}.
 ENDBADAUTH
         }
     } else { # Authentication type is valid
+        
         &initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser');
         my ($authformcurrent,$can_modify,@authform_others) =
             &modify_login_block($ccdomain,$currentauth);
@@ -2290,6 +2661,8 @@ ENDJS
                     $result = &mt('Currently using local (institutional) authentication.');
                 } elsif ($currentauth =~ /^unix:/) {
                     $result = &mt('Currently Filesystem Authenticated.');
+                } elsif ($currentauth =~ /^lti:/) {
+                    $result = &mt('Currently LTI authenticated.');
                 }
                 $outcome = '<h3>'.$lt{'ld'}.'</h3>'.
                            &Apache::loncommon::start_data_table().
@@ -2328,6 +2701,9 @@ sub modify_login_block {
         if ($can_assign{'loc'}) {
             push(@authform_others,$authformloc);
         }
+        if ($can_assign{'lti'}) {
+            push(@authform_others,$authformlti);
+        }
         if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
             $show_override_msg = 1;
         }
@@ -2339,6 +2715,9 @@ sub modify_login_block {
         if ($can_assign{'loc'}) {
             push(@authform_others,$authformloc);
         }
+        if ($can_assign{'lti'}) {
+            push(@authform_others,$authformlti);
+        }
         if ($can_assign{'int'}) {
             $show_override_msg = 1;
         }
@@ -2353,6 +2732,9 @@ sub modify_login_block {
         if ($can_assign{'loc'}) {
             push(@authform_others,$authformloc);
         }
+        if ($can_assign{'lti'}) {
+            push(@authform_others,$authformlti);
+        }
         if ($can_assign{'fsys'}) {
             $show_override_msg = 1;
         }
@@ -2364,9 +2746,23 @@ sub modify_login_block {
         if ($can_assign{'int'}) {
             push(@authform_others,$authformint);
         }
+        if ($can_assign{'lti'}) {
+            push(@authform_others,$authformlti);
+        }
         if ($can_assign{'loc'}) {
             $show_override_msg = 1;
         }
+    } elsif ($currentauth=~/^lti:/) {
+        $authformcurrent=$authformlti;
+        if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
+            push(@authform_others,$authformkrb);
+        }
+        if ($can_assign{'int'}) {
+            push(@authform_others,$authformint);
+        }
+        if ($can_assign{'loc'}) {
+            push(@authform_others,$authformloc);
+        }
     }
     if ($show_override_msg) {
         $authformcurrent = '<table><tr><td colspan="3">'.$authformcurrent.
@@ -2381,9 +2777,9 @@ sub modify_login_block {
 }
 
 sub personal_data_display {
-    my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,
-        $now,$captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded) = @_;
-    my ($output,%userenv,%canmodify,%canmodify_status);
+    my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$readonly,$rolesarray,$now,
+        $captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded,$showsubmit) = @_;
+    my ($output,%userenv,%canmodify,%canmodify_status,$disabled);
     my @userinfo = ('firstname','middlename','lastname','generation',
                     'permanentemail','id');
     my $rowcount = 0;
@@ -2452,6 +2848,8 @@ sub personal_data_display {
             %canmodify = &selfcreate_canmodify($context,$ccdomain,\@userinfo,
                                                $inst_results,$rolesarray);
         }
+    } elsif ($readonly) {
+        $disabled = ' disabled="disabled"';
     }
 
     my $genhelp=&Apache::loncommon::help_open_topic('Generation');
@@ -2465,7 +2863,7 @@ sub personal_data_display {
             } else {
                 undef($condition);
             }
-        }
+        } 
         if ($excluded) {
             unless ($excluded =~ /^\@[^\@]+$/) {
                 undef($condition);
@@ -2492,8 +2890,8 @@ sub personal_data_display {
         }
         $rowcount ++;
         $output .= &Apache::lonhtmlcommon::row_closure(1);
-        my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="off" />';
-        my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="20" autocomplete="off" />';
+        my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="new-password" />';
+        my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="20" autocomplete="new-password" />';
         $output .= &Apache::lonhtmlcommon::row_title(&mt('Password').'<b>*</b>',
                                                     'LC_pick_box_title',
                                                     'LC_oddrow_value')."\n".
@@ -2505,12 +2903,13 @@ sub personal_data_display {
                    $upasstwo.
                    &Apache::lonhtmlcommon::row_closure()."\n";
         if ($usernameset eq 'free') {
-            my $onclick = "toggleUsernameDisp(this,'selfcreateusername');";
+            my $onclick = "toggleUsernameDisp(this,'selfcreateusername');"; 
             $output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n".
-                       &mt('Use e-mail address: ').
-                       '<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'.&mt('Yes').'</label>'."\n".
-                       ('&nbsp;'x2).
-                       '<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'.&mt('No').'</label>'."\n".
+                       '<span class="LC_nobreak">'.&mt('Use e-mail address: ').
+                       '<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'.
+                       &mt('Yes').'</label>'.('&nbsp;'x2).
+                       '<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'.
+                       &mt('No').'</label></span>'."\n".
                        '<div id="selfcreateusername" style="display: none; font-size: smaller">'.
                        '<br /><span class="LC_nobreak">'.&mt('Preferred username').
                        '&nbsp;<input type="text" name="username" value="" size="20" autocomplete="off"/>'.
@@ -2518,6 +2917,24 @@ sub personal_data_display {
             $rowcount ++;
         }
     }
+    my %shownfields;
+    if ($env{'request.role.domain'} ne $ccdomain) {
+        my %shownfields_by_type =
+            &Apache::lonuserutils::get_othdom_shownfields($ccdomain,\@userinfo);
+        my @types = split(/:/,$userenv{'inststatus'});
+        if (@types == 0) {
+            @types = ('default');
+        }
+        foreach my $type (@types) {
+            if (ref($shownfields_by_type{$type}) eq 'HASH') {
+                foreach my $field (keys(%{$shownfields_by_type{$type}})) {
+                    if ($shownfields_by_type{$type}{$field}) {
+                        $shownfields{$field} = 1;
+                    }
+                }
+            }
+        }
+    }
     foreach my $item (@userinfo) {
         my $rowtitle = $lt{$item};
         my $hiderow = 0;
@@ -2538,7 +2955,7 @@ sub personal_data_display {
                             $hiderow = 1;
                         }
                     } else {
-                        $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                        $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value=""'.$disabled.' />';
                     }
                 }
             } else {
@@ -2554,7 +2971,7 @@ sub personal_data_display {
                         $hiderow = 1;
                     }
                 } else {
-                    $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                    $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value=""'.$disabled.' />';
                 }
             }
         } else {
@@ -2564,7 +2981,15 @@ sub personal_data_display {
                     $row .= '<br />'.&Apache::lonuserutils::forceid_change($context);
                 }
             } else {
-                $row .= $userenv{$item};
+                if ($env{'request.role.domain'} ne $ccdomain) {
+                    if ($shownfields{$item}) {
+                        $row .= $userenv{$item};
+                    } else {
+                        $row .= &mt('not shown');
+                    }
+                } else {
+                    $row .= $userenv{$item};
+                }
             }
         }
         $row .= &Apache::lonhtmlcommon::row_closure(1);
@@ -2618,12 +3043,17 @@ sub personal_data_display {
                        &Apache::lonhtmlcommon::row_closure(1); 
             $rowcount ++;
         }
-        my $submit_text = &mt('Create account');
-        $output .= &Apache::lonhtmlcommon::row_title()."\n".
-                   '<br /><input type="submit" name="createaccount" value="'.
-                   $submit_text.'" />'.
-                   '<input type="hidden" name="type" value="'.$usertype.'" />'.
-                   &Apache::lonhtmlcommon::row_closure(1);
+        if ($showsubmit) {
+            my $submit_text = &mt('Create account');
+            $output .= &Apache::lonhtmlcommon::row_title()."\n".
+                       '<br /><input type="submit" name="createaccount" value="'.
+                       $submit_text.'" />';
+            if ($usertype ne '') {
+                $output .= '<input type="hidden" name="type" value="'.
+                           &HTML::Entities::encode($usertype,'\'<>"&').'" />';
+            }
+            $output .= &Apache::lonhtmlcommon::row_closure(1);
+        }
     }
     $output .= &Apache::lonhtmlcommon::end_pick_box();
     if (wantarray) {
@@ -2825,6 +3255,9 @@ sub update_user_data {
 	$amode='localauth';
 	$genpwd=$env{'form.locarg'};
 	$genpwd=" " if (!$genpwd);
+    } elsif ($env{'form.login'} eq 'lti') {
+        $amode='lti';
+        $genpwd=" ";
     } elsif (($env{'form.login'} eq 'nochange') ||
              ($env{'form.login'} eq ''        )) { 
         # There is no need to tell the user we did not change what they
@@ -2843,9 +3276,10 @@ sub update_user_data {
 
     my (%alerts,%rulematch,%inst_results,%curr_rules);
     my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
-    my @usertools = ('aboutme','blog','webdav','portfolio');
-    my @requestcourses = ('official','unofficial','community','textbook');
+    my @usertools = ('aboutme','blog','portfolio','portaccess','timezone');
+    my @requestcourses = ('official','unofficial','community','textbook','placement','lti');
     my @requestauthor = ('requestauthor');
+    my @authordefaults = ('webdav','editors','archive');
     my ($othertitle,$usertypes,$types) = 
         &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
     my %canmodify_status =
@@ -2954,6 +3388,35 @@ sub update_user_data {
                                                     $newcustom{'requestauthor'},
                                                     \%changeHash,'requestauthor');
                 }
+                if ($env{'form.customeditors'} == 1) {
+                    my @editors;
+                    my @posseditors = &Apache::loncommon::get_env_multiple('form.custom_editor');
+                    if (@posseditors) {
+                        foreach my $editor (@posseditors) {
+                            if (grep(/^\Q$editor\E$/,@posseditors)) {
+                                unless (grep(/^\Q$editor\E$/,@editors)) {
+                                    push(@editors,$editor);
+                                }
+                            }
+                        }
+                    }
+                    if (@editors) {
+                        @editors = sort(@editors);
+                        $changed{'editors'} = &tool_admin('editors',join(',',@editors),
+                                                          \%changeHash,'authordefaults');
+                    }
+                }
+                if ($env{'form.customwebdav'} == 1) {
+                    $newcustom{'webdav'} = $env{'form.authordefaults_webdav'};
+                    $changed{'webdav'} = &tool_admin('webdav',$newcustom{'webdav'},
+                                                     \%changeHash,'authordefaults');
+                }
+                if ($env{'form.customarchive'} == 1) {
+                    $newcustom{'archive'} = $env{'form.authordefaults_archive'};
+                    $changed{'archive'} = &tool_admin('archive',$newcustom{'archive'},
+                                                      \%changeHash,'authordefaults');
+
+                }
             }
             if ($canmodify_status{'inststatus'}) {
                 if (exists($env{'form.inststatus'})) {
@@ -2971,7 +3434,7 @@ sub update_user_data {
                 my $chgresult =
                      &Apache::lonnet::put('environment',\%changeHash,
                                           $env{'form.ccdomain'},$env{'form.ccuname'});
-            } 
+            }
         }
         $r->print('<br />'.&mt('Home Server').': '.$uhome.' '.
                   &Apache::lonnet::hostname($uhome));
@@ -2992,7 +3455,7 @@ sub update_user_data {
 		  ($env{'form.ccuname'},$env{'form.ccdomain'}));
 	} else {
 	    # Okay, this is a non-fatal error.
-	    $r->print($error.&mt('You do not have privileges to modify the authentication configuration for this user.').$end);    
+	    $r->print($error.&mt('You do not have privileges to modify the authentication configuration for this user.').$end);
 	}
     } elsif (($env{'form.intarg'} ne '') &&
              (&Apache::lonnet::queryauthenticate($env{'form.ccuname'},$env{'form.ccdomain'}) =~ /^internal:/) &&
@@ -3019,17 +3482,25 @@ sub update_user_data {
         my %userenv = &Apache::lonnet::get
             ('environment',['firstname','middlename','lastname','generation',
              'id','permanentemail','portfolioquota','authorquota','inststatus',
-             'tools.aboutme','tools.blog','tools.webdav','tools.portfolio',
+             'tools.aboutme','tools.blog','tools.webdav',
+             'tools.portfolio','tools.timezone','tools.portaccess',
+             'authormanagers','authoreditors','authorarchive','requestauthor',
              'requestcourses.official','requestcourses.unofficial',
              'requestcourses.community','requestcourses.textbook',
+             'requestcourses.placement','requestcourses.lti',
              'reqcrsotherdom.official','reqcrsotherdom.unofficial',
              'reqcrsotherdom.community','reqcrsotherdom.textbook',
-             'requestauthor'],
+             'reqcrsotherdom.placement','domcoord.author'],
               $env{'form.ccdomain'},$env{'form.ccuname'});
         my ($tmp) = keys(%userenv);
         if ($tmp =~ /^(con_lost|error)/i) { 
             %userenv = ();
         }
+        unless (($userenv{'domcoord.author'} eq 'blocked') &&
+                (($env{'user.name'} ne $env{'form.ccuname'}) ||
+                 ($env{'user.domain'} ne $env{'form.ccdomain'}))) {
+            push(@authordefaults,'managers');
+        }
         my $no_forceid_alert;
         # Check to see if user information can be changed
         my %domconfig =
@@ -3054,7 +3525,7 @@ sub update_user_data {
                 }
             } elsif ($context eq 'author') {
                 if ($rolenum eq $auname && $roledom eq $audom) {
-                    if (!grep(/^\Q$role\E$/,@userroles)) { 
+                    if (!grep(/^\Q$role\E$/,@userroles)) {
                         push(@userroles,$role);
                     }
                 }
@@ -3152,7 +3623,7 @@ sub update_user_data {
             %oldsettingstatus,%newsettingstatus);
         @disporder = ('inststatus');
         if ($env{'request.role.domain'} eq $env{'form.ccdomain'}) {
-            push(@disporder,'requestcourses','requestauthor');
+            push(@disporder,('requestcourses','requestauthor','authordefaults'));
         } else {
             push(@disporder,'reqcrsotherdom');
         }
@@ -3180,6 +3651,7 @@ sub update_user_data {
         }
         if (&Apache::lonnet::allowed('cau',$env{'form.ccdomain'})) {
             $canshow{'requestauthor'} = 1;
+            $canshow{'authordefaults'} = 1;
         }
         my (%changeHash,%changed);
         if ($oldinststatus eq '') {
@@ -3288,8 +3760,14 @@ sub update_user_data {
             if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) {
                 &tool_changes('requestcourses',\@requestcourses,\%oldsettings,\%oldsettingstext,
                               \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
-                &tool_changes('requestauthor',\@requestauthor,\%oldsettings,\%oldsettingstext,
-                              \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
+                my ($isadv,$isauthor) =
+                    &Apache::lonnet::is_advanced_user($env{'form.ccdomain'},$env{'form.ccuname'});
+                unless ($isauthor) {
+                    &tool_changes('requestauthor',\@requestauthor,\%oldsettings,\%oldsettingstext,
+                                  \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
+                }
+                &tool_changes('authordefaults',\@authordefaults,\%oldsettings,\%oldsettingstext,
+                                  \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
             } else {
                 &tool_changes('reqcrsotherdom',\@requestcourses,\%oldsettings,\%oldsettingstext,
                               \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
@@ -3307,33 +3785,135 @@ sub update_user_data {
         if ((keys(%namechanged) > 0) || (keys(%changed) > 0)) {
             my ($chgresult,$namechgresult);
             if (keys(%changed) > 0) {
-                $chgresult = 
+                $chgresult =
                     &Apache::lonnet::put('environment',\%changeHash,
                                   $env{'form.ccdomain'},$env{'form.ccuname'});
                 if ($chgresult eq 'ok') {
+                    my ($ca_mgr_del,%ca_mgr_add);
+                    if ($changed{'managers'}) {
+                        my (@adds,@dels);
+                        if ($changeHash{'authormanagers'} eq '') {
+                            @dels = split(/,/,$userenv{'authormanagers'});
+                        } elsif ($userenv{'authormanagers'} eq '') {
+                            @adds = split(/,/,$changeHash{'authormanagers'});
+                        } else {
+                            my @old = split(/,/,$userenv{'authormanagers'});
+                            my @new = split(/,/,$changeHash{'authormanagers'});
+                            my @diffs = &Apache::loncommon::compare_arrays(\@old,\@new);
+                            if (@diffs) {
+                                foreach my $user (@diffs) {
+                                    if (grep(/^\Q$user\E$/,@old)) {
+                                        push(@dels,$user);
+                                    } elsif (grep(/^\Q$user\E$/,@new)) {
+                                        push(@adds,$user);
+                                    }
+                                }
+                            }
+                        }
+                        my $key = "internal.manager./$env{'form.ccdomain'}/$env{'form.ccuname'}";
+                        if (@dels) {
+                            foreach my $user (@dels) {
+                                if ($user =~ /^($match_username):($match_domain)$/) {
+                                    &Apache::lonnet::del('environment',[$key],$2,$1);
+                                }
+                            }
+                            my $curruser = $env{'user.name'}.':'.$env{'user.domain'};
+                            if (grep(/^\Q$curruser\E$/,@dels)) {
+                                $ca_mgr_del = $key;
+                            }
+                        }
+                        if (@adds) {
+                            foreach my $user (@adds) {
+                                if ($user =~ /^($match_username):($match_domain)$/) {
+                                    &Apache::lonnet::put('environment',{$key => 1},$2,$1);
+                                }
+                            }
+                            my $curruser = $env{'user.name'}.':'.$env{'user.domain'};
+                            if (grep(/^\Q$curruser\E$/,@adds)) {
+                                $ca_mgr_add{$key} = 1;
+                            }
+                        }
+                    }
                     if (($env{'user.name'} eq $env{'form.ccuname'}) &&
                         ($env{'user.domain'} eq $env{'form.ccdomain'})) {
-                        my %newenvhash;
+                        my (%newenvhash,$got_domdefs,%domdefaults,$got_userenv,
+                            %userenv);
+                        my @fromenv = keys(%changed);
+                        push(@fromenv,'inststatus');
                         foreach my $key (keys(%changed)) {
-                            if (($key eq 'official') || ($key eq 'unofficial')
-                                || ($key eq 'community') || ($key eq 'textbook')) {
+                            if (($key eq 'official') || ($key eq 'unofficial') ||
+                                ($key eq 'community') || ($key eq 'textbook') ||
+                                ($key eq 'placement') || ($key eq 'lti')) {
                                 $newenvhash{'environment.requestcourses.'.$key} =
                                     $changeHash{'requestcourses.'.$key};
                                 if ($changeHash{'requestcourses.'.$key}) {
                                     $newenvhash{'environment.canrequest.'.$key} = 1;
                                 } else {
+                                    unless ($got_domdefs) {
+                                        %domdefaults =
+                                            &Apache::lonnet::get_domain_defaults($env{'user.domain'});
+                                        $got_domdefs = 1;
+                                    }
+                                    unless ($got_userenv) {
+                                        %userenv =
+                                            &Apache::lonnet::userenvironment($env{'user.domain'},
+                                                                             $env{'user.name'},@fromenv);
+                                        $got_userenv = 1;
+                                    }
                                     $newenvhash{'environment.canrequest.'.$key} =
           &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
-                                            $key,'reload','requestcourses');
+                                            $key,'reload','requestcourses',\%userenv,\%domdefaults);
                                 }
                             } elsif ($key eq 'requestauthor') {
                                 $newenvhash{'environment.'.$key} = $changeHash{$key};
                                 if ($changeHash{$key}) {
                                     $newenvhash{'environment.canrequest.author'} = 1;
                                 } else {
+                                    unless ($got_domdefs) {
+                                        %domdefaults =
+                                           &Apache::lonnet::get_domain_defaults($env{'user.domain'});
+                                        $got_domdefs = 1;
+                                    }
+                                    unless ($got_userenv) {
+                                        %userenv =
+                                            &Apache::lonnet::userenvironment($env{'user.domain'},
+                                                                             $env{'user.name'},@fromenv);
+                                        $got_userenv = 1;
+                                    }
                                     $newenvhash{'environment.canrequest.author'} =
           &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
-                                            $key,'reload','requestauthor');
+                                            $key,'reload','requestauthor',\%userenv,\%domdefaults);
+                                }
+                            } elsif ($key eq 'editors') {
+                                $newenvhash{'environment.author'.$key} = $changeHash{'author'.$key};
+                                if ($env{'form.customeditors'}) {
+                                    $newenvhash{'environment.editors'} = $changeHash{'author'.$key};
+                                } else {
+                                    unless ($got_domdefs) {
+                                        %domdefaults =
+                                            &Apache::lonnet::get_domain_defaults($env{'user.domain'});
+                                        $got_domdefs = 1;
+                                    }
+                                    if ($domdefaults{'editors'} ne '') {
+                                        $newenvhash{'environment.editors'} = $domdefaults{'editors'};
+                                    } else {
+                                        $newenvhash{'environment.editors'} = 'edit,xml';
+                                    }
+                                }
+                            } elsif ($key eq 'archive') {
+                                $newenvhash{'environment.author.'.$key} =
+                                    $changeHash{'author.'.$key};
+                                if ($changeHash{'author.'.$key} ne '') {
+                                    $newenvhash{'environment.canarchive'} =
+                                        $changeHash{'author.'.$key};
+                                } else {
+                                    unless ($got_domdefs) {
+                                        %domdefaults =
+                                           &Apache::lonnet::get_domain_defaults($env{'user.domain'});
+                                        $got_domdefs = 1;
+                                    }
+                                    $newenvhash{'environment.canarchive'} =
+                                        $domdefaults{'archive'};
                                 }
                             } elsif ($key ne 'quota') {
                                 $newenvhash{'environment.tools.'.$key} = 
@@ -3342,15 +3922,37 @@ sub update_user_data {
                                     $newenvhash{'environment.availabletools.'.$key} =
                                         $changeHash{'tools.'.$key};
                                 } else {
+                                    unless ($got_domdefs) {
+                                        %domdefaults =
+                                           &Apache::lonnet::get_domain_defaults($env{'user.domain'});
+                                        $got_domdefs = 1;
+                                    }
+                                    unless ($got_userenv) {
+                                        %userenv =
+                                            &Apache::lonnet::userenvironment($env{'user.domain'},
+                                                                             $env{'user.name'},@fromenv);
+                                        $got_userenv = 1;
+                                    }
                                     $newenvhash{'environment.availabletools.'.$key} =
           &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
-          $key,'reload','tools');
+                                            $key,'reload','tools',\%userenv,\%domdefaults);
                                 }
                             }
                         }
                         if (keys(%newenvhash)) {
                             &Apache::lonnet::appenv(\%newenvhash);
                         }
+                    } else {
+                        if ($ca_mgr_del) {
+                            &Apache::lonnet::delenv($ca_mgr_del);
+                        }
+                        if (keys(%ca_mgr_add)) {
+                            &Apache::lonnet::appenv(\%ca_mgr_add);
+                        }
+                    }
+                    if ($changed{'aboutme'}) {
+                        &Apache::loncommon::devalidate_aboutme_cache($env{'form.ccuname'},
+                                                                     $env{'form.ccdomain'});
                     }
                 }
             }
@@ -3382,7 +3984,7 @@ sub update_user_data {
                                   \%newsettingstext);
                 if ($env{'form.cid'} ne $userenv{'id'}) {
                     &Apache::lonnet::idput($env{'form.ccdomain'},
-                         {$env{'form.ccuname'} => $env{'form.cid'}});
+                         {$env{'form.ccuname'} => $env{'form.cid'}},$uhome,'ids');
                     if (($recurseid) &&
                         (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
                         my $idresult = 
@@ -3521,14 +4123,24 @@ sub display_userinfo {
          'webdav'         => 'WebDAV Availability',
          'aboutme'        => 'Personal Information Page Availability',
          'portfolio'      => 'Portfolio Availability',
+         'portaccess'     => 'Portfolio Shareable',
+         'timezone'       => 'Can set own Time Zone',
          'official'       => 'Can Request Official Courses',
          'unofficial'     => 'Can Request Unofficial Courses',
          'community'      => 'Can Request Communities',
          'textbook'       => 'Can Request Textbook Courses',
+         'placement'      => 'Can Request Placement Tests',
+         'lti'            => 'Can Request LTI Courses',
          'requestauthor'  => 'Can Request Author Role',
          'inststatus'     => "Affiliation",
          'prvs'           => 'Previous Value:',
-         'chto'           => 'Changed To:'
+         'chto'           => 'Changed To:',
+         'editors'        => "Available Editors in Authoring Space",
+         'managers'       => "Co-authors who can add/revoke roles",
+         'archive'        => "Managers can download tar.gz file of Authoring Space",
+         'edit'           => 'Standard editor (Edit)',
+         'xml'            => 'Text editor (EditXML)',
+         'daxe'           => 'Daxe editor (Daxe)',
     );
     if ($changed) {
         $r->print('<h3>'.$lt{'uic'}.'</h3>'.
@@ -3553,10 +4165,13 @@ sub display_userinfo {
         }
         foreach my $entry (@{$order}) {
             if ($canshow->{$entry}) {
-                if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom') || ($entry eq 'requestauthor')) {
+                if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom') ||
+                    ($entry eq 'requestauthor') || ($entry eq 'authordefaults')) {
                     my @items;
                     if ($entry eq 'requestauthor') {
                         @items = ($entry);
+                    } elsif ($entry eq 'authordefaults') {
+                        @items = ('webdav','managers','editors','archive');
                     } else {
                         @items = @{$requestcourses};
                     }
@@ -3564,19 +4179,27 @@ sub display_userinfo {
                         if (($newsetting->{$item} ne $oldsetting->{$item}) || 
                             ($newsettingtext->{$item} ne $oldsettingtext->{$item})) {
                             $r->print(&Apache::loncommon::start_data_table_row()."\n");  
-                            $r->print("<td>$lt{$item}</td>\n");
-                            $r->print("<td>".$oldsetting->{$item});
+                            $r->print("<td>$lt{$item}</td><td>\n");
+                            unless ($item eq 'managers') {
+                                $r->print($oldsetting->{$item});
+                            }
                             if ($oldsettingtext->{$item}) {
                                 if ($oldsetting->{$item}) {
-                                    $r->print(' -- ');
+                                    unless ($item eq 'managers') {
+                                        $r->print(' -- ');
+                                    }
                                 }
                                 $r->print($oldsettingtext->{$item});
                             }
-                            $r->print("</td>\n");
-                            $r->print("<td>".$newsetting->{$item});
+                            $r->print("</td>\n<td>");
+                            unless ($item eq 'managers') {
+                                $r->print($newsetting->{$item});
+                            }
                             if ($newsettingtext->{$item}) {
                                 if ($newsetting->{$item}) {
-                                    $r->print(' -- ');
+                                    unless ($item eq 'managers') {
+                                        $r->print(' -- ');
+                                    }
                                 }
                                 $r->print($newsettingtext->{$item});
                             }
@@ -3737,6 +4360,11 @@ sub tool_changes {
         }
         return;
     }
+    my %tooldesc = &Apache::lonlocal::texthash(
+        'edit' => 'Standard editor (Edit)',
+        'xml'  => 'Text editor (EditXML)',
+        'daxe' => 'Daxe editor (Daxe)',
+    );
     foreach my $tool (@{$usertools}) {
         my ($newval,$limit,$envkey);
         $envkey = $context.'.'.$tool;
@@ -3750,6 +4378,54 @@ sub tool_changes {
         } elsif ($context eq 'requestauthor') {
             $newval = $env{'form.'.$context};
             $envkey = $context;
+        } elsif ($context eq 'authordefaults') {
+            if ($tool eq 'editors') {
+                $envkey = 'authoreditors';
+                if ($env{'form.customeditors'} == 1) {
+                    my @editors;
+                    my @posseditors = &Apache::loncommon::get_env_multiple('form.custom_editor');
+                    if (@posseditors) {
+                        foreach my $editor (@posseditors) {
+                            if (grep(/^\Q$editor\E$/,@posseditors)) {
+                                unless (grep(/^\Q$editor\E$/,@editors)) {
+                                    push(@editors,$editor);
+                                }
+                            }
+                        }
+                    }
+                    if (@editors) {
+                        $newval = join(',',(sort(@editors)));
+                    }
+                }
+            } elsif ($tool eq 'managers') {
+                $envkey = 'authormanagers';
+                my @possibles = &Apache::loncommon::get_env_multiple('form.custommanagers');
+                if (@possibles) {
+                    my %ca_roles = &Apache::lonnet::get_my_roles($env{'form.ccuname'},$env{'form.ccdomain'},
+                                                                 undef,['active','future'],['ca']);
+                    if (keys(%ca_roles)) {
+                        my @custommanagers;
+                        foreach my $user (@possibles) {
+                            if ($user =~ /^($match_username):($match_domain)$/) {
+                                if (exists($ca_roles{$user.':ca'})) {
+                                    unless ($user eq $env{'form.ccuname'}.':'.$env{'form.ccdomain'}) {
+                                        push(@custommanagers,$user);
+                                    }
+                                }
+                            }
+                        }
+                        if (@custommanagers) {
+                            $newval = join(',',sort(@custommanagers));
+                        }
+                    }
+                }
+            } elsif ($tool eq 'webdav') {
+                $envkey = 'tools.webdav';
+                $newval = $env{'form.'.$context.'_'.$tool};
+            } elsif ($tool eq 'archive') {
+                $envkey = 'authorarchive';
+                $newval = $env{'form.'.$context.'_'.$tool};
+            }
         } else {
             $newval = $env{'form.'.$context.'_'.$tool};
         }
@@ -3768,6 +4444,25 @@ sub tool_changes {
                 } else {
                     $oldaccesstext->{$tool} = &mt("availability set to 'off'");
                 }
+            } elsif ($context eq 'authordefaults') {
+                if ($tool eq 'managers') {
+                    if ($userenv->{$envkey} eq '') {
+                        $oldaccesstext->{$tool} = &mt('Only author may manage co-author roles');
+                    } else {
+                        my $managers = $userenv->{$envkey};
+                        $managers =~ s/,/, /g;
+                        $oldaccesstext->{$tool} = $managers;
+                    }
+                } elsif ($tool eq 'editors') {
+                    $oldaccesstext->{$tool} = &mt('can use: [_1]',
+                                                  join(', ', map { $tooldesc{$_} } split(/,/,$userenv->{$envkey})));
+                } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
+                    if ($userenv->{$envkey}) {
+                        $oldaccesstext->{$tool} = &mt("availability set to 'on'");
+                    } else {
+                        $oldaccesstext->{$tool} = &mt("availability set to 'off'");
+                    }
+                }
             } else {
                 if ($userenv->{$envkey}) {
                     $oldaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -3776,7 +4471,8 @@ sub tool_changes {
                 }
             }
             $changeHash->{$envkey} = $userenv->{$envkey};
-            if ($env{'form.custom'.$tool} == 1) {
+            if (($env{'form.custom'.$tool} == 1) ||
+                (($context eq 'authordefaults') && ($tool eq 'managers') && ($newval ne ''))) {
                 if ($newval ne $userenv->{$envkey}) {
                     $changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
                                                     $context);
@@ -3794,6 +4490,25 @@ sub tool_changes {
                             } else {
                                 $newaccesstext->{$tool} = &mt("availability set to 'off'");
                             }
+                        } elsif ($context eq 'authordefaults') {
+                            if ($tool eq 'editors') {
+                                $newaccesstext->{$tool} = &mt('can use: [_1]',
+                                                              join(', ', map { $tooldesc{$_} } split(/,/,$changeHash->{$envkey})));
+                            } elsif ($tool eq 'managers') {
+                                if ($changeHash->{$envkey} eq '') {
+                                    $newaccesstext->{$tool} = &mt('Only author may manage co-author roles');
+                                } else {
+                                    my $managers = $changeHash->{$envkey};
+                                    $managers =~ s/,/, /g;
+                                    $newaccesstext->{$tool} = $managers;
+                                }
+                            } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
+                                if ($newval) {
+                                    $newaccesstext->{$tool} = &mt("availability set to 'on'");
+                                } else {
+                                    $newaccesstext->{$tool} = &mt("availability set to 'off'");
+                                }
+                            }
                         } else {
                             if ($newval) {
                                 $newaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -3804,17 +4519,36 @@ sub tool_changes {
                     } else {
                         $newaccess->{$tool} = $oldaccess->{$tool};
                         if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
-                            if ($newval =~ /^autolimit/) {
+                            if ($userenv->{$envkey} =~ /^autolimit/) {
                                 if ($limit) {
                                     $newaccesstext->{$tool} = &mt('available with automatic approval, up to limit of [quant,_1,request] per user',$limit);
                                 } else {
                                     $newaccesstext->{$tool} = &mt('available with automatic approval (unlimited)');
                                 }
-                            } elsif ($newval) {
-                                $newaccesstext->{$tool} = $reqdisplay{$newval};
+                            } elsif ($userenv->{$envkey}) {
+                                $newaccesstext->{$tool} = $reqdisplay{$userenv->{$envkey}};
                             } else {
                                 $newaccesstext->{$tool} = &mt("availability set to 'off'");
                             }
+                        } elsif ($context eq 'authordefaults') {
+                            if ($tool eq 'editors') {
+                                $newaccesstext->{$tool} = &mt('can use: [_1]',
+                                                              join(', ', map { $tooldesc{$_} } split(/,/,$userenv->{$envkey})));
+                            } elsif ($tool eq 'managers') {
+                                if ($userenv->{$envkey} eq '') {
+                                    $newaccesstext->{$tool} = &mt('Only author may manage co-author roles');
+                                } else {
+                                    my $managers = $userenv->{$envkey};
+                                    $managers =~ s/,/, /g;
+                                    $newaccesstext->{$tool} = $managers;
+                                }
+                            } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
+                                if ($userenv->{$envkey}) {
+                                    $newaccesstext->{$tool} = &mt("availability set to 'on'");
+                                } else {
+                                    $newaccesstext->{$tool} = &mt("availability set to 'off'");
+                                }
+                            }
                         } else {
                             if ($userenv->{$context.'.'.$tool}) {
                                 $newaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -3845,6 +4579,25 @@ sub tool_changes {
                         } else {
                             $newaccesstext->{$tool} = &mt("availability set to 'off'");
                         }
+                    } elsif ($context eq 'authordefaults') {
+                        if ($tool eq 'editors') {
+                            $newaccesstext->{$tool} = &mt('can use: [_1]',
+                                                          join(', ', map { $tooldesc{$_} } split(/,/,$newval)));
+                        } elsif ($tool eq 'managers') {
+                            if ($newval eq '') {
+                                $newaccesstext->{$tool} = &mt('Only author may manage co-author roles');
+                            } else {
+                                my $managers = $newval;
+                                $managers =~ s/,/, /g;
+                                $newaccesstext->{$tool} = $managers;
+                            }
+                        } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
+                            if ($userenv->{$envkey}) {
+                                $newaccesstext->{$tool} = &mt("availability set to 'on'");
+                            } else {
+                                $newaccesstext->{$tool} = &mt("availability set to 'off'");
+                            }
+                        }
                     } else {
                         if ($userenv->{$context.'.'.$tool}) {
                             $newaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -3856,7 +4609,8 @@ sub tool_changes {
             }
         } else {
             $oldaccess->{$tool} = &mt('default');
-            if ($env{'form.custom'.$tool} == 1) {
+            if (($env{'form.custom'.$tool} == 1) ||
+                (($context eq 'authordefaults') && ($tool eq 'managers') && ($newval ne ''))) {
                 $changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
                                                 $context);
                 if ($changed->{$tool}) {
@@ -3873,6 +4627,25 @@ sub tool_changes {
                         } else {
                             $newaccesstext->{$tool} = &mt("availability set to 'off'");
                         }
+                    } elsif ($context eq 'authordefaults') {
+                        if ($tool eq 'managers') {
+                            if ($newval eq '') {
+                                $newaccesstext->{$tool} = &mt('Only author may manage co-author roles');
+                            } else {
+                                my $managers = $newval;
+                                $managers =~ s/,/, /g;
+                                $newaccesstext->{$tool} = $managers;
+                            }
+                        } elsif ($tool eq 'editors') {
+                            $newaccesstext->{$tool} = &mt('can use: [_1]',
+                                                          join(', ', map { $tooldesc{$_} } split(/,/,$newval)));
+                        } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
+                            if ($newval) {
+                                $newaccesstext->{$tool} = &mt("availability set to 'on'");
+                            } else {
+                                $newaccesstext->{$tool} = &mt("availability set to 'off'");
+                            }
+                        }
                     } else {
                         if ($newval) {
                             $newaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -3895,7 +4668,13 @@ sub update_roles {
     my ($r,$context,$showcredits) = @_;
     my $now=time;
     my @rolechanges;
-    my %disallowed;
+    my (%disallowed,%got_role_approvals,%got_instdoms,%process_by,%instdoms,
+        %pending,%reject,%notifydc,%status,%unauthorized,%currqueued);
+    $got_role_approvals{$context} = '';
+    $process_by{$context} = {};
+    my @domroles = &Apache::lonuserutils::domain_roles();
+    my @cstrroles = &Apache::lonuserutils::construction_space_roles();
+    my @courseroles = &Apache::lonuserutils::roles_by_context('course',1);
     $r->print('<h3>'.&mt('Modifying Roles').'</h3>');
     foreach my $key (keys(%env)) {
 	next if (! $env{$key});
@@ -3997,6 +4776,7 @@ sub update_roles {
 	    if ($key=~/^form\.ren\:([^\_]+)\_([^\_\.]+)$/) {
                 my $url = $1;
                 my $role = $2;
+                my $id = $url.'_'.$role;
                 my $logmsg;
                 my $output;
                 if ($role eq 'st') {
@@ -4004,10 +4784,17 @@ sub update_roles {
                         my ($cdom,$cnum,$csec) = ($1,$2,$3);
                         my $credits;
                         if ($showcredits) {
-                            my $defaultcredits = 
+                            my $defaultcredits =
                                 &Apache::lonuserutils::get_defaultcredits($cdom,$cnum);
                             $credits = &get_user_credits($defaultcredits,$cdom,$cnum);
                         }
+                        unless ($udom eq $cdom) {
+                            next if (&Apache::lonuserutils::restricted_dom($context,$id,$udom,
+                                         $uname,$role,$now,0,$cdom,$cnum,$csec,$credits,
+                                         \%process_by,\%instdoms,\%got_role_approvals,
+                                         \%got_instdoms,\%reject,\%pending,\%notifydc,
+                                         \%status,\%unauthorized,\%currqueued));
+                        }
                         my $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$cdom,$cnum,$csec,$context,$credits);
                         if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course') || ($result eq 'refused')) {
                             if ($result eq 'refused' && $logmsg) {
@@ -4023,12 +4810,28 @@ sub update_roles {
                         }
                     }
                 } else {
+                    my ($cdom,$cnum,$csec);
+                    if (grep(/^\Q$role\E$/,@cstrroles)) {
+                        ($cdom,$cnum) = ($url =~ m{^/($match_domain)/($match_username)$});
+                    } elsif (grep(/^\Q$role\E$/,@domroles)) {
+                        ($cdom) = ($url =~ m{^/($match_domain)/$});
+                    } elsif ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) {
+                        ($cdom,$cnum,$csec) = ($1,$2,$3);
+                    }
+                    if ($cdom ne '') {
+                        unless ($udom eq $cdom) {
+                            next if (&Apache::lonuserutils::restricted_dom($context,$id,$udom,
+                                         $uname,$role,$now,0,$cdom,$cnum,$csec,'',\%process_by,
+                                         \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                         \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued));
+                        }
+                    }
 		    my $result=&Apache::lonnet::assignrole($env{'form.ccdomain'},
                                $env{'form.ccuname'},$url,$role,0,$now,'','',
                                $context);
-                        $output = &Apache::lonhtmlcommon::confirm_success(&mt('Re-enabling [_1] in [_2]',
-                                        &Apache::lonnet::plaintext($role),
-                                        &Apache::loncommon::show_role_extent($url,$context,$role)),$result ne "ok").'<br />';
+                    $output = &Apache::lonhtmlcommon::confirm_success(&mt('Re-enabling [_1] in [_2]',
+                                    &Apache::lonnet::plaintext($role),
+                                    &Apache::loncommon::show_role_extent($url,$context,$role)),$result ne "ok").'<br />';
                     if ($result ne "ok") {
                         $output .= &mt('Error: [_1]',$result).'<br />';
                     }
@@ -4041,6 +4844,17 @@ sub update_roles {
 # Re-enable custom role
 	    if ($key=~m{^form\.ren\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
                 my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
+                my $id = $url.'_cr'."/$rdom/$rnam/$rolename";
+                my $role = "cr/$rdom/$rnam/$rolename";
+                if ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) {
+                    my ($cdom,$cnum,$csec) = ($1,$2,$3);
+                    unless ($udom eq $cdom) {
+                        next if (&Apache::lonuserutils::restricted_dom($context,$id,$udom,
+                                     $uname,$role,$now,0,$cdom,$cnum,$csec,'',\%process_by,
+                                     \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                     \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued));
+                    }
+                }
                 my $result = &Apache::lonnet::assigncustomrole(
                                $env{'form.ccdomain'}, $env{'form.ccuname'},
                                $url,$rdom,$rnam,$rolename,0,$now,undef,$context);
@@ -4062,6 +4876,8 @@ sub update_roles {
                 # Activate a custom role
 		my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5);
 		my $url='/'.$one.'/'.$two;
+                my $id = $url.'_cr/'."$three/$four/$five";
+                my $role = "cr/$three/$four/$five";
 		my $full=$one.'_'.$two.'_cr_cr_'.$three.'_'.$four.'_'.$five;
 
                 my $start = ( $env{'form.start_'.$full} ?
@@ -4070,15 +4886,22 @@ sub update_roles {
                 my $end   = ( $env{'form.end_'.$full} ?
                               $env{'form.end_'.$full} :
                               0 );
-                                                                                     
+
                 # split multiple sections
                 my %sections = ();
-                my $num_sections = &build_roles($env{'form.sec_'.$full},\%sections,$5);
+                my $num_sections = &build_roles($env{'form.sec_'.$full},\%sections,$five);
                 if ($num_sections == 0) {
+                    unless ($udom eq $one) {
+                        next if (&Apache::lonuserutils::restricted_dom($context,$id,$udom,
+                                     $uname,$role,$start,$end,$one,$two,'','',\%process_by,
+                                     \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                     \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued));
+                    }
                     $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end,$context));
                 } else {
 		    my %curr_groups =
 			&Apache::longroup::coursegroups($one,$two);
+                    my ($restricted,$numchanges);
                     foreach my $sec (sort {$a cmp $b} keys(%sections)) {
                         if (($sec eq 'none') || ($sec eq 'all') || 
                             exists($curr_groups{$sec})) {
@@ -4086,8 +4909,18 @@ sub update_roles {
                             next;
                         }
                         my $securl = $url.'/'.$sec;
+                        my $secid = $securl.'_cr'."/$three/$four/$five";
+                        undef($restricted);
+                        unless ($udom eq $one) {
+                            next if (&Apache::lonuserutils::restricted_dom($context,$secid,$udom,
+                                         $uname,$role,$start,$end,$one,$two,$sec,'',\%process_by,
+                                         \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                         \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued));
+                        }
+                        $numchanges ++;
 		        $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end,$context));
                     }
+                    next unless ($numchanges);
                 }
                 if (!grep(/^cr$/,@rolechanges)) {
                     push(@rolechanges,'cr');
@@ -4096,20 +4929,20 @@ sub update_roles {
 		# Activate roles for sections with 3 id numbers
 		# set start, end times, and the url for the class
 		my ($one,$two,$three)=($1,$2,$3);
-		my $start = ( $env{'form.start_'.$one.'_'.$two.'_'.$three} ? 
-			      $env{'form.start_'.$one.'_'.$two.'_'.$three} : 
+		my $start = ( $env{'form.start_'.$one.'_'.$two.'_'.$three} ?
+			      $env{'form.start_'.$one.'_'.$two.'_'.$three} :
 			      $now );
-		my $end   = ( $env{'form.end_'.$one.'_'.$two.'_'.$three} ? 
+		my $end   = ( $env{'form.end_'.$one.'_'.$two.'_'.$three} ?
 			      $env{'form.end_'.$one.'_'.$two.'_'.$three} :
 			      0 );
 		my $url='/'.$one.'/'.$two;
-                my $type = 'three';
+                my $id = $url.'_'.$three;
                 # split multiple sections
                 my %sections = ();
                 my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two.'_'.$three},\%sections,$three);
-                my $credits;
+                my ($credits,$numchanges);
                 if ($three eq 'st') {
-                    if ($showcredits) { 
+                    if ($showcredits) {
                         my $defaultcredits = 
                             &Apache::lonuserutils::get_defaultcredits($one,$two);
                         $credits = $env{'form.credits_'.$one.'_'.$two.'_'.$three};
@@ -4120,11 +4953,19 @@ sub update_roles {
                     }
                 }
                 if ($num_sections == 0) {
+                    unless ($udom eq $one) {
+                        next if (&Apache::lonuserutils::restricted_dom($context,$id,$udom,
+                                     $uname,$three,$start,$end,$one,$two,'',$credits,\%process_by,
+                                     \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                     \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued));
+                    }
+                    $numchanges ++;
                     $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'',$context,$credits));
                 } else {
                     my %curr_groups = 
 			&Apache::longroup::coursegroups($one,$two);
                     my $emptysec = 0;
+                    my $restricted;
                     foreach my $sec (sort {$a cmp $b} keys(%sections)) {
                         $sec =~ s/\W//g;
                         if ($sec ne '') {
@@ -4134,14 +4975,34 @@ sub update_roles {
                                 next;
                             }
                             my $securl = $url.'/'.$sec;
+                            my $secid = $securl.'_'.$three;
+                            unless ($udom eq $one) {
+                                undef($restricted);
+                                $restricted = &Apache::lonuserutils::restricted_dom($context,$secid,$udom,
+                                                  $uname,$three,$start,$end,$one,$two,$sec,$credits,\%process_by,
+                                                  \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                                  \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued);
+                                next if ($restricted);
+                            }
+                            $numchanges ++;
                             $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec,$context,$credits));
                         } else {
                             $emptysec = 1;
                         }
                     }
                     if ($emptysec) {
+                        unless ($udom eq $one) {
+                            undef($restricted);
+                            $restricted = &Apache::lonuserutils::restricted_dom($context,$id,$udom,
+                                              $uname,$three,$start,$end,$one,$two,'',$credits,\%process_by,
+                                              \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                              \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued);
+                            next if ($restricted);
+                        }
+                        $numchanges ++;
                         $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'',$context,$credits));
                     }
+                    next unless ($numchanges);
                 }
                 if (!grep(/^\Q$three\E$/,@rolechanges)) {
                     push(@rolechanges,$three);
@@ -4149,33 +5010,64 @@ sub update_roles {
 	    } elsif ($key=~/^form\.act\_([^\_]+)\_([^\_]+)$/) {
 		# Activate roles for sections with two id numbers
 		# set start, end times, and the url for the class
-		my $start = ( $env{'form.start_'.$1.'_'.$2} ? 
-			      $env{'form.start_'.$1.'_'.$2} : 
+		my $start = ( $env{'form.start_'.$1.'_'.$2} ?
+			      $env{'form.start_'.$1.'_'.$2} :
 			      $now );
-		my $end   = ( $env{'form.end_'.$1.'_'.$2} ? 
+		my $end   = ( $env{'form.end_'.$1.'_'.$2} ?
 			      $env{'form.end_'.$1.'_'.$2} :
 			      0 );
                 my $one = $1;
                 my $two = $2;
 		my $url='/'.$one.'/';
+                my $id = $url.'_'.$two;
+                my ($cdom,$cnum) = split(/\//,$one);
                 # split multiple sections
                 my %sections = ();
+                my ($restricted,$numchanges);
                 my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two},\%sections,$two);
                 if ($num_sections == 0) {
+                    unless ($udom eq $one) {
+                        $restricted = &Apache::lonuserutils::restricted_dom($context,$id,$udom,
+                                          $uname,$two,$start,$end,$cdom,$cnum,'','',\%process_by,
+                                          \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                          \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued);
+                        next if ($restricted);
+                    }
+                    $numchanges ++;
                     $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$two,$start,$end,$one,undef,'',$context));
                 } else {
                     my $emptysec = 0;
                     foreach my $sec (sort {$a cmp $b} keys(%sections)) {
                         if ($sec ne '') {
                             my $securl = $url.'/'.$sec;
+                            my $secid = $securl.'_'.$two;
+                            unless ($udom eq $one) {
+                                undef($restricted);
+                                $restricted = &Apache::lonuserutils::restricted_dom($context,$secid,$udom,
+                                                  $uname,$two,$start,$end,$cdom,$cnum,$sec,'',\%process_by,
+                                                  \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                                  \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued);
+                                next if ($restricted);
+                            }
+                            $numchanges ++;
                             $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$two,$start,$end,$one,undef,$sec,$context));
                         } else {
                             $emptysec = 1;
                         }
                     }
                     if ($emptysec) {
+                        unless ($udom eq $one) {
+                            undef($restricted);
+                            $restricted = &Apache::lonuserutils::restricted_dom($context,$id,$udom,
+                                              $uname,$two,$start,$end,$cdom,$cnum,'','',\%process_by,
+                                              \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+                                              \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued);
+                            next if ($restricted);
+                        }
+                        $numchanges ++;
                         $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$two,$start,$end,$one,undef,'',$context));
                     }
+                    next unless ($numchanges); 
                 }
                 if (!grep(/^\Q$two\E$/,@rolechanges)) {
                     push(@rolechanges,$two);
@@ -4199,6 +5091,12 @@ sub update_roles {
             }
 	}
     } # End of foreach (keys(%env))
+    if ((keys(%reject)) || (keys(%unauthorized))) {
+        $r->print(&Apache::lonuserutils::print_roles_rejected($context,\%reject,\%unauthorized));
+    }
+    if ((keys(%pending)) || (keys(%currqueued))) {
+        $r->print(&Apache::lonuserutils::print_roles_queued($context,\%pending,\%notifydc,\%currqueued));
+    }
 # Flush the course logs so reverse user roles immediately updated
     $r->register_cleanup(\&Apache::lonnet::flushcourselogs);
     if (@rolechanges == 0) {
@@ -4253,11 +5151,35 @@ sub enroll_single_student {
             }
         }
     }
+    my ($startdate,$enddate) = &Apache::lonuserutils::get_dates_from_form();
+    my (%got_role_approvals,%got_instdoms,%process_by,%instdoms,%pending,%reject,%notifydc,
+        %status,%unauthorized,%currqueued);
+    unless ($env{'form.ccdomain'} eq $env{'course.'.$env{'request.course.id'}.'.domain'}) {
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $csec = $env{'form.sections'};
+        my $id = "/$cdom/$cnum";
+        if ($csec ne '') {
+            $id .= "/$csec";
+        }
+        $id .= '_st';
+        if (&Apache::lonuserutils::restricted_dom($context,$id,$env{'form.ccdomain'},$env{'form.ccuname'},
+                                                  'st',$startdate,$enddate,$cdom,$cnum,$csec,$credits,
+                                                  \%process_by,\%instdoms,\%got_role_approvals,\%got_instdoms,
+                                                  \%reject,\%pending,\%notifydc,\%status,\%unauthorized,\%currqueued)) {
+            if ((keys(%reject)) || (keys(%unauthorized))) {
+                $r->print(&Apache::lonuserutils::print_roles_rejected($context,\%reject,\%unauthorized));
+            }
+            if ((keys(%pending)) || (keys(%currqueued))) {
+                $r->print(&Apache::lonuserutils::print_roles_queued($context,\%pending,\%notifydc,\%currqueued));
+            }
+            return;
+        }
+    }
 
     # Clean out any old student roles the user has in this class.
     &Apache::lonuserutils::modifystudent($env{'form.ccdomain'},
          $env{'form.ccuname'},$env{'request.course.id'},undef,$uhome);
-    my ($startdate,$enddate) = &Apache::lonuserutils::get_dates_from_form();
     my $enroll_result =
         &Apache::lonnet::modify_student_enrollment($env{'form.ccdomain'},
             $env{'form.ccuname'},$env{'form.cid'},$env{'form.cfirstname'},
@@ -4367,6 +5289,10 @@ sub tool_admin {
         if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) {
             $canchange = 1;
         }
+    } elsif ($context eq 'authordefaults') {
+        if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) {
+            $canchange = 1;
+        }
     } elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {
         # Current user has quota modification privileges
         $canchange = 1;
@@ -4377,6 +5303,10 @@ sub tool_admin {
             $toolchanged = 1;
             if ($tool eq 'requestauthor') {
                 $changeHash->{$context} = $settool;
+            } elsif (($tool eq 'managers') || ($tool eq 'editors') || ($tool eq 'archive')) {
+                $changeHash->{'author'.$tool} = $settool;
+            } elsif ($tool eq 'webdav') {
+                $changeHash->{'tools.'.$tool} = $settool;
             } else {
                 $changeHash->{$context.'.'.$tool} = $settool;
             }
@@ -4619,6 +5549,189 @@ sub set_custom_role {
     );
 }
 
+sub show_role_requests {
+    my ($caller,$dom) = @_;
+    my $showrolereqs;
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['privacy'],$dom);
+    if (ref($domconfig{'privacy'}) eq 'HASH') {
+        if (ref($domconfig{'privacy'}{'approval'}) eq 'HASH') {
+            my %approvalconf = %{$domconfig{'privacy'}{'approval'}};
+            foreach my $key ('instdom','extdom') {
+                if (ref($approvalconf{$key}) eq 'HASH') {
+                    if (keys(%{$approvalconf{$key}})) {
+                        foreach my $context ('domain','author','course','community') {
+                            if ($approvalconf{$key}{$context} eq $caller) {
+                                $showrolereqs = 1;
+                                last if ($showrolereqs);
+                            }
+                        }
+                    }
+                }
+                last if ($showrolereqs);
+            }
+        }
+    }
+    return $showrolereqs;
+}
+
+sub display_coauthor_managers {
+    my ($permission) = @_;
+    my $output;
+    if ((ref($permission) eq 'HASH') && ($permission->{'author'})) {
+        $output = '<form action="/adm/createuser" method="post" name="camanagers">'.
+                  '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
+                  '<p>';
+        my (@possmanagers,@custommanagers);
+        my %userenv =
+            &Apache::lonnet::userenvironment($env{'user.domain'},
+                                             $env{'user.name'},
+                                             'authormanagers');
+        my %ca_roles = &Apache::lonnet::get_my_roles(undef,undef,undef,
+                                                     ['active','future'],['ca']);
+        if (keys(%ca_roles)) {
+            foreach my $entry (sort(keys(%ca_roles))) {
+                if ($entry =~ /^($match_username\:$match_domain):ca$/) {
+                    my $user = $1;
+                    unless ($user eq $env{'user.name'}.':'.$env{'user.domain'}) {
+                        push(@possmanagers,$user);
+                    }
+                }
+            }
+        }
+        if ($userenv{'authormanagers'} eq '') {
+            $output .= &mt('Currently author manages co-author roles');
+        } else {
+            if (keys(%ca_roles)) {
+                foreach my $user (split(/,/,$userenv{'authormanagers'})) {
+                    if ($user =~ /^($match_username)\:($match_domain)$/) {
+                        if (exists($ca_roles{$user.':ca'})) {
+                            unless ($user eq $env{'user.name'}.':'.$env{'user.domain'}) {
+                                push(@custommanagers,$user);
+                            }
+                        }
+                    }
+                }
+            }
+            if (@custommanagers) {
+                $output .= &mt('Co-authors with active or future roles who currently manage co-author roles: [_1]',
+                              '<br />'.join(', ',map { &Apache::loncommon::plainname(split(':',$_))." ($_)"; } @custommanagers));
+            } else {
+                $output .= &mt('Currently author manages co-author roles');
+            }
+        }
+        $output .= "</p>\n";
+        if (@possmanagers) {
+            $output .= '<p>'.&mt('If checked, can manage').': ';
+            foreach my $user (@possmanagers) {
+                 my $checked;
+                 if (grep(/^\Q$user\E$/,@custommanagers)) {
+                     $checked = ' checked="checked"';
+                 }
+                 $output .= '<span style="LC_nobreak"><label>'.
+                            '<input type="checkbox" name="custommanagers" '.
+                            'value="'.&HTML::Entities::encode($user,'\'<>"&').'"'.$checked.' />'.
+                            &Apache::loncommon::plainname(split(/:/,$user))." ($user)".'</label></span> '."\n";
+            }
+            $output .= '<input type="hidden" name="state" value="process" /></p>'."\n".
+                       '<p><input type="submit" value="'.&mt('Save changes').'" /></p>'."\n";
+        } else {
+            $output .= '<p>'.&mt('No co-author roles assignable as manager').'</p>';
+        }
+        $output .= '</form>';
+    } else {
+        $output = '<span class="LC_warning">'.
+                  &mt('You do not have permission to perform this action').
+                  '</span>';
+    }
+    return $output;
+}
+
+sub update_coauthor_managers {
+    my ($permission) = @_;
+    my $output;
+    if ((ref($permission) eq 'HASH') && ($permission->{'author'})) {
+        my ($current,$newval,@possibles,@managers);
+        my %userenv =
+            &Apache::lonnet::userenvironment($env{'user.domain'},
+                                             $env{'user.name'},
+                                             'authormanagers');
+        $current = $userenv{'authormanagers'};
+        @possibles = &Apache::loncommon::get_env_multiple('form.custommanagers');
+        if (@possibles) {
+            my %ca_roles = &Apache::lonnet::get_my_roles(undef,undef,undef,
+                                                         ['active','future'],['ca']);
+            if (keys(%ca_roles)) {
+                foreach my $user (@possibles) {
+                    if ($user =~ /^($match_username):($match_domain)$/) {
+                        if (exists($ca_roles{$user.':ca'})) {
+                            unless ($user eq $env{'user.name'}.':'.$env{'user.domain'}) {
+                                push(@managers,$user);
+                            }
+                        }
+                    }
+                }
+                if (@managers) {
+                    $newval = join(',',sort(@managers));
+                }
+            }
+        }
+        if ($current eq $newval) {
+            $output = &mt('No changes made to management of co-author roles');
+        } else {
+            my $chgresult =
+                &Apache::lonnet::put('environment',{'authormanagers' => $newval},
+                                     $env{'user.domain'},$env{'user.name'});
+            if ($chgresult eq 'ok') {
+                &Apache::lonnet::appenv({'environment.authormanagers' => $newval});
+                my (@adds,@dels);
+                if ($newval eq '') {
+                    @dels = split(/,/,$current);
+                } elsif ($current eq '') {
+                    @adds = @managers;
+                } else {
+                    my @old = split(/,/,$current);
+                    my @diffs = &Apache::loncommon::compare_arrays(\@old,\@managers);
+                    if (@diffs) {
+                        foreach my $user (@diffs) {
+                            if (grep(/^\Q$user\E$/,@old)) {
+                                push(@dels,$user);
+                            } elsif (grep(/^\Q$user\E$/,@managers)) {
+                                push(@adds,$user);
+                            }
+                        }
+                    }
+                }
+                my $key = "internal.manager./$env{'user.domain'}/$env{'user.name'}";
+                if (@dels) {
+                    foreach my $user (@dels) {
+                        if ($user =~ /^($match_username):($match_domain)$/) {
+                            &Apache::lonnet::del('environment',[$key],$2,$1);
+                        }
+                    }
+                }
+                if (@adds) {
+                    foreach my $user (@adds) {
+                        if ($user =~ /^($match_username):($match_domain)$/) {
+                            &Apache::lonnet::put('environment',{$key => 1},$2,$1);
+                        }
+                    }
+                }
+                if ($newval eq '') {
+                    $output = &mt('Management of co-authors set to be author-only');
+                } else {
+                    $output .= &mt('Co-authors who can manage co-author roles set to: [_1]',
+                                   '<br />'.join(', ',map { &Apache::loncommon::plainname(split(':',$_))." ($_)"; } @managers));
+                }
+            }
+        }
+    } else {
+        $output = '<span class="LC_warning">'.
+                  &mt('You do not have permission to perform this action').
+                  '</span>';
+    }
+    return $output;
+}
+
 # ================================================================ Main Handler
 sub handler {
     my $r = shift;
@@ -4634,12 +5747,17 @@ sub handler {
         $crstype = &Apache::loncommon::course_type();
     } elsif ($env{'request.role'} =~ /^au\./) {
         $context = 'author';
+    } elsif ($env{'request.role'} =~ m{^(ca|aa)\./$match_domain/$match_username$}) {
+        $context = 'coauthor';
     } else {
         $context = 'domain';
     }
 
     my ($permission,$allowed) =
         &Apache::lonuserutils::get_permission($context,$crstype);
+    if (($context eq 'coauthor') && ($allowed)) {
+        $context = 'author';
+    }
 
     if ($allowed) {
         my @allhelp;
@@ -4664,7 +5782,7 @@ sub handler {
                 if (&Apache::lonnet::auto_run($cnum,$cdom) && (($permission->{'cusr'}) || ($permission->{'view'}))) {
                     push(@allhelp,'Course_Automated_Enrollment');
                 }
-                if ($permission->{'selfenrolladmin'}) {
+                if (($permission->{'selfenrolladmin'}) || ($permission->{'selfenrollview'})) {
                     push(@allhelp,'Course_Approve_Selfenroll');
                 }
             }
@@ -4677,6 +5795,13 @@ sub handler {
         } elsif ($context eq 'author') {
             push(@allhelp,('Author_Change_Privileges','Author_Create_Coauthor_List',
                            'Author_View_Coauthor_List','Author_User_Logs'));
+        } elsif ($context eq 'coauthor') {
+            if ($permission->{'cusr'}) {
+                push(@allhelp,('Author_Change_Privileges','Author_Create_Coauthor_List',
+                               'Author_View_Coauthor_List','Author_User_Logs'));
+            } elsif ($permission->{'view'}) {
+                push(@allhelp,'Author_View_Coauthor_List');
+            }
         } else {
             if ($permission->{'cusr'}) {
                 push(@allhelp,'Domain_Change_Privileges');
@@ -4703,7 +5828,8 @@ sub handler {
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
         ['action','state','callingform','roletype','showrole','bulkaction','popup','phase',
-         'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue']);
+         'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue',
+         'forceedit']);
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     my $args;
     my $brcrum = [];
@@ -4718,6 +5844,9 @@ sub handler {
         if ($context eq 'course') {
             $r->internal_redirect('/adm/viewclasslist');
             return OK;
+        } elsif ($context eq 'coauthor') {
+            $r->internal_redirect('/adm/viewcoauthors');
+            return OK;
         }
         $env{'user.error.msg'}=
             "/adm/createuser:cst:0:0:Cannot create/modify user data ".
@@ -4766,7 +5895,7 @@ sub handler {
         if (! exists($env{'form.state'})) {
             &Apache::lonuserutils::print_first_users_upload_form($r,$context);
         } elsif ($env{'form.state'} eq 'got_file') {
-            my $result =
+            my $result = 
                 &Apache::lonuserutils::print_upload_manager_form($r,$context,
                                                                  $permission,
                                                                  $crstype,$showcredits);
@@ -5080,7 +6209,7 @@ sub handler {
                                               &Apache::lonhtmlcommon::row_closure(1));
                                 }
                             }
-                            if ($pickstart) {
+                            if ($pickstart) { 
                                 $r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>');
                             } else {
                                 $r->print('<div>'.&mt('No information to display for this account request.').'</div>');
@@ -5204,8 +6333,9 @@ sub handler {
                      '<span class="LC_error">'.&mt('You do not have permission to modify dates or sections for users').'</span>'); 
         }
     } elsif ($env{'form.action'} eq 'selfenroll') {
-        if ($permission->{selfenrolladmin}) {
-            my %currsettings = (
+        my %currsettings;
+        if ($permission->{selfenrolladmin} || $permission->{selfenrollview}) {
+            %currsettings = (
                 selfenroll_types              => $env{'course.'.$cid.'.internal.selfenroll_types'},
                 selfenroll_registered         => $env{'course.'.$cid.'.internal.selfenroll_registered'},
                 selfenroll_section            => $env{'course.'.$cid.'.internal.selfenroll_section'},
@@ -5221,6 +6351,8 @@ sub handler {
                 default_enrollment_end_date   => $env{'course.'.$cid.'.default_enrollment_end_date'},
                 uniquecode                    => $env{'course.'.$cid.'.internal.uniquecode'},
             );
+        }
+        if ($permission->{selfenrolladmin}) {
             push(@{$brcrum},
                     {href => '/adm/createuser?action=selfenroll',
                      text => "Configure Self-enrollment",
@@ -5241,6 +6373,16 @@ sub handler {
                 $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n");
                 &update_selfenroll_config($r,$cid,$cdom,$cnum,$context,$crstype,\%currsettings);
             }
+        } elsif ($permission->{selfenrollview}) {
+            push(@{$brcrum},
+                    {href => '/adm/createuser?action=selfenroll',
+                     text => "View Self-enrollment configuration",
+                     help => 'Course_Self_Enrollment'});
+            $args = { bread_crumbs           => $brcrum,
+                      bread_crumbs_component => 'Self-enrollment Settings'};
+            $r->print(&header(undef,$args));
+            $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n");
+            &print_selfenroll_menu($r,'course',$cid,$cdom,$cnum,\%currsettings,'',1);
         } else {
             $r->print(&header(undef,{'no_nav_bar' => 1}).
                      '<span class="LC_error">'.&mt('You do not have permission to configure self-enrollment').'</span>');
@@ -5284,7 +6426,8 @@ sub handler {
                      '<span class="LC_error">'.&mt('You do not have permission to view change logs').'</span>');
         }
     } elsif ($env{'form.action'} eq 'helpdesk') {
-        if (($permission->{'owner'}) || ($permission->{'co-owner'})) {
+        if (($permission->{'owner'} || $permission->{'co-owner'}) &&
+            ($permission->{'cusr'} || $permission->{'view'})) {
             if ($env{'form.state'} eq 'process') {
                 if ($permission->{'owner'}) {
                     &update_helpdeskaccess($r,$permission,$brcrum);
@@ -5298,6 +6441,105 @@ sub handler {
             $r->print(&header(undef,{'no_nav_bar' => 1}).
                       '<span class="LC_error">'.&mt('You do not have permission to view helpdesk access').'</span>');
         }
+    } elsif ($env{'form.action'} eq 'rolerequests') {
+        if ($permission->{cusr} || $permission->{view}) {
+            &print_queued_roles($r,$context,$permission,$brcrum);
+        }
+    } elsif ($env{'form.action'} eq 'queuedroles') {
+        if (($permission->{cusr}) && ($context eq 'domain')) {
+            if (&show_role_requests($context,$env{'request.role.domain'})) {
+                if ($env{'form.state'} eq 'done') {
+                    &process_pendingroles($r,$context,$permission,$brcrum);
+                } else {
+                    &print_pendingroles($r,$context,$permission,$brcrum);
+                }
+            } else {
+                $r->print(&header(undef,{'no_nav_bar' => 1}).
+                          '<span class="LC_info">'.&mt('Domain coordinator approval of requests from other domains for assignment of roles to users from this domain not in use.').'</span>');
+            }
+        } else {
+            $r->print(&header(undef,{'no_nav_bar' => 1}).
+                     '<span class="LC_error">'.&mt('You do not have permission to view queued requests from other domains for assignment of roles to users from this domain.').'</span>');
+        }
+    } elsif ($env{'form.action'} eq 'camanagers') {
+        if (($permission->{cusr}) && ($context eq 'author')) {
+            push(@{$brcrum},
+                     {href => '/adm/createuser?action=camanagers',
+                      text => 'Co-author Managers',
+                      help => 'Author_Manage_Coauthors'});
+            if ($env{'form.state'} eq 'process') {
+                push(@{$brcrum},
+                         {href => '/adm/createuser?action=camanagers',
+                          text => 'Result',
+                          help => 'Author_Manage_Coauthors'});
+            }
+            $args = { bread_crumbs           => $brcrum };
+            $r->print(&header(undef,$args));
+            my $coursedesc = $env{'course.'.$cid.'.description'};
+            if (!exists($env{'form.state'})) {
+                $r->print('<h3>'.&mt('Co-author Management').'</h3>'."\n".
+                          &display_coauthor_managers($permission));
+            } elsif ($env{'form.state'} eq 'process') {
+                $r->print('<h3>'.&mt('Co-author Management Update Result').'</h3>'."\n".
+                          &update_coauthor_managers($permission));
+            }
+        }
+    } elsif (($env{'form.action'} eq 'calist') && ($context eq 'author')) {
+        if ($permission->{'cusr'}) {
+            my ($role,$audom,$auname,$canview,$canedit) =
+                &Apache::lonviewcoauthors::get_allowable();
+            if (($canedit) && ($env{'form.forceedit'})) {
+                &Apache::lonviewcoauthors::get_editor_crumbs($brcrum,'/adm/createuser');
+                my $args = { 'bread_crumbs' => $brcrum };
+                $r->print(&Apache::loncommon::start_page('Configure co-author listing',undef,
+                                                         $args).
+                          &Apache::lonviewcoauthors::edit_settings($audom,$auname,$role,
+                                                                   '/adm/createuser'));
+            } else {
+                push(@{$brcrum},
+                       {href => '/adm/createuser?action=calist',
+                        text => 'Coauthor-viewable list',
+                        help => 'Author_List_Coauthors'});
+                my $args = { 'bread_crumbs' => $brcrum };
+                $r->print(&Apache::loncommon::start_page('Coauthor-viewable list',undef,
+                                                         $args));
+                my %viewsettings =
+                    &Apache::lonviewcoauthors::retrieve_view_settings($auname,$audom,$role);
+                if ($viewsettings{'show'} eq 'none') {
+                    $r->print('<h3>'.&mt('Coauthor-viewable listing').'</h3>'.
+                              '<p class="LC_info">'.
+                              &mt('Listing of co-authors not enabled for this Authoring Space').
+                              '</p>');
+                } else {
+                    &Apache::lonviewcoauthors::print_coauthors($r,$auname,$audom,$role,
+                                                               '/adm/createuser',\%viewsettings);
+                }
+            }
+        } else {
+            $r->internal_redirect('/adm/viewcoauthors');
+            return OK;
+        }
+    } elsif (($env{'form.action'} eq 'setenv') && ($context eq 'author')) {
+        my ($role,$audom,$auname,$canview,$canedit) =
+            &Apache::lonviewcoauthors::get_allowable();
+        push(@{$brcrum},
+                 {href => '/adm/createuser?action=calist',
+                  text => 'Coauthor-viewable list',
+                  help => 'Author_List_Coauthors'});
+        my $args = { 'bread_crumbs' => $brcrum };
+        $r->print(&Apache::loncommon::start_page('Coauthor-viewable list',undef,
+                                                 $args));
+        my %viewsettings =
+            &Apache::lonviewcoauthors::retrieve_view_settings($auname,$audom,$role);
+        if ($viewsettings{'show'} eq 'none') {
+            $r->print('<h3>'.&mt('Coauthor-viewable listing').'</h3>'.
+                      '<p class="LC_info">'.
+                      &mt('Listing of co-authors not enabled for this Authoring Space').
+                      '</p>');
+        } else {
+            &Apache::lonviewcoauthors::print_coauthors($r,$auname,$audom,$role,
+                                                       '/adm/createuser',\%viewsettings);
+        }
     } else {
         $bread_crumbs_component = 'User Management';
         $args = { bread_crumbs           => $brcrum,
@@ -5404,6 +6646,15 @@ function updateCols(caller) {
                 document.getElementById('showcolstart').checked = false;
                 document.getElementById('showcolend').checked = false;
             }
+            if (context == 'author') {
+                if (document.studentform.Status.options[document.studentform.Status.selectedIndex].value == 'Expired') {
+                    document.getElementById('showcolmanager').checked = false;
+                    document.getElementById('showcolmanager').disabled = 'disabled';
+                } else if (document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value != 'aa') {
+                    document.getElementById('showcolmanager').checked = true;
+                    document.getElementById('showcolmanager').disabled = '';
+                }
+            }
         }
     }
     if (caller == 'output') {
@@ -5489,6 +6740,15 @@ function updateCols(caller) {
                 }
             }
         }
+        if (context == 'author') {
+            if (document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'aa') {
+                document.getElementById('showcolmanager').checked = false;
+                document.getElementById('showcolmanager').disabled = 'disabled';
+            } else if (document.studentform.Status.options[document.studentform.Status.selectedIndex].value != 'Expired') {
+                document.getElementById('showcolmanager').checked = true;
+                document.getElementById('showcolmanager').disabled = '';
+            }
+        }
     }
     return;
 }
@@ -5549,6 +6809,7 @@ sub print_main_menu {
                             listusers  => 'Show and manage users in this community.',
                            },
                 );
+
   if ($linkcontext eq 'domain') {
       unless ($permission->{'cusr'}) {
           $links{'domain'}{'singleuser'} = 'View a User';
@@ -5670,6 +6931,7 @@ sub print_main_menu {
                                           groups => 'Community Groups',
                                         },
                        );
+        $linktext{'Placement'} = $linktext{'Course'};
 
         my %linktitle = (
             'Course' => {
@@ -5684,6 +6946,8 @@ sub print_main_menu {
                            },
         );
 
+        $linktitle{'Placement'} = $linktitle{'Course'};
+
         push(@{ $menu[0]->{items} }, #Category: Single Users
             {   
              linktext => $linktext{$crstype}{'single'},
@@ -5711,7 +6975,8 @@ sub print_main_menu {
              icon => 'helpdesk-access.png',
              #help => 'Course_Helpdesk_Access',
              url => '/adm/createuser?action=helpdesk',
-             permission => ($permission->{'owner'} || $permission->{'co-owner'}),
+             permission => (($permission->{'owner'} || $permission->{'co-owner'}) &&
+                            ($permission->{'view'} || $permission->{'cusr'})),
              linktitle => 'Helpdesk access options',
             },
             {
@@ -5746,7 +7011,7 @@ sub print_main_menu {
                      icon => 'selfenrl-queue.png',
                      #help => 'Course_Approve_Selfenroll',
                      url => '/adm/createuser?action=selfenrollqueue',
-                     permission => $permission->{'selfenrolladmin'},
+                     permission => $permission->{'selfenrolladmin'} || $permission->{'selfenrollview'},
                      linktitle =>'Approve or reject enrollment requests.',
                     },
             );
@@ -5773,12 +7038,33 @@ sub print_main_menu {
                  icon => 'self_enroll.png',
                  #help => 'Course_Self_Enrollment',
                  url => '/adm/createuser?action=selfenroll',
-                 permission => $permission->{'selfenrolladmin'},
+                 permission => $permission->{'selfenrolladmin'} || $permission->{'selfenrollview'},
                  linktitle => 'Configure user self-enrollment.',
                 },
             );
         }
     } elsif ($context eq 'author') {
+        my $coauthorlist;
+        if ($env{'request.role'} =~ m{^(?:ca|aa)\./($match_domain)/($match_username)$}) {
+            if ($env{'environment.internal.coauthorlist./'.$1.'/'.$2}) {
+                $coauthorlist = 1;
+            }
+        } elsif ($env{'request.role'} eq "au./$env{'user.domain'}/") {
+            if ($env{'environment.coauthorlist'}) {
+                $coauthorlist = 1;
+            }
+        }
+        if ($coauthorlist) {
+            push(@{ $menu[1]->{items} },
+                {
+                 linktext => 'Co-author-viewable list',
+                 icon => 'clst.png',
+                 #help => 'Coauthor_Listing',
+                 url => '/adm/createuser?action=calist&forceedit=0',
+                 permission => $permission->{'cusr'},
+                 linktitle => 'Co-author-viewable listing',
+            });
+        }
         push(@{ $menu[2]->{items} }, #Category: Administration
             {
              linktext => 'Change Log',
@@ -5788,6 +7074,44 @@ sub print_main_menu {
              permission => $permission->{'cusr'},
              linktitle => 'View change log.',
             },
+            {
+             linktext => 'Co-author Managers',
+             icon => 'camanager.png',
+             #help => 'Coauthor_Management',
+             url => '/adm/createuser?action=camanagers',
+             permission => $permission->{'author'},
+             linktitle => 'Assign/Revoke right to manage co-author roles',
+            },
+            {
+             linktext => 'Configure Co-author Listing',
+             icon => 'coauthors.png',
+             #help => 'Coauthor_Settings',
+             url => '/adm/createuser?action=calist&forceedit=1',
+             permission => ($permission->{'cusr'}),
+             linktitle => 'Set availability of coauthor-viewable user listing',
+            },
+        );
+    }
+    push(@{ $menu[2]->{items} },
+        {
+         linktext => 'Role Requests (other domains)',
+         icon => 'edit-find.png',
+         #help => 'Role_Requests',
+         url => '/adm/createuser?action=rolerequests',
+         permission => $permission->{'cusr'},
+         linktitle => 'Role requests for users in other domains',
+        },
+    );
+    if (&show_role_requests($context,$env{'request.role.domain'})) {
+        push(@{ $menu[2]->{items} },
+            {
+             linktext => 'Queued Role Assignments (this domain)',
+             icon => 'edit-find.png',
+             #help => 'Role_Approvals',
+             url => '/adm/createuser?action=queuedroles',
+             permission => $permission->{'cusr'},
+             linktitle => "Role requests for this domain's users",
+            },
         );
     }
     return Apache::lonhtmlcommon::generate_menu(@menu);
@@ -6022,8 +7346,7 @@ ENDSCRIPT
                  '// ]]>'."\n".
                  '</script>'."\n".
                  '<h3>'.$lt->{'selfenroll'}.'</h3>'."\n";
- 
-    my $visactions = &cat_visibility();
+    my $visactions = &cat_visibility($cdom);
     my ($cathash,%cattype);
     my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
     if (ref($domconfig{'coursecategories'}) eq 'HASH') {
@@ -6186,10 +7509,11 @@ ENDSCRIPT
                 } elsif ($curr_types eq '') {
                     $add_domtitle = &mt('Users in other domain:');
                 }
+                my ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$cdom);
                 $output .= &Apache::loncommon::start_data_table_row()
                            .'<td colspan="2"><span class="LC_nobreak">'.$add_domtitle.'</span><br />'
                            .&Apache::loncommon::select_dom_form('','selfenroll_newdom',
-                                                                $includeempty,$showdomdesc,'','','',$readonly)
+                                                                $includeempty,$showdomdesc,'',$trusted,$untrusted,$readonly)
                            .'<input type="hidden" name="selfenroll_types_total" value="'.$num.'" />'
                            .'</td>'.&Apache::loncommon::end_data_table_row()
                            .&Apache::loncommon::end_data_table();
@@ -6460,7 +7784,7 @@ sub get_noedit_fields {
         }
     }
     return %noedit;
-} 
+}
 
 sub visible_in_stdcat {
     my ($cdom,$cnum,$domconf) = @_;
@@ -6568,6 +7892,7 @@ sub visible_in_stdcat {
 }
 
 sub cat_visibility {
+    my ($cdom) = @_;
     my %visactions = &Apache::lonlocal::texthash(
                    vis => 'This course/community currently appears in the Course/Community Catalog for this domain.',
                    gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.',
@@ -6580,13 +7905,24 @@ sub cat_visibility {
                    dc_chgconf => 'Ask a domain coordinator to change the Catalog type for this domain.',
                    dc_setcode => 'Ask a domain coordinator to assign a six character code to the course',
                    dc_unhide  => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.',
-                   dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".',
+                   dc_addinst => 'Ask a domain coordinator to enable catalog display of "Official courses (with institutional codes)".',
                    dc_instcode => 'Ask a domain coordinator to assign an institutional code (if this is an official course).',
                    dc_catalog  => 'Ask a domain coordinator to enable or create at least one course category in the domain.',
                    dc_categories => 'Ask a domain coordinator to create a hierarchy of categories and sub categories for courses in the domain.',
                    dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain',
                    dc_addcat => 'Ask a domain coordinator to assign a category to the course.',
     );
+    if ($env{'request.role'} eq "dc./$cdom/") {
+        $visactions{'dc_chgconf'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to change the Catalog type for this domain.','&raquo;');
+        $visactions{'dc_setcode'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to assign a six character code to the course.','&raquo;');
+        $visactions{'dc_unhide'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to change the "Exclude from course catalog" setting.','&raquo;');
+        $visactions{'dc_addinst'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to enable catalog display of "Official courses (with institutional codes)".','&raquo;');
+        $visactions{'dc_instcode'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify course owner, institutional code ... " to assign an institutional code (if this is an official course).','&raquo;');
+        $visactions{'dc_catalog'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to enable or create at least one course category in the domain.','&raquo;');
+        $visactions{'dc_categories'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to create a hierarchy of categories and sub categories for courses in the domain.','&raquo;');
+        $visactions{'dc_chgcat'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify catalog settings for course" to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','&raquo;');
+        $visactions{'dc_addcat'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify catalog settings for course" to assign a category to the course.','&raquo;');
+    }
     $visactions{'unhide'} = &mt('Use [_1]Categorize course[_2] to change the "Exclude from course catalog" setting.','<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
     $visactions{'chgcat'} = &mt('Use [_1]Categorize course[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
     $visactions{'addcat'} = &mt('Use [_1]Categorize course[_2] to assign a category to the course.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
@@ -6712,9 +8048,11 @@ sub print_userchangelogs_display {
             &Apache::loncommon::restore_course_settings('roles_log',
                                                         \%saveable_parameters);
         } elsif ($context eq 'author') {
-            $domain = $env{'user.domain'}; 
+            $domain = $env{'user.domain'};
             if ($env{'request.role'} =~ m{^au\./\Q$domain\E/$}) {
                 $username = $env{'user.name'};
+            } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) {
+                ($domain,$username) = ($1,$2);
             } else {
                 undef($domain);
             }
@@ -6765,12 +8103,13 @@ ENDSCRIPT
                      chgcontext         => 'any',
                      rolelog_start_date => $defstart,
                      rolelog_end_date   => $now,
+                     approvals          => 'any',
                    );
     my $more_records = 0;
 
     # set current
     my %curr;
-    foreach my $item ('show','page','role','chgcontext') {
+    foreach my $item ('show','page','role','chgcontext','approvals') {
         $curr{$item} = $env{'form.'.$item};
     }
     my ($startdate,$enddate) = 
@@ -6844,6 +8183,11 @@ ENDSCRIPT
         if (($context eq 'course') && ($viewablesec ne '')) {
             next if ($roleslog{$id}{'logentry'}{'section'} ne $viewablesec);
         }
+        if ($curr{'approvals'} eq 'none') {
+            next if ($roleslog{$id}{'logentry'}{'approval'});
+        } elsif ($curr{'approvals'} ne 'any') { 
+            next if ($roleslog{$id}{'logentry'}{'approval'} ne $curr{'approvals'});
+        }
         $count ++;
         next if ($count < $minshown);
         unless ($showntableheader) {
@@ -6890,11 +8234,30 @@ ENDSCRIPT
         if ($chgcontext ne '' && $lt{$chgcontext} ne '') {
             $chgcontext = $lt{$chgcontext};
         }
+        my ($showreqby,%reqby);
+        if (($roleslog{$id}{'logentry'}{'approval'}) &&
+            ($roleslog{$id}{'logentry'}{'requester'})) {
+            if ($reqby{$roleslog{$id}{'logentry'}{'requester'}} eq '') {
+                my ($requname,$requdom) = split(/:/,$roleslog{$id}{'logentry'}{'requester'});
+                $reqby{$roleslog{$id}{'logentry'}{'requester'}} =
+                    &Apache::loncommon::plainname($requname,$requdom);
+            }
+            $showreqby = &mt('Requester').': <span class="LC_nobreak">'.$reqby{$roleslog{$id}{'logentry'}{'requester'}}.'</span><br />';
+            if ($roleslog{$id}{'logentry'}{'approval'} eq 'domain') {
+                $showreqby .= &mt('Adjudicator').': <span class="LC_nobreak">'.
+                              $whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.
+                              '</span>';
+            } else {
+                $showreqby .= '<span class="LC_nobreak">'.&mt('User approved').'</span>';
+            }
+        } else {
+            $showreqby = $whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}};
+        }
         $r->print(
             &Apache::loncommon::start_data_table_row()
            .'<td>'.$count.'</td>'
            .'<td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td>'
-           .'<td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td>'
+           .'<td>'.$showreqby.'</td>'
            .'<td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td>'
            .'<td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'},$crstype).'</td>');
         if ($context eq 'course') { 
@@ -7248,7 +8611,7 @@ sub activity_display_filter {
     my $nolink = 1;
     my $output = '<table><tr><td valign="top">'.
                  '<span class="LC_nobreak"><b>'.&mt('Actions/page:').'</b></span><br />'.
-                 &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
+                 &Apache::lonmeta::selectbox('show',$curr->{'show'},'',undef,
                                               (&mt('all'),5,10,20,50,100,1000,10000)).
                  '</td><td>&nbsp;&nbsp;</td>';
     my $startform =
@@ -7335,14 +8698,10 @@ sub userlogdisplay_navlinks {
 
 sub role_display_filter {
     my ($context,$formname,$cdom,$cnum,$curr,$version,$crstype) = @_;
-    my $lctype;
-    if ($context eq 'course') {
-        $lctype = lc($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,
+                 &Apache::lonmeta::selectbox('show',$curr->{'show'},'',undef,
                                               (&mt('all'),5,10,20,50,100,1000,10000)).
                  '</td><td>&nbsp;&nbsp;</td>';
     my $startform =
@@ -7366,7 +8725,7 @@ sub role_display_filter {
     if ($curr->{'role'} eq 'any') {
         $output .= ' selected="selected"';
     }
-    $output .=  '>'.&mt('Any').'</option>'."\n";
+    $output .= '>'.&mt('Any').'</option>'."\n";
     my @roles = &Apache::lonuserutils::roles_by_context($context,1,$crstype);
     foreach my $role (@roles) {
         my $plrole;
@@ -7387,12 +8746,12 @@ sub role_display_filter {
                &mt('Context:').'</b><br /><select name="chgcontext">';
     my @posscontexts;
     if ($context eq 'course') {
-        @posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses');
+        @posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses','chgtype','ltienroll');
     } elsif ($context eq 'domain') {
         @posscontexts = ('any','domain','requestauthor','domconfig','server');
     } else {
-        @posscontexts = ('any','author','domain');
-    } 
+        @posscontexts = ('any','author','coauthor','domain');
+    }
     foreach my $chgtype (@posscontexts) {
         my $selstr = '';
         if ($curr->{'chgcontext'} eq $chgtype) {
@@ -7405,8 +8764,20 @@ sub role_display_filter {
         }
         $output .= '<option value="'.$chgtype.'"'.$selstr.'>'.$lt{$chgtype}.'</option>'."\n";
     }
-    $output .= '</select></td>'
-              .'</tr></table>';
+    my @possapprovals = ('any','none','domain','user');
+    my %apptxt = &approval_types();
+    $output .= '</select></td>'.
+               '<td>&nbsp;&nbsp;</td>'.
+               '<td valign="top"><b>'.
+               &mt('Approvals:').'</b><br /><select name="approvals">';
+    foreach my $approval (@possapprovals) {
+        my $selstr = '';
+        if ($curr->{'approvals'} eq $approval) {
+            $selstr = ' selected="selected"';
+        }    
+        $output .= '<option value="'.$approval.'"'.$selstr.'>'.$apptxt{$approval}.'</option>';
+    }
+    $output .= '</select></td></tr></table>';
 
     # Update Display button
     $output .= '<p>'
@@ -7436,12 +8807,14 @@ sub rolechg_contexts {
         %lt = &Apache::lonlocal::texthash (
                                              any          => 'Any',
                                              automated    => 'Automated Enrollment',
+                                             chgtype      => 'Enrollment Type/Lock Change',
                                              updatenow    => 'Roster Update',
                                              createcourse => 'Course Creation',
                                              course       => 'User Management in course',
                                              domain       => 'User Management in domain',
                                              selfenroll   => 'Self-enrolled',
                                              requestcourses => 'Course Request',
+                                             ltienroll    => 'Enrollment via LTI',
                                          );
         if ($crstype eq 'Community') {
             $lt{'createcourse'} = &mt('Community Creation');
@@ -7461,11 +8834,21 @@ sub rolechg_contexts {
                                              any    => 'Any',
                                              domain => 'User Management in domain',
                                              author => 'User Management by author',
+                                             coauthor => 'User Management by coauthor',
                                          );
     } 
     return %lt;
 }
 
+sub approval_types {
+    return &Apache::lonlocal::texthash (
+                                          any => 'Any',
+                                          none => 'No approval needed',
+                                          user => 'Role recipient approval',
+                                          domain => 'Domain coordinator approval',
+                                       );
+}
+
 sub print_helpdeskaccess_display {
     my ($r,$permission,$brcrum) = @_;
     my $formname = 'helpdeskaccess';
@@ -7872,6 +9255,67 @@ ENDJS
     return;
 }
 
+sub print_queued_roles {
+    my ($r,$context,$permission,$brcrum) = @_;
+    push (@{$brcrum},
+             {href => '/adm/createuser?action=rolerequests',
+              text => 'Role Requests (other domains)',
+              help => ''});
+    my $bread_crumbs_component = 'Role Requests';
+    my $args = { bread_crumbs           => $brcrum,
+                 bread_crumbs_component => $bread_crumbs_component};
+    # print page header
+    $r->print(&header('',$args));
+    my ($dom,$cnum);
+    $dom = $env{'request.role.domain'};
+    if ($context eq 'course') {
+        if ($env{'request.course.id'}) {
+            if (&Apache::loncommon::course_type() eq 'Community') {
+                $context = 'community';
+            }
+            $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        }
+    } elsif ($context eq 'author') {
+        $cnum = $env{'user.name'};
+    }
+    $r->print(&Apache::loncoursequeueadmin::display_queued_requests('othdomqueue',$dom,$cnum,$context));
+    return;
+}
+
+sub print_pendingroles {
+    my ($r,$context,$permission,$brcrum) = @_;
+    push (@{$brcrum},
+             {href => '/adm/createuser?action=queuedroles',
+              text => 'Queued Role Assignments (users in this domain)',
+              help => ''});
+    my $bread_crumbs_component = 'Queued Role Assignments';
+    my $args = { bread_crumbs           => $brcrum,
+                 bread_crumbs_component => $bread_crumbs_component};
+    # print page header
+    $r->print(&header('',$args));
+    $r->print(&Apache::loncoursequeueadmin::display_queued_requests('othdomaction',$env{'request.role.domain'},'','domain'));
+    return;
+}
+
+sub process_pendingroles {
+    my ($r,$context,$permission,$brcrum) = @_;
+    push (@{$brcrum},
+             {href => '/adm/createuser?action=queuedroles',
+              text => 'Queued Role Assignments (users in this domain)',
+              help => ''},
+             {href => '/adm/createuser?action=processrolereq',
+              text => 'Process Queue',
+              help => ''});
+    my $bread_crumbs_component = 'Queued Role Assignments';
+    my $args = { bread_crumbs           => $brcrum,
+                 bread_crumbs_component => $bread_crumbs_component};
+    # print page header
+    $r->print(&header('',$args));
+    $r->print(&Apache::loncoursequeueadmin::update_request_queue('othdombydc',
+                                                                 $env{'request.role.domain'}));
+    return;
+}
+
 sub domain_adhoc_access {
     my ($roles,$domcurrent,$accesstypes,$usertypes,$othertitle) = @_;
     my %domusage;
@@ -8500,7 +9944,7 @@ sub user_search_result {
             my $domd_chk = &domdirectorysrch_check($srch);
             $response .= '<span class="LC_warning">'.$instd_chk.'</span><br />';
             if ($domd_chk eq 'ok') {
-                $response .= &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.');
+                $response .= &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.');
             }
             $response .= '<br />';
         }
@@ -8511,7 +9955,7 @@ sub user_search_result {
                 my $instd_chk = &instdirectorysrch_check($srch);
                 $response .= '<span class="LC_warning">'.$domd_chk.'</span><br />';
                 if ($instd_chk eq 'ok') {
-                    $response .= &mt('You may want to search in the institutional directory instead of the LON-CAPA domain.');
+                    $response .= &mt('You may want to search in the institutional directory instead of in the LON-CAPA domain.');
                 }
                 $response .= '<br />';
             }
@@ -8612,7 +10056,7 @@ sub user_search_result {
                 $response = '<span class="LC_warning">'.
                     &mt('Institutional directory search is not available in domain: [_1]',$showdom).
                     '</span><br />'.
-                    &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
+                    &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.').
                     '<br />'; 
             }
         }
@@ -8685,7 +10129,7 @@ sub user_search_result {
                 $response = '<span class="LC_warning">'.
                     &mt('Institutional directory search is not available in domain: [_1]',$showdom).
                     '</span><br />'.
-                    &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
+                    &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.').
                     '<br />';
             }
         }
@@ -9205,7 +10649,7 @@ sub course_level_dc {
 ENDTIMEENTRY
     $otheritems .= &Apache::loncommon::end_data_table_row().
                    &Apache::loncommon::end_data_table()."\n";
-    return $cb_jscript.$header.$hiddenitems.$otheritems;
+    return $cb_jscript.$hiddenitems.$header.$otheritems;
 }
 
 sub update_selfenroll_config {
@@ -9541,7 +10985,7 @@ sub update_selfenroll_config {
     } else {
         $r->print(&mt('No changes were made to the existing self-enrollment settings in this course.'));
     }
-    my $visactions = &cat_visibility();
+    my $visactions = &cat_visibility($cdom);
     my ($cathash,%cattype);
     my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
     if (ref($domconfig{'coursecategories'}) eq 'HASH') {