--- loncom/interface/loncreateuser.pm 2009/08/14 14:21:00 1.295.2.4 +++ loncom/interface/loncreateuser.pm 2009/08/14 15:02:09 1.295.2.6 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.295.2.4 2009/08/14 14:21:00 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.295.2.6 2009/08/14 15:02:09 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -246,13 +246,15 @@ sub build_tools_display { &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef, $context); if ($userenv{$context.'.'.$item} eq '') { - $custom_access = 'default'; + $custom_access = + &mt('Availability determined currently from default setting.'); if (!$curr_access) { $tool_off = 'checked="checked" '; $tool_on = ''; } } else { - $custom_access = 'custom'; + $custom_access = + &mt('Availability determined currently from custom setting.'); $cust_on = ' checked="checked" '; $cust_off = ''; if ($userenv{$context.'.'.$item} == 0) { @@ -264,8 +266,7 @@ sub build_tools_display { ' '.$lt{$item}.''."\n". ' '."\n". &Apache::loncommon::start_data_table_row()."\n". - ' '.&mt('Availability determined currently from [_1] setting.',$custom_access). - '     '.$lt{'avai'}.': '. + ' '.$custom_access.(' 'x5).$lt{'avai'}.': '. ($curr_access?&mt('Yes'):&mt('No')).''."\n". &Apache::loncommon::end_data_table_row()."\n". &Apache::loncommon::start_data_table_row()."\n". @@ -879,6 +880,13 @@ $lt{'hs'}: $home_server_pick } else { $r->print($home_server_pick); } + if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { + $r->print('

'.&mt('User Can Request Creation of Courses in this Domain?').'

'. + &Apache::loncommon::start_data_table(). + &build_tools_display($ccuname,$ccdomain, + 'requestcourses'). + &Apache::loncommon::end_data_table()); + } $r->print(''."\n".'

'. $lt{'lg'}.'

'); my ($fixedauth,$varauth,$authmsg); @@ -5568,17 +5576,29 @@ sub build_search_response { $response .= '
'.&mt('You may want to broaden your search to the selected LON-CAPA domain.'); } } - if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $env{'request.role.domain'})) { + my $createdom = $env{'request.role.domain'}; + if ($context eq 'requestcrs') { + if ($env{'form.coursedom'} ne '') { + $createdom = $env{'form.coursedom'}; + } + } + + if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $createdom)) { my $cancreate = - &Apache::lonuserutils::can_create_user($env{'request.role.domain'},$context); + &Apache::lonuserutils::can_create_user($cretedom,$context); + my $targetdom = ''.$createdom.'' if ($cancreate) { - my $showdom = &display_domain_info($env{'request.role.domain'}); + my $showdom = &display_domain_info($createdom); $response .= '

' .''.&mt('To add a new user:').'' - .'
' - .&mt("(You can only create new users in your current role's domain - [_1])" - ,''.$env{'request.role.domain'}.'') - .'