--- loncom/interface/loncreateuser.pm	2019/07/30 13:55:16	1.406.2.16
+++ loncom/interface/loncreateuser.pm	2024/02/29 21:43:33	1.406.2.20.2.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.406.2.16 2019/07/30 13:55:16 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.406.2.20.2.5 2024/02/29 21:43:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,6 +71,7 @@ use Apache::longroup;
 use Apache::lonuserutils;
 use Apache::loncoursequeueadmin;
 use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities;
 
 my $loginscript; # piece of javascript used in two separate instances
 my $authformnop;
@@ -80,7 +81,7 @@ my $authformfsys;
 my $authformloc;
 
 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,
@@ -101,6 +102,9 @@ 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);
@@ -123,14 +127,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 +226,61 @@ 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|timezone|webdav)\$/;
+                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);
     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",
                    'portfolio'  => "Personal User Portfolio",
+                   'timezone'   => "Can set Time Zone",
                    'avai'       => "Available",
                    'cusa'       => "availability",
                    'chse'       => "Change setting",
@@ -253,7 +291,11 @@ sub build_tools_display {
                    'community'  => 'Can request creation of communities',
                    'textbook'   => 'Can request creation of textbook 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',
@@ -263,39 +305,58 @@ sub build_tools_display {
         %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');
+        @usertools = ('webdav','editors');
+        $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');
+        @usertools = ('aboutme','blog','portfolio','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 ne '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') {
+                if ($userenv{'author'.$item} ne '') {
+                    $cust_on = ' checked="checked" ';
+                    $cust_off = '';
+                }
+            } elsif ($item eq 'webdav') {
+                if ($userenv{'tools.'.$item} ne '') {
+                    $cust_on = ' checked="checked" ';
+                    $cust_off = '';
+                }
+            }
         } elsif ($userenv{$context.'.'.$item} ne '') {
             $cust_on = ' checked="checked" ';
             $cust_off = '';
@@ -303,30 +364,71 @@ 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;"';
             }
         } else {
-            if ($userenv{$context.'.'.$item} eq '') {
+            my $current = $userenv{$context.'.'.$item};
+            if ($item eq 'webdav') {
+                $current = $userenv{'tools.webdav'};
+            }
+            if ($current eq '') {
                 $custom_access =
                     &mt('Availability determined currently from default setting.');
                 if (!$curr_access) {
                     $tool_off = 'checked="checked" ';
                     $tool_on = '';
                 }
+                $customsty = ' style="display:none;"';
             } else {
                 $custom_access =
                     &mt('Availability determined currently from custom setting.');
-                if ($userenv{$context.'.'.$item} == 0) {
+                if ($current == 0) {
                     $tool_off = 'checked="checked" ';
                     $tool_on = '';
                 }
+                $customsty = ' style="display:inline;"';
             }
         }
         $output .= '  <tr class="LC_info_row">'."\n".
@@ -358,6 +460,11 @@ sub build_tools_display {
             if (!$curroption) {
                 $curroption = 'norequest';
             }
+            my $name = 'crsreq_'.$item;
+            if ($context eq 'requestauthor') {
+                $name = $item;
+            }
+            $onclick = ' onclick="javascript:toggleCustom(this.form,'."'customtext_$item','custom$item'".');"';
             if ($curroption =~ /^autolimit=(\d*)$/) {
                 $currlimit = $1;
                 if ($currlimit eq '') {
@@ -368,7 +475,7 @@ sub build_tools_display {
             } else {
                 $currdisp = $reqdisplay{$curroption};
             }
-            $custdisp = '<table>';
+            $custdisp = '<fieldset id="customtext_'.$item.'"'.$customsty.'>';
             foreach my $option (@options) {
                 my $val = $option;
                 if ($option eq 'norequest') {
@@ -391,53 +498,87 @@ 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";
             }
-            $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') {
+            $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;
@@ -523,7 +664,7 @@ sub coursereq_externaluser {
 sub domainrole_req {
     my ($ccuname,$ccdomain) = @_;
     return '<br /><h3>'.
-           &mt('User Can Request Assignment of Domain Roles?').
+           &mt('Can Request Assignment of Domain Roles?').
            '</h3>'."\n".
            &Apache::loncommon::start_data_table().
            &build_tools_display($ccuname,$ccdomain,
@@ -531,6 +672,18 @@ sub domainrole_req {
            &Apache::loncommon::end_data_table();
 }
 
+sub authoring_defaults {
+    my ($ccuname,$ccdomain) = @_;
+    return '<br /><h3>'.
+           &mt('Authoring Space defaults (if role assigned)').
+           '</h3>'."\n".
+           &Apache::loncommon::start_data_table().
+           &build_tools_display($ccuname,$ccdomain,
+                                'authordefaults').
+           &user_quotas($ccuname,$ccdomain,'author').
+           &Apache::loncommon::end_data_table();
+}
+
 sub courserequest_titles {
     my %titles = &Apache::lonlocal::texthash (
                                    official   => 'Official',
@@ -1241,8 +1394,9 @@ sub print_user_modification_page {
 
     my $groupslist = &Apache::lonuserutils::get_groupslist();
 
-    my $js = &validation_javascript($context,$ccdomain,$pjump_def,$crstype,
-                               $groupslist,$newuser,$formname,\%loaditem);
+    my $js = &validation_javascript($context,$ccdomain,$pjump_def,
+                                    $crstype,$groupslist,$newuser,
+                                    $formname,\%loaditem,$permission);
     my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$ccdomain);
     my $helpitem = 'Course_Change_Privileges';
     if ($env{'form.action'} eq 'singlestudent') {
@@ -1251,6 +1405,7 @@ sub print_user_modification_page {
         $helpitem = 'Author_Change_Privileges';
     } elsif ($context eq 'domain') {
         $helpitem = 'Domain_Change_Privileges';
+        $js .= &set_custom_js();
     }
     push (@{$brcrum},
         {href => "javascript:backPage($form)",
@@ -1276,6 +1431,32 @@ sub print_user_modification_page {
     if ($env{'form.popup'}) {
         $args->{'no_nav_bar'} = 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'));
+        }
+        if (&Apache::lonnet::allowed('mut',$ccdomain)) {
+            push(@toggles,('aboutme','blog','portfolio','timezone'));
+        }
+        if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
+            push(@toggles,('official','unofficial','community','textbook'));
+        }
+        if (@toggles) {
+            my $onload;
+            foreach my $item (@toggles) {
+                $onload .= "toggleCustom(document.cu,'customtext_$item','custom$item');";
+            }
+            $args->{'add_entries'} = {
+                                       'onload' => $onload,
+                                     };
+        }
+    }
     my $start_page =
         &Apache::loncommon::start_page('User Management',$js,$args);
 
@@ -1312,18 +1493,36 @@ ENDFORMINFO
         }
     }
     my $title = '';
+    my $need_quota_js;
     if ($newuser) {
         my ($portfolioform,$domroleform);
         if ((&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) ||
             (&Apache::lonnet::allowed('mut',$env{'request.role.domain'}))) {
             # Current user has quota or user tools modification privileges
-            $portfolioform = '<br />'.&user_quotas($ccuname,$ccdomain);
+            $portfolioform = '<br /><h3>'.
+                             &mt('User Tools').
+                             '</h3>'."\n".
+                             &Apache::loncommon::start_data_table();
+            if (&Apache::lonnet::allowed('mut',$ccdomain)) {
+                $portfolioform .= &build_tools_display($ccuname,$ccdomain,'tools');
+            }
+            if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
+                $portfolioform .= &user_quotas($ccuname,$ccdomain,'portfolio');
+                $need_quota_js = 1;
+            }
+            $portfolioform .= &Apache::loncommon::end_data_table();
         }
         if ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) &&
             ($ccdomain eq $env{'request.role.domain'})) {
-            $domroleform = '<br />'.&domainrole_req($ccuname,$ccdomain);
+            $domroleform = &domainrole_req($ccuname,$ccdomain).
+                           &authoring_defaults($ccuname,$ccdomain);
+            $need_quota_js = 1;
+        }
+        my $readonly;
+        unless ($permission->{'cusr'}) {
+            $readonly = 1;
         }
-        &initialize_authen_forms($ccdomain,$formname);
+        &initialize_authen_forms($ccdomain,$formname,'','',$readonly);
         my %lt=&Apache::lonlocal::texthash(
                 'lg'             => 'Login Data',
                 'hs'             => "Home Server",
@@ -1354,7 +1553,7 @@ ENDTITLE
         $r->print('<h2>'.$title.'</h2>'."\n");
         $r->print('<div class="LC_left_float">');
         $r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context,
-                                         $inst_results{$ccuname.':'.$ccdomain}));
+                                         $inst_results{$ccuname.':'.$ccdomain},$readonly));
         # Option to disable student/employee ID conflict checking not offerred for new users.
         my ($home_server_pick,$numlib) = 
             &Apache::loncommon::home_server_form_item($ccdomain,'hserver',
@@ -1369,7 +1568,7 @@ $lt{'hs'}: $home_server_pick
         }
         if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
             $r->print('<br /><h3>'.
-                      &mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
+                      &mt('Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
                       &Apache::loncommon::start_data_table().
                       &build_tools_display($ccuname,$ccdomain,
                                            'requestcourses').
@@ -1465,7 +1664,7 @@ ENDAUTH
                                          $inst_results{$ccuname.':'.$ccdomain}));
         if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) ||
             (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) {
-            $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
+            $r->print('<br /><h3>'.&mt('Can Request Creation of Courses/Communities in this Domain?').'</h3>'."\n".
                       &Apache::loncommon::start_data_table());
             if ($env{'request.role.domain'} eq $ccdomain) {
                 $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
@@ -1476,28 +1675,44 @@ ENDAUTH
             $r->print(&Apache::loncommon::end_data_table());
         }
         $r->print('</div>');
-        my @order = ('auth','quota','tools','requestauthor');
+        my @order = ('auth','quota','tools','requestauthor','authordefaults');
         my %user_text;
         my ($isadv,$isauthor) = 
             &Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
-        if ((!$isauthor) && 
-            ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) ||
+        if (((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) ||
              (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) &&
-             ($env{'request.role.domain'} eq $ccdomain)) {
-            $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);
+            ($env{'request.role.domain'} eq $ccdomain)) {
+            if (!$isauthor) {
+                $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);
+            }
+            $user_text{'authordefaults'} = &authoring_defaults($ccuname,$ccdomain);
+            if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) {
+                $need_quota_js = 1;
+            }
         }
-        $user_text{'auth'} =  &user_authentication($ccuname,$ccdomain,$formname);
+        $user_text{'auth'} =  &user_authentication($ccuname,$ccdomain,$formname,$crstype,$permission);
         if ((&Apache::lonnet::allowed('mpq',$ccdomain)) ||
             (&Apache::lonnet::allowed('mut',$ccdomain)) ||
             (&Apache::lonnet::allowed('udp',$ccdomain))) {
+            $user_text{'quota'} = '<br /><h3>'.&mt('User Tools').'</h3>'."\n".
+                                  &Apache::loncommon::start_data_table();
+            if ((&Apache::lonnet::allowed('mut',$ccdomain)) ||
+                (&Apache::lonnet::allowed('udp',$ccdomain))) {
+                $user_text{'quota'} .= &build_tools_display($ccuname,$ccdomain,'tools');
+            }
             # Current user has quota modification privileges
-            $user_text{'quota'} = &user_quotas($ccuname,$ccdomain);
+            if ((&Apache::lonnet::allowed('mpq',$ccdomain)) ||
+                (&Apache::lonnet::allowed('udp',$ccdomain))) {
+                $user_text{'quota'} .= &user_quotas($ccuname,$ccdomain,'portfolio');
+                $need_quota_js = 1;
+            }
+            $user_text{'quota'} .= &Apache::loncommon::end_data_table();
         }
         if (!&Apache::lonnet::allowed('mpq',$ccdomain)) {
             if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
                 my %lt=&Apache::lonlocal::texthash(
-                    'dska'  => "Disk quotas for user's portfolio and Authoring Space",
-                    'youd'  => "You do not have privileges to modify the portfolio and/or Authoring Space quotas for this user.",
+                    'dska'  => "Disk quotas for user's portfolio",
+                    'youd'  => "You do not have privileges to modify the portfolio quota for this user.",
                     'ichr'  => "If a change is required, contact a domain coordinator for the domain",
                 );
                 $user_text{'quota'} = <<ENDNOPORTPRIV;
@@ -1510,7 +1725,7 @@ ENDNOPORTPRIV
             if (&Apache::lonnet::allowed('mut',$env{'request.role.domain'})) {
                 my %lt=&Apache::lonlocal::texthash(
                     'utav'  => "User Tools Availability",
-                    'yodo'  => "You do not have privileges to modify Portfolio, Blog, WebDAV, or Personal Information Page settings for this user.",
+                    'yodo'  => "You do not have privileges to modify Portfolio, Blog, Personal Information Page, or Time Zone settings for this user.",
                     'ifch'  => "If a change is required, contact a domain coordinator for the domain",
                 );
                 $user_text{'tools'} = <<ENDNOTOOLSPRIV;
@@ -1591,7 +1806,7 @@ ENDNOTOOLSPRIV
                 if ($newuser) {
                     $r->print(' onclick="auth_check()" \>'."\n");
                 } else {
-                    $r->print('onclick="this.form.submit()" \>'."\n");
+                    $r->print(' onclick="this.form.submit()" \>'."\n");
                 }
             } else {
                 $r->print('</fieldset></div>'.
@@ -1608,6 +1823,9 @@ ENDNOTOOLSPRIV
     $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
     $r->print('<input type="hidden" name="currstate" value="" />');
     $r->print('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" /></form><br /><br />');
+    if ($need_quota_js) {
+        $r->print(&user_quota_js());
+    }
     return;
 }
 
@@ -1666,14 +1884,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))) {
@@ -2164,7 +2384,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(
@@ -2236,6 +2456,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;
@@ -2344,8 +2601,8 @@ sub modify_login_block {
 }
 
 sub personal_data_display {
-    my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,
-        $now,$captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded) = @_;
+    my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,$now,
+        $captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded,$showsubmit) = @_;
     my ($output,%userenv,%canmodify,%canmodify_status);
     my @userinfo = ('firstname','middlename','lastname','generation',
                     'permanentemail','id');
@@ -2455,8 +2712,8 @@ sub personal_data_display {
         }
         $rowcount ++;
         $output .= &Apache::lonhtmlcommon::row_closure(1);
-        my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="off" />';
-        my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="20" autocomplete="off" />';
+        my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="new-password" />';
+        my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="20" autocomplete="new-password" />';
         $output .= &Apache::lonhtmlcommon::row_title(&mt('Password').'<b>*</b>',
                                                     'LC_pick_box_title',
                                                     'LC_oddrow_value')."\n".
@@ -2470,10 +2727,11 @@ sub personal_data_display {
         if ($usernameset eq 'free') {
             my $onclick = "toggleUsernameDisp(this,'selfcreateusername');";
             $output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n".
-                       &mt('Use e-mail address: ').
-                       '<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'.&mt('Yes').'</label>'."\n".
-                       ('&nbsp;'x2).
-                       '<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'.&mt('No').'</label>'."\n".
+                       '<span class="LC_nobreak">'.&mt('Use e-mail address: ').
+                       '<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'.
+                       &mt('Yes').'</label>'.('&nbsp;'x2).
+                       '<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'.
+                       &mt('No').'</label></span>'."\n".
                        '<div id="selfcreateusername" style="display: none; font-size: smaller">'.
                        '<br /><span class="LC_nobreak">'.&mt('Preferred username').
                        '&nbsp;<input type="text" name="username" value="" size="20" autocomplete="off"/>'.
@@ -2581,12 +2839,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) {
@@ -2670,7 +2933,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
@@ -2806,9 +3069,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 @usertools = ('aboutme','blog','portfolio','timezone');
     my @requestcourses = ('official','unofficial','community','textbook');
     my @requestauthor = ('requestauthor');
+    my @authordefaults = ('webdav','editors');
     my ($othertitle,$usertypes,$types) = 
         &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
     my %canmodify_status =
@@ -2917,6 +3181,29 @@ sub update_user_data {
                                                     $newcustom{'requestauthor'},
                                                     \%changeHash,'requestauthor');
                 }
+                if ($env{'form.customeditors'} == 1) {
+                    my @editors;
+                    my @posseditors = &Apache::loncommon::get_env_multiple('form.custom_editor');
+                    if (@posseditors) {
+                        foreach my $editor (@posseditors) {
+                            if (grep(/^\Q$editor\E$/,@posseditors)) {
+                                unless (grep(/^\Q$editor\E$/,@editors)) {
+                                    push(@editors,$editor);
+                                }
+                            }
+                        }
+                    }
+                    if (@editors) {
+                        @editors = sort(@editors);
+                        $changed{'editors'} = &tool_admin('editors',join(',',@editors),
+                                                          \%changeHash,'authordefaults');
+                    }
+                }
+                if ($env{'form.customwebdav'} == 1) {
+                    $newcustom{'webdav'} = $env{'form.authordefaults_webdav'};
+                    $changed{'webdav'} = &tool_admin('webdav',$newcustom{'webdav'},
+                                                  \%changeHash,'authordefaults');
+                }
             }
             if ($canmodify_status{'inststatus'}) {
                 if (exists($env{'form.inststatus'})) {
@@ -2936,7 +3223,7 @@ sub update_user_data {
                                           $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 ''        )) {
@@ -2951,12 +3238,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);
@@ -2975,12 +3269,13 @@ 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',
+             'authoreditors','requestauthor',
              'requestcourses.official','requestcourses.unofficial',
              'requestcourses.community','requestcourses.textbook',
              'reqcrsotherdom.official','reqcrsotherdom.unofficial',
-             'reqcrsotherdom.community','reqcrsotherdom.textbook',
-             'requestauthor'],
+             'reqcrsotherdom.community','reqcrsotherdom.textbook'],
               $env{'form.ccdomain'},$env{'form.ccuname'});
         my ($tmp) = keys(%userenv);
         if ($tmp =~ /^(con_lost|error)/i) { 
@@ -3108,7 +3403,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');
         }
@@ -3136,6 +3431,7 @@ sub update_user_data {
         }
         if (&Apache::lonnet::allowed('cau',$env{'form.ccdomain'})) {
             $canshow{'requestauthor'} = 1;
+            $canshow{'authordefaults'} = 1;
         }
         my (%changeHash,%changed);
         if ($oldinststatus eq '') {
@@ -3244,8 +3540,14 @@ sub update_user_data {
             if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) {
                 &tool_changes('requestcourses',\@requestcourses,\%oldsettings,\%oldsettingstext,
                               \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
-                &tool_changes('requestauthor',\@requestauthor,\%oldsettings,\%oldsettingstext,
-                              \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
+                my ($isadv,$isauthor) =
+                    &Apache::lonnet::is_advanced_user($env{'form.ccdomain'},$env{'form.ccuname'});
+                unless ($isauthor) {
+                    &tool_changes('requestauthor',\@requestauthor,\%oldsettings,\%oldsettingstext,
+                                  \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
+                }
+                &tool_changes('authordefaults',\@authordefaults,\%oldsettings,\%oldsettingstext,
+                                  \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
             } else {
                 &tool_changes('reqcrsotherdom',\@requestcourses,\%oldsettings,\%oldsettingstext,
                               \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
@@ -3269,7 +3571,10 @@ sub update_user_data {
                 if ($chgresult eq 'ok') {
                     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')) {
@@ -3278,18 +3583,56 @@ sub update_user_data {
                                 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 ne 'quota') {
                                 $newenvhash{'environment.tools.'.$key} = 
@@ -3298,9 +3641,20 @@ 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);
                                 }
                             }
                         }
@@ -3308,6 +3662,10 @@ sub update_user_data {
                             &Apache::lonnet::appenv(\%newenvhash);
                         }
                     }
+                    if ($changed{'aboutme'}) {
+                        &Apache::loncommon::devalidate_aboutme_cache($env{'form.ccuname'},
+                                                                     $env{'form.ccdomain'});
+                    }
                 }
             }
             if (keys(%namechanged) > 0) {
@@ -3477,6 +3835,7 @@ sub display_userinfo {
          'webdav'         => 'WebDAV Availability',
          'aboutme'        => 'Personal Information Page Availability',
          'portfolio'      => 'Portfolio Availability',
+         'timezone'       => 'Can set own Time Zone',
          'official'       => 'Can Request Official Courses',
          'unofficial'     => 'Can Request Unofficial Courses',
          'community'      => 'Can Request Communities',
@@ -3484,7 +3843,11 @@ sub display_userinfo {
          'requestauthor'  => 'Can Request Author Role',
          'inststatus'     => "Affiliation",
          'prvs'           => 'Previous Value:',
-         'chto'           => 'Changed To:'
+         'chto'           => 'Changed To:',
+         'editors'        => "Available Editors in Authoring Space",
+         'edit'           => 'Standard editor (Edit)',
+         'xml'            => 'Text editor (EditXML)',
+         'daxe'           => 'Daxe editor (Daxe)',
     );
     if ($changed) {
         $r->print('<h3>'.$lt{'uic'}.'</h3>'.
@@ -3509,10 +3872,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','editors');
                     } else {
                         @items = @{$requestcourses};
                     }
@@ -3693,6 +4059,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;
@@ -3706,6 +4077,29 @@ 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 'webdav') {
+                $envkey = 'tools.webdav';
+                $newval = $env{'form.'.$context.'_'.$tool};
+            }
         } else {
             $newval = $env{'form.'.$context.'_'.$tool};
         }
@@ -3724,6 +4118,17 @@ sub tool_changes {
                 } else {
                     $oldaccesstext->{$tool} = &mt("availability set to 'off'");
                 }
+            } elsif ($context eq 'authordefaults') {
+                if ($tool eq 'editors') {
+                    $oldaccesstext->{$tool} = &mt('can use: [_1]',
+                                                  join(', ', map { $tooldesc{$_} } split(/,/,$userenv->{$envkey})));
+                } elsif ($tool eq 'webdav') {
+                    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'");
@@ -3750,6 +4155,17 @@ 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 'webdav') {
+                                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'");
@@ -3760,17 +4176,28 @@ 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 'webdav') {
+                                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'");
@@ -3801,6 +4228,17 @@ 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 'webdav') {
+                            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'");
@@ -3829,6 +4267,17 @@ 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 'webdav') {
+                            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'");
@@ -4323,6 +4772,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;
@@ -4333,6 +4786,10 @@ sub tool_admin {
             $toolchanged = 1;
             if ($tool eq 'requestauthor') {
                 $changeHash->{$context} = $settool;
+            } elsif ($tool eq 'editors') {
+                $changeHash->{'author'.$tool} = $settool;
+            } elsif ($tool eq 'webdav') {
+                $changeHash->{'tools.'.$tool} = $settool;
             } else {
                 $changeHash->{$context.'.'.$tool} = $settool;
             }
@@ -4620,7 +5077,7 @@ sub handler {
                 if (&Apache::lonnet::auto_run($cnum,$cdom) && (($permission->{'cusr'}) || ($permission->{'view'}))) {
                     push(@allhelp,'Course_Automated_Enrollment');
                 }
-                if ($permission->{'selfenrolladmin'}) {
+                if (($permission->{'selfenrolladmin'}) || ($permission->{'selfenrollview'})) {
                     push(@allhelp,'Course_Approve_Selfenroll');
                 }
             }
@@ -4862,7 +5319,7 @@ 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,$permission);
@@ -5160,8 +5617,9 @@ sub handler {
                      '<span class="LC_error">'.&mt('You do not have permission to modify dates or sections for users').'</span>'); 
         }
     } elsif ($env{'form.action'} eq 'selfenroll') {
-        if ($permission->{selfenrolladmin}) {
-            my %currsettings = (
+        my %currsettings;
+        if ($permission->{selfenrolladmin} || $permission->{selfenrollview}) {
+            %currsettings = (
                 selfenroll_types              => $env{'course.'.$cid.'.internal.selfenroll_types'},
                 selfenroll_registered         => $env{'course.'.$cid.'.internal.selfenroll_registered'},
                 selfenroll_section            => $env{'course.'.$cid.'.internal.selfenroll_section'},
@@ -5177,6 +5635,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",
@@ -5197,6 +5657,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>');
@@ -5240,7 +5710,8 @@ sub handler {
                      '<span class="LC_error">'.&mt('You do not have permission to view change logs').'</span>');
         }
     } elsif ($env{'form.action'} eq 'helpdesk') {
-        if (($permission->{'owner'}) || ($permission->{'co-owner'})) {
+        if (($permission->{'owner'} || $permission->{'co-owner'}) &&
+            ($permission->{'cusr'} || $permission->{'view'})) {
             if ($env{'form.state'} eq 'process') {
                 if ($permission->{'owner'}) {
                     &update_helpdeskaccess($r,$permission,$brcrum);
@@ -5667,7 +6138,8 @@ sub print_main_menu {
              icon => 'helpdesk-access.png',
              #help => 'Course_Helpdesk_Access',
              url => '/adm/createuser?action=helpdesk',
-             permission => ($permission->{'owner'} || $permission->{'co-owner'}),
+             permission => (($permission->{'owner'} || $permission->{'co-owner'}) &&
+                            ($permission->{'view'} || $permission->{'cusr'})),
              linktitle => 'Helpdesk access options',
             },
             {
@@ -5702,7 +6174,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.',
                     },
             );
@@ -5729,7 +6201,7 @@ 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.',
                 },
             );
@@ -5978,8 +6450,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') {
@@ -6524,6 +6995,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.',
@@ -6536,13 +7008,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>"');
@@ -7033,9 +7516,10 @@ ENDSCRIPT
     my ($nav_script,$nav_links);
 
 # table header
-    my $tableheader = '<h3>'.
+    my $heading = '<h3>'.
         &mt('User access logs for: [_1]',
-            &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).'</h3>'
+            &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>'
@@ -7153,7 +7637,7 @@ 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>');
     }
@@ -7342,12 +7826,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');
     } elsif ($context eq 'domain') {
         @posscontexts = ('any','domain','requestauthor','domconfig','server');
     } else {
         @posscontexts = ('any','author','domain');
-    } 
+    }
     foreach my $chgtype (@posscontexts) {
         my $selstr = '';
         if ($curr->{'chgcontext'} eq $chgtype) {
@@ -7391,6 +7875,7 @@ 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',
@@ -9160,7 +9645,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 {
@@ -9496,7 +9981,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') {