--- loncom/interface/loncreateuser.pm	2024/09/03 09:26:06	1.406.2.20.2.8
+++ loncom/interface/loncreateuser.pm	2017/08/11 00:24:53	1.446
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.406.2.20.2.8 2024/09/03 09:26:06 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.446 2017/08/11 00:24:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -70,9 +70,7 @@ 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;
@@ -82,7 +80,7 @@ my $authformfsys;
 my $authformloc;
 
 sub initialize_authen_forms {
-    my ($dom,$formname,$curr_authtype,$mode,$readonly) = @_;
+    my ($dom,$formname,$curr_authtype,$mode) = @_;
     my ($krbdef,$krbdefdom) = &Apache::loncommon::get_kerberos_defaults($dom);
     my %param = ( formname => $formname,
                   kerb_def_dom => $krbdefdom,
@@ -103,9 +101,6 @@ 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);
@@ -128,82 +123,14 @@ sub auth_abbrev {
 # ====================================================
 
 sub user_quotas {
-    my ($ccuname,$ccdomain,$name) = @_;
+    my ($ccuname,$ccdomain) = @_;
     my %lt = &Apache::lonlocal::texthash(
+                   'usrt'      => "User Tools",
                    'cust'      => "Custom quota",
                    'chqu'      => "Change quota",
     );
-    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";
+   
+    my $quota_javascript = <<"END_SCRIPT";
 <script type="text/javascript">
 // <![CDATA[
 function quota_changes(caller,context) {
@@ -227,65 +154,95 @@ 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');
+    }
 
-}
-
-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 %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};
                 }
             }
         }
-    }
-    return;
-}
-// ]]>
-</script>
-
-END_SCRIPT
+        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;
 }
 
 sub build_tools_display {
     my ($ccuname,$ccdomain,$context) = @_;
     my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay,
-        $colspan,$isadv,%domconfig,@defaulteditors,@customeditors,@custommanagers,
-        @possmanagers);
+        $colspan,$isadv,%domconfig);
     my %lt = &Apache::lonlocal::texthash (
                    'blog'       => "Personal User Blog",
                    'aboutme'    => "Personal Information Page",
-                   '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",
+                   'webdav'     => "WebDAV access to Authoring Spaces (if SSL and author/co-author)",
                    'portfolio'  => "Personal User Portfolio",
-                   'portaccess' => "Portfolio Shareable",
-                   'timezone'   => "Can set Time Zone",
                    'avai'       => "Available",
                    'cusa'       => "availability",
                    'chse'       => "Change setting",
@@ -295,88 +252,52 @@ sub build_tools_display {
                    'unofficial' => 'Can request creation of unofficial courses',
                    'community'  => 'Can request creation of communities',
                    'textbook'   => 'Can request creation of textbook courses',
+                   'placement'  => 'Can request creation of placement tests',
                    'requestauthor'  => 'Can request author space',
-                   'edit'       => 'Standard editor (Edit)',
-                   'xml'        => 'Text editor (EditXML)',
-                   'daxe'       => 'Daxe editor (Daxe)',
     );
-    $isadv = &Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
     if ($context eq 'requestcourses') {
         %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
                       'requestcourses.official','requestcourses.unofficial',
-                      'requestcourses.community','requestcourses.textbook');
-        @usertools = ('official','unofficial','community','textbook');
+                      'requestcourses.community','requestcourses.textbook',
+                      'requestcourses.placement');
+        @usertools = ('official','unofficial','community','textbook','placement');
         @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.timezone','tools.portaccess');
-        @usertools = ('aboutme','blog','portfolio','portaccess','timezone');
-        $colspan = ' colspan="2"';
+                          'tools.webdav');
+        @usertools = ('aboutme','blog','webdav','portfolio');
     }
     foreach my $item (@usertools) {
         my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off,
-            $currdisp,$custdisp,$custradio,$onclick,$customsty,$editorsty);
+            $currdisp,$custdisp,$custradio);
         $cust_off = 'checked="checked" ';
         $tool_on = 'checked="checked" ';
-        unless (($context eq 'authordefaults') || ($item eq 'webdav')) {
-            $curr_access =
-                &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
-                                                  $context,\%userenv,'',
-                                                  {'is_adv' => $isadv});
-        }
+        $curr_access =  
+            &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
+                                              $context);
         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 = '';
