--- loncom/interface/loncreateuser.pm	2003/06/19 21:46:38	1.55
+++ loncom/interface/loncreateuser.pm	2008/08/26 23:20:22	1.249.2.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.55 2003/06/19 21:46:38 www Exp $
+# $Id: loncreateuser.pm,v 1.249.2.6 2008/08/26 23:20:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,136 +25,361 @@
 #
 # http://www.lon-capa.org/
 #
-# (Create a course
-# (My Desk
-#
-# (Internal Server Error Handler
-#
-# (Login Screen
-# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14,
-# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer)
-#
-# YEAR=2001
-# 3/1/1 Gerd Kortemeyer)
-#
-# 3/1 Gerd Kortemeyer)
-#
-# 2/14 Gerd Kortemeyer)
-#
-# 2/14,2/17,2/19,2/20,2/21,2/22,2/23,3/2,3/17,3/24,04/12 Gerd Kortemeyer
-# April Guy Albertelli
-# 05/10,10/16 Gerd Kortemeyer 
-# 02/11/02 Matthew Hall
-#
-# $Id: loncreateuser.pm,v 1.55 2003/06/19 21:46:38 www Exp $
 ###
 
 package Apache::loncreateuser;
 
+=pod
+
+=head1 NAME
+
+Apache::loncreateuser - handler to create users and custom roles
+
+=head1 SYNOPSIS
+
+Apache::loncreateuser provides an Apache handler for creating users,
+    editing their login parameters, roles, and removing roles, and
+    also creating and assigning custom roles.
+
+=head1 OVERVIEW
+
+=head2 Custom Roles
+
+In LON-CAPA, roles are actually collections of privileges. "Teaching
+Assistant", "Course Coordinator", and other such roles are really just
+collection of privileges that are useful in many circumstances.
+
+Creating custom roles can be done by the Domain Coordinator through
+the Create User functionality. That screen will show all privileges
+that can be assigned to users. For a complete list of privileges,
+please see C</home/httpd/lonTabs/rolesplain.tab>.
+
+Custom role definitions are stored in the C<roles.db> file of the role
+author.
+
+=cut
+
 use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonnet;
 use Apache::loncommon;
+use Apache::lonlocal;
+use Apache::longroup;
+use Apache::lonuserutils;
+use LONCAPA qw(:DEFAULT :match);
 
 my $loginscript; # piece of javascript used in two separate instances
-my $generalrule;
 my $authformnop;
 my $authformkrb;
 my $authformint;
 my $authformfsys;
 my $authformloc;
 
-BEGIN {
-    $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
-    my $krbdefdom=$1;
-    $krbdefdom=~tr/a-z/A-Z/;
-    my %param = ( formname => 'document.cu',
-                  kerb_def_dom => $krbdefdom 
-                  );
-# no longer static due to configurable kerberos defaults
-#    $loginscript  = &Apache::loncommon::authform_header(%param);
-    $generalrule  = &Apache::loncommon::authform_authorwarning(%param);
+sub initialize_authen_forms {
+    my ($dom,$formname,$curr_authtype,$mode) = @_;
+    my ($krbdef,$krbdefdom) = &Apache::loncommon::get_kerberos_defaults($dom);
+    my %param = ( formname => $formname,
+                  kerb_def_dom => $krbdefdom,
+                  kerb_def_auth => $krbdef,
+                  domain => $dom,
+                );
+    my %abv_auth = &auth_abbrev();
+    if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix):(.*)$/) {
+        my $long_auth = $1;
+        my $curr_autharg = $2;
+        my %abv_auth = &auth_abbrev();
+        $param{'curr_authtype'} = $abv_auth{$long_auth};
+        if ($long_auth =~ /^krb(4|5)$/) {
+            $param{'curr_kerb_ver'} = $1;
+            $param{'curr_autharg'} = $curr_autharg;
+        }
+        if ($mode eq 'modifyuser') {
+            $param{'mode'} = $mode;
+        }
+    }
+    $loginscript  = &Apache::loncommon::authform_header(%param);
+    $authformkrb  = &Apache::loncommon::authform_kerberos(%param);
     $authformnop  = &Apache::loncommon::authform_nochange(%param);
-# no longer static due to configurable kerberos defaults
-#    $authformkrb  = &Apache::loncommon::authform_kerberos(%param);
     $authformint  = &Apache::loncommon::authform_internal(%param);
     $authformfsys = &Apache::loncommon::authform_filesystem(%param);
     $authformloc  = &Apache::loncommon::authform_local(%param);
 }
 
+sub auth_abbrev {
+    my %abv_auth = (
+                     krb4     => 'krb',
+                     internal => 'int',
+                     localuth => 'loc',
+                     unix     => 'fsys',
+                   );
+    return %abv_auth;
+}
 
+# ====================================================
 
-# ==================================================== Figure out author access
-
-sub authorpriv {
-    my ($auname,$audom)=@_;
-    if (($auname ne $ENV{'user.name'}) ||
-        (($audom ne $ENV{'user.domain'}) &&
-         ($audom ne $ENV{'request.role.domain'}))) { return ''; }
-    unless (&Apache::lonnet::allowed('cca',$audom)) { return ''; }
-    return 1;
+sub portfolio_quota {
+    my ($ccuname,$ccdomain) = @_;
+    my %lt = &Apache::lonlocal::texthash(
+                   'disk' => "Disk space allocated to user's portfolio files",
+                   'cuqu' => "Current quota",
+                   'cust' => "Custom quota",
+                   'defa' => "Default",
+                   'chqu' => "Change quota",
+    );
+    my ($currquota,$quotatype,$inststatus,$defquota) = 
+        &Apache::loncommon::get_user_quota($ccuname,$ccdomain);
+    my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($ccdomain);
+    my ($longinsttype,$showquota,$custom_on,$custom_off,$defaultinfo);
+    if ($inststatus ne '') {
+        if ($usertypes->{$inststatus} ne '') {
+            $longinsttype = $usertypes->{$inststatus};
+        }
+    }
+    $custom_on = ' ';
+    $custom_off = ' checked="checked" ';
+    my $quota_javascript = <<"END_SCRIPT";
+<script type="text/javascript">
+function quota_changes(caller) {
+    if (caller == "custom") {
+        if (document.cu.customquota[0].checked) {
+            document.cu.portfolioquota.value = "";
+        }
+    }
+    if (caller == "quota") {
+        document.cu.customquota[1].checked = true;
+    }
+}
+</script>
+END_SCRIPT
+    if ($quotatype eq 'custom') {
+        $custom_on = $custom_off;
+        $custom_off = ' ';
+        $showquota = $currquota;
+        if ($longinsttype eq '') {
+            $defaultinfo = &mt('For this user, the default quota would be [_1]'
+                            .' Mb.',$defquota);
+        } else {
+            $defaultinfo = &mt("For this user, the default quota would be [_1]".
+                               " Mb, as determined by the user's institutional".
+                               " affiliation ([_2]).",$defquota,$longinsttype);
+        }
+    } else {
+        if ($longinsttype eq '') {
+            $defaultinfo = &mt('For this user, the default quota is [_1]'
+                            .' Mb.',$defquota);
+        } else {
+            $defaultinfo = &mt("For this user, the default quota of [_1]".
+                               " Mb, is determined by the user's institutional".
+                               " affiliation ([_2]).",$defquota,$longinsttype);
+        }
+    }
+    my $output = $quota_javascript.
+                 '<h3>'.$lt{'disk'}.'</h3>'.
+                 &Apache::loncommon::start_data_table().
+                 &Apache::loncommon::start_data_table_row().
+                 '<td>'.$lt{'cuqu'}.': '.$currquota.'&nbsp;Mb.&nbsp;&nbsp;'.
+                 $defaultinfo.'</td>'.
+                 &Apache::loncommon::end_data_table_row().
+                 &Apache::loncommon::start_data_table_row().
+                 '<td><span class="LC_nobreak">'.$lt{'chqu'}.
+                 ': <label>'.
+                 '<input type="radio" name="customquota" value="0" '.
+                 $custom_off.' onchange="javascript:quota_changes('."'custom'".')"
+                  />'.$lt{'defa'}.'&nbsp;('.$defquota.' Mb).</label>&nbsp;'.
+                 '&nbsp;<label><input type="radio" name="customquota" value="1" '. 
+                 $custom_on.'  onchange="javascript:quota_changes('."'custom'".')" />'.
+                 $lt{'cust'}.':</label>&nbsp;'.
+                 '<input type="text" name="portfolioquota" size ="5" value="'.
+                 $showquota.'" onfocus="javascript:quota_changes('."'quota'".')" '.
+                 '/>&nbsp;Mb</span></td>'.
+                 &Apache::loncommon::end_data_table_row().
+                 &Apache::loncommon::end_data_table();
+    return $output;
 }
 
 # =================================================================== Phase one
 
 sub print_username_entry_form {
-    my $r=shift;
-    my $defdom=$ENV{'request.role.domain'};
-    my @domains = &Apache::loncommon::get_domains();
-    my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
-    my $bodytag =&Apache::loncommon::bodytag(
-                                  'Create Users, Change User Privileges');
-    my $selscript=&Apache::loncommon::studentbrowser_javascript();
-    my $sellink=&Apache::loncommon::selectstudent_link
-                                        ('crtuser','ccuname','ccdomain');
-    $r->print(<<"ENDDOCUMENT");
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-$selscript
-</head>
-$bodytag
+    my ($r,$context,$response,$srch,$forcenewuser) = @_;
+    my $defdom=$env{'request.role.domain'};
+    my $formtoset = 'crtuser';
+    if (exists($env{'form.startrolename'})) {
+        $formtoset = 'docustom';
+        $env{'form.rolename'} = $env{'form.startrolename'};
+    } elsif ($env{'form.origform'} eq 'crtusername') {
+        $formtoset =  $env{'form.origform'};
+    }
+
+    my ($jsback,$elements) = &crumb_utilities();
+
+    my $jscript = &Apache::loncommon::studentbrowser_javascript()."\n".
+        '<script type="text/javascript">'."\n".
+        &Apache::lonhtmlcommon::set_form_elements($elements->{$formtoset}).
+        '</script>'."\n";
+
+    my %loaditems = (
+                'onload' => "javascript:setFormElements(document.$formtoset)",
+                    );
+    my %breadcrumb_text = &singleuser_breadcrumb();
+    my $start_page =
+	&Apache::loncommon::start_page('User Management',
+				       $jscript,{'add_entries' => \%loaditems,});
+    if ($env{'form.action'} eq 'custom') {
+        &Apache::lonhtmlcommon::add_breadcrumb
+          ({href=>"javascript:backPage(document.crtuser)",
+            text=>"Pick custom role",});
+    } else {
+        &Apache::lonhtmlcommon::add_breadcrumb
+          ({href=>"javascript:backPage(document.crtuser)",
+            text=>$breadcrumb_text{'search'},
+            faq=>282,bug=>'Instructor Interface',});
+    }
+    my $helpitem = 'Course_Change_Privileges';
+    if ($env{'form.action'} eq 'custom') {
+        $helpitem = 'Course_Editing_Custom_Roles';
+    } elsif ($env{'form.action'} eq 'singlestudent') {
+        $helpitem = 'Course_Add_Student';
+    }
+    my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                     $helpitem);
+    my %existingroles=&Apache::lonuserutils::my_custom_roles();
+    my $choice=&Apache::loncommon::select_form('make new role','rolename',
+		('make new role' => 'Generate new role ...',%existingroles));
+    my %lt=&Apache::lonlocal::texthash(
+                    'srst' => 'Search for a user and enroll as a student',
+                    'srad' => 'Search for a user and modify/add user information or roles',
+		    'usr'  => "Username",
+                    'dom'  => "Domain",
+                    'ecrp' => "Edit Custom Role Privileges",
+                    'nr'   => "Name of Role",
+                    'cre'  => "Custom Role Editor",
+				       );
+    $r->print($start_page."\n".$crumbs);
+    if ($env{'form.action'} eq 'custom') {
+        if (&Apache::lonnet::allowed('mcr','/')) {
+            $r->print(<<ENDCUSTOM);
+<form action="/adm/createuser" method="post" name="docustom">
+<input type="hidden" name="action" value="$env{'form.action'}" />
+<input type="hidden" name="phase" value="selected_custom_edit" />
+<h3>$lt{'ecrp'}</h3>
+$lt{'nr'}: $choice <input type="text" size="15" name="newrolename" /><br />
+<input name="customeditor" type="submit" value="$lt{'cre'}" />
+</form>
+ENDCUSTOM
+        }
+    } else {
+        my $actiontext = $lt{'srad'};
+        if ($env{'form.action'} eq 'singlestudent') {
+            $actiontext = $lt{'srst'};
+        }
+        $r->print("
+<h3>$actiontext</h3>");
+        if ($env{'form.origform'} ne 'crtusername') {
+            $r->print("\n".$response);
+        }
+        $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response));
+    }
+    $r->print(&Apache::loncommon::end_page());
+}
+
+sub entry_form {
+    my ($dom,$srch,$forcenewuser,$context,$responsemsg) = @_;
+    my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
+    my ($usertype,$inexact);
+    if (ref($srch) eq 'HASH') {
+        if (($srch->{'srchin'} eq 'dom') &&
+            ($srch->{'srchby'} eq 'uname') &&
+            ($srch->{'srchtype'} eq 'exact') &&
+            ($srch->{'srchdomain'} ne '') &&
+            ($srch->{'srchterm'} ne '')) {
+            my ($rules,$ruleorder) =
+                &Apache::lonnet::inst_userrules($srch->{'srchdomain'},'username');
+            $usertype = &Apache::lonuserutils::check_usertype($srch->{'srchdomain'},$srch->{'srchterm'},$rules);
+        } else {
+            $inexact = 1;
+        }
+    }
+    my $cancreate =
+        &Apache::lonuserutils::can_create_user($dom,$context,$usertype);
+    my $userpicker = 
+       &Apache::loncommon::user_picker($dom,$srch,$forcenewuser,
+                                       'document.crtuser',$cancreate,$usertype);
+    my $srchbutton = &mt('Search');
+    if ($env{'form.action'} eq 'singlestudent') {
+        $srchbutton = &mt('Search and Enroll');
+    } elsif ($cancreate && $responsemsg ne '' && $inexact) {
+        $srchbutton = &mt('Search or Add New User');
+    }
+    my $output = <<"ENDBLOCK";
 <form action="/adm/createuser" method="post" name="crtuser">
-<input type="hidden" name="phase" value="get_user_info">
-<p>
+<input type="hidden" name="action" value="$env{'form.action'}" />
+<input type="hidden" name="phase" value="get_user_info" />
+$userpicker
+<input name="userrole" type="button" value="$srchbutton" onclick="javascript:validateEntry(document.crtuser)" />
+</form>
+ENDBLOCK
+    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(
+                  'enro' => 'Enroll one student',
+                  'admo' => 'Add/modify a single user',
+                  'crea' => 'create new user if required',
+                  'uskn' => "username is known",
+                  'crnu' => 'Create a new user',
+                  'usr'  => 'Username',
+                  'dom'  => 'in domain',
+                  'enrl' => 'Enroll',
+                  'cram'  => 'Create/Modify user',
+        );
+        my $sellink=&Apache::loncommon::selectstudent_link('crtusername','srchterm','srchdomain');
+        my ($title,$buttontext,$showresponse);
+        if ($env{'form.action'} eq 'singlestudent') {   
+            $title = $lt{'enro'};
+            $buttontext = $lt{'enrl'};
+        } else {
+            $title = $lt{'admo'};
+            $buttontext = $lt{'cram'};
+        }
+        if ($cancreate) {
+            $title .= ' <span class="LC_cusr_subheading">('.$lt{'crea'}.')</span>';
+        } else {
+            $title .= ' <span class="LC_cusr_subheading">('.$lt{'uskn'}.')</span>';
+        }
+        if ($env{'form.origform'} eq 'crtusername') {
+            $showresponse = $responsemsg;
+        }
+        $output .= <<"ENDDOCUMENT";
+<br />
+<form action="/adm/createuser" method="post" name="crtusername">
+<input type="hidden" name="action" value="$env{'form.action'}" />
+<input type="hidden" name="phase" value="createnewuser" />
+<input type="hidden" name="srchtype" value="exact" />
+<input type="hidden" name="srchby" value="uname" />
+<input type="hidden" name="srchin" value="dom" />
+<input type="hidden" name="forcenewuser" value="1" />
+<input type="hidden" name="origform" value="crtusername" />
+<h3>$title</h3>
+$showresponse
 <table>
-<tr><td>Username:</td><td><input type="text" size="15" name="ccuname">
-</td><td rowspan="2">$sellink</td></tr><tr><td>
-Domain:</td><td>$domform</td></tr>
-</table> 
-</p>
-<input type="submit" value="Continue">
+ <tr>
+  <td>$lt{'usr'}:</td>
+  <td><input type="text" size="15" name="srchterm" /></td>
+  <td>&nbsp;$lt{'dom'}:</td><td>$domform</td>
+  <td>&nbsp;$sellink&nbsp;</td>
+  <td>&nbsp;<input name="userrole" type="submit" value="$buttontext" /></td>
+ </tr>
+</table>
 </form>
-</body>
-</html>
 ENDDOCUMENT
+    }
+    return $output;
 }
 
-# =================================================================== Phase two
-sub print_user_modification_page {
-    my $r=shift;
-    my $ccuname=$ENV{'form.ccuname'};
-    my $ccdomain=$ENV{'form.ccdomain'};
-
-    my $defdom=$ENV{'request.role.domain'};
-
-    my ($krbdef,$krbdefdom) =
-       &Apache::loncommon::get_kerberos_defaults($defdom);
-
-    my %param = ( formname => 'document.cu',
-                  kerb_def_dom => $krbdefdom,
-                  kerb_def_auth => $krbdef
-                  );
-    $loginscript  = &Apache::loncommon::authform_header(%param);
-    $authformkrb  = &Apache::loncommon::authform_kerberos(%param);
-
-    $ccuname=~s/\W//g;
-    $ccdomain=~s/\W//g;
-    my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
-    my $dochead =<<"ENDDOCHEAD";
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
+sub user_modification_js {
+    my ($pjump_def,$dc_setcourse_code,$nondc_setsection_code,$groupslist)=@_;
+    
+    return <<END;
 <script type="text/javascript" language="Javascript">
 
     function pclose() {
@@ -164,6 +389,7 @@ sub print_user_modification_page {
     }
 
     $pjump_def
+    $dc_setcourse_code
 
     function dateset() {
         eval("document.cu."+document.cu.pres_marker.value+
@@ -171,742 +397,4510 @@ sub print_user_modification_page {
         pclose();
     }
 
+    $nondc_setsection_code
+
 </script>
-</head>
-ENDDOCHEAD
-    $r->print(&Apache::loncommon::bodytag(
-                                     'Create Users, Change User Privileges'));
+END
+}
+
+# =================================================================== Phase two
+sub print_user_selection_page {
+    my ($r,$response,$srch,$srch_results,$srcharray,$context) = @_;
+    my @fields = ('username','domain','lastname','firstname','permanentemail');
+    my $sortby = $env{'form.sortby'};
+
+    if (!grep(/^\Q$sortby\E$/,@fields)) {
+        $sortby = 'lastname';
+    }
+
+    my ($jsback,$elements) = &crumb_utilities();
+
+    my $jscript = (<<ENDSCRIPT);
+<script type="text/javascript">
+function pickuser(uname,udom) {
+    document.usersrchform.seluname.value=uname;
+    document.usersrchform.seludom.value=udom;
+    document.usersrchform.phase.value="userpicked";
+    document.usersrchform.submit();
+}
+
+$jsback
+</script>
+ENDSCRIPT
+
+    my %lt=&Apache::lonlocal::texthash(
+                                       'usrch'          => "User Search to add/modify roles",
+                                       'stusrch'        => "User Search to enroll student",
+                                       'usel'           => "Select a user to add/modify roles",
+                                       'stusel'         => "Select a user to enroll as a student", 
+                                       'username'       => "username",
+                                       'domain'         => "domain",
+                                       'lastname'       => "last name",
+                                       'firstname'      => "first name",
+                                       'permanentemail' => "permanent e-mail",
+                                      );
+    $r->print(&Apache::loncommon::start_page('User Management',$jscript));
+
+    my %breadcrumb_text = &singleuser_breadcrumb();
+    &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"javascript:backPage(document.usersrchform,'','')",
+          text=>$breadcrumb_text{'search'},
+          faq=>282,bug=>'Instructor Interface',},
+         {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
+          text=>$breadcrumb_text{'userpicked'},
+          faq=>282,bug=>'Instructor Interface',});
+    if ($env{'form.action'} eq 'singleuser') {
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                      'Course_Change_Privileges'));
+        $r->print("<b>$lt{'usrch'}</b><br />");
+        $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
+        $r->print('<h3>'.$lt{'usel'}.'</h3>');
+    } elsif ($env{'form.action'} eq 'singlestudent') {
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                      'Course_Add_Student'));
+        $r->print($jscript."<b>$lt{'stusrch'}</b><br />");
+        $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
+        $r->print('</form><h3>'.$lt{'stusel'}.'</h3>');
+    }
+    $r->print('<form name="usersrchform" method="post">'.
+              &Apache::loncommon::start_data_table()."\n".
+              &Apache::loncommon::start_data_table_header_row()."\n".
+              ' <th> </th>'."\n");
+    foreach my $field (@fields) {
+        $r->print(' <th><a href="javascript:document.usersrchform.sortby.value='.
+                  "'".$field."'".';document.usersrchform.submit();">'.
+                  $lt{$field}.'</a></th>'."\n");
+    }
+    $r->print(&Apache::loncommon::end_data_table_header_row());
+
+    my @sorted_users = sort {
+        lc($srch_results->{$a}->{$sortby})   cmp lc($srch_results->{$b}->{$sortby})
+            ||
+        lc($srch_results->{$a}->{lastname})  cmp lc($srch_results->{$b}->{lastname})
+            ||
+        lc($srch_results->{$a}->{firstname}) cmp lc($srch_results->{$b}->{firstname})
+	    ||
+	lc($a) cmp lc($b)
+        } (keys(%$srch_results));
+
+    foreach my $user (@sorted_users) {
+        my ($uname,$udom) = split(/:/,$user);
+        $r->print(&Apache::loncommon::start_data_table_row().
+                  '<td><input type="button" name="seluser" value="'.&mt('Select').'" onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".')" /></td>'.
+                  '<td><tt>'.$uname.'</tt></td>'.
+                  '<td><tt>'.$udom.'</tt></td>');
+        foreach my $field ('lastname','firstname','permanentemail') {
+            $r->print('<td>'.$srch_results->{$user}->{$field}.'</td>');
+        }
+        $r->print(&Apache::loncommon::end_data_table_row());
+    }
+    $r->print(&Apache::loncommon::end_data_table().'<br /><br />');
+    if (ref($srcharray) eq 'ARRAY') {
+        foreach my $item (@{$srcharray}) {
+            $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n");
+        }
+    }
+    $r->print(' <input type="hidden" name="sortby" value="'.$sortby.'" />'."\n".
+              ' <input type="hidden" name="seluname" value="" />'."\n".
+              ' <input type="hidden" name="seludom" value="" />'."\n".
+              ' <input type="hidden" name="currstate" value="select" />'."\n".
+              ' <input type="hidden" name="phase" value="get_user_info" />'."\n".
+              ' <input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n");
+    $r->print($response.'</form>'.&Apache::loncommon::end_page());
+}
+
+sub print_user_query_page {
+    my ($r,$caller) = @_;
+# FIXME - this is for a network-wide name search (similar to catalog search)
+# To use frames with similar behavior to catalog/portfolio search.
+# To be implemented. 
+    return;
+}
+
+sub print_user_modification_page {
+    my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission) = @_;
+    if (($ccuname eq '') || ($ccdomain eq '')) {
+        my $usermsg = &mt('No username and/or domain provided.');
+        $env{'form.phase'} = '';
+	&print_username_entry_form($r,$context,$usermsg);
+        return;
+    }
+    my ($form,$formname);
+    if ($env{'form.action'} eq 'singlestudent') {
+        $form = 'document.enrollstudent';
+        $formname = 'enrollstudent';
+    } else {
+        $form = 'document.cu';
+        $formname = 'cu';
+    }
+    my %abv_auth = &auth_abbrev();
+    my (%rulematch,%inst_results,$newuser,%alerts,%curr_rules,%got_rules);
+    my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
+    if ($uhome eq 'no_host') {
+        my $usertype;
+        my ($rules,$ruleorder) =
+            &Apache::lonnet::inst_userrules($ccdomain,'username');
+            $usertype =
+                &Apache::lonuserutils::check_usertype($ccdomain,$ccuname,$rules);
+        my $cancreate =
+            &Apache::lonuserutils::can_create_user($ccdomain,$context,
+                                                   $usertype);
+        if (!$cancreate) {
+            my $helplink = ' href="javascript:helpMenu('."'display'".')"';
+            my %usertypetext = (
+                official   => 'institutional',
+                unofficial => 'non-institutional',
+            );
+            my $response;
+            if ($env{'form.origform'} eq 'crtusername') {
+                $response =  '<span class="LC_warning">'.&mt('No match was found for the username ([_1]) in LON-CAPA domain: [_2]',$ccuname,$ccdomain).
+                            '</span><br />';
+            }
+            $response .= '<span class="LC_warning">'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the <a[_1]>helpdesk</a> for assistance.',$helplink).'</span><br /><br />';
+            $env{'form.phase'} = '';
+            &print_username_entry_form($r,$context,$response);
+            return;
+        }
+        $newuser = 1;
+        my $checkhash;
+        my $checks = { 'username' => 1 };
+        $checkhash->{$ccuname.':'.$ccdomain} = { 'newuser' => $newuser };
+        &Apache::loncommon::user_rule_check($checkhash,$checks,
+            \%alerts,\%rulematch,\%inst_results,\%curr_rules,\%got_rules);
+        if (ref($alerts{'username'}) eq 'HASH') {
+            if (ref($alerts{'username'}{$ccdomain}) eq 'HASH') {
+                my $domdesc =
+                    &Apache::lonnet::domain($ccdomain,'description');
+                if ($alerts{'username'}{$ccdomain}{$ccuname}) {
+                    my $userchkmsg;
+                    if (ref($curr_rules{$ccdomain}) eq 'HASH') {  
+                        $userchkmsg = 
+                            &Apache::loncommon::instrule_disallow_msg('username',
+                                                                 $domdesc,1).
+                        &Apache::loncommon::user_rule_formats($ccdomain,
+                            $domdesc,$curr_rules{$ccdomain}{'username'},
+                            'username');
+                    }
+                    $env{'form.phase'} = '';
+                    &print_username_entry_form($r,$context,$userchkmsg);
+                    return;
+                }
+            }
+        }
+    } else {
+        $newuser = 0;
+    }
+    if ($response) {
+        $response = '<br />'.$response;
+    }
+
+    my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
+    my $dc_setcourse_code = '';
+    my $nondc_setsection_code = '';                                        
+    my %loaditem;
+
+    my $groupslist = &Apache::lonuserutils::get_groupslist();
+
+    my $js = &validation_javascript($context,$ccdomain,$pjump_def,
+                               $groupslist,$newuser,$formname,\%loaditem);
+    my $args = {'add_entries' => \%loaditem};  
+    if ($env{'form.popup'}) {
+       $args->{'no_nav_bar'} = 1; 
+    }
+    my $start_page = 
+	&Apache::loncommon::start_page('User Management',$js,$args);
+    my %breadcrumb_text = &singleuser_breadcrumb();
+    &Apache::lonhtmlcommon::add_breadcrumb
+     ({href=>"javascript:backPage($form)",
+       text=>$breadcrumb_text{'search'},
+       faq=>282,bug=>'Instructor Interface',});
+
+    if ($env{'form.phase'} eq 'userpicked') {
+        &Apache::lonhtmlcommon::add_breadcrumb
+     ({href=>"javascript:backPage($form,'get_user_info','select')",
+       text=>$breadcrumb_text{'userpicked'},
+       faq=>282,bug=>'Instructor Interface',});
+    }
+    &Apache::lonhtmlcommon::add_breadcrumb
+      ({href=>"javascript:backPage($form,'$env{'form.phase'}','modify')",
+        text=>$breadcrumb_text{'modify'},
+        faq=>282,bug=>'Instructor Interface',});
+    my $helpitem = 'Course_Change_Privileges';
+    if ($env{'form.action'} eq 'singlestudent') {
+        $helpitem = 'Course_Add_Student';
+    }
+    my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                     $helpitem);
+
     my $forminfo =<<"ENDFORMINFO";
