--- loncom/interface/loncreateuser.pm	2007/12/21 20:34:26	1.221
+++ loncom/interface/loncreateuser.pm	2008/05/12 17:52:09	1.239
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.221 2007/12/21 20:34:26 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.239 2008/05/12 17:52:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -76,30 +76,30 @@ my $authformfsys;
 my $authformloc;
 
 sub initialize_authen_forms {
-    my ($dom,$curr_authtype,$mode) = @_; 
-    my ($krbdefdom)=( $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/);
-    $krbdefdom= uc($krbdefdom);
-    my %param = ( formname => 'document.cu',
+    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):$/) {
+    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;
         }
     }
-# no longer static due to configurable kerberos defaults
-#    $loginscript  = &Apache::loncommon::authform_header(%param);
+    $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);
@@ -156,21 +156,21 @@ END_SCRIPT
         $custom_off = ' ';
         $showquota = $currquota;
         if ($longinsttype eq '') {
-            $defaultinfo = &mt('For this user, the default quota would be [_1]
-                            Mb.',$defquota);
+            $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);
+            $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);
+            $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);
+            $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.
@@ -220,6 +220,7 @@ sub print_username_entry_form {
     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,});
@@ -230,32 +231,29 @@ sub print_username_entry_form {
     } else {
         &Apache::lonhtmlcommon::add_breadcrumb
           ({href=>"javascript:backPage(document.crtuser)",
-            text=>"Single user search",
+            text=>$breadcrumb_text{'search'},
             faq=>282,bug=>'Instructor Interface',});
     }
-    my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management');
+    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(
-                    'srch' => "User Search",
-                     or    => "or",
+                    '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",
-                    'mod'  => "to modify user information or add/modify roles",
-                    'enrl' => "to enroll one student",
 				       );