@@ -384,113 +305,37 @@ 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 {
-            my $current = $userenv{$context.'.'.$item};
-            if ($item eq 'webdav') {
-                $current = $userenv{'tools.webdav'};
-            } elsif ($item eq 'archive') {
-                $current = $userenv{'author'.$item};
-            }
-            if ($current eq '') {
+            if ($userenv{$context.'.'.$item} 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 ($current == 0) {
+                if ($userenv{$context.'.'.$item} == 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;
@@ -516,11 +361,6 @@ 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 '') {
@@ -531,7 +371,7 @@ sub build_tools_display {
             } else {
                 $currdisp = $reqdisplay{$curroption};
             }
-            $custdisp = '<fieldset id="customtext_'.$item.'"'.$customsty.'>';
+            $custdisp = '<table>';
             foreach my $option (@options) {
                 my $val = $option;
                 if ($option eq 'norequest') {
@@ -554,114 +394,53 @@ sub build_tools_display {
                         $checked = ' checked="checked"';
                     }
                 }
-                if ($option eq 'autolimit') {
-                    $custdisp .= '<br />';
+                my $name = 'crsreq_'.$item;
+                if ($context eq 'requestauthor') {
+                    $name = $item;
                 }
-                $custdisp .= '<span class="LC_nobreak"><label>'.
+                $custdisp .= '<tr><td><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.'" />&nbsp;'.
-                                 $reqtitles{'unlimited'}.'</span>';
+                                 'value="'.$currlimit.'" /></span><br />'.
+                                 $reqtitles{'unlimited'};
                 } else {
                     $custdisp .= '</span>';
                 }
-                $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 .= '</td></tr>';
             }
+            $custdisp .= '</table>';
+            $custradio = '</span></td><td>'.&mt('Custom setting').'<br />'.$custdisp;
         } else {
             $currdisp = ($curr_access?&mt('Yes'):&mt('No'));
             my $name = $context.'_'.$item;
-            $onclick = 'onclick="javascript:toggleCustom(this.form,'."'customtext_$item','custom$item'".');" ';
+            if ($context eq 'requestauthor') {
+                $name = $context;
+            }
             $custdisp = '<span class="LC_nobreak"><label>'.
                         '<input type="radio" name="'.$name.'"'.
-                        ' value="1" '.$tool_on.$onclick.'/>'.&mt('On').'</label>&nbsp;<label>'.
+                        ' value="1" '.$tool_on.'/>'.&mt('On').'</label>&nbsp;<label>'.
                         '<input type="radio" name="'.$name.'" value="0" '.
-                        $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 .=
+                        $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 .=
                    &Apache::loncommon::start_data_table_row()."\n".
-                   '<td><span class="LC_nobreak">'.
+                   '  <td style="vertical-align:top;"><span class="LC_nobreak">'.
                    $lt{'chse'}.': <label>'.
                    '<input type="radio" name="custom'.$item.'" value="0" '.
-                   $cust_off.$onclick.'/>'.$lt{'usde'}.'</label>'.('&nbsp;' x3).
+                   $cust_off.'/>'.$lt{'usde'}.'</label>'.('&nbsp;' x3).
                    '<label><input type="radio" name="custom'.$item.'" value="1" '.
-                   $cust_on.$onclick.'/>'.$lt{'uscu'}.'</label></span>';
-                if ($colspan) {
-                    $output .= '</td><td>';
-                }
-                $output .= $custradio.'</td>'.
-                           &Apache::loncommon::end_data_table_row()."\n";
-            }
+                   $cust_on.'/>'.$lt{'uscu'}.'</label>'.$custradio.'</td>'.
+                   &Apache::loncommon::end_data_table_row()."\n";
         }
     }
     return $output;
@@ -675,12 +454,14 @@ sub coursereq_externaluser {
                    'unofficial' => 'Can request creation of unofficial courses',
                    'community'  => 'Can request creation of communities',
                    'textbook'   => 'Can request creation of textbook courses',
+                   'placement'  => 'Can request creation of placement tests',
     );
 
     %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
                       'reqcrsotherdom.official','reqcrsotherdom.unofficial',
-                      'reqcrsotherdom.community','reqcrsotherdom.textbook');
-    @usertools = ('official','unofficial','community','textbook');
+                      'reqcrsotherdom.community','reqcrsotherdom.textbook',
+                      'reqcrsotherdom.placement');
+    @usertools = ('official','unofficial','community','textbook','placement');
     @options = ('approval','validate','autolimit');
     %validations = &Apache::lonnet::auto_courserequest_checks($cdom);
     my $optregex = join('|',@options);
