--- loncom/interface/loncreateuser.pm 2009/08/14 16:43:32 1.295.2.7
+++ loncom/interface/loncreateuser.pm 2009/09/07 13:23:23 1.295.2.13
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.295.2.7 2009/08/14 16:43:32 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.295.2.13 2009/09/07 13:23:23 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -110,6 +110,7 @@ sub initialize_authen_forms {
sub auth_abbrev {
my %abv_auth = (
+ krb5 => 'krb',
krb4 => 'krb',
internal => 'int',
localuth => 'loc',
@@ -234,7 +235,7 @@ sub build_tools_display {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'requestcourses.official','requestcourses.unofficial');
@usertools = ('official','unofficial');
- @options =('norequest','approve','autolimit','validate');
+ @options =('norequest','approval','autolimit','validate');
%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
%reqtitles = &courserequest_titles();
%reqdisplay = &courserequest_display();
@@ -369,7 +370,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();
@@ -430,7 +431,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',
);
@@ -439,7 +440,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',
);
@@ -1556,8 +1557,10 @@ sub new_domain_roles {
&mt('Extent').''.
'
'.&mt('Start').' | '.&mt('End').' | '.
&Apache::loncommon::end_data_table_header_row();
+ my @allroles = &Apache::lonuserutils::roles_by_context('domain');
foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) {
- foreach my $role ('dc','li','dg','au','sc') {
+ foreach my $role (@allroles) {
+ next if ($role eq 'ad');
if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) {
my $plrole=&Apache::lonnet::plaintext($role);
my %lt=&Apache::lonlocal::texthash(
@@ -2805,7 +2808,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'};
@@ -3984,7 +3987,7 @@ sub add_script {
return ''."\n";
}
@@ -5045,7 +5048,8 @@ sub rolechg_contexts {
createcourse => 'Course Creation',
course => 'User Management in course',
domain => 'User Management in domain',
- selfenroll => 'Self-enrolled',
+ selfenroll => 'Self-enrolled',
+ requestcourses => 'Course Request',
);
return %lt;
}
@@ -5130,6 +5134,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);
@@ -5966,7 +5979,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");