--- loncom/interface/loncreateuser.pm	2012/02/06 04:50:52	1.358.4.1
+++ loncom/interface/loncreateuser.pm	2012/04/25 21:22:01	1.360
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.358.4.1 2012/02/06 04:50:52 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.360 2012/04/25 21:22:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -674,7 +674,7 @@ $userpicker
 ENDBLOCK
     if ($env{'form.phase'} eq '') {
         my $defdom=$env{'request.role.domain'};
-        my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain','',1);
+        my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
         my %lt=&Apache::lonlocal::texthash(
                   'enro' => 'Enroll one student',
                   'enrm' => 'Enroll one member',
@@ -723,7 +723,7 @@ $showresponse
 <table>
  <tr>
   <td>$lt{'usr'}:</td>
-  <td><input type="text" size="25" name="srchterm" /></td>
+  <td><input type="text" size="15" name="srchterm" /></td>
   <td>&nbsp;$lt{'dom'}:</td><td>$domform</td>
   <td>&nbsp;$sellink&nbsp;</td>
   <td>&nbsp;<input name="userrole" type="submit" value="$buttontext" /></td>
@@ -742,19 +742,13 @@ sub user_modification_js {
 <script type="text/javascript" language="Javascript">
 // <![CDATA[
 
-    function pclose() {
-        parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
-        parmwin.close();
-    }
-
     $pjump_def
     $dc_setcourse_code
 
     function dateset() {
         eval("document.cu."+document.cu.pres_marker.value+
             ".value=document.cu.pres_value.value");
-        pclose();
+        modalWindow.close();
     }
 
     $nondc_setsection_code
@@ -938,18 +932,12 @@ sub print_user_modification_page {
     my (%rulematch,%inst_results,$newuser,%alerts,%curr_rules,%got_rules);
     my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
     if ($uhome eq 'no_host') {
-        my $lc_ccuname = lc($ccuname);
-        if ($lc_ccuname ne $ccuname) {
-            $uhome = &Apache::lonnet::homeserver($lc_ccuname,$ccdomain);
-            $ccuname = $lc_ccuname;
-        }
-    }
-    if ($uhome eq 'no_host') {
+        my $usertype;
         my ($rules,$ruleorder) =
             &Apache::lonnet::inst_userrules($ccdomain,'username');
-        my $usertype =
-            &Apache::lonuserutils::check_usertype($ccdomain,$ccuname,$rules,
-                                                  \%curr_rules,\%got_rules);
+            $usertype =
+                &Apache::lonuserutils::check_usertype($ccdomain,$ccuname,$rules,
+                                                       \%curr_rules,\%got_rules);
         my $cancreate =
             &Apache::lonuserutils::can_create_user($ccdomain,$context,
                                                    $usertype);
@@ -1477,8 +1465,7 @@ sub display_existing_roles {
             $rolesdump{$newkey} = $newvalue;
         }
     } else {
-        my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1});
-        %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname,'.',undef,$extra);
+        %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname);
     }
     # Build up table of user roles to allow revocation and re-enabling of roles.
     my ($tmp) = keys(%rolesdump);
@@ -4106,9 +4093,7 @@ sub handler {
             if ($env{'form.phase'} eq 'createnewuser') {
                 my $response;
                 if ($env{'form.srchterm'} !~ /^$match_username$/) {
-                    my $response = '<p class="LC_warning">'.
-                                   &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @').
-                                   '</p>';
+                    my $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @');
                     $env{'form.phase'} = '';
                     &print_username_entry_form($r,$context,$response,$srch,undef,$crstype,$brcrum);
                 } else {
@@ -5622,9 +5607,7 @@ sub user_search_result {
     if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'instd')) {
         if (($srch->{'srchdomain'} eq '') || 
 	    ! (&Apache::lonnet::domain($srch->{'srchdomain'}))) {
-            $response = '<p class="LC_warning">'.
-                        &mt('You must specify a valid domain when searching in a domain or institutional directory.').
-                        '</p>';
+            $response = &mt('You must specify a valid domain when searching in a domain or institutional directory.')
         }
     }
     if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'crs') ||
@@ -5637,9 +5620,7 @@ sub user_search_result {
                 }
             }
             if ($unamecheck !~ /^$match_username$/) {
-                $response = '<p class="LC_warning">'.
-                            &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @').
-                            '</p>';
+                $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @');
             }
         }
     }
@@ -5814,8 +5795,7 @@ sub user_search_result {
                 ($currstate,$response,$forcenewuser) = 
                     &build_search_response($context,$srch,%srch_results);
             } else {
-                my $showdom = &display_domain_info($srch->{'srchdomain'});
-                $response = '<span class="LC_warning">'.
+                my $showdom = &display_domain_info($srch->{'srchdomain'});                $response = '<span class="LC_warning">'.
                     &mt('Institutional directory search is not available in domain: [_1]',$showdom).
                     '</span><br />'.
                     &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').