--- loncom/interface/loncreateuser.pm	2016/11/12 00:16:24	1.421
+++ 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.421 2016/11/12 00:16:24 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",
@@ -253,51 +299,90 @@ sub build_tools_display {
                    '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',
-                      'requestcourses.placement');
-        @usertools = ('official','unofficial','community','textbook','placement');
+                      '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 = '';
@@ -305,37 +390,113 @@ 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".
                    '   <td'.$colspan.'>'.$lt{$item}.'</td>'."\n".
                    '  </tr>'."\n".
                    &Apache::loncommon::start_data_table_row()."\n";
-  
         if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
             my ($curroption,$currlimit);
             my $envkey = $context.'.'.$item;
@@ -361,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 '') {
@@ -371,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') {
@@ -394,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;
@@ -528,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,
@@ -536,82 +763,16 @@ sub domainrole_req {
            &Apache::loncommon::end_data_table();
 }
 
-sub domadhocroles {
+sub authoring_defaults {
     my ($ccuname,$ccdomain) = @_;
-    my $confname = &Apache::lonnet::get_domainconfiguser($env{'request.role.domain'});
-    my %existing=&Apache::lonnet::dump('roles',$env{'request.role.domain'},
-                                       $confname,'rolesdef_');
-    my ($output,$canmodify);
-    if (&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) {
-        $canmodify = 1;
-    }
-    if (keys(%existing) > 0) {
-        my @current;
-        my $curradhoc = 'adhocroles.'.$env{'request.role.domain'};
-        my %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,$curradhoc);
-        if ($userenv{$curradhoc}) {
-            @current = split(/,/,$userenv{$curradhoc});
-        }
-        if (!$canmodify && !@current) {
-            return;
-        }
-        my %customroles;
-        foreach my $key (keys(%existing)) {
-            if ($key=~/^rolesdef\_(\w+)$/) {
-                my $rolename = $1;
-                my %privs;
-                ($privs{'system'},$privs{'domain'},$privs{'course'}) = split(/\_/,$existing{$key});
-                $customroles{$rolename} = \%privs;
-            }
-        }
-        $output = '<br /><h3>'.
-                  &mt('Ad Hoc Course Roles Selectable via Helpdesk Role').
-                  '</h3>'."\n".
-                  &Apache::loncommon::start_data_table().
-                  &Apache::loncommon::start_data_table_header_row();
-        if ($canmodify) {
-            $output .= '<th>'.&mt('Action').'</th>';
-        }
-        $output .= '<th>'.&mt('Role').'</th>'.
-                   '<th>'.&mt('Privileges in Course').'<th>'.
-                   &Apache::loncommon::end_data_table_header_row();
-        foreach my $key (sort(keys(%customroles))) {
-            next if ((!$canmodify) && (!grep(/^\Q$key\E$/,@current)));
-            $output .= &Apache::loncommon::start_data_table_row();
-            if ($canmodify) {
-                if (grep(/^\Q$key\E$/,@current)) {
-                    $output .= '<td><label>'.
-                               '<input type="checkbox" name="adhocroledel" value="'.$key.'" />'.
-                               &mt('Delete').'</label>'.
-                               '</td>';
-                } else {
-                    $output .= '<td><label>'.
-                               '<input type="checkbox" name="adhocroleadd" value="'.$key.'" />'.
-                               &mt('Add').'</label>'.
-                               '</td>';
-                }
-            }
-            $output .= '<td>'.$key.'</td><td>';
-            foreach my $level ('course','domain','system') {
-                if ($customroles{$key}{$level}) {
-                    my $suffix;
-                    if (($level eq 'domain') || ($level eq 'system')) {
-                        $suffix = '&nbsp;('.&mt($level).')';
-                    }
-                    my @privs = split(/:/,$customroles{$key}{$level});
-                    foreach my $item (@privs) {
-                        next if ($item eq '');
-                        my ($priv,$cond) = split(/\&/,$item);
-                        $output .= &Apache::lonnet::plaintext($priv,'Course').$suffix.'<br />';
-                    }
-                }
-            }
-            $output .= '</td>'.
-                       &Apache::loncommon::end_data_table_row();
-        }
-        $output .= &Apache::loncommon::end_data_table();
-    }
-    return $output;
+    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 {
@@ -621,6 +782,7 @@ sub courserequest_titles {
                                    community  => 'Communities',
                                    textbook   => 'Textbook',
                                    placement  => 'Placement Tests',
+                                   lti        => 'LTI Provider',
                                    norequest  => 'Not allowed',
                                    approval   => 'Approval by Dom. Coord.',
                                    validate   => 'With validation',
@@ -725,7 +887,8 @@ sub curr_requestauthor {
 # =================================================================== Phase one
 
 sub print_username_entry_form {
-    my ($r,$context,$response,$srch,$forcenewuser,$crstype,$brcrum) = @_;
+    my ($r,$context,$response,$srch,$forcenewuser,$crstype,$brcrum,
+        $permission) = @_;
     my $defdom=$env{'request.role.domain'};
     my $formtoset = 'crtuser';
     if (exists($env{'form.startrolename'})) {
@@ -751,13 +914,27 @@ sub print_username_entry_form {
     }
     my $helpitem = 'Course_Change_Privileges';
     if ($env{'form.action'} eq 'custom') {
-        $helpitem = 'Course_Editing_Custom_Roles';
+        if ($context eq 'course') {
+            $helpitem = 'Course_Editing_Custom_Roles';
+        } elsif ($context eq 'domain') {
+            $helpitem = 'Domain_Editing_Custom_Roles';
+        }
     } elsif ($env{'form.action'} eq 'singlestudent') {
         $helpitem = 'Course_Add_Student';
     } elsif ($env{'form.action'} eq 'accesslogs') {
         $helpitem = 'Domain_User_Access_Logs';
+    } elsif ($context eq 'author') {
+        $helpitem = 'Author_Change_Privileges';
+    } elsif ($context eq 'domain') {
+        if ($permission->{'cusr'}) {
+            $helpitem = 'Domain_Change_Privileges';
+        } elsif ($permission->{'view'}) {
+            $helpitem = 'Domain_View_Privileges';
+        } else {
+            undef($helpitem);
+        }
     }
-    my %breadcrumb_text = &singleuser_breadcrumb($crstype);
+    my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$defdom);
     if ($env{'form.action'} eq 'custom') {
         push(@{$brcrum},
                  {href=>"javascript:backPage(document.crtuser)",       
@@ -785,6 +962,7 @@ sub print_username_entry_form {
                     'srst' => 'Search for a user and enroll as a student',
                     'srme' => 'Search for a user and enroll as a member',
                     'srad' => 'Search for a user and modify/add user information or roles',
+                    'srvu' => 'Search for a user and view user information and roles',
                     'srva' => 'Search for a user and view access log information',
 		    'usr'  => "Username",
                     'dom'  => "Domain",
@@ -832,6 +1010,7 @@ sub print_username_entry_form {
         }
     } else {
         my $actiontext = $lt{'srad'};
+        my $fixeddom;
         if ($env{'form.action'} eq 'singlestudent') {
             if ($crstype eq 'Community') {
                 $actiontext = $lt{'srme'};
@@ -840,6 +1019,11 @@ sub print_username_entry_form {
             }
         } elsif ($env{'form.action'} eq 'accesslogs') {
             $actiontext = $lt{'srva'};
+            $fixeddom = 1;
+        } elsif (($env{'form.action'} eq 'singleuser') &&
+                 ($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$defdom))) {
+            $actiontext = $lt{'srvu'};
+            $fixeddom = 1;
         }
         $r->print("<h3>$actiontext</h3>");
         if ($env{'form.origform'} ne 'crtusername') {
@@ -848,7 +1032,7 @@ sub print_username_entry_form {
                          '<br clear="all" />');
             }
         }
-        $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,1));
+        $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,$fixeddom));
     }
 }
 
@@ -907,11 +1091,16 @@ sub entry_form {
             $inexact = 1;
         }
     }
-    my $cancreate =
-        &Apache::lonuserutils::can_create_user($dom,$context,$usertype);
+    my ($cancreate,$noinstd);
+    if ($env{'form.action'} eq 'accesslogs') {
+        $noinstd = 1;
+    } else {
+        $cancreate =
+            &Apache::lonuserutils::can_create_user($dom,$context,$usertype);
+    }
     my ($userpicker,$cansearch) = 
        &Apache::loncommon::user_picker($dom,$srch,$forcenewuser,
-                                       'document.crtuser',$cancreate,$usertype,$context,$fixeddom);
+                                       'document.crtuser',$cancreate,$usertype,$context,$fixeddom,$noinstd);
     my $srchbutton = &mt('Search');
     if ($env{'form.action'} eq 'singlestudent') {
         $srchbutton = &mt('Search and Enroll');
@@ -933,9 +1122,19 @@ ENDBLOCK
     } else {
         $output = '<p>'.$userpicker.'</p>';
     }
-    if (($env{'form.phase'} eq '') && ($env{'form.action'} ne 'accesslogs')) {
+    if (($env{'form.phase'} eq '') && ($env{'form.action'} ne 'accesslogs') &&
+        (!(($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',
@@ -1050,7 +1249,9 @@ ENDSCRIPT
                                        'stusrch'        => "User Search to enroll student",
                                        'memsrch'        => "User Search to enroll member",
                                        'srcva'          => "Search for a user and view access log information",
+                                       'usrvu'          => "User Search to view user roles",
                                        'usel'           => "Select a user to add/modify roles",
+                                       'suvr'           => "Select a user to view roles",
                                        'stusel'         => "Select a user to enroll as a student",
                                        'memsel'         => "Select a user to enroll as a member",
                                        'vacsel'         => "Select a user to view access log",
@@ -1063,12 +1264,16 @@ ENDSCRIPT
     if ($context eq 'requestcrs') {
         $r->print('<div>');
     } else {
-        my %breadcrumb_text = &singleuser_breadcrumb($crstype);
+        my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$srch->{'srchdomain'});
         my $helpitem;
         if ($env{'form.action'} eq 'singleuser') {
             $helpitem = 'Course_Change_Privileges';
         } elsif ($env{'form.action'} eq 'singlestudent') {
             $helpitem = 'Course_Add_Student';
+        } elsif ($context eq 'author') {
+            $helpitem = 'Author_Change_Privileges';
+        } elsif ($context eq 'domain') {
+            $helpitem = 'Domain_Change_Privileges';
         }
         push (@{$brcrum},
                   {href => "javascript:backPage(document.usersrchform,'','')",
@@ -1083,9 +1288,19 @@ ENDSCRIPT
                   );
         $r->print(&Apache::loncommon::start_page('User Management',$jscript,{bread_crumbs => $brcrum}));
         if ($env{'form.action'} eq 'singleuser') {
-            $r->print("<b>$lt{'usrch'}</b><br />");
+            my $readonly;
+            if (($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$srch->{'srchdomain'}))) {
+                $readonly = 1;
+                $r->print("<b>$lt{'usrvu'}</b><br />");
+            } else {
+                $r->print("<b>$lt{'usrch'}</b><br />");
+            }
             $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype));
-            $r->print('<h3>'.$lt{'usel'}.'</h3>');
+            if ($readonly) {
+                $r->print('<h3>'.$lt{'suvr'}.'</h3>');
+            } else {
+                $r->print('<h3>'.$lt{'usel'}.'</h3>');
+            }
         } elsif ($env{'form.action'} eq 'singlestudent') {
             $r->print($jscript."<b>");
             if ($crstype eq 'Community') {
@@ -1104,7 +1319,7 @@ ENDSCRIPT
             $r->print('</h3>');
         } elsif ($env{'form.action'} eq 'accesslogs') {
             $r->print("<b>$lt{'srcva'}</b><br />");
-            $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,'accesslogs',undef,undef,1));
+            $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,undef,1));
             $r->print('<h3>'.$lt{'vacsel'}.'</h3>');
         }
     }
@@ -1185,7 +1400,8 @@ sub print_user_modification_page {
     if (($ccuname eq '') || ($ccdomain eq '')) {
         my $usermsg = &mt('No username and/or domain provided.');
         $env{'form.phase'} = '';
-	&print_username_entry_form($r,$context,$usermsg,'','',$crstype,$brcrum);
+	&print_username_entry_form($r,$context,$usermsg,'','',$crstype,$brcrum,
+                                   $permission);
         return;
     }
     my ($form,$formname);
@@ -1234,7 +1450,8 @@ sub print_user_modification_page {
             }
             $response .= '</p><br />';
             $env{'form.phase'} = '';
-            &print_username_entry_form($r,$context,$response,undef,undef,$crstype,$brcrum);
+            &print_username_entry_form($r,$context,$response,undef,undef,$crstype,$brcrum,
+                                       $permission);
             return;
         }
         $newuser = 1;
@@ -1258,7 +1475,8 @@ sub print_user_modification_page {
                             'username');
                     }
                     $env{'form.phase'} = '';
-                    &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype,$brcrum);
+                    &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype,$brcrum,
+                                               $permission);
                     return;
                 }
             }
@@ -1277,12 +1495,18 @@ 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 %breadcrumb_text = &singleuser_breadcrumb($crstype);
+    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') {
         $helpitem = 'Course_Add_Student';