@@ -747,7 +528,7 @@ sub coursereq_externaluser {
 sub domainrole_req {
     my ($ccuname,$ccdomain) = @_;
     return '<br /><h3>'.
-           &mt('Can Request Assignment of Domain Roles?').
+           &mt('User Can Request Assignment of Domain Roles?').
            '</h3>'."\n".
            &Apache::loncommon::start_data_table().
            &build_tools_display($ccuname,$ccdomain,
@@ -755,24 +536,13 @@ sub domainrole_req {
            &Apache::loncommon::end_data_table();
 }
 
-sub authoring_defaults {
-    my ($ccuname,$ccdomain) = @_;
-    return '<br /><h3>'.
-           &mt('Authoring Space defaults (if role assigned)').
-           '</h3>'."\n".
-           &Apache::loncommon::start_data_table().
-           &build_tools_display($ccuname,$ccdomain,
-                                'authordefaults').
-           &user_quotas($ccuname,$ccdomain,'author').
-           &Apache::loncommon::end_data_table();
-}
-
 sub courserequest_titles {
     my %titles = &Apache::lonlocal::texthash (
                                    official   => 'Official',
                                    unofficial => 'Unofficial',
                                    community  => 'Communities',
                                    textbook   => 'Textbook',
+                                   placement  => 'Placement Tests',
                                    norequest  => 'Not allowed',
                                    approval   => 'Approval by Dom. Coord.',
                                    validate   => 'With validation',
@@ -1116,7 +886,15 @@ ENDBLOCK
         (!(($env{'form.action'} eq 'singleuser') && ($context eq 'domain') &&
         (!&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))))) {
         my $defdom=$env{'request.role.domain'};
-        my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
+        my ($trusted,$untrusted);
+        if ($context eq 'course') {
+            ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$defdom);
+        } elsif ($context eq 'author') {
+            ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('othcoau',$defdom);
+        } elsif ($context eq 'domain') {
+            ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('domroles',$defdom); 
+        }
+        my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain',undef,undef,undef,$trusted,$untrusted);
         my %lt=&Apache::lonlocal::texthash(
                   'enro' => 'Enroll one student',
                   'enrm' => 'Enroll one member',
@@ -1477,9 +1255,8 @@ sub print_user_modification_page {
 
     my $groupslist = &Apache::lonuserutils::get_groupslist();
 
-    my $js = &validation_javascript($context,$ccdomain,$pjump_def,
-                                    $crstype,$groupslist,$newuser,
-                                    $formname,\%loaditem,$permission);
+    my $js = &validation_javascript($context,$ccdomain,$pjump_def,$crstype,
+                               $groupslist,$newuser,$formname,\%loaditem);
     my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$ccdomain);
     my $helpitem = 'Course_Change_Privileges';
     if ($env{'form.action'} eq 'singlestudent') {
@@ -1488,7 +1265,6 @@ 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)",
@@ -1513,33 +1289,6 @@ 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'));
-        }
-        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);
@@ -1577,36 +1326,18 @@ 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 /><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();
+            $portfolioform = '<br />'.&user_quotas($ccuname,$ccdomain);
         }
         if ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) &&
             ($ccdomain eq $env{'request.role.domain'})) {
-            $domroleform = &domainrole_req($ccuname,$ccdomain).
-                           &authoring_defaults($ccuname,$ccdomain);
-            $need_quota_js = 1;
-        }
-        my $readonly;
-        unless ($permission->{'cusr'}) {
-            $readonly = 1;
+            $domroleform = '<br />'.&domainrole_req($ccuname,$ccdomain);
         }
-        &initialize_authen_forms($ccdomain,$formname,'','',$readonly);
+        &initialize_authen_forms($ccdomain,$formname);
         my %lt=&Apache::lonlocal::texthash(
                 'lg'             => 'Login Data',
                 'hs'             => "Home Server",
@@ -1637,7 +1368,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},$readonly));
+                                         $inst_results{$ccuname.':'.$ccdomain}));
         # 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',
@@ -1652,7 +1383,7 @@ $lt{'hs'}: $home_server_pick
         }
         if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
             $r->print('<br /><h3>'.
-                      &mt('Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
+                      &mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
                       &Apache::loncommon::start_data_table().
                       &build_tools_display($ccuname,$ccdomain,
                                            'requestcourses').
@@ -1748,55 +1479,41 @@ 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('Can Request Creation of Courses/Communities in this Domain?').'</h3>'."\n".
+            $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'));
             } else {
-                $r->print(&coursereq_externaluser($ccuname,$ccdomain,
-                                                  $env{'request.role.domain'}));
+                if (&Apache::lonnet::will_trust('reqcrs',$ccdomain,$env{'request.role.domain'})) {
+                    $r->print(&coursereq_externaluser($ccuname,$ccdomain,
+                                                      $env{'request.role.domain'}));
+                }
             }
             $r->print(&Apache::loncommon::end_data_table());
         }
         $r->print('</div>');
-        my @order = ('auth','quota','tools','requestauthor','authordefaults');
+        my @order = ('auth','quota','tools','requestauthor');
         my %user_text;
         my ($isadv,$isauthor) = 
             &Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
-        if (((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) ||
+        if ((!$isauthor) && 
+            ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) ||
              (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) &&
-            ($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;
-            }
+             ($env{'request.role.domain'} eq $ccdomain)) {
+            $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);
         }
-        $user_text{'auth'} =  &user_authentication($ccuname,$ccdomain,$formname,$crstype,$permission);
+        $user_text{'auth'} =  &user_authentication($ccuname,$ccdomain,$formname);
         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
-            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();
+            $user_text{'quota'} = &user_quotas($ccuname,$ccdomain);
         }
         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",
-                    'youd'  => "You do not have privileges to modify the portfolio quota for this user.",
+                    '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.",
                     'ichr'  => "If a change is required, contact a domain coordinator for the domain",
                 );
                 $user_text{'quota'} = <<ENDNOPORTPRIV;
@@ -1809,7 +1526,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, Personal Information Page, or Time Zone settings for this user.",
+                    'yodo'  => "You do not have privileges to modify Portfolio, Blog, WebDAV, or Personal Information Page settings for this user.",
                     'ifch'  => "If a change is required, contact a domain coordinator for the domain",
                 );
                 $user_text{'tools'} = <<ENDNOTOOLSPRIV;
@@ -1890,7 +1607,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>'.
@@ -1907,9 +1624,6 @@ 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;
 }
 
