--- loncom/interface/loncreateuser.pm 2008/06/03 01:13:27 1.241 +++ loncom/interface/loncreateuser.pm 2008/07/02 16:08:21 1.246 @@ -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.246 2008/07/02 16:08:21 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2069,7 +2069,10 @@ END if ($env{'form.popup'}) { $r->print('
'); } else { - $r->print(''.&mt('Modify this user: ([_1])',$userinfo).''.(' 'x5).''.&mt('Create/Modify Another User').'
'); + $r->print('' + .&mt('Modify this user: [_1]',''.$env{'form.ccuname'}.':'.$env{'form.ccdomain'}.' ('.$userinfo.')').'' + .(' 'x5).'' + .&mt('Create/Modify Another User').'
'); } } $r->print(&Apache::loncommon::end_page()); @@ -3105,7 +3108,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 +3248,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 +3269,10 @@ sub print_selfenroll_menu { $regoff = ' checked="checked" '; } $output .= ' '; + ''. + &mt('Yes').' '; } 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 +3399,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 +3672,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 +4390,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('