-    my $help = &Apache::loncommon::help_open_menu(undef,undef,282,'Instructor Interface');
-    my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
-    my $helpsist=&Apache::loncommon::help_open_topic('Course_Add_Student');
-    my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
-    my $sellink=&Apache::loncommon::selectstudent_link('crtuser','srchterm','srchdomain');
-    if ($sellink) {
-        $sellink = "$lt{'or'} ".$sellink;
-    } 
     $r->print($start_page."\n".$crumbs);
     if ($env{'form.action'} eq 'custom') {
         if (&Apache::lonnet::allowed('mcr','/')) {
@@ -263,19 +261,19 @@ sub print_username_entry_form {
 <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'}$helpecpr</h3>
+<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{'mod'}.$helpsiur;
+        my $actiontext = $lt{'srad'};
         if ($env{'form.action'} eq 'singlestudent') {
-            $actiontext = $lt{'enrl'}.$helpsist;
+            $actiontext = $lt{'srst'};
         }
         $r->print("
-<h3>$lt{'srch'} $sellink $actiontext</h3>");
+<h3>$actiontext</h3>");
         if ($env{'form.origform'} ne 'crtusername') {
             $r->print("\n".$response);
         }
@@ -287,7 +285,7 @@ ENDCUSTOM
 sub entry_form {
     my ($dom,$srch,$forcenewuser,$context,$responsemsg) = @_;
     my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
-    my $usertype;
+    my ($usertype,$inexact);
     if (ref($srch) eq 'HASH') {
         if (($srch->{'srchin'} eq 'dom') &&
             ($srch->{'srchby'} eq 'uname') &&
@@ -297,6 +295,8 @@ sub entry_form {
             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 =
@@ -305,6 +305,11 @@ sub entry_form {
        &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="action" value="$env{'form.action'}" />
@@ -313,33 +318,56 @@ $userpicker
 <input name="userrole" type="button" value="$srchbutton" onclick="javascript:validateEntry(document.crtuser)" />
 </form>
 ENDBLOCK
-    if ($cancreate && $env{'form.phase'} eq '') {
+    if ($env{'form.phase'} eq '') {
         my $defdom=$env{'request.role.domain'};
         my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
-        my $helpcrt=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
         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',
-                  'cra'  => 'Create user',
+                  '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="username" />
+<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>$lt{crnu}$helpcrt</h3>
-$responsemsg
+<h3>$title</h3>
+$showresponse
 <table>
  <tr>
   <td>$lt{'usr'}:</td>
   <td><input type="text" size="15" name="srchterm" /></td>
   <td>&nbsp;$lt{'dom'}:</td><td>$domform</td>
-  <td>&nbsp;<input name="userrole" type="submit" value="$lt{'cra'}" /></td>
+  <td>&nbsp;$sellink&nbsp;</td>
+  <td>&nbsp;<input name="userrole" type="submit" value="$buttontext" /></td>
  </tr>
 </table>
 </form>
@@ -377,7 +405,7 @@ END
 
 # =================================================================== Phase two
 sub print_user_selection_page {
-    my ($r,$response,$srch,$srch_results,$operation,$srcharray,$context) = @_;
+    my ($r,$response,$srch,$srch_results,$srcharray,$context) = @_;
     my @fields = ('username','domain','lastname','firstname','permanentemail');
     my $sortby = $env{'form.sortby'};
 
@@ -412,27 +440,24 @@ ENDSCRIPT
                                        'permanentemail' => "permanent e-mail",
                                       );
     $r->print(&Apache::loncommon::start_page('User Management',$jscript));
-    if ($operation eq 'createuser') {
-        &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>"javascript:backPage(document.usersrchform,'','')",
-              text=>"Create/modify user",
-              faq=>282,bug=>'Instructor Interface',},
-             {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
-              text=>"Select User",
-              faq=>282,bug=>'Instructor Interface',});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+
+    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 ($operation eq 'enrollstudent') {
-        &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>"javascript:backPage(document.usersrchform,'','')",
-              text=>"Create/modify student",
-              faq=>282,bug=>'Instructor Interface',},
-             {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
-              text=>"Select Student",
-              faq=>282,bug=>'Instructor Interface',});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+    } 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>');
@@ -509,8 +534,7 @@ sub print_user_modification_page {
         $formname = 'cu';
     }
     my %abv_auth = &auth_abbrev();
-    my ($curr_authtype,%rulematch,%inst_results,$curr_kerb_ver,$newuser,
-        %alerts,%curr_rules,%got_rules);
+    my (%rulematch,%inst_results,$newuser,%alerts,%curr_rules,%got_rules);
     my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
     if ($uhome eq 'no_host') {
         my $usertype;
@@ -565,32 +589,10 @@ sub print_user_modification_page {
         }
     } else {
         $newuser = 0;
-        my $currentauth = 
-            &Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
-        if ($currentauth =~ /^(krb4|krb5|unix|internal|localauth):/) {	
-            $curr_authtype = $abv_auth{$1};
-            if ($currentauth =~ /^krb(4|5)/) {
-                $curr_kerb_ver = $1;
-            }
-        }
     }
     if ($response) {
         $response = '<br />'.$response;
     }
-    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,
-                  curr_authtype => $curr_authtype,
-                  curr_kerb_ver => $curr_kerb_ver,
-                  domain => $ccdomain,
-                );
-    $loginscript  = &Apache::loncommon::authform_header(%param);
-    $authformkrb  = &Apache::loncommon::authform_kerberos(%param);
 
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     my $dc_setcourse_code = '';
@@ -601,9 +603,12 @@ sub print_user_modification_page {
 
     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,{'add_entries' => \%loaditem,});
+	&Apache::loncommon::start_page('User Management',$js,$args);
     my %breadcrumb_text = &singleuser_breadcrumb();
     &Apache::lonhtmlcommon::add_breadcrumb
      ({href=>"javascript:backPage($form)",
@@ -620,7 +625,12 @@ sub print_user_modification_page {
       ({href=>"javascript:backPage($form,'$env{'form.phase'}','modify')",
         text=>$breadcrumb_text{'modify'},
         faq=>282,bug=>'Instructor Interface',});
-    my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management');
+    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="$formname">
@@ -643,7 +653,7 @@ ENDFORMINFO
             # Current user has quota modification privileges
             $portfolioform = '<br />'.&portfolio_quota($ccuname,$ccdomain);
         }
-        &initialize_authen_forms($ccdomain);
+        &initialize_authen_forms($ccdomain,$formname);
         my %lt=&Apache::lonlocal::texthash(
                 'cnu'            => 'Create New User',
                 'ast'            => 'as a student',
@@ -764,8 +774,7 @@ ENDCHANGEUSER
             $r->print(&Apache::lonuserutils::forceid_change($context));
         }
         $r->print('</div>');
-        my $user_auth_text = 
-            &user_authentication($ccuname,$ccdomain,$krbdefdom,\%abv_auth);
+        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
@@ -829,7 +838,7 @@ ENDNOPORTPRIV
             if ($addrolesdisplay) {
                 $r->print('<br /><input type="button" value="'.&mt('Modify User').'"');
                 if ($newuser) {
-                    $r->print(' onClick="verify_message(this.form)" \>'."\n");
+                    $r->print(' onClick="auth_check()" \>'."\n");
                 } else {
                     $r->print('onClick="this.form.submit()" \>'."\n");
                 }
@@ -856,7 +865,7 @@ sub singleuser_breadcrumb {
         $breadcrumb_text{'userpicked'} = 'Select a user',
         $breadcrumb_text{'modify'} = 'Set section/dates',
     } else {
-        $breadcrumb_text{'search'} = 'Create/modify user';
+        $breadcrumb_text{'search'} = 'Create/modify a user';
         $breadcrumb_text{'userpicked'} = 'Select a user',
         $breadcrumb_text{'modify'} = 'Set user role',
     }
@@ -886,26 +895,28 @@ sub validation_javascript {
     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');
+        $dc_setcourse_code = 
+            &Apache::lonuserutils::dc_setcourse_js('cu','singleuser',$context);
     } else {
-        $nondc_setsection_code =
-            &Apache::lonuserutils::setsections_javascript($formname,$groupslist);
+        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();
-    my $javascript_validations;
-    if ((&Apache::lonnet::allowed('mau',$ccdomain)) || ($newuser)) {
-        my ($krbdef,$krbdefdom) =
-            &Apache::loncommon::get_kerberos_defaults($ccdomain);
-        $javascript_validations =
-            &Apache::lonuserutils::javascript_validations('createuser',$krbdefdom,undef,
-                                                          undef,$ccdomain);
-    }
     $js .= "\n".
-           '<script type="text/javascript">'."\n".$jsback."\n".
-           $javascript_validations.'</script>';
+           '<script type="text/javascript">'."\n".$jsback."\n".'</script>';
     return $js;
 }
 
@@ -1230,22 +1241,9 @@ sub new_domain_roles {
 }
 
 sub user_authentication {
-    my ($ccuname,$ccdomain,$krbdefdom,$abv_auth) = @_;
+    my ($ccuname,$ccdomain,$formname) = @_;
     my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
-    my ($loginscript,$outcome);
-    if ($currentauth=~/^(krb)(4|5):(.*)/) {
-        my $long_auth = $1.$2;
-        my $curr_kerb_ver = $2;
-        my $krbdefdom=$3;
-        my $curr_authtype = $abv_auth->{$long_auth};
-        my %param = ( formname      => 'document.cu',
-                      kerb_def_dom  => $krbdefdom,
-                      domain        => $ccdomain,
-                      curr_authtype => $curr_authtype,
-                      curr_kerb_ver => $curr_kerb_ver,
-                          );
-        $loginscript  = &Apache::loncommon::authform_header(%param);
-    }
+    my $outcome;
     # Check for a bad authentication type
     if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) {
         # bad authentication scheme
@@ -1257,7 +1255,8 @@ sub user_authentication {
                        'ld'    => "Login Data"
         );
         if (&Apache::lonnet::allowed('mau',$ccdomain)) {
-            &initialize_authen_forms($ccdomain);
+            &initialize_authen_forms($ccdomain,$formname);
+
             my $choices = &Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc);
             $outcome = <<ENDBADAUTH;
 <script type="text/javascript" language="Javascript">
@@ -1278,7 +1277,7 @@ $lt{'uuas'} ($currentauth). $lt{'adcs'}.
 ENDBADAUTH
         }
     } else { # Authentication type is valid
-        &initialize_authen_forms($ccdomain,$currentauth,'modifyuser');
+        &initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser');
         my ($authformcurrent,$can_modify,@authform_others) =
             &modify_login_block($ccdomain,$currentauth);
         if (&Apache::lonnet::allowed('mau',$ccdomain)) {
@@ -1322,6 +1321,7 @@ ENDBADAUTH
                 $outcome .= <<ENDNOPRIV;
 <h3>$lt{'ccld'}</h3>
 $lt{'yodo'} $lt{'ifch'}: $ccdomain
+<input type="hidden" name="login" value="nochange" />
 ENDNOPRIV
             }
         }
@@ -1490,7 +1490,13 @@ sub update_user_data {
     my $jscript = '<script type="text/javascript">'."\n".
                   $jsback."\n".'</script>'."\n";
     my %breadcrumb_text = &singleuser_breadcrumb();
-    $r->print(&Apache::loncommon::start_page($title,$jscript));
+    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'},
@@ -1508,7 +1514,12 @@ sub update_user_data {
         {href=>"/adm/createuser",
          text=>"Result",
          faq=>282,bug=>'Instructor Interface',});
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+    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'} ) {
@@ -1635,6 +1646,27 @@ sub update_user_data {
 	$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') &&
@@ -1954,7 +1986,7 @@ END
                     foreach my $key (keys(%changeHash)) {
                         $newenvhash{'environment.'.$key} = $changeHash{$key};
                     }
-                    &Apache::lonnet::appenv(%newenvhash);
+                    &Apache::lonnet::appenv(\%newenvhash);
                 }
             } else { # error occurred
                 $r->print('<span class="LC_error">'.&mt('Unable to successfully change environment for').' '.
@@ -2009,32 +2041,44 @@ END
                       &mt('Contact your <a href="[_1]">helpdesk</a> for more information.',"javascript:helpMenu('display')").'<br />');
         }
         $r->print($no_forceid_alert.
-                  &Apache::lonuserutils::print_namespacing_alerts($env{'form.ccdomain'},\%alerts, \%curr_rules));
+                  &Apache::lonuserutils::print_namespacing_alerts($env{'form.ccdomain'},\%alerts,\%curr_rules));
     }
     if ($env{'form.action'} eq 'singlestudent') {
-        &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser);
+        &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);
-        if (!$rolechanges && $namechanged) {
+        my @rolechanges = &update_roles($r,$context);
+        if ($namechanged) {
             if ($context eq 'course') {
                 if (@userroles > 0) {
-                    if (grep(/^st$/,@userroles)) {
-                        my $classlistupdated =
-                            &Apache::lonuserutils::update_classlist($cdom,
+                    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: <span class="LC_cusr_emph">([_1])</span>',$userinfo).'</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) = @_;
+    my ($r,$context) = @_;
     my $now=time;
-    my $rolechanges = 0;
+    my @rolechanges;
     my %disallowed;
     $r->print('<h3>'.&mt('Modifying Roles').'</h3>');
     foreach my $key (keys (%env)) {
@@ -2048,7 +2092,7 @@ sub update_roles {
 		my $result =
 		    &Apache::lonnet::revokerole($env{'form.ccdomain'},
 						$env{'form.ccuname'},
-						$scope,$role);
+						$scope,$role,'','',$context);
 	        $r->print(&mt('Revoking [_1] in [_2]: [_3]',
 			      $role,$scope,'<b>'.$result.'</b>').'<br />');
 		if ($role eq 'st') {
@@ -2058,16 +2102,21 @@ sub update_roles {
 			    $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).
+				  $env{'form.ccuname'},$1,$2,$3,$4,'','',$context).
 		'</b><br />');
+                if (!grep(/^cr$/,@rolechanges)) {
+                    push(@rolechanges,'cr');
+                }
 	    }
-            $rolechanges ++;
 	} elsif ($key=~/^form\.del/) {
 	    if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
 # Delete standard role
@@ -2075,7 +2124,8 @@ sub update_roles {
 		my $result =
 		    &Apache::lonnet::assignrole($env{'form.ccdomain'},
 						$env{'form.ccuname'},
-						$scope,$role,$now,0,1);
+						$scope,$role,$now,0,1,'',
+                                                $context);
 	        $r->print(&mt('Deleting [_1] in [_2]: [_3]',$role,$scope,
 			      '<b>'.$result.'</b>').'<br />');
 		if ($role eq 'st') {
@@ -2085,6 +2135,9 @@ sub update_roles {
 			    $now);
 		    $r->print($result);
 		}
+                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);
@@ -2094,8 +2147,10 @@ sub update_roles {
                       &Apache::lonnet::assigncustomrole($env{'form.ccdomain'},
                          $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
                          0,1).'</b><br />');
+                if (!grep(/^cr$/,@rolechanges)) {
+                    push(@rolechanges,'cr');
+                }
             }
-            $rolechanges ++;
 	} elsif ($key=~/^form\.ren/) {
             my $udom = $env{'form.ccdomain'};
             my $uname = $env{'form.ccuname'};
@@ -2109,7 +2164,11 @@ sub update_roles {
                     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')) {
-                            $output = "Error: $result\n";
+                            if ($result eq 'refused' && $logmsg) {
+                                $output = $logmsg;
+                            } else { 
+                                $output = "Error: $result\n";
+                            }
                         } else {
                             $output = &mt('Assigning').' '.$role.' in '.$url.
                                       &mt('starting').' '.localtime($now).
@@ -2119,11 +2178,15 @@ sub update_roles {
                     }
                 } else {
 		    my $result=&Apache::lonnet::assignrole($env{'form.ccdomain'},
-                               $env{'form.ccuname'},$url,$role,0,$now);
+                               $env{'form.ccuname'},$url,$role,0,$now,'','',
+                               $context);
 		    $output = &mt('Re-enabling [_1] in [_2]: <b>[_3]</b>',
 			      $role,$url,$result).'<br />';
 		}
                 $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+)$}) {
@@ -2133,8 +2196,10 @@ sub update_roles {
                                $url,$rdom,$rnam,$rolename,0,$now);
                 $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');
+                }
             }
-            $rolechanges ++;
 	} elsif ($key=~/^form\.act/) {
             my $udom = $env{'form.ccdomain'};
             my $uname = $env{'form.ccuname'};
@@ -2169,6 +2234,9 @@ sub update_roles {
 		        $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));
                     }
                 }
