--- loncom/interface/loncreateuser.pm	2017/01/21 23:30:18	1.406.2.9
+++ loncom/interface/loncreateuser.pm	2016/02/17 19:15:48	1.408
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.406.2.9 2017/01/21 23:30:18 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.408 2016/02/17 19:15:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -160,8 +160,7 @@ END_SCRIPT
                  '<h3>'.$lt{'usrt'}.'</h3>'."\n".
                  &Apache::loncommon::start_data_table();
 
-    if ((&Apache::lonnet::allowed('mut',$ccdomain)) ||
-        (&Apache::lonnet::allowed('udp',$ccdomain))) {
+    if (&Apache::lonnet::allowed('mut',$ccdomain)) {
         $output .= &build_tools_display($ccuname,$ccdomain,'tools');
     }
 
@@ -266,7 +265,7 @@ sub build_tools_display {
         $colspan = ' colspan="2"';
         %domconfig =
             &Apache::lonnet::get_dom('configuration',['requestcourses'],$ccdomain);
-        $isadv = &Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
+        $isadv = &Apache::lonnet::is_advanced_user($ccuname,$ccdomain);
     } elsif ($context eq 'requestauthor') {
         %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
                                                     'requestauthor');
@@ -427,9 +426,7 @@ sub build_tools_display {
         }
         $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::end_data_table_row()."\n".
                    &Apache::loncommon::start_data_table_row()."\n".
                    '  <td style="vertical-align:top;"><span class="LC_nobreak">'.
                    $lt{'chse'}.': <label>'.
@@ -438,7 +435,6 @@ sub build_tools_display {
                    '<label><input type="radio" name="custom'.$item.'" value="1" '.
                    $cust_on.'/>'.$lt{'uscu'}.'</label>'.$custradio.'</td>'.
                    &Apache::loncommon::end_data_table_row()."\n";
-        }
     }
     return $output;
 }
@@ -670,10 +666,8 @@ sub print_username_entry_form {
         $helpitem = 'Course_Editing_Custom_Roles';
     } elsif ($env{'form.action'} eq 'singlestudent') {
         $helpitem = 'Course_Add_Student';
-    } elsif ($env{'form.action'} eq 'accesslogs') {
-        $helpitem = 'Domain_User_Access_Logs';
     }
-    my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$defdom);
+    my %breadcrumb_text = &singleuser_breadcrumb($crstype);
     if ($env{'form.action'} eq 'custom') {
         push(@{$brcrum},
                  {href=>"javascript:backPage(document.crtuser)",       
@@ -701,8 +695,6 @@ sub print_username_entry_form {
                     'srst' => 'Search for a user and enroll as a student',
                     'srme' => 'Search for a user and enroll as a member',
                     'srad' => 'Search for a user and modify/add user information or roles',
-                    'srvu' => 'Search for a user and view user information and roles',
-                    'srva' => 'Search for a user and view access log information',
 		    'usr'  => "Username",
                     'dom'  => "Domain",
                     'ecrp' => "Define or Edit Custom Role",
@@ -755,20 +747,12 @@ sub print_username_entry_form {
             } else {
                 $actiontext = $lt{'srst'};
             }
-        } elsif ($env{'form.action'} eq 'accesslogs') {
-            $actiontext = $lt{'srva'};
-        } elsif (($env{'form.action'} eq 'singleuser') &&
-                 ($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$defdom))) {
-            $actiontext = $lt{'srvu'};
         }
         $r->print("<h3>$actiontext</h3>");
         if ($env{'form.origform'} ne 'crtusername') {
-            if ($response) {
-               $r->print("\n<div>$response</div>".
-                         '<br clear="all" />');
-            }
+            $r->print("\n".$response);
         }
-        $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,1));
+        $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype));
     }
 }
 
@@ -811,7 +795,7 @@ END
 }
 
 sub entry_form {
-    my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype,$fixeddom) = @_;
+    my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype) = @_;
     my ($usertype,$inexact);
     if (ref($srch) eq 'HASH') {
         if (($srch->{'srchin'} eq 'dom') &&
@@ -829,20 +813,16 @@ sub entry_form {
     }
     my $cancreate =
         &Apache::lonuserutils::can_create_user($dom,$context,$usertype);
-    my ($userpicker,$cansearch) = 
+    my $userpicker = 
        &Apache::loncommon::user_picker($dom,$srch,$forcenewuser,
-                                       'document.crtuser',$cancreate,$usertype,$context,$fixeddom);
+                                       'document.crtuser',$cancreate,$usertype);
     my $srchbutton = &mt('Search');
     if ($env{'form.action'} eq 'singlestudent') {
         $srchbutton = &mt('Search and Enroll');
-    } elsif ($env{'form.action'} eq 'accesslogs') {
-        $srchbutton = &mt('Search');
     } elsif ($cancreate && $responsemsg ne '' && $inexact) {
         $srchbutton = &mt('Search or Add New User');
     }
-    my $output;
-    if ($cansearch) {
-        $output = <<"ENDBLOCK";
+    my $output = <<"ENDBLOCK";
 <form action="/adm/createuser" method="post" name="crtuser">
 <input type="hidden" name="action" value="$env{'form.action'}" />
 <input type="hidden" name="phase" value="get_user_info" />
@@ -850,12 +830,7 @@ $userpicker
 <input name="userrole" type="button" value="$srchbutton" onclick="javascript:validateEntry(document.crtuser)" />
 </form>
 ENDBLOCK
-    } else {
-        $output = '<p>'.$userpicker.'</p>';
-    }
-    if (($env{'form.phase'} eq '') && ($env{'form.action'} ne 'accesslogs') &&
-        (!(($env{'form.action'} eq 'singleuser') && ($context eq 'domain') &&
-        (!&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))))) {
+    if ($env{'form.phase'} eq '') {
         my $defdom=$env{'request.role.domain'};
         my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
         my %lt=&Apache::lonlocal::texthash(
@@ -971,13 +946,9 @@ ENDSCRIPT
                                        'usrch'          => "User Search to add/modify roles",
                                        'stusrch'        => "User Search to enroll student",
                                        'memsrch'        => "User Search to enroll member",
-                                       'srcva'          => "Search for a user and view access log information",
-                                       'usrvu'          => "User Search to view user roles",
                                        'usel'           => "Select a user to add/modify roles",
-                                       'suvr'           => "Select a user to view roles",
                                        'stusel'         => "Select a user to enroll as a student",
                                        'memsel'         => "Select a user to enroll as a member",
-                                       'vacsel'         => "Select a user to view access log",
                                        'username'       => "username",
                                        'domain'         => "domain",
                                        'lastname'       => "last name",
@@ -987,7 +958,7 @@ ENDSCRIPT
     if ($context eq 'requestcrs') {
         $r->print('<div>');
     } else {
-        my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$srch->{'srchdomain'});
+        my %breadcrumb_text = &singleuser_breadcrumb($crstype);
         my $helpitem;
         if ($env{'form.action'} eq 'singleuser') {
             $helpitem = 'Course_Change_Privileges';
@@ -1007,19 +978,9 @@ ENDSCRIPT
                   );
         $r->print(&Apache::loncommon::start_page('User Management',$jscript,{bread_crumbs => $brcrum}));
         if ($env{'form.action'} eq 'singleuser') {
-            my $readonly;
-            if (($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$srch->{'srchdomain'}))) {
-                $readonly = 1;
-                $r->print("<b>$lt{'usrvu'}</b><br />");
-            } else {
-                $r->print("<b>$lt{'usrch'}</b><br />");
-            }
+            $r->print("<b>$lt{'usrch'}</b><br />");
             $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype));
-            if ($readonly) {
-                $r->print('<h3>'.$lt{'suvr'}.'</h3>');
-            } else {
-                $r->print('<h3>'.$lt{'usel'}.'</h3>');
-            }
+            $r->print('<h3>'.$lt{'usel'}.'</h3>');
         } elsif ($env{'form.action'} eq 'singlestudent') {
             $r->print($jscript."<b>");
             if ($crstype eq 'Community') {
@@ -1036,10 +997,6 @@ ENDSCRIPT
                 $r->print($lt{'stusel'});
             }
             $r->print('</h3>');
-        } elsif ($env{'form.action'} eq 'accesslogs') {
-            $r->print("<b>$lt{'srcva'}</b><br />");
-            $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,'accesslogs',undef,undef,1));
-            $r->print('<h3>'.$lt{'vacsel'}.'</h3>');
         }
     }
     $r->print('<form name="usersrchform" method="post" action="">'.
@@ -1158,15 +1115,10 @@ sub print_user_modification_page {
             }
             $response .= '<p class="LC_warning">'
                         .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.")
-                        .' ';
-            if ($context eq 'domain') {
-                $response .= &mt('Please contact a [_1] for assistance.',
-                                 &Apache::lonnet::plaintext('dc'));
-            } else {
-                $response .= &mt('Please contact the [_1]helpdesk[_2] for assistance.'
-                                ,'<a href="'.$helplink.'">','</a>');
-            }
-            $response .= '</p><br />';
+                        .' '
+                        .&mt('Please contact the [_1]helpdesk[_2] for assistance.'
+                            ,'<a href="'.$helplink.'">','</a>')
+                        .'</p><br />';
             $env{'form.phase'} = '';
             &print_username_entry_form($r,$context,$response,undef,undef,$crstype,$brcrum);
             return;
@@ -1213,7 +1165,7 @@ sub print_user_modification_page {
 
     my $js = &validation_javascript($context,$ccdomain,$pjump_def,$crstype,
                                $groupslist,$newuser,$formname,\%loaditem);
-    my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$ccdomain);
+    my %breadcrumb_text = &singleuser_breadcrumb($crstype);
     my $helpitem = 'Course_Change_Privileges';
     if ($env{'form.action'} eq 'singlestudent') {
         $helpitem = 'Course_Add_Student';
@@ -1417,20 +1369,14 @@ ENDAUTH
                                  '"'.$ccuname.'"','"'.$ccdomain.'"');
             }
         } else {
-            if ($permission->{'cusr'}) {
-                $title = &mt('Modify existing user: [_1] in domain [_2]',
+            $title = &mt('Modify existing user: [_1] in domain [_2]',
                              '"'.$ccuname.'"','"'.$ccdomain.'"');
-            } else {
-                $title = &mt('Existing user: [_1] in domain [_2]',
-                             '"'.$ccuname.'"','"'.$ccdomain.'"');
-            }
         }
         $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}));
-        if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) ||
-            (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) {
+        if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
             $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
                       &Apache::loncommon::start_data_table());
             if ($env{'request.role.domain'} eq $ccdomain) {
@@ -1445,17 +1391,15 @@ ENDAUTH
         my @order = ('auth','quota','tools','requestauthor');
         my %user_text;
         my ($isadv,$isauthor) = 
-            &Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
+            &Apache::lonnet::is_advanced_user($ccuname,$ccdomain);
         if ((!$isauthor) && 
-            ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) ||
-             (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) &&
-             ($env{'request.role.domain'} eq $ccdomain)) {
+            (&Apache::lonnet::allowed('cau',$env{'request.role.domain'}))
+            && ($env{'request.role.domain'} eq $ccdomain)) {
             $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);
         }
         $user_text{'auth'} =  &user_authentication($ccuname,$ccdomain,$formname);
         if ((&Apache::lonnet::allowed('mpq',$ccdomain)) ||
-            (&Apache::lonnet::allowed('mut',$ccdomain)) ||
-            (&Apache::lonnet::allowed('udp',$ccdomain))) {
+            (&Apache::lonnet::allowed('mut',$ccdomain))) {
             # Current user has quota modification privileges
             $user_text{'quota'} = &user_quotas($ccuname,$ccdomain);
         }