@@ -1968,16 +1682,14 @@ sub date_sections_select {
 
 sub validation_javascript {
     my ($context,$ccdomain,$pjump_def,$crstype,$groupslist,$newuser,$formname,
-        $loaditem,$permission) = @_;
+        $loaditem) = @_;
     my $dc_setcourse_code = '';
     my $nondc_setsection_code = '';
     if ($context eq 'domain') {
-        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);
-        }
+        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))) {
@@ -2049,12 +1761,7 @@ 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') {
-                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'}));
-                }
+                next unless (($rnum eq $env{'user.name'}) && ($rdom eq $env{'request.role.domain'}));
             }
             my ($newkey,$newvalue,$newrole);
             $newkey = '/'.$rdom.'/'.$rnum;
@@ -2214,8 +1921,6 @@ 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;
             }
@@ -2318,9 +2023,6 @@ 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');
@@ -2362,25 +2064,13 @@ sub new_coauthor_roles {
     #
     # Co-Author
     #
-    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'};
+    if (&Apache::lonuserutils::authorpriv($env{'user.name'},
+                                          $env{'request.role.domain'}) &&
+        ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain)) {
         # No sense in assigning co-author role to yourself
-        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) {
+        $addrolesdisplay = 1;
+        my $cuname=$env{'user.name'};
+        my $cudom=$env{'request.role.domain'};
         my %lt=&Apache::lonlocal::texthash(
                     'cs'   => "Authoring Space",
                     'act'  => "Activate",
@@ -2435,17 +2125,6 @@ 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;;
 }
@@ -2466,11 +2145,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",
@@ -2501,7 +2189,7 @@ sub new_domain_roles {
 }
 
 sub user_authentication {
-    my ($ccuname,$ccdomain,$formname,$crstype,$permission) = @_;
+    my ($ccuname,$ccdomain,$formname) = @_;
     my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
     my $outcome;
     my %lt=&Apache::lonlocal::texthash(
@@ -2539,6 +2227,7 @@ $lt{'uuas'} ($currentauth). $lt{'adcs'}.
 ENDBADAUTH
         }
     } else { # Authentication type is valid
+        
         &initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser');
         my ($authformcurrent,$can_modify,@authform_others) =
             &modify_login_block($ccdomain,$currentauth);
@@ -2573,43 +2262,6 @@ 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;
@@ -2718,9 +2370,9 @@ sub modify_login_block {
 }
 
 sub personal_data_display {
-    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 ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,
+        $now,$captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded) = @_;
+    my ($output,%userenv,%canmodify,%canmodify_status);
     my @userinfo = ('firstname','middlename','lastname','generation',
                     'permanentemail','id');
     my $rowcount = 0;
@@ -2789,8 +2441,6 @@ 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');
@@ -2804,7 +2454,7 @@ sub personal_data_display {
             } else {
                 undef($condition);
             }
-        }
+        } 
         if ($excluded) {
             unless ($excluded =~ /^\@[^\@]+$/) {
                 undef($condition);
@@ -2831,8 +2481,8 @@ sub personal_data_display {
         }
         $rowcount ++;
         $output .= &Apache::lonhtmlcommon::row_closure(1);
-        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" />';
+        my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="off" />';
+        my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="20" autocomplete="off" />';
         $output .= &Apache::lonhtmlcommon::row_title(&mt('Password').'<b>*</b>',
                                                     'LC_pick_box_title',
                                                     'LC_oddrow_value')."\n".
@@ -2844,13 +2494,12 @@ sub personal_data_display {
                    $upasstwo.
                    &Apache::lonhtmlcommon::row_closure()."\n";
         if ($usernameset eq 'free') {
-            my $onclick = "toggleUsernameDisp(this,'selfcreateusername');";
+            my $onclick = "toggleUsernameDisp(this,'selfcreateusername');"; 
             $output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n".
-                       '<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".
+                       &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".
                        '<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"/>'.
@@ -2878,7 +2527,7 @@ sub personal_data_display {
                             $hiderow = 1;
                         }
                     } else {
-                        $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value=""'.$disabled.' />';
+                        $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
                     }
                 }
             } else {
@@ -2894,7 +2543,7 @@ sub personal_data_display {
                         $hiderow = 1;
                     }
                 } else {
-                    $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value=""'.$disabled.' />';
+                    $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
                 }
             }
         } else {
@@ -2958,17 +2607,12 @@ sub personal_data_display {
                        &Apache::lonhtmlcommon::row_closure(1); 
             $rowcount ++;
         }
-        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);
-        }
+        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);
     }
     $output .= &Apache::lonhtmlcommon::end_pick_box();
     if (wantarray) {
@@ -3052,7 +2696,7 @@ sub get_inststatuses {
 
 # ================================================================= Phase Three
 sub update_user_data {
-    my ($r,$context,$crstype,$brcrum,$showcredits,$permission) = @_; 
+    my ($r,$context,$crstype,$brcrum,$showcredits) = @_; 
     my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
                                           $env{'form.ccdomain'});
     # Error messages
@@ -3188,10 +2832,9 @@ sub update_user_data {
 
     my (%alerts,%rulematch,%inst_results,%curr_rules);
     my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
-    my @usertools = ('aboutme','blog','portfolio','portaccess','timezone');
-    my @requestcourses = ('official','unofficial','community','textbook');
+    my @usertools = ('aboutme','blog','webdav','portfolio');
+    my @requestcourses = ('official','unofficial','community','textbook','placement');
     my @requestauthor = ('requestauthor');
-    my @authordefaults = ('webdav','editors','archive');
     my ($othertitle,$usertypes,$types) = 
         &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
     my %canmodify_status =
@@ -3300,35 +2943,6 @@ sub update_user_data {
                                                     $newcustom{'requestauthor'},
                                                     \%changeHash,'requestauthor');
                 }
-                if ($env{'form.customeditors'} == 1) {
-                    my @editors;
-                    my @posseditors = &Apache::loncommon::get_env_multiple('form.custom_editor');
-                    if (@posseditors) {
-                        foreach my $editor (@posseditors) {
-                            if (grep(/^\Q$editor\E$/,@posseditors)) {
-                                unless (grep(/^\Q$editor\E$/,@editors)) {
-                                    push(@editors,$editor);
-                                }
-                            }
-                        }
-                    }
-                    if (@editors) {
-                        @editors = sort(@editors);
-                        $changed{'editors'} = &tool_admin('editors',join(',',@editors),
-                                                          \%changeHash,'authordefaults');
-                    }
-                }
-                if ($env{'form.customwebdav'} == 1) {
-                    $newcustom{'webdav'} = $env{'form.authordefaults_webdav'};
-                    $changed{'webdav'} = &tool_admin('webdav',$newcustom{'webdav'},
-                                                     \%changeHash,'authordefaults');
-                }
-                if ($env{'form.customarchive'} == 1) {
-                    $newcustom{'archive'} = $env{'form.authordefaults_archive'};
-                    $changed{'archive'} = &tool_admin('archive',$newcustom{'archive'},
-                                                      \%changeHash,'authordefaults');
-
-                }
             }
             if ($canmodify_status{'inststatus'}) {
                 if (exists($env{'form.inststatus'})) {
@@ -3348,7 +2962,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 ''        )) {
@@ -3363,19 +2977,12 @@ 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 privileges to modify the authentication configuration for this user.').$end);    
+	    $r->print($error.&mt('You do not have the authority to modify this users authentication information.').$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);
@@ -3394,24 +3001,17 @@ 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.timezone','tools.portaccess',
-             'authormanagers','authoreditors','authorarchive','requestauthor',
+             'tools.aboutme','tools.blog','tools.webdav','tools.portfolio',
              'requestcourses.official','requestcourses.unofficial',
              'requestcourses.community','requestcourses.textbook',
              'reqcrsotherdom.official','reqcrsotherdom.unofficial',
              'reqcrsotherdom.community','reqcrsotherdom.textbook',
-             'domcoord.author'], 
+             'reqcrsotherdom.placement','requestauthor'],
               $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 =