-<form action="/adm/createuser" method="post" name="cu">
-<input type="hidden" name="phase"       value="update_user_data">
-<input type="hidden" name="ccuname"     value="$ccuname">
-<input type="hidden" name="ccdomain"    value="$ccdomain">
-<input type="hidden" name="pres_value"  value="" >
-<input type="hidden" name="pres_type"   value="" >
-<input type="hidden" name="pres_marker" value="" >
+<form action="/adm/createuser" method="post" name="$formname">
+<input type="hidden" name="phase" value="update_user_data" />
+<input type="hidden" name="ccuname" value="$ccuname" />
+<input type="hidden" name="ccdomain" value="$ccdomain" />
+<input type="hidden" name="pres_value"  value="" />
+<input type="hidden" name="pres_type"   value="" />
+<input type="hidden" name="pres_marker" value="" />
 ENDFORMINFO
-    my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
-    my %incdomains; 
     my %inccourses;
-    foreach (values(%Apache::lonnet::hostdom)) {
-       $incdomains{$_}=1;
-    }
-    foreach (keys(%ENV)) {
-	if ($_=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) {
+    foreach my $key (keys(%env)) {
+	if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) {
 	    $inccourses{$1.'_'.$2}=1;
         }
     }
-    if ($uhome eq 'no_host') {
-        my $home_server_list=
-            '<option value="default" selected>default</option>'."\n".
-                &Apache::loncommon::home_server_option_list($ccdomain);
-        
-	$r->print(<<ENDNEWUSER);
-$dochead
-<h1>Create New User</h1>
+    if ($newuser) {
+        my $portfolioform;
+        if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
+            # Current user has quota modification privileges
+            $portfolioform = '<br />'.&portfolio_quota($ccuname,$ccdomain);
+        }
+        &initialize_authen_forms($ccdomain,$formname);
+        my %lt=&Apache::lonlocal::texthash(
+                'cnu'            => 'Create New User',
+                'ast'            => 'as a student',
+                'ind'            => 'in domain',
+                'lg'             => 'Login Data',
+                'hs'             => "Home Server",
+        );
+	$r->print(<<ENDTITLE);
+$start_page
+$crumbs
+$response
 $forminfo
-<h2>New user "$ccuname" in domain $ccdomain</h2>
 <script type="text/javascript" language="Javascript">
 $loginscript
 </script>
 <input type='hidden' name='makeuser' value='1' />
-<h3>Personal Data</h3>
-<p>
-<table>
-<tr><td>First Name  </td>
-    <td><input type='text' name='cfirst'  size='15' /></td></tr>
-<tr><td>Middle Name </td> 
-    <td><input type='text' name='cmiddle' size='15' /></td></tr>
-<tr><td>Last Name   </td>
-    <td><input type='text' name='clast'   size='15' /></td></tr>
-<tr><td>Generation  </td>
-    <td><input type='text' name='cgen'    size='5'  /></td></tr>
-</table>
-ID/Student Number <input type='text' name='cstid'   size='15' /></p>
-Home Server: <select name="hserver" size="1"> $home_server_list </select>
-<hr />
-<h3>Login Data</h3>
-<p>$generalrule </p>
-<p>$authformkrb </p>
-<p>$authformint </p>
-<p>$authformfsys</p>
-<p>$authformloc </p>
-ENDNEWUSER
+<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain
+ENDTITLE
+        if ($env{'form.action'} eq 'singlestudent') {
+            $r->print(' ('.$lt{'ast'}.')');
+        }
+        $r->print('</h2>'."\n".'<div class="LC_left_float">');
+        my $personal_table = 
+            &personal_data_display($ccuname,$ccdomain,$newuser,$context,
+                                   $inst_results{$ccuname.':'.$ccdomain});
+        $r->print($personal_table);
+        my ($home_server_pick,$numlib) = 
+            &Apache::loncommon::home_server_form_item($ccdomain,'hserver',
+                                                      'default','hide');
+        if ($numlib > 1) {
+            $r->print("
+<br />
+$lt{'hs'}: $home_server_pick
+<br />");
+        } else {
+            $r->print($home_server_pick);
+        }
+        $r->print('</div>'."\n".'<div class="LC_left_float"><h3>'.
+                  $lt{'lg'}.'</h3>');
+        my ($fixedauth,$varauth,$authmsg); 
+        if (ref($rulematch{$ccuname.':'.$ccdomain}) eq 'HASH') {
+            my $matchedrule = $rulematch{$ccuname.':'.$ccdomain}{'username'};
+            my ($rules,$ruleorder) = 
+                &Apache::lonnet::inst_userrules($ccdomain,'username');
+            if (ref($rules) eq 'HASH') {
+                if (ref($rules->{$matchedrule}) eq 'HASH') {
+                    my $authtype = $rules->{$matchedrule}{'authtype'};
+                    if ($authtype !~ /^(krb4|krb5|int|fsys|loc)$/) {
+                        $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc));
+                    } else { 
+                        my $authparm = $rules->{$matchedrule}{'authparm'};
+                        if ($authtype =~ /^krb(4|5)$/) {
+                            my $ver = $1;
+                            if ($authparm ne '') {
+                                $fixedauth = <<"KERB"; 
+<input type="hidden" name="login" value="krb" />
+<input type="hidden" name="krbver" value="$ver" />
+<input type="hidden" name="krbarg" value="$authparm" />
+KERB
+                                $authmsg = $rules->{$matchedrule}{'authmsg'};    
+                            }
+                        } else {
+                            $fixedauth = 
+'<input type="hidden" name="login" value="'.$authtype.'" />'."\n";
+                            if ($rules->{$matchedrule}{'authparmfixed'}) {
+                                $fixedauth .=    
+'<input type="hidden" name="'.$authtype.'arg" value="'.$authparm.'" />'."\n";
+                            } else {
+                                $varauth =  
+'<input type="text" name="'.$authtype.'arg" value="" />'."\n";
+                            }
+                        }
+                    }
+                } else {
+                    $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc));
+                }
+            }
+            if ($authmsg) {
+                $r->print(<<ENDAUTH);
+$fixedauth
+$authmsg
+$varauth
+ENDAUTH
+            }
+        } else {
+            $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc)); 
+        }
+        $r->print($portfolioform);
+        if ($env{'form.action'} eq 'singlestudent') {
+            $r->print(&date_sections_select($context,$newuser,$formname,
+                                            $permission));
+        }
+        $r->print('</div><div class="LC_clear_float_footer"></div>');
     } else { # user already exists
+	my %lt=&Apache::lonlocal::texthash(
+                    'cup'  => "Modify existing user: ",
+                    'ens'  => "Enroll one student: ",
+                    'id'   => "in domain",
+				       );
 	$r->print(<<ENDCHANGEUSER);
-$dochead
-<h1>Change User Privileges</h1>
+$start_page
+$crumbs
 $forminfo
-<h2>User "$ccuname" in domain $ccdomain </h2>
+<h2>
 ENDCHANGEUSER
-        # Get the users information
-        my %userenv = &Apache::lonnet::get('environment',
-                          ['firstname','middlename','lastname','generation'],
-                          $ccdomain,$ccuname);
-        my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname);
-        $r->print(<<END);
-<hr />
-<table border="2">
-<tr>
-<th>first name</th><th>middle name</th><th>last name</th><th>generation</th>
-</tr>
-<tr>
-END
-        foreach ('firstname','middlename','lastname','generation') {
-           if (&Apache::lonnet::allowed('mau',$ccdomain)) {
-              $r->print(<<"END");            
-<td><input type="text" name="c$_" value="$userenv{$_}" size="15" /></td>
-END
-           } else {
-               $r->print('<td>'.$userenv{$_}.'</td>');
-           }
+        if ($env{'form.action'} eq 'singlestudent') {
+            $r->print($lt{'ens'});
+        } else {
+            $r->print($lt{'cup'});
         }
-        $r->print(<<END);
-</tr>
-</table>
-END
-        # Build up table of user roles to allow revocation of a role.
-        my ($tmp) = keys(%rolesdump);
-        unless ($tmp =~ /^(con_lost|error)/i) {
-           my $now=time;
-           $r->print(<<END);
-<hr />
-<h3>Revoke Existing Roles</h3>
-<table border=2>
-<tr><th>Revoke</th><th>Delete</th><th>Role</th><th>Extent</th><th>Start</th><th>End</th>
-END
-	   foreach my $area (keys(%rolesdump)) {
-               next if ($area =~ /^rolesdef/);
-               my $role = $rolesdump{$area};
-               my $thisrole=$area;
-               $area =~ s/\_\w\w$//;
-               my ($role_code,$role_end_time,$role_start_time) = 
-                   split(/_/,$role);
-               my $bgcol='ffffff';
-               my $allowed=0;
-               my $delallowed=0;
-               if ($area =~ /^\/(\w+)\/(\d\w+)/ ) {
-                   my %coursedata=
-                       &Apache::lonnet::coursedescription($1.'_'.$2);
-		   my $carea;
-		   if (defined($coursedata{'description'})) {
-		       $carea='Course: '.$coursedata{'description'}.
-                              '<br />Domain: '.$1;
-		   } else {
-		       $carea='Unavailable course: '.$area;
-		   }
-                   $inccourses{$1.'_'.$2}=1;
-                   if ((&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) ||
-                       (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
-                       $allowed=1;
-                   }
-                   if ((&Apache::lonnet::allowed('dro',$1)) ||
-                       (&Apache::lonnet::allowed('dro',$ccdomain))) {
-                       $delallowed=1;
-                   }
-                   # Compute the background color based on $area
-                   $bgcol=$1.'_'.$2;
-                   $bgcol=~s/[^8-9b-e]//g;
-                   $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',0,6);
-                   if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) {
-                       $carea.='<br>Section/Group: '.$3;
-                   }
-                   $area=$carea;
-               } else {
-                   # Determine if current user is able to revoke privileges
-                   if ($area=~ /^\/(\w+)\//) {
-                       if ((&Apache::lonnet::allowed('c'.$role_code,$1)) ||
+        $r->print(' "'.$ccuname.'" '.$lt{'id'}.' "'.$ccdomain.'"</h2>'.
+                  "\n".'<div class="LC_left_float">');
+        my ($personal_table,$showforceid) = 
+            &personal_data_display($ccuname,$ccdomain,$newuser,$context,
+                                   $inst_results{$ccuname.':'.$ccdomain});
+        $r->print($personal_table);
+        if ($showforceid) {
+            $r->print(&Apache::lonuserutils::forceid_change($context));
+        }
+        $r->print('</div>');
+        my $user_auth_text =  &user_authentication($ccuname,$ccdomain,$formname);
+        my $user_quota_text;
+        if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
+            # Current user has quota modification privileges
+            $user_quota_text = &portfolio_quota($ccuname,$ccdomain);
+        } elsif (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
+            # Get the user's portfolio information
+            my %portq = &Apache::lonnet::get('environment',['portfolioquota'],
+                                             $ccdomain,$ccuname);
+
+            my %lt=&Apache::lonlocal::texthash(
+                'dska'  => "Disk space allocated to user's portfolio files",
+                'youd'  => "You do not have privileges to modify the portfolio quota for this user.",
+                'ichr'  => "If a change is required, contact a domain coordinator for the domain",
+            );
+            $user_quota_text = <<ENDNOPORTPRIV;
+<h3>$lt{'dska'}</h3>
+$lt{'youd'} $lt{'ichr'}: $ccdomain
+ENDNOPORTPRIV
+        }
+        if ($user_auth_text ne '') {
+            $r->print('<div class="LC_left_float">'.$user_auth_text);
+            if ($user_quota_text ne '') {
+                $r->print($user_quota_text);
+            }
+            if ($env{'form.action'} eq 'singlestudent') {
+                $r->print(&date_sections_select($context,$newuser,$formname));
+            }
+        } elsif ($user_quota_text ne '') {
+            $r->print('<div class="LC_left_float">'.$user_quota_text);
+            if ($env{'form.action'} eq 'singlestudent') {
+                $r->print(&date_sections_select($context,$newuser,$formname));
+            }
+        } else {
+            if ($env{'form.action'} eq 'singlestudent') {
+                $r->print('<div class="LC_left_float">'.
+                          &date_sections_select($context,$newuser,$formname));
+            }
+        }
+        $r->print('</div><div class="LC_clear_float_footer"></div>');
+        if ($env{'form.action'} ne 'singlestudent') {
+            &display_existing_roles($r,$ccuname,$ccdomain,\%inccourses);
+        }
+    } ## End of new user/old user logic
+
+    if ($env{'form.action'} eq 'singlestudent') {
+        $r->print('<br /><input type="button" value="'.&mt('Enroll Student').'" onClick="setSections(this.form)" />'."\n");
+    } else {
+        $r->print('<h3>'.&mt('Add Roles').'</h3>');
+        my $addrolesdisplay = 0;
+        if ($context eq 'domain' || $context eq 'author') {
+            $addrolesdisplay = &new_coauthor_roles($r,$ccuname,$ccdomain);
+        }
+        if ($context eq 'domain') {
+            my $add_domainroles = &new_domain_roles($r);
+            if (!$addrolesdisplay) {
+                $addrolesdisplay = $add_domainroles;
+            }
+            $r->print(&course_level_dc($env{'request.role.domain'},'Course'));
+            $r->print('<br /><input type="button" value="'.&mt('Modify User').'" onClick="setCourse()" />'."\n");
+        } elsif ($context eq 'author') {
+            if ($addrolesdisplay) {
+                $r->print('<br /><input type="button" value="'.&mt('Modify User').'"');
+                if ($newuser) {
+                    $r->print(' onClick="auth_check()" \>'."\n");
+                } else {
+                    $r->print('onClick="this.form.submit()" \>'."\n");
+                }
+            } else {
+                $r->print('<br /><a href="javascript:backPage(document.cu)">'.
+                          &mt('Back to previous page').'</a>');
+            }
+        } else {
+            $r->print(&course_level_table(%inccourses));
+            $r->print('<br /><input type="button" value="'.&mt('Modify User').'" onClick="setSections(this.form)" />'."\n");
+        }
+    }
+    $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
+    $r->print('<input type="hidden" name="currstate" value="" />');
+    $r->print('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />');
+    $r->print("</form>".&Apache::loncommon::end_page());
+    return;
+}
+
+sub singleuser_breadcrumb {
+    my %breadcrumb_text;
+    if ($env{'form.action'} eq 'singlestudent') {
+        $breadcrumb_text{'search'} = 'Enroll a student';
+        $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',
+    }
+    return %breadcrumb_text;
+}
+
+sub date_sections_select {
+    my ($context,$newuser,$formname,$permission) = @_;
+    my $cid = $env{'request.course.id'};
+    my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity($cid);
+    my $date_table = '<h3>'.&mt('Starting and Ending Dates').'</h3>'."\n".
+        &Apache::lonuserutils::date_setting_table(undef,undef,$context,
+                                                  undef,$formname,$permission);
+    my $rowtitle = 'Section';
+    my $secbox = '<h3>'.&mt('Section').'</h3>'."\n".
+        &Apache::lonuserutils::section_picker($cdom,$cnum,'st',$rowtitle,
+                                              $permission);
+    my $output = $date_table.$secbox;
+    return $output;
+}
+
+sub validation_javascript {
+    my ($context,$ccdomain,$pjump_def,$groupslist,$newuser,$formname,
+        $loaditem) = @_;
+    my $dc_setcourse_code = '';
+    my $nondc_setsection_code = '';
+    if ($context eq 'domain') {
+        my $dcdom = $env{'request.role.domain'};
+        $loaditem->{'onload'} = "document.cu.coursedesc.value='';";
+        $dc_setcourse_code = 
+            &Apache::lonuserutils::dc_setcourse_js('cu','singleuser',$context);
+    } else {
+        my $checkauth; 
+        if (($newuser) || (&Apache::lonnet::allowed('mau',$ccdomain))) {
+            $checkauth = 1;
+        }
+        if ($context eq 'course') {
+            $nondc_setsection_code =
+                &Apache::lonuserutils::setsections_javascript($formname,$groupslist,
+                                                              undef,$checkauth);
+        }
+        if ($checkauth) {
+            $nondc_setsection_code .= 
+                &Apache::lonuserutils::verify_authen($formname,$context);
+        }
+    }
+    my $js = &user_modification_js($pjump_def,$dc_setcourse_code,
+                                   $nondc_setsection_code,$groupslist);
+    my ($jsback,$elements) = &crumb_utilities();
+    $js .= "\n".
+           '<script type="text/javascript">'."\n".$jsback."\n".'</script>';
+    return $js;
+}
+
+sub display_existing_roles {
+    my ($r,$ccuname,$ccdomain,$inccourses) = @_;
+    my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname);
+    # Build up table of user roles to allow revocation and re-enabling of roles.
+    my ($tmp) = keys(%rolesdump);
+    if ($tmp !~ /^(con_lost|error)/i) {
+        my $now=time;
+        my %lt=&Apache::lonlocal::texthash(
+                    'rer'  => "Existing Roles",
+                    'rev'  => "Revoke",
+                    'del'  => "Delete",
+                    'ren'  => "Re-Enable",
+                    'rol'  => "Role",
+                    'ext'  => "Extent",
+                    'sta'  => "Start",
+                    'end'  => "End",
+                                       );
+        my (%roletext,%sortrole,%roleclass,%rolepriv);
+        foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]);
+                                    my $b1=join('_',(split('_',$b))[1,0]);
+                                    return $a1 cmp $b1;
+                                } keys(%rolesdump)) {
+            next if ($area =~ /^rolesdef/);
+            my $envkey=$area;
+            my $role = $rolesdump{$area};
+            my $thisrole=$area;
+            $area =~ s/\_\w\w$//;
+            my ($role_code,$role_end_time,$role_start_time) =
+                split(/_/,$role);
+# Is this a custom role? Get role owner and title.
+            my ($croleudom,$croleuname,$croletitle)=
+                ($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$});
+            my $allowed=0;
+            my $delallowed=0;
+            my $sortkey=$role_code;
+            my $class='Unknown';
+            if ($area =~ m{^/($match_domain)/($match_courseid)} ) {
+                $class='Course';
+                my ($coursedom,$coursedir) = ($1,$2);
+                $sortkey.="\0$coursedom";
+                # $1.'_'.$2 is the course id (eg. 103_12345abcef103l3).
+                my %coursedata=
+                    &Apache::lonnet::coursedescription($1.'_'.$2);
+                my $carea;
+                if (defined($coursedata{'description'})) {
+                    $carea=$coursedata{'description'}.
+                        '<br />'.&mt('Domain').': '.$coursedom.('&nbsp;'x8).
+     &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$coursedir,$coursedom);
+                    $sortkey.="\0".$coursedata{'description'};
+                    $class=$coursedata{'type'};
+                } else {
+                    $carea=&mt('Unavailable course').': '.$area;
+                    $sortkey.="\0".&mt('Unavailable course').': '.$area;
+                }
+                $sortkey.="\0$coursedir";
+                $inccourses->{$1.'_'.$2}=1;
+                if ((&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) ||
+                    (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
+                    $allowed=1;
+                }
+                if ((&Apache::lonnet::allowed('dro',$1)) ||
+                    (&Apache::lonnet::allowed('dro',$ccdomain))) {
+                    $delallowed=1;
+                }
+# - custom role. Needs more info, too
+                if ($croletitle) {
+                    if (&Apache::lonnet::allowed('ccr',$1.'/'.$2)) {
+                        $allowed=1;
+                        $thisrole.='.'.$role_code;
+                    }
+                }
+                # Compute the background color based on $area
+                if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) {
+                    $carea.='<br />Section: '.$3;
+                    $sortkey.="\0$3";
+                    if (!$allowed) {
+                        if ($env{'request.course.sec'} eq $3) {
+                            if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) {
+                                $allowed = 1;
+                            }
+                        }
+                    }
+                }
+                $area=$carea;
+            } else {
+                $sortkey.="\0".$area;
+                # Determine if current user is able to revoke privileges
+                if ($area=~m{^/($match_domain)/}) {
+                    if ((&Apache::lonnet::allowed('c'.$role_code,$1)) ||
                        (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
-                           $allowed=1;
-                       }
-                       if (((&Apache::lonnet::allowed('dro',$1))  ||
-                            (&Apache::lonnet::allowed('dro',$ccdomain))) &&
-                           ($role_code ne 'dc')) {
-                           $delallowed=1;
-                       }
-                   } else {
-                       if (&Apache::lonnet::allowed('c'.$role_code,'/')) {
-                           $allowed=1;
-                       }
-                   }
-               }
-               if ($role_code eq 'ca') {
-                   $area=~/\/(\w+)\/(\w+)/;
-		   if (&authorpriv($2,$1)) {
-		       $allowed=1;
-                   } else {
-                       $allowed=0;
-                   }
-               }
-               my $row = '';
-               $row.='<tr bgcolor=#"'.$bgcol.'"><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 {
-                   $row.='&nbsp;';
-               }
-	       $row.='</td><td>';
-               if ($delallowed) {
-                   $row.= '<input type="checkbox" name="del:'.$thisrole.'">';
-               } else {
+                        $allowed=1;
+                    }
+                    if (((&Apache::lonnet::allowed('dro',$1))  ||
+                         (&Apache::lonnet::allowed('dro',$ccdomain))) &&
+                        ($role_code ne 'dc')) {
+                        $delallowed=1;
+                    }
+                } else {
+                    if (&Apache::lonnet::allowed('c'.$role_code,'/')) {
+                        $allowed=1;
+                    }
+                }
+                if ($role_code eq 'ca' || $role_code eq 'au') {
+                    $class='Construction Space';
+                } elsif ($role_code eq 'su') {
+                    $class='System';
+                } else {
+                    $class='Domain';
+                }
+            }
+            if (($role_code eq 'ca') || ($role_code eq 'aa')) {
+                $area=~m{/($match_domain)/($match_username)};
+                if (&Apache::lonuserutils::authorpriv($2,$1)) {
+                    $allowed=1;
+                } else {
+                    $allowed=0;
+                }
+            }
+            my $row = '';
+            $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;';
-               }
-               $row.= '</td><td>'.&Apache::lonnet::plaintext($role_code).
-                      '</td><td>'.$area.
-                      '</td><td>'.($role_start_time?localtime($role_start_time)
-                                                   : '&nbsp;' ).
-                      '</td><td>'.($role_end_time  ?localtime($role_end_time)
-                                                   : '&nbsp;' )
-                      ."</td></tr>\n";
-               $r->print($row);
-           } # end of foreach        (table building loop)
-	   $r->print('</table>');
-        }  # End of unless
-	my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
-	if ($currentauth=~/^krb(4|5):/) {
-	    $currentauth=~/^krb(4|5):(.*)/;
-	    my $krbdefdom=$1;
-            my %param = ( formname => 'document.cu',
-                          kerb_def_dom => $krbdefdom 
-                          );
-            $loginscript  = &Apache::loncommon::authform_header(%param);
-	}
-	# Check for a bad authentication type
-        unless ($currentauth=~/^krb(4|5):/ or
-		$currentauth=~/^unix:/ or
-		$currentauth=~/^internal:/ or
-		$currentauth=~/^localauth:/
-		) { # bad authentication scheme
-	    if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {
-		$r->print(<<ENDBADAUTH);
-<hr />
-<script type="text/javascript" language="Javascript">
-$loginscript
-</script>
-<font color='#ff0000'>ERROR:</font>
-This user has an unrecognized authentication scheme ($currentauth).
-Please specify login data below.
-<h3>Login Data</h3>
-<p>$generalrule</p>
-<p>$authformkrb</p>
-<p>$authformint</p>
-<p>$authformfsys</p>
-<p>$authformloc</p>
-ENDBADAUTH
-            } else { 
-                # This user is not allowed to modify the users 
-                # authentication scheme, so just notify them of the problem
-		$r->print(<<ENDBADAUTH);
-<hr />
-<script type="text/javascript" language="Javascript">
-$loginscript
-</script>
-<font color="#ff0000"> ERROR: </font>
-This user has an unrecognized authentication scheme ($currentauth).
-Please alert a domain coordinator of this situation.
-<hr />
-ENDBADAUTH
+                } else {
+                   $row.=&mt('expired or revoked');
+                }
             }