@@ -1513,18 +1457,9 @@ ENDNOTOOLSPRIV
         if ($gotdiv) {
             $r->print('</div><div class="LC_clear_float_footer"></div>');
         }
-        my $statuses;
-        if (($context eq 'domain') && (&Apache::lonnet::allowed('udp',$ccdomain)) &&
-            (!&Apache::lonnet::allowed('mau',$ccdomain))) {
-            $statuses = ['active'];
-        } elsif (($context eq 'course') && ((&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) ||
-                 ($env{'request.course.sec'} &&
-                  &Apache::lonnet::allowed('vcl',$env{'request.course.id'}.'/'.$env{'request.course.sec'})))) {
-            $statuses = ['active'];
-        }
         if ($env{'form.action'} ne 'singlestudent') {
             &display_existing_roles($r,$ccuname,$ccdomain,\%inccourses,$context,
-                                    $roledom,$crstype,$showcredits,$statuses);
+                                    $roledom,$crstype);
         }
     } ## End of new user/old user logic
     if ($env{'form.action'} eq 'singlestudent') {
@@ -1535,7 +1470,7 @@ ENDNOTOOLSPRIV
             $btntxt = &mt('Enroll Student');
         }
         $r->print('<br /><input type="button" value="'.$btntxt.'" onclick="setSections(this.form)" />'."\n");
