--- loncom/interface/loncreateuser.pm	2007/12/31 01:58:17	1.225
+++ loncom/interface/loncreateuser.pm	2008/02/22 05:05:57	1.235
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.225 2007/12/31 01:58:17 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.235 2008/02/22 05:05:57 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,7 +231,7 @@ 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 $helpitem = 'Course_Change_Privileges';
@@ -245,21 +246,14 @@ sub print_username_entry_form {
     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 $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','/')) {
@@ -274,12 +268,12 @@ $lt{'nr'}: $choice <input type="text" si
 ENDCUSTOM
         }
     } else {
-        my $actiontext = $lt{'mod'};
+        my $actiontext = $lt{'srad'};
         if ($env{'form.action'} eq 'singlestudent') {
-            $actiontext = $lt{'enrl'};
+            $actiontext = $lt{'srst'};
         }
         $r->print("
-<h3>$lt{'srch'} $sellink $actiontext</h3>");
+<h3>$actiontext</h3>");
         if ($env{'form.origform'} ne 'crtusername') {
             $r->print("\n".$response);
         }
@@ -291,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') &&
@@ -301,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 =
@@ -309,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'}" />
@@ -317,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>
@@ -381,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'};
 
@@ -416,27 +440,22 @@ 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',});
+
+    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',});
+    } elsif ($env{'form.action'} eq 'singlestudent') {
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
                                                       'Course_Add_Student'));
         $r->print($jscript."<b>$lt{'stusrch'}</b><br />");
@@ -515,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;
@@ -571,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 = '';
@@ -607,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)",
@@ -654,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',
@@ -775,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
@@ -840,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");
                 }
@@ -867,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',
     }
@@ -897,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;
 }
 
@@ -1241,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
@@ -1268,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">
@@ -1289,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)) {
@@ -1333,6 +1321,7 @@ ENDBADAUTH
                 $outcome .= <<ENDNOPRIV;
 <h3>$lt{'ccld'}</h3>
 $lt{'yodo'} $lt{'ifch'}: $ccdomain
+<input type="hidden" name="login" value="nochange" />
 ENDNOPRIV
             }
         }
@@ -1501,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'},
@@ -1651,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') &&
@@ -2029,6 +2045,7 @@ END
     }
     if ($env{'form.action'} eq 'singlestudent') {
         &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser);
+        $r->print('<p><a href="javascript:backPage(document.userupdate)">'.                  &mt('Enroll Another Student').'</a></p>');
     } else {
         my @rolechanges = &update_roles($r);
         if ($namechanged) {
@@ -2046,6 +2063,13 @@ END
                 }
             }
         }
+        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());
 }
@@ -2742,7 +2766,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
@@ -2799,7 +2824,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') {
@@ -2822,14 +2846,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') && 
@@ -2851,6 +2869,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);
                 }
@@ -3055,6 +3074,7 @@ 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',
@@ -3072,6 +3092,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'}">};
@@ -3080,10 +3104,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;
@@ -3341,11 +3361,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;
         }
@@ -3466,7 +3490,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 />';