version 1.295.2.9, 2009/08/19 19:05:03
|
version 1.295.2.13, 2009/09/07 13:23:23
|
Line 110 sub initialize_authen_forms {
|
Line 110 sub initialize_authen_forms {
|
|
|
sub auth_abbrev { |
sub auth_abbrev { |
my %abv_auth = ( |
my %abv_auth = ( |
|
krb5 => 'krb', |
krb4 => 'krb', |
krb4 => 'krb', |
internal => 'int', |
internal => 'int', |
localuth => 'loc', |
localuth => 'loc', |
Line 234 sub build_tools_display {
|
Line 235 sub build_tools_display {
|
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, |
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, |
'requestcourses.official','requestcourses.unofficial'); |
'requestcourses.official','requestcourses.unofficial'); |
@usertools = ('official','unofficial'); |
@usertools = ('official','unofficial'); |
@options =('norequest','approve','autolimit','validate'); |
@options =('norequest','approval','autolimit','validate'); |
%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain); |
%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain); |
%reqtitles = &courserequest_titles(); |
%reqtitles = &courserequest_titles(); |
%reqdisplay = &courserequest_display(); |
%reqdisplay = &courserequest_display(); |
Line 369 sub coursereq_externaluser {
|
Line 370 sub coursereq_externaluser {
|
'reqcrsotherdom.official','reqcrsotherdom.unofficial', |
'reqcrsotherdom.official','reqcrsotherdom.unofficial', |
'reqcrsotherdom.community'); |
'reqcrsotherdom.community'); |
@usertools = ('official','unofficial','community'); |
@usertools = ('official','unofficial','community'); |
@options = ('approve','validate','autolimit'); |
@options = ('approval','validate','autolimit'); |
%validations = &Apache::lonnet::auto_courserequest_checks($cdom); |
%validations = &Apache::lonnet::auto_courserequest_checks($cdom); |
my $optregex = join('|',@options); |
my $optregex = join('|',@options); |
my %reqtitles = &courserequest_titles(); |
my %reqtitles = &courserequest_titles(); |
Line 430 sub courserequest_titles {
|
Line 431 sub courserequest_titles {
|
unofficial => 'Unofficial', |
unofficial => 'Unofficial', |
community => 'Communities', |
community => 'Communities', |
norequest => 'Not allowed', |
norequest => 'Not allowed', |
approve => 'Approval by Dom. Coord.', |
approval => 'Approval by Dom. Coord.', |
validate => 'With validation', |
validate => 'With validation', |
autolimit => 'Numerical limit', |
autolimit => 'Numerical limit', |
); |
); |
Line 439 sub courserequest_titles {
|
Line 440 sub courserequest_titles {
|
|
|
sub courserequest_display { |
sub courserequest_display { |
my %titles = &Apache::lonlocal::texthash ( |
my %titles = &Apache::lonlocal::texthash ( |
approve => 'Yes, need approval', |
approval => 'Yes, need approval', |
validate => 'Yes, with validation', |
validate => 'Yes, with validation', |
norequest => 'No', |
norequest => 'No', |
); |
); |
Line 1556 sub new_domain_roles {
|
Line 1557 sub new_domain_roles {
|
&mt('Extent').'</th>'. |
&mt('Extent').'</th>'. |
'<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'. |
'<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'. |
&Apache::loncommon::end_data_table_header_row(); |
&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 $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)) { |
if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) { |
my $plrole=&Apache::lonnet::plaintext($role); |
my $plrole=&Apache::lonnet::plaintext($role); |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
Line 2805 sub tool_changes {
|
Line 2808 sub tool_changes {
|
return; |
return; |
} |
} |
if ($context eq 'reqcrsotherdom') { |
if ($context eq 'reqcrsotherdom') { |
my @options = ('approve','validate','autolimit'); |
my @options = ('approval','validate','autolimit'); |
my $optregex = join('|',@options); |
my $optregex = join('|',@options); |
my %reqdisplay = &courserequest_display(); |
my %reqdisplay = &courserequest_display(); |
my $cdom = $env{'request.role.domain'}; |
my $cdom = $env{'request.role.domain'}; |
Line 5045 sub rolechg_contexts {
|
Line 5048 sub rolechg_contexts {
|
createcourse => 'Course Creation', |
createcourse => 'Course Creation', |
course => 'User Management in course', |
course => 'User Management in course', |
domain => 'User Management in domain', |
domain => 'User Management in domain', |
selfenroll => 'Self-enrolled', |
selfenroll => 'Self-enrolled', |
|
requestcourses => 'Course Request', |
); |
); |
return %lt; |
return %lt; |
} |
} |
Line 5130 sub user_search_result {
|
Line 5134 sub user_search_result {
|
&build_search_response($context,$srch,%srch_results); |
&build_search_response($context,$srch,%srch_results); |
} else { |
} else { |
$currstate = 'modify'; |
$currstate = 'modify'; |
|
my $uname = $srch->{'srchterm'}; |
|
my $udom = $srch->{'srchdomain'}; |
|
$srch_results{$uname.':'.$udom} = |
|
{ &Apache::lonnet::get('environment', |
|
['firstname', |
|
'lastname', |
|
'permanentemail'], |
|
$udom,$uname) |
|
}; |
} |
} |
} else { |
} else { |
%srch_results = &Apache::lonnet::usersearch($srch); |
%srch_results = &Apache::lonnet::usersearch($srch); |