-    } elsif ($permission->{'cusr'}) {
+    } else {
         $r->print('<div class="LC_left_float">'.
                   '<fieldset><legend>'.&mt('Add Roles').'</legend>');
         my $addrolesdisplay = 0;
@@ -1578,7 +1513,7 @@ ENDNOTOOLSPRIV
 }
 
 sub singleuser_breadcrumb {
-    my ($crstype,$context,$domain) = @_;
+    my ($crstype) = @_;
     my %breadcrumb_text;
     if ($env{'form.action'} eq 'singlestudent') {
         if ($crstype eq 'Community') {
@@ -1586,21 +1521,12 @@ sub singleuser_breadcrumb {
         } else {
             $breadcrumb_text{'search'} = 'Enroll a student';
         }
-        $breadcrumb_text{'userpicked'} = 'Select a user';
-        $breadcrumb_text{'modify'} = 'Set section/dates';
-    } elsif ($env{'form.action'} eq 'accesslogs') {
-        $breadcrumb_text{'search'} = 'View access logs for a user';
-        $breadcrumb_text{'userpicked'} = 'Select a user';
-        $breadcrumb_text{'activity'} = 'Activity';
-    } elsif (($env{'form.action'} eq 'singleuser') && ($context eq 'domain') &&
-             (!&Apache::lonnet::allowed('mau',$domain))) {
-        $breadcrumb_text{'search'} = "View user's roles";
-        $breadcrumb_text{'userpicked'} = 'Select a user';
-        $breadcrumb_text{'modify'} = 'User roles';
+        $breadcrumb_text{'userpicked'} = 'Select a user',
+        $breadcrumb_text{'modify'} = 'Set section/dates',
     } else {
         $breadcrumb_text{'search'} = 'Create/modify a user';
-        $breadcrumb_text{'userpicked'} = 'Select a user';
-        $breadcrumb_text{'modify'} = 'Set user role';
+        $breadcrumb_text{'userpicked'} = 'Select a user',
+        $breadcrumb_text{'modify'} = 'Set user role',
     }
     return %breadcrumb_text;
 }
@@ -1670,22 +1596,8 @@ sub validation_javascript {
 
 sub display_existing_roles {
     my ($r,$ccuname,$ccdomain,$inccourses,$context,$roledom,$crstype,
-        $showcredits,$statuses) = @_;
+        $showcredits) = @_;
     my $now=time;
-    my $showall = 1;
-    my ($showexpired,$showactive);
-    if ((ref($statuses) eq 'ARRAY') && (@{$statuses} > 0)) {
-        $showall = 0;
-        if (grep(/^expired$/,@{$statuses})) {
-            $showexpired = 1;
-        }
-        if (grep(/^active$/,@{$statuses})) {
-            $showactive = 1;
-        }
-        if ($showexpired && $showactive) {
-            $showall = 1;
-        }
-    }
     my %lt=&Apache::lonlocal::texthash(
                     'rer'  => "Existing Roles",
                     'rev'  => "Revoke",
@@ -1749,13 +1661,6 @@ sub display_existing_roles {
         $area =~ s/\_\w\w$//;
         my ($role_code,$role_end_time,$role_start_time) =
             split(/_/,$role);
-        my $active=1;
-        $active=0 if (($role_end_time) && ($now>$role_end_time));
-        if ($active) {
-            next unless($showall || $showactive);
-        } else {
-            next unless($showall || $showexpired);
-        }
 # Is this a custom role? Get role owner and title.
         my ($croleudom,$croleuname,$croletitle)=
             ($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$});
@@ -1764,13 +1669,11 @@ sub display_existing_roles {
         my $sortkey=$role_code;
         my $class='Unknown';
         my $credits='';
-        my $csec;
-        if ($area =~ m{^/($match_domain)/($match_courseid)}) {
+        if ($area =~ m{^/($match_domain)/($match_courseid)} ) {
             $class='Course';
             my ($coursedom,$coursedir) = ($1,$2);
             my $cid = $1.'_'.$2;
             # $1.'_'.$2 is the course id (eg. 103_12345abcef103l3).
-            next if ($envkey =~ m{^/$match_domain/$match_courseid/[A-Za-z0-9]+_gr$});
             my %coursedata=
                 &Apache::lonnet::coursedescription($cid);
             if ($coursedir =~ /^$match_community$/) {
@@ -1828,13 +1731,12 @@ sub display_existing_roles {
                     $thisrole.='.'.$role_code;
                 }
             }
-            if ($area=~m{^/($match_domain/$match_courseid/(\w+))}) {
-                $csec = $2;
-                $carea.='<br />'.&mt('Section: [_1]',$csec);
-                $sortkey.="\0$csec";
+            if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) {
+                $carea.='<br />'.&mt('Section: [_1]',$3);
+                $sortkey.="\0$3";
                 if (!$allowed) {
-                    if ($env{'request.course.sec'} eq $csec) {
-                        if (&Apache::lonnet::allowed('c'.$role_code,$1)) {
+                    if ($env{'request.course.sec'} eq $3) {
+                        if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) {
                             $allowed = 1;
                         }
                     }
@@ -1876,30 +1778,29 @@ sub display_existing_roles {
             }
         }
         my $row = '';
-        if ($showall) {
-            $row.= '<td>';
-            if (($active) && ($allowed)) {
-                $row.= '<input type="checkbox" name="rev:'.$thisrole.'" />';
-            } else {
-                if ($active) {
-                    $row.='&nbsp;';
-                } else {
-                    $row.=&mt('expired or revoked');
-                }
-            }
-            $row.='</td><td>';
-            if ($allowed && !$active) {
-                $row.= '<input type="checkbox" name="ren:'.$thisrole.'" />';
-            } else {
-                $row.='&nbsp;';
-            }
-            $row.='</td><td>';
-            if ($delallowed) {
-                $row.= '<input type="checkbox" name="del:'.$thisrole.'" />';
+        $row.= '<td>';
+        my $active=1;
+        $active=0 if (($role_end_time) && ($now>$role_end_time));
+        if (($active) && ($allowed)) {
+            $row.= '<input type="checkbox" name="rev:'.$thisrole.'" />';
+        } else {
+            if ($active) {
+               $row.='&nbsp;';
             } else {
-                $row.='&nbsp;';
+               $row.=&mt('expired or revoked');
             }
-            $row.= '</td>';
+        }
+        $row.='</td><td>';
+        if ($allowed && !$active) {
+            $row.= '<input type="checkbox" name="ren:'.$thisrole.'" />';
+        } else {
+            $row.='&nbsp;';
+        }
+        $row.='</td><td>';
+        if ($delallowed) {
+            $row.= '<input type="checkbox" name="del:'.$thisrole.'" />';
+        } else {
+            $row.='&nbsp;';
         }
         my $plaintext='';
         if (!$croletitle) {
@@ -1917,31 +1818,17 @@ sub display_existing_roles {
                         '<br />',
                         $croleuname.':'.$croleudom);
         }
-        $row.= '<td>'.$plaintext.'</td>'.
-               '<td>'.$area.'</td>'.
-               '<td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time)
-                                            : '&nbsp;' ).'</td>'.
-               '<td>'.($role_end_time  ?&Apache::lonlocal::locallocaltime($role_end_time)
-                                            : '&nbsp;' ).'</td>';
+        $row.= '</td><td>'.$plaintext.
+               '</td><td>'.$area.
+               '</td><td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time)
+                                            : '&nbsp;' ).
+               '</td><td>'.($role_end_time  ?&Apache::lonlocal::locallocaltime($role_end_time)
+                                            : '&nbsp;' )
+               ."</td>";
         $sortrole{$sortkey}=$envkey;
         $roletext{$envkey}=$row;
         $roleclass{$envkey}=$class;
-        if ($allowed) {
-            $rolepriv{$envkey}='edit';
-        } else {
-            if ($context eq 'domain') {
-                if ((&Apache::lonnet::allowed('vur',$ccdomain)) &&
-                    ($envkey=~m{^/$ccdomain/})) {
-                    $rolepriv{$envkey}='view';
-                }
-            } elsif ($context eq 'course') {
-                if ((&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) ||
-                    ($env{'request.course.sec'} && ($env{'request.course.sec'} eq $csec) &&
-                     &Apache::lonnet::allowed('vcl',$env{'request.course.id'}.'/'.$env{'request.course.sec'}))) {
-                    $rolepriv{$envkey}='view';
-                }
-            }
-        }
+        $rolepriv{$envkey}=$allowed;
     } # end of foreach        (table building loop)
 
     my $rolesdisplay = 0;
@@ -1974,28 +1861,15 @@ sub display_existing_roles {
         } elsif ($env{'request.role'} =~ /^au\./) {
             $contextrole = &mt('Existing Co-Author Roles in your Authoring Space');
         } else {
-            if ($showall) {
-                $contextrole = &mt('Existing Roles in this Domain');
-            } elsif ($showactive) {
-                $contextrole = &mt('Unexpired Roles in this Domain');
-            } elsif ($showexpired) {
-                $contextrole = &mt('Expired or Revoked Roles in this Domain');
-            }
+            $contextrole = &mt('Existing Roles in this Domain');
         }
         $r->print('<div class="LC_left_float">'.
 '<fieldset><legend>'.$contextrole.'</legend>'.
 &Apache::loncommon::start_data_table("LC_createuser").
-&Apache::loncommon::start_data_table_header_row());
-        if ($showall) {
-            $r->print(
-'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}.'</th>'
-            );
-        } elsif ($showexpired) {
-            $r->print('<th>'.$lt{'rev'}.'</th>');
-        }
-        $r->print(
-'<th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.'</th>'.
-'<th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
+&Apache::loncommon::start_data_table_header_row().
+'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}.
+'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.
+'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
 &Apache::loncommon::end_data_table_header_row());
         foreach my $type ('Authoring Space','Course','Community','Domain','System','Unknown') {
             if ($output{$type}) {
@@ -2133,16 +2007,16 @@ sub user_authentication {
     my ($ccuname,$ccdomain,$formname) = @_;
     my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
     my $outcome;
-    my %lt=&Apache::lonlocal::texthash(
-                   'err'   => "ERROR",
-                   'uuas'  => "This user has an unrecognized authentication scheme",
-                   'adcs'  => "Please alert a domain coordinator of this situation",
-                   'sldb'  => "Please specify login data below",
-                   'ld'    => "Login Data"
-    );
     # Check for a bad authentication type
     if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) {
         # bad authentication scheme
+        my %lt=&Apache::lonlocal::texthash(
+                       'err'   => "ERROR",
+                       'uuas'  => "This user has an unrecognized authentication scheme",
+                       'adcs'  => "Please alert a domain coordinator of this situation",
+                       'sldb'  => "Please specify login data below",
+                       'ld'    => "Login Data"
+        );
         if (&Apache::lonnet::allowed('mau',$ccdomain)) {
             &initialize_authen_forms($ccdomain,$formname);
 
@@ -2173,6 +2047,11 @@ ENDBADAUTH
             &modify_login_block($ccdomain,$currentauth);
         if (&Apache::lonnet::allowed('mau',$ccdomain)) {
             # Current user has login modification privileges
+            my %lt=&Apache::lonlocal::texthash (
+                           'ld'    => "Login Data",
+                           'ccld'  => "Change Current Login Data",
+                           'enld'  => "Enter New Login Data"
+                                               );
             $outcome =
                        '<script type="text/javascript" language="Javascript">'."\n".
                        '// <![CDATA['."\n".
@@ -2183,7 +2062,7 @@ ENDBADAUTH
                        &Apache::loncommon::start_data_table().
                        &Apache::loncommon::start_data_table_row().
                        '<td>'.$authformnop;
-            if (($can_modify) && (&Apache::lonnet::allowed('mau',$ccdomain))) {
+            if ($can_modify) {
                 $outcome .= '</td>'."\n".
                             &Apache::loncommon::end_data_table_row().
                             &Apache::loncommon::start_data_table_row().
@@ -2193,40 +2072,14 @@ ENDBADAUTH
                 $outcome .= '&nbsp;('.$authformcurrent.')</td>'.
                             &Apache::loncommon::end_data_table_row()."\n";
             }
-            if (&Apache::lonnet::allowed('mau',$ccdomain)) {
-                foreach my $item (@authform_others) { 
-                    $outcome .= &Apache::loncommon::start_data_table_row().
-                                '<td>'.$item.'</td>'.
-                                &Apache::loncommon::end_data_table_row()."\n";
-                }
+            foreach my $item (@authform_others) { 
+                $outcome .= &Apache::loncommon::start_data_table_row().
+                            '<td>'.$item.'</td>'.
+                            &Apache::loncommon::end_data_table_row()."\n";
             }
             $outcome .= &Apache::loncommon::end_data_table();
         } else {
-            if (&Apache::lonnet::allowed('udp',$ccdomain)) {
-                # Current user has rights to view domain preferences for user's domain
-                my $result;
-                if ($currentauth =~ /^krb(4|5):([^:]*)$/) {
-                    my ($krbver,$krbrealm) = ($1,$2);
-                    if ($krbrealm eq '') {
-                        $result = &mt('Currently Kerberos authenticated, Version [_1].',$krbver);
-                    } else {
-                        $result = &mt('Currently Kerberos authenticated with domain [_1] Version [_2].',
-                                      $krbrealm,$krbver);
-                    }
-                } elsif ($currentauth =~ /^internal:/) {
-                    $result = &mt('Currently internally authenticated.');
-                } elsif ($currentauth =~ /^localauth:/) {
-                    $result = &mt('Currently using local (institutional) authentication.');
-                } elsif ($currentauth =~ /^unix:/) {
-                    $result = &mt('Currently Filesystem Authenticated.');
-                }
-                $outcome = '<h3>'.$lt{'ld'}.'</h3>'.
-                           &Apache::loncommon::start_data_table().
-                           &Apache::loncommon::start_data_table_row().
-                           '<td>'.$result.'</td>'.
-                           &Apache::loncommon::end_data_table_row()."\n".
-                           &Apache::loncommon::end_data_table();
-            } elsif (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
+            if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
                 my %lt=&Apache::lonlocal::texthash(
                            'ccld'  => "Change Current Login Data",
                            'yodo'  => "You do not have privileges to modify the authentication configuration for this user.",
@@ -2498,7 +2351,7 @@ sub personal_data_display {
     }
     if (($context eq 'selfcreate') && ($newuser eq 'email')) {
         if ($captchaform) {
-            $output .= &Apache::lonhtmlcommon::row_title($lt{'valid'}.'*',
+            $output .= &Apache::lonhtmlcommon::row_title($lt{'valid'},
                                                          'LC_pick_box_title')."\n".
                        $captchaform."\n".'<br /><br />'.
                        &Apache::lonhtmlcommon::row_closure(1); 
@@ -2617,7 +2470,7 @@ sub update_user_data {
                   $jsback."\n".
                   '// ]]>'."\n".
                   '</script>'."\n";
-    my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$env{'form.ccdomain'});
+    my %breadcrumb_text = &singleuser_breadcrumb($crstype);
     push (@{$brcrum},
              {href => "javascript:backPage(document.userupdate)",
               text => $breadcrumb_text{'search'},
@@ -3257,7 +3110,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 = 
@@ -4296,7 +4149,7 @@ sub build_roles {
 # ========================================================== Custom Role Editor
 
 sub custom_role_editor {
-    my ($r,$brcrum,$prefix) = @_;
+    my ($r,$brcrum) = @_;
     my $action = $env{'form.customroleaction'};
     my $rolename; 
     if ($action eq 'new') {
@@ -4311,7 +4164,7 @@ sub custom_role_editor {
         $context = 'course';
     } else {
         $context = 'domain';
-        $crstype = 'course';
+        $crstype = $env{'form.templatecrstype'};
     }
 
     $rolename=~s/[^A-Za-z0-9]//gs;
@@ -4320,54 +4173,120 @@ sub custom_role_editor {
         return;
     }
 
-    my $formname = 'form1';
-    my %privs=();
-    my $body_top = '<h2>';
-# ------------------------------------------------------- Does this role exist?
+# ------------------------------------------------------- What can be assigned?
+    my %full=();
+    my %courselevel=();
+    my %courselevelcurrent=();
+    my $syspriv='';
+    my $dompriv='';
+    my $coursepriv='';
+    my $body_top;
+    my $newrole;
     my ($rdummy,$roledef)=
 			 &Apache::lonnet::get('roles',["rolesdef_$rolename"]);
+# ------------------------------------------------------- Does this role exist?
+    $body_top .= '<h2>';
     if (($rdummy ne 'con_lost') && ($roledef ne '')) {
-        $body_top .= &mt('Existing Role').' "';
+	$body_top .= &mt('Existing Role').' "';
 # ------------------------------------------------- Get current role privileges
-        ($privs{'system'},$privs{'domain'},$privs{'course'})=split(/\_/,$roledef);
-        if ($privs{'system'} =~ /bre\&S/) {
-            if ($context eq 'domain') {
-                $crstype = 'Course';
-            } elsif ($crstype eq 'Community') {
-                $privs{'system'} =~ s/bre\&S//;
-            }
-        } elsif ($context eq 'domain') {
-            $crstype = 'Course';
+	($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);
+        if ($crstype eq 'Community') {
+            $syspriv =~ s/bre\&S//;   
         }
     } else {
-        $body_top .= &mt('New Role').' "';
-        $roledef='';
+        $newrole = 1;
+	$body_top .= &mt('New Role').' "';
+	$roledef='';
     }
     $body_top .= $rolename.'"</h2>';
-
-# ------------------------------------------------------- What can be assigned?
-    my %full=();
-    my %levels=(
-                 course => {},
-                 domain => {},
-                 system => {},
-               );
-    my %levelscurrent=(
-                        course => {},
-                        domain => {},
-                        system => {},
-                      );
-    &Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent);
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
+        if (!$restrict) { $restrict='F'; }
+        $courselevel{$priv}=$restrict;
+        if ($coursepriv=~/\:$priv/) {
+	    $courselevelcurrent{$priv}=1;
+	}
+	$full{$priv}=1;
+    }
+    my %domainlevel=();
+    my %domainlevelcurrent=();
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
+        if (!$restrict) { $restrict='F'; }
+        $domainlevel{$priv}=$restrict;
+        if ($dompriv=~/\:$priv/) {
+	    $domainlevelcurrent{$priv}=1;
+	}
+	$full{$priv}=1;
+    }
+    my %systemlevel=();
+    my %systemlevelcurrent=();
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
+        if (!$restrict) { $restrict='F'; }
+        $systemlevel{$priv}=$restrict;
+        if ($syspriv=~/\:$priv/) {
+	    $systemlevelcurrent{$priv}=1;
+	}
+	$full{$priv}=1;
+    }
     my ($jsback,$elements) = &crumb_utilities();
-    my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);
-    my $head_script =
-        &Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname,
-                                                  \%full,\@templateroles,$jsback);
+    my $button_code = "\n";
+    my $head_script = "\n";
+    $head_script .= '<script type="text/javascript">'."\n"
+                   .'// <![CDATA['."\n";
+    my @template_roles = ("in","ta","ep");
+    if ($context eq 'domain') {
+        push(@template_roles,"ad");
+    }
+    push(@template_roles,"st");
+    if ($crstype eq 'Community') {
+        unshift(@template_roles,'co');
+    } else {
+        unshift(@template_roles,'cc');
+    }
+    foreach my $role (@template_roles) {
+        $head_script .= &make_script_template($role,$crstype);
+        $button_code .= &make_button_code($role,$crstype).' ';
+    }
+    my $context_code;
+    if ($context eq 'domain') {
+        my $checkedCommunity = '';
+        my $checkedCourse = ' checked="checked"';
+        if ($env{'form.templatecrstype'} eq 'Community') {
+            $checkedCommunity = $checkedCourse;
+            $checkedCourse = '';
+        }
+        $context_code = '<label>'.
+                        '<input type="radio" name="templatecrstype" value="Course"'.$checkedCourse.' onclick="this.form.submit();">'.
+                        &mt('Course').
+                        '</label>'.('&nbsp;' x2).
+                        '<label>'.
+                        '<input type="radio" name="templatecrstype" value="Community"'.$checkedCommunity.' onclick="this.form.submit();">'.
+                        &mt('Community').
+                        '</label>'.
+                        '</fieldset>'.
+                        '<input type="hidden" name="customroleaction" value="'.
+                        $action.'" />';
+        if ($env{'form.customroleaction'} eq 'new') {
+            $context_code .= '<input type="hidden" name="newrolename" value="'.
+                             $rolename.'" />';
+        } else {
+            $context_code .= '<input type="hidden" name="rolename" value="'.
+                             $rolename.'" />';
+        }
+        $context_code .= '<input type="hidden" name="action" value="custom" />'.
+                         '<input type="hidden" name="phase" value="selected_custom_edit" />';
+    }
+
+    $head_script .= "\n".$jsback."\n"
+                   .'// ]]>'."\n"
+                   .'</script>'."\n";
     push (@{$brcrum},
-              {href => "javascript:backPage(document.$formname,'pickrole','')",
+              {href => "javascript:backPage(document.form1,'pickrole','')",
                text => "Pick custom role",
                faq  => 282,bug=>'Instructor Interface',},
-              {href => "javascript:backPage(document.$formname,'','')",
+              {href => "javascript:backPage(document.form1,'','')",
                text => "Edit custom role",
                faq  => 282,
                bug  => 'Instructor Interface',
@@ -4375,35 +4294,149 @@ sub custom_role_editor {
               );
     my $args = { bread_crumbs          => $brcrum,
                  bread_crumbs_component => 'User Management'};
-
+ 
     $r->print(&Apache::loncommon::start_page('Custom Role Editor',
                                              $head_script,$args).
               $body_top);
-    $r->print('<form name="'.$formname.'" method="post" action="">'."\n".
-              &Apache::lonuserutils::custom_role_header($context,$crstype,
-                                                        \@templateroles,$prefix));
+    my %lt=&Apache::lonlocal::texthash(
+		    'prv'  => "Privilege",
+		    'crl'  => "Course Level",
+                    'dml'  => "Domain Level",
+                    'ssl'  => "System Level");
+
+    $r->print('<div class="LC_left_float">'
+             .'<form action=""><fieldset>'
+             .'<legend>'.&mt('Select a Template').'</legend>'
+             .$button_code
+             .'</fieldset></form></div>');
+    if ($context_code) {
+        $r->print('<div class="LC_left_float">'
+                 .'<form action="/adm/createuser" method="post"><fieldset>'
+                 .'<legend>'.&mt('Context').'</legend>'
+                 .$context_code
+                 .'</form>'
+                 .'</div>'
+        );
+    }
+    $r->print('<br clear="all" />');
 
     $r->print(<<ENDCCF);
+<form name="form1" method="post" action="">
 <input type="hidden" name="phase" value="set_custom_roles" />
 <input type="hidden" name="rolename" value="$rolename" />
 ENDCCF
-    $r->print(&Apache::lonuserutils::custom_role_table($crstype,\%full,\%levels,
-                                                       \%levelscurrent,$prefix));
+    $r->print(&Apache::loncommon::start_data_table().
+              &Apache::loncommon::start_data_table_header_row(). 
+'<th>'.$lt{'prv'}.'</th><th>'.$lt{'crl'}.'</th><th>'.$lt{'dml'}.
+'</th><th>'.$lt{'ssl'}.'</th>'.
+              &Apache::loncommon::end_data_table_header_row());
+    foreach my $priv (sort(keys(%full))) {
+        my $privtext = &Apache::lonnet::plaintext($priv,$crstype);
+        $r->print(&Apache::loncommon::start_data_table_row().
+	          '<td>'.$privtext.'</td><td>'.
+    ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c"'.
+    ($courselevelcurrent{$priv}?' checked="checked"':'').' />':'&nbsp;').
+    '</td><td>'.
+    ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d"'.
+    ($domainlevelcurrent{$priv}?' checked="checked"':'').' />':'&nbsp;').
+    '</td><td>');
+        if ($priv eq 'bre' && $crstype eq 'Community') {
+            $r->print('&nbsp;');  
+        } else {
+            $r->print($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s"'.
+                      ($systemlevelcurrent{$priv}?' checked="checked"':'').' />':'&nbsp;');
+        }
+        $r->print('</td>'.
+                  &Apache::loncommon::end_data_table_row());
+    }
     $r->print(&Apache::loncommon::end_data_table().
    '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
    '<input type="hidden" name="startrolename" value="'.$env{'form.rolename'}.
-   '" />'."\n".'<input type="hidden" name="currstate" value="" />'."\n".
+   '" />'."\n".'<input type="hidden" name="currstate" value="" />'."\n".   
    '<input type="reset" value="'.&mt("Reset").'" />'."\n".
    '<input type="submit" value="'.&mt('Save').'" /></form>');
 }
-
+# --------------------------------------------------------
+sub make_script_template {
+    my ($role,$crstype) = @_;
+    my %full_c=();
+    my %full_d=();
+    my %full_s=();
+    my $return_script;
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
+        my ($priv,$restrict)=split(/\&/,$item);
+        $full_c{$priv}=1;
+    }
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
+        my ($priv,$restrict)=split(/\&/,$item);
+        $full_d{$priv}=1;
+    }
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
+        next if (($crstype eq 'Community') && ($item eq 'bre&S'));
+        my ($priv,$restrict)=split(/\&/,$item);
+        $full_s{$priv}=1;
+    }
+    $return_script .= 'function set_'.$role.'() {'."\n";
+    my @temp = split(/:/,$Apache::lonnet::pr{$role.':c'});
+    my %role_c;
+    foreach my $priv (@temp) {
+        my ($priv_item, $dummy) = split(/\&/,$priv);
+        $role_c{$priv_item} = 1;
+    }
+    my %role_d;
+    @temp = split(/:/,$Apache::lonnet::pr{$role.':d'});
+    foreach my $priv(@temp) {
+        my ($priv_item, $dummy) = split(/\&/,$priv);
+        $role_d{$priv_item} = 1;
+    }
+    my %role_s;
+    @temp = split(/:/,$Apache::lonnet::pr{$role.':s'});
+    foreach my $priv(@temp) {
+        my ($priv_item, $dummy) = split(/\&/,$priv);
+        $role_s{$priv_item} = 1;
+    }
+    foreach my $priv_item (keys(%full_c)) {
+        my ($priv, $dummy) = split(/\&/,$priv_item);
+        if ((exists($role_c{$priv})) || (exists($role_d{$priv})) || 
+            (exists($role_s{$priv}))) {
+            $return_script .= "document.form1.$priv"."_c.checked = true;\n";
+        } else {
+            $return_script .= "document.form1.$priv"."_c.checked = false;\n";
+        }
+    }
+    foreach my $priv_item (keys(%full_d)) {
+        my ($priv, $dummy) = split(/\&/,$priv_item);
+        if ((exists($role_d{$priv})) || (exists($role_s{$priv}))) {
+            $return_script .= "document.form1.$priv"."_d.checked = true;\n";
+        } else {
+            $return_script .= "document.form1.$priv"."_d.checked = false;\n";
+        }
+    }
+    foreach my $priv_item (keys(%full_s)) {
+        my ($priv, $dummy) = split(/\&/,$priv_item);
+        if (exists($role_s{$priv})) {
+            $return_script .= "document.form1.$priv"."_s.checked = true;\n";
+        } else {
+            $return_script .= "document.form1.$priv"."_s.checked = false;\n";
+        }
+    }
+    $return_script .= '}'."\n";
+    return ($return_script);
+}
+# ----------------------------------------------------------
+sub make_button_code {
+    my ($role,$crstype) = @_;
+    my $label = &Apache::lonnet::plaintext($role,$crstype);
+    my $button_code = '<input type="button" onclick="set_'.$role.'()" value="'.$label.'" />';
+    return ($button_code);
+}
 # ---------------------------------------------------------- Call to definerole
 sub set_custom_role {
-    my ($r,$context,$brcrum,$prefix) = @_;
+    my ($r,$context,$brcrum) = @_;
     my $rolename=$env{'form.rolename'};
     $rolename=~s/[^A-Za-z0-9]//gs;
     if (!$rolename) {
-	&custom_role_editor($r,$brcrum,$prefix);
+	&custom_role_editor($r,$brcrum);
         return;
     }
     my ($jsback,$elements) = &crumb_utilities();
@@ -4428,7 +4461,7 @@ sub set_custom_role {
          help => 'Course_Editing_Custom_Roles'},
         );
     my $args = { bread_crumbs           => $brcrum,
-                 bread_crumbs_component => 'User Management'};
+                 bread_crumbs_component => 'User Management'}; 
     $r->print(&Apache::loncommon::start_page('Save Custom Role',$jscript,$args));
 
     my $newrole;
@@ -4445,13 +4478,38 @@ sub set_custom_role {
         $newrole = 1;
     }
     $r->print($rolename.'"</h3>');
-# ------------------------------------------------- Assign role and show result
+# ------------------------------------------------------- What can be assigned?
+    my $sysrole='';
+    my $domrole='';
+    my $courole='';
+
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
+        if (!$restrict) { $restrict=''; }
+        if ($env{'form.'.$priv.'_c'}) {
+	    $courole.=':'.$item;
+	}
+    }
 
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
+        if (!$restrict) { $restrict=''; }
+        if ($env{'form.'.$priv.'_d'}) {
+	    $domrole.=':'.$item;
+	}
+    }
+
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
+        if (!$restrict) { $restrict=''; }
+        if ($env{'form.'.$priv.'_s'}) {
+	    $sysrole.=':'.$item;
+	}
+    }
+    # Assign role; Compile and show result
     my $errmsg;
-    my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$prefix);
-    # Assign role and return result
-    my $result = &Apache::lonnet::definerole($rolename,$newprivs{'s'},$newprivs{'d'},
-                                             $newprivs{'c'});
+    my $result =
+        &Apache::lonnet::definerole($rolename,$sysrole,$domrole,$courole);
     if ($result ne 'ok') {
         $errmsg = ': '.$result;
     }
@@ -4579,10 +4637,8 @@ sub handler {
         } else {
             &Apache::lonuserutils::print_first_users_upload_form($r,$context);
         }
-    } elsif (((($env{'form.action'} eq 'singleuser') || ($env{'form.action'}
-              eq 'singlestudent')) && ($permission->{'cusr'})) ||
-             (($env{'form.action'} eq 'singleuser') && ($permission->{'view'})) ||
-             (($env{'form.action'} eq 'accesslogs') && ($permission->{'activity'}))) {
+    } elsif ((($env{'form.action'} eq 'singleuser') || ($env{'form.action'}
+             eq 'singlestudent')) && ($permission->{'cusr'})) {
         my $phase = $env{'form.phase'};
         my @search = ('srchterm','srchby','srchin','srchtype','srchdomain');
 	&Apache::loncreateuser::restore_prev_selections();
@@ -4591,7 +4647,7 @@ sub handler {
 	    $srch->{$item} = $env{'form.'.$item};
 	}
         if (($phase eq 'get_user_info') || ($phase eq 'userpicked') ||
-            ($phase eq 'createnewuser') || ($phase eq 'activity')) {
+            ($phase eq 'createnewuser')) {
             if ($env{'form.phase'} eq 'createnewuser') {
                 my $response;
                 if ($env{'form.srchterm'} !~ /^$match_username$/) {
@@ -4621,8 +4677,8 @@ sub handler {
                     &print_user_selection_page($r,$response,$srch,$results,
                                                \@search,$context,undef,$crstype,
                                                $brcrum);
-                } elsif (($currstate eq 'modify') || ($env{'form.action'} eq 'accesslogs')) {
-                    my ($ccuname,$ccdomain,$uhome);
+                } elsif ($currstate eq 'modify') {
+                    my ($ccuname,$ccdomain);
                     if (($srch->{'srchby'} eq 'uname') && 
                         ($srch->{'srchtype'} eq 'exact')) {
                         $ccuname = $srch->{'srchterm'};
@@ -4633,32 +4689,12 @@ sub handler {
                     }
                     $ccuname =&LONCAPA::clean_username($ccuname);
                     $ccdomain=&LONCAPA::clean_domain($ccdomain);
-                    if ($env{'form.action'} eq 'accesslogs') {
-                        my $uhome;
-                        if (($ccuname ne '') && ($ccdomain ne '')) {
-                           $uhome = &Apache::lonnet::homeserver($ccuname,$ccdomain);
-                        }
-                        if (($uhome eq '') || ($uhome eq 'no_host')) {
-                            $env{'form.phase'} = '';
-                            undef($forcenewuser);
-                            #if ($response) {
-                            #    unless ($response =~ m{\Q<br /><br />\E$}) {
-                            #        $response .= '<br /><br />';
-                            #    }
-                            #}
-                            &print_username_entry_form($r,$context,$response,$srch,
-                                                       $forcenewuser,$crstype,$brcrum);
-                        } else {
-                            &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
-                        }
-                    } else {
-                        if ($env{'form.forcenewuser'}) {
-                            $response = '';
-                        }
-                        &print_user_modification_page($r,$ccuname,$ccdomain,
-                                                      $srch,$response,$context,
-                                                      $permission,$crstype,$brcrum);
+                    if ($env{'form.forcenewuser'}) {
+                        $response = '';
                     }
+                    &print_user_modification_page($r,$ccuname,$ccdomain,
+                                                  $srch,$response,$context,
+                                                  $permission,$crstype,$brcrum);
                 } elsif ($currstate eq 'query') {
                     &print_user_query_page($r,'createuser',$brcrum);
                 } else {
@@ -4669,17 +4705,9 @@ sub handler {
             } elsif ($env{'form.phase'} eq 'userpicked') {
                 my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
                 my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'});
-                if ($env{'form.action'} eq 'accesslogs') {
-                    &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
-                } else {
-                    &print_user_modification_page($r,$ccuname,$ccdomain,$srch,'',
-                                                  $context,$permission,$crstype,
-                                                  $brcrum);
-                }
-            } elsif ($env{'form.action'} eq 'accesslogs') {
-                my $ccuname = &LONCAPA::clean_username($env{'form.accessuname'});
-                my $ccdomain = &LONCAPA::clean_domain($env{'form.accessudom'});
-                &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
+                &print_user_modification_page($r,$ccuname,$ccdomain,$srch,'',
+                                              $context,$permission,$crstype,
+                                              $brcrum);
             }
         } elsif ($env{'form.phase'} eq 'update_user_data') {
             &update_user_data($r,$context,$crstype,$brcrum,$showcredits);
@@ -4688,11 +4716,10 @@ sub handler {
                                        $brcrum);
         }
     } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
-        my $prefix;
         if ($env{'form.phase'} eq 'set_custom_roles') {
-            &set_custom_role($r,$context,$brcrum,$prefix);
+            &set_custom_role($r,$context,$brcrum);
         } else {
-            &custom_role_editor($r,$brcrum,$prefix);
+            &custom_role_editor($r,$brcrum);
         }
     } elsif (($env{'form.action'} eq 'processauthorreq') &&
              ($permission->{'cusr'}) && 
@@ -4989,47 +5016,48 @@ sub handler {
                      '<span class="LC_error">'.&mt('You do not have permission to configure self-enrollment').'</span>');
         }
     } elsif ($env{'form.action'} eq 'selfenrollqueue') {
-        if ($permission->{selfenrolladmin}) {
+        push(@{$brcrum},
+                 {href => '/adm/createuser?action=selfenrollqueue',
+                  text => 'Enrollment requests',
+                  help => 'Course_Self_Enrollment'});
+        $bread_crumbs_component = 'Enrollment requests';
+        if ($env{'form.state'} eq 'done') {
             push(@{$brcrum},
                      {href => '/adm/createuser?action=selfenrollqueue',
-                      text => 'Enrollment requests',
+                      text => 'Result',
                       help => 'Course_Self_Enrollment'});
-            $bread_crumbs_component = 'Enrollment requests';
-            if ($env{'form.state'} eq 'done') {
-                push(@{$brcrum},
-                         {href => '/adm/createuser?action=selfenrollqueue',
-                          text => 'Result',
-                          help => 'Course_Self_Enrollment'});
-                $bread_crumbs_component = 'Enrollment result';
-            }
-            $args = { bread_crumbs           => $brcrum,
-                      bread_crumbs_component => $bread_crumbs_component};
-            $r->print(&header(undef,$args));
-            my $cid = $env{'request.course.id'};
-            my $cdom = $env{'course.'.$cid.'.domain'};
-            my $cnum = $env{'course.'.$cid.'.num'};
-            my $coursedesc = $env{'course.'.$cid.'.description'};
-            if (!exists($env{'form.state'})) {
-                $r->print('<h3>'.&mt('Pending enrollment requests').'</h3>'."\n");
-                $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context,
-                                                                                $cdom,$cnum));
-            } elsif ($env{'form.state'} eq 'done') {
-                $r->print('<h3>'.&mt('Enrollment request processing').'</h3>'."\n");
-                $r->print(&Apache::loncoursequeueadmin::update_request_queue($context,
-                              $cdom,$cnum,$coursedesc));
-            }
-        } else {
-            $r->print(&header(undef,{'no_nav_bar' => 1}).
-                     '<span class="LC_error">'.&mt('You do not have permission to manage self-enrollment').'</span>');
+            $bread_crumbs_component = 'Enrollment result';
+        }
+        $args = { bread_crumbs           => $brcrum,
+                  bread_crumbs_component => $bread_crumbs_component};
+        $r->print(&header(undef,$args));
+        my $cid = $env{'request.course.id'};
+        my $cdom = $env{'course.'.$cid.'.domain'};
+        my $cnum = $env{'course.'.$cid.'.num'};
+        my $coursedesc = $env{'course.'.$cid.'.description'};
+        if (!exists($env{'form.state'})) {
+            $r->print('<h3>'.&mt('Pending enrollment requests').'</h3>'."\n");
+            $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context,
+                                                                       $cdom,$cnum));
+        } elsif ($env{'form.state'} eq 'done') {
+            $r->print('<h3>'.&mt('Enrollment request processing').'</h3>'."\n");
+            $r->print(&Apache::loncoursequeueadmin::update_request_queue($context,
+                          $cdom,$cnum,$coursedesc));
         }
-
     } elsif ($env{'form.action'} eq 'changelogs') {
-        if ($permission->{cusr} || $permission->{view}) {
-            &print_userchangelogs_display($r,$context,$permission,$brcrum);
-        } else {
-            $r->print(&header(undef,{'no_nav_bar' => 1}).
-                     '<span class="LC_error">'.&mt('You do not have permission to view change logs').'</span>');
+        my $helpitem;
+        if ($context eq 'course') {
+            $helpitem = 'Course_User_Logs';
         }
+        push (@{$brcrum},
+                 {href => '/adm/createuser?action=changelogs',
+                  text => 'User Management Logs',
+                  help => $helpitem});
+        $bread_crumbs_component = 'User Changes';
+        $args = { bread_crumbs           => $brcrum,
+                  bread_crumbs_component => $bread_crumbs_component};
+        $r->print(&header(undef,$args));
+        &print_userchangelogs_display($r,$context,$permission);
     } else {
         $bread_crumbs_component = 'User Management';
         $args = { bread_crumbs           => $brcrum,
@@ -5281,27 +5309,6 @@ sub print_main_menu {
                             listusers  => 'Show and manage users in this community.',
                            },
                 );
-  if ($linkcontext eq 'domain') {
-      unless ($permission->{'cusr'}) {
-          $links{'domain'}{'singleuser'} = 'View a User';
-          $linktitles{'domain'}{'singleuser'} = 'View information about a user in the domain';
-
-      }
-  } elsif ($linkcontext eq 'course') {
-      unless ($permission->{'cusr'}) {
-          $links{'course'}{'singleuser'} = 'View a Course User';
-          $linktitles{'course'}{'singleuser'} = 'View information about a user in this course';
-          $links{'course'}{'listusers'} = 'List Course Users';
-          $linktitles{'course'}{'listusers'} = 'Show information about users in this course';
-      }
-  } elsif ($linkcontext eq 'community') {
-      unless ($permission->{'cusr'}) {
-          $links{'community'}{'singleuser'} = 'View a Community User';
-          $linktitles{'community'}{'singleuser'} = 'View information about a user in this community';
-          $links{'community'}{'listusers'} = 'List Community Users';
-          $linktitles{'community'}{'listusers'} = 'Show information about users in this community';
-      }
-  }
   my @menu = ( {categorytitle => 'Single Users', 
          items =>
          [
@@ -5310,7 +5317,7 @@ sub print_main_menu {
              icon => 'edit-redo.png',
              #help => 'Course_Change_Privileges',
              url => '/adm/createuser?action=singleuser',
-             permission => ($permission->{'view'} || $permission->{'cusr'}),
+             permission => $permission->{'cusr'},
              linktitle => $linktitles{$linkcontext}{'singleuser'},
             },
          ]},
@@ -5340,18 +5347,8 @@ sub print_main_menu {
          {categorytitle => 'Administration',
          items => [ ]},
        );
-
+            
     if ($context eq 'domain'){
-        push(@{  $menu[0]->{items} }, # Single Users
-            {
-             linktext => 'User Access Log',
-             icon => 'document-properties.png',
-             #help => 'Domain_User_Access_Logs',
-             url => '/adm/createuser?action=accesslogs',
-             permission => $permission->{'activity'},
-             linktitle => 'View user access log.',
-            }
-        );
         
         push(@{ $menu[2]->{items} }, #Category: Administration
             {
@@ -5383,7 +5380,7 @@ sub print_main_menu {
              icon => 'document-properties.png',
              #help => 'Course_User_Logs',
              url => '/adm/createuser?action=changelogs',
-             permission => ($permission->{'cusr'} || $permission->{'view'}),
+             permission => $permission->{'cusr'},
              linktitle => 'View change log.',
             },
         );
@@ -5460,7 +5457,7 @@ sub print_main_menu {
              icon => 'document-properties.png',
              #help => 'Course_User_Logs',
              url => '/adm/createuser?action=changelogs',
-             permission => ($permission->{'view'} || $permission->{'cusr'}),
+             permission => $permission->{'cusr'},
              linktitle => 'View change log.',
             },
         );
@@ -5485,8 +5482,7 @@ sub print_main_menu {
                      icon => 'roles.png',
                      #help => 'Course_Automated_Enrollment',
                      permission => (&Apache::lonnet::auto_run($cnum,$cdom)
-                                         && (($permission->{'cusr'}) ||
-                                             ($permission->{'view'}))),
+                                         && $permission->{'cusr'}),
                      url  => '/adm/populate',
                      linktitle => 'Automated enrollment manager.',
                     }
@@ -5535,7 +5531,7 @@ sub restore_prev_selections {
 }
 
 sub print_selfenroll_menu {
-    my ($r,$context,$cid,$cdom,$cnum,$currsettings,$additional,$readonly) = @_;
+    my ($r,$context,$cid,$cdom,$cnum,$currsettings,$additional) = @_;
     my $crstype = &Apache::loncommon::course_type();
     my $formname = 'selfenroll';
     my $nolink = 1;
@@ -5548,10 +5544,6 @@ sub print_selfenroll_menu {
         butn => 'but no user types have been checked.',
         wilf => "Please uncheck 'activate' or check at least one type.",
     );
-    my $disabled;
-    if ($readonly) {
-       $disabled = ' disabled="disabled"';
-    }
     &js_escape(\%alerts);
     my $selfenroll_js = <<"ENDSCRIPT";
 function update_types(caller,num) {
@@ -5867,13 +5859,13 @@ ENDSCRIPT
                     $output .= ' checked="checked" '; 
                 }
                 $output .= 'onchange="javascript:update_types('.
-                           "'selfenroll_all'".');"'.$disabled.' />'.&mt('Yes').'</label>'.
+                           "'selfenroll_all'".');" />'.&mt('Yes').'</label>'.
                            '&nbsp;&nbsp;<input type="radio" name="selfenroll_all" value="0" ';
                 if ($curr_types ne '*') {
                     $output .= ' checked="checked" ';
                 }
                 $output .= ' onchange="javascript:update_types('.
-                           "'selfenroll_all'".');"'.$disabled.' />'.&mt('No').'</label></td>'.
+                           "'selfenroll_all'".');"/>'.&mt('No').'</label></td>'.
                            &Apache::loncommon::end_data_table_row().
                            &Apache::loncommon::end_data_table().
                            &mt('Or').'<br />'.
@@ -5895,10 +5887,10 @@ ENDSCRIPT
                                        .'</b><input type="hidden" name="selfenroll_dom_'.$num
                                        .'" value="'.$currdom.'" /></span><br />'
                                        .'<span class="LC_nobreak"><label><input type="checkbox" '
-                                       .'name="selfenroll_delete" value="'.$num.'" onchange="javascript:update_types('."'selfenroll_delete','$num'".');"'.$disabled.' />'
+                                       .'name="selfenroll_delete" value="'.$num.'" onchange="javascript:update_types('."'selfenroll_delete','$num'".');" />'
                                        .&mt('Delete').'</label></span></td>';
                             $output .= '<td valign="top">&nbsp;&nbsp;'.&mt('User types:').'<br />'
-                                       .&selfenroll_inst_types($num,$currdom,\@currinsttypes,$readonly).'</td>'
+                                       .&selfenroll_inst_types($num,$currdom,\@currinsttypes).'</td>'
                                        .&Apache::loncommon::end_data_table_row();
                             $num ++;
                         }
@@ -5913,7 +5905,7 @@ ENDSCRIPT
                 $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)
                            .'<input type="hidden" name="selfenroll_types_total" value="'.$num.'" />'
                            .'</td>'.&Apache::loncommon::end_data_table_row()
                            .&Apache::loncommon::end_data_table();
@@ -5934,15 +5926,15 @@ ENDSCRIPT
                 }
                 if ($registered) {
                     $regon = ' checked="checked" ';
-                    $regoff = '';
+                    $regoff = ' ';
                 } else {
-                    $regon = '';
+                    $regon = ' ';
                     $regoff = ' checked="checked" ';
                 }
                 $output .= '<label>'.
-                           '<input type="radio" name="selfenroll_registered" value="1"'.$regon.$disabled.' />'.
+                           '<input type="radio" name="selfenroll_registered" value="1"'.$regon.'/>'.
                            &mt('Yes').'</label>&nbsp;&nbsp;<label>'.
-                           '<input type="radio" name="selfenroll_registered" value="0"'.$regoff.$disabled.' />'.
+                           '<input type="radio" name="selfenroll_registered" value="0"'.$regoff.'/>'.
                            &mt('No').'</label>';
             } elsif ($item eq 'enroll_dates') {
                 my ($starttime,$endtime);
@@ -5964,10 +5956,10 @@ ENDSCRIPT
                 }
                 my $startform =
                     &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_date',$starttime,
-                                      $disabled,undef,undef,undef,undef,undef,undef,$nolink);
+                                      undef,undef,undef,undef,undef,undef,undef,$nolink);
                 my $endform =
                     &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_end_date',$endtime,
-                                      $disabled,undef,undef,undef,undef,undef,undef,$nolink);
+                                      undef,undef,undef,undef,undef,undef,undef,$nolink);
                 $output .= &selfenroll_date_forms($startform,$endform);
             } elsif ($item eq 'access_dates') {
                 my ($starttime,$endtime);
@@ -5989,10 +5981,10 @@ ENDSCRIPT
                 }
                 my $startform =
                     &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_access',$starttime,
-                                      $disabled,undef,undef,undef,undef,undef,undef,$nolink);
+                                      undef,undef,undef,undef,undef,undef,undef,$nolink);
                 my $endform =
                     &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_end_access',$endtime,
-                                      $disabled,undef,undef,undef,undef,undef,undef,$nolink);
+                                      undef,undef,undef,undef,undef,undef,undef,$nolink);
                 $output .= &selfenroll_date_forms($startform,$endform);
             } elsif ($item eq 'section') {
                 my $currsec;
@@ -6016,19 +6008,19 @@ ENDSCRIPT
                     next;
                 }
                 my $sections_select = 
-                    &Apache::lonuserutils::course_sections(\%sections_count,'st',$currsec,$disabled);
+                    &Apache::lonuserutils::course_sections(\%sections_count,'st',$currsec);
                 $output .= '<table class="LC_createuser">'."\n".
                            '<tr class="LC_section_row">'."\n".
                            '<td align="center">'.&mt('Existing sections')."\n".
                            '<br />'.$sections_select.'</td><td align="center">'.
                            &mt('New section').'<br />'."\n".
-                           '<input type="text" name="newsec" size="15" value="'.$newsecval.'"'.$disabled.' />'."\n".
+                           '<input type="text" name="newsec" size="15" value="'.$newsecval.'" />'."\n".
                            '<input type="hidden" name="sections" value="" />'."\n".
                            '</td></tr></table>'."\n";
             } elsif ($item eq 'approval') {
                 my ($currnotified,$currapproval,%appchecked);
                 my %selfdescs = &Apache::lonuserutils::selfenroll_default_descs();
-                if (ref($currsettings) eq 'HASH') {
+                if (ref($currsettings) eq 'HASH') { 
                     $currnotified = $currsettings->{'selfenroll_notifylist'};
                     $currapproval = $currsettings->{'selfenroll_approval'};
                 }
@@ -6044,8 +6036,8 @@ ENDSCRIPT
                 for my $i (0..2) {
                     $output .= '<label>'.
                                '<input type="radio" name="selfenroll_approval" value="'.$i.'"'.
-                               $appchecked{$i}.' onclick="toggleNotify();"'.$disabled.' />'.
-                               $selfdescs{'approval'}{$i}.'</label>'.('&nbsp;'x2);
+                               $appchecked{$i}.' onclick="toggleNotify();" />'.$selfdescs{'approval'}{$i}.
+                               '</label>'.('&nbsp;'x2);
                 }
                 my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1);
                 my (@ccs,%notified);
@@ -6086,7 +6078,7 @@ ENDSCRIPT
                                        &Apache::loncommon::start_data_table_row()
                         }
                         $output .= '<td><span class="LC_nobreak"><label>'.
