--- loncom/interface/loncreateuser.pm 2009/08/11 00:39:45 1.307 +++ loncom/interface/loncreateuser.pm 2009/08/27 13:00:59 1.310 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.307 2009/08/11 00:39:45 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.310 2009/08/27 13:00:59 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -236,7 +236,7 @@ sub build_tools_display { 'requestcourses.official','requestcourses.unofficial', 'requestcourses.community'); @usertools = ('official','unofficial','community'); - @options =('norequest','approve','autolimit','validate'); + @options =('norequest','approval','autolimit','validate'); %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain); %reqtitles = &courserequest_titles(); %reqdisplay = &courserequest_display(); @@ -371,7 +371,7 @@ sub coursereq_externaluser { 'reqcrsotherdom.official','reqcrsotherdom.unofficial', 'reqcrsotherdom.community'); @usertools = ('official','unofficial','community'); - @options = ('approve','validate','autolimit'); + @options = ('approval','validate','autolimit'); %validations = &Apache::lonnet::auto_courserequest_checks($cdom); my $optregex = join('|',@options); my %reqtitles = &courserequest_titles(); @@ -432,7 +432,7 @@ sub courserequest_titles { unofficial => 'Unofficial', community => 'Communities', norequest => 'Not allowed', - approve => 'Approval by Dom. Coord.', + approval => 'Approval by Dom. Coord.', validate => 'With validation', autolimit => 'Numerical limit', ); @@ -441,7 +441,7 @@ sub courserequest_titles { sub courserequest_display { my %titles = &Apache::lonlocal::texthash ( - approve => 'Yes, need approval', + approval => 'Yes, need approval', validate => 'Yes, with validation', norequest => 'No', ); @@ -2810,7 +2810,7 @@ sub tool_changes { return; } if ($context eq 'reqcrsotherdom') { - my @options = ('approve','validate','autolimit'); + my @options = ('approval','validate','autolimit'); my $optregex = join('|',@options); my %reqdisplay = &courserequest_display(); my $cdom = $env{'request.role.domain'}; @@ -5235,6 +5235,15 @@ sub user_search_result { &build_search_response($context,$srch,%srch_results); } else { $currstate = 'modify'; + my $uname = $srch->{'srchterm'}; + my $udom = $srch->{'srchdomain'}; + $srch_results{$uname.':'.$udom} = + { &Apache::lonnet::get('environment', + ['firstname', + 'lastname', + 'permanentemail'], + $udom,$uname) + }; } } else { %srch_results = &Apache::lonnet::usersearch($srch); @@ -6071,7 +6080,7 @@ sub update_selfenroll_config { if ($currlimit eq 'allstudents') { $newval = &mt('New self-enrollment no longer allowed when total (all students) reaches [_1].',$newcap); } elsif ($changes{'internal.selfenroll_limit'} eq 'selfenrolled') { - $newval = &mt('New self-enrollment no longer allowed when total umber of self-enrolled students reaches [_1].',$newcap); + $newval = &mt('New self-enrollment no longer allowed when total number of self-enrolled students reaches [_1].',$newcap); } } $r->print('
  • '.&mt('"[_1]" set to "[_2]".',$title,$newval).'
  • '."\n");