+                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
@@ -2207,7 +2275,10 @@ sub update_roles {
                     if ($emptysec) {
                         $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
                     }
-                } 
+                }
+                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
@@ -2217,26 +2288,31 @@ sub update_roles {
 		my $end   = ( $env{'form.end_'.$1.'_'.$2} ? 
 			      $env{'form.end_'.$1.'_'.$2} :
 			      0 );
-		my $url='/'.$1.'/';
+                my $one = $1;
+                my $two = $2;
+		my $url='/'.$one.'/';
                 # split multiple sections
                 my %sections = ();
-                my $num_sections = &build_roles($env{'form.sec_'.$1.'_'.$2},\%sections,$2);
+                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,$2,$start,$end,$1,undef,''));
+                    $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$two,$start,$end,$one,undef,''));
                 } 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,$2,$start,$end,$1,undef,$sec));
+                            $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$two,$start,$end,$one,undef,$sec));
                         } else {
                             $emptysec = 1;
                         }
                     }
                     if ($emptysec) {
-                        $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,''));
+                        $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$two,$start,$end,$one,undef,''));
                     }
                 }
+                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 />');
             }
@@ -2248,19 +2324,18 @@ sub update_roles {
                 }
                 $r->print(' '.&mt('Please <a href="javascript:history.go(-1)">go back</a> and choose a different section name.').'</p><br />');
             }