+    } elsif ($context eq 'author') {
+        $helpitem = 'Author_Change_Privileges';
+    } elsif ($context eq 'domain') {
+        $helpitem = 'Domain_Change_Privileges';
+        $js .= &set_custom_js();
     }
     push (@{$brcrum},
         {href => "javascript:backPage($form)",
@@ -1307,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);
@@ -1344,24 +1595,36 @@ ENDFORMINFO
         }
     }
     my $title = '';
+    my $need_quota_js;
     if ($newuser) {
-        my ($portfolioform,$domroleform,$adhocroleform);
+        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);
-        }
-        if (&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) {
-            $adhocroleform = &domadhocroles($ccuname,$ccdomain);
-            if ($adhocroleform) {
-                $adhocroleform = '<br />'.$adhocroleform;
-            }
+            $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",
@@ -1392,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',
@@ -1407,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').
@@ -1471,7 +1734,7 @@ ENDAUTH
         } else {
             $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc)); 
         }
-        $r->print($portfolioform.$domroleform.$adhocroleform);
+        $r->print($portfolioform.$domroleform);
         if ($env{'form.action'} eq 'singlestudent') {
             $r->print(&date_sections_select($context,$newuser,$formname,
                                             $permission,$crstype,$ccuname,
@@ -1501,45 +1764,63 @@ ENDAUTH
         $r->print('<div class="LC_left_float">');
         $r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context,
                                          $inst_results{$ccuname.':'.$ccdomain}));
-        if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) || 
+        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','adhocroles');
+        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);
-        }
-        if ((&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) || 
-            (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) {
-            $user_text{'adhocroles'} = &domadhocroles($ccuname,$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);
+        $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;
@@ -1552,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;
@@ -1596,7 +1877,7 @@ ENDNOTOOLSPRIV
         } elsif (($context eq 'course') && ((&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) ||
                  ($env{'request.course.sec'} &&
                   &Apache::lonnet::allowed('vcl',$env{'request.course.id'}.'/'.$env{'request.course.sec'})))) {
-            $statuses = ['active'];   
+            $statuses = ['active'];
         }
         if ($env{'form.action'} ne 'singlestudent') {
             &display_existing_roles($r,$ccuname,$ccdomain,\%inccourses,$context,
@@ -1633,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>'.
@@ -1650,11 +1931,14 @@ 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;
 }
 
 sub singleuser_breadcrumb {
-    my ($crstype) = @_;
+    my ($crstype,$context,$domain) = @_;
     my %breadcrumb_text;
     if ($env{'form.action'} eq 'singlestudent') {
         if ($crstype eq 'Community') {
@@ -1662,16 +1946,21 @@ sub singleuser_breadcrumb {
         } else {
             $breadcrumb_text{'search'} = 'Enroll a student';
         }
-        $breadcrumb_text{'userpicked'} = 'Select a user',
-        $breadcrumb_text{'modify'} = 'Set section/dates',
+        $breadcrumb_text{'userpicked'} = 'Select a user';
+        $breadcrumb_text{'modify'} = 'Set section/dates';
     } elsif ($env{'form.action'} eq 'accesslogs') {
         $breadcrumb_text{'search'} = 'View access logs for a user';
-        $breadcrumb_text{'userpicked'} = 'Select a user',
-        $breadcrumb_text{'activity'} = 'Activity',
+        $breadcrumb_text{'userpicked'} = 'Select a user';
+        $breadcrumb_text{'activity'} = 'Activity';
+    } elsif (($env{'form.action'} eq 'singleuser') && ($context eq 'domain') &&
+             (!&Apache::lonnet::allowed('mau',$domain))) {
+        $breadcrumb_text{'search'} = "View user's roles";
+        $breadcrumb_text{'userpicked'} = 'Select a user';
+        $breadcrumb_text{'modify'} = 'User roles';
     } else {
         $breadcrumb_text{'search'} = 'Create/modify a user';
-        $breadcrumb_text{'userpicked'} = 'Select a user',
-        $breadcrumb_text{'modify'} = 'Set user role',
+        $breadcrumb_text{'userpicked'} = 'Select a user';
+        $breadcrumb_text{'modify'} = 'Set user role';
     }
     return %breadcrumb_text;
 }
@@ -1703,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))) {
@@ -1782,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;
@@ -1825,7 +2121,7 @@ sub display_existing_roles {
         if ($active) {
             next unless($showall || $showactive);
         } else {
-            next unless($showall || $showexpired); 
+            next unless($showall || $showexpired);
         }
 # Is this a custom role? Get role owner and title.
         my ($croleudom,$croleuname,$croletitle)=
@@ -1942,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;
             }
@@ -1970,7 +2268,7 @@ sub display_existing_roles {
             } else {
                 $row.='&nbsp;';
             }
-            $row.= '</td>'; 
+            $row.= '</td>';
         }
         my $plaintext='';
         if (!$croletitle) {
@@ -2044,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');
@@ -2085,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",
@@ -2146,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;;
 }
@@ -2166,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",
@@ -2201,7 +2534,7 @@ sub new_domain_roles {
 }
 
 sub user_authentication {
-    my ($ccuname,$ccdomain,$formname) = @_;
+    my ($ccuname,$ccdomain,$formname,$crstype,$permission) = @_;
     my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
     my $outcome;
     my %lt=&Apache::lonlocal::texthash(
@@ -2212,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);
@@ -2274,6 +2607,43 @@ ENDBADAUTH
             }
             $outcome .= &Apache::loncommon::end_data_table();
         } else {
+            if (($currentauth =~ /^internal:/) &&
+                (&Apache::lonuserutils::can_change_internalpass($ccuname,$ccdomain,$crstype,$permission))) {
+                $outcome = <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+function togglePwd(form) {
+    if (form.newintpwd.length) {
+        if (document.getElementById('LC_ownersetpwd')) {
+            for (var i=0; i<form.newintpwd.length; i++) {
+                if (form.newintpwd[i].checked) {
+                    if (form.newintpwd[i].value == 1) {
+                        document.getElementById('LC_ownersetpwd').style.display = 'inline-block';
+                    } else {
+                        document.getElementById('LC_ownersetpwd').style.display = 'none';
+                    }
+                }
+            }
+        }
+    }
+}
+// ]]>
+</script>
+ENDJS
+
+                $outcome .= '<h3>'.$lt{'ld'}.'</h3>'.
+                            &Apache::loncommon::start_data_table().
+                            &Apache::loncommon::start_data_table_row().
+                            '<td>'.&mt('Internally authenticated').'<br />'.&mt("Change user's password?").
+                            '<label><input type="radio" name="newintpwd" value="0" checked="checked" onclick="togglePwd(this.form);" />'.
+                            &mt('No').'</label>'.('&nbsp;'x2).
+                            '<label><input type="radio" name="newintpwd" value="1" onclick="togglePwd(this.form);" />'.&mt('Yes').'</label>'.
+                            '<div id="LC_ownersetpwd" style="display:none">'.
+                            '&nbsp;&nbsp;'.&mt('Password').' <input type="password" size="15" name="intarg" value="" />'.
+                            '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.intarg.type='."'text'".' } else { this.form.intarg.type='."'password'".' }" />'.&mt('Visible input').'</label></div></td>'.
+                            &Apache::loncommon::end_data_table_row().
+                            &Apache::loncommon::end_data_table();
+            }
             if (&Apache::lonnet::allowed('udp',$ccdomain)) {
                 # Current user has rights to view domain preferences for user's domain
                 my $result;
@@ -2283,7 +2653,7 @@ ENDBADAUTH
                         $result = &mt('Currently Kerberos authenticated, Version [_1].',$krbver);
                     } else {
                         $result = &mt('Currently Kerberos authenticated with domain [_1] Version [_2].',
-                                      $krbver,$krbrealm);
+                                      $krbrealm,$krbver);
                     }
                 } elsif ($currentauth =~ /^internal:/) {
                     $result = &mt('Currently internally authenticated.');
@@ -2291,6 +2661,8 @@ ENDBADAUTH
                     $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().
@@ -2329,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;
         }
@@ -2340,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;
         }
@@ -2354,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;
         }
@@ -2365,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.
@@ -2382,9 +2777,9 @@ sub modify_login_block {
 }
 
 sub personal_data_display {
-    my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,
-        $now,$captchaform,$emailusername,$usertype) = @_;
-    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;
@@ -2410,6 +2805,7 @@ sub personal_data_display {
                 'inststatus'     => "Affiliation",
                 'email'          => 'E-mail address',
                 'valid'          => 'Validation',
+                'username'       => 'Username',
     );
 
     %canmodify_status =
@@ -2428,7 +2824,7 @@ sub personal_data_display {
             if (ref($emailusername) eq 'HASH') {
                 if (ref($emailusername->{$usertype}) eq 'HASH') {
                     my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
-                    @userinfo = ();          
+                    @userinfo = ();
                     if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
                         foreach my $field (@{$infofields}) { 
                             if ($emailusername->{$usertype}->{$field}) {
@@ -2452,19 +2848,50 @@ 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');
     $output = '<h3>'.$lt{'pd'}.'</h3>'.
               &Apache::lonhtmlcommon::start_pick_box();
     if (($context eq 'selfcreate') && ($newuser eq 'email')) {
+        my $size = 25;
+        if ($condition) {
+            if ($condition =~ /^\@[^\@]+$/) {
+                $size = 10;
+            } else {
+                undef($condition);
+            }
+        } 
+        if ($excluded) {
+            unless ($excluded =~ /^\@[^\@]+$/) {
+                undef($condition);
+            }
+        }
         $output .= &Apache::lonhtmlcommon::row_title($lt{'email'}.'<b>*</b>',undef,
                                                      'LC_oddrow_value')."\n".
-                   '<input type="text" name="uname" size="25" value="" autocomplete="off" />';
+                   '<input type="text" name="uname" size="'.$size.'" value="" autocomplete="off" />';
+        if ($condition) {
+            $output .= $condition;
+        } elsif ($excluded) {
+            $output .= '<br /><span style="font-size: smaller">'.&mt('You must use an e-mail address that does not end with [_1]',
+                                                                     $excluded).'</span>';
+        }
+        if ($usernameset eq 'first') {
+            $output .= '<br /><span style="font-size: smaller">';
+            if ($condition) {
+                $output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before [_1]',
+                                      $condition);
+            } else {
+                $output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before the @');
+            }
+            $output .= '</span>';
+        }
         $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".
@@ -2475,6 +2902,38 @@ sub personal_data_display {
                                                      'LC_oddrow_value')."\n".
                    $upasstwo.
                    &Apache::lonhtmlcommon::row_closure()."\n";
+        if ($usernameset eq 'free') {
+            my $onclick = "toggleUsernameDisp(this,'selfcreateusername');"; 
+            $output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\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"/>'.
+                       '</span></div>'."\n".&Apache::lonhtmlcommon::row_closure(1);
+            $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};
@@ -2496,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 {
@@ -2512,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 {
@@ -2522,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);
@@ -2576,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) {
@@ -2665,7 +3137,7 @@ sub get_inststatuses {
 
 # ================================================================= Phase Three
 sub update_user_data {
-    my ($r,$context,$crstype,$brcrum,$showcredits) = @_; 
+    my ($r,$context,$crstype,$brcrum,$showcredits,$permission) = @_; 
     my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
                                           $env{'form.ccdomain'});
     # Error messages
@@ -2689,7 +3161,7 @@ sub update_user_data {
                   $jsback."\n".
                   '// ]]>'."\n".
                   '</script>'."\n";
-    my %breadcrumb_text = &singleuser_breadcrumb($crstype);
+    my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$env{'form.ccdomain'});
     push (@{$brcrum},
              {href => "javascript:backPage(document.userupdate)",
               text => $breadcrumb_text{'search'},
@@ -2706,6 +3178,10 @@ sub update_user_data {
     my $helpitem = 'Course_Change_Privileges';
     if ($env{'form.action'} eq 'singlestudent') {
         $helpitem = 'Course_Add_Student';
+    } elsif ($context eq 'author') {
+        $helpitem = 'Author_Change_Privileges';
+    } elsif ($context eq 'domain') {
+        $helpitem = 'Domain_Change_Privileges';
     }
     push(@{$brcrum}, 
             {href => "javascript:backPage(document.userupdate,'$env{'form.prevphase'}','modify')",
@@ -2779,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
@@ -2797,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','placement');
+    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 =
@@ -2908,12 +3388,35 @@ sub update_user_data {
                                                     $newcustom{'requestauthor'},
                                                     \%changeHash,'requestauthor');
                 }
-                if (&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) {
-                    my @adds = &Apache::loncommon::get_env_multiple('form.adhocroleadd');
-                    if (&adhocrole_changes(\%changeHash)) {
-                        $changed{'adhocroles.'.$env{'request.role.domain'}} = $changeHash{'adhocroles.'.$env{'request.role.domain'}};
+                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'})) {
@@ -2931,9 +3434,9 @@ sub update_user_data {
                 my $chgresult =
                      &Apache::lonnet::put('environment',\%changeHash,
                                           $env{'form.ccdomain'},$env{'form.ccuname'});
-            } 
+            }
         }
-        $r->print('<br />'.&mt('Home server').': '.$uhome.' '.
+        $r->print('<br />'.&mt('Home Server').': '.$uhome.' '.
                   &Apache::lonnet::hostname($uhome));
     } elsif (($env{'form.login'} ne 'nochange') &&
              ($env{'form.login'} ne ''        )) {
@@ -2948,12 +3451,19 @@ sub update_user_data {
                       &Apache::lonnet::modifyuserauth(
 		       $env{'form.ccdomain'},$env{'form.ccuname'},
                        $amode,$genpwd));
-            $r->print('<br />'.&mt('Home server').': '.&Apache::lonnet::homeserver
+            $r->print('<br />'.&mt('Home Server').': '.&Apache::lonnet::homeserver
 		  ($env{'form.ccuname'},$env{'form.ccdomain'}));
 	} else {
 	    # Okay, this is a non-fatal error.
-	    $r->print($error.&mt('You do not have the authority to modify this users authentication information.').$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:/) &&
+             (&Apache::lonuserutils::can_change_internalpass($env{'form.ccuname'},$env{'form.ccdomain'},$crstype,$permission))) {
+        $r->print('Modifying authentication: '.
+                  &Apache::lonnet::modifyuserauth(
+                  $env{'form.ccdomain'},$env{'form.ccuname'},
+                  'internal',$env{'form.intarg'}));
     }
     $r->rflush(); # Finish display of header before time consuming actions start
     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state);
@@ -2972,18 +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',
-             'reqcrsotherdom.placement','requestauthor',
-             'adhocroles.'.$env{'request.role.domain'}],
+             '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 =
@@ -3008,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);
                     }
                 }
@@ -3106,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');
         }
@@ -3117,7 +3634,6 @@ sub update_user_data {
                 &Apache::loncommon::default_quota($env{'form.ccdomain'},$oldinststatus,$name);
             ($newdefquota{$name},$newsettingstatus{$name}) = ($olddefquota{$name},$oldsettingstatus{$name});
         }
-        push(@disporder,'adhocroles');
         my %canshow;
         if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
             $canshow{'quota'} = 1;
@@ -3135,9 +3651,7 @@ sub update_user_data {
         }
         if (&Apache::lonnet::allowed('cau',$env{'form.ccdomain'})) {
             $canshow{'requestauthor'} = 1;
-        }
-        if (&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) {
-            $canshow{'adhocroles'} = 1;
+            $canshow{'authordefaults'} = 1;
         }
         my (%changeHash,%changed);
         if ($oldinststatus eq '') {
@@ -3246,20 +3760,18 @@ 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);
             }
-            if ($userenv{'adhocroles.'.$env{'request.role.domain'}}) {
-                $changeHash{'adhocroles.'.$env{'request.role.domain'}} = $userenv{'adhocroles.'.$env{'request.role.domain'}};
-            }
-            if (&adhocrole_changes(\%changeHash,\%userenv)) {
-                $changed{'adhocroles'} = 1;
-                $oldsettings{'adhocroles'} = $userenv{'adhocroles.'.$env{'request.role.domain'}};
-                $newsettings{'adhocroles'} = $changeHash{'adhocroles.'.$env{'request.role.domain'}};
-            }
         }
         foreach my $item (@userinfo) {
             if ($env{'form.c'.$item} ne $userenv{$item}) {
@@ -3273,38 +3785,136 @@ 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') ||
-                                ($key eq 'placement')) {
+                                ($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 eq 'adhocroles') {
-                                $newenvhash{'adhocroles.'.$env{'request.role.domain'}} =
-                                    $changeHash{'adhocroles.'.$env{'request.role.domain'}};
                             } elsif ($key ne 'quota') {
                                 $newenvhash{'environment.tools.'.$key} = 
                                     $changeHash{'tools.'.$key};
@@ -3312,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'});
                     }
                 }
             }
@@ -3491,16 +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',
-         'adhocroles'     => 'Ad Hoc Roles Selectable via Helpdesk 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>'.
@@ -3525,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};
                     }
@@ -3536,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});
                             }