-        } else { # Authentication type is valid
-	    my $authformcurrent='';
-	    my $authform_other='';
-	    if ($currentauth=~/^krb(4|5):/) {
-		$authformcurrent=$authformkrb;
-		$authform_other="<p>$authformint</p>\n".
-                    "<p>$authformfsys</p><p>$authformloc</p>";
-	    }
-	    elsif ($currentauth=~/^internal:/) {
-		$authformcurrent=$authformint;
-		$authform_other="<p>$authformkrb</p>".
-                    "<p>$authformfsys</p><p>$authformloc</p>";
-	    }
-	    elsif ($currentauth=~/^unix:/) {
-		$authformcurrent=$authformfsys;
-		$authform_other="<p>$authformkrb</p>".
-                    "<p>$authformint</p><p>$authformloc;</p>";
-	    }
-	    elsif ($currentauth=~/^localauth:/) {
-		$authformcurrent=$authformloc;
-		$authform_other="<p>$authformkrb</p>".
-                    "<p>$authformint</p><p>$authformfsys</p>";
-	    }
-            $authformcurrent.=' <i>(will override current values)</i><br />';
-            if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {
-		# Current user has login modification privileges
-		$r->print(<<ENDOTHERAUTHS);
-<hr />
-<script type="text/javascript" language="Javascript">
-$loginscript
-</script>
-<h3>Change Current Login Data</h3>
-<p>$generalrule</p>
-<p>$authformnop</p>
-<p>$authformcurrent</p>
-<h3>Enter New Login Data</h3>
-$authform_other
-ENDOTHERAUTHS
+            $row.='</td><td>';
+            if ($allowed && !$active) {
+                $row.= '<input type="checkbox" name="ren:'.$thisrole.'" />';
+            } else {
+                $row.='&nbsp;';
             }
-        }  ## End of "check for bad authentication type" logic
-    } ## End of new user/old user logic
-    $r->print('<hr /><h3>Add Roles</h3>');
-#
-# Co-Author
-# 
-    if (&authorpriv($ENV{'user.name'},$ENV{'request.role.domain'}) &&
-        ($ENV{'user.name'} ne $ccuname || $ENV{'user.domain'} ne $ccdomain)) {
+            $row.='</td><td>';
+            if ($delallowed) {
+                $row.= '<input type="checkbox" name="del:'.$thisrole.'" />';
+            } else {
+                $row.='&nbsp;';
+            }
+            my $plaintext='';
+            if (!$croletitle) {
+                $plaintext=&Apache::lonnet::plaintext($role_code,$class)
+            } else {
+                $plaintext=
+        "Customrole '$croletitle'<br />defined by $croleuname\@$croleudom";
+            }
+            $row.= '</td><td>'.$plaintext.
+                   '</td><td>'.$area.
+                   '</td><td>'.($role_start_time?localtime($role_start_time)
+                                                : '&nbsp;' ).
+                   '</td><td>'.($role_end_time  ?localtime($role_end_time)
+                                                : '&nbsp;' )
+                   ."</td>";
+            $sortrole{$sortkey}=$envkey;
+            $roletext{$envkey}=$row;
+            $roleclass{$envkey}=$class;
+            $rolepriv{$envkey}=$allowed;
+            #$r->print($row);
+        } # end of foreach        (table building loop)
+        my $rolesdisplay = 0;
+        my %output = ();
+        foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
+            $output{$type} = '';
+            foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
+                if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) {
+                    $output{$type}.=
+                          &Apache::loncommon::start_data_table_row().
+                          $roletext{$sortrole{$which}}.
+                          &Apache::loncommon::end_data_table_row();
+                }
+            }
+            unless($output{$type} eq '') {
+                $output{$type} = '<tr class="LC_info_row">'.
+                          "<td align='center' colspan='7'>".&mt($type)."</td></tr>".
+                           $output{$type};
+                $rolesdisplay = 1;
+            }
+        }
+        if ($rolesdisplay == 1) {
+            $r->print('
+<h3>'.$lt{'rer'}.'</h3>'.
+&Apache::loncommon::start_data_table("LC_createuser").
+&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 ('Construction Space','Course','Group','Domain','System','Unknown') {
+                if ($output{$type}) {
+                    $r->print($output{$type}."\n");
+                }
+            }
+            $r->print(&Apache::loncommon::end_data_table());
+        }
+    }  # End of check for keys in rolesdump
+    return;
+}
+
+sub new_coauthor_roles {
+    my ($r,$ccuname,$ccdomain) = @_;
+    my $addrolesdisplay = 0;
+    #
+    # Co-Author
+    #
+    if (&Apache::lonuserutils::authorpriv($env{'user.name'},
+                                          $env{'request.role.domain'}) &&
+        ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain)) {
         # No sense in assigning co-author role to yourself
-	my $cuname=$ENV{'user.name'};
-        my $cudom=$ENV{'request.role.domain'};
-       $r->print(<<ENDCOAUTH);
-<h4>Construction Space</h4>
-<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>
-<th>Start</th><th>End</th></tr>
-<tr>
-<td><input type=checkbox name="act_$cudom\_$cuname\_ca"></td>
-<td>Co-Author</td>
-<td>$cudom\_$cuname</td>
-<td><input type=hidden name="start_$cudom\_$cuname\_ca" value=''>
+        $addrolesdisplay = 1;
+        my $cuname=$env{'user.name'};
+        my $cudom=$env{'request.role.domain'};
+        my %lt=&Apache::lonlocal::texthash(
+                    'cs'   => "Construction Space",
+                    'act'  => "Activate",
+                    'rol'  => "Role",
+                    'ext'  => "Extent",
+                    'sta'  => "Start",
+                    'end'  => "End",
+                    'cau'  => "Co-Author",
+                    'caa'  => "Assistant Co-Author",
+                    'ssd'  => "Set Start Date",
+                    'sed'  => "Set End Date"
+                                       );
+        $r->print('<h4>'.$lt{'cs'}.'</h4>'."\n".
+                  &Apache::loncommon::start_data_table()."\n".
+                  &Apache::loncommon::start_data_table_header_row()."\n".
+                  '<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th>'.
+                  '<th>'.$lt{'ext'}.'</th><th>'.$lt{'sta'}.'</th>'.
+                  '<th>'.$lt{'end'}.'</th>'."\n".
+                  &Apache::loncommon::end_data_table_header_row()."\n".
+                  &Apache::loncommon::start_data_table_row().'
+           <td>
+            <input type=checkbox name="act_'.$cudom.'_'.$cuname.'_ca" />
+           </td>
+           <td>'.$lt{'cau'}.'</td>
+           <td>'.$cudom.'_'.$cuname.'</td>
+           <td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_ca" value="" />
+             <a href=
+"javascript:pjump('."'date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
+<td><input type="hidden" name="end_'.$cudom.'_'.$cuname.'_ca" value="" />
 <a href=
-"javascript:pjump('date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset')">Set Start Date</a></td>
-<td><input type=hidden name="end_$cudom\_$cuname\_ca" value=''>
+"javascript:pjump('."'date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".
+              &Apache::loncommon::end_data_table_row()."\n".
+              &Apache::loncommon::start_data_table_row()."\n".
+'<td><input type=checkbox name="act_'.$cudom.'_'.$cuname.'_aa" /></td>
+<td>'.$lt{'caa'}.'</td>
+<td>'.$cudom.'_'.$cuname.'</td>
+<td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_aa" value="" />
 <a href=
-"javascript:pjump('date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset')">Set End Date</a></td>
-</tr>
-</table>
-ENDCOAUTH
+"javascript:pjump('."'date_start','Start Date Assistant Co-Author',document.cu.start_$cudom\_$cuname\_aa.value,'start_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
+<td><input type="hidden" name="end_'.$cudom.'_'.$cuname.'_aa" value="" />
+<a href=
+"javascript:pjump('."'date_end','End Date Assistant Co-Author',document.cu.end_$cudom\_$cuname\_aa.value,'end_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".
+             &Apache::loncommon::end_data_table_row()."\n".
+             &Apache::loncommon::end_data_table());
+    } elsif ($env{'request.role'} =~ /^au\./) {
+        if (!(&Apache::lonuserutils::authorpriv($env{'user.name'},
+                                                $env{'request.role.domain'}))) {
+            $r->print('<span class="LC_error">'.
+                      &mt('You do not have privileges to assign co-author roles.').
+                      '</span>');
+        } elsif (($env{'user.name'} eq $ccuname) &&
+             ($env{'user.domain'} eq $ccdomain)) {
+            $r->print(&mt('Assigning yourself a co-author or assistant co-author role in your own author area in Construction Space is not permitted'));
+        }
     }
-#
-# Domain level
-#
-    $r->print('<h4>Domain Level</h4>'.
-    '<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>'.
-    '<th>Start</th><th>End</th></tr>');
-    foreach ( sort( keys(%incdomains))) {
-	my $thisdomain=$_;
-        foreach ('dc','li','dg','au') {
-            if (&Apache::lonnet::allowed('c'.$_,$thisdomain)) {
-               my $plrole=&Apache::lonnet::plaintext($_);
-               $r->print(<<ENDDROW);
-<tr>
-<td><input type=checkbox name="act_$thisdomain\_$_"></td>
-<td>$plrole</td>
-<td>$thisdomain</td>
-<td><input type=hidden name="start_$thisdomain\_$_" value=''>
+    return $addrolesdisplay;;
+}
+
+sub new_domain_roles {
+    my ($r) = @_;
+    my $addrolesdisplay = 0;
+    #
+    # Domain level
+    #
+    my $num_domain_level = 0;
+    my $domaintext =
+    '<h4>'.&mt('Domain Level').'</h4>'.
+    &Apache::loncommon::start_data_table().
+    &Apache::loncommon::start_data_table_header_row().
+    '<th>'.&mt('Activate').'</th><th>'.&mt('Role').'</th><th>'.
+    &mt('Extent').'</th>'.
+    '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'.
+    &Apache::loncommon::end_data_table_header_row();
+    foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) {
+        foreach my $role ('dc','li','dg','au','sc') {
+            if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) {
+               my $plrole=&Apache::lonnet::plaintext($role);
+               my %lt=&Apache::lonlocal::texthash(
+                    'ssd'  => "Set Start Date",
+                    'sed'  => "Set End Date"
+                                       );
+               $num_domain_level ++;
+               $domaintext .=
+&Apache::loncommon::start_data_table_row().
+'<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'" /></td>
+<td>'.$plrole.'</td>
+<td>'.$thisdomain.'</td>
+<td><input type="hidden" name="start_'.$thisdomain.'_'.$role.'" value="" />
 <a href=
-"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$thisdomain\_$_.value,'start_$thisdomain\_$_','cu.pres','dateset')">Set Start Date</a></td>
-<td><input type=hidden name="end_$thisdomain\_$_" value=''>
+"javascript:pjump('."'date_start','Start Date $plrole',document.cu.start_$thisdomain\_$role.value,'start_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
+<td><input type="hidden" name="end_'.$thisdomain.'_'.$role.'" value="" />
 <a href=
-"javascript:pjump('date_end','End Date $plrole',document.cu.end_$thisdomain\_$_.value,'end_$thisdomain\_$_','cu.pres','dateset')">Set End Date</a></td>
-</tr>
-ENDDROW
+"javascript:pjump('."'date_end','End Date $plrole',document.cu.end_$thisdomain\_$role.value,'end_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'.
+&Apache::loncommon::end_data_table_row();
             }
-        } 
+        }
     }
-    $r->print('</table>');
-#
-# Course level
-#
-    $r->print(&course_level_table(%inccourses));
-    $r->print("<hr /><input type=submit value=\"Modify User\">\n");
-    $r->print("</form></body></html>");
+    $domaintext.= &Apache::loncommon::end_data_table();
+    if ($num_domain_level > 0) {
+        $r->print($domaintext);
+        $addrolesdisplay = 1;
+    }
+    return $addrolesdisplay;
+}
+
+sub user_authentication {
+    my ($ccuname,$ccdomain,$formname) = @_;
+    my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
+    my $outcome;
+    # 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);
+
+            my $choices = &Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc);
+            $outcome = <<ENDBADAUTH;
+<script type="text/javascript" language="Javascript">
+$loginscript
+</script>
+<span class="LC_error">$lt{'err'}:
+$lt{'uuas'} ($currentauth). $lt{'sldb'}.</span>
+<h3>$lt{'ld'}</h3>
+$choices
+ENDBADAUTH
+        } else {
+            # This user is not allowed to modify the user's
+            # authentication scheme, so just notify them of the problem
+            $outcome = <<ENDBADAUTH;
+<span class="LC_error"> $lt{'err'}: 
+$lt{'uuas'} ($currentauth). $lt{'adcs'}.
+</span>
+ENDBADAUTH
+        }
+    } else { # Authentication type is valid
+        &initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser');
+        my ($authformcurrent,$can_modify,@authform_others) =
+            &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".
+                       $loginscript."\n".
+                       '</script>'."\n".
+                       '<h3>'.$lt{'ld'}.'</h3>'.
+                       &Apache::loncommon::start_data_table().
+                       &Apache::loncommon::start_data_table_row().
+                       '<td>'.$authformnop;
+            if ($can_modify) {
+                $outcome .= '</td>'."\n".
+                            &Apache::loncommon::end_data_table_row().
+                            &Apache::loncommon::start_data_table_row().
+                            '<td>'.$authformcurrent.'</td>'.
+                            &Apache::loncommon::end_data_table_row()."\n";
+            } else {
+                $outcome .= '&nbsp;('.$authformcurrent.')</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('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.",
+                           'ifch'  => "If a change is required, contact a domain coordinator for the domain",
+                );
+                $outcome .= <<ENDNOPRIV;
+<h3>$lt{'ccld'}</h3>
+$lt{'yodo'} $lt{'ifch'}: $ccdomain
+<input type="hidden" name="login" value="nochange" />
+ENDNOPRIV
+            }
+        }
+    }  ## End of "check for bad authentication type" logic
+    return $outcome;
+}
+
+sub modify_login_block {
+    my ($dom,$currentauth) = @_;
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
+    my ($authnum,%can_assign) =
+        &Apache::loncommon::get_assignable_auth($dom);
+    my ($authformcurrent,@authform_others,$show_override_msg);
+    if ($currentauth=~/^krb(4|5):/) {
+        $authformcurrent=$authformkrb;
+        if ($can_assign{'int'}) {
+            push(@authform_others,$authformint);
+        }
+        if ($can_assign{'loc'}) {
+            push(@authform_others,$authformloc);
+        }
+        if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
+            $show_override_msg = 1;
+        }
+    } elsif ($currentauth=~/^internal:/) {
+        $authformcurrent=$authformint;
+        if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
+            push(@authform_others,$authformkrb);
+        }
+        if ($can_assign{'loc'}) {
+            push(@authform_others,$authformloc);
+        }
+        if ($can_assign{'int'}) {
+            $show_override_msg = 1;
+        }
+    } elsif ($currentauth=~/^unix:/) {
+        $authformcurrent=$authformfsys;
+        if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
+            push(@authform_others,$authformkrb);
+        }
+        if ($can_assign{'int'}) {
+            push(@authform_others,$authformint);
+        }
+        if ($can_assign{'loc'}) {
+            push(@authform_others,$authformloc);
+        }
+        if ($can_assign{'fsys'}) {
+            $show_override_msg = 1;
+        }
+    } elsif ($currentauth=~/^localauth:/) {
+        $authformcurrent=$authformloc;
+        if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
+            push(@authform_others,$authformkrb);
+        }
+        if ($can_assign{'int'}) {
+            push(@authform_others,$authformint);
+        }
+        if ($can_assign{'loc'}) {
+            $show_override_msg = 1;
+        }
+    }
+    if ($show_override_msg) {
+        $authformcurrent = '<table><tr><td colspan="3">'.$authformcurrent.
+                           '</td></tr>'."\n".
+                           '<tr><td>&nbsp;&nbsp;&nbsp;</td>'.
+                           '<td><b>'.&mt('Currently in use').'</b></td>'.
+                           '<td align="right"><span class="LC_cusr_emph">'.
+                            &mt('will override current values').
+                            '</span></td></tr></table>';
+    }
+    return ($authformcurrent,$show_override_msg,@authform_others); 
+}
+
+sub personal_data_display {
+    my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray) = @_;
+    my ($output,$showforceid,%userenv,%canmodify);
+    my @userinfo = ('firstname','middlename','lastname','generation',
+                    'permanentemail','id');
+    my $rowcount = 0;
+    my $editable = 0;
+    if (!$newuser) {
+        # Get the users information
+        %userenv = &Apache::lonnet::get('environment',
+                   ['firstname','middlename','lastname','generation',
+                    'permanentemail','id'],$ccdomain,$ccuname);
+        %canmodify =
+            &Apache::lonuserutils::can_modify_userinfo($context,$ccdomain,
+                                                       \@userinfo,$rolesarray);
+    } elsif ($context eq 'selfcreate') {
+        %canmodify = &selfcreate_canmodify($context,$ccdomain,\@userinfo,
+                                           $inst_results,$rolesarray);
+    }
+    my %lt=&Apache::lonlocal::texthash(
+                'pd'             => "Personal Data",
+                'firstname'      => "First Name",
+                'middlename'     => "Middle Name",
+                'lastname'       => "Last Name",
+                'generation'     => "Generation",
+                'permanentemail' => "Permanent e-mail address",
+                'id'             => "Student/Employee ID",
+                'lg'             => "Login Data"
+    );
+    my %textboxsize = (
+                       firstname      => '15',
+                       middlename     => '15',
+                       lastname       => '15',
+                       generation     => '5',
+                       permanentemail => '25',
+                       id             => '15',
+                      );
+    my $genhelp=&Apache::loncommon::help_open_topic('Generation');
+    $output = '<h3>'.$lt{'pd'}.'</h3>'.
+              &Apache::lonhtmlcommon::start_pick_box();
+    foreach my $item (@userinfo) {
+        my $rowtitle = $lt{$item};
+        my $hiderow = 0;
+        if ($item eq 'generation') {
+            $rowtitle = $genhelp.$rowtitle;
+        }
+        my $row = &Apache::lonhtmlcommon::row_title($rowtitle,undef,'LC_oddrow_value')."\n";
+        if ($newuser) {
+            if (ref($inst_results) eq 'HASH') {
+                if ($inst_results->{$item} ne '') {
+                    $row .= '<input type="hidden" name="c'.$item.'" value="'.$inst_results->{$item}.'" />'.$inst_results->{$item};
+                } else {
+                    if ($context eq 'selfcreate') {
+                        if ($canmodify{$item}) {
+                            $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                            $editable ++;
+                        } else {
+                            $hiderow = 1;
+                        }
+                    } else {
+                        $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                    }
+                }
+            } else {
+                if ($context eq 'selfcreate') {
+                    if ($canmodify{$item}) {
+                        $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                        $editable ++;
+                    } else {
+                        $hiderow = 1;
+                    }
+                } else {
+                    $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                }
+            }
+        } else {
+            if ($canmodify{$item}) {
+                $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="'.$userenv{$item}.'" />';
+            } else {
+                $row .= $userenv{$item};
+            }
+            if ($item eq 'id') {
+                $showforceid = $canmodify{$item};
+            }
+        }
+        $row .= &Apache::lonhtmlcommon::row_closure(1);
+        if (!$hiderow) {
+            $output .= $row;
+            $rowcount ++;
+        }
+    }
+    $output .= &Apache::lonhtmlcommon::end_pick_box();
+    if (wantarray) {
+        if ($context eq 'selfcreate') {
+            return($output,$rowcount,$editable);
+        } else {
+            return ($output,$showforceid);
+        }
+    } else {
+        return $output;
+    }
+}
+
+sub selfcreate_canmodify {
+    my ($context,$dom,$userinfo,$inst_results,$rolesarray) = @_;
+    if (ref($inst_results) eq 'HASH') {
+        my @inststatuses = &get_inststatuses($inst_results);
+        if (@inststatuses == 0) {
+            @inststatuses = ('default');
+        }
+        $rolesarray = \@inststatuses;
+    }
+    my %canmodify =
+        &Apache::lonuserutils::can_modify_userinfo($context,$dom,$userinfo,
+                                                   $rolesarray);
+    return %canmodify;
+}
+
+sub get_inststatuses {
+    my ($insthashref) = @_;
+    my @inststatuses = ();
+    if (ref($insthashref) eq 'HASH') {
+        if (ref($insthashref->{'inststatus'}) eq 'ARRAY') {
+            @inststatuses = @{$insthashref->{'inststatus'}};
+        }
+    }
+    return @inststatuses;
 }
 
 # ================================================================= Phase Three
 sub update_user_data {
-    my $r=shift;
-    my $uhome=&Apache::lonnet::homeserver($ENV{'form.ccuname'},
-                                          $ENV{'form.ccdomain'});
+    my ($r,$context) = @_; 
+    my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
+                                          $env{'form.ccdomain'});
     # Error messages
-    my $error     = '<font color="#ff0000">Error:</font>';
-    my $end       = '</body></html>';
-    # Print header
-    $r->print(<<ENDTHREEHEAD);
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-</head>
-ENDTHREEHEAD
+    my $error     = '<span class="LC_error">'.&mt('Error').': ';
+    my $end       = '</span><br /><br />';
+    my $rtnlink   = '<a href="javascript:backPage(document.userupdate,'.
+                    "'$env{'form.prevphase'}','modify')".'" />'.
+                    &mt('Return to previous page').'</a>'.
+                    &Apache::loncommon::end_page();
+    my $now = time;
     my $title;
-    if (exists($ENV{'form.makeuser'})) {
+    if (exists($env{'form.makeuser'})) {
 	$title='Set Privileges for New User';
     } else {
         $title='Modify User Privileges';
     }
-    $r->print(&Apache::loncommon::bodytag($title));
+    my $newuser = 0;
+    my ($jsback,$elements) = &crumb_utilities();
+    my $jscript = '<script type="text/javascript">'."\n".
+                  $jsback."\n".'</script>'."\n";
+    my %breadcrumb_text = &singleuser_breadcrumb();
+    my $args;
+    if ($env{'form.popup'}) {
+        $args->{'no_nav_bar'} = 1;
+    } else {
+        $args = undef;
+    }
+    $r->print(&Apache::loncommon::start_page($title,$jscript,$args));
+    &Apache::lonhtmlcommon::add_breadcrumb
+       ({href=>"javascript:backPage(document.userupdate)",
+         text=>$breadcrumb_text{'search'},
+         faq=>282,bug=>'Instructor Interface',});
+    if ($env{'form.prevphase'} eq 'userpicked') {
+        &Apache::lonhtmlcommon::add_breadcrumb
+           ({href=>"javascript:backPage(document.userupdate,'get_user_info','select')",
+             text=>$breadcrumb_text{'userpicked'},
+             faq=>282,bug=>'Instructor Interface',});
+    }
+    &Apache::lonhtmlcommon::add_breadcrumb
+       ({href=>"javascript:backPage(document.userupdate,'$env{'form.prevphase'}','modify')",
+         text=>$breadcrumb_text{'modify'},
+         faq=>282,bug=>'Instructor Interface',},
+        {href=>"/adm/createuser",
+         text=>"Result",
+         faq=>282,bug=>'Instructor Interface',});
+    my $helpitem = 'Course_Change_Privileges';
+    if ($env{'form.action'} eq 'singlestudent') {
+        $helpitem = 'Course_Add_Student';
+    }
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                 $helpitem));
+    $r->print(&update_result_form($uhome));
     # Check Inputs