@@ -3534,7 +3134,7 @@ sub update_user_data {
             %oldsettingstatus,%newsettingstatus);
         @disporder = ('inststatus');
         if ($env{'request.role.domain'} eq $env{'form.ccdomain'}) {
-            push(@disporder,('requestcourses','requestauthor','authordefaults'));
+            push(@disporder,'requestcourses','requestauthor');
         } else {
             push(@disporder,'reqcrsotherdom');
         }
@@ -3562,7 +3162,6 @@ sub update_user_data {
         }
         if (&Apache::lonnet::allowed('cau',$env{'form.ccdomain'})) {
             $canshow{'requestauthor'} = 1;
-            $canshow{'authordefaults'} = 1;
         }
         my (%changeHash,%changed);
         if ($oldinststatus eq '') {
@@ -3671,14 +3270,8 @@ sub update_user_data {
             if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) {
                 &tool_changes('requestcourses',\@requestcourses,\%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);
+                &tool_changes('requestauthor',\@requestauthor,\%oldsettings,\%oldsettingstext,
+                              \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
             } else {
                 &tool_changes('reqcrsotherdom',\@requestcourses,\%oldsettings,\%oldsettingstext,
                               \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
@@ -3696,134 +3289,34 @@ 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,$got_domdefs,%domdefaults,$got_userenv,
-                            %userenv);
-                        my @fromenv = keys(%changed);
-                        push(@fromenv,'inststatus');
+                        my %newenvhash;
                         foreach my $key (keys(%changed)) {
-                            if (($key eq 'official') || ($key eq 'unofficial')
-                                || ($key eq 'community') || ($key eq 'textbook')) {
+                            if (($key eq 'official') || ($key eq 'unofficial') ||
+                                ($key eq 'community') || ($key eq 'textbook') ||
+                                ($key eq 'placement')) {
                                 $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',\%userenv,\%domdefaults);
+                                            $key,'reload','requestcourses');
                                 }
                             } 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',\%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'};
+                                            $key,'reload','requestauthor');
                                 }
                             } elsif ($key ne 'quota') {
                                 $newenvhash{'environment.tools.'.$key} = 
@@ -3832,37 +3325,15 @@ 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',\%userenv,\%domdefaults);
+          $key,'reload','tools');
                                 }
                             }
                         }
                         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'});
                     }
                 }
             }
