--- loncom/interface/loncreateuser.pm	2008/06/03 01:13:27	1.241
+++ loncom/interface/loncreateuser.pm	2008/06/23 14:13:50	1.244
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.241 2008/06/03 01:13:27 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.244 2008/06/23 14:13:50 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3105,7 +3105,7 @@ sub print_main_menu {
               });
         if (!exists($permission->{'cusr_section'})) {
             push(@courselinks,
-               { text => 'Automated Student Enrollment Manager',
+               { text => 'Automated Enrollment Manager',
                  help => 'Course_Automated_Enrollment',
                  permission => (&Apache::lonnet::auto_run($cnum,$cdom)
                                 && $permission->{'cusr'}),
@@ -3245,7 +3245,7 @@ sub print_selfenroll_menu {
                 }
                 my $add_domtitle = &mt('Additional domain:');
                 if ($curr_types eq '*') { 
-                    $add_domtitle = &mt('Specific Domain:');
+                    $add_domtitle = &mt('Specific domain:');
                 } elsif ($curr_types eq '') {
                     $add_domtitle = &mt('Other domain:');
                 }
@@ -3266,10 +3266,10 @@ sub print_selfenroll_menu {
                     $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>';
+                           &mt('Yes').'</label>&nbsp;&nbsp;<label>'.
+                           '<input type="radio" name="registered" value="0"'.$regoff.'/>'.
+                           &mt('No').'</label>';
             } elsif ($item eq 'enroll_dates') {
                 my $starttime = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_start_date'};
                 my $endtime = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_end_date'};
@@ -3396,11 +3396,11 @@ sub selfenroll_inst_types {
 sub selfenroll_date_forms {
     my ($startform,$endform) = @_;
     my $output .= &Apache::lonhtmlcommon::start_pick_box()."\n".
-                  &Apache::lonhtmlcommon::row_title(&mt('Starts'),
+                  &Apache::lonhtmlcommon::row_title(&mt('Start date'),
                                                     'LC_oddrow_value')."\n".
                   $startform."\n".
                   &Apache::lonhtmlcommon::row_closure(1).
-                  &Apache::lonhtmlcommon::row_title(&mt('Ends'),
+                  &Apache::lonhtmlcommon::row_title(&mt('End date'),
                                                    'LC_oddrow_value')."\n".
                   $endform."\n".
                   &Apache::lonhtmlcommon::row_closure(1).
@@ -3669,7 +3669,13 @@ sub user_search_result {
     if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'crs') ||
         ($srch->{'srchin'} eq 'alc')) {
         if ($srch->{'srchby'} eq 'uname') {
-            if ($srch->{'srchterm'} !~ /^$match_username$/) {
+            my $unamecheck = $srch->{'srchterm'};
+            if ($srch->{'srchtype'} eq 'contains') {
+                if ($unamecheck !~ /^\w/) {
+                    $unamecheck = 'a'.$unamecheck; 
+                }
+            }
+            if ($unamecheck !~ /^$match_username$/) {
                 $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @');
             }
         }
@@ -4381,7 +4387,7 @@ sub update_selfenroll_config {
                         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]".',
+                                $r->print('<li>'.&mt('[_1]: "[_2]" set to "[_3]".',
                                           $title,$type,$newdate).'</li>');
                             }
                         }
@@ -4389,7 +4395,7 @@ sub update_selfenroll_config {
                         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]".',
+                                $r->print('<li>'.&mt('[_1]: "[_2]" set to "[_3]".',
                                           $title,$type,$newdate).'</li>');
                             }
                         }
@@ -4403,7 +4409,7 @@ sub update_selfenroll_config {
                                     $newval = &mt('Any user in any domain');
                                 }
                             }
-                            $r->print('<li>'.&mt('[_1] set to "[_2]".',$title,$newval).'</li>'."\n");
+                            $r->print('<li>'.&mt('"[_1]" set to "[_2]".',$title,$newval).'</li>'."\n");
                         }
                     }
                 }
@@ -4432,9 +4438,9 @@ sub get_selfenroll_titles {
     my @row = ('types','registered','enroll_dates','access_dates','section');
     my %lt = &Apache::lonlocal::texthash (
                 types        => 'Users allowed to self-enroll in this course',
-                registered   => 'Restrict self-enrollment to registered students?',
+                registered   => 'Restrict self-enrollment to registered students',
                 enroll_dates => 'Dates self-enrollment available',
-                access_dates => 'Access dates for self-enrolled users',
+                access_dates => 'Course access dates for self-enrolled users',
                 section      => 'Section assigned to self-enrolled users',
              );
     return (\@row,\%lt);