-    if (! $ENV{'form.ccuname'} ) {
-	$r->print($error.'No login name specified.'.$end);
+    if (! $env{'form.ccuname'} ) {
+	$r->print($error.&mt('No login name specified').'.'.$end.$rtnlink);
 	return;
     }
-    if (  $ENV{'form.ccuname'}  =~/\W/) {
-	$r->print($error.'Invalid login name.  '.
-		  'Only letters, numbers, and underscores are valid.'.
-		  $end);
+    if (  $env{'form.ccuname'} ne 
+	  &LONCAPA::clean_username($env{'form.ccuname'}) ) {
+	$r->print($error.&mt('Invalid login name').'.  '.
+		  &mt('Only letters, numbers, periods, dashes, @, and underscores are valid').'.'.
+		  $end.$rtnlink);
 	return;
     }
-    if (! $ENV{'form.ccdomain'}       ) {
-	$r->print($error.'No domain specified.'.$end);
+    if (! $env{'form.ccdomain'}       ) {
+	$r->print($error.&mt('No domain specified').'.'.$end.$rtnlink);
 	return;
     }
-    if (  $ENV{'form.ccdomain'} =~/\W/) {
-	$r->print($error.'Invalid domain name.  '.
-		  'Only letters, numbers, and underscores are valid.'.
-		  $end);
+    if (  $env{'form.ccdomain'} ne
+	  &LONCAPA::clean_domain($env{'form.ccdomain'}) ) {
+	$r->print($error.&mt ('Invalid domain name').'.  '.
+		  &mt('Only letters, numbers, periods, dashes, and underscores are valid').'.'.
+		  $end.$rtnlink);
 	return;
     }
-    if (! exists($ENV{'form.makeuser'})) {
+    if ($uhome eq 'no_host') {
+        $newuser = 1;
+    }
+    if (! exists($env{'form.makeuser'})) {
         # Modifying an existing user, so check the validity of the name
         if ($uhome eq 'no_host') {
-            $r->print($error.'Unable to determine home server for '.
-                      $ENV{'form.ccuname'}.' in domain '.
-                      $ENV{'form.ccdomain'}.'.');
+            $r->print($error.&mt('Unable to determine home server for ').
+                      $env{'form.ccuname'}.&mt(' in domain ').
+                      $env{'form.ccdomain'}.'.');
             return;
         }
     }
     # Determine authentication method and password for the user being modified
     my $amode='';
     my $genpwd='';
-    if ($ENV{'form.login'} eq 'krb') {
+    if ($env{'form.login'} eq 'krb') {
 	$amode='krb';
-	$amode.=$ENV{'form.krbver'};
-	$genpwd=$ENV{'form.krbarg'};
-    } elsif ($ENV{'form.login'} eq 'int') {
+	$amode.=$env{'form.krbver'};
+	$genpwd=$env{'form.krbarg'};
+    } elsif ($env{'form.login'} eq 'int') {
 	$amode='internal';
-	$genpwd=$ENV{'form.intarg'};
-    } elsif ($ENV{'form.login'} eq 'fsys') {
+	$genpwd=$env{'form.intarg'};
+    } elsif ($env{'form.login'} eq 'fsys') {
 	$amode='unix';
-	$genpwd=$ENV{'form.fsysarg'};
-    } elsif ($ENV{'form.login'} eq 'loc') {
+	$genpwd=$env{'form.fsysarg'};
+    } elsif ($env{'form.login'} eq 'loc') {
 	$amode='localauth';
-	$genpwd=$ENV{'form.locarg'};
+	$genpwd=$env{'form.locarg'};
 	$genpwd=" " if (!$genpwd);
-    } elsif (($ENV{'form.login'} eq 'nochange') ||
-             ($ENV{'form.login'} eq ''        )) { 
+    } elsif (($env{'form.login'} eq 'nochange') ||
+             ($env{'form.login'} eq ''        )) { 
         # There is no need to tell the user we did not change what they
         # did not ask us to change.
         # If they are creating a new user but have not specified login
         # information this will be caught below.
     } else {
-	    $r->print($error.'Invalid login mode or password'.$end);    
+	    $r->print($error.&mt('Invalid login mode or password').$end.$rtnlink);    
 	    return;
     }
-    if ($ENV{'form.makeuser'}) {
-        # Create a new user
-	$r->print(<<ENDNEWUSERHEAD);
-<h3>Creating user "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2>
-ENDNEWUSERHEAD
+
+    $r->print('<h3>'.&mt('User [_1] in domain [_2]',
+			 $env{'form.ccuname'}, $env{'form.ccdomain'}).'</h3>');
+    my (%alerts,%rulematch,%inst_results,%curr_rules);
+    if ($env{'form.makeuser'}) {
+	$r->print('<h3>'.&mt('Creating new account.').'</h3>');
         # Check for the authentication mode and password
         if (! $amode || ! $genpwd) {
-	    $r->print($error.'Invalid login mode or password'.$end);    
+	    $r->print($error.&mt('Invalid login mode or password').$end.$rtnlink);    
 	    return;
 	}
         # Determine desired host
-        my $desiredhost = $ENV{'form.hserver'};
+        my $desiredhost = $env{'form.hserver'};
         if (lc($desiredhost) eq 'default') {
             $desiredhost = undef;
         } else {
-            my %home_servers = &Apache::loncommon::get_library_servers
-                ($ENV{'form.ccdomain'});  
+            my %home_servers = 
+		&Apache::lonnet::get_servers($env{'form.ccdomain'},'library');
             if (! exists($home_servers{$desiredhost})) {
-                $r->print($error.'Invalid home server specified');
+                $r->print($error.&mt('Invalid home server specified').$end.$rtnlink);
                 return;
             }
         }
+        # Check ID format
+        my %checkhash;
+        my %checks = ('id' => 1);
+        %{$checkhash{$env{'form.ccuname'}.':'.$env{'form.ccdomain'}}} = (
+            'newuser' => $newuser, 
+            'id' => $env{'form.cid'},
+        );
+        if ($env{'form.cid'} ne '') {
+            &Apache::loncommon::user_rule_check(\%checkhash,\%checks,\%alerts,
+                                          \%rulematch,\%inst_results,\%curr_rules);
+            if (ref($alerts{'id'}) eq 'HASH') {
+                if (ref($alerts{'id'}{$env{'form.ccdomain'}}) eq 'HASH') {
+                    my $domdesc =
+                        &Apache::lonnet::domain($env{'form.ccdomain'},'description');
+                    if ($alerts{'id'}{$env{'form.ccdomain'}}{$env{'form.cid'}}) {
+                        my $userchkmsg;
+                        if (ref($curr_rules{$env{'form.ccdomain'}}) eq 'HASH') {
+                            $userchkmsg  = 
+                                &Apache::loncommon::instrule_disallow_msg('id',
+                                                                    $domdesc,1).
+                                &Apache::loncommon::user_rule_formats($env{'form.ccdomain'},
+                                    $domdesc,$curr_rules{$env{'form.ccdomain'}}{'id'},'id');
+                        }
+                        $r->print($error.&mt('Invalid ID format').$end.
+                                  $userchkmsg.$rtnlink);
+                        return;
+                    }
+                }
+            }
+        }
 	# Call modifyuser
 	my $result = &Apache::lonnet::modifyuser
-	    ($ENV{'form.ccdomain'},$ENV{'form.ccuname'},$ENV{'form.cstid'},
-             $amode,$genpwd,$ENV{'form.cfirst'},
-             $ENV{'form.cmiddle'},$ENV{'form.clast'},$ENV{'form.cgen'},
-             undef,$desiredhost
-	     );
-	$r->print('Generating user: '.$result);
-        my $home = &Apache::lonnet::homeserver($ENV{'form.ccuname'},
-                                               $ENV{'form.ccdomain'});
-        $r->print('<br>Home server: '.$home.' '.
-                  $Apache::lonnet::libserv{$home});
-    } elsif (($ENV{'form.login'} ne 'nochange') &&
-             ($ENV{'form.login'} ne ''        )) {
+	    ($env{'form.ccdomain'},$env{'form.ccuname'},$env{'form.cid'},
+             $amode,$genpwd,$env{'form.cfirstname'},
+             $env{'form.cmiddlename'},$env{'form.clastname'},
+             $env{'form.cgeneration'},undef,$desiredhost,
+             $env{'form.cpermanentemail'});
+	$r->print(&mt('Generating user').': '.$result);
+        $uhome = &Apache::lonnet::homeserver($env{'form.ccuname'},
+                                               $env{'form.ccdomain'});
+        if (($uhome ne 'no_host') && ($env{'form.customquota'} == 1)) {
+            my (%changeHash,$newportfolioquota);
+            if ($env{'form.portfolioquota'} eq '') {
+                $newportfolioquota = 0;
+            } else {
+                $newportfolioquota = $env{'form.portfolioquota'};
+                $newportfolioquota =~ s/[^\d\.]//g;
+            }
+            my $quotachanged = &quota_admin($newportfolioquota,\%changeHash);
+            if ($quotachanged) {
+                $changeHash{'firstname'}  = $env{'form.cfirstname'};
+                $changeHash{'middlename'} = $env{'form.cmiddlename'};
+                $changeHash{'lastname'}   = $env{'form.clastname'};
+                $changeHash{'generation'} = $env{'form.cgeneration'};
+                $changeHash{'id'}         = $env{'form.cid'};
+                $changeHash{'permanentemail'} = $env{'form.cpermanentemail'};
+                my $quotachgresult =
+                    &Apache::lonnet::put('environment',\%changeHash,
+                                         $env{'form.ccdomain'},$env{'form.ccuname'});
+            }
+        }
+        $r->print('<br />'.&mt('Home server').': '.$uhome.' '.
+                  &Apache::lonnet::hostname($uhome));
+    } elsif (($env{'form.login'} ne 'nochange') &&
+             ($env{'form.login'} ne ''        )) {
 	# Modify user privileges
-	$r->print(<<ENDMODIFYUSERHEAD);
-<h2>User "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2>
-ENDMODIFYUSERHEAD
         if (! $amode || ! $genpwd) {
-	    $r->print($error.'Invalid login mode or password'.$end);    
+	    $r->print($error.'Invalid login mode or password'.$end.$rtnlink);    
 	    return;
 	}
 	# Only allow authentification modification if the person has authority
-	if (&Apache::lonnet::allowed('mau',$ENV{'form.ccdomain'})) {
+	if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) {
 	    $r->print('Modifying authentication: '.
                       &Apache::lonnet::modifyuserauth(
-		       $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
+		       $env{'form.ccdomain'},$env{'form.ccuname'},
                        $amode,$genpwd));
-            $r->print('<br>Home server: '.&Apache::lonnet::homeserver
-		  ($ENV{'form.ccuname'},$ENV{'form.ccdomain'}));
+            $r->print('<br />'.&mt('Home server').': '.&Apache::lonnet::homeserver
+		  ($env{'form.ccuname'},$env{'form.ccdomain'}));
 	} else {
 	    # Okay, this is a non-fatal error.
-	    $r->print($error.'You do not have the authority to modify '.
-		      'this users authentification information.');    
+	    $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.'.$end);    
 	}
     }
     ##
-    if (! $ENV{'form.makeuser'} ) {
+    my (@userroles,%userupdate,$cnum,$cdom,$namechanged);
+    if ($context eq 'course') {
+        ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
+    }
+    if (! $env{'form.makeuser'} ) {
         # Check for need to change
         my %userenv = &Apache::lonnet::get
-            ('environment',['firstname','middlename','lastname','generation'],
-             $ENV{'form.ccdomain'},$ENV{'form.ccuname'});
+            ('environment',['firstname','middlename','lastname','generation',
+             'id','permanentemail','portfolioquota','inststatus'],
+              $env{'form.ccdomain'},$env{'form.ccuname'});
         my ($tmp) = keys(%userenv);
         if ($tmp =~ /^(con_lost|error)/i) { 
             %userenv = ();
         }
-        # Check to see if we need to change user information
-        foreach ('firstname','middlename','lastname','generation') {
+        my $no_forceid_alert;
+        # Check to see if user information can be changed
+        my %domconfig =
+            &Apache::lonnet::get_dom('configuration',['usermodification'],
+                                     $env{'form.ccdomain'});
+        my @statuses = ('active','future');
+        my %roles = &Apache::lonnet::get_my_roles($env{'form.ccuname'},$env{'form.ccdomain'},'userroles',\@statuses,undef,$env{'request.role.domain'});
+        my ($auname,$audom);
+        if ($context eq 'author') {
+            $auname = $env{'user.name'};
+            $audom = $env{'user.domain'};     
+        }
+        foreach my $item (keys(%roles)) {
+            my ($rolenum,$roledom,$role) = split(/:/,$item,-1);
+            if ($context eq 'course') {
+                if ($cnum ne '' && $cdom ne '') {
+                    if ($rolenum eq $cnum && $roledom eq $cdom) {
+                        if (!grep(/^\Q$role\E$/,@userroles)) {
+                            push(@userroles,$role);
+                        }
+                    }
+                }
+            } elsif ($context eq 'author') {
+                if ($rolenum eq $auname && $roledom eq $audom) {
+                    if (!grep(/^\Q$role\E$/,@userroles)) { 
+                        push(@userroles,$role);
+                    }
+                }
+            }
+        }
+        if ($env{'form.action'} eq 'singlestudent') {
+            if (!grep(/^st$/,@userroles)) {
+                push(@userroles,'st');
+            }
+        } else {
+            # Check for course or co-author roles being activated or re-enabled
+            if ($context eq 'author' || $context eq 'course') {
+                foreach my $key (keys(%env)) {
+                    if ($context eq 'author') {
+                        if ($key=~/^form\.act_\Q$audom\E_\Q$auname\E_([^_]+)/) {
+                            if (!grep(/^\Q$1\E$/,@userroles)) {
+                                push(@userroles,$1);
+                            }
+                        } elsif ($key =~/^form\.ren\:\Q$audom\E\/\Q$auname\E_([^_]+)/) {
+                            if (!grep(/^\Q$1\E$/,@userroles)) {
+                                push(@userroles,$1);
+                            }
+                        }
+                    } elsif ($context eq 'course') {
+                        if ($key=~/^form\.act_\Q$cdom\E_\Q$cnum\E_([^_]+)/) {
+                            if (!grep(/^\Q$1\E$/,@userroles)) {
+                                push(@userroles,$1);
+                            }
+                        } elsif ($key =~/^form\.ren\:\Q$cdom\E\/\Q$cnum\E(\/?\w*)_([^_]+)/) {
+                            if (!grep(/^\Q$1\E$/,@userroles)) {
+                                push(@userroles,$1);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        #Check to see if we can change personal data for the user 
+        my (@mod_disallowed,@longroles);
+        foreach my $role (@userroles) {
+            if ($role eq 'cr') {
+                push(@longroles,'Custom');
+            } else {
+                push(@longroles,&Apache::lonnet::plaintext($role)); 
+            }
+        }
+        my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
+        my %canmodify = &Apache::lonuserutils::can_modify_userinfo($context,$env{'form.ccdomain'},\@userinfo,\@userroles);
+        foreach my $item (@userinfo) {
             # Strip leading and trailing whitespace
-            $ENV{'form.c'.$_} =~ s/(\s+$|^\s+)//g; 
+            $env{'form.c'.$item} =~ s/(\s+$|^\s+)//g;
+            if (!$canmodify{$item}) {
+                if (defined($env{'form.c'.$item})) {
+                    if ($env{'form.c'.$item} ne $userenv{$item}) {
+                        push(@mod_disallowed,$item);
+                    }
+                }
+                $env{'form.c'.$item} = $userenv{$item};
+            }
+        }
+        # Check to see if we can change the Student/Employee ID
+        my $forceid = $env{'form.forceid'};
+        my $recurseid = $env{'form.recurseid'};
+        my (%alerts,%rulematch,%idinst_results,%curr_rules,%got_rules);
+        my %uidhash = &Apache::lonnet::idrget($env{'form.ccdomain'},
+                                            $env{'form.ccuname'});
+        if (($uidhash{$env{'form.ccuname'}}) && 
+            ($uidhash{$env{'form.ccuname'}}!~/error\:/) && 
+            (!$forceid)) {
+            if ($env{'form.cid'} ne $uidhash{$env{'form.ccuname'}}) {
+                $env{'form.cid'} = $userenv{'id'};
+                $no_forceid_alert = &mt('New Student/Employee ID does not match existing ID for this user.')
+                                    .'<br />'
+                                    .&mt("Change is not permitted without checking the 'Force ID change' checkbox on the previous page.")
+                                    .'<br />'."\n";        
+            }
+        }
+        if ($env{'form.cid'} ne $userenv{'id'}) {
+            my $checkhash;
+            my $checks = { 'id' => 1 };
+            $checkhash->{$env{'form.ccuname'}.':'.$env{'form.ccdomain'}} = 
+                   { 'newuser' => $newuser,
+                     'id'  => $env{'form.cid'}, 
+                   };
+            &Apache::loncommon::user_rule_check($checkhash,$checks,
+                \%alerts,\%rulematch,\%idinst_results,\%curr_rules,\%got_rules);
+            if (ref($alerts{'id'}) eq 'HASH') {
+                if (ref($alerts{'id'}{$env{'form.ccdomain'}}) eq 'HASH') {
+                   $env{'form.cid'} = $userenv{'id'};
+                }
+            }
+        }
+        my ($quotachanged,$oldportfolioquota,$newportfolioquota,
+            $inststatus,$oldisdefault,$newisdefault,$olddefquotatext,
+            $newdefquotatext);
+        my ($defquota,$settingstatus) = 
+            &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus);
+        my $showquota;
+        if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
+            $showquota = 1;
         }
-        if (&Apache::lonnet::allowed('mau',$ENV{'form.ccdomain'}) && 
-            ($ENV{'form.cfirstname'}  ne $userenv{'firstname'}  ||
-             $ENV{'form.cmiddlename'} ne $userenv{'middlename'} ||
-             $ENV{'form.clastname'}   ne $userenv{'lastname'}   ||
-             $ENV{'form.cgeneration'} ne $userenv{'generation'} )) {
+        my %changeHash;
+        $changeHash{'portfolioquota'} = $userenv{'portfolioquota'};
+        if ($userenv{'portfolioquota'} ne '') {
+            $oldportfolioquota = $userenv{'portfolioquota'};
+            if ($env{'form.customquota'} == 1) {
+                if ($env{'form.portfolioquota'} eq '') {
+                    $newportfolioquota = 0;
+                } else {
+                    $newportfolioquota = $env{'form.portfolioquota'};
+                    $newportfolioquota =~ s/[^\d\.]//g;
+                }
+                if ($newportfolioquota != $oldportfolioquota) {
+                    $quotachanged = &quota_admin($newportfolioquota,\%changeHash);
+                }
+            } else {
+                $quotachanged = &quota_admin('',\%changeHash);
+                $newportfolioquota = $defquota;
+                $newisdefault = 1; 
+            }
+        } else {
+            $oldisdefault = 1;
+            $oldportfolioquota = $defquota;
+            if ($env{'form.customquota'} == 1) {
+                if ($env{'form.portfolioquota'} eq '') {
+                    $newportfolioquota = 0;
+                } else {
+                    $newportfolioquota = $env{'form.portfolioquota'};
+                    $newportfolioquota =~ s/[^\d\.]//g;
+                }
+                $quotachanged = &quota_admin($newportfolioquota,\%changeHash);
+            } else {
+                $newportfolioquota = $defquota;
+                $newisdefault = 1;
+            }
+        }
+        if ($oldisdefault) {
+            $olddefquotatext = &get_defaultquota_text($settingstatus);
+        }
+        if ($newisdefault) {
+            $newdefquotatext = &get_defaultquota_text($settingstatus);
+        }
+        if ($env{'form.cfirstname'}  ne $userenv{'firstname'}  ||
+            $env{'form.cmiddlename'} ne $userenv{'middlename'} ||
+            $env{'form.clastname'}   ne $userenv{'lastname'}   ||
+            $env{'form.cgeneration'} ne $userenv{'generation'} ||
+            $env{'form.cid'} ne $userenv{'id'}                 ||
+            $env{'form.cpermanentemail'} ne $userenv{'permanentemail'} ) {
+            $namechanged = 1;
+        }
+        if ($namechanged || $quotachanged) {
+            $changeHash{'firstname'}  = $env{'form.cfirstname'};
+            $changeHash{'middlename'} = $env{'form.cmiddlename'};
+            $changeHash{'lastname'}   = $env{'form.clastname'};
+            $changeHash{'generation'} = $env{'form.cgeneration'};
+            $changeHash{'id'}         = $env{'form.cid'};
+            $changeHash{'permanentemail'} = $env{'form.cpermanentemail'};
+            my ($quotachgresult,$namechgresult);
+            if ($quotachanged) {
+                $quotachgresult = 
+                    &Apache::lonnet::put('environment',\%changeHash,
+                                  $env{'form.ccdomain'},$env{'form.ccuname'});
+            }
+            if ($namechanged) {
             # Make the change
-            my %changeHash;
-            $changeHash{'firstname'}  = $ENV{'form.cfirstname'};
-            $changeHash{'middlename'} = $ENV{'form.cmiddlename'};
-            $changeHash{'lastname'}   = $ENV{'form.clastname'};
-            $changeHash{'generation'} = $ENV{'form.cgeneration'};
-            my $putresult = &Apache::lonnet::put
-                ('environment',\%changeHash,
-                 $ENV{'form.ccdomain'},$ENV{'form.ccuname'});
-            if ($putresult eq 'ok') {
+                $namechgresult =
+                    &Apache::lonnet::modifyuser($env{'form.ccdomain'},
+                        $env{'form.ccuname'},$changeHash{'id'},undef,undef,
+                        $changeHash{'firstname'},$changeHash{'middlename'},
+                        $changeHash{'lastname'},$changeHash{'generation'},
+                        $changeHash{'id'},undef,$changeHash{'permanentemail'});
+                %userupdate = (
+                               lastname   => $env{'form.clastname'},
+                               middlename => $env{'form.cmiddlename'},
+                               firstname  => $env{'form.cfirstname'},
+                               generation => $env{'form.cgeneration'},
+                               id         => $env{'form.cid'},
+                             );
+            }
+            if (($namechanged && $namechgresult eq 'ok') || 
+                ($quotachanged && $quotachgresult eq 'ok')) {
             # Tell the user we changed the name
+		my %lt=&Apache::lonlocal::texthash(
+                             'uic'  => "User Information Changed",             
+                             'frst' => "first",
+                             'mddl' => "middle",
+                             'lst'  => "last",
+			     'gen'  => "generation",
+                             'id'   => "Student/Employee ID",
+                             'mail' => "permanent e-mail",
+                             'disk' => "disk space allocated to portfolio files",
+                             'prvs' => "Previous",
+                             'chto' => "Changed To"
+						   );
+                $r->print('<h4>'.$lt{'uic'}.'</h4>'.
+                          &Apache::loncommon::start_data_table().
+                          &Apache::loncommon::start_data_table_header_row());
+                $r->print(<<"END");
+    <th>&nbsp;</th>
+    <th>$lt{'frst'}</th>
+    <th>$lt{'mddl'}</th>
+    <th>$lt{'lst'}</th>
+    <th>$lt{'gen'}</th>
+    <th>$lt{'id'}</th>
+    <th>$lt{'mail'}</th>
+END
+                if ($showquota) {
+                    $r->print("
+    <th>$lt{'disk'}</th>\n");
+                }
+                $r->print(&Apache::loncommon::end_data_table_header_row().
+                          &Apache::loncommon::start_data_table_row());
                 $r->print(<<"END");
-<table border="2">
-<caption>User Information Changed</caption>
-<tr><th>&nbsp;</th>
-    <th>first</th>
-    <th>middle</th>
-    <th>last</th>
-    <th>generation</th></tr>
-<tr><td>Previous</td>
+    <td><b>$lt{'prvs'}</b></td>
     <td>$userenv{'firstname'}  </td>
     <td>$userenv{'middlename'} </td>
     <td>$userenv{'lastname'}   </td>
-    <td>$userenv{'generation'} </td></tr>
-<tr><td>Changed To</td>
-    <td>$ENV{'form.cfirstname'}  </td>
-    <td>$ENV{'form.cmiddlename'} </td>
-    <td>$ENV{'form.clastname'}   </td>
-    <td>$ENV{'form.cgeneration'} </td></tr>
-</table>
+    <td>$userenv{'generation'} </td>
+    <td>$userenv{'id'}</td>
+    <td>$userenv{'permanentemail'} </td>
 END
-            } else { # error occurred
-                $r->print("<h2>Unable to successfully change environment for ".
-                      $ENV{'form.ccuname'}." in domain ".
-                      $ENV{'form.ccdomain'}."</h2>");
-            }
-        }  else { # End of if ($ENV ... ) logic
-            # They did not want to change the users name but we can
-            # still tell them what the name is
+                if ($showquota) {
+                    $r->print("
+    <td>$oldportfolioquota Mb $olddefquotatext </td>\n");
+                }
+                $r->print(&Apache::loncommon::end_data_table_row().
+                          &Apache::loncommon::start_data_table_row());
                 $r->print(<<"END");
-<h2>User "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2>
-<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} </h4>
-<h4>Generation: $userenv{'generation'}</h4>
+    <td><b>$lt{'chto'}</b></td>
+    <td>$env{'form.cfirstname'}  </td>
+    <td>$env{'form.cmiddlename'} </td>
+    <td>$env{'form.clastname'}   </td>
+    <td>$env{'form.cgeneration'} </td>
+    <td>$env{'form.cid'} </td>
+    <td>$env{'form.cpermanentemail'} </td>
+END
+                if ($showquota) {
+                    $r->print("
+    <td>$newportfolioquota Mb $newdefquotatext </td>\n");
+                }
+                $r->print(&Apache::loncommon::end_data_table_row().
+                          &Apache::loncommon::end_data_table().'<br />');
+                if ($env{'form.cid'} ne $userenv{'id'}) {
+                    &Apache::lonnet::idput($env{'form.ccdomain'},
+                         ($env{'form.ccuname'} => $env{'form.cid'}));
+                    if (($recurseid) &&
+                        (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
+                        my $idresult = 
+                            &Apache::lonuserutils::propagate_id_change(
+                                $env{'form.ccuname'},$env{'form.ccdomain'},
+                                \%userupdate);
+                        $r->print('<br />'.$idresult.'<br />');
+                    }
+                }
+                if (($env{'form.ccdomain'} eq $env{'user.domain'}) && 
+                    ($env{'form.ccuname'} eq $env{'user.name'})) {
+                    my %newenvhash;
+                    foreach my $key (keys(%changeHash)) {
+                        $newenvhash{'environment.'.$key} = $changeHash{$key};
+                    }
+                    &Apache::lonnet::appenv(\%newenvhash);
+                }
+            } else { # error occurred
+                $r->print('<span class="LC_error">'.&mt('Unable to successfully change environment for').' '.
+                      $env{'form.ccuname'}.' '.&mt('in domain').' '.
+                      $env{'form.ccdomain'}.'</span><br />');
+            }
+        }  else { # End of if ($env ... ) logic
+            # They did not want to change the users name or quota but we can
+            # still tell them what the name and quota are 
+	    my %lt=&Apache::lonlocal::texthash(
+                           'id'   => "Student/Employee ID",
+                           'mail' => "Permanent e-mail",
+                           'disk' => "Disk space allocated to user's portfolio files",
+					       );
+            $r->print(<<"END");
+<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}
 END
+            if ($userenv{'permanentemail'} ne '') {
+                $r->print('<br />['.$lt{'mail'}.': '.
+                          $userenv{'permanentemail'}.']');
+            }
+            if ($showquota) {
+                $r->print('<br />['.$lt{'disk'}.': '.$oldportfolioquota.' Mb '. 
+                          $olddefquotatext.']');
+            }
+            $r->print('</h4>');
+        }
+        if (@mod_disallowed) {
+            my ($rolestr,$contextname);
+            if (@longroles > 0) {
+                $rolestr = join(', ',@longroles);
+            } else {
+                $rolestr = &mt('No roles');
+            }
+            if ($context eq 'course') {
+                $contextname = &mt('course');
+            } elsif ($context eq 'author') {
+                $contextname = &mt('co-author');
+            }
+            $r->print(&mt('The following fields were not updated: ').'<ul>');
+            my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
+            foreach my $field (@mod_disallowed) {
+                $r->print('<li>'.$fieldtitles{$field}.'</li>'."\n"); 
+            }
+            $r->print('</ul>');
+            if (@mod_disallowed == 1) {
+                $r->print(&mt("You do not have the authority to change this field given the user's current set of active/future [_1] roles:",$contextname));
+            } else {
+                $r->print(&mt("You do not have the authority to change these fields given the user's current set of active/future [_1] roles:",$contextname));
+            }
+            $r->print('<span class="LC_cusr_emph">'.$rolestr.'</span><br />'.
+                      &mt('Contact your <a href="[_1]">helpdesk</a> for more information.',"javascript:helpMenu('display')").'<br />');
         }
+        $r->print('<span class="LC_warning">'
+                  .$no_forceid_alert
+                  .&Apache::lonuserutils::print_namespacing_alerts($env{'form.ccdomain'},\%alerts,\%curr_rules)
+                  .'</span>');
     }
-    ##
+    if ($env{'form.action'} eq 'singlestudent') {
+        &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context);
+        $r->print('<p><a href="javascript:backPage(document.userupdate)">'.
+                  &mt('Enroll Another Student').'</a></p>');
+    } else {
+        my @rolechanges = &update_roles($r,$context);
+        if ($namechanged) {
+            if ($context eq 'course') {
+                if (@userroles > 0) {
+                    if ((@rolechanges == 0) || 
+                        (!(grep(/^st$/,@rolechanges)))) {
+                        if (grep(/^st$/,@userroles)) {
+                            my $classlistupdated =
+                                &Apache::lonuserutils::update_classlist($cdom,
+                                              $cnum,$env{'form.ccdomain'},
+                                       $env{'form.ccuname'},\%userupdate);
+                        }
+                    }
+                }
+            }
+        }
+        my $userinfo = &Apache::loncommon::plainname($env{'form.ccuname'},
+                                                     $env{'form.ccdomain'});
+        if ($env{'form.popup'}) {
+            $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>');
+        } else {
+            $r->print('<p><a href="javascript:backPage(document.userupdate,'."'$env{'form.prevphase'}','modify'".')">'
+                     .&mt('Modify this user: [_1]','<span class="LC_cusr_emph">'.$env{'form.ccuname'}.':'.$env{'form.ccdomain'}.' ('.$userinfo.')</span>').'</a>'
+                     .('&nbsp;'x5).'<a href="javascript:backPage(document.userupdate)">'
+                     .&mt('Create/Modify Another User').'</a></p>');
+        }
+    }
+    $r->print(&Apache::loncommon::end_page());
+}
+
+sub update_roles {
+    my ($r,$context) = @_;
     my $now=time;
-    $r->print('<h3>Modifying Roles</h3>');
-    foreach (keys (%ENV)) {
-	next if (! $ENV{$_});
+    my @rolechanges;
+    my %disallowed;
+    $r->print('<h3>'.&mt('Modifying Roles').'</h3>');
+    foreach my $key (keys (%env)) {
+	next if (! $env{$key});
+        next if ($key eq 'form.action');
 	# Revoke roles
-	if ($_=~/^form\.rev/) {
-	    if ($_=~/^form\.rev\:([^\_]+)\_([^\_]+)$/) {
-	        $r->print('Revoking '.$2.' in '.$1.': '.
-                     &Apache::lonnet::assignrole($ENV{'form.ccdomain'},
-                     $ENV{'form.ccuname'},$1,$2,$now).'<br>');
-		if ($2 eq 'st') {
-		    $1=~/^\/(\w+)\/(\w+)/;
-		    my $cid=$1.'_'.$2;
-		    $r->print('Drop from classlist: '.
-			 &Apache::lonnet::critical('put:'.
-                             $ENV{'course.'.$cid.'.domain'}.':'.
-	                     $ENV{'course.'.$cid.'.num'}.':classlist:'.
-                         &Apache::lonnet::escape($ENV{'form.ccuname'}.':'.
-                             $ENV{'form.ccdomain'}).'='.
-                         &Apache::lonnet::escape($now.':'),
-	                     $ENV{'course.'.$cid.'.home'}).'<br>');
+	if ($key=~/^form\.rev/) {
+	    if ($key=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
+# Revoke standard role
+		my ($scope,$role) = ($1,$2);
+		my $result =
+		    &Apache::lonnet::revokerole($env{'form.ccdomain'},
+						$env{'form.ccuname'},
+						$scope,$role,'','',$context);
+	        $r->print(&mt('Revoking [_1] in [_2]: [_3]',
+			      $role,$scope,'<b>'.$result.'</b>').'<br />');
+		if ($role eq 'st') {
+		    my $result = 
+                        &Apache::lonuserutils::classlist_drop($scope,
+                            $env{'form.ccuname'},$env{'form.ccdomain'},
+			    $now);
+		    $r->print($result);
+		}
+                if (!grep(/^\Q$role\E$/,@rolechanges)) {
+                    push(@rolechanges,$role);
+                }
+	    }
+	    if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}s) {
+# Revoke custom role
+		$r->print(&mt('Revoking custom role:').
+                      ' '.$4.' by '.$3.':'.$2.' in '.$1.': <b>'.
+                      &Apache::lonnet::revokecustomrole($env{'form.ccdomain'},
+				  $env{'form.ccuname'},$1,$2,$3,$4,'','',$context).
+		'</b><br />');
+                if (!grep(/^cr$/,@rolechanges)) {
+                    push(@rolechanges,'cr');
+                }
+	    }
+	} elsif ($key=~/^form\.del/) {
+	    if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
+# Delete standard role
+		my ($scope,$role) = ($1,$2);
+		my $result =
+		    &Apache::lonnet::assignrole($env{'form.ccdomain'},
+						$env{'form.ccuname'},
+						$scope,$role,$now,0,1,'',
+                                                $context);
+	        $r->print(&mt('Deleting [_1] in [_2]: [_3]',$role,$scope,
+			      '<b>'.$result.'</b>').'<br />');
+		if ($role eq 'st') {
+		    my $result = 
+                        &Apache::lonuserutils::classlist_drop($scope,
+                            $env{'form.ccuname'},$env{'form.ccdomain'},
+			    $now);
+		    $r->print($result);
 		}
-	    } 
-	} elsif ($_=~/^form\.del/) {
-	    if ($_=~/^form\.del\:([^\_]+)\_([^\_]+)$/) {
-	        $r->print('Deleting '.$2.' in '.$1.': '.
-                     &Apache::lonnet::assignrole($ENV{'form.ccdomain'},
-                     $ENV{'form.ccuname'},$1,$2,$now,0,1).'<br>');
-		if ($2 eq 'st') {
-		    $1=~/^\/(\w+)\/(\w+)/;
-		    my $cid=$1.'_'.$2;
-		    $r->print('Drop from classlist: '.
-			 &Apache::lonnet::critical('put:'.
-                             $ENV{'course.'.$cid.'.domain'}.':'.
-	                     $ENV{'course.'.$cid.'.num'}.':classlist:'.
-                         &Apache::lonnet::escape($ENV{'form.ccuname'}.':'.
-                             $ENV{'form.ccdomain'}).'='.
-                         &Apache::lonnet::escape($now.':'),
-	                     $ENV{'course.'.$cid.'.home'}).'<br>');
+                if (!grep(/^\Q$role\E$/,@rolechanges)) {
+                    push(@rolechanges,$role);
+                }
+            }
+	    if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
+                my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
+# Delete custom role
+                $r->print(&mt('Deleting custom role [_1] by [_2]:[_3] in [_4]',
+                      $rolename,$rnam,$rdom,$url).': <b>'.
+                      &Apache::lonnet::assigncustomrole($env{'form.ccdomain'},
+                         $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
+                         0,1,$context).'</b><br />');
+                if (!grep(/^cr$/,@rolechanges)) {
+                    push(@rolechanges,'cr');
+                }
+            }
+	} elsif ($key=~/^form\.ren/) {
+            my $udom = $env{'form.ccdomain'};
+            my $uname = $env{'form.ccuname'};
+# Re-enable standard role
+	    if ($key=~/^form\.ren\:([^\_]+)\_([^\_\.]+)$/) {
+                my $url = $1;
+                my $role = $2;
+                my $logmsg;
+                my $output;
+                if ($role eq 'st') {
+                    if ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) {
+                        my $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$1,$2,$3);
+                        if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course') || ($result eq 'refused')) {
+                            if ($result eq 'refused' && $logmsg) {
+                                $output = $logmsg;
+                            } else { 
+                                $output = "Error: $result\n";
+                            }
+                        } else {
+                            $output = &mt('Assigning').' '.$role.' in '.$url.
+                                      &mt('starting').' '.localtime($now).
+                                      ': <br />'.$logmsg.'<br />'.
+                                      &mt('Add to classlist').': <b>ok</b><br />';
+                        }
+                    }
+                } else {
+		    my $result=&Apache::lonnet::assignrole($env{'form.ccdomain'},
+                               $env{'form.ccuname'},$url,$role,0,$now,'','',
+                               $context);
+		    $output = &mt('Re-enabling [_1] in [_2]: <b>[_3]</b>',
+			      $role,$url,$result).'<br />';
 		}
-	    } 
-	} elsif ($_=~/^form\.act/) {
-	    if ($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_([^\_]+)$/) {
+                $r->print($output);
+                if (!grep(/^\Q$role\E$/,@rolechanges)) {
+                    push(@rolechanges,$role);
+                }
+	    }
+# Re-enable custom role
+	    if ($key=~m{^form\.ren\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
+                my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
+                my $result = &Apache::lonnet::assigncustomrole(
+                               $env{'form.ccdomain'}, $env{'form.ccuname'},
+                               $url,$rdom,$rnam,$rolename,0,$now,undef,$context);
+                $r->print(&mt('Re-enabling custom role [_1] by [_2]@[_3] in [_4] : <b>[_5]</b>',
+                          $rolename,$rnam,$rdom,$url,$result).'<br />');
+                if (!grep(/^cr$/,@rolechanges)) {
+                    push(@rolechanges,'cr');
+                }
+            }
+	} elsif ($key=~/^form\.act/) {
+            my $udom = $env{'form.ccdomain'};
+            my $uname = $env{'form.ccuname'};
+	    if ($key=~/^form\.act\_($match_domain)\_($match_courseid)\_cr_cr_($match_domain)_($match_username)_([^\_]+)$/) {
+                # Activate a custom role
+		my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5);
+		my $url='/'.$one.'/'.$two;
+		my $full=$one.'_'.$two.'_cr_cr_'.$three.'_'.$four.'_'.$five;
+
+                my $start = ( $env{'form.start_'.$full} ?
+                              $env{'form.start_'.$full} :
+                              $now );
+                my $end   = ( $env{'form.end_'.$full} ?
+                              $env{'form.end_'.$full} :
+                              0 );
+                                                                                     
+                # split multiple sections
+                my %sections = ();
+                my $num_sections = &build_roles($env{'form.sec_'.$full},\%sections,$5);
+                if ($num_sections == 0) {
+                    $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end,$context));
+                } else {
+		    my %curr_groups =
+			&Apache::longroup::coursegroups($one,$two);
+                    foreach my $sec (sort {$a cmp $b} keys %sections) {
+                        if (($sec eq 'none') || ($sec eq 'all') || 
+                            exists($curr_groups{$sec})) {
+                            $disallowed{$sec} = $url;
+                            next;
+                        }
+                        my $securl = $url.'/'.$sec;
+		        $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end,$context));
+                    }
+                }
+                if (!grep(/^cr$/,@rolechanges)) {
+                    push(@rolechanges,'cr');
+                }
+	    } elsif ($key=~/^form\.act\_($match_domain)\_($match_name)\_([^\_]+)$/) {
 		# Activate roles for sections with 3 id numbers
 		# set start, end times, and the url for the class
-
-		my $start = ( $ENV{'form.start_'.$1.'_'.$2.'_'.$3} ? 
-			      $ENV{'form.start_'.$1.'_'.$2.'_'.$3} : 
+		my ($one,$two,$three)=($1,$2,$3);
+		my $start = ( $env{'form.start_'.$one.'_'.$two.'_'.$three} ? 
+			      $env{'form.start_'.$one.'_'.$two.'_'.$three} : 
 			      $now );
-		my $end   = ( $ENV{'form.end_'.$1.'_'.$2.'_'.$3} ? 
-			      $ENV{'form.end_'.$1.'_'.$2.'_'.$3} :
+		my $end   = ( $env{'form.end_'.$one.'_'.$two.'_'.$three} ? 
+			      $env{'form.end_'.$one.'_'.$two.'_'.$three} :
 			      0 );
-		my $url='/'.$1.'/'.$2;
-		if ($ENV{'form.sec_'.$1.'_'.$2.'_'.$3}) {
-		    $url.='/'.$ENV{'form.sec_'.$1.'_'.$2.'_'.$3};
-		}
-		# Assign the role and report it
-		$r->print('Assigning: '.$3.' in '.$url.
-                         ($start?', starting '.localtime($start):'').
-                         ($end?', ending '.localtime($end):'').': '.
-                          &Apache::lonnet::assignrole(
-                              $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
-                              $url,$3,$end,$start).
-			  '<br>');
-		# Handle students differently
-		if ($3 eq 'st') {
-		    $url=~/^\/(\w+)\/(\w+)/;
-		    my $cid=$1.'_'.$2;
-		    $r->print('Add to classlist: '.
-			      &Apache::lonnet::critical(
-				  'put:'.$ENV{'course.'.$cid.'.domain'}.':'.
-	                           $ENV{'course.'.$cid.'.num'}.':classlist:'.
-                                   &Apache::lonnet::escape(
-                                       $ENV{'form.ccuname'}.':'.
-                                       $ENV{'form.ccdomain'} ).'='.
-                                   &Apache::lonnet::escape($end.':'.$start),
-				       $ENV{'course.'.$cid.'.home'})
-			      .'<br>');
-		}
-	    } elsif ($_=~/^form\.act\_([^\_]+)\_([^\_]+)$/) {
+		my $url='/'.$one.'/'.$two;
+                my $type = 'three';
+                # split multiple sections
+                my %sections = ();
+                my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two.'_'.$three},\%sections,$three);
+                if ($num_sections == 0) {
+                    $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'',$context));
+                } else {
+                    my %curr_groups = 
+			&Apache::longroup::coursegroups($one,$two);
+                    my $emptysec = 0;
+                    foreach my $sec (sort {$a cmp $b} keys %sections) {
+                        $sec =~ s/\W//g;
+                        if ($sec ne '') {
+                            if (($sec eq 'none') || ($sec eq 'all') || 
+                                exists($curr_groups{$sec})) {
+                                $disallowed{$sec} = $url;
+                                next;
+                            }
+                            my $securl = $url.'/'.$sec;
+                            $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec,$context));
+                        } else {
+                            $emptysec = 1;
+                        }
+                    }
+                    if ($emptysec) {
+                        $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'',$context));
+                    }
+                }
+                if (!grep(/^\Q$three\E$/,@rolechanges)) {
+                    push(@rolechanges,$three);
+                }
+	    } elsif ($key=~/^form\.act\_([^\_]+)\_([^\_]+)$/) {
 		# Activate roles for sections with two id numbers
 		# set start, end times, and the url for the class
-		my $start = ( $ENV{'form.start_'.$1.'_'.$2} ? 
-			      $ENV{'form.start_'.$1.'_'.$2} : 
+		my $start = ( $env{'form.start_'.$1.'_'.$2} ? 
+			      $env{'form.start_'.$1.'_'.$2} : 
 			      $now );
-		my $end   = ( $ENV{'form.end_'.$1.'_'.$2} ? 
-			      $ENV{'form.end_'.$1.'_'.$2} :
+		my $end   = ( $env{'form.end_'.$1.'_'.$2} ? 
+			      $env{'form.end_'.$1.'_'.$2} :
 			      0 );
-		my $url='/'.$1.'/';
-		# Assign the role and report it.
-		$r->print('Assigning: '.$2.' in '.$url.': '.
-                          &Apache::lonnet::assignrole(
-                              $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
-                              $url,$2,$end,$start)
-			  .'<br>');
-	    }
-	} 
-    } # End of foreach (keys(%ENV))
-    $r->print('</body></html>');
+                my $one = $1;
+                my $two = $2;
+		my $url='/'.$one.'/';
+                # split multiple sections
+                my %sections = ();
+                my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two},\%sections,$two);
+                if ($num_sections == 0) {
+                    $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$two,$start,$end,$one,undef,'',$context));
+                } else {
+                    my $emptysec = 0;
+                    foreach my $sec (sort {$a cmp $b} keys %sections) {
+                        if ($sec ne '') {
+                            my $securl = $url.'/'.$sec;
+                            $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$two,$start,$end,$one,undef,$sec,$context));
+                        } else {
+                            $emptysec = 1;
+                        }
+                    }
+                    if ($emptysec) {
+                        $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$two,$start,$end,$one,undef,'',$context));
+                    }
+                }
+                if (!grep(/^\Q$two\E$/,@rolechanges)) {
+                    push(@rolechanges,$two);
+                }
+	    } else {
+		$r->print('<p><span class="LC_error">'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$key.'</tt></span></p><br />');
+            }
+            foreach my $key (sort(keys(%disallowed))) {
+                if (($key eq 'none') || ($key eq 'all')) {  
+                    $r->print('<p>'.&mt('[_1] may not be used as the name for a section, as it is a reserved word.',$key));
+                } else {
+                    $r->print('<p>'.&mt('[_1] may not be used as the name for a section, as it is the name of a course group.',$key));
+                }
+                $r->print(' '.&mt('Please <a href="javascript:history.go(-1)">go back</a> and choose a different section name.').'</p><br />');
+            }
+	}
+    } # End of foreach (keys(%env))
+# Flush the course logs so reverse user roles immediately updated
+    &Apache::lonnet::flushcourselogs();
+    if (@rolechanges == 0) {
+        $r->print(&mt('No roles to modify'));
+    }
+    return @rolechanges;
+}
+
+sub enroll_single_student {
+    my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context) = @_;
+    $r->print('<h3>'.&mt('Enrolling Student').'</h3>');
+
+    # Remove non alphanumeric values from section
+    $env{'form.sections'}=~s/\W//g;
+
+    # Clean out any old student roles the user has in this class.
+    &Apache::lonuserutils::modifystudent($env{'form.ccdomain'},
+         $env{'form.ccuname'},$env{'request.course.id'},undef,$uhome);
+    my ($startdate,$enddate) = &Apache::lonuserutils::get_dates_from_form();
+    my $enroll_result =
+        &Apache::lonnet::modify_student_enrollment($env{'form.ccdomain'},
+            $env{'form.ccuname'},$env{'form.cid'},$env{'form.cfirstname'},
+            $env{'form.cmiddlename'},$env{'form.clastname'},
+            $env{'form.generation'},$env{'form.sections'},$enddate,
+            $startdate,'manual',undef,$env{'request.course.id'},'',$context);
+    if ($enroll_result =~ /^ok/) {
+        $r->print(&mt('<b>[_1]</b> enrolled',$env{'form.ccuname'}.':'.$env{'form.ccdomain'}));
+        if ($env{'form.sections'} ne '') {
+            $r->print(' '.&mt('in section [_1]',$env{'form.sections'}));
+        }
+        my ($showstart,$showend);
+        if ($startdate <= $now) {
+            $showstart = &mt('Access starts immediately');
+        } else {
+            $showstart = &mt('Access starts: ').&Apache::lonlocal::locallocaltime($startdate);
+        }
+        if ($enddate == 0) {
+            $showend = &mt('ends: no ending date');
+        } else {
+            $showend = &mt('ends: ').&Apache::lonlocal::locallocaltime($enddate);
+        }
+        $r->print('.<br />'.$showstart.'; '.$showend);
+        if ($startdate <= $now && !$newuser) {
+            $r->print("<p> ".&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.')."</p>");
+        }
+    } else {
+        $r->print(&mt('unable to enroll').": ".$enroll_result);
+    }
+    return;
+}
+
+sub get_defaultquota_text {
+    my ($settingstatus) = @_;
+    my $defquotatext; 
+    if ($settingstatus eq '') {
+        $defquotatext = &mt('(default)');
+    } else {
+        my ($usertypes,$order) =
+            &Apache::lonnet::retrieve_inst_usertypes($env{'form.ccdomain'});
+        if ($usertypes->{$settingstatus} eq '') {
+            $defquotatext = &mt('(default)');
+        } else {
+            $defquotatext = &mt('(default for [_1])',$usertypes->{$settingstatus});
+        }
+    }
+    return $defquotatext;
+}
+
+sub update_result_form {
+    my ($uhome) = @_;
+    my $outcome = 
+    '<form name="userupdate" method="post" />'."\n";
+    foreach my $item ('srchby','srchin','srchtype','srchterm','srchdomain','ccuname','ccdomain') {
+        $outcome .= '<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n";
+    }
+    if ($env{'form.origname'} ne '') {
+        $outcome .= '<input type="hidden" name="origname" value="'.$env{'form.origname'}.'" />'."\n";
+    }
+    foreach my $item ('sortby','seluname','seludom') {
+        if (exists($env{'form.'.$item})) {
+            $outcome .= '<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n";
+        }
+    }
+    if ($uhome eq 'no_host') {
+        $outcome .= '<input type="hidden" name="forcenewuser" value="1" />'."\n";
+    }
+    $outcome .= '<input type="hidden" name="phase" value="" />'."\n".
+                '<input type ="hidden" name="currstate" value="" />'."\n".
+                '<input type ="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
+                '</form>';
+    return $outcome;
+}
+
+sub quota_admin {
+    my ($setquota,$changeHash) = @_;
+    my $quotachanged;
+    if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
+        # Current user has quota modification privileges
+        $quotachanged = 1;
+        $changeHash->{'portfolioquota'} = $setquota;
+    }
+    return $quotachanged;
+}
+
+sub build_roles {
+    my ($sectionstr,$sections,$role) = @_;
+    my $num_sections = 0;
+    if ($sectionstr=~ /,/) {
+        my @secnums = split/,/,$sectionstr;
+        if ($role eq 'st') {
+            $secnums[0] =~ s/\W//g;
+            $$sections{$secnums[0]} = 1;
+            $num_sections = 1;
+        } else {
+            foreach my $sec (@secnums) {
+                $sec =~ ~s/\W//g;
+                if (!($sec eq "")) {
+                    if (exists($$sections{$sec})) {
+                        $$sections{$sec} ++;
+                    } else {
+                        $$sections{$sec} = 1;
+                        $num_sections ++;
+                    }
+                }
+            }
+        }
+    } else {
+        $sectionstr=~s/\W//g;
+        unless ($sectionstr eq '') {
+            $$sections{$sectionstr} = 1;
+            $num_sections ++;
+        }
+    }
+
+    return $num_sections;
+}
+
+# ========================================================== Custom Role Editor
+
+sub custom_role_editor {
+    my ($r) = @_;
+    my $rolename=$env{'form.rolename'};
+
+    if ($rolename eq 'make new role') {
+	$rolename=$env{'form.newrolename'};
+    }
+
+    $rolename=~s/[^A-Za-z0-9]//gs;
+
+    if (!$rolename || $env{'form.phase'} eq 'pickrole') {
+	&print_username_entry_form($r);
+        return;
+    }
+# ------------------------------------------------------- What can be assigned?
+    my %full=();
+    my %courselevel=();
+    my %courselevelcurrent=();
+    my $syspriv='';
+    my $dompriv='';
+    my $coursepriv='';
+    my $body_top;
+    my ($disp_dummy,$disp_roles) = &Apache::lonnet::get('roles',["st"]);
+    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').' "';
+# ------------------------------------------------- Get current role privileges
+	($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);
+    } else {
+	$body_top .= &mt('New Role').' "';
+	$roledef='';
+    }
+    $body_top .= $rolename.'"</h2>';
+    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 $button_code = "\n";
+    my $head_script = "\n";
+    $head_script .= '<script type="text/javascript">'."\n";
+    my @template_roles = ("cc","in","ta","ep","st");
+    foreach my $role (@template_roles) {
+        $head_script .= &make_script_template($role);
+        $button_code .= &make_button_code($role);
+    }
+    $head_script .= "\n".$jsback."\n".'</script>'."\n";
+    $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
+   &Apache::lonhtmlcommon::add_breadcrumb
+     ({href=>"javascript:backPage(document.form1,'pickrole','')",
+       text=>"Pick custom role",
+       faq=>282,bug=>'Instructor Interface',},
+      {href=>"javascript:backPage(document.form1,'','')",
+         text=>"Edit custom role",
+         faq=>282,bug=>'Instructor Interface',});
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                  'Course_Editing_Custom_Roles'));
+
+    $r->print($body_top);
+    my %lt=&Apache::lonlocal::texthash(
+		    'prv'  => "Privilege",
+		    'crl'  => "Course Level",
+                    'dml'  => "Domain Level",
+                    'ssl'  => "System Level");
+    $r->print(&mt('Select a Template').'<br />');
+    $r->print('<form action="">');
+    $r->print($button_code);
+    $r->print('</form>');
+    $r->print(<<ENDCCF);
+<form name="form1" method="post">
+<input type="hidden" name="phase" value="set_custom_roles" />
+<input type="hidden" name="rolename" value="$rolename" />
+ENDCCF
+    $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);
+        $r->print(&Apache::loncommon::start_data_table_row().
+	          '<td>'.$privtext.'</td><td>'.
+    ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c" '.
+    ($courselevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
+    '</td><td>'.
+    ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d" '.
+    ($domainlevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
+    '</td><td>'.
+    ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s" '.
+    ($systemlevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
+    '</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".   
+   '<input type="reset" value="'.&mt("Reset").'" />'."\n".
+   '<input type="submit" value="'.&mt('Define Role').'" /></form>'.
+	      &Apache::loncommon::end_page());
+}
+# --------------------------------------------------------
+sub make_script_template {
+    my ($role) = @_;
+    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'})) {
+        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;
+    }
+    foreach my $priv_item (keys(%full_c)) {
+        my ($priv, $dummy) = split(/\&/,$priv_item);
+        if (exists($role_c{$priv})) {
+            $return_script .= "document.form1.$priv"."_c.checked = true;\n";
+        } else {
+            $return_script .= "document.form1.$priv"."_c.checked = false;\n";
+        }
+    }
+    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;
+    }
+    foreach my $priv_item (keys(%full_d)) {
+        my ($priv, $dummy) = split(/\&/,$priv_item);
+        if (exists($role_d{$priv})) {
+            $return_script .= "document.form1.$priv"."_d.checked = true;\n";
+        } else {
+            $return_script .= "document.form1.$priv"."_d.checked = false;\n";
+        }
+    }
+    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_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) = @_;
+    my $label = &Apache::lonnet::plaintext($role);
+    my $button_code = '<input type="button" onClick="set_'.$role.'()" value="'.$label.'" />';    
+    return ($button_code);
+}
+# ---------------------------------------------------------- Call to definerole
+sub set_custom_role {
+    my ($r,$context) = @_;
+    my $rolename=$env{'form.rolename'};
+    $rolename=~s/[^A-Za-z0-9]//gs;
+    if (!$rolename) {
+	&custom_role_editor($r);
+        return;
+    }
+    my ($jsback,$elements) = &crumb_utilities();
+    my $jscript = '<script type="text/javascript">'.$jsback."\n".'</script>';
+
+    $r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);
+    &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"javascript:backPage(document.customresult,'pickrole','')",
+          text=>"Pick custom role",
+          faq=>282,bug=>'Instructor Interface',},
+         {href=>"javascript:backPage(document.customresult,'selected_custom_edit','')",
+          text=>"Edit custom role",
+          faq=>282,bug=>'Instructor Interface',},
+         {href=>"javascript:backPage(document.customresult,'set_custom_roles','')",
+          text=>"Result",
+          faq=>282,bug=>'Instructor Interface',});
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                  'Course_Editing_Custom_Roles'));
+
+    my ($rdummy,$roledef)=
+	&Apache::lonnet::get('roles',["rolesdef_$rolename"]);
+
+# ------------------------------------------------------- Does this role exist?
+    $r->print('<h3>');
+    if (($rdummy ne 'con_lost') && ($roledef ne '')) {
+	$r->print(&mt('Existing Role').' "');
+    } else {
+	$r->print(&mt('New Role').' "');
+	$roledef='';
+    }
+    $r->print($rolename.'"</h3>');
+# ------------------------------------------------------- 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;
+	}
+    }
+    $r->print('<br />Defining Role: '.
+	   &Apache::lonnet::definerole($rolename,$sysrole,$domrole,$courole));
+    if ($env{'request.course.id'}) {
+        my $url='/'.$env{'request.course.id'};
+        $url=~s/\_/\//g;
+	$r->print('<br />'.&mt('Assigning Role to Self').': '.
+	      &Apache::lonnet::assigncustomrole($env{'user.domain'},
+						$env{'user.name'},
+						$url,
+						$env{'user.domain'},
+						$env{'user.name'},
+						$rolename,undef,undef,undef,$context));
+    }
+    $r->print('<p><a href="javascript:backPage(document.customresult,'."'pickrole'".')">'.&mt('Create or edit another custom role').'</a></p><form name="customresult" method="post">');
+    $r->print(&Apache::lonhtmlcommon::echo_form_input([]).'</form>');
+    $r->print(&Apache::loncommon::end_page());
 }
 
 # ================================================================ Main Handler
 sub handler {
     my $r = shift;
-
     if ($r->header_only) {
-       $r->content_type('text/html');
+       &Apache::loncommon::content_type($r,'text/html');
        $r->send_http_header;
        return OK;
     }
+    my $context;
+    if ($env{'request.course.id'}) {
+        $context = 'course';
+    } elsif ($env{'request.role'} =~ /^au\./) {
+        $context = 'author';
+    } else {
+        $context = 'domain';
+    }
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+        ['action','state','callingform','roletype','showrole','bulkaction','popup','phase',
+         'username','domain','srchterm','srchdomain','srchin','srchby','srchtype']);
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    if ($env{'form.action'} ne 'dateselect') {
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>"/adm/createuser",
+              text=>"User Management"});
+    }
+    my ($permission,$allowed) = 
+        &Apache::lonuserutils::get_permission($context);
+    if (!$allowed) {
+        $env{'user.error.msg'}=
+            "/adm/createuser:cst:0:0:Cannot create/modify user data ".
+                                 "or view user status.";
+        return HTTP_NOT_ACCEPTABLE;
+    }
 