-                                   '<input type="checkbox" name="selfenroll_notify"'.$notifyon.' value="'.$cc.'"'.$disabled.' />'.
+                                   '<input type="checkbox" name="selfenroll_notify"'.$notifyon.' value="'.$cc.'" />'.
                                    &Apache::loncommon::plainname($ccuname,$ccudom).
                                    '</label></span></td>';
                         $count ++;
@@ -6136,28 +6128,26 @@ ENDSCRIPT
                     $nolimit = ' checked="checked" ';
                 }
                 $output .= '<table><tr><td><label>'.
-                           '<input type="radio" name="selfenroll_limit" value="none"'.$nolimit.$disabled.'/>'.
+                           '<input type="radio" name="selfenroll_limit" value="none"'.$nolimit.'/>'.
                            &mt('No limit').'</label></td><td><label>'.
-                           '<input type="radio" name="selfenroll_limit" value="allstudents"'.$crslimit.$disabled.'/>'.
+                           '<input type="radio" name="selfenroll_limit" value="allstudents"'.$crslimit.'/>'.
                            &mt('Limit by total students').'</label></td><td><label>'.
-                           '<input type="radio" name="selfenroll_limit" value="selfenrolled"'.$selflimit.$disabled.'/>'.
+                           '<input type="radio" name="selfenroll_limit" value="selfenrolled"'.$selflimit.'/>'.
                            &mt('Limit by total self-enrolled students').
                            '</td></tr><tr>'.
                            '<td>&nbsp;</td><td colspan="2"><span class="LC_nobreak">'.
                            ('&nbsp;'x3).&mt('Maximum number allowed: ').