-            $rolechanges ++;
 	}
     } # End of foreach (keys(%env))
 # Flush the course logs so reverse user roles immediately updated
     &Apache::lonnet::flushcourselogs();
-    if (!$rolechanges) {
+    if (@rolechanges == 0) {
         $r->print(&mt('No roles to modify'));
     }
-    return $rolechanges;
+    return @rolechanges;
 }
 
 sub enroll_single_student {
-    my ($r,$uhome,$amode,$genpwd,$now,$newuser) = @_;
+    my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context) = @_;
     $r->print('<h3>'.&mt('Enrolling Student').'</h3>');
 
     # Remove non alphanumeric values from section
@@ -2275,7 +2350,7 @@ sub enroll_single_student {
             $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'});
+            $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 '') {
@@ -2475,7 +2550,8 @@ sub custom_role_editor {
       {href=>"javascript:backPage(document.form1,'','')",
          text=>"Edit custom role",
          faq=>282,bug=>'Instructor Interface',});
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                  'Course_Editing_Custom_Roles'));
 
     $r->print($body_top);
     my %lt=&Apache::lonlocal::texthash(
@@ -2483,7 +2559,7 @@ sub custom_role_editor {
 		    'crl'  => "Course Level",
                     'dml'  => "Domain Level",
                     'ssl'  => "System Level");
-    $r->print('Select a Template<br />');
+    $r->print(&mt('Select a Template').'<br />');
     $r->print('<form action="">');
     $r->print($button_code);
     $r->print('</form>');
@@ -2615,7 +2691,8 @@ sub set_custom_role {
          {href=>"javascript:backPage(document.customresult,'set_custom_roles','')",
           text=>"Result",
           faq=>282,bug=>'Instructor Interface',});
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                  'Course_Editing_Custom_Roles'));
 
     my ($rdummy,$roledef)=
 	&Apache::lonnet::get('roles',["rolesdef_$rolename"]);