@@ -3709,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;
@@ -3722,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};
         }
@@ -3740,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'");
@@ -3748,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);
@@ -3766,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'");
@@ -3776,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'");
@@ -3817,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'");
@@ -3828,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}) {
@@ -3845,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'");
@@ -3863,75 +4664,17 @@ sub tool_changes {
     return;
 }
 
-sub adhocrole_changes {
-    my ($changehashref,$userenv) = @_;
-    my @adds = &Apache::loncommon::get_env_multiple('form.adhocroleadd');
-    my @dels = &Apache::loncommon::get_env_multiple('form.adhocroledel');
-    my (@saved,@added,@alladhoc,$changed);
-    my $adhoc_key = 'adhocroles.'.$env{'request.role.domain'};
-    if (!$env{'form.makeuser'}) {
-        if (ref($userenv) eq 'HASH') {
-            my @current;
-            if ($userenv->{$adhoc_key}) {
-                @current = split(/,/,$userenv->{$adhoc_key});
-                if (@dels) {
-                    foreach my $curr (@current) {
-                        next if ($curr eq '');
-                        unless (grep(/\Q$curr\E$/,@dels)) {
-                            push(@saved,$curr);
-                        }
-                    }
-                    $changed = 1;
-                } else {
-                    @saved = @current;
-                }
-            }
-        }
-    }
-    if (@adds) {
-        my $confname = &Apache::lonnet::get_domainconfiguser($env{'request.role.domain'});
-        my %existing=&Apache::lonnet::dump('roles',$env{'request.role.domain'},
-                                           $confname,'rolesdef_');
-        foreach my $poss (@adds) {
-            if (exists($existing{'rolesdef_'.$poss})) {
-                push(@added,$poss);
-                $changed = 1;
-            }
-        }
-    }
-    if (@added) {
-        if (@saved) {
-            foreach my $add (@added) {
-                unless (grep(/^\Q$add\E$/,@saved)) {
-                    push(@alladhoc,$add);
-                }
-            }
-        } else {
-            push(@alladhoc,@added);
-        }
-    }
-    if (@saved) {
-        push(@alladhoc,@saved);
-    }
-    if (@alladhoc) {
-        my $adhocstr = join(',',sort(@alladhoc));
-        $changehashref->{$adhoc_key} = $adhocstr;
-    } elsif (@dels) {
-        &Apache::lonnet::del('environment',[$adhoc_key],$env{'form.ccdomain'},$env{'form.ccuname'});
-        delete($changehashref->{$adhoc_key});
-        if (($env{'form.ccdomain'} eq $env{'user.domain'}) &&
-            ($env{'form.ccuname'} eq $env{'user.name'})) {
-            &Apache::lonnet::delenv($adhoc_key);
-        }
-    }
-    return $changed;
-}
-
 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});
@@ -4033,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') {
@@ -4040,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) {
@@ -4059,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 />';
                     }
@@ -4077,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);
@@ -4098,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} ?
@@ -4106,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})) {
@@ -4122,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');
@@ -4132,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};
@@ -4156,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 '') {
@@ -4170,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);
@@ -4185,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);
@@ -4235,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) {
@@ -4289,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'},
@@ -4403,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;
@@ -4413,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;
             }
@@ -4457,9 +5351,9 @@ sub build_roles {
 # ========================================================== Custom Role Editor
 
 sub custom_role_editor {
-    my ($r,$brcrum,$prefix) = @_;
+    my ($r,$context,$brcrum,$prefix,$permission) = @_;
     my $action = $env{'form.customroleaction'};
-    my $rolename; 
+    my ($rolename,$helpitem);
     if ($action eq 'new') {
         $rolename=$env{'form.newrolename'};
     } else {
@@ -4470,14 +5364,17 @@ sub custom_role_editor {
     if ($env{'request.course.id'}) {
         $crstype = &Apache::loncommon::course_type();
         $context = 'course';
+        $helpitem = 'Course_Editing_Custom_Roles';
     } else {
         $context = 'domain';
         $crstype = 'course';
+        $helpitem = 'Domain_Editing_Custom_Roles';
     }
 
     $rolename=~s/[^A-Za-z0-9]//gs;
     if (!$rolename || $env{'form.phase'} eq 'pickrole') {
-	&print_username_entry_form($r,undef,undef,undef,undef,$crstype,$brcrum);
+	&print_username_entry_form($r,$context,undef,undef,undef,$crstype,$brcrum,
+                                   $permission);
         return;
     }
 
@@ -4532,11 +5429,10 @@ sub custom_role_editor {
                text => "Edit custom role",
                faq  => 282,
                bug  => 'Instructor Interface',
-               help => 'Course_Editing_Custom_Roles'}
+               help => $helpitem}
               );
     my $args = { bread_crumbs          => $brcrum,
                  bread_crumbs_component => 'User Management'};
- 
     $r->print(&Apache::loncommon::start_page('Custom Role Editor',
                                              $head_script,$args).
               $body_top);
@@ -4560,11 +5456,11 @@ ENDCCF
 
 # ---------------------------------------------------------- Call to definerole
 sub set_custom_role {
-    my ($r,$context,$brcrum,$prefix) = @_;
+    my ($r,$context,$brcrum,$prefix,$permission) = @_;
     my $rolename=$env{'form.rolename'};
     $rolename=~s/[^A-Za-z0-9]//gs;
     if (!$rolename) {
-	&custom_role_editor($r,$brcrum,$prefix);
+	&custom_role_editor($r,$context,$brcrum,$prefix,$permission);
         return;
     }
     my ($jsback,$elements) = &crumb_utilities();
@@ -4573,6 +5469,10 @@ sub set_custom_role {
                  .$jsback."\n"
                  .'// ]]>'."\n"
                  .'</script>'."\n";
+    my $helpitem = 'Course_Editing_Custom_Roles';
+    if ($context eq 'domain') {
+        $helpitem = 'Domain_Editing_Custom_Roles';
+    }
     push(@{$brcrum},
         {href => "javascript:backPage(document.customresult,'pickrole','')",
          text => "Pick custom role",
@@ -4586,7 +5486,7 @@ sub set_custom_role {
          text => "Result",
          faq  => 282,
          bug  => 'Instructor Interface',
-         help => 'Course_Editing_Custom_Roles'},
+         help => $helpitem,}
         );
     my $args = { bread_crumbs           => $brcrum,
                  bread_crumbs_component => 'User Management'};
@@ -4649,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;
@@ -4657,19 +5740,96 @@ sub handler {
        $r->send_http_header;
        return OK;
     }
-    my ($context,$crstype);
+    my ($context,$crstype,$cid,$cnum,$cdom,$allhelpitems);
+
     if ($env{'request.course.id'}) {
         $context = 'course';
         $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;
+        if ($context eq 'course') {
+            $cid = $env{'request.course.id'};
+            $cdom = $env{'course.'.$cid.'.domain'};
+            $cnum = $env{'course.'.$cid.'.num'};
+
+            if ($permission->{'cusr'}) {
+                push(@allhelp,'Course_Create_Class_List');
+            }
+            if ($permission->{'view'} || $permission->{'cusr'}) {
+                push(@allhelp,('Course_Change_Privileges','Course_View_Class_List'));
+            }
+            if ($permission->{'custom'}) {
+                push(@allhelp,'Course_Editing_Custom_Roles');
+            }
+            if ($permission->{'cusr'}) {
+                push(@allhelp,('Course_Add_Student','Course_Drop_Student'));
+            }
+            unless ($permission->{'cusr_section'}) {
+                if (&Apache::lonnet::auto_run($cnum,$cdom) && (($permission->{'cusr'}) || ($permission->{'view'}))) {
+                    push(@allhelp,'Course_Automated_Enrollment');
+                }
+                if (($permission->{'selfenrolladmin'}) || ($permission->{'selfenrollview'})) {
+                    push(@allhelp,'Course_Approve_Selfenroll');
+                }
+            }
+            if ($permission->{'grp_manage'}) {
+                push(@allhelp,'Course_Manage_Group');
+            }
+            if ($permission->{'view'} || $permission->{'cusr'}) {
+                push(@allhelp,'Course_User_Logs');
+            }
+        } 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');
+                if ($permission->{'activity'}) {
+                    push(@allhelp,'Domain_User_Access_Logs');
+                }
+                push(@allhelp,('Domain_Create_Users','Domain_View_Users_List'));
+                if ($permission->{'custom'}) {
+                    push(@allhelp,'Domain_Editing_Custom_Roles');
+                }
+                push(@allhelp,('Domain_Role_Approvals','Domain_Username_Approvals','Domain_Change_Logs'));
+            } elsif ($permission->{'view'}) {
+                push(@allhelp,'Domain_View_Privileges');
+                if ($permission->{'activity'}) {
+                    push(@allhelp,'Domain_User_Access_Logs');
+                }
+                push(@allhelp,('Domain_View_Users_List','Domain_Change_Logs'));
+            }
+        }
+        if (@allhelp) {
+            $allhelpitems = join(',',@allhelp);
+        }
+    }
+
     &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 = [];
@@ -4677,17 +5837,16 @@ sub handler {
     if (($env{'form.action'} ne 'dateselect') && ($env{'form.action'} ne 'displayuserreq')) {
         $brcrum = [{href=>"/adm/createuser",
                     text=>"User Management",
-                    help=>'Course_Create_Class_List,Course_Change_Privileges,Course_View_Class_List,Course_Editing_Custom_Roles,Course_Add_Student,Course_Drop_Student,Course_Automated_Enrollment,Course_Self_Enrollment,Course_Manage_Group'}
+                    help=>$allhelpitems}
                   ];
     }
-    #SD Following files not added to help, because the corresponding .tex-files seem to
-    #be missing: Course_Approve_Selfenroll,Course_User_Logs,
-    my ($permission,$allowed) = 
-        &Apache::lonuserutils::get_permission($context,$crstype);
     if (!$allowed) {
         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 ".
@@ -4715,10 +5874,16 @@ sub handler {
         $r->print(&header(undef,$args));
         $r->print(&print_main_menu($permission,$context,$crstype));
     } elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {
+        my $helpitem = 'Course_Create_Class_List';
+        if ($context eq 'author') {
+            $helpitem = 'Author_Create_Coauthor_List';
+        } elsif ($context eq 'domain') {
+            $helpitem = 'Domain_Create_Users';
+        }
         push(@{$brcrum},
               { href => '/adm/createuser?action=upload&state=',
                 text => 'Upload Users List',
-                help => 'Course_Create_Class_List',
+                help => $helpitem,
               });
         $bread_crumbs_component = 'Upload Users List';
         $args = {bread_crumbs           => $brcrum,
@@ -4730,16 +5895,41 @@ sub handler {
         if (! exists($env{'form.state'})) {
             &Apache::lonuserutils::print_first_users_upload_form($r,$context);
         } elsif ($env{'form.state'} eq 'got_file') {
-            &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission,
-                                                             $crstype,$showcredits);
+            my $result = 
+                &Apache::lonuserutils::print_upload_manager_form($r,$context,
+                                                                 $permission,
+                                                                 $crstype,$showcredits);
+            if ($result eq 'missingdata') {
+                delete($env{'form.state'});
+                &Apache::lonuserutils::print_first_users_upload_form($r,$context);
+            }
         } elsif ($env{'form.state'} eq 'enrolling') {
             if ($env{'form.datatoken'}) {
-                &Apache::lonuserutils::upfile_drop_add($r,$context,$permission,
-                                                       $showcredits);
+                my $result = &Apache::lonuserutils::upfile_drop_add($r,$context,
+                                                                    $permission,
+                                                                    $showcredits);
+                if ($result eq 'missingdata') {
+                    delete($env{'form.state'});
+                    &Apache::lonuserutils::print_first_users_upload_form($r,$context);
+                } elsif ($result eq 'invalidhome') {
+                    $env{'form.state'} = 'got_file';
+                    delete($env{'form.lcserver'});
+                    my $result =
+                        &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission,
+                                                                         $crstype,$showcredits);
+                    if ($result eq 'missingdata') {
+                        delete($env{'form.state'});
+                        &Apache::lonuserutils::print_first_users_upload_form($r,$context);
+                    }
+                }
+            } else {
+                delete($env{'form.state'});
+                &Apache::lonuserutils::print_first_users_upload_form($r,$context);
             }
         } else {
             &Apache::lonuserutils::print_first_users_upload_form($r,$context);
         }
+        $r->print('</form>');
     } elsif (((($env{'form.action'} eq 'singleuser') || ($env{'form.action'}
               eq 'singlestudent')) && ($permission->{'cusr'})) ||
              (($env{'form.action'} eq 'singleuser') && ($permission->{'view'})) ||
@@ -4763,7 +5953,7 @@ sub handler {
                        .'</span>';
                     $env{'form.phase'} = '';
                     &print_username_entry_form($r,$context,$response,$srch,undef,
-                                               $crstype,$brcrum,$showcredits);
+                                               $crstype,$brcrum,$permission);
                 } else {
                     my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'});
                     my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'});
@@ -4808,7 +5998,8 @@ sub handler {
                             #    }
                             #}
                             &print_username_entry_form($r,$context,$response,$srch,
-                                                       $forcenewuser,$crstype,$brcrum);
+                                                       $forcenewuser,$crstype,$brcrum,
+                                                       $permission);
                         } else {
                             &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
                         }
@@ -4825,7 +6016,8 @@ sub handler {
                 } else {
                     $env{'form.phase'} = '';
                     &print_username_entry_form($r,$context,$response,$srch,
-                                               $forcenewuser,$crstype,$brcrum);
+                                               $forcenewuser,$crstype,$brcrum,
+                                               $permission);
                 }
             } elsif ($env{'form.phase'} eq 'userpicked') {
                 my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
@@ -4843,17 +6035,17 @@ sub handler {
                 &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
             }
         } elsif ($env{'form.phase'} eq 'update_user_data') {
-            &update_user_data($r,$context,$crstype,$brcrum,$showcredits);
+            &update_user_data($r,$context,$crstype,$brcrum,$showcredits,$permission);
         } else {
             &print_username_entry_form($r,$context,undef,$srch,undef,$crstype,
-                                       $brcrum);
+                                       $brcrum,$permission);
         }
     } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
         my $prefix;
         if ($env{'form.phase'} eq 'set_custom_roles') {
-            &set_custom_role($r,$context,$brcrum,$prefix);
+            &set_custom_role($r,$context,$brcrum,$prefix,$permission);
         } else {
-            &custom_role_editor($r,$brcrum,$prefix);
+            &custom_role_editor($r,$context,$brcrum,$prefix,$permission);
         }
     } elsif (($env{'form.action'} eq 'processauthorreq') &&
              ($permission->{'cusr'}) && 
@@ -4959,56 +6151,92 @@ sub handler {
                             unless ($usertype) {
                                 $usertype = 'default';
                             }
+                            my ($showstatus,$showemail,$pickstart);
+                            my $numextras = 0;
+                            my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+                            if ((ref($types) eq 'ARRAY') && (@{$types} > 0)) {
+                                if (ref($usertypes) eq 'HASH') {
+                                    if ($usertypes->{$usertype}) {
+                                        $showstatus = $usertypes->{$usertype};
+                                    } else {
+                                        $showstatus = $othertitle;
+                                    }
+                                    if ($showstatus) {
+                                        $numextras ++;
+                                    }
+                                }
+                            }
+                            if (($info{$uname}{'email'} ne '') && ($info{$uname}{'email'} ne $uname)) {
+                                $showemail = $info{$uname}{'email'};
+                                $numextras ++;
+                            }
                             if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}) eq 'HASH') {
                                 if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
+                                    $pickstart = 1;
                                     $r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box());