@@ -3894,7 +3365,7 @@ sub update_user_data {
                                   \%newsettingstext);
                 if ($env{'form.cid'} ne $userenv{'id'}) {
                     &Apache::lonnet::idput($env{'form.ccdomain'},
-                         {$env{'form.ccuname'} => $env{'form.cid'}});
+                         {$env{'form.ccuname'} => $env{'form.cid'}},$uhome,'ids');
                     if (($recurseid) &&
                         (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
                         my $idresult = 
@@ -4033,22 +3504,15 @@ 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',
          'requestauthor'  => 'Can Request Author Role',
          'inststatus'     => "Affiliation",
          'prvs'           => 'Previous Value:',
-         '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)',
+         'chto'           => 'Changed To:'
     );
     if ($changed) {
         $r->print('<h3>'.$lt{'uic'}.'</h3>'.
@@ -4073,13 +3537,10 @@ sub display_userinfo {
         }
         foreach my $entry (@{$order}) {
             if ($canshow->{$entry}) {
-                if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom') ||
-                    ($entry eq 'requestauthor') || ($entry eq 'authordefaults')) {
+                if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom') || ($entry eq 'requestauthor')) {
                     my @items;
                     if ($entry eq 'requestauthor') {
                         @items = ($entry);
-                    } elsif ($entry eq 'authordefaults') {
-                        @items = ('webdav','managers','editors','archive');
                     } else {
                         @items = @{$requestcourses};
                     }
@@ -4087,27 +3548,19 @@ 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><td>\n");
-                            unless ($item eq 'managers') {
-                                $r->print($oldsetting->{$item});
-                            }
+                            $r->print("<td>$lt{$item}</td>\n");
+                            $r->print("<td>".$oldsetting->{$item});
                             if ($oldsettingtext->{$item}) {
                                 if ($oldsetting->{$item}) {
-                                    unless ($item eq 'managers') {
-                                        $r->print(' -- ');
-                                    }
+                                    $r->print(' -- ');
                                 }
                                 $r->print($oldsettingtext->{$item});
                             }
-                            $r->print("</td>\n<td>");
-                            unless ($item eq 'managers') {
-                                $r->print($newsetting->{$item});
-                            }
+                            $r->print("</td>\n");
+                            $r->print("<td>".$newsetting->{$item});
                             if ($newsettingtext->{$item}) {
                                 if ($newsetting->{$item}) {
-                                    unless ($item eq 'managers') {
-                                        $r->print(' -- ');
-                                    }
+                                    $r->print(' -- ');
                                 }
                                 $r->print($newsettingtext->{$item});
                             }
@@ -4268,11 +3721,6 @@ 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;
@@ -4286,54 +3734,6 @@ 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};
         }
@@ -4352,25 +3752,6 @@ 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'");
@@ -4379,8 +3760,7 @@ sub tool_changes {
                 }
             }
             $changeHash->{$envkey} = $userenv->{$envkey};
-            if (($env{'form.custom'.$tool} == 1) ||
-                (($context eq 'authordefaults') && ($tool eq 'managers') && ($newval ne ''))) {
+            if ($env{'form.custom'.$tool} == 1) {
                 if ($newval ne $userenv->{$envkey}) {
                     $changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
                                                     $context);
@@ -4398,25 +3778,6 @@ 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'");
@@ -4427,36 +3788,17 @@ sub tool_changes {
                     } else {
                         $newaccess->{$tool} = $oldaccess->{$tool};
                         if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
-                            if ($userenv->{$envkey} =~ /^autolimit/) {
+                            if ($newval =~ /^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 ($userenv->{$envkey}) {
-                                $newaccesstext->{$tool} = $reqdisplay{$userenv->{$envkey}};
+                            } elsif ($newval) {
+                                $newaccesstext->{$tool} = $reqdisplay{$newval};
                             } 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'");
@@ -4487,25 +3829,6 @@ 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 ($newval) {
-                                $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'");
@@ -4517,8 +3840,7 @@ sub tool_changes {
             }
         } else {
             $oldaccess->{$tool} = &mt('default');
-            if (($env{'form.custom'.$tool} == 1) ||
-                (($context eq 'authordefaults') && ($tool eq 'managers') && ($newval ne ''))) {
+            if ($env{'form.custom'.$tool} == 1) {
                 $changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
                                                 $context);
                 if ($changed->{$tool}) {
@@ -4535,25 +3857,6 @@ 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'");
@@ -5048,10 +4351,6 @@ 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;
@@ -5062,10 +4361,6 @@ 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;
             }
@@ -5308,164 +4603,6 @@ sub set_custom_role {
     );
 }
 
-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;
@@ -5481,17 +4618,12 @@ sub handler {
         $crstype = &Apache::loncommon::course_type();
     } elsif ($env{'request.role'} =~ /^au\./) {
         $context = 'author';
-    } elsif ($env{'request.role'} =~ m{^(ca|aa)\./$match_domain/$match_username$}) {
-        $context = 'coauthor';
     } else {
         $context = 'domain';
     }
 
     my ($permission,$allowed) =
         &Apache::lonuserutils::get_permission($context,$crstype);
-    if (($context eq 'coauthor') && ($allowed)) {
-        $context = 'author';
-    }
 
     if ($allowed) {
         my @allhelp;
@@ -5516,7 +4648,7 @@ sub handler {
                 if (&Apache::lonnet::auto_run($cnum,$cdom) && (($permission->{'cusr'}) || ($permission->{'view'}))) {
                     push(@allhelp,'Course_Automated_Enrollment');
                 }
-                if (($permission->{'selfenrolladmin'}) || ($permission->{'selfenrollview'})) {
+                if ($permission->{'selfenrolladmin'}) {
                     push(@allhelp,'Course_Approve_Selfenroll');
                 }
             }
@@ -5529,13 +4661,6 @@ sub handler {
         } elsif ($context eq 'author') {
             push(@allhelp,('Author_Change_Privileges','Author_Create_Coauthor_List',
                            'Author_View_Coauthor_List','Author_User_Logs'));
-        } elsif ($context eq 'coauthor') {
-            if ($permission->{'cusr'}) {
-                push(@allhelp,('Author_Change_Privileges','Author_Create_Coauthor_List',
-                               'Author_View_Coauthor_List','Author_User_Logs'));
-            } elsif ($permission->{'view'}) {
-                push(@allhelp,'Author_View_Coauthor_List');
-            }
         } else {
             if ($permission->{'cusr'}) {
                 push(@allhelp,'Domain_Change_Privileges');
@@ -5562,8 +4687,7 @@ sub handler {
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
         ['action','state','callingform','roletype','showrole','bulkaction','popup','phase',
-         'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue',
-         'forceedit']);
+         'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue']);
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     my $args;
     my $brcrum = [];
@@ -5578,9 +4702,6 @@ sub handler {
         if ($context eq 'course') {
             $r->internal_redirect('/adm/viewclasslist');
             return OK;
-        } elsif ($context eq 'coauthor') {
-            $r->internal_redirect('/adm/viewcoauthors');
-            return OK;
         }
         $env{'user.error.msg'}=
             "/adm/createuser:cst:0:0:Cannot create/modify user data ".
@@ -5629,41 +4750,16 @@ sub handler {
         if (! exists($env{'form.state'})) {
             &Apache::lonuserutils::print_first_users_upload_form($r,$context);
         } elsif ($env{'form.state'} eq 'got_file') {
-            my $result =
-                &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);
-            }
+            &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission,
+                                                             $crstype,$showcredits);
         } elsif ($env{'form.state'} eq 'enrolling') {
             if ($env{'form.datatoken'}) {
-                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);
+                &Apache::lonuserutils::upfile_drop_add($r,$context,$permission,
+                                                       $showcredits);
             }
         } 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'})) ||
@@ -5769,7 +4865,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,$permission);
+            &update_user_data($r,$context,$crstype,$brcrum,$showcredits);
         } else {
             &print_username_entry_form($r,$context,undef,$srch,undef,$crstype,
                                        $brcrum,$permission);
@@ -5943,7 +5039,7 @@ sub handler {
                                               &Apache::lonhtmlcommon::row_closure(1));
                                 }
                             }
-                            if ($pickstart) {
+                            if ($pickstart) { 
                                 $r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>');
                             } else {
                                 $r->print('<div>'.&mt('No information to display for this account request.').'</div>');
@@ -6067,9 +5163,8 @@ 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') {
-        my %currsettings;
-        if ($permission->{selfenrolladmin} || $permission->{selfenrollview}) {
-            %currsettings = (
+        if ($permission->{selfenrolladmin}) {
+            my %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'},
@@ -6085,8 +5180,6 @@ 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",
@@ -6107,16 +5200,6 @@ 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>');
@@ -6160,8 +5243,7 @@ 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'}) &&
-            ($permission->{'cusr'} || $permission->{'view'})) {
+        if (($permission->{'owner'}) || ($permission->{'co-owner'})) {
             if ($env{'form.state'} eq 'process') {
                 if ($permission->{'owner'}) {
                     &update_helpdeskaccess($r,$permission,$brcrum);
@@ -6175,85 +5257,6 @@ sub handler {
             $r->print(&header(undef,{'no_nav_bar' => 1}).
                       '<span class="LC_error">'.&mt('You do not have permission to view helpdesk access').'</span>');
         }
-    } elsif ($env{'form.action'} eq '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,
@@ -6360,15 +5363,6 @@ 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') {
@@ -6454,15 +5448,6 @@ 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;
 }
@@ -6644,6 +5629,7 @@ sub print_main_menu {
                                           groups => 'Community Groups',
                                         },
                        );
+        $linktext{'Placement'} = $linktext{'Course'};
 
         my %linktitle = (
             'Course' => {
@@ -6658,6 +5644,8 @@ sub print_main_menu {
                            },
         );
 
+        $linktitle{'Placement'} = $linktitle{'Course'};
+
         push(@{ $menu[0]->{items} }, #Category: Single Users
             {   
              linktext => $linktext{$crstype}{'single'},
@@ -6685,8 +5673,7 @@ sub print_main_menu {
              icon => 'helpdesk-access.png',
              #help => 'Course_Helpdesk_Access',
              url => '/adm/createuser?action=helpdesk',
-             permission => (($permission->{'owner'} || $permission->{'co-owner'}) &&
-                            ($permission->{'view'} || $permission->{'cusr'})),
+             permission => ($permission->{'owner'} || $permission->{'co-owner'}),
              linktitle => 'Helpdesk access options',
             },
             {
@@ -6721,7 +5708,7 @@ sub print_main_menu {
                      icon => 'selfenrl-queue.png',
                      #help => 'Course_Approve_Selfenroll',
                      url => '/adm/createuser?action=selfenrollqueue',
-                     permission => $permission->{'selfenrolladmin'} || $permission->{'selfenrollview'},
+                     permission => $permission->{'selfenrolladmin'},
                      linktitle =>'Approve or reject enrollment requests.',
                     },
             );
@@ -6748,33 +5735,12 @@ sub print_main_menu {
                  icon => 'self_enroll.png',
                  #help => 'Course_Self_Enrollment',
                  url => '/adm/createuser?action=selfenroll',
-                 permission => $permission->{'selfenrolladmin'} || $permission->{'selfenrollview'},
+                 permission => $permission->{'selfenrolladmin'},
                  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',
@@ -6784,22 +5750,6 @@ 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',
-            },
         );
     }
     return Apache::lonhtmlcommon::generate_menu(@menu);
@@ -7034,7 +5984,8 @@ ENDSCRIPT
                  '// ]]>'."\n".
                  '</script>'."\n".
                  '<h3>'.$lt->{'selfenroll'}.'</h3>'."\n";
-    my $visactions = &cat_visibility($cdom);
+ 
+    my $visactions = &cat_visibility();
     my ($cathash,%cattype);
     my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
     if (ref($domconfig{'coursecategories'}) eq 'HASH') {
@@ -7197,10 +6148,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();
@@ -7579,7 +6531,6 @@ 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.',
@@ -7592,24 +6543,13 @@ 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 catalog display of "Official courses (with institutional codes)".',
+                   dc_addinst => 'Ask a domain coordinator to enable display the catalog 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>"');
@@ -7735,11 +6675,9 @@ 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);
             }
@@ -8102,10 +7040,9 @@ ENDSCRIPT
     my ($nav_script,$nav_links);
 
 # table header
-    my $heading = '<h3>'.
+    my $tableheader = '<h3>'.
         &mt('User access logs for: [_1]',
-            &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).'</h3>';
-    my $tableheader = $heading
+            &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).'</h3>'
        .&Apache::loncommon::start_data_table_header_row()
        .'<th>&nbsp;</th>'
        .'<th>'.&mt('When').'</th>'
@@ -8223,7 +7160,7 @@ ENDSCRIPT
         $r->print(&Apache::loncommon::end_data_table().
                   &userlogdisplay_navlinks(\%curr,$more_records));
     } else { # No content displayed above
-        $r->print($heading.'<p class="LC_info">'
+        $r->print('<p class="LC_info">'
                  .&mt('There are no records to display.')
                  .'</p>');
     }
@@ -8412,12 +7349,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','chgtype');
+        @posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses');
     } elsif ($context eq 'domain') {
         @posscontexts = ('any','domain','requestauthor','domconfig','server');
     } else {
-        @posscontexts = ('any','author','coauthor','domain');
-    }
+        @posscontexts = ('any','author','domain');
+    } 
     foreach my $chgtype (@posscontexts) {
         my $selstr = '';
         if ($curr->{'chgcontext'} eq $chgtype) {
@@ -8461,7 +7398,6 @@ 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',
@@ -8487,7 +7423,6 @@ sub rolechg_contexts {
                                              any    => 'Any',
                                              domain => 'User Management in domain',
                                              author => 'User Management by author',
-                                             coauthor => 'User Management by coauthor',
                                          );
     } 
     return %lt;
@@ -9527,7 +8462,7 @@ sub user_search_result {
             my $domd_chk = &domdirectorysrch_check($srch);
             $response .= '<span class="LC_warning">'.$instd_chk.'</span><br />';
             if ($domd_chk eq 'ok') {
-                $response .= &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.');
+                $response .= &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.');
             }
             $response .= '<br />';
         }
@@ -9538,7 +8473,7 @@ sub user_search_result {
                 my $instd_chk = &instdirectorysrch_check($srch);
                 $response .= '<span class="LC_warning">'.$domd_chk.'</span><br />';
                 if ($instd_chk eq 'ok') {
-                    $response .= &mt('You may want to search in the institutional directory instead of the LON-CAPA domain.');
+                    $response .= &mt('You may want to search in the institutional directory instead of in the LON-CAPA domain.');
                 }
                 $response .= '<br />';
             }
@@ -9639,7 +8574,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 />'; 
             }
         }
@@ -9712,7 +8647,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 />';
             }
         }
@@ -10232,7 +9167,7 @@ sub course_level_dc {
 ENDTIMEENTRY
     $otheritems .= &Apache::loncommon::end_data_table_row().
                    &Apache::loncommon::end_data_table()."\n";
-    return $cb_jscript.$hiddenitems.$header.$otheritems;
+    return $cb_jscript.$header.$hiddenitems.$otheritems;
 }
 
 sub update_selfenroll_config {
@@ -10568,7 +9503,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($cdom);
+    my $visactions = &cat_visibility();
     my ($cathash,%cattype);
     my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
     if (ref($domconfig{'coursecategories'}) eq 'HASH') {