@@ -2692,7 +2769,8 @@ sub handler {
         $context = 'domain';
     }
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-        ['action','state','callingform','roletype','showrole','bulkaction']);
+        ['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
@@ -2723,7 +2801,7 @@ sub handler {
             ({href=>'/adm/createuser?action=upload&state=',
               text=>"Upload Users List"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('Upload Users List',
-                                                   'User_Management_Upload'));
+                                                   'Course_Create_Class_List'));
         $r->print('<form name="studentform" method="post" '.
                   'enctype="multipart/form-data" '.
                   ' action="/adm/createuser">'."\n");
@@ -2749,7 +2827,6 @@ sub handler {
 	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') {
@@ -2772,14 +2849,8 @@ sub handler {
                     $currstate = $env{'form.currstate'};
                 }
                 if ($currstate eq 'select') {
-                    my $operation; 
-                    if ($env{'form.action'} eq 'singleuser') {
-                        $operation = 'createuser';
-                    } elsif ($env{'form.action'} eq 'singlestudent') {
-                        $operation = 'enrollstudent';
-                    }
                     &print_user_selection_page($r,$response,$srch,$results,
-                                               $operation,\@search,$context);
+                                               \@search,$context);
                 } elsif ($currstate eq 'modify') {
                     my ($ccuname,$ccdomain);
                     if (($srch->{'srchby'} eq 'uname') && 
@@ -2801,6 +2872,7 @@ sub handler {
                 } elsif ($currstate eq 'query') {
                     &print_user_query_page($r,'createuser');
                 } else {
+                    $env{'form.phase'} = '';
                     &print_username_entry_form($r,$context,$response,$srch,
                                                $forcenewuser);
                 }
@@ -2833,13 +2905,13 @@ sub handler {
             my $choice = $env{'form.bulkaction'};
             $r->print(&header());
             $r->print(&Apache::lonhtmlcommon::breadcrumbs("Update Users",
-                                                          'User_Management_List'));
+                                                          'Course_View_Class_List'));
             if ($permission->{'cusr'}) {
                 &Apache::lonuserutils::update_user_list($r,$context,$setting,$choice);
-                $r->print('<p><a href="/adm/createuser?action=listusers">'.&mt('Display User Lists').'</a>');
                 $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 {
@@ -2865,7 +2937,7 @@ sub handler {
                 $r->print(&header(&add_script(&verify_user_display())));
             }
             $r->print(&Apache::lonhtmlcommon::breadcrumbs("List Users",
-                                                          'User_Management_List'));
+                                                          'Course_View_Class_List'));
             &Apache::lonuserutils::print_userlist($r,undef,$permission,$context,
                          $formname,$totcodes,$codetitles,$idlist,$idlist_titles);
             $r->print(&Apache::loncommon::end_page());
@@ -2901,6 +2973,34 @@ sub handler {
                      '<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'));
+
+            &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'));
+            &update_selfenroll_config($r,$context);
+        }
+        $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'));
@@ -2965,24 +3065,24 @@ sub print_main_menu {
     my @menu =
         (
           { text => $links{$context}{'upload'},
-            help => 'User_Management_Upload',
+            help => 'Course_Create_Class_List',
             action => 'upload',
             permission => $permission->{'cusr'},
             },
           { text => $links{$context}{'singleuser'}, 
-            help => 'User_Management_Single_User',
+            help => 'Course_Change_Privileges',
             action => 'singleuser',
             permission => $permission->{'cusr'},
             },
           { text => $links{$context}{'listusers'},
-            help => 'User_Management_List',
+            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 => 'Custom_Role_Edit',
+                            help => 'Course_Editing_Custom_Roles',
                             action => 'custom',
                             permission => $permission->{'custom'},
                           };
@@ -2993,7 +3093,7 @@ sub print_main_menu {
         my @courselinks =
             (
               { text => 'Enroll a Single Student',
-                 help => 'Course_Single_Student',
+                 help => 'Course_Add_Student',
                  action => 'singlestudent',
                  permission => $permission->{'cusr'},
                  },
@@ -3005,16 +3105,32 @@ sub print_main_menu {
         if (!exists($permission->{'cusr_section'})) {
             push(@courselinks,
                { text => 'Automated Student 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 Log-in History',
+                 help => 'Course_User_Logins',
+                 action => 'logins',
+                 permission => $permission->{'cusr'},
+               },
+               { text => 'View Change Logs',
+                 help => 'Course_User_Logs',
+                 action => 'changelogs',
+                 permission => $permission->{'cusr'},
                });
         push(@menu,@courselinks);
     }
@@ -3022,6 +3138,10 @@ sub print_main_menu {
     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'}">};
@@ -3030,10 +3150,6 @@ sub print_main_menu {
                 qq{<a href="/adm/createuser?action=$menu_item->{'action'}">};
         }
         $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
-        if (exists($menu_item->{'help'})) {
-            $menu_html.=
-                &Apache::loncommon::help_open_topic($menu_item->{'help'});
-        }
         $menu_html.='</p>';
     }
     return $menu_html;
@@ -3050,6 +3166,355 @@ sub restore_prev_selections {
 					 \%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 $output = '<script type="text/javascript">'."\n".
+                 $setsec_js."\n".
+                 '</script>'."\n".
+                 '<h3>'.$lt->{'selfenroll'}.'</h3>'."\n".
+                 '<form name="'.$formname.'" method="post">'."\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'};
+                $output .= '<input type="text" name="selfenroll_types" value="'.$curr_types.'" size="50" />';
+            } 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="registered" value="0"'.$regoff.'/>'.
+                           &mt('No').'</label>&nbsp;&nbsp;<label>'.
+                           '<input type="radio" name="registered" value="1"'.$regon.'/>'.
+                           &mt('Yes').'</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 $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                my $cnum = $env{'course.'.$env{'request.course.id'},'.num'};
+                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="setSections(this.form);" /></form>';
+    $r->print($output);
+    return;
+}
+
+sub selfenroll_date_forms {
+    my ($startform,$endform) = @_;
+    my $output .= &Apache::lonhtmlcommon::start_pick_box()."\n".
+                  &Apache::lonhtmlcommon::row_title(&mt('Starts'),
+                                                    'LC_oddrow_value')."\n".
+                  $startform."\n".
+                  &Apache::lonhtmlcommon::row_closure(1).
+                  &Apache::lonhtmlcommon::row_title(&mt('Ends'),
+                                                   '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);
+    $r->print(&role_display_filter($formname,$cdom,$cnum,\%curr));
+    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);
+    my $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) = @_;
+    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><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) = @_;
@@ -3291,11 +3756,15 @@ sub directorysrch_check {
                 my ($insttypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($srch->{'srchdomain'});
                 my @longtypes; 
                 foreach my $item (@usertypes) {
-                    push (@longtypes,$insttypes->{$item});
+                    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;
         }
@@ -3416,7 +3885,7 @@ sub build_search_response {
                     &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 />';
+                    $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 />';
@@ -3561,48 +4030,49 @@ $table.
 
 sub course_level_row {
     my ($protectedcourse,$role,$area,$domain,$plrole,$sections_count,$lt) = @_;
-    my $table = &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";
+    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') {
-        $table .= '<td>&nbsp</td>';
+        $row .= '<td>&nbsp;</td>';
     } elsif ($env{'request.course.sec'} ne '') {
-        $table .= ' <td><input type="hidden" value="'.
-                  $env{'request.course.sec'}.'" '.
-                  'name="sec_'.$protectedcourse.'_'.$role.'" />'.
-                  $env{'request.course.sec'}.'</td>';
+        $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);
-            $table .= '<td><table class="LC_createuser">'.
-                      '<tr class="LC_section_row">
-                        <td valign="top">'.$lt->{'exs'}.'<br />'.
-                        $currsec.'</td>
-                        <td>&nbsp;&nbsp;</td>
-                        <td valign="top">&nbsp;'.$lt->{'new'}.'<br />'.
+            $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>';
+                     '</tr></table></td>'."\n";
         } else {
-            $table .= '<td><input type="text" size="10" '.
-                      'name="sec_'.$protectedcourse.'_'.$role.'" /></td>';
+            $row .= '<td><input type="text" size="10" '.
+                      'name="sec_'.$protectedcourse.'_'.$role.'" /></td>'."\n";
         }
     }
-    $table .= <<ENDTIMEENTRY;
-<td><input type="hidden" name="start_$protectedcourse\_$role" value='' />
+    $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='' />
+<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
-    $table.= &Apache::loncommon::end_data_table_row();
+    $row .= &Apache::loncommon::end_data_table_row();
+    return $row;
 }
 
 sub course_level_dc {
@@ -3651,7 +4121,7 @@ sub course_level_dc {
                      '<td>&nbsp;&nbsp;</td>'.
                      '<td valign="top">&nbsp;<b>'.$lt{'new'}.'</b><br />'.
                      '<input type="text" name="newsec" value="" />'.
-                     '<input type="hidden" name="sections" value="" />'.
+                     '<input type="hidden" name="section" value="" />'.
                      '<input type="hidden" name="groups" value="" /></td>'.
                      '</tr></table></td>';
     $otheritems .= <<ENDTIMEENTRY;
@@ -3667,6 +4137,144 @@ ENDTIMEENTRY
     return $cb_jscript.$header.$hiddenitems.$otheritems;
 }
 
+sub update_selfenroll_config {
+    my ($r,$context) = @_;
+    my ($row,$lt) = &get_selfenroll_titles();
+    my $groupslist = &Apache::lonuserutils::get_groupslist();
+    my (%changes,%warning);
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    $r->print('<h3>'.$lt->{'selfenroll'}.'</h3>'."\n");
+    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};
+                    }
+                }
+            } 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 (grep(/^\Q$newval\E$/,keys(%{$groupslist}))) {
+                        $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})) {
+                            $r->print('<li>'.&mt('[_1] set to "[_2]".',$title,
+                                      $changes{'internal.selfenroll_'.$item}).'</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 needed to the existing self-enrollment settings in this course.'));
+        }
+    } else {
+        $r->print(&mt('No changes were needed to the existing self-enrollment settings in this course.'));
+    }
+    return;
+}
+
+sub get_selfenroll_titles {
+    my @row = ('types','registered','enroll_dates','access_dates','section');
+    my %lt = &Apache::lonlocal::texthash (
+                selfenroll   => 'Self-enrollment with a student role',
+                types        => 'Users allowed to self-enroll in this course',
+                registered   => 'Restrict self-enrollment to registered students?',
+                enroll_dates => 'Dates self-enrollment available',
+                access_dates => 'Access dates for self-enrolled users',
+                section      => 'Section',
+             );
+    return (\@row,\%lt);
+}
+
 #---------------------------------------------- end functions for &phase_two
 
 #--------------------------------- functions for &phase_two and &phase_three