-                                    my ($num,$count,$showstatus);
+                                    my ($num,$count);
                                     $count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}}));
-                                    unless ($usertype eq 'default') {
-                                        my ($othertitle,$usertypes,$types) = 
-                                            &Apache::loncommon::sorted_inst_types($dom);
-                                        if (ref($usertypes) eq 'HASH') {
-                                            if ($usertypes->{$usertype}) {
-                                                $showstatus = $usertypes->{$usertype};
-                                                $count ++;
-                                            }
-                                        }
-                                    }
+                                    $count += $numextras;
                                     foreach my $field (@{$infofields}) {
                                         next unless ($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}{$field});
                                         next unless ($infotitles->{$field});
                                         $r->print(&Apache::lonhtmlcommon::row_title($infotitles->{$field}).
                                                   $info{$uname}{$field});
                                         $num ++;
-                                        if ($count == $num) {
-                                            $r->print(&Apache::lonhtmlcommon::row_closure(1));
-                                        } else {
+                                        unless ($count == $num) {
                                             $r->print(&Apache::lonhtmlcommon::row_closure());
                                         }
                                     }
-                                    if ($showstatus) {
-                                        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type (self-reported)')).
-                                                  $showstatus.
-                                                  &Apache::lonhtmlcommon::row_closure(1));
+                                }
+                            }
+                            if ($numextras) {
+                                unless ($pickstart) {
+                                    $r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box());
+                                    $pickstart = 1;
+                                }
+                                if ($showemail) {
+                                    my $closure = '';
+                                    unless ($showstatus) {
+                                        $closure = 1;
                                     }
-                                    $r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>');
+                                    $r->print(&Apache::lonhtmlcommon::row_title(&mt('E-mail address')).
+                                              $showemail.
+                                              &Apache::lonhtmlcommon::row_closure($closure));
                                 }
+                                if ($showstatus) {
+                                    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type[_1](self-reported)','<br />')).
+                                              $showstatus.
+                                              &Apache::lonhtmlcommon::row_closure(1));
+                                }
+                            }
+                            if ($pickstart) { 
+                                $r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>');
+                            } else {
+                                $r->print('<div>'.&mt('No information to display for this account request.').'</div>');
                             }
+                        } else {
+                            $r->print('<div>'.&mt('No information available for this account request.').'</div>');
                         }
                     }
                 }
             }
-            $r->print(&close_popup_form());
         }
+        $r->print(&close_popup_form());
     } elsif (($env{'form.action'} eq 'listusers') && 
              ($permission->{'view'} || $permission->{'cusr'})) {
+        my $helpitem = 'Course_View_Class_List';
+        if ($context eq 'author') {
+            $helpitem = 'Author_View_Coauthor_List';
+        } elsif ($context eq 'domain') {
+            $helpitem = 'Domain_View_Users_List';
+        }
         if ($env{'form.phase'} eq 'bulkchange') {
             push(@{$brcrum},
                     {href => '/adm/createuser?action=listusers',
                      text => "List Users"},
                     {href => "/adm/createuser",
                      text => "Result",
-                     help => 'Course_View_Class_List'});
+                     help => $helpitem});
             $bread_crumbs_component = 'Update Users';
             $args = {bread_crumbs           => $brcrum,
                      bread_crumbs_component => $bread_crumbs_component};
@@ -5025,7 +6253,7 @@ sub handler {
             push(@{$brcrum},
                     {href => '/adm/createuser?action=listusers',
                      text => "List Users",
-                     help => 'Course_View_Class_List'});
+                     help => $helpitem});
             $bread_crumbs_component = 'List Users';
             $args = {bread_crumbs           => $brcrum,
                      bread_crumbs_component => $bread_crumbs_component};
@@ -5105,11 +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 $cid = $env{'request.course.id'};
-            my $cdom = $env{'course.'.$cid.'.domain'};
-            my $cnum = $env{'course.'.$cid.'.num'};
-            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'},
@@ -5125,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",
@@ -5145,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>');
@@ -5154,21 +6392,18 @@ sub handler {
             push(@{$brcrum},
                      {href => '/adm/createuser?action=selfenrollqueue',
                       text => 'Enrollment requests',
-                      help => 'Course_Self_Enrollment'});
+                      help => 'Course_Approve_Selfenroll'});
             $bread_crumbs_component = 'Enrollment requests';
             if ($env{'form.state'} eq 'done') {
                 push(@{$brcrum},
                          {href => '/adm/createuser?action=selfenrollqueue',
                           text => 'Result',
-                          help => 'Course_Self_Enrollment'});
+                          help => 'Course_Approve_Selfenroll'});
                 $bread_crumbs_component = 'Enrollment result';
             }
             $args = { bread_crumbs           => $brcrum,
                       bread_crumbs_component => $bread_crumbs_component};
             $r->print(&header(undef,$args));