-                           '<input type="text" name="selfenroll_cap" size = "5" value="'.$currcap.'"'.$disabled.' /></td></tr></table>';
+                           '<input type="text" name="selfenroll_cap" size = "5" value="'.$currcap.'" /></td></tr></table>';
             }
             $output .= &Apache::lonhtmlcommon::row_closure(1);
         }
     }
-    $output .= &Apache::lonhtmlcommon::end_pick_box().'<br />';
-    unless ($readonly) {
-        $output .= '<input type="button" name="selfenrollconf" value="'
-                   .&mt('Save').'" onclick="validate_types(this.form);" />';
-    }
-    $output .= '<input type="hidden" name="action" value="selfenroll" />'
-               .'<input type="hidden" name="state" value="done" />'."\n"
-               .$additional.'</form>';
+    $output .= &Apache::lonhtmlcommon::end_pick_box().
+               '<br /><input type="button" name="selfenrollconf" value="'
+               .&mt('Save').'" onclick="validate_types(this.form);" />'
+               .'<input type="hidden" name="action" value="selfenroll" />'
+               .'<input type="hidden" name="state" value="done" />'."\n".
+               $additional.'</form>';
     $r->print($output);
     return;
 }
@@ -6340,16 +6330,12 @@ sub new_selfenroll_dom_row {
 }
 
 sub selfenroll_inst_types {
-    my ($num,$currdom,$currinsttypes,$readonly) = @_;
+    my ($num,$currdom,$currinsttypes) = @_;
     my $output;
     my $numinrow = 4;
     my $count = 0;
     my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($currdom);
     my $othervalue = 'any';
-    my $disabled;
-    if ($readonly) {
-        $disabled = ' disabled="disabled"';
-    }
     if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
         if (keys(%{$usertypes}) > 0) {
             $othervalue = 'other';
@@ -6374,7 +6360,7 @@ sub selfenroll_inst_types {
                         $output .= 'checked="checked"';
                     }
                 }
-                $output .= ' name="selfenroll_types_'.$num.'"'.$disabled.' />'.$usertypes->{$type}.'</label></span></td>';
+                $output .= ' name="selfenroll_types_'.$num.'" />'.$usertypes->{$type}.'</label></span></td>';
             }
             $count ++;
         }