-    if ((&Apache::lonnet::allowed('cta',$ENV{'request.course.id'})) ||
-        (&Apache::lonnet::allowed('cin',$ENV{'request.course.id'})) || 
-        (&Apache::lonnet::allowed('ccr',$ENV{'request.course.id'})) || 
-        (&Apache::lonnet::allowed('cep',$ENV{'request.course.id'})) ||
-        (&Apache::lonnet::allowed('cca',$ENV{'request.role.domain'})) ||
-        (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'}))) {
-       $r->content_type('text/html');
-       $r->send_http_header;
-       unless ($ENV{'form.phase'}) {
-	   &print_username_entry_form($r);
-       }
-       if ($ENV{'form.phase'} eq 'get_user_info') {
-           &print_user_modification_page($r);
-       } elsif ($ENV{'form.phase'} eq 'update_user_data') {
-           &update_user_data($r);
-       }
-   } else {
-      $ENV{'user.error.msg'}=
-        "/adm/createuser:mau:0:0:Cannot modify user data";
-      return HTTP_NOT_ACCEPTABLE; 
-   }
-   return OK;
-} 
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+
+    # Main switch on form.action and form.state, as appropriate
+    if (! exists($env{'form.action'})) {
+        $r->print(&header());
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+        $r->print(&print_main_menu($permission,$context));
+        $r->print(&Apache::loncommon::end_page());
+    } elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {
+        $r->print(&header());
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/createuser?action=upload&state=',
+              text=>"Upload Users List"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Upload Users List',
+                                                   'Course_Create_Class_List'));
+        $r->print('<form name="studentform" method="post" '.
+                  'enctype="multipart/form-data" '.
+                  ' action="/adm/createuser">'."\n");
+        if (! exists($env{'form.state'})) {
+            &Apache::lonuserutils::print_first_users_upload_form($r,$context);
+        } elsif ($env{'form.state'} eq 'got_file') {
+            &Apache::lonuserutils::print_upload_manager_form($r,$context,
+                                                             $permission);
+        } elsif ($env{'form.state'} eq 'enrolling') {
+            if ($env{'form.datatoken'}) {
+                &Apache::lonuserutils::upfile_drop_add($r,$context,$permission);
+            }
+        } else {
+            &Apache::lonuserutils::print_first_users_upload_form($r,$context);
+        }
+        $r->print('</form>'.&Apache::loncommon::end_page());
+    } 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();
+	my $srch;
+	foreach my $item (@search) {
+	    $srch->{$item} = $env{'form.'.$item};
+	}
+        if (($phase eq 'get_user_info') || ($phase eq 'userpicked') ||
+            ($phase eq 'createnewuser')) {
+            if ($env{'form.phase'} eq 'createnewuser') {
+                my $response;
+                if ($env{'form.srchterm'} !~ /^$match_username$/) {
+                    my $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @');
+                    $env{'form.phase'} = '';
+                    &print_username_entry_form($r,$context,$response,$srch);
+                } else {
+                    my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'});
+                    my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'});
+                    &print_user_modification_page($r,$ccuname,$ccdomain,
+                                                  $srch,$response,$context,
+                                                  $permission);
+                }
+            } elsif ($env{'form.phase'} eq 'get_user_info') {
+                my ($currstate,$response,$forcenewuser,$results) = 
+                    &user_search_result($context,$srch);
+                if ($env{'form.currstate'} eq 'modify') {
+                    $currstate = $env{'form.currstate'};
+                }
+                if ($currstate eq 'select') {
+                    &print_user_selection_page($r,$response,$srch,$results,
+                                               \@search,$context);
+                } elsif ($currstate eq 'modify') {
+                    my ($ccuname,$ccdomain);
+                    if (($srch->{'srchby'} eq 'uname') && 
+                        ($srch->{'srchtype'} eq 'exact')) {
+                        $ccuname = $srch->{'srchterm'};
+                        $ccdomain= $srch->{'srchdomain'};
+                    } else {
+                        my @matchedunames = keys(%{$results});
+                        ($ccuname,$ccdomain) = split(/:/,$matchedunames[0]);
+                    }
+                    $ccuname =&LONCAPA::clean_username($ccuname);
+                    $ccdomain=&LONCAPA::clean_domain($ccdomain);
+                    if ($env{'form.forcenewuser'}) {
+                        $response = '';
+                    }
+                    &print_user_modification_page($r,$ccuname,$ccdomain,
+                                                  $srch,$response,$context,
+                                                  $permission);
+                } elsif ($currstate eq 'query') {
+                    &print_user_query_page($r,'createuser');
+                } else {
+                    $env{'form.phase'} = '';
+                    &print_username_entry_form($r,$context,$response,$srch,
+                                               $forcenewuser);
+                }
+            } elsif ($env{'form.phase'} eq 'userpicked') {
+                my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
+                my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'});
+                &print_user_modification_page($r,$ccuname,$ccdomain,$srch,'',
+                                              $context,$permission);
+            }
+        } elsif ($env{'form.phase'} eq 'update_user_data') {
+            &update_user_data($r,$context);
+        } else {
+            &print_username_entry_form($r,$context,undef,$srch);
+        }
+    } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
+        if ($env{'form.phase'} eq 'set_custom_roles') {
+            &set_custom_role($r,$context);
+        } else {
+            &custom_role_editor($r);
+        }
+    } elsif (($env{'form.action'} eq 'listusers') && 
+             ($permission->{'view'} || $permission->{'cusr'})) {
+        if ($env{'form.phase'} eq 'bulkchange') {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>'/adm/createuser?action=listusers',
+                  text=>"List Users"},
+                {href=>"/adm/createuser",
+                  text=>"Result"});
+            my $setting = $env{'form.roletype'};
+            my $choice = $env{'form.bulkaction'};
+            $r->print(&header());
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs("Update Users",
+                                                          'Course_View_Class_List'));
+            if ($permission->{'cusr'}) {
+                &Apache::lonuserutils::update_user_list($r,$context,$setting,$choice);
+                $r->print(&Apache::loncommon::end_page());
+            } else {
+                $r->print(&mt('You are not authorized to make bulk changes to user roles'));
+                $r->print('<p><a href="/adm/createuser?action=listusers">'.&mt('Display User Lists').'</a>');
+                $r->print(&Apache::loncommon::end_page());
+            }
+        } else {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>'/adm/createuser?action=listusers',
+                  text=>"List Users"});
+            my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles);
+            my $formname = 'studentform';
+            if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
+                ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) = 
+                    &Apache::lonuserutils::courses_selector($env{'request.role.domain'},
+                                                            $formname);
+                $jscript .= &verify_user_display();
+                my $js = &add_script($jscript).$cb_jscript;
+                my $loadcode = 
+                    &Apache::lonuserutils::course_selector_loadcode($formname);
+                if ($loadcode ne '') {
+                    $r->print(&header($js,{'onload' => $loadcode,}));
+                } else {
+                    $r->print(&header($js));
+                }
+            } else {
+                $r->print(&header(&add_script(&verify_user_display())));
+            }
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs("List Users",
+                                                          'Course_View_Class_List'));
+            &Apache::lonuserutils::print_userlist($r,undef,$permission,$context,
+                         $formname,$totcodes,$codetitles,$idlist,$idlist_titles);
+            $r->print(&Apache::loncommon::end_page());
+        }
+    } elsif ($env{'form.action'} eq 'drop' && $permission->{'cusr'}) {
+        $r->print(&header());
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/createuser?action=drop',
+              text=>"Drop Students"});
+        if (!exists($env{'form.state'})) {
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
+                                                          'Course_Drop_Student'));
+
+            &Apache::lonuserutils::print_drop_menu($r,$context,$permission);
+        } elsif ($env{'form.state'} eq 'done') {
+            &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/createuser?action=drop',
+              text=>"Result"});
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
+                                                          'Course_Drop_Student'));
+            &Apache::lonuserutils::update_user_list($r,$context,undef,
+                                                    $env{'form.action'});
+        }
+        $r->print(&Apache::loncommon::end_page());
+    } elsif ($env{'form.action'} eq 'dateselect') {
+        if ($permission->{'cusr'}) {
+            $r->print(&header(undef,undef,{'no_nav_bar' => 1}).
+                      &Apache::lonuserutils::date_section_selector($context,
+                                                                   $permission).
+                      &Apache::loncommon::end_page());
+        } else {
+            $r->print(&header().
+                     '<span class="LC_error">'.&mt('You do not have permission to modify dates or sections for users').'</span>'. 
+                     &Apache::loncommon::end_page());
+        }
+    } elsif ($env{'form.action'} eq 'selfenroll') {
+        $r->print(&header());
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/createuser?action=selfenroll',
+              text=>"Configure Self-enrollment"});
+        if (!exists($env{'form.state'})) {
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs('Configure Self-enrollment',
+                                                          'Course_Self_Enrollment'));
+            $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n");
+            &print_selfenroll_menu($r,$context,$permission);
+        } elsif ($env{'form.state'} eq 'done') {
+            &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/createuser?action=selfenroll',
+              text=>"Result"});
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs('Self-enrollment result',
+                                                          'Course_Self_Enrollment'));
+            $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n");
+            &update_selfenroll_config($r,$context,$permission);
+        }
+        $r->print(&Apache::loncommon::end_page());
+    } elsif ($env{'form.action'} eq 'changelogs') {
+        $r->print(&header());
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/createuser?action=changelogs',
+              text=>"User Management Logs"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Changes',
+                                                      'Course_User_Logs'));
+            &print_userchangelogs_display($r,$context,$permission);
+        $r->print(&Apache::loncommon::end_page());        
+    } else {
+        $r->print(&header());
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+        $r->print(&print_main_menu($permission,$context));
+        $r->print(&Apache::loncommon::end_page());
+    }
+    return OK;
+}
+
+sub header {
+    my ($jscript,$loaditems,$args) = @_;
+    my $start_page;
+    if (ref($loaditems) eq 'HASH') {
+        $start_page=&Apache::loncommon::start_page('User Management',$jscript,{'add_entries' => $loaditems});
+    } else {
+        $start_page=&Apache::loncommon::start_page('User Management',$jscript,$args);
+    }
+    return $start_page;
+}
+
+sub add_script {
+    my ($js) = @_;
+    return '<script type="text/javascript">'."\n".$js."\n".'</script>';
+}
+
+sub verify_user_display {
+    my $output = <<"END";
+
+function display_update() {
+    document.studentform.action.value = 'listusers';
+    document.studentform.phase.value = 'display';
+    document.studentform.submit();
+}
+
+END
+    return $output;
+
+}
+
+###############################################################
+###############################################################
+#  Menu Phase One
+sub print_main_menu {
+    my ($permission,$context) = @_;
+    my %links = (
+                       domain => {
+                                   upload => 'Upload a File of Users',
+                                   singleuser => 'Add/Modify a Single User',
+                                   listusers => 'Manage Multiple Users',
+                                 },
+                       author => {
+                                   upload => 'Upload a File of Co-authors',
+                                   singleuser => 'Add/Modify a Single Co-author',
+                                   listusers => 'Display Co-authors and Manage Multiple Users',
+                                 },
+                       course => {
+                                   upload => 'Upload a File of Course Users',
+                                   singleuser => 'Add/Modify a Single Course User',
+                                   listusers => 'Display Class Lists and Manage Multiple Users',
+                                 },
+                     );
+    my @menu =
+        (
+          { text => $links{$context}{'upload'},
+            help => 'Course_Create_Class_List',
+            action => 'upload',
+            permission => $permission->{'cusr'},
+            },
+          { text => $links{$context}{'singleuser'}, 
+            help => 'Course_Change_Privileges',
+            action => 'singleuser',
+            permission => $permission->{'cusr'},
+            },
+          { text => $links{$context}{'listusers'},
+            help => 'Course_View_Class_List',
+            action => 'listusers',
+            permission => ($permission->{'view'} || $permission->{'cusr'}),
+          },
+        );
+    if ($context eq 'domain' || $context eq 'course') {
+        my $customlink =  { text => 'Edit Custom Roles',
+                            help => 'Course_Editing_Custom_Roles',
+                            action => 'custom',
+                            permission => $permission->{'custom'},
+                          };
+        push(@menu,$customlink);
+    }
+    if ($context eq 'course') {
+        my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
+        my @courselinks =
+            (
+              { text => 'Enroll a Single Student',
+                 help => 'Course_Add_Student',
+                 action => 'singlestudent',
+                 permission => $permission->{'cusr'},
+                 },
+              { text => 'Drop Students',
+                help => 'Course_Drop_Student',
+                action => 'drop',
+                permission => $permission->{'cusr'},
+              });
+        if (!exists($permission->{'cusr_section'})) {
+            push(@courselinks,
+               { text => 'Automated Enrollment Manager',
+                 help => 'Course_Automated_Enrollment',
+                 permission => (&Apache::lonnet::auto_run($cnum,$cdom)
+                                && $permission->{'cusr'}),
+                 url  => '/adm/populate',
+                 },
+               { text => 'Configure User Self-enrollment',
+                 help => 'Course_Self_Enrollment',
+                 action => 'selfenroll',
+                 permission => $permission->{'cusr'},    
+               });
+        }
+        push(@courselinks,
+               { text => 'Manage Course Groups',
+                 help => 'Course_Manage_Group',
+                 permission => $permission->{'grp_manage'},
+                 url => '/adm/coursegroups?refpage=cusr',
+               },
+               { text => 'View Change Logs',
+                 help => 'Course_User_Logs',
+                 action => 'changelogs',
+                 permission => $permission->{'cusr'},
+               },);
+#               { text => 'View Log-in History',
+#                 help => 'Course_User_Logins',
+#                 action => 'logins',
+#                 permission => $permission->{'cusr'},
+#               });
+        push(@menu,@courselinks);
+    }
+    my $menu_html = '';
+    foreach my $menu_item (@menu) {
+        next if (! $menu_item->{'permission'});
+        $menu_html.='<p>';
+        if (exists($menu_item->{'help'})) {
+            $menu_html.=
+                &Apache::loncommon::help_open_topic($menu_item->{'help'});
+        }
+        $menu_html.='<font size="+1">';
+        if (exists($menu_item->{'url'})) {
+            $menu_html.=qq{<a href="$menu_item->{'url'}">};
+        } else {
+            $menu_html.=
+                qq{<a href="/adm/createuser?action=$menu_item->{'action'}">};
+        }
+        $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
+        $menu_html.='</p>';
+    }
+    return $menu_html;
+}
+
+sub restore_prev_selections {
+    my %saveable_parameters = ('srchby'   => 'scalar',
+			       'srchin'   => 'scalar',
+			       'srchtype' => 'scalar',
+			       );
+    &Apache::loncommon::store_settings('user','user_picker',
+				       \%saveable_parameters);
+    &Apache::loncommon::restore_settings('user','user_picker',
+					 \%saveable_parameters);
+}
+
+sub print_selfenroll_menu {
+    my ($r,$context,$permission) = @_;
+    my $formname = 'enrollstudent';
+    my $nolink = 1;
+    my ($row,$lt) = &get_selfenroll_titles();
+    my $groupslist = &Apache::lonuserutils::get_groupslist();
+    my $setsec_js = 
+        &Apache::lonuserutils::setsections_javascript($formname,$groupslist);
+    my %alerts = &Apache::lonlocal::texthash(
+        acto => 'Activation of self-enrollment was selected for the following domain(s)',
+        butn => 'but no user types have been checked.',
+        wilf => "Please uncheck 'activate' or check at least one type.",
+    );
+    my $selfenroll_js = <<"ENDSCRIPT";
+function update_types(caller,num) {
+    var delidx = getIndexByName('selfenroll_delete');
+    var actidx = getIndexByName('selfenroll_activate');
+    if (caller == 'selfenroll_all') {
+        var selall;
+        for (var i=0; i<document.$formname.selfenroll_all.length; i++) {
+            if (document.$formname.selfenroll_all[i].checked) {
+                selall = document.$formname.selfenroll_all[i].value;
+            }
+        }
+        if (selall == 1) {
+            if (delidx != -1) {
+                if (document.$formname.selfenroll_delete.length) {
+                    for (var j=0; j<document.$formname.selfenroll_delete.length; j++) {
+                        document.$formname.selfenroll_delete[j].checked = true;
+                    }
+                } else {
+                    document.$formname.elements[delidx].checked = true;
+                }
+            }
+            if (actidx != -1) {
+                if (document.$formname.selfenroll_activate.length) {
+                    for (var j=0; j<document.$formname.selfenroll_activate.length; j++) {
+                        document.$formname.selfenroll_activate[j].checked = false;
+                    }
+                } else {
+                    document.$formname.elements[actidx].checked = false;
+                }
+            }
+            document.$formname.selfenroll_newdom.selectedIndex = 0; 
+        }
+    }
+    if (caller == 'selfenroll_activate') {
+        if (document.$formname.selfenroll_activate.length) {
+            for (var j=0; j<document.$formname.selfenroll_activate.length; j++) {
+                if (document.$formname.selfenroll_activate[j].value == num) {
+                    if (document.$formname.selfenroll_activate[j].checked) {
+                        for (var i=0; i<document.$formname.selfenroll_all.length; i++) {
+                            if (document.$formname.selfenroll_all[i].value == '1') {
+                                document.$formname.selfenroll_all[i].checked = false;
+                            }
+                            if (document.$formname.selfenroll_all[i].value == '0') {
+                                document.$formname.selfenroll_all[i].checked = true;
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            for (var i=0; i<document.$formname.selfenroll_all.length; i++) {
+                if (document.$formname.selfenroll_all[i].value == '1') {
+                    document.$formname.selfenroll_all[i].checked = false;
+                }
+                if (document.$formname.selfenroll_all[i].value == '0') {
+                    document.$formname.selfenroll_all[i].checked = true;
+                }
+            }
+        }
+    }
+    if (caller == 'selfenroll_delete') {
+        if (document.$formname.selfenroll_delete.length) {
+            for (var j=0; j<document.$formname.selfenroll_delete.length; j++) {
+                if (document.$formname.selfenroll_delete[j].value == num) {
+                    if (document.$formname.selfenroll_delete[j].checked) {
+                        var delindex = getIndexByName('selfenroll_types_'+num);
+                        if (delindex != -1) { 
+                            if (document.$formname.elements[delindex].length) {
+                                for (var k=0; k<document.$formname.elements[delindex].length; k++) {
+                                    document.$formname.elements[delindex][k].checked = false;
+                                }
+                            } else {
+                                document.$formname.elements[delindex].checked = false;
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            if (document.$formname.selfenroll_delete.checked) {
+                var delindex = getIndexByName('selfenroll_types_'+num);
+                if (delindex != -1) {
+                    if (document.$formname.elements[delindex].length) {
+                        for (var k=0; k<document.$formname.elements[delindex].length; k++) {
+                            document.$formname.elements[delindex][k].checked = false;
+                        }
+                    } else {
+                        document.$formname.elements[delindex].checked = false;
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+function validate_types(form) {
+    var needaction = new Array();
+    var countfail = 0;
+    var actidx = getIndexByName('selfenroll_activate');
+    if (actidx != -1) {
+        if (document.$formname.selfenroll_activate.length) {
+            for (var j=0; j<document.$formname.selfenroll_activate.length; j++) {
+                var num = document.$formname.selfenroll_activate[j].value;
+                if (document.$formname.selfenroll_activate[j].checked) {
+                    countfail = check_types(num,countfail,needaction)
+                }
+            }
+        } else {
+            if (document.$formname.selfenroll_activate.checked) {
+                var num = document.enrollstudent.selfenroll_activate.value;
+                countfail = check_types(num,countfail,needaction)
+            }
+        }
+    }
+    if (countfail > 0) {
+        var msg = "$alerts{'acto'}\\n";
+        var loopend = needaction.length -1;
+        if (loopend > 0) {
+            for (var m=0; m<loopend; m++) {
+                msg += needaction[m]+", ";
+            }
+        }
+        msg += needaction[loopend]+"\\n$alerts{'butn'}\\n$alerts{'wilf'}";
+        alert(msg);
+        return; 
+    }
+    setSections(form);
+}
+
+function check_types(num,countfail,needaction) {
+    var typeidx = getIndexByName('selfenroll_types_'+num);
+    var count = 0;
+    if (typeidx != -1) {
+        if (document.$formname.elements[typeidx].length) {
+            for (var k=0; k<document.$formname.elements[typeidx].length; k++) {
+                if (document.$formname.elements[typeidx][k].checked) {
+                    count ++;
+                }
+            }
+        } else {
+            if (document.$formname.elements[typeidx].checked) {
+                count ++;
+            }
+        }
+        if (count == 0) {
+            var domidx = getIndexByName('selfenroll_dom_'+num);
+            if (domidx != -1) {
+                var domname = document.$formname.elements[domidx].value;
+                needaction[countfail] = domname;
+                countfail ++;
+            }
+        }
+    }
+    return countfail;
+}
+
+function getIndexByName(item) {
+    for (var i=0;i<document.$formname.elements.length;i++) {
+        if (document.$formname.elements[i].name == item) {
+            return i;
+        }
+    }
+    return -1;
+}
+ENDSCRIPT
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+    my $output = '<script type="text/javascript">'."\n".
+                 $setsec_js."\n".$selfenroll_js."\n".
+                 '</script>'."\n".
+                 '<h3>'.$lt->{'selfenroll'}.'</h3>'."\n";
+    my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum);
+    if (ref($visactions) eq 'HASH') {
+        if ($visible) {
+            $output .= '<p>'.$visactions->{'vis'}.'</p>';
+        } else {
+            $output .= $visactions->{'miss'}.'<br />'.$visactions->{'yous'}.
+                       '<p>'.$visactions->{'gen'}.'<br />'.$visactions->{'coca'};
+            if (ref($vismsgs) eq 'ARRAY') {
+                $output .= '<br />'.$visactions->{'make'}.'<ul>';
+                foreach my $item (@{$vismsgs}) {
+                    $output .= '<li>'.$visactions->{$item}.'</li>';
+                }
+                $output .= '</ul>';
+            }
+            $output .= '</p>';
+        }
+    }
+    $output .= '<form name="'.$formname.'" method="post" action="/adm/createuser">'."\n".
+               &Apache::lonhtmlcommon::start_pick_box();
+    if (ref($row) eq 'ARRAY') {
+        foreach my $item (@{$row}) {
+            my $title = $item; 
+            if (ref($lt) eq 'HASH') {
+                $title = $lt->{$item};
+            }
+            $output .= 
+                &Apache::lonhtmlcommon::row_title($title,
+                             'LC_selfenroll_pick_box_title','LC_oddrow_value')."\n";
+            if ($item eq 'types') {
+                my $curr_types = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_types'};
+                my $showdomdesc = 1;
+                my $includeempty = 1;
+                my $num = 0;
+                $output .= &Apache::loncommon::start_data_table().
+                           &Apache::loncommon::start_data_table_row()
+                           .'<td colspan="2"><span class="LC_nobreak"><label>'
+                           .&mt('Any user in any domain:')
+                           .'&nbsp;<input type="radio" name="selfenroll_all" value="1" ';
+                if ($curr_types eq '*') {
+                    $output .= ' checked="checked" '; 
+                }
+                $output .= 'onchange="javascript:update_types('.
+                           "'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'".');"/>'.&mt('No').'</label></td>'.
+                           &Apache::loncommon::end_data_table_row().
+                           &Apache::loncommon::end_data_table().
+                           &mt('Or').'<br />'.
+                           &Apache::loncommon::start_data_table();
+                my %currdoms;
+                if ($curr_types eq '') {
+                    $output .= &new_selfenroll_dom_row($cdom,'0');
+                } elsif ($curr_types ne '*') {
+                    my @entries = split(/;/,$curr_types);
+                    if (@entries > 0) {
+                        foreach my $entry (@entries) {
+                            my ($currdom,$typestr) = split(/:/,$entry);
+                            $currdoms{$currdom} = 1;
+                            my $domdesc = &Apache::lonnet::domain($currdom);
+                            my @currinsttypes = split(',',$typestr);
+                            $output .= &Apache::loncommon::start_data_table_row()
+                                       .'<td valign="top"><span class="LC_nobreak">'.&mt('Domain:').'<b>'
+                                       .'&nbsp;'.$domdesc.' ('.$currdom.')'
+                                       .'</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'".');" />'
+                                       .&mt('Delete').'</label></span></td>';
+                            $output .= '<td valign="top">&nbsp;&nbsp;'.&mt('User types:').'<br />'
+                                       .&selfenroll_inst_types($num,$currdom,\@currinsttypes).'</td>'
+                                       .&Apache::loncommon::end_data_table_row();
+                            $num ++;
+                        }
+                    }
+                }
+                my $add_domtitle = &mt('Users in additional domain:');
+                if ($curr_types eq '*') { 
+                    $add_domtitle = &mt('Users in specific domain:');
+                } elsif ($curr_types eq '') {
+                    $add_domtitle = &mt('Users in other domain:');
+                }
+                $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)
+                           .'<input type="hidden" name="selfenroll_types_total" value="'.$num.'" />'
+                           .'</td>'.&Apache::loncommon::end_data_table_row()
+                           .&Apache::loncommon::end_data_table();
+            } elsif ($item eq 'registered') {
+                my ($regon,$regoff);
+                if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_registered'}) {
+                    $regon = ' checked="checked" ';
+                    $regoff = ' ';
+                } else {
+                    $regon = ' ';
+                    $regoff = ' checked="checked" ';
+                }
+                $output .= '<label>'.
+                           '<input type="radio" name="selfenroll_registered" value="1"'.$regon.'/>'.
+                           &mt('Yes').'</label>&nbsp;&nbsp;<label>'.
+                           '<input type="radio" name="selfenroll_registered" value="0"'.$regoff.'/>'.
+                           &mt('No').'</label>';
+            } elsif ($item eq 'enroll_dates') {
+                my $starttime = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_start_date'};
+                my $endtime = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_end_date'};
+                if ($starttime eq '') {
+                    $starttime = $env{'course.'.$env{'request.course.id'}.'.default_enrollment_start_date'};
+                }
+                if ($endtime eq '') {
+                    $endtime = $env{'course.'.$env{'request.course.id'}.'.default_enrollment_end_date'};
+                }
+                my $startform =
+                    &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_date',$starttime,
+                                      undef,undef,undef,undef,undef,undef,undef,$nolink);
+                my $endform =
+                    &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_end_date',$endtime,
+                                      undef,undef,undef,undef,undef,undef,undef,$nolink);
+                $output .= &selfenroll_date_forms($startform,$endform);
+            } elsif ($item eq 'access_dates') {
+                my $starttime = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_start_access'};
+                my $endtime = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_end_access'};
+                if ($starttime eq '') {
+                    $starttime = $env{'course.'.$env{'request.course.id'}.'.default_enrollment_start_date'};
+                }
+                if ($endtime eq '') {
+                    $endtime = $env{'course.'.$env{'request.course.id'}.'.default_enrollment_end_date'};
+                }
+                my $startform =
+                    &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_access',$starttime,
+                                      undef,undef,undef,undef,undef,undef,undef,$nolink);
+                my $endform =
+                    &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_end_access',$endtime,
+                                      undef,undef,undef,undef,undef,undef,undef,$nolink);
+                $output .= &selfenroll_date_forms($startform,$endform);
+            } elsif ($item eq 'section') {
+                my $currsec = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_section'}; 
+                my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
+                my $newsecval;
+                if ($currsec ne 'none' && $currsec ne '') {
+                    if (!defined($sections_count{$currsec})) {
+                        $newsecval = $currsec;
+                    }
+                }
+                my $sections_select = 
+                    &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.'" />'."\n".
+                           '<input type="hidden" name="sections" value="" />'."\n".
+                           '<input type="hidden" name="state" value="done" />'."\n".
+                           '</td></tr></table>'."\n";
+            }
+            $output .= &Apache::lonhtmlcommon::row_closure(1);
+        }
+    }
+    $output .= &Apache::lonhtmlcommon::end_pick_box().
+               '<br /><input type="button" name="selfenrollconf" value="'
+               .&mt('Save changes').'" onclick="validate_types(this.form);" />'
+               .'<input type="hidden" name="action" value="selfenroll" /></form>';
+    $r->print($output);
+    return;
+}
+
+sub visible_in_cat {
+    my ($cdom,$cnum) = @_;
+    my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
+    my ($cathash,%settable,@vismsgs,$cansetvis);
+    my %visactions = &Apache::lonlocal::texthash(
+                   vis => 'Your course currently appears in the Course Catalog for this domain.',
+                   gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.',
+                   miss => 'Your course does not currently appear in the Course Catalog for this domain.',
+                   yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.',
+                   coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.',
+                   make => 'Make any changes to self-enrollment settings below, click "Save changes", then take action to include the course in the Catalog:',
+                   take => 'Take the following action to ensure the course appears in the Catalog:',
+                   dc_unhide  => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.',
+                   dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".',
+                   dc_instcode => 'Ask a domain coordinator to assign an institutional code (if this is an official course).',
+                   dc_catalog  => 'Ask a domain coordinator to enable or create at least one course category in the domain.',
+                   dc_categories => 'Ask a domain coordinator to create a hierarchy of categories and sub categories for courses in the domain.',
+                   dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain',
+                   dc_addcat => 'Ask a domain coordinator to assign a category to the course.',
+    );
+    $visactions{'unhide'} = &mt('Use [_1]Set course environment[_2] to change the "Exclude from course catalog" setting.','<a href="/adm/parmset?action=crsenv">','</a>');
+    $visactions{'chgcat'} = &mt('Use [_1]Set course environment[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','<a href="/adm/parmset?action=crsenv">','</a>');
+    $visactions{'addcat'} = &mt('Use [_1]Set course environment[_2] to assign a category to the course.','<a href="/adm/parmset?action=crsenv">','</a>');
+    if (ref($domconf{'coursecategories'}) eq 'HASH') {
+        if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
+            $settable{'togglecats'} = 1;
+        }
+        if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
+            $settable{'categorize'} = 1;
+        }
+        $cathash = $domconf{'coursecategories'}{'cats'};
+    }
+    if ($settable{'togglecats'} && $settable{'categories'}) {
+        $cansetvis = &mt('You are able to both assign a course category and choose to exclude this course from the catalog.');
+    } elsif ($settable{'togglecats'}) {
+        $cansetvis = &mt('You are able to choose to exclude this course from the catalog, but only a Domain Coordinator may assign a course category.');
+    } elsif ($settable{'categories'}) {
+        $cansetvis = &mt('You may assign a course category, but only a Domain Coordinator may choose to exclude this course from the catalog.');
+    } else {
+        $cansetvis = &mt('Only a Domain Coordinator may assign a course category or choose to exclude this course from the catalog.');
+    }
+
+    my %currsettings =
+        &Apache::lonnet::get('environment',['hidefromcat','categories','internal.coursecode'],
+                             $cdom,$cnum);
+    my $visible = 0;
+    if ($currsettings{'internal.coursecode'} ne '') {
+        if (ref($domconf{'coursecategories'}) eq 'HASH') {
+            $cathash = $domconf{'coursecategories'}{'cats'};
+            if (ref($cathash) eq 'HASH') {
+                if ($cathash->{'instcode::0'} eq '') {
+                    push(@vismsgs,'dc_addinst');
+                } else {
+                    $visible = 1;
+                }
+            } else {
+                $visible = 1;
+            }
+        } else {
+            $visible = 1;
+        }
+    } else {
+        if (ref($cathash) eq 'HASH') {
+            if ($cathash->{'instcode::0'} ne '') {
+                push(@vismsgs,'dc_instcode');
+            }
+        } else {
+            push(@vismsgs,'dc_instcode');
+        }
+    }
+    if ($currsettings{'categories'} ne '') {
+        my $cathash;
+        if (ref($domconf{'coursecategories'}) eq 'HASH') {
+            $cathash = $domconf{'coursecategories'}{'cats'};
+            if (ref($cathash) eq 'HASH') {
+                if (keys(%{$cathash}) == 0) {
+                    push(@vismsgs,'dc_catalog');
+                } elsif ((keys(%{$cathash}) == 1) && ($cathash->{'instcode::0'} ne '')) {
+                    push(@vismsgs,'dc_categories');
+                } else {
+                    my @currcategories = split('&',$currsettings{'categories'});
+                    my $matched = 0;
+                    foreach my $cat (@currcategories) {
+                        if ($cathash->{$cat} ne '') {
+                            $visible = 1;
+                            $matched = 1;
+                            last;
+                        }
+                    }
+                    if (!$matched) {
+                        if ($settable{'categories'}) {
+                            push(@vismsgs,'chgcat');
+                        } else {
+                            push(@vismsgs,'dc_chgcat');
+                        }
+                    }
+                }
+            }
+        }
+    } else {
+        if (ref($cathash) eq 'HASH') {
+            if ((keys(%{$cathash}) > 1) ||
+                (keys(%{$cathash}) == 1) && ($cathash->{'instcode::0'} eq '')) {
+                if ($settable{'categories'}) {
+                    push(@vismsgs,'addcat');
+                } else {
+                    push(@vismsgs,'dc_addcat');
+                }
+            }
+        }
+    }
+    if ($currsettings{'hidefromcat'} eq 'yes') {
+        $visible = 0;
+        if ($settable{'togglecats'}) {
+            unshift(@vismsgs,'unhide');
+        } else {
+            unshift(@vismsgs,'dc_unhide')
+        }
+    }
+    return ($visible,$cansetvis,\@vismsgs,\%visactions);
+}
+
+sub new_selfenroll_dom_row {
+    my ($newdom,$num) = @_;
+    my $domdesc = &Apache::lonnet::domain($newdom);
+    my $output;
+    if ($domdesc ne '') {
+        $output .= &Apache::loncommon::start_data_table_row()
+                   .'<td valign="top"><span class="LC_nobreak">'.&mt('Domain:').'&nbsp;<b>'.$domdesc
+                   .' ('.$newdom.')</b><input type="hidden" name="selfenroll_dom_'.$num
+                   .'" value="'.$newdom.'" /></span><br />'
+                   .'<span class="LC_nobreak"><label><input type="checkbox" '
+                   .'name="selfenroll_activate" value="'.$num.'" '
+                   .'onchange="javascript:update_types('
+                   ."'selfenroll_activate','$num'".');" />'
+                   .&mt('Activate').'</label></span></td>';
+        my @currinsttypes;
+        $output .= '<td>'.&mt('User types:').'<br />'
+                   .&selfenroll_inst_types($num,$newdom,\@currinsttypes).'</td>'
+                   .&Apache::loncommon::end_data_table_row();
+    }
+    return $output;
+}
+
+sub selfenroll_inst_types {
+    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';
+    if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
+        if (keys(%{$usertypes}) > 0) {
+            $othervalue = 'other';
+        }
+        $output .= '<table><tr>';
+        foreach my $type (@{$types}) {
+            if (($count > 0) && ($count%$numinrow == 0)) {
+                $output .= '</tr><tr>';
+            }
+            if (defined($usertypes->{$type})) {
+                my $esc_type = &escape($type);
+                $output .= '<td><span class="LC_nobreak"><label><input type = "checkbox" value="'.
+                           $esc_type.'" ';
+                if (ref($currinsttypes) eq 'ARRAY') {
+                    if (@{$currinsttypes} > 0) {
+                        if (grep(/^any$/,@{$currinsttypes})) {
+                            $output .= 'checked="checked"';
+                        } elsif (grep(/^\Q$esc_type\E$/,@{$currinsttypes})) {
+                            $output .= 'checked="checked"';
+                        }
+                    } else {
+                        $output .= 'checked="checked"';
+                    }
+                }
+                $output .= ' name="selfenroll_types_'.$num.'" />'.$usertypes->{$type}.'</label></span></td>';
+            }
+            $count ++;
+        }
+        if (($count > 0) && ($count%$numinrow == 0)) {
+            $output .= '</tr><tr>';
+        }
+        $output .= '<td><span class="LC_nobreak"><label><input type = "checkbox" value="'.$othervalue.'"';
+        if (ref($currinsttypes) eq 'ARRAY') {
+            if (@{$currinsttypes} > 0) {
+                if (grep(/^any$/,@{$currinsttypes})) { 
+                    $output .= ' checked="checked"';
+                } elsif ($othervalue eq 'other') {
+                    if (grep(/^\Q$othervalue\E$/,@{$currinsttypes})) {
+                        $output .= ' checked="checked"';
+                    }
+                }
+            } else {
+                $output .= ' checked="checked"';
+            }
+        } else {
+            $output .= ' checked="checked"';
+        }
+        $output .= ' name="selfenroll_types_'.$num.'" />'.$othertitle.'</label></span></td></tr></table>';
+    }
+    return $output;
+}
+
+sub selfenroll_date_forms {
+    my ($startform,$endform) = @_;
+    my $output .= &Apache::lonhtmlcommon::start_pick_box()."\n".
+                  &Apache::lonhtmlcommon::row_title(&mt('Start date'),
+                                                    'LC_oddrow_value')."\n".
+                  $startform."\n".
+                  &Apache::lonhtmlcommon::row_closure(1).
+                  &Apache::lonhtmlcommon::row_title(&mt('End date'),
+                                                   'LC_oddrow_value')."\n".
+                  $endform."\n".
+                  &Apache::lonhtmlcommon::row_closure(1).
+                  &Apache::lonhtmlcommon::end_pick_box();
+    return $output;
+}
+
+sub print_userchangelogs_display {
+    my ($r,$context,$permission) = @_;
+    my $formname = 'roleslog';
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my %roleslog=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum);
+    if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); }
+
+    $r->print('<form action="/adm/createuser" method="post" name="'.$formname.'">');
+    my %saveable_parameters = ('show' => 'scalar',);
+    &Apache::loncommon::store_course_settings('roles_log',
+                                              \%saveable_parameters);
+    &Apache::loncommon::restore_course_settings('roles_log',
+                                                \%saveable_parameters);
+    # set defaults
+    my $now = time();
+    my $defstart = $now - (7*24*3600); #7 days ago 
+    my %defaults = (
+                     page               => '1',
+                     show               => '10',
+                     role               => 'any',
+                     chgcontext         => 'any',
+                     rolelog_start_date => $defstart,
+                     rolelog_end_date   => $now,
+                   );
+    my $more_records = 0;
+
+    # set current
+    my %curr;
+    foreach my $item ('show','page','role','chgcontext') {
+        $curr{$item} = $env{'form.'.$item};
+    }
+    my ($startdate,$enddate) = 
+        &Apache::lonuserutils::get_dates_from_form('rolelog_start_date','rolelog_end_date');
+    $curr{'rolelog_start_date'} = $startdate;
+    $curr{'rolelog_end_date'} = $enddate;
+    foreach my $key (keys(%defaults)) {
+        if ($curr{$key} eq '') {
+            $curr{$key} = $defaults{$key};
+        }
+    }
+    my (%whodunit,%changed,$version);
+    ($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/);
+    $r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version));
+    my $showntablehdr = 0;
+    my $tablehdr = &Apache::loncommon::start_data_table().
+                   &Apache::loncommon::start_data_table_header_row().
+                   '<th>&nbsp;</th><th>'.&mt('When').'</th><th>'.&mt('Who made the change').
+                   '</th><th>'.&mt('Changed User').'</th><th>'.&mt('Role').'</th><th>'.&mt('Section').'</th><th>'.
+                   &mt('Context').'</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'.
+                   &Apache::loncommon::end_data_table_header_row();
+    my ($minshown,$maxshown);
+    $minshown = 1;
+    my $count = 0;
+    if ($curr{'show'} ne &mt('all')) { 
+        $maxshown = $curr{'page'} * $curr{'show'};
+        if ($curr{'page'} > 1) {
+            $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
+        }
+    }
+    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'} ne &mt('all')) {
+            if ($count >= $curr{'page'} * $curr{'show'}) {
+                $more_records = 1;
+                last;
+            }
+        }
+        if ($curr{'role'} ne 'any') {
+            next if ($roleslog{$id}{'logentry'}{'role'} ne $curr{'role'}); 
+        }
+        if ($curr{'chgcontext'} ne 'any') {
+            if ($curr{'chgcontext'} eq 'selfenroll') {
+                next if (!$roleslog{$id}{'logentry'}{'selfenroll'});
+            } else {
+                next if ($roleslog{$id}{'logentry'}{'context'} ne $curr{'chgcontext'});
+            }
+        }
+        $count ++;
+        next if ($count < $minshown);
+        if (!$showntablehdr) {
+            $r->print($tablehdr);
+            $showntablehdr = 1;
+        }
+        if ($whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} eq '') {
+            $whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} =
+                &Apache::loncommon::plainname($roleslog{$id}{'exe_uname'},$roleslog{$id}{'exe_udom'});
+        }
+        if ($changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}} eq '') {
+            $changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}} =
+                &Apache::loncommon::plainname($roleslog{$id}{'uname'},$roleslog{$id}{'udom'});
+        }
+        my $sec = $roleslog{$id}{'logentry'}{'section'};
+        if ($sec eq '') {
+            $sec = &mt('None');
+        }
+        my ($rolestart,$roleend);
+        if ($roleslog{$id}{'delflag'}) {
+            $rolestart = &mt('deleted');
+            $roleend = &mt('deleted');
+        } else {
+            $rolestart = $roleslog{$id}{'logentry'}{'start'};
+            $roleend = $roleslog{$id}{'logentry'}{'end'};
+            if ($rolestart eq '' || $rolestart == 0) {
+                $rolestart = &mt('No start date'); 
+            } else {
+                $rolestart = &Apache::lonlocal::locallocaltime($rolestart);
+            }
+            if ($roleend eq '' || $roleend == 0) { 
+                $roleend = &mt('No end date');
+            } else {
+                $roleend = &Apache::lonlocal::locallocaltime($roleend);
+            }
+        }
+        my $chgcontext = $roleslog{$id}{'logentry'}{'context'};
+        if ($roleslog{$id}{'logentry'}{'selfenroll'}) {
+            $chgcontext = 'selfenroll';
+        }
+        my %lt = &rolechg_contexts();
+        if ($chgcontext ne '' && $lt{$chgcontext} ne '') {
+            $chgcontext = $lt{$chgcontext};
+        }
+        $r->print(&Apache::loncommon::start_data_table_row().'<td>'.$count.'</td><td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td><td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td><td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td><td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'}).'</td><td>'.$sec.'</td><td>'.$chgcontext.'</td><td>'.$rolestart.'</td><td>'.$roleend.'</td>'.&Apache::loncommon::end_data_table_row()."\n");
+    }
+    if ($showntablehdr) {
+        $r->print(&Apache::loncommon::end_data_table().'<br />');
+        if (($curr{'page'} > 1) || ($more_records)) {
+            $r->print('<table><tr>');
+            if ($curr{'page'} > 1) {
+                $r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>');
+            }
+            if ($more_records) {
+                $r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>');
+            }
+            $r->print('</tr></table>');
+            $r->print(<<"ENDSCRIPT");
+<script type="text/javascript">
+function chgPage(caller) {
+    if (caller == 'previous') {
+        document.$formname.page.value --;
+    }
+    if (caller == 'next') {
+        document.$formname.page.value ++;
+    }
+    document.$formname.submit(); 
+    return;
+}
+</script>
+ENDSCRIPT
+        }
+    } else {
+        $r->print(&mt('There are no records to display'));
+    }
+    $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.
+              '<input type="hidden" name="action" value="changelogs" /></form>');
+    return;
+}
+
+sub role_display_filter {
+    my ($formname,$cdom,$cnum,$curr,$version) = @_;
+    my $context = 'course';
+    my $nolink = 1;
+    my $output = '<table><tr><td valign="top">'.
+                 '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b><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,'rolelog_start_date',
+                                            $curr->{'rolelog_start_date'},undef,
+                                            undef,undef,undef,undef,undef,undef,$nolink);
+    my $endform =
+        &Apache::lonhtmlcommon::date_setter($formname,'rolelog_end_date',
+                                            $curr->{'rolelog_end_date'},undef,
+                                            undef,undef,undef,undef,undef,undef,$nolink);
+    my %lt = &rolechg_contexts();
+    $output .= '<td valign="top"><b>'.&mt('Window during which changes 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('Role:').'</b><br />'.
+               '<select name="role"><option value="any"';
+    if ($curr->{'role'} eq 'any') {
+        $output .= ' selected="selected"';
+    }
+    $output .=  '>'.&mt('Any').'</option>'."\n";
+    my @roles = &Apache::lonuserutils::course_roles($context,undef,1);
+    foreach my $role (@roles) {
+        my $plrole;
+        if ($role eq 'cr') {
+            $plrole = &mt('Custom Role');
+        } else {
+            $plrole=&Apache::lonnet::plaintext($role);
+        }
+        my $selstr = '';
+        if ($role eq $curr->{'role'}) {
+            $selstr = ' selected="selected"';
+        }
+        $output .= '  <option value="'.$role.'"'.$selstr.'>'.$plrole.'</option>';
+    }
+    $output .= '</select></td><td>&nbsp;&nbsp;</td><td valign="top"><b>'.
+               &mt('Context:').'</b><br /><select name="chgcontext">';
+    foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll') {
+        my $selstr = '';
+        if ($curr->{'chgcontext'} eq $chgtype) {
+            $output .= $selstr = ' selected="selected"';
+        }
+        if (($chgtype eq 'auto') || ($chgtype eq 'updatenow')) {
+            next if (!&Apache::lonnet::auto_run($cnum,$cdom));
+        }
+        $output .= '<option value="'.$chgtype.'"'.$selstr.'>'.$lt{$chgtype}.'</option>'."\n";
+    }
+    $output .= '</select></td><td>&nbsp;&nbsp;</td><td valign="middle"><input type="submit" value="'.
+               &mt('Update Display').'" /></tr></table>'.
+               '<span class="LC_roleslog_note">'.
+               &mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.6.99.0 or later are displayed.');
+    if ($version) {
+        $output .= ' '.&mt('This server is version [_3].','<b>','</b>',$version);    }
+    $output .= '</span><hr noshade><br />';
+    return $output;
+}
+
+sub rolechg_contexts {
+    my %lt = &Apache::lonlocal::texthash (
+                                             any          => 'Any',
+                                             auto         => 'Automated enrollment',
+                                             updatenow    => 'Roster Update',
+                                             createcourse => 'Course Creation',
+                                             course       => 'User Management in course',
+                                             domain       => 'User Management in domain',
+                                             selfenroll   => 'Self-enrolled', 
+                                         );
+    return %lt;
+}
 
 #-------------------------------------------------- functions for &phase_two