-            my $cid = $env{'request.course.id'};
-            my $cdom = $env{'course.'.$cid.'.domain'};
-            my $cnum = $env{'course.'.$cid.'.num'};
             my $coursedesc = $env{'course.'.$cid.'.description'};
             if (!exists($env{'form.state'})) {
                 $r->print('<h3>'.&mt('Pending enrollment requests').'</h3>'."\n");
@@ -5177,7 +6412,7 @@ sub handler {
             } elsif ($env{'form.state'} eq 'done') {
                 $r->print('<h3>'.&mt('Enrollment request processing').'</h3>'."\n");
                 $r->print(&Apache::loncoursequeueadmin::update_request_queue($context,
-                               $cdom,$cnum,$coursedesc));
+                              $cdom,$cnum,$coursedesc));
             }
         } else {
             $r->print(&header(undef,{'no_nav_bar' => 1}).
@@ -5190,6 +6425,121 @@ sub handler {
             $r->print(&header(undef,{'no_nav_bar' => 1}).
                      '<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'}) &&
+            ($permission->{'cusr'} || $permission->{'view'})) {
+            if ($env{'form.state'} eq 'process') {
+                if ($permission->{'owner'}) {
+                    &update_helpdeskaccess($r,$permission,$brcrum);
+                } else {
+                    &print_helpdeskaccess_display($r,$permission,$brcrum);
+                }
+            } else {
+                &print_helpdeskaccess_display($r,$permission,$brcrum);
+            }
+        } else {
+            $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,
@@ -5296,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') {
@@ -5381,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;
 }
@@ -5441,11 +6809,11 @@ 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'; 
+          $links{'domain'}{'singleuser'} = 'View a User';
           $linktitles{'domain'}{'singleuser'} = 'View information about a user in the domain';
-          
       }
   } elsif ($linkcontext eq 'course') {
       unless ($permission->{'cusr'}) {
@@ -5506,7 +6874,7 @@ sub print_main_menu {
             {
              linktext => 'User Access Log',
              icon => 'document-properties.png',
-             #help => 'User_Access_Logs',
+             #help => 'Domain_User_Access_Logs',
              url => '/adm/createuser?action=accesslogs',
              permission => $permission->{'activity'},
              linktitle => 'View user access log.',
@@ -5602,7 +6970,16 @@ sub print_main_menu {
             },
         );
         push(@{ $menu[2]->{items} }, #Category: Administration
-            {    
+            {
+             linktext => 'Helpdesk Access',
+             icon => 'helpdesk-access.png',
+             #help => 'Course_Helpdesk_Access',
+             url => '/adm/createuser?action=helpdesk',
+             permission => (($permission->{'owner'} || $permission->{'co-owner'}) &&
+                            ($permission->{'view'} || $permission->{'cusr'})),
+             linktitle => 'Helpdesk access options',
+            },
+            {
              linktext => 'Custom Roles',
              icon => 'emblem-photos.png',
              #help => 'Course_Editing_Custom_Roles',
@@ -5634,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.',
                     },
             );
@@ -5661,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',
@@ -5676,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);
@@ -5847,12 +7283,13 @@ function validate_types(form) {
 }
 
 function check_types(num,countfail,needaction) {
-    var typeidx = getIndexByName('selfenroll_types_'+num);
+    var boxname = 'selfenroll_types_'+num;
+    var typeidx = getIndexByName(boxname);
     var count = 0;
     if (typeidx != -1) {
-        if (document.$formname.elements[typeidx].length) {
-            for (var k=0; k<document.$formname.elements[typeidx].length; k++) {
-                if (document.$formname.elements[typeidx][k].checked) {
+        if (document.$formname.elements[boxname].length) {
+            for (var k=0; k<document.$formname.elements[boxname].length; k++) {
+                if (document.$formname.elements[boxname][k].checked) {
                     count ++;
                 }
             }
@@ -5909,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') {
@@ -6073,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();
@@ -6191,7 +7628,7 @@ ENDSCRIPT
             } elsif ($item eq 'approval') {
                 my ($currnotified,$currapproval,%appchecked);
                 my %selfdescs = &Apache::lonuserutils::selfenroll_default_descs();
-                if (ref($currsettings) eq 'HASH') { 
+                if (ref($currsettings) eq 'HASH') {
                     $currnotified = $currsettings->{'selfenroll_notifylist'};
                     $currapproval = $currsettings->{'selfenroll_approval'};
                 }
@@ -6347,7 +7784,7 @@ sub get_noedit_fields {
         }
     }
     return %noedit;
-} 
+}
 
 sub visible_in_stdcat {
     my ($cdom,$cnum,$domconf) = @_;
@@ -6455,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.',
@@ -6467,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>"');
@@ -6599,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);
             }
@@ -6615,6 +8066,10 @@ sub print_userchangelogs_display {
     my $helpitem;
     if ($context eq 'course') {
         $helpitem = 'Course_User_Logs';
+    } elsif ($context eq 'domain') {
+        $helpitem = 'Domain_Role_Logs';
+    } elsif ($context eq 'author') {
+        $helpitem = 'Author_User_Logs';
     }
     push (@{$brcrum},
              {href => '/adm/createuser?action=changelogs',
@@ -6648,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) = 
@@ -6725,7 +8181,12 @@ ENDSCRIPT
             }
         }
         if (($context eq 'course') && ($viewablesec ne '')) {
-            next if ($roleslog{$id}{'logentry'}{'section'} ne $viewablesec); 
+            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);
@@ -6773,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') { 
@@ -6814,30 +8294,39 @@ sub print_useraccesslogs_display {
     my $form = 'document.accesslog';
 
 # set breadcrumbs
-    my %breadcrumb_text = &singleuser_breadcrumb();
-    push (@{$brcrum},
-        {href => "javascript:backPage($form)",
-         text => $breadcrumb_text{'search'}});
-    my (@prevphases,$prevphasestr);
-    if ($env{'form.prevphases'}) {
-        @prevphases = split(/,/,$env{'form.prevphases'});
-        $prevphasestr = $env{'form.prevphases'};
-    }
-    if (($env{'form.phase'} eq 'userpicked') || (grep(/^userpicked$/,@prevphases))) {
-        push(@{$brcrum},
-              {href => "javascript:backPage($form,'get_user_info','select')",
-               text => $breadcrumb_text{'userpicked'}});
-        if ($env{'form.phase'} eq 'userpicked') {
-            $prevphasestr = 'userpicked';
+    my %breadcrumb_text = &singleuser_breadcrumb('','domain',$udom);
+    my $prevphasestr;
+    if ($env{'form.popup'}) {
+        $brcrum = [];
+    } else {
+        push (@{$brcrum},
+            {href => "javascript:backPage($form)",
+             text => $breadcrumb_text{'search'}});
+        my @prevphases;
+        if ($env{'form.prevphases'}) {
+            @prevphases = split(/,/,$env{'form.prevphases'});
+            $prevphasestr = $env{'form.prevphases'};
+        }
+        if (($env{'form.phase'} eq 'userpicked') || (grep(/^userpicked$/,@prevphases))) {
+            push(@{$brcrum},
+                  {href => "javascript:backPage($form,'get_user_info','select')",
+                   text => $breadcrumb_text{'userpicked'}});
+            if ($env{'form.phase'} eq 'userpicked') {
+                $prevphasestr = 'userpicked';
+            }
         }
     }
     push(@{$brcrum},
              {href => '/adm/createuser?action=accesslogs',
               text => 'User access logs',
-              help => 'User_Access_Logs'});
+              help => 'Domain_User_Access_Logs'});
     my $bread_crumbs_component = 'User Access Logs';
     my $args = { bread_crumbs           => $brcrum,
                  bread_crumbs_component => 'User Management'};
+    if ($env{'form.popup'}) {
+        $args->{'no_nav_bar'} = 1;
+        $args->{'bread_crumbs_nomenu'} = 1;
+    }
 
 # set javascript
     my ($jsback,$elements) = &crumb_utilities();
@@ -6862,8 +8351,12 @@ ENDSCRIPT
     unless ($permission->{'activity'}) {
         $r->print('<p class="LC_warning">'
                  .&mt('You do not have rights to display user access logs.')
-                 .'</p>'
-                 .&earlyout_accesslog_form($formname,$prevphasestr,$udom));
+                 .'</p>');
+        if ($env{'form.popup'}) {
+            $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>');
+        } else {
+            $r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom));
+        }
         return;
     }
 
@@ -6883,6 +8376,24 @@ ENDSCRIPT
         return;
     }
 
+    if (&Apache::lonnet::privileged($uname,$udom,
+                                    [$env{'request.role.domain'}],['dc','su'])) {
+        unless (&Apache::lonnet::privileged($env{'user.name'},$env{'user.domain'},
+                                            [$env{'request.role.domain'}],['dc','su'])) {
+            $r->print('<p class="LC_warning">'
+                 .&mt('You need to be a privileged user to display user access logs for [_1]',
+                      &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),
+                                                         $uname,$udom))
+                 .'</p>');
+            if ($env{'form.popup'}) {
+                $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>');
+            } else {
+                $r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom));
+            }
+            return;
+        }
+    }
+
 # set defaults
     my $now = time();
     my $defstart = $now - (7*24*3600);
@@ -6929,8 +8440,11 @@ ENDSCRIPT
     my ($nav_script,$nav_links);
 
 # table header
-    my $tableheader =
-        &Apache::loncommon::start_data_table_header_row()
+    my $heading = '<h3>'.
+        &mt('User access logs for: [_1]',
+            &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).'</h3>';
+    my $tableheader = $heading
+       .&Apache::loncommon::start_data_table_header_row()
        .'<th>&nbsp;</th>'
        .'<th>'.&mt('When').'</th>'
        .'<th>'.&mt('HostID').'</th>'
@@ -6967,7 +8481,7 @@ ENDSCRIPT
                 $showntableheader = 1;
             }
             my ($shown,$extra);