@@ -6397,7 +6383,7 @@ sub selfenroll_inst_types {
         } else {
             $output .= ' checked="checked"';
         }
-        $output .= ' name="selfenroll_types_'.$num.'"'.$disabled.' />'.$othertitle.'</label></span></td></tr></table>';
+        $output .= ' name="selfenroll_types_'.$num.'" />'.$othertitle.'</label></span></td></tr></table>';
     }
     return $output;
 }
@@ -6418,9 +6404,9 @@ sub selfenroll_date_forms {
 }
 
 sub print_userchangelogs_display {
-    my ($r,$context,$permission,$brcrum) = @_;
+    my ($r,$context,$permission) = @_;
     my $formname = 'rolelog';
-    my ($username,$domain,$crstype,$viewablesec,%roleslog);
+    my ($username,$domain,$crstype,%roleslog);
     if ($context eq 'domain') {
         $domain = $env{'request.role.domain'};
         %roleslog=&Apache::lonnet::dump_dom('nohist_rolelog',$domain);
@@ -6429,7 +6415,6 @@ sub print_userchangelogs_display {
             $domain = $env{'course.'.$env{'request.course.id'}.'.domain'};
             $username = $env{'course.'.$env{'request.course.id'}.'.num'};
             $crstype = &Apache::loncommon::course_type();
-            $viewablesec = &Apache::lonuserutils::viewable_section($permission);
             my %saveable_parameters = ('show' => 'scalar',);
             &Apache::loncommon::store_course_settings('roles_log',
                                                       \%saveable_parameters);
@@ -6449,32 +6434,6 @@ sub print_userchangelogs_display {
     }
     if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); }
 
-    my $helpitem;
-    if ($context eq 'course') {
-        $helpitem = 'Course_User_Logs';
-    }
-    push (@{$brcrum},
-             {href => '/adm/createuser?action=changelogs',
-              text => 'User Management Logs',
-              help => $helpitem});
-    my $bread_crumbs_component = 'User Changes';
-    my $args = { bread_crumbs           => $brcrum,
-                 bread_crumbs_component => $bread_crumbs_component};
-
-    # Create navigation javascript
-    my $jsnav = &userlogdisplay_js($formname);
-
-    my $jscript = (<<ENDSCRIPT);
-<script type="text/javascript">
-// <![CDATA[
-$jsnav
-// ]]>
-</script>
-ENDSCRIPT
-
-    # print page header
-    $r->print(&header($jscript,$args));
-
     # set defaults
     my $now = time();
     my $defstart = $now - (7*24*3600); #7 days ago 
@@ -6507,9 +6466,7 @@ ENDSCRIPT
     my ($minshown,$maxshown);
     $minshown = 1;
     my $count = 0;
-    if ($curr{'show'} =~ /\D/) {
-        $curr{'page'} = 1;
-    } else {
+    if ($curr{'show'} ne &mt('all')) { 
         $maxshown = $curr{'page'} * $curr{'show'};
         if ($curr{'page'} > 1) {
             $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
@@ -6521,6 +6478,8 @@ ENDSCRIPT
               &role_display_filter($context,$formname,$domain,$username,\%curr,
                                    $version,$crstype));
 
+    # Create navigation
+    my ($nav_script,$nav_links) = &userlogdisplay_nav($formname,\%curr,$more_records);
     my $showntableheader = 0;
 
     # Table Header
@@ -6545,7 +6504,7 @@ ENDSCRIPT
     foreach my $id (sort { $roleslog{$b}{'exe_time'}<=>$roleslog{$a}{'exe_time'} } (keys(%roleslog))) {
         next if (($roleslog{$id}{'exe_time'} < $curr{'rolelog_start_date'}) ||
                  ($roleslog{$id}{'exe_time'} > $curr{'rolelog_end_date'}));
-        if ($curr{'show'} !~ /\D/) {
+        if ($curr{'show'} ne &mt('all')) {
             if ($count >= $curr{'page'} * $curr{'show'}) {
                 $more_records = 1;
                 last;
@@ -6561,13 +6520,12 @@ ENDSCRIPT
                 next if ($roleslog{$id}{'logentry'}{'context'} ne $curr{'chgcontext'});
             }
         }
-        if (($context eq 'course') && ($viewablesec ne '')) {
-            next if ($roleslog{$id}{'logentry'}{'section'} ne $viewablesec);
-        }
         $count ++;
         next if ($count < $minshown);
         unless ($showntableheader) {
-            $r->print(&Apache::loncommon::start_data_table()
+            $r->print($nav_script
+                     .$nav_links
+                     .&Apache::loncommon::start_data_table()
                      .$tableheader);
             $r->rflush();
             $showntableheader = 1;
@@ -6628,8 +6586,8 @@ ENDSCRIPT
     }
 
     if ($showntableheader) { # Table footer, if content displayed above
-        $r->print(&Apache::loncommon::end_data_table().
-                  &userlogdisplay_navlinks(\%curr,$more_records));
+        $r->print(&Apache::loncommon::end_data_table()
+                 .$nav_links);
     } else { # No content displayed above
         $r->print('<p class="LC_info">'
                  .&mt('There are no records to display.')
@@ -6645,338 +6603,15 @@ ENDSCRIPT
     return;
 }
 
-sub print_useraccesslogs_display {
-    my ($r,$uname,$udom,$permission,$brcrum) = @_;
-    my $formname = 'accesslog';
-    my $form = 'document.accesslog';
-
-# set breadcrumbs
-    my %breadcrumb_text = &singleuser_breadcrumb('','domain',$udom);
-    push (@{$brcrum},
-        {href => "javascript:backPage($form)",
-         text => $breadcrumb_text{'search'}});
-    my (@prevphases,$prevphasestr);
-    if ($env{'form.prevphases'}) {
-        @prevphases = split(/,/,$env{'form.prevphases'});
-        $prevphasestr = $env{'form.prevphases'};
-    }
-    if (($env{'form.phase'} eq 'userpicked') || (grep(/^userpicked$/,@prevphases))) {
-        push(@{$brcrum},
-              {href => "javascript:backPage($form,'get_user_info','select')",
-               text => $breadcrumb_text{'userpicked'}});
-        if ($env{'form.phase'} eq 'userpicked') {
-            $prevphasestr = 'userpicked';
-        }
-    }
-    push(@{$brcrum},
-             {href => '/adm/createuser?action=accesslogs',
-              text => 'User access logs',
-              help => 'Domain_User_Access_Logs'});
-    my $bread_crumbs_component = 'User Access Logs';
-    my $args = { bread_crumbs           => $brcrum,
-                 bread_crumbs_component => 'User Management'};
-    if ($env{'form.popup'}) {
-        $args->{'no_nav_bar'} = 1;
-    }
-
-# set javascript
-    my ($jsback,$elements) = &crumb_utilities();
-    my $jsnav = &userlogdisplay_js($formname);
-
-    my $jscript = (<<ENDSCRIPT);
+sub userlogdisplay_nav {
+    my ($formname,$curr,$more_records) = @_;
+    my ($nav_script,$nav_links);
+    if (ref($curr) eq 'HASH') {
+        # Create Navigation:
+        # Navigation Script
+        $nav_script = <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
-
-$jsback
-$jsnav
-
-// ]]>
-</script>
-
-ENDSCRIPT
-
-# print page header
-    $r->print(&header($jscript,$args));
-
-# early out unless log data can be displayed.
-    unless ($permission->{'activity'}) {
-        $r->print('<p class="LC_warning">'
-                 .&mt('You do not have rights to display user access logs.')
-                 .'</p>'
-                 .&earlyout_accesslog_form($formname,$prevphasestr,$udom));
-        return;
-    }
-
-    unless ($udom eq $env{'request.role.domain'}) {
-        $r->print('<p class="LC_warning">'
-                 .&mt("User's domain must match role's domain")
-                 .'</p>'
-                 .&earlyout_accesslog_form($formname,$prevphasestr,$udom));
-        return;
-    }
-
-    if (($uname eq '') || ($udom eq '')) {
-        $r->print('<p class="LC_warning">'
-                 .&mt('Invalid username or domain')
-                 .'</p>'
-                 .&earlyout_accesslog_form($formname,$prevphasestr,$udom));
-        return;
-    }
-
-# set defaults
-    my $now = time();
-    my $defstart = $now - (7*24*3600);
-    my %defaults = (
-                     page                 => '1',
-                     show                 => '10',
-                     activity             => 'any',
-                     accesslog_start_date => $defstart,
-                     accesslog_end_date   => $now,
-                   );
-    my $more_records = 0;
-
-# set current
-    my %curr;
-    foreach my $item ('show','page','activity') {
-        $curr{$item} = $env{'form.'.$item};
-    }
-    my ($startdate,$enddate) =
-        &Apache::lonuserutils::get_dates_from_form('accesslog_start_date','accesslog_end_date');
-    $curr{'accesslog_start_date'} = $startdate;
-    $curr{'accesslog_end_date'} = $enddate;
-    foreach my $key (keys(%defaults)) {
-        if ($curr{$key} eq '') {
-            $curr{$key} = $defaults{$key};
-        }
-    }
-    my ($minshown,$maxshown);
-    $minshown = 1;
-    my $count = 0;
-    if ($curr{'show'} =~ /\D/) {
-        $curr{'page'} = 1;
-    } else {
-        $maxshown = $curr{'page'} * $curr{'show'};
-        if ($curr{'page'} > 1) {
-            $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
-        }
-    }
-
-# form header
-    $r->print('<form action="/adm/createuser" method="post" name="'.$formname.'">'.
-              &activity_display_filter($formname,\%curr));
-
-    my $showntableheader = 0;
-    my ($nav_script,$nav_links);
-
-# table header
-    my $tableheader =
-        &Apache::loncommon::start_data_table_header_row()
-       .'<th>&nbsp;</th>'
-       .'<th>'.&mt('When').'</th>'
-       .'<th>'.&mt('HostID').'</th>'
-       .'<th>'.&mt('Event').'</th>'
-       .'<th>'.&mt('Other data').'</th>'
-       .&Apache::loncommon::end_data_table_header_row();
-
-    my %filters=(
-        start  => $curr{'accesslog_start_date'},
-        end    => $curr{'accesslog_end_date'},
-        action => $curr{'activity'},
-    );
-
-    my $reply = &Apache::lonnet::userlog_query($uname,$udom,%filters);
-    unless ( ($reply =~/^timeout/) || ($reply =~/^error/) ) {
-        my (%courses,%missing);
-        my @results = split(/\&/,$reply);
-        foreach my $item (reverse(@results)) {
-            my ($timestamp,$host,$event) = split(/:/,$item);
-            next unless ($event =~ /^(Log|Role)/);
-            if ($curr{'show'} !~ /\D/) {
-                if ($count >= $curr{'page'} * $curr{'show'}) {
-                    $more_records = 1;
-                    last;
-                }
-            }
-            $count ++;
-            next if ($count < $minshown);
-            unless ($showntableheader) {
-                $r->print($nav_script
-                         .&Apache::loncommon::start_data_table()
-                         .$tableheader);
-                $r->rflush();
-                $showntableheader = 1;
-            }
-            my ($shown,$extra);
-            my ($event,$data) = split(/\s+/,&unescape($event));
-            if ($event eq 'Role') {
-                my ($rolecode,$extent) = split(/\./,$data,2);
-                next if ($extent eq '');
-                my ($crstype,$desc,$info);
-                if ($extent =~ m{^/($match_domain)/($match_courseid)(?:/(\w+)|)$}) {
-                    my ($cdom,$cnum,$sec) = ($1,$2,$3);
-                    my $cid = $cdom.'_'.$cnum;
-                    if (exists($courses{$cid})) {
-                        $crstype = $courses{$cid}{'type'};
-                        $desc = $courses{$cid}{'description'};
-                    } elsif ($missing{$cid}) {
-                        $crstype = 'Course';
-                        $desc = 'Course/Community';
-                    } else {
-                        my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,undef,undef,'.');
-                        if (ref($crsinfo{$cdom.'_'.$cnum}) eq 'HASH') {
-                            $courses{$cid} = $crsinfo{$cid};
-                            $crstype = $crsinfo{$cid}{'type'};
-                            $desc = $crsinfo{$cid}{'description'};
-                        } else {
-                            $missing{$cid} = 1;
-                        }
-                    }
-                    $extra = &mt($crstype).': <a href="/public/'.$cdom.'/'.$cnum.'/syllabus">'.$desc.'</a>';
-                    if ($sec ne '') {
-                       $extra .= ' ('.&mt('Section: [_1]',$sec).')';
-                    }
-                } elsif ($extent =~ m{^/($match_domain)/($match_username|$)}) {
-                    my ($dom,$name) = ($1,$2);
-                    if ($rolecode eq 'au') {
-                        $extra = '';
-                    } elsif ($rolecode =~ /^(ca|aa)$/) {
-                        $extra = &mt('Authoring Space: [_1]',$name.':'.$dom);
-                    } elsif ($rolecode =~ /^(li|dg|dh|dc|sc)$/) {
-                        $extra = &mt('Domain: [_1]',$dom);
-                    }
-                }
-                my $rolename;
-                if ($rolecode =~ m{^cr/($match_domain)/($match_username)/(\w+)}) {
-                    my $role = $3;
-                    my $owner = "($2:$1)";
-                    if ($2 eq $1.'-domainconfig') {
-                        $owner = '(ad hoc)';
-                    }
-                    $rolename = &mt('Custom role: [_1]',$role.' '.$owner);
-                } else {
-                    $rolename = &Apache::lonnet::plaintext($rolecode,$crstype);
-                }
-                $shown = &mt('Role selection: [_1]',$rolename);
-            } else {
-                $shown = &mt($event);
-                if ($data ne '') {
-                   $extra = &mt('Client IP address: [_1]',$data);
-                }
-            }
-            $r->print(
-            &Apache::loncommon::start_data_table_row()
-           .'<td>'.$count.'</td>'
-           .'<td>'.&Apache::lonlocal::locallocaltime($timestamp).'</td>'
-           .'<td>'.$host.'</td>'
-           .'<td>'.$shown.'</td>'
-           .'<td>'.$extra.'</td>'
-           .&Apache::loncommon::end_data_table_row()."\n");
-        }
-    }
-
-    if ($showntableheader) { # Table footer, if content displayed above
-        $r->print(&Apache::loncommon::end_data_table().
-                  &userlogdisplay_navlinks(\%curr,$more_records));
-    } else { # No content displayed above
-        $r->print('<p class="LC_info">'
-                 .&mt('There are no records to display.')
-                 .'</p>');
-    }
-
-    if ($env{'form.popup'} == 1) {
-        $r->print('<input type="hidden" name="popup" value="1" />'."\n");
-    }
-
-    # Form Footer
-    $r->print(
-        '<input type="hidden" name="currstate" value="" />'
-       .'<input type="hidden" name="accessuname" value="'.$uname.'" />'
-       .'<input type="hidden" name="accessudom" value="'.$udom.'" />'
-       .'<input type="hidden" name="page" value="'.$curr{'page'}.'" />'
-       .'<input type="hidden" name="prevphases" value="'.$prevphasestr.'" />'
-       .'<input type="hidden" name="phase" value="activity" />'
-       .'<input type="hidden" name="action" value="accesslogs" />'
-       .'<input type="hidden" name="srchdomain" value="'.$udom.'" />'
-       .'<input type="hidden" name="srchby" value="'.$env{'form.srchby'}.'" />'
-       .'<input type="hidden" name="srchtype" value="'.$env{'form.srchtype'}.'" />'
-       .'<input type="hidden" name="srchterm" value="'.&HTML::Entities::encode($env{'form.srchterm'},'<>"&').'" />'
-       .'<input type="hidden" name="srchin" value="'.$env{'form.srchin'}.'" />'
-       .'</form>');
-    return;
-}
-
-sub earlyout_accesslog_form {
-    my ($formname,$prevphasestr,$udom) = @_;
-    my $srchterm = &HTML::Entities::encode($env{'form.srchterm'},'<>"&');
-   return <<"END";
-<form action="/adm/createuser" method="post" name="$formname">
-<input type="hidden" name="currstate" value="" />
-<input type="hidden" name="prevphases" value="$prevphasestr" />
-<input type="hidden" name="phase" value="activity" />
-<input type="hidden" name="action" value="accesslogs" />
-<input type="hidden" name="srchdomain" value="$udom" />
-<input type="hidden" name="srchby" value="$env{'form.srchby'}" />
-<input type="hidden" name="srchtype" value="$env{'form.srchtype'}" />
-<input type="hidden" name="srchterm" value="$srchterm" />
-<input type="hidden" name="srchin" value="$env{'form.srchin'}" />
-</form>
-END
-}
-
-sub activity_display_filter {
-    my ($formname,$curr) = @_;
-    my $nolink = 1;
-    my $output = '<table><tr><td valign="top">'.
-                 '<span class="LC_nobreak"><b>'.&mt('Actions/page:').'</b></span><br />'.
-                 &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
-                                              (&mt('all'),5,10,20,50,100,1000,10000)).
-                 '</td><td>&nbsp;&nbsp;</td>';
-    my $startform =
-        &Apache::lonhtmlcommon::date_setter($formname,'accesslog_start_date',
-                                            $curr->{'accesslog_start_date'},undef,
-                                            undef,undef,undef,undef,undef,undef,$nolink);
-    my $endform =
-        &Apache::lonhtmlcommon::date_setter($formname,'accesslog_end_date',
-                                            $curr->{'accesslog_end_date'},undef,
-                                            undef,undef,undef,undef,undef,undef,$nolink);
-    my %lt = &Apache::lonlocal::texthash (
-                                          activity => 'Activity',
-                                          Role     => 'Role selection',
-                                          log      => 'Log-in or Logout',
-    );
-    $output .= '<td valign="top"><b>'.&mt('Window during which actions occurred:').'</b><br />'.
-               '<table><tr><td>'.&mt('After:').
-               '</td><td>'.$startform.'</td></tr>'.
-               '<tr><td>'.&mt('Before:').'</td>'.
-               '<td>'.$endform.'</td></tr></table>'.
-               '</td>'.
-               '<td>&nbsp;&nbsp;</td>'.
-               '<td valign="top"><b>'.&mt('Activities').'</b><br />'.
-               '<select name="activity"><option value="any"';
-    if ($curr->{'activity'} eq 'any') {
-        $output .= ' selected="selected"';
-    }
-    $output .= '>'.&mt('Any').'</option>'."\n";
-    foreach my $activity ('Role','log') {
-        my $selstr = '';
-        if ($activity eq $curr->{'activity'}) {
-            $selstr = ' selected="selected"';
-        }
-        $output .= '<option value="'.$activity.'"'.$selstr.'>'.$lt{$activity}.'</option>';
-    }
-    $output .= '</select></td>'.
-               '</tr></table>';
-    # Update Display button
-    $output .= '<p>'
-              .'<input type="submit" value="'.&mt('Update Display').'" />'
-              .'</p>';
-    return $output;
-}
-
-sub userlogdisplay_js {
-    my ($formname) = @_;
-    return <<"ENDSCRIPT";
-
 function chgPage(caller) {
     if (caller == 'previous') {
         document.$formname.page.value --;
@@ -6987,30 +6622,28 @@ function chgPage(caller) {
     document.$formname.submit();
     return;
 }
+// ]]>
+</script>
 ENDSCRIPT
-}
-
-sub userlogdisplay_navlinks {
-    my ($curr,$more_records) = @_;
-    return unless(ref($curr) eq 'HASH');
-    # Navigation Buttons
-    my $nav_links = '<p>';
-    if (($curr->{'page'} > 1) || ($more_records)) {
-        if (($curr->{'page'} > 1) && ($curr->{'show'} !~ /\D/)) {
-            $nav_links .= '<input type="button"'
-                         .' onclick="javascript:chgPage('."'previous'".');"'
-                         .' value="'.&mt('Previous [_1] changes',$curr->{'show'})
-                         .'" /> ';
-        }
-        if ($more_records) {
-            $nav_links .= '<input type="button"'
-                         .' onclick="javascript:chgPage('."'next'".');"'
-                         .' value="'.&mt('Next [_1] changes',$curr->{'show'})
-                         .'" />';
+        # Navigation Buttons
+        $nav_links = '<p>';
+        if (($curr->{'page'} > 1) || ($more_records)) {
+            if ($curr->{'page'} > 1) {
+                $nav_links .= '<input type="button"'
+                             .' onclick="javascript:chgPage('."'previous'".');"'
+                             .' value="'.&mt('Previous [_1] changes',$curr->{'show'})
+                             .'" /> ';
+            }
+            if ($more_records) {
+                $nav_links .= '<input type="button"'
+                             .' onclick="javascript:chgPage('."'next'".');"'
+                             .' value="'.&mt('Next [_1] changes',$curr->{'show'})
+                             .'" />';
+            }
         }
+        $nav_links .= '</p>';
     }
-    $nav_links .= '</p>';
-    return $nav_links;
+    return ($nav_script,$nav_links);
 }
 
 sub role_display_filter {
@@ -7190,29 +6823,13 @@ sub user_search_result {
         }
     }
     if ($response ne '') {
-        $response = '<span class="LC_warning">'.$response.'</span><br />';
+        $response = '<span class="LC_warning">'.$response.'</span>';
     }
     if ($srch->{'srchin'} eq 'instd') {
-        my $instd_chk = &instdirectorysrch_check($srch);
+        my $instd_chk = &directorysrch_check($srch);
         if ($instd_chk ne 'ok') {
-            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 .= '<br />';
-        }
-    } else {
-        unless (($context eq 'requestcrs') && ($srch->{'srchtype'} eq 'exact')) {
-            my $domd_chk = &domdirectorysrch_check($srch);
-            if ($domd_chk ne 'ok') {
-                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 .= '<br />';
-            }
+            $response = '<span class="LC_warning">'.$instd_chk.'</span>'.
+                        '<br />'.&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').'<br /><br />';
         }
     }
     if ($response ne '') {
@@ -7242,9 +6859,6 @@ sub user_search_result {
                                 &build_search_response($context,$srch,%srch_results);
                         } else {
                             $currstate = 'modify';
-                            if ($env{'form.action'} eq 'accesslogs') {
-                                $currstate = 'activity';
-                            }
                             my $uname = $srch->{'srchterm'};
                             my $udom = $srch->{'srchdomain'};
                             $srch_results{$uname.':'.$udom} =
@@ -7311,7 +6925,7 @@ sub user_search_result {
                     &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.').
-                    '<br />'; 
+                    '<br /><br />'; 
             }
         }
     } else {
@@ -7379,38 +6993,18 @@ sub user_search_result {
                 ($currstate,$response,$forcenewuser) = 
                     &build_search_response($context,$srch,%srch_results);
             } else {
-                my $showdom = &display_domain_info($srch->{'srchdomain'});
-                $response = '<span class="LC_warning">'.
+                my $showdom = &display_domain_info($srch->{'srchdomain'});                $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.').
-                    '<br />';
+                    '<br /><br />';
             }
         }
     }
     return ($currstate,$response,$forcenewuser,\%srch_results);
 }
 
-sub domdirectorysrch_check {
-    my ($srch) = @_;
-    my $response;
-    my %dom_inst_srch = &Apache::lonnet::get_dom('configuration',
-                                             ['directorysrch'],$srch->{'srchdomain'});
-    my $showdom = &display_domain_info($srch->{'srchdomain'});
-    if (ref($dom_inst_srch{'directorysrch'}) eq 'HASH') {
-        if ($dom_inst_srch{'directorysrch'}{'lcavailable'} eq '0') {
-            return &mt('LON-CAPA directory search is not available in domain: [_1]',$showdom);
-        }
-        if ($dom_inst_srch{'directorysrch'}{'lclocalonly'}) {
-            if ($env{'request.role.domain'} ne $srch->{'srchdomain'}) {
-                return &mt('LON-CAPA directory search in domain: [_1] is only allowed for users with a current role in the domain.',$showdom);
-            }
-        }
-    }
-    return 'ok';
-}
-
-sub instdirectorysrch_check {
+sub directorysrch_check {
     my ($srch) = @_;
     my $can_search = 0;
     my $response;
@@ -7532,11 +7126,7 @@ sub build_search_response {
         $currstate = 'select';
     } else {
         if (keys(%srch_results) == 1) {
-            if ($env{'form.action'} eq 'accesslogs') {
-                $currstate = 'activity';
-            } else {
-                $currstate = 'modify';
-            }
+            $currstate = 'modify';
             $response = &mt("$single{$srch->{'srchtype'}} was found for the $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}.",$srch->{'srchterm'});
             if ($srch->{'srchin'} eq 'dom' || $srch->{'srchin'} eq 'instd') {
                 $response .= ': '.&display_domain_info($srch->{'srchdomain'});
@@ -7581,8 +7171,7 @@ sub build_search_response {
                     $createdom = $env{'form.coursedom'};
                 }
             }
-            unless (($env{'form.action'} eq 'accesslogs') || (($srch->{'srchby'} eq 'uname') && ($srch->{'srchin'} eq 'dom') &&
-                    ($srch->{'srchtype'} eq 'exact') && ($srch->{'srchdomain'} eq $createdom))) {
+            if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $createdom)) {
                 my $cancreate =
                     &Apache::lonuserutils::can_create_user($createdom,$context);
                 my $targetdom = '<span class="LC_cusr_emph">'.$createdom.'</span>';
@@ -7606,20 +7195,18 @@ sub build_search_response {
                                 .&mt("Click 'Search'")
                                 .'</li></ul><br />';
                 } else {
-                    unless (($context eq 'domain') && ($env{'form.action'} eq 'singleuser')) {
-                        my $helplink = ' href="javascript:helpMenu('."'display'".')"';
-                        $response .= '<br /><br />';
-                        if ($context eq 'requestcrs') {
-                            $response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom);
-                        } else {
-                            $response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom);
-                        }
-                        $response .= '<br />'
-                                     .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.'
-                                        ,' <a'.$helplink.'>'
-                                        ,'</a>')
-                                     .'<br />';
+                    my $helplink = ' href="javascript:helpMenu('."'display'".')"';
+                    $response .= '<br /><br />';
+                    if ($context eq 'requestcrs') {
+                        $response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom);
+                    } else {
+                        $response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom);
                     }
+                    $response .= '<br />'
+                                 .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.'
+                                    ,' <a'.$helplink.'>'
+                                    ,'</a>')
+                                 .'<br /><br />';
                 }
             }
         }