+sub user_search_result {
+    my ($context,$srch) = @_;
+    my %allhomes;
+    my %inst_matches;
+    my %srch_results;
+    my ($response,$currstate,$forcenewuser,$dirsrchres);
+    $srch->{'srchterm'} =~ s/\s+/ /g;
+    if ($srch->{'srchby'} !~ /^(uname|lastname|lastfirst)$/) {
+        $response = &mt('Invalid search.');
+    }
+    if ($srch->{'srchin'} !~ /^(crs|dom|alc|instd)$/) {
+        $response = &mt('Invalid search.');
+    }
+    if ($srch->{'srchtype'} !~ /^(exact|contains|begins)$/) {
+        $response = &mt('Invalid search.');
+    }
+    if ($srch->{'srchterm'} eq '') {
+        $response = &mt('You must enter a search term.');
+    }
+    if ($srch->{'srchterm'} =~ /^\s+$/) {
+        $response = &mt('Your search term must contain more than just spaces.');
+    }
+    if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'instd')) {
+        if (($srch->{'srchdomain'} eq '') || 
+	    ! (&Apache::lonnet::domain($srch->{'srchdomain'}))) {
+            $response = &mt('You must specify a valid domain when searching in a domain or institutional directory.')
+        }
+    }
+    if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'crs') ||
+        ($srch->{'srchin'} eq 'alc')) {
+        if ($srch->{'srchby'} eq 'uname') {
+            my $unamecheck = $srch->{'srchterm'};
+            if ($srch->{'srchtype'} eq 'contains') {
+                if ($unamecheck !~ /^\w/) {
+                    $unamecheck = 'a'.$unamecheck; 
+                }
+            }
+            if ($unamecheck !~ /^$match_username$/) {
+                $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @');
+            }
+        }
+    }
+    if ($response ne '') {
+        $response = '<span class="LC_warning">'.$response.'</span>';
+    }
+    if ($srch->{'srchin'} eq 'instd') {
+        my $instd_chk = &directorysrch_check($srch);
+        if ($instd_chk ne 'ok') {
+            $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 '') {
+        return ($currstate,$response);
+    }
+    if ($srch->{'srchby'} eq 'uname') {
+        if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'crs')) {
+            if ($env{'form.forcenew'}) {
+                if ($srch->{'srchdomain'} ne $env{'request.role.domain'}) {
+                    my $uhome=&Apache::lonnet::homeserver($srch->{'srchterm'},$srch->{'srchdomain'});
+                    if ($uhome eq 'no_host') {
+                        my $domdesc = &Apache::lonnet::domain($env{'request.role.domain'},'description');
+                        my $showdom = &display_domain_info($env{'request.role.domain'});
+                        $response = &mt('New users can only be created in the domain to which your current role belongs - [_1].',$showdom);
+                    } else {
+                        $currstate = 'modify';
+                    }
+                } else {
+                    $currstate = 'modify';
+                }
+            } else {
+                if ($srch->{'srchin'} eq 'dom') {
+                    if ($srch->{'srchtype'} eq 'exact') {
+                        my $uhome=&Apache::lonnet::homeserver($srch->{'srchterm'},$srch->{'srchdomain'});
+                        if ($uhome eq 'no_host') {
+                            ($currstate,$response,$forcenewuser) =
+                                &build_search_response($context,$srch,%srch_results);
+                        } else {
+                            $currstate = 'modify';
+                        }
+                    } else {
+                        %srch_results = &Apache::lonnet::usersearch($srch);
+                        ($currstate,$response,$forcenewuser) =
+                            &build_search_response($context,$srch,%srch_results);
+                    }
+                } else {
+                    my $courseusers = &get_courseusers();
+                    if ($srch->{'srchtype'} eq 'exact') {
+                        if (exists($courseusers->{$srch->{'srchterm'}.':'.$srch->{'srchdomain'}})) {
+                            $currstate = 'modify';
+                        } else {
+                            ($currstate,$response,$forcenewuser) =
+                                &build_search_response($context,$srch,%srch_results);
+                        }
+                    } else {
+                        foreach my $user (keys(%$courseusers)) {
+                            my ($cuname,$cudomain) = split(/:/,$user);
+                            if ($cudomain eq $srch->{'srchdomain'}) {
+                                my $matched = 0;
+                                if ($srch->{'srchtype'} eq 'begins') {
+                                    if ($cuname =~ /^\Q$srch->{'srchterm'}\E/i) {
+                                        $matched = 1;
+                                    }
+                                } else {
+                                    if ($cuname =~ /\Q$srch->{'srchterm'}\E/i) {
+                                        $matched = 1;
+                                    }
+                                }
+                                if ($matched) {
+                                    $srch_results{$user} = 
+					{&Apache::lonnet::get('environment',
+							     ['firstname',
+							      'lastname',
+							      'permanentemail'],
+							      $cudomain,$cuname)};
+                                }
+                            }
+                        }
+                        ($currstate,$response,$forcenewuser) =
+                            &build_search_response($context,$srch,%srch_results);
+                    }
+                }
+            }
+        } elsif ($srch->{'srchin'} eq 'alc') {
+            $currstate = 'query';
+        } elsif ($srch->{'srchin'} eq 'instd') {
+            ($dirsrchres,%srch_results) = &Apache::lonnet::inst_directory_query($srch);
+            if ($dirsrchres eq 'ok') {
+                ($currstate,$response,$forcenewuser) = 
+                    &build_search_response($context,$srch,%srch_results);
+            } else {
+                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 />'; 
+            }
+        }
+    } else {
+        if ($srch->{'srchin'} eq 'dom') {
+            %srch_results = &Apache::lonnet::usersearch($srch);
+            ($currstate,$response,$forcenewuser) = 
+                &build_search_response($context,$srch,%srch_results); 
+        } elsif ($srch->{'srchin'} eq 'crs') {
+            my $courseusers = &get_courseusers(); 
+            foreach my $user (keys(%$courseusers)) {
+                my ($uname,$udom) = split(/:/,$user);
+                my %names = &Apache::loncommon::getnames($uname,$udom);
+                my %emails = &Apache::loncommon::getemails($uname,$udom);
+                if ($srch->{'srchby'} eq 'lastname') {
+                    if ((($srch->{'srchtype'} eq 'exact') && 
+                         ($names{'lastname'} eq $srch->{'srchterm'})) || 
+                        (($srch->{'srchtype'} eq 'begins') &&
+                         ($names{'lastname'} =~ /^\Q$srch->{'srchterm'}\E/i)) ||
+                        (($srch->{'srchtype'} eq 'contains') &&
+                         ($names{'lastname'} =~ /\Q$srch->{'srchterm'}\E/i))) {
+                        $srch_results{$user} = {firstname => $names{'firstname'},
+                                            lastname => $names{'lastname'},
+                                            permanentemail => $emails{'permanentemail'},
+                                           };
+                    }
+                } elsif ($srch->{'srchby'} eq 'lastfirst') {
+                    my ($srchlast,$srchfirst) = split(/,/,$srch->{'srchterm'});
+                    $srchlast =~ s/\s+$//;
+                    $srchfirst =~ s/^\s+//;
+                    if ($srch->{'srchtype'} eq 'exact') {
+                        if (($names{'lastname'} eq $srchlast) &&
+                            ($names{'firstname'} eq $srchfirst)) {
+                            $srch_results{$user} = {firstname => $names{'firstname'},
+                                                lastname => $names{'lastname'},
+                                                permanentemail => $emails{'permanentemail'},
+
+                                           };
+                        }
+                    } elsif ($srch->{'srchtype'} eq 'begins') {
+                        if (($names{'lastname'} =~ /^\Q$srchlast\E/i) &&
+                            ($names{'firstname'} =~ /^\Q$srchfirst\E/i)) {
+                            $srch_results{$user} = {firstname => $names{'firstname'},
+                                                lastname => $names{'lastname'},
+                                                permanentemail => $emails{'permanentemail'},
+                                               };
+                        }
+                    } else {
+                        if (($names{'lastname'} =~ /\Q$srchlast\E/i) && 
+                            ($names{'firstname'} =~ /\Q$srchfirst\E/i)) {
+                            $srch_results{$user} = {firstname => $names{'firstname'},
+                                                lastname => $names{'lastname'},
+                                                permanentemail => $emails{'permanentemail'},
+                                               };
+                        }
+                    }
+                }
+            }
+            ($currstate,$response,$forcenewuser) = 
+                &build_search_response($context,$srch,%srch_results); 
+        } elsif ($srch->{'srchin'} eq 'alc') {
+            $currstate = 'query';
+        } elsif ($srch->{'srchin'} eq 'instd') {
+            ($dirsrchres,%srch_results) = &Apache::lonnet::inst_directory_query($srch); 
+            if ($dirsrchres eq 'ok') {
+                ($currstate,$response,$forcenewuser) = 
+                    &build_search_response($context,$srch,%srch_results);
+            } else {
+                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 />';
+            }
+        }
+    }
+    return ($currstate,$response,$forcenewuser,\%srch_results);
+}
+
+sub directorysrch_check {
+    my ($srch) = @_;
+    my $can_search = 0;
+    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'}{'available'}) {
+            return &mt('Institutional directory search is not available in domain: [_1]',$showdom); 
+        }
+        if ($dom_inst_srch{'directorysrch'}{'localonly'}) {
+            if ($env{'request.role.domain'} ne $srch->{'srchdomain'}) {
+                return &mt('Institutional directory search in domain: [_1] is only allowed for users with a current role in the domain.',$showdom); 
+            }
+            my @usertypes = split(/:/,$env{'environment.inststatus'});
+            if (!@usertypes) {
+                push(@usertypes,'default');
+            }
+            if (ref($dom_inst_srch{'directorysrch'}{'cansearch'}) eq 'ARRAY') {
+                foreach my $type (@usertypes) {
+                    if (grep(/^\Q$type\E$/,@{$dom_inst_srch{'directorysrch'}{'cansearch'}})) {
+                        $can_search = 1;
+                        last;
+                    }
+                }
+            }
+            if (!$can_search) {
+                my ($insttypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($srch->{'srchdomain'});
+                my @longtypes; 
+                foreach my $item (@usertypes) {
+                    if (defined($insttypes->{$item})) { 
+                        push (@longtypes,$insttypes->{$item});
+                    } elsif ($item eq 'default') {
+                        push (@longtypes,&mt('other')); 
+                    }
+                }
+                my $insttype_str = join(', ',@longtypes); 
+                return &mt('Institutional directory search in domain: [_1] is not available to your user type: ',$showdom).$insttype_str;
+            }
+        } else {
+            $can_search = 1;
+        }
+    } else {
+        return &mt('Institutional directory search has not been configured for domain: [_1]',$showdom);
+    }
+    my %longtext = &Apache::lonlocal::texthash (
+                       uname     => 'username',
+                       lastfirst => 'last name, first name',
+                       lastname  => 'last name',
+                       contains  => 'contains',
+                       exact     => 'as exact match to',
+                       begins    => 'begins with',
+                   );
+    if ($can_search) {
+        if (ref($dom_inst_srch{'directorysrch'}{'searchby'}) eq 'ARRAY') {
+            if (!grep(/^\Q$srch->{'srchby'}\E$/,@{$dom_inst_srch{'directorysrch'}{'searchby'}})) {
+                return &mt('Institutional directory search in domain: [_1] is not available for searching by "[_2]"',$showdom,$longtext{$srch->{'srchby'}});
+            }
+        } else {
+            return &mt('Institutional directory search in domain: [_1] is not available.', $showdom);
+        }
+    }
+    if ($can_search) {
+        if (ref($dom_inst_srch{'directorysrch'}{'searchtypes'}) eq 'ARRAY') {
+            if (grep(/^\Q$srch->{'srchtype'}\E/,@{$dom_inst_srch{'directorysrch'}{'searchtypes'}})) {
+                return 'ok';
+            } else {
+                return &mt('Institutional directory search in domain [_1] is not available for the requested search type: "[_2]"',$showdom,$longtext{$srch->{'srchtype'}});
+            }
+        } else {
+            if ((($dom_inst_srch{'directorysrch'}{'searchtypes'} eq 'specify') &&
+                 ($srch->{'srchtype'} eq 'exact' || $srch->{'srchtype'} eq 'contains')) ||
+                ($dom_inst_srch{'directorysrch'}{'searchtypes'} eq $srch->{'srchtype'})) {
+                return 'ok';
+            } else {
+                return &mt('Institutional directory search in domain [_1] is not available for the requested search type: "[_2]"',$showdom,$longtext{$srch->{'srchtype'}});
+            }
+        }
+    }
+}
+
+sub get_courseusers {
+    my %advhash;
+    my $classlist = &Apache::loncoursedata::get_classlist();
+    my %coursepersonnel=&Apache::lonnet::get_course_adv_roles();
+    foreach my $role (sort(keys(%coursepersonnel))) {
+        foreach my $user (split(/\,/,$coursepersonnel{$role})) {
+	    if (!exists($classlist->{$user})) {
+		$classlist->{$user} = [];
+	    }
+        }
+    }
+    return $classlist;
+}
+
+sub build_search_response {
+    my ($context,$srch,%srch_results) = @_;
+    my ($currstate,$response,$forcenewuser);
+    my %names = (
+          'uname' => 'username',
+          'lastname' => 'last name',
+          'lastfirst' => 'last name, first name',
+          'crs' => 'this course',
+          'dom' => 'LON-CAPA domain: ',
+          'instd' => 'the institutional directory for domain: ',
+    );
+
+    my %single = (
+                   begins   => 'A match',
+                   contains => 'A match',
+                   exact    => 'An exact match',
+                 );
+    my %nomatch = (
+                   begins   => 'No match',
+                   contains => 'No match',
+                   exact    => 'No exact match',
+                  );
+    if (keys(%srch_results) > 1) {
+        $currstate = 'select';
+    } else {
+        if (keys(%srch_results) == 1) {
+            $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'});
+            }
+        } else {
+            $response = '<span class="LC_warning">'.&mt("$nomatch{$srch->{'srchtype'}} 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'});
+            }
+            $response .= '</span>';
+            if ($srch->{'srchin'} ne 'alc') {
+                $forcenewuser = 1;
+                my $cansrchinst = 0; 
+                if ($srch->{'srchdomain'}) {
+                    my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$srch->{'srchdomain'});
+                    if (ref($domconfig{'directorysrch'}) eq 'HASH') {
+                        if ($domconfig{'directorysrch'}{'available'}) {
+                            $cansrchinst = 1;
+                        } 
+                    }
+                }
+                if ((($srch->{'srchby'} eq 'lastfirst') || 
+                     ($srch->{'srchby'} eq 'lastname')) &&
+                    ($srch->{'srchin'} eq 'dom')) {
+                    if ($cansrchinst) {
+                        $response .= '<br />'.&mt('You may want to broaden your search to a search of the institutional directory for the domain.');
+                    }
+                }
+                if ($srch->{'srchin'} eq 'crs') {
+                    $response .= '<br />'.&mt('You may want to broaden your search to the selected LON-CAPA domain.');
+                }
+            }
+            if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $env{'request.role.domain'})) {
+                my $cancreate =
+                    &Apache::lonuserutils::can_create_user($env{'request.role.domain'},$context);
+                if ($cancreate) {
+                    my $showdom = &display_domain_info($env{'request.role.domain'}); 
+                    $response .= '<br /><br />'.&mt("<b>To add a new user</b> (you can only create new users in your current role's domain - <span class=\"LC_cusr_emph\">[_1]</span>):",$env{'request.role.domain'}).'<ul><li>'.&mt("Set 'Domain/institution to search' to: <span class=\"LC_cusr_emph\">[_1]</span>",$showdom).'<li>'.&mt("Set 'Search criteria' to: <span class=\"LC_cusr_emph\">'username is ...... in selected LON-CAPA domain'").'</span></li><li>'.&mt('Provide the proposed username').'</li><li>'.&mt('Search').'</li></ul><br />';
+                } else {
+                    my $helplink = ' href="javascript:helpMenu('."'display'".')"';
+                    $response .= '<br /><br />'.&mt("You are not authorized to create new users in your current role's domain - <span class=\"LC_cusr_emph\">[_1]</span>.",$env{'request.role.domain'}).'<br />'.&mt('Contact the <a[_1]>helpdesk</a> if you need to create a new user.',$helplink).'<br /><br />';
+                }
+            }
+        }
+    }
+    return ($currstate,$response,$forcenewuser);
+}
+
+sub display_domain_info {
+    my ($dom) = @_;
+    my $output = $dom;
+    if ($dom ne '') { 
+        my $domdesc = &Apache::lonnet::domain($dom,'description');
+        if ($domdesc ne '') {
+            $output .= ' <span class="LC_cusr_emph">('.$domdesc.')</span>';
+        }
+    }
+    return $output;
+}
+
+sub crumb_utilities {
+    my %elements = (
+       crtuser => {
+           srchterm => 'text',
+           srchin => 'selectbox',
+           srchby => 'selectbox',
+           srchtype => 'selectbox',
+           srchdomain => 'selectbox',
+       },
+       crtusername => {
+           srchterm => 'text',
+           srchdomain => 'selectbox',
+       },
+       docustom => {
+           rolename => 'selectbox',
+           newrolename => 'textbox',
+       },
+       studentform => {
+           srchterm => 'text',
+           srchin => 'selectbox',
+           srchby => 'selectbox',
+           srchtype => 'selectbox',
+           srchdomain => 'selectbox',
+       },
+    );
+
+    my $jsback .= qq|
+function backPage(formname,prevphase,prevstate) {
+    if (typeof prevphase == 'undefined') {
+        formname.phase.value = '';
+    }
+    else {  
+        formname.phase.value = prevphase;
+    }
+    if (typeof prevstate == 'undefined') {
+        formname.currstate.value = '';
+    }
+    else {
+        formname.currstate.value = prevstate;
+    }
+    formname.submit();
+}
+|;
+    return ($jsback,\%elements);
+}
+
 sub course_level_table {
-    my %inccourses = @_;
+    my (%inccourses) = @_;
     my $table = '';
-    foreach (sort( keys(%inccourses))) {
-	my $thiscourse=$_;
-	my $protectedcourse=$_;
+# Custom Roles?
+
+    my %customroles=&Apache::lonuserutils::my_custom_roles();
+    my %lt=&Apache::lonlocal::texthash(
+            'exs'  => "Existing sections",
+            'new'  => "Define new section",
+            'ssd'  => "Set Start Date",
+            'sed'  => "Set End Date",
+            'crl'  => "Course Level",
+            'act'  => "Activate",
+            'rol'  => "Role",
+            'ext'  => "Extent",
+            'grs'  => "Section",
+            'sta'  => "Start",
+            'end'  => "End"
+    );
+
+    foreach my $protectedcourse (sort( keys(%inccourses))) {
+	my $thiscourse=$protectedcourse;
 	$thiscourse=~s:_:/:g;
 	my %coursedata=&Apache::lonnet::coursedescription($thiscourse);
 	my $area=$coursedata{'description'};
-	if (!defined($area)) { $area='Unavailable course: '.$_; }
-	my $bgcol=$thiscourse;
-	$bgcol=~s/[^8-9b-e]//g;
-	$bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',0,6);
-	foreach  ('st','ta','ep','ad','in','cc') {
-	    if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) {
-		my $plrole=&Apache::lonnet::plaintext($_);
-		$table .= <<ENDEXTENT;
-<tr bgcolor="#$bgcol">
-<td><input type="checkbox" name="act_$protectedcourse\_$_"></td>
-<td>$plrole</td>
-<td>$area</td>
-ENDEXTENT
-	        if ($_ ne 'cc') {
-		    $table .= <<ENDSECTION;
-<td><input type="text" size="5" name="sec_$protectedcourse\_$_"></td>
-ENDSECTION
-                } else { 
-		    $table .= <<ENDSECTION;
-<td>&nbsp</td> 
-ENDSECTION
+        my $type=$coursedata{'type'};
+	if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; }
+	my ($domain,$cnum)=split(/\//,$thiscourse);
+        my %sections_count;
+        if (defined($env{'request.course.id'})) {
+            if ($env{'request.course.id'} eq $domain.'_'.$cnum) {
+                %sections_count = 
+		    &Apache::loncommon::get_sections($domain,$cnum);
+            }
+        }
+        my @roles = &Apache::lonuserutils::roles_by_context('course');
+	foreach my $role (@roles) {
+            my $plrole=&Apache::lonnet::plaintext($role);
+	    if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) {
+                $table .= &course_level_row($protectedcourse,$role,$area,$domain,
+                                            $plrole,\%sections_count,\%lt);    
+            } elsif ($env{'request.course.sec'} ne '') {
+                if (&Apache::lonnet::allowed('c'.$role,$thiscourse.'/'.
+                                             $env{'request.course.sec'})) {
+                    $table .= &course_level_row($protectedcourse,$role,$area,$domain,
+                                                $plrole,\%sections_count,\%lt);
                 }
-		$table .= <<ENDTIMEENTRY;
-<td><input type=hidden name="start_$protectedcourse\_$_" value=''>
-<a href=
-"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$_.value,'start_$protectedcourse\_$_','cu.pres','dateset')">Set Start Date</a></td>
-<td><input type=hidden name="end_$protectedcourse\_$_" value=''>
-<a href=
-"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">Set End Date</a></td>
-ENDTIMEENTRY
-                $table.= "</tr>\n";
             }
         }
+        if (&Apache::lonnet::allowed('ccr',$thiscourse)) {
+            foreach my $cust (sort keys %customroles) {
+                my $role = 'cr_cr_'.$env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cust;
+                $table .= &course_level_row($protectedcourse,$role,$area,$domain,
+                                            $cust,\%sections_count,\%lt);
+            }
+	}
     }
     return '' if ($table eq ''); # return nothing if there is nothing 
                                  # in the table
-    my $result = <<ENDTABLE;
-<h4>Course Level</h4>
-<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>
-<th>Group/Section</th><th>Start</th><th>End</th></tr>
-$table
-</table>
-ENDTABLE
+    my $result;
+    if (!$env{'request.course.id'}) {
+        $result = '<h4>'.$lt{'crl'}.'</h4>'."\n";
+    }
+    $result .= 
+&Apache::loncommon::start_data_table().
+&Apache::loncommon::start_data_table_header_row().
+'<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.'</th>
+<th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
+&Apache::loncommon::end_data_table_header_row().
+$table.
+&Apache::loncommon::end_data_table();
     return $result;
 }
+
+sub course_level_row {
+    my ($protectedcourse,$role,$area,$domain,$plrole,$sections_count,$lt) = @_;
+    my $row = &Apache::loncommon::start_data_table_row().
+              ' <td><input type="checkbox" name="act_'.
+              $protectedcourse.'_'.$role.'" /></td>'."\n".
+              ' <td>'.$plrole.'</td>'."\n".
+              ' <td>'.$area.'<br />Domain: '.$domain.'</td>'."\n";
+    if ($role eq 'cc') {
+        $row .= '<td>&nbsp;</td>';
+    } elsif ($env{'request.course.sec'} ne '') {
+        $row .= ' <td><input type="hidden" value="'.
+                $env{'request.course.sec'}.'" '.
+                'name="sec_'.$protectedcourse.'_'.$role.'" />'.
+                $env{'request.course.sec'}.'</td>';
+    } else {
+        if (ref($sections_count) eq 'HASH') {
+            my $currsec = 
+                &Apache::lonuserutils::course_sections($sections_count,
+                                                       $protectedcourse.'_'.$role);
+            $row .= '<td><table class="LC_createuser">'."\n".
+                    '<tr class="LC_section_row">'."\n".
+                    ' <td valign="top">'.$lt->{'exs'}.'<br />'.
+                       $currsec.'</td>'."\n".
+                     ' <td>&nbsp;&nbsp;</td>'."\n".
+                     ' <td valign="top">&nbsp;'.$lt->{'new'}.'<br />'.
+                     '<input type="text" name="newsec_'.$protectedcourse.'_'.$role.
+                     '" value="" />'.
+                     '<input type="hidden" '.
+                     'name="sec_'.$protectedcourse.'_'.$role.'" /></td>'."\n".
+                     '</tr></table></td>'."\n";
+        } else {
+            $row .= '<td><input type="text" size="10" '.
+                      'name="sec_'.$protectedcourse.'_'.$role.'" /></td>'."\n";
+        }
+    }
+    $row .= <<ENDTIMEENTRY;
+<td><input type="hidden" name="start_$protectedcourse\_$role" value="" />
+<a href=
+"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$role.value,'start_$protectedcourse\_$role','cu.pres','dateset')">$lt->{'ssd'}</a></td>
+<td><input type="hidden" name="end_$protectedcourse\_$role" value="" />
+<a href=
+"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$role.value,'end_$protectedcourse\_$role','cu.pres','dateset')">$lt->{'sed'}</a></td>
+ENDTIMEENTRY
+    $row .= &Apache::loncommon::end_data_table_row();
+    return $row;
+}
+
+sub course_level_dc {
+    my ($dcdom) = @_;
+    my %customroles=&Apache::lonuserutils::my_custom_roles();
+    my @roles = &Apache::lonuserutils::roles_by_context('course');
+    my $hiddenitems = '<input type="hidden" name="dcdomain" value="'.$dcdom.'" />'.
+                      '<input type="hidden" name="origdom" value="'.$dcdom.'" />'.
+                      '<input type="hidden" name="dccourse" value="" />';
+    my $courseform='<b>'.&Apache::loncommon::selectcourse_link
+            ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>';
+    my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu');
+    my %lt=&Apache::lonlocal::texthash(
+                    'rol'  => "Role",
+                    'grs'  => "Section",
+                    'exs'  => "Existing sections",
+                    'new'  => "Define new section", 
+                    'sta'  => "Start",
+                    'end'  => "End",
+                    'ssd'  => "Set Start Date",
+                    'sed'  => "Set End Date"
+                  );
+    my $header = '<h4>'.&mt('Course Level').'</h4>'.
+                 &Apache::loncommon::start_data_table().
+                 &Apache::loncommon::start_data_table_header_row().
+                 '<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
+                 &Apache::loncommon::end_data_table_header_row();
+    my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
+                     '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
+                     '<td><select name="role">'."\n";
+    foreach my $role (@roles) {
+        my $plrole=&Apache::lonnet::plaintext($role);
+        $otheritems .= '  <option value="'.$role.'">'.$plrole;
+    }
+    if ( keys %customroles > 0) {
+        foreach my $cust (sort keys %customroles) {
+            my $custrole='cr_cr_'.$env{'user.domain'}.
+                    '_'.$env{'user.name'}.'_'.$cust;
+            $otheritems .= '  <option value="'.$custrole.'">'.$cust;
+        }
+    }
+    $otheritems .= '</select></td><td>'.
+                     '<table border="0" cellspacing="0" cellpadding="0">'.
+                     '<tr><td valign="top"><b>'.$lt{'exs'}.'</b><br /><select name="currsec">'.
+                     ' <option value=""><--'.&mt('Pick course first').'</select></td>'.
+                     '<td>&nbsp;&nbsp;</td>'.
+                     '<td valign="top">&nbsp;<b>'.$lt{'new'}.'</b><br />'.
+                     '<input type="text" name="newsec" value="" />'.
+                     '<input type="hidden" name="section" value="" />'.
+                     '<input type="hidden" name="groups" value="" /></td>'.
+                     '</tr></table></td>';
+    $otheritems .= <<ENDTIMEENTRY;
+<td><input type="hidden" name="start" value='' />
+<a href=
+"javascript:pjump('date_start','Start Date',document.cu.start.value,'start','cu.pres','dateset')">$lt{'ssd'}</a></td>
+<td><input type="hidden" name="end" value='' />
+<a href=
+"javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td>
+ENDTIMEENTRY
+    $otheritems .= &Apache::loncommon::end_data_table_row().
+                   &Apache::loncommon::end_data_table()."\n";
+    return $cb_jscript.$header.$hiddenitems.$otheritems;
+}
+
+sub update_selfenroll_config {
+    my ($r,$context,$permission) = @_;
+    my ($row,$lt) = &get_selfenroll_titles();
+    my %curr_groups = &Apache::longroup::coursegroups();
+    my (%changes,%warning);
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $curr_types;
+    if (ref($row) eq 'ARRAY') {
+        foreach my $item (@{$row}) {
+            if ($item eq 'enroll_dates') {
+                my (%currenrolldate,%newenrolldate);
+                foreach my $type ('start','end') {
+                    $currenrolldate{$type} = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$type.'_date'};
+                    $newenrolldate{$type} = &Apache::lonhtmlcommon::get_date_from_form('selfenroll_'.$type.'_date');
+                    if ($newenrolldate{$type} ne $currenrolldate{$type}) {
+                        $changes{'internal.selfenroll_'.$type.'_date'} = $newenrolldate{$type};
+                    }
+                }
+            } elsif ($item eq 'access_dates') {
+                my (%currdate,%newdate);
+                foreach my $type ('start','end') {
+                    $currdate{$type} = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$type.'_access'};
+                    $newdate{$type} = &Apache::lonhtmlcommon::get_date_from_form('selfenroll_'.$type.'_access');
+                    if ($newdate{$type} ne $currdate{$type}) {
+                        $changes{'internal.selfenroll_'.$type.'_access'} = $newdate{$type};
+                    }
+                }
+            } elsif ($item eq 'types') {
+                $curr_types =
+                    $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$item};
+                if ($env{'form.selfenroll_all'}) {
+                    if ($curr_types ne '*') {
+                        $changes{'internal.selfenroll_types'} = '*';
+                    } else {
+                        next;
+                    }
+                } else {
+                    my %currdoms;
+                    my @entries = split(/;/,$curr_types);
+                    my @deletedoms = &Apache::loncommon::get_env_multiple('form.selfenroll_delete');
+                    my @activations = &Apache::loncommon::get_env_multiple('form.selfenroll_activate');
+                    my $newnum = 0;
+                    my @latesttypes;
+                    foreach my $num (@activations) {
+                        my @types = &Apache::loncommon::get_env_multiple('form.selfenroll_types_'.$num);
+                        if (@types > 0) {
+                            @types = sort(@types);
+                            my $typestr = join(',',@types);
+                            my $typedom = $env{'form.selfenroll_dom_'.$num};
+                            $latesttypes[$newnum] = $typedom.':'.$typestr;
+                            $currdoms{$typedom} = 1;
+                            $newnum ++;
+                        }
+                    }
+                    for (my $j=0; $j<$env{'form.selfenroll_types_total'}; $j++) {                        if ((!grep(/^$j$/,@deletedoms)) && (!grep(/^$j$/,@activations))) {
+                            my @types = &Apache::loncommon::get_env_multiple('form.selfenroll_types_'.$j);
+                            if (@types > 0) {
+                                @types = sort(@types);
+                                my $typestr = join(',',@types);
+                                my $typedom = $env{'form.selfenroll_dom_'.$j};
+                                $latesttypes[$newnum] = $typedom.':'.$typestr;
+                                $currdoms{$typedom} = 1;
+                                $newnum ++;
+                            }
+                        }
+                    }
+                    if ($env{'form.selfenroll_newdom'} ne '') {
+                        my $typedom = $env{'form.selfenroll_newdom'};
+                        if ((!defined($currdoms{$typedom})) && 
+                            (&Apache::lonnet::domain($typedom) ne '')) {
+                            my $typestr;
+                            my ($othertitle,$usertypes,$types) = 
+                                &Apache::loncommon::sorted_inst_types($typedom);
+                            my $othervalue = 'any';
+                            if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
+                                if (@{$types} > 0) {
+                                    my @esc_types = map { &escape($_); } @{$types};
+                                    $othervalue = 'other';
+                                    $typestr = join(',',(@esc_types,$othervalue));
+                                }
+                                $typestr = $othervalue;
+                            } else {
+                                $typestr = $othervalue;
+                            } 
+                            $latesttypes[$newnum] = $typedom.':'.$typestr;
+                            $newnum ++ ;
+                        }
+                    }
+                    my $selfenroll_types = join(';',@latesttypes);
+                    if ($selfenroll_types ne $curr_types) {
+                        $changes{'internal.selfenroll_types'} = $selfenroll_types;
+                    }
+                }
+            } else {
+                my $curr_val = 
+                    $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$item};
+                my $newval = $env{'form.selfenroll_'.$item};
+                if ($item eq 'section') {
+                    $newval = $env{'form.sections'};
+                    if (defined($curr_groups{$newval})) {
+                        $newval = $curr_val;
+                        $warning{$item} = &mt('Section for self-enrolled users unchanged as the proposed section is a group').'<br />'.&mt('Group names and section names must be distinct');
+                    } elsif ($newval eq 'all') {
+                        $newval = $curr_val;
+                        $warning{$item} = &mt("Section for self-enrolled users unchanged, as 'all' is a reserved section name.");
+                    }
+                    if ($newval eq '') {
+                        $newval = 'none';
+                    }
+                }
+                if ($newval ne $curr_val) {
+                    $changes{'internal.selfenroll_'.$item} = $newval;
+                }
+            }
+        }
+        if (keys(%warning) > 0) {
+            foreach my $item (@{$row}) {
+                if (exists($warning{$item})) {
+                    $r->print($warning{$item}.'<br />');
+                }
+            } 
+        }
+        if (keys(%changes) > 0) {
+            my $putresult = &Apache::lonnet::put('environment',\%changes,$cdom,$cnum);
+            if ($putresult eq 'ok') {
+                if ((exists($changes{'internal.selfenroll_types'})) ||
+                    (exists($changes{'internal.selfenroll_start_date'}))  ||
+                    (exists($changes{'internal.selfenroll_end_date'}))) {
+                    my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',
+                                                                $cnum,undef,undef,'Course');
+                    my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
+                    if (ref($crsinfo{$env{'request.course.id'}}) eq 'HASH') {
+                        foreach my $item ('selfenroll_types','selfenroll_start_date','selfenroll_end_date') {
+                            if (exists($changes{'internal.'.$item})) {
+                                $crsinfo{$env{'request.course.id'}}{$item} = 
+                                    $changes{'internal.'.$item};
+                            }
+                        }
+                        my $crsputresult =
+                            &Apache::lonnet::courseidput($cdom,\%crsinfo,
+                                                         $chome,'notime');
+                    }
+                }
+                $r->print(&mt('The following changes were made to self-enrollment settings:').'<ul>');
+                foreach my $item (@{$row}) {
+                    my $title = $item;
+                    if (ref($lt) eq 'HASH') {
+                        $title = $lt->{$item};
+                    }
+                    if ($item eq 'enroll_dates') {
+                        foreach my $type ('start','end') {
+                            if (exists($changes{'internal.selfenroll_'.$type.'_date'})) {
+                                my $newdate = &Apache::lonlocal::locallocaltime($changes{'internal.selfenroll_'.$type.'_date'});
+                                $r->print('<li>'.&mt('[_1]: "[_2]" set to "[_3]".',
+                                          $title,$type,$newdate).'</li>');
+                            }
+                        }
+                    } elsif ($item eq 'access_dates') {
+                        foreach my $type ('start','end') {
+                            if (exists($changes{'internal.selfenroll_'.$type.'_access'})) {
+                                my $newdate = &Apache::lonlocal::locallocaltime($changes{'internal.selfenroll_'.$type.'_access'});
+                                $r->print('<li>'.&mt('[_1]: "[_2]" set to "[_3]".',
+                                          $title,$type,$newdate).'</li>');
+                            }
+                        }
+                    } else {
+                        if (exists($changes{'internal.selfenroll_'.$item})) {
+                            my $newval = $changes{'internal.selfenroll_'.$item};
+                            if ($item eq 'types') {
+                                if ($newval eq '') {
+                                    $newval = &mt('None');
+                                } elsif ($newval eq '*') {
+                                    $newval = &mt('Any user in any domain');
+                                }
+                            } elsif ($item eq 'registered') {
+                                if ($newval eq '1') {
+                                    $newval = &mt('Yes');
+                                } elsif ($newval eq '0') {
+                                    $newval = &mt('No');
+                                }
+                            }
+                            $r->print('<li>'.&mt('"[_1]" set to "[_2]".',$title,$newval).'</li>'."\n");
+                        }
+                    }
+                }
+                $r->print('</ul>');
+                my %newenvhash;
+                foreach my $key (keys(%changes)) {
+                    $newenvhash{'course.'.$env{'request.course.id'}.'.'.$key} = $changes{$key};
+                }
+                &Apache::lonnet::appenv(\%newenvhash);
+            } else {
+                $r->print(&mt('An error occurred when saving changes to self-enrollment settings in this course.').'<br />'.&mt('The error was: [_1].',$putresult));
+            }
+        } else {
+            $r->print(&mt('No changes were made to the existing self-enrollment settings in this course.'));
+        }
+    } else {
+        $r->print(&mt('No changes were made to the existing self-enrollment settings in this course.'));
+    }
+    my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum);
+    if (ref($visactions) eq 'HASH') {
+        if (!$visible) {
+            $r->print('<br />'.$visactions->{'miss'}.'<br />'.$visactions->{'yous'}.
+                      '<br />');
+            if (ref($vismsgs) eq 'ARRAY') {
+                $r->print('<br />'.$visactions->{'take'}.'<ul>');
+                foreach my $item (@{$vismsgs}) {
+                    $r->print('<li>'.$visactions->{$item}.'</li>');
+                }
+                $r->print('</ul>');
+            }
+            $r->print($cansetvis);
+        }
+    }
+    return;
+}
+
+sub get_selfenroll_titles {
+    my @row = ('types','registered','enroll_dates','access_dates','section');
+    my %lt = &Apache::lonlocal::texthash (
+                types        => 'Users allowed to self-enroll in this course',
+                registered   => 'Restrict self-enrollment to students officially registered for the course',
+                enroll_dates => 'Dates self-enrollment available',
+                access_dates => 'Course access dates assigned to self-enrolling users',
+                section      => 'Section assigned to self-enrolling users',
+             );
+    return (\@row,\%lt);
+}
+
 #---------------------------------------------- end functions for &phase_two
 
 #--------------------------------- functions for &phase_two and &phase_three