-            my ($event,$data) = split(/\s+/,&unescape($event));
+            my ($event,$data) = split(/\s+/,&unescape($event),2);
             if ($event eq 'Role') {
                 my ($rolecode,$extent) = split(/\./,$data,2);
                 next if ($extent eq '');
@@ -7019,8 +8533,17 @@ ENDSCRIPT
                 $shown = &mt('Role selection: [_1]',$rolename);
             } else {
                 $shown = &mt($event);
-                if ($data ne '') {
-                   $extra = &mt('Client IP address: [_1]',$data);
+                if ($data =~ /^webdav/) {
+                    my ($path,$clientip) = split(/\s+/,$data,2);
+                    $path =~ s/^webdav//;
+                    if ($clientip ne '') {
+                        $extra = &mt('Client IP address: [_1]',$clientip);
+                    }
+                    if ($path ne '') {
+                        $shown .= ' '.&mt('(WebDAV access to [_1])',$path);
+                    }
+                } elsif ($data ne '') {
+                    $extra = &mt('Client IP address: [_1]',$data);
                 }
             }
             $r->print(
@@ -7038,11 +8561,15 @@ ENDSCRIPT
         $r->print(&Apache::loncommon::end_data_table().
                   &userlogdisplay_navlinks(\%curr,$more_records));
     } else { # No content displayed above
-        $r->print('<p class="LC_info">'
+        $r->print($heading.'<p class="LC_info">'
                  .&mt('There are no records to display.')
                  .'</p>');
     }
 
+    if ($env{'form.popup'} == 1) {
+        $r->print('<input type="hidden" name="popup" value="1" />'."\n");
+    }
+
     # Form Footer
     $r->print(
         '<input type="hidden" name="currstate" value="" />'
@@ -7084,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 =
@@ -7125,7 +8652,7 @@ sub activity_display_filter {
     # Update Display button
     $output .= '<p>'
               .'<input type="submit" value="'.&mt('Update Display').'" />'
-              .'</p>';
+              .'</p><hr />';
     return $output;
 }
 
@@ -7171,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 =
@@ -7202,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;
@@ -7223,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) {
@@ -7241,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>'
@@ -7272,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');
@@ -7297,11 +8834,1064 @@ 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';
+    my $helpitem = 'Course_Helpdesk_Access';
+    push (@{$brcrum},
+             {href => '/adm/createuser?action=helpdesk',
+              text => 'Helpdesk Access',
+              help => $helpitem});
+    my $bread_crumbs_component = 'Helpdesk Staff Access';
+    my $args = { bread_crumbs           => $brcrum,
+                 bread_crumbs_component => $bread_crumbs_component};
+
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $confname = $cdom.'-domainconfig';
+    my $crstype = &Apache::loncommon::course_type();
+
+    my @accesstypes = ('all','dh','da','none');
+    my ($numstatustypes,@jsarray);
+    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom);
+    if (ref($types) eq 'ARRAY') {
+        if (@{$types} > 0) {
+            $numstatustypes = scalar(@{$types});
+            push(@accesstypes,'status');
+            @jsarray = ('bystatus');
+        }
+    }
+    my %customroles = &get_domain_customroles($cdom,$confname);
+    my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']);
+    if (keys(%domhelpdesk)) {
+       push(@accesstypes,('inc','exc'));
+       push(@jsarray,('notinc','notexc'));
+    }
+    push(@jsarray,'privs');
+    my $hiddenstr = join("','",@jsarray);
+    my $rolestr = join("','",sort(keys(%customroles)));
+
+    my $jscript;
+    my (%settings,%overridden);
+    if (keys(%customroles)) {
+        &get_adhocrole_settings($env{'request.course.id'},\@accesstypes,
+                                $types,\%customroles,\%settings,\%overridden);
+        my %jsfull=();
+        my %jslevels= (
+                     course => {},
+                     domain => {},
+                     system => {},
+                    );
+        my %jslevelscurrent=(
+                           course => {},
+                           domain => {},
+                           system => {},
+                          );
+        my (%privs,%jsprivs);
+        &Apache::lonuserutils::custom_role_privs(\%privs,\%jsfull,\%jslevels,\%jslevelscurrent);
+        foreach my $priv (keys(%jsfull)) {
+            if ($jslevels{'course'}{$priv}) {
+                $jsprivs{$priv} = 1;
+            }
+        }
+        my (%elements,%stored);
+        foreach my $role (keys(%customroles)) {
+            $elements{$role.'_access'} = 'radio';
+            $elements{$role.'_incrs'} = 'radio';
+            if ($numstatustypes) {
+                $elements{$role.'_status'} = 'checkbox';
+            }
+            if (keys(%domhelpdesk) > 0) {
+                $elements{$role.'_staff_inc'} = 'checkbox';
+                $elements{$role.'_staff_exc'} = 'checkbox';
+            }
+            $elements{$role.'_override'} = 'checkbox';
+            if (ref($settings{$role}) eq 'HASH') {
+                if ($settings{$role}{'access'} ne '') {
+                    my $curraccess = $settings{$role}{'access'};
+                    $stored{$role.'_access'} = $curraccess;
+                    $stored{$role.'_incrs'} = 1;
+                    if ($curraccess eq 'status') {
+                        if (ref($settings{$role}{'status'}) eq 'ARRAY') {
+                            $stored{$role.'_status'} = $settings{$role}{'status'};
+                        }
+                    } elsif (($curraccess eq 'exc') || ($curraccess eq 'inc')) {
+                        if (ref($settings{$role}{$curraccess}) eq 'ARRAY') {
+                            $stored{$role.'_staff_'.$curraccess} = $settings{$role}{$curraccess};
+                        }
+                    }
+                } else {
+                    $stored{$role.'_incrs'} = 0;
+                }
+                $stored{$role.'_override'} = [];
+                if ($env{'course.'.$env{'request.course.id'}.'.internal.adhocpriv.'.$role}) {
+                    if (ref($settings{$role}{'off'}) eq 'ARRAY') {
+                        foreach my $priv (@{$settings{$role}{'off'}}) {
+                            push(@{$stored{$role.'_override'}},$priv);
+                        }
+                    }
+                    if (ref($settings{$role}{'on'}) eq 'ARRAY') {
+                        foreach my $priv (@{$settings{$role}{'on'}}) {
+                            unless (grep(/^$priv$/,@{$stored{$role.'_override'}})) {
+                                push(@{$stored{$role.'_override'}},$priv);
+                            }
+                        }
+                    }
+                }
+            } else {
+                $stored{$role.'_incrs'} = 0;
+            }
+        }
+        $jscript = &Apache::lonhtmlcommon::set_form_elements(\%elements,\%stored);
+    }
+
+    my $js = <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+$jscript;
+
+function switchRoleTab(caller,role) {
+    if (document.getElementById(role+'_maindiv')) {
+        if (caller.id != 'LC_current_minitab') {
+            if (document.getElementById('LC_current_minitab')) {
+                document.getElementById('LC_current_minitab').id=null;
+            }
+            var roledivs = Array('$rolestr');
+            if (roledivs.length > 0) {
+                for (var i=0; i<roledivs.length; i++) {
+                    if (document.getElementById(roledivs[i]+'_maindiv')) {
+                        document.getElementById(roledivs[i]+'_maindiv').style.display='none';
+                    }
+                }
+            }
+            caller.id = 'LC_current_minitab';
+            document.getElementById(role+'_maindiv').style.display='block';
+        }
+    }
+    return false;
+}
+
+function helpdeskAccess(role) {
+    var curraccess = null;
+    if (document.$formname.elements[role+'_access'].length) {
+        for (var i=0; i<document.$formname.elements[role+'_access'].length; i++) {
+            if (document.$formname.elements[role+'_access'][i].checked) {
+                curraccess = document.$formname.elements[role+'_access'][i].value;
+            }
+        }
+    }
+    var shown = Array();
+    var hidden = Array();
+    if (curraccess == 'none') {
+        hidden = Array ('$hiddenstr');
+    } else {
+        if (curraccess == 'status') {
+            shown = Array ('bystatus','privs');
+            hidden = Array ('notinc','notexc');
+        } else {
+            if (curraccess == 'exc') {
+                shown = Array ('notexc','privs');
+                hidden = Array ('notinc','bystatus');
+            }
+            if (curraccess == 'inc') {
+                shown = Array ('notinc','privs');
+                hidden = Array ('notexc','bystatus');
+            }
+            if (curraccess == 'all') {
+                shown = Array ('privs');
+                hidden = Array ('notinc','notexc','bystatus');
+            }
+        }
+    }
+    if (hidden.length > 0) {
+        for (var i=0; i<hidden.length; i++) {
+            if (document.getElementById(role+'_'+hidden[i])) {
+                document.getElementById(role+'_'+hidden[i]).style.display = 'none';
+            }
+        }
+    }
+    if (shown.length > 0) {
+        for (var i=0; i<shown.length; i++) {
+            if (document.getElementById(role+'_'+shown[i])) {
+                if (shown[i] == 'privs') {
+                    document.getElementById(role+'_'+shown[i]).style.display = 'block';
+                } else {
+                    document.getElementById(role+'_'+shown[i]).style.display = 'inline';
+                }
+            }
+        }
+    }
+    return;
+}
+
+function toggleAccess(role) {
+    if ((document.getElementById(role+'_setincrs')) &&
+        (document.getElementById(role+'_setindom'))) {
+        for (var i=0; i<document.$formname.elements[role+'_incrs'].length; i++) {
+            if (document.$formname.elements[role+'_incrs'][i].checked) {
+                if (document.$formname.elements[role+'_incrs'][i].value == 1) {
+                    document.getElementById(role+'_setindom').style.display = 'none';
+                    document.getElementById(role+'_setincrs').style.display = 'block';
+                } else {
+                    document.getElementById(role+'_setincrs').style.display = 'none';
+                    document.getElementById(role+'_setindom').style.display = 'block';
+                }
+                break;
+            }
+        }
+    }
+    return;
+}
+
+// ]]>
+</script>
+ENDJS
+
+    $args->{add_entries} = {onload => "javascript:setFormElements(document.$formname)"};
+
+    # print page header
+    $r->print(&header($js,$args));
+    # print form header
+    $r->print('<form action="/adm/createuser" method="post" name="'.$formname.'">');
+
+    if (keys(%customroles)) {
+        my %lt = &Apache::lonlocal::texthash(
+                    'aco'    => 'As course owner you may override the defaults set in the domain for role usage and/or privileges.',
+                    'rou'    => 'Role usage',
+                    'whi'    => 'Which helpdesk personnel may use this role?',
+                    'udd'    => 'Use domain default',
+                    'all'    => 'All with domain helpdesk or helpdesk assistant role',
+                    'dh'     => 'All with domain helpdesk role',
+                    'da'     => 'All with domain helpdesk assistant role',
+                    'none'   => 'None',
+                    'status' => 'Determined based on institutional status',
+                    'inc'    => 'Include all, but exclude specific personnel',
+                    'exc'    => 'Exclude all, but include specific personnel',
+                    'hel'    => 'Helpdesk',
+                    'rpr'    => 'Role privileges',
+                 );
+        $lt{'tfh'} = &mt("Custom [_1]ad hoc[_2] course roles available for use by the domain's helpdesk are as follows",'<i>','</i>');
+        my %domconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$cdom);
+        my (%domcurrent,%ordered,%description,%domusage,$disabled);
+        if (ref($domconfig{'helpsettings'}) eq 'HASH') {
+            if (ref($domconfig{'helpsettings'}{'adhoc'}) eq 'HASH') {
+                %domcurrent = %{$domconfig{'helpsettings'}{'adhoc'}};
+            }
+        }
+        my $count = 0;
+        foreach my $role (sort(keys(%customroles))) {
+            my ($order,$desc,$access_in_dom);
+            if (ref($domcurrent{$role}) eq 'HASH') {
+                $order = $domcurrent{$role}{'order'};
+                $desc = $domcurrent{$role}{'desc'};
+                $access_in_dom = $domcurrent{$role}{'access'};
+            }
+            if ($order eq '') {
+                $order = $count;
+            }
+            $ordered{$order} = $role;
+            if ($desc ne '') {
+                $description{$role} = $desc;
+            } else {
+                $description{$role}= $role;
+            }
+            $count++;
+        }
+        %domusage = &domain_adhoc_access(\%customroles,\%domcurrent,\@accesstypes,$usertypes,$othertitle);
+        my @roles_by_num = ();
+        foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
+            push(@roles_by_num,$ordered{$item});
+        }
+        $r->print('<p>'.$lt{'tfh'}.': <i>'.join('</i>, <i>',map { $description{$_}; } @roles_by_num).'</i>.');
+        if ($permission->{'owner'}) {
+            $r->print('<br />'.$lt{'aco'}.'</p><p>');
+            $r->print('<input type="hidden" name="state" value="process" />'.
+                      '<input type="submit" value="'.&mt('Save changes').'" />');
+        } else {
+            if ($env{'course.'.$env{'request.course.id'}.'.internal.courseowner'}) {
+                my ($ownername,$ownerdom) = split(/:/,$env{'course.'.$env{'request.course.id'}.'.internal.courseowner'});
+                $r->print('<br />'.&mt('The course owner -- [_1] -- can override the default access and/or privileges for these ad hoc roles.',
+                                    &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($ownername,$ownerdom),$ownername,$ownerdom)));
+            }
+            $disabled = ' disabled="disabled"';
+        }
+        $r->print('</p>');
+
+        $r->print('<div id="LC_minitab_header"><ul>');
+        my $count = 0;
+        my %visibility;
+        foreach my $role (@roles_by_num) {
+            my $id;
+            if ($count == 0) {
+                $id=' id="LC_current_minitab"';
+                $visibility{$role} = ' style="display:block"';
+            } else {
+                $visibility{$role} = ' style="display:none"';
+            }
+            $count ++;
+            $r->print('<li'.$id.'><a href="#" onclick="javascript:switchRoleTab(this.parentNode,'."'$role'".');">'.$description{$role}.'</a></li>');
+        }
+        $r->print('</ul></div>');
+
+        foreach my $role (@roles_by_num) {
+            my %usecheck = (
+                             all => ' checked="checked"',
+                           );
+            my %displaydiv = (
+                                status => 'none',
+                                inc    => 'none',
+                                exc    => 'none',
+                                priv   => 'block',
+                             );
+            my (%selected,$overridden,$incrscheck,$indomcheck,$indomvis,$incrsvis);
+            if (ref($settings{$role}) eq 'HASH') {
+                if ($settings{$role}{'access'} ne '') {
+                    $indomvis = ' style="display:none"';
+                    $incrsvis = ' style="display:block"';
+                    $incrscheck = ' checked="checked"';
+                    if ($settings{$role}{'access'} ne 'all') {
+                        $usecheck{$settings{$role}{'access'}} = $usecheck{'all'};
+                        delete($usecheck{'all'});
+                        if ($settings{$role}{'access'} eq 'status') {
+                            my $access = 'status';
+                            $displaydiv{$access} = 'inline';
+                            if (ref($settings{$role}{$access}) eq 'ARRAY') {
+                                $selected{$access} = $settings{$role}{$access};
+                            }
+                        } elsif ($settings{$role}{'access'} =~ /^(inc|exc)$/) {
+                            my $access = $1;
+                            $displaydiv{$access} = 'inline';
+                            if (ref($settings{$role}{$access}) eq 'ARRAY') {
+                                $selected{$access} = $settings{$role}{$access};
+                            }
+                        } elsif ($settings{$role}{'access'} eq 'none') {
+                            $displaydiv{'priv'} = 'none';
+                        }
+                    }
+                } else {
+                    $indomcheck = ' checked="checked"';
+                    $indomvis = ' style="display:block"';
+                    $incrsvis = ' style="display:none"';
+                }
+            } else {
+                $indomcheck = ' checked="checked"';
+                $indomvis = ' style="display:block"';
+                $incrsvis = ' style="display:none"';
+            }
+            $r->print('<div class="LC_left_float" id="'.$role.'_maindiv"'.$visibility{$role}.'>'.
+                      '<fieldset><legend>'.$lt{'rou'}.'</legend>'.
+                      '<p>'.$lt{'whi'}.' <span class="LC_nobreak">'.
+                      '<label><input type="radio" name="'.$role.'_incrs" value="1"'.$incrscheck.' onclick="toggleAccess('."'$role'".');"'.$disabled.'>'.
+                      &mt('Set here in [_1]',lc($crstype)).'</label>'.
+                      '<span>'.('&nbsp;'x2).
+                      '<label><input type="radio" name="'.$role.'_incrs" value="0"'.$indomcheck.' onclick="toggleAccess('."'$role'".');"'.$disabled.'>'.
+                      $lt{'udd'}.'</label><span></p>'.
+                      '<div id="'.$role.'_setindom"'.$indomvis.'>'.
+                      '<span class="LC_cusr_emph">'.$domusage{$role}.'</span></div>'.
+                      '<div id="'.$role.'_setincrs"'.$incrsvis.'>');
+            foreach my $access (@accesstypes) {
+                $r->print('<p><label><input type="radio" name="'.$role.'_access" value="'.$access.'" '.$usecheck{$access}.
+                          ' onclick="helpdeskAccess('."'$role'".');"'.$disabled.' />'.$lt{$access}.'</label>');
+                if ($access eq 'status') {
+                    $r->print('<div id="'.$role.'_bystatus" style="display:'.$displaydiv{$access}.'">'.
+                              &Apache::lonuserutils::adhoc_status_types($cdom,undef,$role,$selected{$access},
+                                                                        $othertitle,$usertypes,$types,$disabled).
+                              '</div>');
+                } elsif (($access eq 'inc') && (keys(%domhelpdesk) > 0)) {
+                    $r->print('<div id="'.$role.'_notinc" style="display:'.$displaydiv{$access}.'">'.
+                              &Apache::lonuserutils::adhoc_staff($access,undef,$role,$selected{$access},
+                                                                 \%domhelpdesk,$disabled).
+                              '</div>');
+                } elsif (($access eq 'exc') && (keys(%domhelpdesk) > 0)) {
+                    $r->print('<div id="'.$role.'_notexc" style="display:'.$displaydiv{$access}.'">'.
+                              &Apache::lonuserutils::adhoc_staff($access,undef,$role,$selected{$access},
+                                                                 \%domhelpdesk,$disabled).
+                              '</div>');
+                }
+                $r->print('</p>');
+            }
+            $r->print('</div></fieldset>');
+            my %full=();
+            my %levels= (
+                         course => {},
+                         domain => {},
+                         system => {},
+                        );
+            my %levelscurrent=(
+                               course => {},
+                               domain => {},
+                               system => {},
+                              );
+            &Apache::lonuserutils::custom_role_privs($customroles{$role},\%full,\%levels,\%levelscurrent);
+            $r->print('<fieldset id="'.$role.'_privs" style="display:'.$displaydiv{'priv'}.'">'.
+                      '<legend>'.$lt{'rpr'}.'</legend>'.
+                      &role_priv_table($role,$permission,$crstype,\%full,\%levels,\%levelscurrent,$overridden{$role}).
+                      '</fieldset></div><div style="padding:0;clear:both;margin:0;border:0"></div>');
+        }
+        if ($permission->{'owner'}) {
+            $r->print('<p><input type="submit" value="'.&mt('Save changes').'" /></p>');
+        }
+    } else {
+        $r->print(&mt('Helpdesk roles have not yet been created in this domain.'));
+    }
+    # Form Footer
+    $r->print('<input type="hidden" name="action" value="helpdesk" />'
+             .'</form>');
+    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;
+    return unless ((ref($roles) eq 'HASH') && (ref($domcurrent) eq 'HASH') && (ref($accesstypes) eq 'ARRAY'));
+    foreach my $role (keys(%{$roles})) {
+        if (ref($domcurrent->{$role}) eq 'HASH') {
+            my $access = $domcurrent->{$role}{'access'};
+            if (($access eq '') || (!grep(/^\Q$access\E$/,@{$accesstypes}))) {
+                $access = 'all';
+                $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',&Apache::lonnet::plaintext('dh'),
+                                                                                          &Apache::lonnet::plaintext('da'));
+            } elsif ($access eq 'status') {
+                if (ref($domcurrent->{$role}{$access}) eq 'ARRAY') {
+                    my @shown;
+                    foreach my $type (@{$domcurrent->{$role}{$access}}) {
+                        unless ($type eq 'default') {
+                            if ($usertypes->{$type}) {
+                                push(@shown,$usertypes->{$type});
+                            }
+                        }
+                    }
+                    if (grep(/^default$/,@{$domcurrent->{$role}{$access}})) {
+                        push(@shown,$othertitle);
+                    }
+                    if (@shown) {
+                        my $shownstatus = join(' '.&mt('or').' ',@shown);
+                        $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role, and institutional status: [_3]',
+                                               &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownstatus);
+                    } else {
+                        $domusage{$role} = &mt('No one in the domain');
+                    }
+                }
+            } elsif ($access eq 'inc') {
+                my @dominc = ();
+                if (ref($domcurrent->{$role}{'inc'}) eq 'ARRAY') {
+                    foreach my $user (@{$domcurrent->{$role}{'inc'}}) {
+                        my ($uname,$udom) = split(/:/,$user);
+                        push(@dominc,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom));
+                    }
+                    my $showninc = join(', ',@dominc);
+                    if ($showninc ne '') {
+                        $domusage{$role} = &mt('Include any user in domain with active [_1] or [_2] role, except: [_3]',
+                                               &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$showninc);
+                    } else {
+                        $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',
+                                               &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
+                    }
+                }
+            } elsif ($access eq 'exc') {
+                my @domexc = ();
+                if (ref($domcurrent->{$role}{'exc'}) eq 'ARRAY') {
+                    foreach my $user (@{$domcurrent->{$role}{'exc'}}) {
+                        my ($uname,$udom) = split(/:/,$user);
+                        push(@domexc,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom));
+                    }
+                }
+                my $shownexc = join(', ',@domexc);
+                if ($shownexc ne '') {
+                    $domusage{$role} = &mt('Only the following in the domain with active [_1] or [_2] role: [_3]',
+                                           &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownexc);
+                } else {
+                    $domusage{$role} = &mt('No one in the domain');
+                }
+            } elsif ($access eq 'none') {
+                $domusage{$role} = &mt('No one in the domain');
+            } elsif ($access eq 'dh') {
+                $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
+            } elsif ($access eq 'da') {
+                $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('da'));
+            } elsif ($access eq 'all') {
+                $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',
+                                       &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
+            }
+        } else {
+            $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',
+                                   &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
+        }
+    }
+    return %domusage;
+}
+
+sub get_domain_customroles {
+    my ($cdom,$confname) = @_;
+    my %existing=&Apache::lonnet::dump('roles',$cdom,$confname,'rolesdef_');
+    my %customroles;
+    foreach my $key (keys(%existing)) {
+        if ($key=~/^rolesdef\_(\w+)$/) {
+            my $rolename = $1;
+            my %privs;
+            ($privs{'system'},$privs{'domain'},$privs{'course'}) = split(/\_/,$existing{$key});
+            $customroles{$rolename} = \%privs;
+        }
+    }
+    return %customroles;
+}
+
+sub role_priv_table {
+    my ($role,$permission,$crstype,$full,$levels,$levelscurrent,$overridden) = @_;
+    return unless ((ref($full) eq 'HASH') && (ref($levels) eq 'HASH') &&
+                   (ref($levelscurrent) eq 'HASH'));
+    my %lt=&Apache::lonlocal::texthash (
+                    'crl'  => 'Course Level Privilege',
+                    'def'  => 'Domain Defaults',
+                    'ove'  => 'Override in Course',
+                    'ine'  => 'In effect',
+                    'dis'  => 'Disabled',
+                    'ena'  => 'Enabled',
+                   );
+    if ($crstype eq 'Community') {
+        $lt{'ove'} = 'Override in Community',
+    }
+    my @status = ('Disabled','Enabled');
+    my (%on,%off);
+    if (ref($overridden) eq 'HASH') {
+        if (ref($overridden->{'on'}) eq 'ARRAY') {
+            map { $on{$_} = 1; } (@{$overridden->{'on'}});
+        }
+        if (ref($overridden->{'off'}) eq 'ARRAY') {
+            map { $off{$_} = 1; } (@{$overridden->{'off'}});
+        }
+    }
+    my $output=&Apache::loncommon::start_data_table().
+               &Apache::loncommon::start_data_table_header_row().
+               '<th>'.$lt{'crl'}.'</th><th>'.$lt{'def'}.'</th><th>'.$lt{'ove'}.
+               '</th><th>'.$lt{'ine'}.'</th>'.
+               &Apache::loncommon::end_data_table_header_row();
+    foreach my $priv (sort(keys(%{$full}))) {
+        next unless ($levels->{'course'}{$priv});
+        my $privtext = &Apache::lonnet::plaintext($priv,$crstype);
+        my ($default,$ineffect);
+        if ($levelscurrent->{'course'}{$priv}) {
+            $default = '<img src="/adm/lonIcons/navmap.correct.gif" alt="'.$lt{'ena'}.'" />';
+            $ineffect = $default;
+        }
+        my ($customstatus,$checked);
+        $output .= &Apache::loncommon::start_data_table_row().
+                   '<td>'.$privtext.'</td>'.
+                   '<td>'.$default.'</td><td>';
+        if (($levelscurrent->{'course'}{$priv}) && ($off{$priv})) {
+            if ($permission->{'owner'}) {
+                $checked = ' checked="checked"';
+            }
+            $customstatus = '<img src="/adm/lonIcons/navmap.wrong.gif" alt="'.$lt{'dis'}.'" />';
+            $ineffect = $customstatus;
+        } elsif ((!$levelscurrent->{'course'}{$priv}) && ($on{$priv})) {
+            if ($permission->{'owner'}) {
+                $checked = ' checked="checked"';
+            }
+            $customstatus = '<img src="/adm/lonIcons/navmap.correct.gif" alt="'.$lt{'ena'}.'" />';
+            $ineffect = $customstatus;
+        }
+        if ($permission->{'owner'}) {
+            $output .= '<input type="checkbox" name="'.$role.'_override" value="'.$priv.'"'.$checked.' />';
+        } else {
+            $output .= $customstatus;
+        }
+        $output .= '</td><td>'.$ineffect.'</td>'.
+                   &Apache::loncommon::end_data_table_row();
+    }
+    $output .= &Apache::loncommon::end_data_table();
+    return $output;
+}
+
+sub get_adhocrole_settings {
+    my ($cid,$accesstypes,$types,$customroles,$settings,$overridden) = @_;
+    return unless ((ref($accesstypes) eq 'ARRAY') && (ref($customroles) eq 'HASH') &&
+                   (ref($settings) eq 'HASH') && (ref($overridden) eq 'HASH'));
+    foreach my $role (split(/,/,$env{'course.'.$cid.'.internal.adhocaccess'})) {
+        my ($curraccess,$rest) = split(/=/,$env{'course.'.$cid.'.internal.adhoc.'.$role});
+        if (($curraccess ne '') && (grep(/^\Q$curraccess\E$/,@{$accesstypes}))) {
+            $settings->{$role}{'access'} = $curraccess;
+            if (($curraccess eq 'status') && (ref($types) eq 'ARRAY')) {
+                my @status = split(/,/,$rest);
+                my @currstatus;
+                foreach my $type (@status) {
+                    if ($type eq 'default') {
+                        push(@currstatus,$type);
+                    } elsif (grep(/^\Q$type\E$/,@{$types})) {
+                        push(@currstatus,$type);
+                    }
+                }
+                if (@currstatus) {
+                    $settings->{$role}{$curraccess} = \@currstatus;
+                } elsif (($curraccess eq 'exc') || ($curraccess eq 'inc')) {
+                    my @personnel = split(/,/,$rest);
+                    $settings->{$role}{$curraccess} = \@personnel;
+                }
+            }
+        }
+    }
+    foreach my $role (keys(%{$customroles})) {
+        if ($env{'course.'.$cid.'.internal.adhocpriv.'.$role}) {
+            my %currentprivs;
+            if (ref($customroles->{$role}) eq 'HASH') {
+                if (exists($customroles->{$role}{'course'})) {
+                    my %full=();
+                    my %levels= (
+                                  course => {},
+                                  domain => {},
+                                  system => {},
+                                );
+                    my %levelscurrent=(
+                                        course => {},
+                                        domain => {},
+                                        system => {},
+                                      );
+                    &Apache::lonuserutils::custom_role_privs($customroles->{$role},\%full,\%levels,\%levelscurrent);
+                    %currentprivs = %{$levelscurrent{'course'}};
+                }
+            }
+            foreach my $item (split(/,/,$env{'course.'.$cid.'.internal.adhocpriv.'.$role})) {
+                next if ($item eq '');
+                my ($rule,$rest) = split(/=/,$item);
+                next unless (($rule eq 'off') || ($rule eq 'on'));
+                foreach my $priv (split(/:/,$rest)) {
+                    if ($priv ne '') {
+                        if ($rule eq 'off') {
+                            push(@{$overridden->{$role}{'off'}},$priv);
+                            if ($currentprivs{$priv}) {
+                                push(@{$settings->{$role}{'off'}},$priv);
+                            }
+                        } else {
+                            push(@{$overridden->{$role}{'on'}},$priv);
+                            unless ($currentprivs{$priv}) {
+                                push(@{$settings->{$role}{'on'}},$priv);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+sub update_helpdeskaccess {
+    my ($r,$permission,$brcrum) = @_;
+    my $helpitem = 'Course_Helpdesk_Access';
+    push (@{$brcrum},
+             {href => '/adm/createuser?action=helpdesk',
+              text => 'Helpdesk Access',
+              help => $helpitem},
+             {href => '/adm/createuser?action=helpdesk',
+              text => 'Result',
+              help => $helpitem}
+         );
+    my $bread_crumbs_component = 'Helpdesk Staff Access';
+    my $args = { bread_crumbs           => $brcrum,
+                 bread_crumbs_component => $bread_crumbs_component};
+
+    # print page header
+    $r->print(&header('',$args));
+    unless ((ref($permission) eq 'HASH') && ($permission->{'owner'})) {
+        $r->print('<p class="LC_error">'.&mt('You do not have permission to change helpdesk access.').'</p>');
+        return;
+    }
+    my @accesstypes = ('all','dh','da','none','status','inc','exc');
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $confname = $cdom.'-domainconfig';
+    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom);
+    my $crstype = &Apache::loncommon::course_type();
+    my %customroles = &get_domain_customroles($cdom,$confname);
+    my (%settings,%overridden);
+    &get_adhocrole_settings($env{'request.course.id'},\@accesstypes,
+                            $types,\%customroles,\%settings,\%overridden);
+    my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']);
+    my (%changed,%storehash,@todelete);
+
+    if (keys(%customroles)) {
+        my (%newsettings,@incrs);
+        foreach my $role (keys(%customroles)) {
+            $newsettings{$role} = {
+                                    access => '',
+                                    status => '',
+                                    exc    => '',
+                                    inc    => '',
+                                    on     => '',
+                                    off    => '',
+                                  };
+            my %current;
+            if (ref($settings{$role}) eq 'HASH') {
+                %current = %{$settings{$role}};
+            }
+            if (ref($overridden{$role}) eq 'HASH') {
+                $current{'overridden'} = $overridden{$role};
+            }
+            if ($env{'form.'.$role.'_incrs'}) {
+                my $access = $env{'form.'.$role.'_access'};
+                if (grep(/^\Q$access\E$/,@accesstypes)) {
+                    push(@incrs,$role);
+                    unless ($current{'access'} eq $access) {
+                        $changed{$role}{'access'} = 1;
+                        $storehash{'internal.adhoc.'.$role} = $access;
+                    }
+                    if ($access eq 'status') {
+                        my @statuses = &Apache::loncommon::get_env_multiple('form.'.$role.'_status');
+                        my @stored;
+                        my @shownstatus;
+                        if (ref($types) eq 'ARRAY') {
+                            foreach my $type (sort(@statuses)) {
+                                if ($type eq 'default') {
+                                    push(@stored,$type);
+                                } elsif (grep(/^\Q$type\E$/,@{$types})) {
+                                    push(@stored,$type);
+                                    push(@shownstatus,$usertypes->{$type});
+                                }
+                            }
+                            if (grep(/^default$/,@statuses)) {
+                                push(@shownstatus,$othertitle);
+                            }
+                            $storehash{'internal.adhoc.'.$role} .= '='.join(',',@stored);
+                        }
+                        $newsettings{$role}{'status'} = join(' '.&mt('or').' ',@shownstatus);
+                        if (ref($current{'status'}) eq 'ARRAY') {
+                            my @diffs = &Apache::loncommon::compare_arrays(\@stored,$current{'status'});
+                            if (@diffs) {
+                                $changed{$role}{'status'} = 1;
+                            }
+                        } elsif (@stored) {
+                            $changed{$role}{'status'} = 1;
+                        }
+                    } elsif (($access eq 'inc') || ($access eq 'exc')) {
+                        my @personnel = &Apache::loncommon::get_env_multiple('form.'.$role.'_staff_'.$access);
+                        my @newspecstaff;
+                        my @stored;
+                        my @currstaff;
+                        foreach my $person (sort(@personnel)) {
+                            if ($domhelpdesk{$person}) {
+                                push(@stored,$person);
+                            }
+                        }
+                        if (ref($current{$access}) eq 'ARRAY') {
+                            my @diffs = &Apache::loncommon::compare_arrays(\@stored,$current{$access});
+                            if (@diffs) {
+                                $changed{$role}{$access} = 1;
+                            }
+                        } elsif (@stored) {
+                            $changed{$role}{$access} = 1;
+                        }
+                        $storehash{'internal.adhoc.'.$role} .= '='.join(',',@stored);
+                        foreach my $person (@stored) {
+                            my ($uname,$udom) = split(/:/,$person);
+                            push(@newspecstaff,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom,'lastname'),$uname,$udom));
+                        }
+                        $newsettings{$role}{$access} = join(', ',sort(@newspecstaff));
+                    }
+                    $newsettings{$role}{'access'} = $access;
+                }
+            } else {
+                if (($current{'access'} ne '') && (grep(/^\Q$current{'access'}\E$/,@accesstypes))) {
+                    $changed{$role}{'access'} = 1;
+                    $newsettings{$role} = {};
+                    push(@todelete,'internal.adhoc.'.$role);
+                }
+            }
+            if (($env{'form.'.$role.'_incrs'}) && ($env{'form.'.$role.'_access'} eq 'none')) {
+                if (ref($current{'overridden'}) eq 'HASH') {
+                    push(@todelete,'internal.adhocpriv.'.$role);
+                }
+            } else {
+                my %full=();
+                my %levels= (
+                             course => {},
+                             domain => {},
+                             system => {},
+                            );
+                my %levelscurrent=(
+                                   course => {},
+                                   domain => {},
+                                   system => {},
+                                  );
+                &Apache::lonuserutils::custom_role_privs($customroles{$role},\%full,\%levels,\%levelscurrent);
+                my (@updatedon,@updatedoff,@override);
+                @override = &Apache::loncommon::get_env_multiple('form.'.$role.'_override');
+                if (@override) {
+                    foreach my $priv (sort(keys(%full))) {
+                        next unless ($levels{'course'}{$priv});
+                        if (grep(/^\Q$priv\E$/,@override)) {
+                            if ($levelscurrent{'course'}{$priv}) {
+                                push(@updatedoff,$priv);
+                            } else {
+                                push(@updatedon,$priv);
+                            }
+                        }
+                    }
+                }
+                if (@updatedon) {
+                    $newsettings{$role}{'on'} = join('</li><li>', map { &Apache::lonnet::plaintext($_,$crstype) } (@updatedon));
+                }
+                if (@updatedoff) {
+                    $newsettings{$role}{'off'} = join('</li><li>', map { &Apache::lonnet::plaintext($_,$crstype) } (@updatedoff));
+                }
+                if (ref($current{'overridden'}) eq 'HASH') {
+                    if (ref($current{'overridden'}{'on'}) eq 'ARRAY') {
+                        if (@updatedon) {
+                            my @diffs = &Apache::loncommon::compare_arrays(\@updatedon,$current{'overridden'}{'on'});
+                            if (@diffs) {
+                                $changed{$role}{'on'} = 1;
+                            }
+                        } else {
+                            $changed{$role}{'on'} = 1;
+                        }
+                    } elsif (@updatedon) {
+                        $changed{$role}{'on'} = 1;
+                    }
+                    if (ref($current{'overridden'}{'off'}) eq 'ARRAY') {
+                        if (@updatedoff) {
+                            my @diffs = &Apache::loncommon::compare_arrays(\@updatedoff,$current{'overridden'}{'off'});
+                            if (@diffs) {
+                                $changed{$role}{'off'} = 1;
+                            }
+                        } else {
+                            $changed{$role}{'off'} = 1;
+                        }
+                    } elsif (@updatedoff) {
+                        $changed{$role}{'off'} = 1;
+                    }
+                } else {
+                    if (@updatedon) {
+                        $changed{$role}{'on'} = 1;
+                    }
+                    if (@updatedoff) {
+                        $changed{$role}{'off'} = 1;
+                    }
+                }
+                if (ref($changed{$role}) eq 'HASH') {
+                    if (($changed{$role}{'on'} || $changed{$role}{'off'})) {
+                        my $newpriv;
+                        if (@updatedon) {
+                            $newpriv = 'on='.join(':',@updatedon);
+                        }
+                        if (@updatedoff) {
+                            $newpriv .= ($newpriv ? ',' : '' ).'off='.join(':',@updatedoff);
+                        }
+                        if ($newpriv eq '') {
+                            push(@todelete,'internal.adhocpriv.'.$role);
+                        } else {
+                            $storehash{'internal.adhocpriv.'.$role} = $newpriv;
+                        }
+                    }
+                }
+            }
+        }
+        if (@incrs) {
+            $storehash{'internal.adhocaccess'} = join(',',@incrs);
+        } elsif (@todelete) {
+            push(@todelete,'internal.adhocaccess');
+        }
+        if (keys(%changed)) {
+            my ($putres,$delres);
+            if (keys(%storehash)) {
+                $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
+                my %newenvhash;
+                foreach my $key (keys(%storehash)) {
+                    $newenvhash{'course.'.$env{'request.course.id'}.'.'.$key} = $storehash{$key};
+                }
+                &Apache::lonnet::appenv(\%newenvhash);
+            }
+            if (@todelete) {
+                $delres = &Apache::lonnet::del('environment',\@todelete,$cdom,$cnum);
+                foreach my $key (@todelete) {
+                    &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.'.$key);
+                }
+            }
+            if (($putres eq 'ok') || ($delres eq 'ok')) {
+                my %domconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$cdom);
+                my (%domcurrent,%ordered,%description,%domusage);
+                if (ref($domconfig{'helpsettings'}) eq 'HASH') {
+                    if (ref($domconfig{'helpsettings'}{'adhoc'}) eq 'HASH') {
+                        %domcurrent = %{$domconfig{'helpsettings'}{'adhoc'}};
+                    }
+                }
+                my $count = 0;
+                foreach my $role (sort(keys(%customroles))) {
+                    my ($order,$desc);
+                    if (ref($domcurrent{$role}) eq 'HASH') {
+                        $order = $domcurrent{$role}{'order'};
+                        $desc = $domcurrent{$role}{'desc'};
+                    }
+                    if ($order eq '') {
+                        $order = $count;
+                    }
+                    $ordered{$order} = $role;
+                    if ($desc ne '') {
+                        $description{$role} = $desc;
+                    } else {
+                        $description{$role}= $role;
+                    }
+                    $count++;
+                }
+                my @roles_by_num = ();
+                foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
+                    push(@roles_by_num,$ordered{$item});
+                }
+                %domusage = &domain_adhoc_access(\%changed,\%domcurrent,\@accesstypes,$usertypes,$othertitle);
+                $r->print(&mt('Helpdesk access settings have been changed as follows').'<br />');
+                $r->print('<ul>');
+                foreach my $role (@roles_by_num) {
+                    next unless (ref($changed{$role}) eq 'HASH');
+                    $r->print('<li>'.&mt('Ad hoc role').': <b>'.$description{$role}.'</b>'.
+                              '<ul>');
+                    if ($changed{$role}{'access'} || $changed{$role}{'status'} || $changed{$role}{'inc'} || $changed{$role}{'exc'}) {
+                        $r->print('<li>');
+                        if ($env{'form.'.$role.'_incrs'}) {
+                            if ($newsettings{$role}{'access'} eq 'all') {
+                                $r->print(&mt('All helpdesk staff can access '.lc($crstype).' with this role.'));
+                            } elsif ($newsettings{$role}{'access'} eq 'dh') {
+                                $r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role',
+                                              &Apache::lonnet::plaintext('dh')));
+                            } elsif ($newsettings{$role}{'access'} eq 'da') {
+                                $r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role',
+                                              &Apache::lonnet::plaintext('da')));
+                            } elsif ($newsettings{$role}{'access'} eq 'none') {
+                                $r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.'));
+                            } elsif ($newsettings{$role}{'access'} eq 'status') {
+                                if ($newsettings{$role}{'status'}) {
+                                    my ($access,$rest) = split(/=/,$storehash{'internal.adhoc.'.$role});
+                                    if (split(/,/,$rest) > 1) {
+                                        $r->print(&mt('Helpdesk staff can use this role if their institutional type is one of: [_1].',
+                                                      $newsettings{$role}{'status'}));
+                                    } else {
+                                        $r->print(&mt('Helpdesk staff can use this role if their institutional type is: [_1].',
+                                                      $newsettings{$role}{'status'}));
+                                    }
+                                } else {
+                                    $r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.'));
+                                }
+                            } elsif ($newsettings{$role}{'access'} eq 'exc') {
+                                if ($newsettings{$role}{'exc'}) {
+                                    $r->print(&mt('Helpdesk staff who can use this role are as follows:').' '.$newsettings{$role}{'exc'}.'.');
+                                } else {
+                                    $r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.'));
+                                }
+                            } elsif ($newsettings{$role}{'access'} eq 'inc') {
+                                if ($newsettings{$role}{'inc'}) {
+                                    $r->print(&mt('All helpdesk staff may use this role except the following:').' '.$newsettings{$role}{'inc'}.'.');
+                                } else {
+                                    $r->print(&mt('All helpdesk staff may use this role.'));
+                                }
+                            }
+                        } else {
+                            $r->print(&mt('Default access set in the domain now applies.').'<br />'.
+                                      '<span class="LC_cusr_emph">'.$domusage{$role}.'</span>');
+                        }
+                        $r->print('</li>');
+                    }
+                    unless ($newsettings{$role}{'access'} eq 'none') {
+                        if ($changed{$role}{'off'}) {
+                            if ($newsettings{$role}{'off'}) {
+                                $r->print('<li>'.&mt('Privileges which are available by default for this ad hoc role, but are disabled for this specific '.lc($crstype).':').
+                                          '<ul><li>'.$newsettings{$role}{'off'}.'</li></ul></li>');
+                            } else {
+                                $r->print('<li>'.&mt('All privileges available by default for this ad hoc role are enabled.').'</li>');
+                            }
+                        }
+                        if ($changed{$role}{'on'}) {
+                            if ($newsettings{$role}{'on'}) {
+                                $r->print('<li>'.&mt('Privileges which are not available by default for this ad hoc role, but are enabled for this specific '.lc($crstype).':').
+                                          '<ul><li>'.$newsettings{$role}{'on'}.'</li></ul></li>');
+                            } else {
+                                $r->print('<li>'.&mt('None of the privileges unavailable by default for this ad hoc role are enabled.').'</li>');
+                            }
+                        }
+                    }
+                    $r->print('</ul></li>');
+                }
+                $r->print('</ul>');
+            }
+        } else {
+            $r->print(&mt('No changes made to helpdesk access settings.'));
+        }
+    }
+    return;
+}
+
 #-------------------------------------------------- functions for &phase_two
 sub user_search_result {
     my ($context,$srch) = @_;
@@ -7354,18 +9944,18 @@ 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 />';
         }
     } else {
         unless (($context eq 'requestcrs') && ($srch->{'srchtype'} eq 'exact')) {
             my $domd_chk = &domdirectorysrch_check($srch);
-            if ($domd_chk ne 'ok') {
+            if (($domd_chk ne 'ok') && ($env{'form.action'} ne 'accesslogs')) {
                 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 />';
             }
@@ -7466,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 />'; 
             }
         }
@@ -7539,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 />';
             }
         }
@@ -7712,7 +10302,7 @@ sub build_search_response {
             if ($srch->{'srchin'} ne 'alc') {
                 $forcenewuser = 1;
                 my $cansrchinst = 0; 
-                if ($srch->{'srchdomain'}) {
+                if (($srch->{'srchdomain'}) && ($env{'form.action'} ne 'accesslogs')) {
                     my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$srch->{'srchdomain'});
                     if (ref($domconfig{'directorysrch'}) eq 'HASH') {
                         if ($domconfig{'directorysrch'}{'available'}) {
@@ -7762,18 +10352,20 @@ sub build_search_response {
                                 .&mt("Click 'Search'")
                                 .'</li></ul><br />';
                 } else {
-                    my $helplink = ' href="javascript:helpMenu('."'display'".')"';
-                    $response .= '<br /><br />';
-                    if ($context eq 'requestcrs') {
-                        $response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom);
-                    } else {
-                        $response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom);
+                    unless (($context eq 'domain') && ($env{'form.action'} eq 'singleuser')) {
+                        my $helplink = ' href="javascript:helpMenu('."'display'".')"';
+                        $response .= '<br /><br />';
+                        if ($context eq 'requestcrs') {
+                            $response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom);
+                        } else {
+                            $response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom);
+                        }
+                        $response .= '<br />'
+                                     .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.'
+                                        ,' <a'.$helplink.'>'
+                                        ,'</a>')
+                                     .'<br />';
                     }
-                    $response .= '<br />'
-                                 .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.'
-                                    ,' <a'.$helplink.'>'
-                                    ,'</a>')
-                                 .'<br />';
                 }
             }
         }
@@ -8057,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 {
@@ -8393,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') {