--- loncom/interface/loncreateuser.pm 2009/02/17 16:53:37 1.281 +++ 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.281 2009/02/17 16:53:37 bisitz Exp $ +# $Id: loncreateuser.pm,v 1.295.2.13 2009/09/07 13:23:23 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -68,7 +68,7 @@ use Apache::loncommon; use Apache::lonlocal; use Apache::longroup; use Apache::lonuserutils; -use Apache::selfenroll(); +use Apache::loncoursequeueadmin; use LONCAPA qw(:DEFAULT :match); my $loginscript; # piece of javascript used in two separate instances @@ -110,6 +110,7 @@ sub initialize_authen_forms { sub auth_abbrev { my %abv_auth = ( + krb5 => 'krb', krb4 => 'krb', internal => 'int', localuth => 'loc', @@ -143,6 +144,7 @@ sub portfolio_quota { $custom_off = ' checked="checked" '; my $quota_javascript = <<"END_SCRIPT"; END_SCRIPT if ($quotatype eq 'custom') { @@ -214,7 +217,8 @@ END_SCRIPT sub build_tools_display { my ($ccuname,$ccdomain,$context) = @_; - my (@usertools,%userenv,$output); + my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay, + $colspan); my %lt = &Apache::lonlocal::texthash ( 'blog' => "Personal User Blog", 'aboutme' => "Personal Information Page", @@ -231,57 +235,218 @@ sub build_tools_display { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'requestcourses.official','requestcourses.unofficial'); @usertools = ('official','unofficial'); + @options =('norequest','approval','autolimit','validate'); + %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain); + %reqtitles = &courserequest_titles(); + %reqdisplay = &courserequest_display(); + $colspan = ' colspan="2"'; } else { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'tools.aboutme','tools.portfolio','tools.blog'); @usertools = ('aboutme','blog','portfolio'); } foreach my $item (@usertools) { - my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off); + my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off, + $currdisp,$custdisp,$custradio); $cust_off = 'checked="checked" '; $tool_on = 'checked="checked" '; $curr_access = &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef, $context); - if ($userenv{$context.'.'.$item} eq '') { - $custom_access = 'default'; - if (!$curr_access) { - $tool_off = 'checked="checked" '; - $tool_on = ''; - } - } else { - $custom_access = 'custom'; + if ($userenv{$context.'.'.$item} ne '') { $cust_on = ' checked="checked" '; $cust_off = ''; - if ($userenv{$context.'.'.$item} == 0) { - $tool_off = 'checked="checked" '; - $tool_on = ''; + } + if ($context eq 'requestcourses') { + if ($userenv{$context.'.'.$item} eq '') { + $custom_access = &mt('Currently from default setting.'); + } else { + $custom_access = &mt('Currently from custom setting.'); + } + } else { + if ($userenv{$context.'.'.$item} eq '') { + $custom_access = + &mt('Availability determined currently from default setting.'); + if (!$curr_access) { + $tool_off = 'checked="checked" '; + $tool_on = ''; + } + } else { + $custom_access = + &mt('Availability determined currently from custom setting.'); + if ($userenv{$context.'.'.$item} == 0) { + $tool_off = 'checked="checked" '; + $tool_on = ''; + } } } $output .= ' '."\n". - ' '.$lt{$item}.''."\n". + ' '.$lt{$item}.''."\n". ' '."\n". - &Apache::loncommon::start_data_table_row()."\n". - ' '.&mt('Availability determined currently from [_1] setting.',$custom_access). - '     '.$lt{'avai'}.': '. - ($curr_access?&mt('Yes'):&mt('No')).''."\n". + &Apache::loncommon::start_data_table_row()."\n"; + if ($context eq 'requestcourses') { + my ($curroption,$currlimit); + $curroption = $userenv{$context.'.'.$item}; + if (!$curroption) { + $curroption = 'norequest'; + } + if ($curroption =~ /^autolimit=(\d*)$/) { + $currlimit = $1; + $currdisp = &mt('Yes, up to [quant,_1,request]/user',$currlimit); + } else { + $currdisp = $reqdisplay{$curroption}; + } + $custdisp = ''; + foreach my $option (@options) { + my $val = $option; + if ($option eq 'norequest') { + $val = 0; + } + if ($option eq 'validate') { + my $canvalidate = 0; + if (ref($validations{$item}) eq 'HASH') { + if ($validations{$item}{'_custom_'}) { + $canvalidate = 1; + } + } + next if (!$canvalidate); + } + my $checked = ''; + if ($option eq $curroption) { + $checked = ' checked="checked"'; + } elsif ($option eq 'autolimit') { + if ($curroption =~ /^autolimit/) { + $checked = ' checked="checked"'; + } + } + $custdisp .= ''; + } + $custdisp .= '
 '; + if ($option eq 'autolimit') { + $custdisp .= ''; + } + $custdisp .= '
'; + $custradio = ''.&mt('Custom setting').'
'.$custdisp; + } else { + $currdisp = ($curr_access?&mt('Yes'):&mt('No')); + $custdisp = ' '; + $custradio = (' 'x2).'--'.$lt{'cusa'}.': '.$custdisp. + ''; + } + $output .= ' '.$custom_access.(' 'x4). + $lt{'avai'}.': '.$currdisp.''."\n". &Apache::loncommon::end_data_table_row()."\n". &Apache::loncommon::start_data_table_row()."\n". - ' '.$lt{'chse'}.': '.(' ' x3). + ''.$custradio.''. + &Apache::loncommon::end_data_table_row()."\n"; + } + return $output; +} + +sub coursereq_externaluser { + my ($ccuname,$ccdomain,$cdom) = @_; + my (@usertools,@options,%validations,%userenv,$output); + my %lt = &Apache::lonlocal::texthash ( + 'official' => 'Can request creation of official courses', + 'unofficial' => 'Can request creation of unofficial courses', + 'community' => 'Can request creation of communities', + ); + + %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, + 'reqcrsotherdom.official','reqcrsotherdom.unofficial', + 'reqcrsotherdom.community'); + @usertools = ('official','unofficial','community'); + @options = ('approval','validate','autolimit'); + %validations = &Apache::lonnet::auto_courserequest_checks($cdom); + my $optregex = join('|',@options); + my %reqtitles = &courserequest_titles(); + foreach my $item (@usertools) { + my ($curroption,$currlimit,$tooloff); + if ($userenv{'reqcrsotherdom.'.$item} ne '') { + my @curr = split(',',$userenv{'reqcrsotherdom.'.$item}); + if (grep(/^\Q$cdom\E:($optregex)=?(\d*)$/,@curr)) { + $curroption = $1; + $currlimit = $2; + if (!$curroption) { + $curroption = 'norequest'; + } + } + } else { + $curroption = 'norequest'; + $tooloff = ' checked="checked"'; + } + $output.= &Apache::loncommon::start_data_table_row()."\n". + ' '.$lt{$item}.': '. + ' '; + foreach my $option (@options) { + if ($option eq 'validate') { + my $canvalidate = 0; + if (ref($validations{$item}) eq 'HASH') { + if ($validations{$item}{'_external_'}) { + $canvalidate = 1; + } + } + next if (!$canvalidate); + } + my $checked = ''; + if ($option eq $curroption) { + $checked = ' checked="checked"'; + } + $output .= ' '; + if ($option eq 'autolimit') { + $output .= ''; + } + $output .= ' ' + } + $output .= ''."\n". &Apache::loncommon::end_data_table_row()."\n"; } return $output; } +sub courserequest_titles { + my %titles = &Apache::lonlocal::texthash ( + official => 'Official', + unofficial => 'Unofficial', + community => 'Communities', + norequest => 'Not allowed', + approval => 'Approval by Dom. Coord.', + validate => 'With validation', + autolimit => 'Numerical limit', + ); + return %titles; +} + +sub courserequest_display { + my %titles = &Apache::lonlocal::texthash ( + approval => 'Yes, need approval', + validate => 'Yes, with validation', + norequest => 'No', + ); + return %titles; +} + # =================================================================== Phase one sub print_username_entry_form { @@ -299,7 +464,9 @@ sub print_username_entry_form { my $jscript = &Apache::loncommon::studentbrowser_javascript()."\n". ''."\n"; my %loaditems = ( @@ -337,7 +504,7 @@ sub print_username_entry_form { 'dom' => "Domain", 'ecrp' => "Edit Custom Role Privileges", 'nr' => "Name of Role", - 'cre' => "Custom Role Editor", + 'cre' => "Next", ); $r->print($start_page."\n".$crumbs); if ($env{'form.action'} eq 'custom') { @@ -347,7 +514,7 @@ sub print_username_entry_form {

$lt{'ecrp'}

-$lt{'nr'}: $choice
+$choice $lt{'nr'}:
ENDCUSTOM @@ -466,6 +633,7 @@ sub user_modification_js { return < +// END } # =================================================================== Phase two sub print_user_selection_page { - my ($r,$response,$srch,$srch_results,$srcharray,$context) = @_; + my ($r,$response,$srch,$srch_results,$srcharray,$context,$opener_elements) = @_; my @fields = ('username','domain','lastname','firstname','permanentemail'); my $sortby = $env{'form.sortby'}; @@ -502,6 +670,7 @@ sub print_user_selection_page { my $jscript = (< +// ENDSCRIPT @@ -524,28 +694,32 @@ ENDSCRIPT 'firstname' => "first name", 'permanentemail' => "permanent e-mail", ); - $r->print(&Apache::loncommon::start_page('User Management',$jscript)); + if ($context eq 'requestcrs') { + $r->print('
'); + } else { + $r->print(&Apache::loncommon::start_page('User Management',$jscript)); - my %breadcrumb_text = &singleuser_breadcrumb(); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:backPage(document.usersrchform,'','')", - text=>$breadcrumb_text{'search'}, - faq=>282,bug=>'Instructor Interface',}, - {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')", - text=>$breadcrumb_text{'userpicked'}, - faq=>282,bug=>'Instructor Interface',}); - if ($env{'form.action'} eq 'singleuser') { - $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', + my %breadcrumb_text = &singleuser_breadcrumb(); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:backPage(document.usersrchform,'','')", + text=>$breadcrumb_text{'search'}, + faq=>282,bug=>'Instructor Interface',}, + {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')", + text=>$breadcrumb_text{'userpicked'}, + faq=>282,bug=>'Instructor Interface',}); + if ($env{'form.action'} eq 'singleuser') { + $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', 'Course_Change_Privileges')); - $r->print("$lt{'usrch'}
"); - $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context)); - $r->print('

'.$lt{'usel'}.'

'); - } elsif ($env{'form.action'} eq 'singlestudent') { - $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', + $r->print("$lt{'usrch'}
"); + $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context)); + $r->print('

'.$lt{'usel'}.'

'); + } elsif ($env{'form.action'} eq 'singlestudent') { + $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', 'Course_Add_Student')); - $r->print($jscript."$lt{'stusrch'}
"); - $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context)); - $r->print('

'.$lt{'stusel'}.'

'); + $r->print($jscript."$lt{'stusrch'}
"); + $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context)); + $r->print('

'.$lt{'stusel'}.'

'); + } } $r->print('
'. &Apache::loncommon::start_data_table()."\n". @@ -570,8 +744,20 @@ ENDSCRIPT foreach my $user (@sorted_users) { my ($uname,$udom) = split(/:/,$user); + my $onclick; + if ($context eq 'requestcrs') { + $onclick = + 'onclick="javascript:gochoose('."'$uname','$udom',". + "'$srch_results->{$user}->{firstname}',". + "'$srch_results->{$user}->{lastname}',". + "'$srch_results->{$user}->{permanentemail}'".');"'; + } else { + $onclick = + ' onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".');"'; + } $r->print(&Apache::loncommon::start_data_table_row(). - ''. + ''. ''.$uname.''. ''.$udom.''); foreach my $field ('lastname','firstname','permanentemail') { @@ -591,7 +777,11 @@ ENDSCRIPT ' '."\n". ' '."\n". ' '."\n"); - $r->print($response.'
'.&Apache::loncommon::end_page()); + if ($context eq 'requestcrs') { + $r->print($opener_elements.'
'); + } else { + $r->print($response.''.&Apache::loncommon::end_page()); + } } sub print_user_query_page { @@ -631,7 +821,7 @@ sub print_user_modification_page { &Apache::lonuserutils::can_create_user($ccdomain,$context, $usertype); if (!$cancreate) { - my $helplink = ' href="javascript:helpMenu('."'display'".')"'; + my $helplink = 'javascript:helpMenu('."'display'".')'; my %usertypetext = ( official => 'institutional', unofficial => 'non-institutional', @@ -641,7 +831,12 @@ sub print_user_modification_page { $response = ''.&mt('No match was found for the username ([_1]) in LON-CAPA domain: [_2]',$ccuname,$ccdomain). '
'; } - $response .= ''.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the helpdesk for assistance.',$helplink).'

'; + $response .= '

' + .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.") + .' ' + .&mt('Please contact the [_1]helpdesk[_2] for assistance.' + ,'','') + .'


'; $env{'form.phase'} = ''; &print_username_entry_form($r,$context,$response); return; @@ -753,7 +948,9 @@ $crumbs $response $forminfo

$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain @@ -777,6 +974,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); @@ -810,7 +1014,7 @@ KERB } else { if ($authtype eq 'int') { $varauth = '
'. -&mt('[_1] Internally authenticated (with initial password [_2])','','')."'; +&mt('[_1] Internally authenticated (with initial password [_2])','','')."'; } elsif ($authtype eq 'loc') { $varauth = '
'. &mt('[_1] Local Authentication with argument [_2]','','')."\n"; @@ -868,10 +1072,15 @@ ENDCHANGEUSER $r->print(&Apache::lonuserutils::forceid_change($context)); } if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { - $r->print('

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

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

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

'. + &Apache::loncommon::start_data_table()); + if ($env{'request.role.domain'} eq $ccdomain) { + $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses')); + } else { + $r->print(&coursereq_externaluser($ccuname,$ccdomain, + $env{'request.role.domain'})); + } + $r->print(&Apache::loncommon::end_data_table()); } $r->print('
'); my $user_auth_text = &user_authentication($ccuname,$ccdomain,$formname); @@ -901,7 +1110,7 @@ ENDNOPORTPRIV if (&Apache::lonnet::allowed('mut',$env{'request.role.domain'})) { my %lt=&Apache::lonlocal::texthash( 'utav' => "User Tools Availability", - 'yodo' => "You do not have privileges to modify Portfolio, Blog or Home Page settings for this user.", + 'yodo' => "You do not have privileges to modify Portfolio, Blog or Personal Information Page settings for this user.", 'ifch' => "If a change is required, contact a domain coordinator for the domain", ); $user_tools_text = <print('
'."\n"); + $r->print('
'."\n"); } else { $r->print('

'.&mt('Add Roles').'

'); my $addrolesdisplay = 0; @@ -960,14 +1169,14 @@ ENDNOTOOLSPRIV $addrolesdisplay = $add_domainroles; } $r->print(&course_level_dc($env{'request.role.domain'},'Course')); - $r->print('
'."\n"); + $r->print('
'."\n"); } elsif ($context eq 'author') { if ($addrolesdisplay) { $r->print('
print(' onClick="auth_check()" \>'."\n"); + $r->print(' onclick="auth_check()" \>'."\n"); } else { - $r->print('onClick="this.form.submit()" \>'."\n"); + $r->print('onclick="this.form.submit()" \>'."\n"); } } else { $r->print('
'. @@ -975,7 +1184,7 @@ ENDNOTOOLSPRIV } } else { $r->print(&course_level_table(%inccourses)); - $r->print('
'."\n"); + $r->print('
'."\n"); } } $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain'])); @@ -1043,7 +1252,11 @@ sub validation_javascript { $nondc_setsection_code,$groupslist); my ($jsback,$elements) = &crumb_utilities(); $js .= "\n". - ''; + ''."\n"; return $js; } @@ -1230,8 +1443,17 @@ sub display_existing_roles { } } if ($rolesdisplay == 1) { + my $contextrole=''; + if ($env{'request.course.id'}) { + $contextrole = 'Existing Roles in this Course'; + } elsif ($env{'request.role'} =~ /^au\./) { + $contextrole = 'Existing Co-Author Roles in your Construction Space'; + } else { + $contextrole = 'Existing Roles in this Domain'; + } $r->print('

'.$lt{'rer'}.'

'. +'
'.&mt($contextrole).'
'. &Apache::loncommon::start_data_table("LC_createuser"). &Apache::loncommon::start_data_table_header_row(). ''.$lt{'rev'}.''.$lt{'ren'}.''.$lt{'del'}. @@ -1283,7 +1505,7 @@ sub new_coauthor_roles { &Apache::loncommon::end_data_table_header_row()."\n". &Apache::loncommon::start_data_table_row().' - + '.$lt{'cau'}.' '.$cudom.'_'.$cuname.' @@ -1295,7 +1517,7 @@ sub new_coauthor_roles { "javascript:pjump('."'date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'sed'}.''."\n". &Apache::loncommon::end_data_table_row()."\n". &Apache::loncommon::start_data_table_row()."\n". -' +' '.$lt{'caa'}.' '.$cudom.'_'.$cuname.' @@ -1335,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( @@ -1346,7 +1570,7 @@ sub new_domain_roles { $num_domain_level ++; $domaintext .= &Apache::loncommon::start_data_table_row(). -' +' '.$plrole.' '.$thisdomain.' @@ -1387,7 +1611,9 @@ sub user_authentication { my $choices = &Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc); $outcome = < +// $lt{'err'}: $lt{'uuas'} ($currentauth). $lt{'sldb'}. @@ -1416,7 +1642,9 @@ ENDBADAUTH ); $outcome = ''."\n". '

'.$lt{'ld'}.'

'. &Apache::loncommon::start_data_table(). @@ -1524,16 +1752,19 @@ sub modify_login_block { sub personal_data_display { my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray) = @_; - my ($output,$showforceid,%userenv,%canmodify); + my ($output,$showforceid,%userenv,%canmodify,%canmodify_status); my @userinfo = ('firstname','middlename','lastname','generation', 'permanentemail','id'); my $rowcount = 0; my $editable = 0; + %canmodify_status = + &Apache::lonuserutils::can_modify_userinfo($context,$ccdomain, + ['inststatus'],$rolesarray); if (!$newuser) { # Get the users information %userenv = &Apache::lonnet::get('environment', ['firstname','middlename','lastname','generation', - 'permanentemail','id'],$ccdomain,$ccuname); + 'permanentemail','id','inststatus'],$ccdomain,$ccuname); %canmodify = &Apache::lonuserutils::can_modify_userinfo($context,$ccdomain, \@userinfo,$rolesarray); @@ -1549,7 +1780,8 @@ sub personal_data_display { 'generation' => "Generation", 'permanentemail' => "Permanent e-mail address", 'id' => "Student/Employee ID", - 'lg' => "Login Data" + 'lg' => "Login Data", + 'inststatus' => "Affiliation", ); my %textboxsize = ( firstname => '15', @@ -1587,11 +1819,15 @@ sub personal_data_display { } } else { if ($context eq 'selfcreate') { - if ($canmodify{$item}) { - $row .= ''; - $editable ++; + if (($item eq 'permanentemail') && ($newuser eq 'email')) { + $row .= $ccuname; } else { - $hiderow = 1; + if ($canmodify{$item}) { + $row .= ''; + $editable ++; + } else { + $hiderow = 1; + } } } else { $row .= ''; @@ -1613,6 +1849,30 @@ sub personal_data_display { $rowcount ++; } } + if (($canmodify_status{'inststatus'}) || ($context ne 'selfcreate')) { + my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($ccdomain); + if (ref($types) eq 'ARRAY') { + if (@{$types} > 0) { + my ($hiderow,$shown); + if ($canmodify_status{'inststatus'}) { + $shown = &pick_inst_statuses($userenv{'inststatus'},$usertypes,$types); + } else { + $shown .= $userenv{'inststatus'}; + if ($userenv{'inststatus'} eq '') { + $hiderow = 1; + } + } + if (!$hiderow) { + my $row = &Apache::lonhtmlcommon::row_title(&mt('Affliations'),undef,'LC_oddrow_value')."\n". + $shown.&Apache::lonhtmlcommon::row_closure(1); + if ($context eq 'selfcreate') { + $rowcount ++; + } + $output .= $row; + } + } + } + } $output .= &Apache::lonhtmlcommon::end_pick_box(); if (wantarray) { if ($context eq 'selfcreate') { @@ -1625,6 +1885,48 @@ sub personal_data_display { } } +sub pick_inst_statuses { + my ($curr,$usertypes,$types) = @_; + my ($output,$rem,@currtypes); + if ($curr ne '') { + @currtypes = map { &unescape($_); } split(/:/,$curr); + } + my $numinrow = 2; + if (ref($types) eq 'ARRAY') { + $output = ''; + my $lastcolspan; + for (my $i=0; $i<@{$types}; $i++) { + if (defined($usertypes->{$types->[$i]})) { + my $rem = $i%($numinrow); + if ($rem == 0) { + if ($i<@{$types}-1) { + if ($i > 0) { + $output .= ''; + } + $output .= ''; + } + } elsif ($i==@{$types}-1) { + my $colsleft = $numinrow - $rem; + if ($colsleft > 1) { + $lastcolspan = ' colspan="'.$colsleft.'"'; + } + } + my $check = ' '; + if (grep(/^\Q$types->[$i]\E$/,@currtypes)) { + $check = ' checked="checked" '; + } + $output .= ''; + } + } + $output .= '
'. + '
'; + } + return $output; +} + sub selfcreate_canmodify { my ($context,$dom,$userinfo,$inst_results,$rolesarray) = @_; if (ref($inst_results) eq 'HASH') { @@ -1673,7 +1975,10 @@ sub update_user_data { my $newuser = 0; my ($jsback,$elements) = &crumb_utilities(); my $jscript = ''."\n"; + '// '."\n". + ''."\n"; my %breadcrumb_text = &singleuser_breadcrumb(); my $args; if ($env{'form.popup'}) { @@ -1774,6 +2079,8 @@ sub update_user_data { my (%alerts,%rulematch,%inst_results,%curr_rules); my @usertools = ('aboutme','blog','portfolio'); my @requestcourses = ('official','unofficial'); + my ($othertitle,$usertypes,$types) = + &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'}); if ($env{'form.makeuser'}) { $r->print('

'.&mt('Creating new account.').'

'); # Check for the authentication mode and password @@ -1852,10 +2159,23 @@ sub update_user_data { } } foreach my $item (@requestcourses) { - $newcustom{$item} = $env{'form.requestcourses_'.$item}; + $newcustom{$item} = $env{'form.crsreq_'.$item}; + if ($env{'form.crsreq_'.$item} eq 'autolimit') { + $newcustom{$item} .= '='; + unless ($env{'form.crsreq_'.$item.'_limit'} =~ /\D/) { + $newcustom{$item} .= $env{'form.crsreq_'.$item.'_limit'}; + } + } $changed{$item} = &tool_admin($item,$newcustom{$item}, \%changeHash,'requestcourses'); } + if (exists($env{'form.inststatus'})) { + my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus'); + if (@inststatuses > 0) { + $changeHash{'inststatus'} = join(',',@inststatuses); + $changed{'inststatus'} = $changeHash{'inststatus'}; + } + } if (keys(%changed)) { $changeHash{'firstname'} = $env{'form.cfirstname'}; $changeHash{'middlename'} = $env{'form.cmiddlename'}; @@ -1901,7 +2221,9 @@ sub update_user_data { ('environment',['firstname','middlename','lastname','generation', 'id','permanentemail','portfolioquota','inststatus','tools.aboutme', 'tools.blog','tools.portfolio','requestcourses.official', - 'requestcourses.unofficial'], + 'requestcourses.unofficial','requestcourses.community', + 'reqcrsotherdom.official','reqcrsotherdom.unofficial', + 'reqcrsotherdom.community'], $env{'form.ccdomain'},$env{'form.ccuname'}); my ($tmp) = keys(%userenv); if ($tmp =~ /^(con_lost|error)/i) { @@ -2003,7 +2325,7 @@ sub update_user_data { (!$forceid)) { if ($env{'form.cid'} ne $uidhash{$env{'form.ccuname'}}) { $env{'form.cid'} = $userenv{'id'}; - $no_forceid_alert = &mt('New Student/Employee ID does not match existing ID for this user.') + $no_forceid_alert = &mt('New student/employee ID does not match existing ID for this user.') .'
' .&mt("Change is not permitted without checking the 'Force ID change' checkbox on the previous page.") .'
'."\n"; @@ -2024,12 +2346,13 @@ sub update_user_data { } } } - my ($quotachanged,$oldportfolioquota,$newportfolioquota, - $inststatus,$oldisdefault,$newisdefault,$olddefquotatext, - $newdefquotatext,%oldaccess,%oldaccesstext,%newaccess,%newaccesstext); + my ($quotachanged,$oldportfolioquota,$newportfolioquota,$oldinststatus, + $inststatus,$newinststatus,$oldisdefault,$newisdefault,$olddefquotatext, + $newdefquotatext,%oldaccess,%oldaccesstext,%newaccess,%newaccesstext, + $oldinststatuses,$newinststatuses); my ($defquota,$settingstatus) = &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus); - my ($showquota,$showtools,$showrequestcourses); + my ($showquota,$showtools,$showrequestcourses,$showinststatus,$showreqotherdom); if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) { $showquota = 1; } @@ -2038,8 +2361,49 @@ sub update_user_data { } if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) { $showrequestcourses = 1; + } elsif (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { + $showreqotherdom = 1; + } + if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) { + $showinststatus = 1; } my (%changeHash,%changed); + $oldinststatus = $userenv{'inststatus'}; + if ($oldinststatus eq '') { + $oldinststatuses = $othertitle; + } else { + if (ref($usertypes) eq 'HASH') { + $oldinststatuses = join(', ',map{ $usertypes->{ &unescape($_) }; } (split(/:/,$userenv{'inststatus'}))); + } else { + $oldinststatuses = join(', ',map{ &unescape($_); } (split(/:/,$userenv{'inststatus'}))); + } + } + $changeHash{'inststatus'} = $userenv{'inststatus'}; + my %canmodify_inststatus = &Apache::lonuserutils::can_modify_userinfo($context,$env{'form.ccdomain'},['inststatus'],\@userroles); + if ($canmodify_inststatus{'inststatus'}) { + if (exists($env{'form.inststatus'})) { + my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus'); + if (@inststatuses > 0) { + $newinststatus = join(':',map { &escape($_); } @inststatuses); + $changeHash{'inststatus'} = $newinststatus; + if ($newinststatus ne $oldinststatus) { + $changed{'inststatus'} = $newinststatus; + } + if (ref($usertypes) eq 'HASH') { + $newinststatuses = join(', ',map{ $usertypes->{$_}; } (@inststatuses)); + } else { + $newinststatuses = join(', ',map{ $usertypes->{$_}; } (@inststatuses)); + } + } else { + $newinststatus = ''; + $changeHash{'inststatus'} = $newinststatus; + $newinststatuses = $othertitle; + if ($newinststatus ne $oldinststatus) { + $changed{'inststatus'} = $changeHash{'inststatus'}; + } + } + } + } $changeHash{'portfolioquota'} = $userenv{'portfolioquota'}; if ($userenv{'portfolioquota'} ne '') { $oldportfolioquota = $userenv{'portfolioquota'}; @@ -2056,7 +2420,7 @@ sub update_user_data { } else { $changed{'quota'} = "a_admin('',\%changeHash); $newportfolioquota = $defquota; - $newisdefault = 1; + $newisdefault = 1; } } else { $oldisdefault = 1; @@ -2082,8 +2446,14 @@ sub update_user_data { } &tool_changes('tools',\@usertools,\%oldaccess,\%oldaccesstext,\%userenv, \%changeHash,\%changed,\%newaccess,\%newaccesstext); - &tool_changes('requestcourses',\@requestcourses,\%oldaccess,\%oldaccesstext, - \%userenv, \%changeHash,\%changed,\%newaccess,\%newaccesstext); + + if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) { + &tool_changes('requestcourses',\@requestcourses,\%oldaccess,\%oldaccesstext, + \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext); + } else { + &tool_changes('reqcrsotherdom',\@requestcourses,\%oldaccess,\%oldaccesstext, + \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext); + } if ($env{'form.cfirstname'} ne $userenv{'firstname'} || $env{'form.cmiddlename'} ne $userenv{'middlename'} || $env{'form.clastname'} ne $userenv{'lastname'} || @@ -2158,21 +2528,22 @@ sub update_user_data { ((keys(%changed) > 0) && $chgresult eq 'ok')) { # Tell the user we changed the name my %lt=&Apache::lonlocal::texthash( - 'uic' => "User Information Changed", - 'frst' => "First", - 'mddl' => "Middle", - 'lst' => "Last", - 'gen' => "Generation", - 'id' => "Student/Employee ID", - 'mail' => "Permanent E-mail", - 'disk' => "Disk space allocated to portfolio files", - 'blog' => "Blog Availability", - 'aboutme' => "Home Page Availability", - 'portfolio' => "Portfolio Availability", - 'official' => "Can Request Official Courses", - 'unofficial' => "Can Request Unofficial Courses", - 'prvs' => "Previous", - 'chto' => "Changed To" + 'uic' => 'User Information Changed', + 'frst' => 'First Name', + 'mddl' => 'Middle Name', + 'lst' => 'Last Name', + 'gen' => 'Generation', + 'id' => 'Student/Employee ID', + 'mail' => 'Permanent e-mail address', + 'disk' => 'Disk space allocated to portfolio files', + 'blog' => 'Blog Availability', + 'aboutme' => 'Personal Information Page Availability', + 'portfolio' => 'Portfolio Availability', + 'official' => 'Can Request Official Courses', + 'unofficial' => 'Can Request Unofficial Courses', + 'inststatus' => "Affiliation", + 'prvs' => 'Previous Value:', + 'chto' => 'Changed To:' ); $r->print('

'.$lt{'uic'}.'

'. &Apache::loncommon::start_data_table(). @@ -2186,11 +2557,20 @@ sub update_user_data { $lt{'id'} $lt{'mail'} END + if ($showinststatus) { + $r->print(" + $lt{'inststatus'}\n"); + } if ($showrequestcourses) { foreach my $item (@requestcourses) { $r->print(" $lt{$item}\n"); } + } elsif ($showreqotherdom) { + foreach my $item (@requestcourses) { + $r->print(" + $lt{$item}\n"); + } } if ($showquota) { $r->print(" @@ -2213,11 +2593,20 @@ END $userenv{'id'} $userenv{'permanentemail'} END + if ($showinststatus) { + $r->print(" + $oldinststatuses\n"); + } if ($showrequestcourses) { foreach my $item (@requestcourses) { $r->print(" $oldaccess{$item} $oldaccesstext{$item}\n"); } + } elsif ($showreqotherdom) { + foreach my $item (@requestcourses) { + $r->print(" + $oldaccess{$item} $oldaccesstext{$item}\n"); + } } if ($showquota) { $r->print(" @@ -2240,11 +2629,20 @@ END $env{'form.cid'} $env{'form.cpermanentemail'} END + if ($showinststatus) { + $r->print(" + $newinststatuses\n"); + } if ($showrequestcourses) { foreach my $item (@requestcourses) { $r->print(" $newaccess{$item} $newaccesstext{$item} \n"); } + } elsif ($showreqotherdom) { + foreach my $item (@requestcourses) { + $r->print(" + $newaccess{$item} $newaccesstext{$item} \n"); + } } if ($showquota) { $r->print(" @@ -2289,13 +2687,14 @@ END # but we can still tell them what the name and quota and availabilities are my %lt=&Apache::lonlocal::texthash( 'id' => "Student/Employee ID", - 'mail' => "Permanent e-mail", + 'mail' => "Permanent e-mail address", 'disk' => "Disk space allocated to user's portfolio files", 'blog' => "Blog Availability", - 'aboutme' => "Home Page Availability", + 'aboutme' => "Personal Information Page Availability", 'portfolio' => "Portfolio Availability", 'official' => "Can Request Official Courses", 'unofficial' => "Can Request Unofficial Course", + 'inststatus' => "Affiliation", ); $r->print(<<"END");

$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'} @@ -2304,11 +2703,19 @@ END $r->print('
['.$lt{'mail'}.': '. $userenv{'permanentemail'}.']'); } + if ($showinststatus) { + $r->print('
['.$lt{'inststatus'}.': '.$oldinststatuses.']'); + } if ($showrequestcourses) { foreach my $item (@requestcourses) { $r->print('
['.$lt{$item}.': '.$newaccess{$item}.' '. $newaccesstext{$item}.']'."\n"); } + } elsif ($showreqotherdom) { + foreach my $item (@requestcourses) { + $r->print('
['.$lt{$item}.': '.$newaccess{$item}.' '. + $newaccesstext{$item}.']'."\n"); + } } if ($showtools) { foreach my $item (@usertools) { @@ -2345,8 +2752,11 @@ END } else { $r->print(&mt("You do not have the authority to change these fields given the user's current set of active/future [_1] roles:",$contextname)); } - $r->print(''.$rolestr.'
'. - &mt('Contact your helpdesk for more information.',"javascript:helpMenu('display')").'
'); + my $helplink = 'javascript:helpMenu('."'display'".')'; + $r->print(''.$rolestr.'
' + .&mt('Please contact your [_1]helpdesk[_2] for more information.' + ,'','') + .'
'); } $r->print('' .$no_forceid_alert @@ -2397,7 +2807,91 @@ sub tool_changes { (ref($newaccess) eq 'HASH') && (ref($newaccesstext) eq 'HASH'))) { return; } + if ($context eq 'reqcrsotherdom') { + my @options = ('approval','validate','autolimit'); + my $optregex = join('|',@options); + my %reqdisplay = &courserequest_display(); + my $cdom = $env{'request.role.domain'}; + foreach my $tool (@{$usertools}) { + $oldaccesstext->{$tool} = &mt('no'); + $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool}; + if ($userenv->{$context.'.'.$tool} eq '') { + if ($env{'form.'.$context.'_'.$tool}) { + $changed->{$tool}=&tool_admin($tool,$cdom, + $changeHash,$context); + if ($changed->{$tool}) { + $newaccesstext->{$tool} = &mt('yes'); + } else { + $newaccesstext->{$tool} = $oldaccesstext->{$tool}; } + } + } else { + my @curr = split(',',$userenv->{$context.'.'.$tool}); + my @new; + my $changedoms; + my $newop = $env{'form.'.$context.'_'.$tool}; + if ($newop eq 'autolimit') { + $newop .= '='; + unless ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/) { + $newop .= $env{'form.'.$context.'_'.$tool.'_limit'}; + } + } + if (grep(/^\Q$cdom:($optregex\=?\d*)\E$/,@curr)) { + $oldaccesstext->{$tool} = &mt('yes'); + my $oldop = $1; + if ($oldop ne $newop) { + $changedoms = 1; + foreach my $dom (@curr) { + unless ($dom eq $cdom) { + push(@new,$dom); + } + } + if ($newop) { + push(@new,$cdom.':'.$newop); + } + @new = sort(@new); + } + } elsif ($env{'form.'.$context.'_'.$tool}) { + $changedoms = 1; + @new = sort(@curr,$cdom.':'.$newop); + } + $newaccesstext->{$tool} = $oldaccesstext->{$tool}; + if ($changedoms) { + my $newdomstr; + if (@new) { + $newdomstr = join(',',@new); + } + $changed->{$tool}=&tool_admin($tool,$newdomstr,$changeHash, + $context); + if ($changed->{$tool}) { + if ($env{'form.'.$context.'_'.$tool}) { + if ($env{'form.'.$context.'_'.$tool} eq 'autolimit') { + if ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/) { + $newaccesstext->{$tool} = &mt('Yes, processed automatically'); + } else { + $newaccesstext->{$tool} = &mt('Yes, up to limit of [quant,_1,request] per user).',$env{'form.'.$context.'_'.$tool.'_limit'}); + } + } else { + $newaccesstext->{$tool} = $reqdisplay{$env{'form.'.$context.'_'.$tool}}; + } + } else { + $newaccesstext->{$tool} = &mt('No'); + } + } + } + } + } + return; + } foreach my $tool (@{$usertools}) { + my $newval; + if ($context eq 'requestcourses') { + $newval = $env{'form.crsreq_'.$tool}; + if ($newval eq 'autolimit') { + $newval .= '='.$env{'form.crsreq_'.$tool.'_limit'}; + } + } else { + $newval = $env{'form.'.$context.'_'.$tool}; + } if ($userenv->{$context.'.'.$tool} ne '') { $oldaccess->{$tool} = &mt('custom'); if ($userenv->{$context.'.'.$tool}) { @@ -2407,12 +2901,12 @@ sub tool_changes { } $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool}; if ($env{'form.custom'.$tool} == 1) { - if ($env{'form.'.$context.'_'.$tool} ne $userenv->{$context.'.'.$tool}) { - $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool}, - $changeHash,$context); + if ($newval ne $userenv->{$context.'.'.$tool}) { + $changed->{$tool} = &tool_admin($tool,$newval,$changeHash, + $context); if ($changed->{$tool}) { $newaccess->{$tool} = &mt('custom'); - if ($env{'form.'.$context.'_'.$tool}) { + if ($newval) { $newaccesstext->{$tool} = &mt("availability set to 'on'"); } else { $newaccesstext->{$tool} = &mt("availability set to 'off'"); @@ -2436,20 +2930,20 @@ sub tool_changes { } else { $newaccess->{$tool} = $oldaccess->{$tool}; if ($userenv->{$context.'.'.$tool}) { - $newaccesstext->{$tool} = &mt("availability set to 'on'"); + $newaccesstext->{$tool} = &mt("availability set to 'on'"); } else { - $newaccesstext->{$tool} = &mt("availability set to 'off'"); + $newaccesstext->{$tool} = &mt("availability set to 'off'"); } } } } else { $oldaccess->{$tool} = &mt('default'); if ($env{'form.custom'.$tool} == 1) { - $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool}, - $changeHash,$context); + $changed->{$tool} = &tool_admin($tool,$newval,$changeHash, + $context); if ($changed->{$tool}) { $newaccess->{$tool} = &mt('custom'); - if ($env{'form.'.$context.'_'.$tool}) { + if ($newval) { $newaccesstext->{$tool} = &mt("availability set to 'on'"); } else { $newaccesstext->{$tool} = &mt("availability set to 'off'"); @@ -2532,8 +3026,8 @@ sub update_roles { if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) { my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4); # Delete custom role - $r->print(&mt('Deleting custom role [_1] by [_2]:[_3] in [_4]', - $rolename,$rnam,$rdom,$url).': '. + $r->print(&mt('Deleting custom role [_1] by [_2] in [_3]', + $rolename,$rnam.':'.$rdom,$url).': '. &Apache::lonnet::assigncustomrole($env{'form.ccdomain'}, $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now, 0,1,$context).'
'); @@ -2584,8 +3078,8 @@ sub update_roles { my $result = &Apache::lonnet::assigncustomrole( $env{'form.ccdomain'}, $env{'form.ccuname'}, $url,$rdom,$rnam,$rolename,0,$now,undef,$context); - $r->print(&mt('Re-enabling custom role [_1] by [_2]:[_3] in [_4] : [_5]', - $rolename,$rnam,$rdom,$url,''.$result.'').'
'); + $r->print(&mt('Re-enabling custom role [_1] by [_2] in [_3]: [_4]', + $rolename,$rnam.':'.$rdom,$url,''.$result.'').'
'); if (!grep(/^cr$/,@rolechanges)) { push(@rolechanges,'cr'); } @@ -2835,6 +3329,10 @@ sub tool_admin { if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) { $canchange = 1; } + } elsif ($context eq 'reqcrsotherdom') { + if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { + $canchange = 1; + } } elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) { # Current user has quota modification privileges $canchange = 1; @@ -2954,13 +3452,16 @@ sub custom_role_editor { my ($jsback,$elements) = &crumb_utilities(); my $button_code = "\n"; my $head_script = "\n"; - $head_script .= ''."\n"; + $head_script .= "\n".$jsback."\n". + '// ]]>'."\n". + ''."\n"; $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script)); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:backPage(document.form1,'pickrole','')", @@ -3001,14 +3502,14 @@ ENDCCF my $privtext = &Apache::lonnet::plaintext($priv); $r->print(&Apache::loncommon::start_data_table_row(). ''.$privtext.''. - ($courselevel{$priv}?'':' '). + ($courselevel{$priv}?'':' '). ''. - ($domainlevel{$priv}?'':' '). + ($domainlevel{$priv}?'':' '). ''. - ($systemlevel{$priv}?'':' '). + ($systemlevel{$priv}?'':' '). ''. &Apache::loncommon::end_data_table_row()); } @@ -3017,7 +3518,7 @@ ENDCCF ''."\n".''."\n". ''."\n". - ''. + ''. &Apache::loncommon::end_page()); } # -------------------------------------------------------- @@ -3090,7 +3591,7 @@ sub make_script_template { sub make_button_code { my ($role) = @_; my $label = &Apache::lonnet::plaintext($role); - my $button_code = ''; + my $button_code = ''; return ($button_code); } # ---------------------------------------------------------- Call to definerole @@ -3103,7 +3604,11 @@ sub set_custom_role { return; } my ($jsback,$elements) = &crumb_utilities(); - my $jscript = ''; + my $jscript = ''; $r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript); &Apache::lonhtmlcommon::add_breadcrumb @@ -3200,8 +3705,11 @@ sub handler { if ($env{'form.action'} ne 'dateselect') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/createuser", - text=>"User Management"}); + text=>"User Management", + help=>'Course_Create_Class_List,Course_Change_Privileges,Course_View_Class_List,Course_Editing_Custom_Roles,Course_Add_Student,Course_Drop_Student,Course_Automated_Enrollment,Course_Self_Enrollment,Course_Manage_Group'}); } + #SD Following files not added to help, because the corresponding .tex-files seem to + #be missing: Course_Approve_Selfenroll,Course_User_Logs, my ($permission,$allowed) = &Apache::lonuserutils::get_permission($context); if (!$allowed) { @@ -3426,11 +3934,14 @@ sub handler { my $cid = $env{'request.course.id'}; my $cdom = $env{'course.'.$cid.'.domain'}; my $cnum = $env{'course.'.$cid.'.num'}; + my $coursedesc = $env{'course.'.$cid.'.description'}; if (!exists($env{'form.state'})) { $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment requests', 'Course_SelfEnrollment_Approval')); $r->print('

'.&mt('Pending enrollment requests').'

'."\n"); - &display_selfenroll_queue($r,$context,$permission,$cnum,$cdom); + $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context, + $cdom,$cnum)); + } elsif ($env{'form.state'} eq 'done') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/createuser?action=selfenrollqueue', @@ -3438,7 +3949,8 @@ sub handler { $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment result', 'Course_Self_Enrollment')); $r->print('

'.&mt('Enrollment request processing').'

'."\n"); - &update_selfenroll_queue($r,$context,$permission,$cid,$cnum,$cdom); + $r->print(&Apache::loncoursequeueadmin::update_request_queue($context, + $cdom,$cnum,$coursedesc)); } $r->print(&Apache::loncommon::end_page()); } elsif ($env{'form.action'} eq 'changelogs') { @@ -3472,7 +3984,11 @@ sub header { sub add_script { my ($js) = @_; - return ''; + return ''."\n"; } sub verify_user_display { @@ -3506,137 +4022,110 @@ sub print_main_menu { listusers => 'Display Co-authors and Manage Multiple Users', }, course => { - upload => 'File of Course Users', - singleuser => 'Single Course User', - listusers => 'Course User Lists', + upload => 'Upload a File of Course Users', + singleuser => 'Add/Modify a Single Course User', + listusers => 'Display Class Lists and Manage Multiple Users', }, - ); - my @menu = ( {categorytitle => 'Add Users', - items => - [{ - linktext => $links{$context}{'upload'}, - icon => 'sctr.png', - #help => 'Course_Create_Class_List', - url => '/adm/createuser?action=upload', - permission => $permission->{'cusr'}, - linktitle => 'Upload a CSV or a text file containing users.', - }, - { - linktext => $links{$context}{'singleuser'}, - icon => 'edit-redo.png', - #help => 'Course_Change_Privileges', - url => '/adm/createuser?action=singleuser', - permission => $permission->{'cusr'}, - linktitle => 'Add a user with a certain role to this course.', - }]}, - {categorytitle => 'Administration', - items => - [{ - linktext => $links{$context}{'listusers'}, - icon => 'edit-find.png', - #help => 'Course_View_Class_List', - url => '/adm/createuser?action=listusers', - permission => ($permission->{'view'} || $permission->{'cusr'}), - linktitle => 'Show and manage users of this course.', - }]}, - {categorytitle => 'Configuration', - items => - [ - ]}, - ); - - if ($context eq 'domain'){ - - push(@{ $menu[1]->{items} }, - { linktext => 'Custom Roles', - icon => 'emblem-photos.png', - #help => 'Course_Editing_Custom_Roles', - url => '/adm/createuser?action=custom', - permission => $permission->{'custom'}, - linktitle => 'Configure a custom role.', - }); - - }elsif ($context eq 'course'){ - my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity(); - - push(@{ $menu[0]->{items} }, - { linktext => 'Single Student', - #help => 'Course_Add_Student', - icon => 'list-add.png', - url => '/adm/createuser?action=singlestudent', - permission => $permission->{'cusr'}, - linktitle => 'Add a user with the role student to this course.', - }); - - push(@{ $menu[1]->{items} }, - { linktext => 'Drop Students', - icon => 'edit-undo.png', - #help => 'Course_Drop_Student', - url => '/adm/createuser?action=drop', - permission => $permission->{'cusr'}, - linktitle =>'Remove a student from this course.', - }, - { linktext => 'Custom Roles', - icon => 'emblem-photos.png', - #help => 'Course_Editing_Custom_Roles', - url => '/adm/createuser?action=custom', - permission => $permission->{'custom'}, - linktitle => 'Configure a custom role.', - }); + ); + + my @menu = + ( + { text => $links{$context}{'upload'}, + help => 'Course_Create_Class_List', + action => 'upload', + permission => $permission->{'cusr'}, + }, + { text => $links{$context}{'singleuser'}, + help => 'Course_Change_Privileges', + action => 'singleuser', + permission => $permission->{'cusr'}, + }, + { text => $links{$context}{'listusers'}, + help => 'Course_View_Class_List', + action => 'listusers', + permission => ($permission->{'view'} || $permission->{'cusr'}), + }, + ); + if ($context eq 'domain' || $context eq 'course') { + my $customlink = { text => 'Edit Custom Roles', + help => 'Course_Editing_Custom_Roles', + action => 'custom', + permission => $permission->{'custom'}, + }; + push(@menu,$customlink); + } + if ($context eq 'course') { + my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity(); + my @courselinks = + ( + { text => 'Enroll a Single Student', + help => 'Course_Add_Student', + action => 'singlestudent', + permission => $permission->{'cusr'}, + }, + { text => 'Drop Students', + help => 'Course_Drop_Student', + action => 'drop', + permission => $permission->{'cusr'}, + }); + if (!exists($permission->{'cusr_section'})) { + push(@courselinks, + { text => 'Automated Enrollment Manager', + help => 'Course_Automated_Enrollment', + permission => (&Apache::lonnet::auto_run($cnum,$cdom) + && $permission->{'cusr'}), + url => '/adm/populate', + }, + { text => 'Configure User Self-enrollment', + help => 'Course_Self_Enrollment', + action => 'selfenroll', + permission => $permission->{'cusr'}, + }); + } if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) { - push(@{ $menu[1]->{items} }, - { linktext => 'Enrollment Requests', - icon => 'selfenrl-queue.png', - #help => 'Course_Approve_Selfenroll', - url => '/adm/createuser?action=selfenrollqueue', + push(@courselinks, + { text => 'Enrollment Requests', + help => 'Course_Approve_Selfenroll', + action => 'selfenrollqueue', permission => $permission->{'cusr'}, - linktitle =>'Approve or reject enrollment requests.', - }); + }); } - - if (!exists($permission->{'cusr_section'})){ - - push(@{ $menu[2]->{items} }, - { linktext => 'Automated Enrollment', - icon => 'roles.png', - #help => 'Course_Automated_Enrollment', - permission => (&Apache::lonnet::auto_run($cnum,$cdom) - && $permission->{'cusr'}), - url => '/adm/populate', - linktitle => 'Automated enrollment manager.', - }, - { linktext => 'User Self-Enrollment', - icon => 'cstr.png', - #help => 'Course_Self_Enrollment', - url => '/adm/createuser?action=selfenroll', - permission => $permission->{'cusr'}, - linktitle => 'Configure user self enrollment.', - }); - - } - - push(@{ $menu[2]->{items} }, - { linktext => 'Course Groups', - icon => 'conf.png', - #help => 'Course_Manage_Group', - url => '/adm/coursegroups?refpage=cusr', - permission => $permission->{'grp_manage'}, - linktitle => 'Manage course groups.', - }, - { linktext => 'Change Logs', - icon => 'document-properties.png', - #help => 'Course_User_Logs', - url => '/adm/createuser?action=changelogs', - permission => $permission->{'cusr'}, - linktitle => 'View change log.', - }); - }; -return Apache::lonhtmlcommon::generate_menu(@menu); + push(@courselinks, + { text => 'Manage Course Groups', + help => 'Course_Manage_Group', + permission => $permission->{'grp_manage'}, + url => '/adm/coursegroups?refpage=cusr', + }, + { text => 'View Change Logs', + help => 'Course_User_Logs', + action => 'changelogs', + permission => $permission->{'cusr'}, + },); # { text => 'View Log-in History', # help => 'Course_User_Logins', # action => 'logins', # permission => $permission->{'cusr'}, # }); + push(@menu,@courselinks); + } + my $menu_html = ''; + foreach my $menu_item (@menu) { + next if (! $menu_item->{'permission'}); + $menu_html.='

'; + if (exists($menu_item->{'help'})) { + $menu_html.= + &Apache::loncommon::help_open_topic($menu_item->{'help'}); + } + $menu_html.=''; + if (exists($menu_item->{'url'})) { + $menu_html.=qq{}; + } else { + $menu_html.= + qq{}; } + $menu_html.= &mt($menu_item->{'text'}).''; + $menu_html.='

'; + } + return $menu_html; } sub restore_prev_selections { @@ -3833,15 +4322,18 @@ ENDSCRIPT my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; my $output = ''."\n". '

'.$lt->{'selfenroll'}.'

'."\n"; my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum); if (ref($visactions) eq 'HASH') { if ($visible) { - $output .= '

'.$visactions->{'vis'}.'

'; + $output .= '

'.$visactions->{'vis'}.'

'; } else { - $output .= $visactions->{'miss'}.'
'.$visactions->{'yous'}. + $output .= '

'.$visactions->{'miss'}.'

' + .$visactions->{'yous'}. '

'.$visactions->{'gen'}.'
'.$visactions->{'coca'}; if (ref($vismsgs) eq 'ARRAY') { $output .= '
'.$visactions->{'make'}.'

    '; @@ -4089,285 +4581,12 @@ ENDSCRIPT } $output .= &Apache::lonhtmlcommon::end_pick_box(). '
    ' + .&mt('Save').'" onclick="validate_types(this.form);" />' .''; $r->print($output); return; } -sub display_selfenroll_queue { - my ($r,$context,$permission,$cnum,$cdom) = @_; - my $namespace = 'selfenrollrequests'; - my ($output,%queue_by_date); - my %requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum); - if (keys(%requesthash) > 0) { - $r->print('
    '. - ''. - ''. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(). - ''.&mt('Action').''. - ''.&mt('Requestor').''. - ''.&mt('Section').''. - ''.&mt('Date requested').''. - &Apache::loncommon::end_data_table_header_row()); - foreach my $item (keys(%requesthash)) { - my ($timestamp,$usec) = split(/:/,$requesthash{$item}); - if (exists($queue_by_date{$timestamp})) { - if (ref($queue_by_date{$timestamp}) eq 'ARRAY') { - push(@{$queue_by_date{$timestamp}},$item.':'.$usec); - } - } else { - @{$queue_by_date{$timestamp}} = ($item.':'.$usec); - } - } - my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date)); - my $count = 0; - foreach my $item (@sortedtimes) { - if (ref($queue_by_date{$item}) eq 'ARRAY') { - foreach my $request (sort(@{$queue_by_date{$item}})) { - my ($puname,$pudom,$pusec) = split(/:/,$request); - my $showsec = $pusec; - if ($showsec eq '') { - $showsec = &mt('none'); - } - my $namelink = &Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($puname,$pudom), - $puname,$pudom); - $r->print(&Apache::loncommon::start_data_table_row(). - '
    '. - '
    '. - ''.$namelink.''. - ''.$showsec.''. - ''.&Apache::lonlocal::locallocaltime($item).''. - &Apache::loncommon::end_data_table_row()); - $count ++; - } - } - } - $r->print(&Apache::loncommon::end_data_table(). - '
    '); - } else { - $r->print(&mt('There are currently no enrollment requests.')); - } - return; -} - -sub update_selfenroll_queue { - my ($r,$context,$permission,$cid,$cnum,$cdom) = @_; - my @approvals = &Apache::loncommon::get_env_multiple('form.approvereq'); - my @rejections = &Apache::loncommon::get_env_multiple('form.rejectreq'); - my $access_start = $env{'course.'.$cid.'.internal.selfenroll_start_access'}; - my $access_end = $env{'course.'.$cid.'.internal.selfenroll_end_access'}; - my $limit = $env{'course.'.$cid.'.internal.selfenroll_limit'}; - my $cap = $env{'course.'.$cid.'.internal.selfenroll_cap'}; - my $notifylist = $env{'course.'.$cid.'.internal.selfenroll_notifylist'}; - my $namespace = 'selfenrollrequests'; - my ($stucounts,$idx,$classlist) = &get_student_counts($cdom,$cnum); - my %requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum); - my $coursedesc = $env{'course.'.$cid.'.description'}; - my $chome = &Apache::lonnet::homeserver($cnum,$cdom); - my $hostname = &Apache::lonnet::hostname($chome); - my $protocol = $Apache::lonnet::protocol{$chome}; - $protocol = 'http' if ($protocol ne 'https'); - my (@existing,@missingreq,@invalidusers,@limitexceeded,@enrolled, - @enrollerrors,@warn_approves,@warn_rejects); - my $now = time; - my $sender = $env{'user.name'}.':'.$env{'user.domain'}; - my $approvedmsg = [{ - mt => 'Your request for enrollment has been approved.', - }, - { - mt => 'Visit [_1], to log-in and access the course', - args => [$protocol.'://'.$hostname], - }]; - - my $rejectedmsg = [{ - mt => 'Your request for enrollment has not been approved.', - }]; - foreach my $item (sort {$a <=> $b} @approvals) { - my ($num,$uname,$udom,$usec) = split(/:/,$item); - my $uhome = &Apache::lonnet::homeserver($uname,$udom); - if ($uhome ne 'no_host') { - if (exists($requesthash{$uname.':'.$udom})) { - - if (exists($classlist->{$uname.':'.$udom})) { - if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') { - if (($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Active') || - ($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Future')) { - push(@existing,$uname.':'.$udom); - next; - } - } - } - } else { - push(@missingreq,$uname.':'.$udom); - next; - } - if (!grep(/^\Q$item\E$/,@rejections)) { - if ($limit eq 'allstudents') { - if ($stucounts->{$limit} >= $cap) { - push(@limitexceeded,$uname.':'.$udom); - last; - } - } elsif ($limit eq 'selfenrolled') { - if ($stucounts->{$limit} >= $cap) { - push(@limitexceeded,$uname.':'.$udom); - last; - } - } - my $result = - &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$usec,$access_end,$access_start,'selfenroll',undef,$cdom.'_'.$cnum,1); - if ($result eq 'ok') { - push(@enrolled,$uname.':'.$udom); - $stucounts->{'allstudents'} ++; - $stucounts->{'selfenrolled'} ++; - &Apache::selfenroll::send_notification($uname.':'.$udom,$approvedmsg,$cid, - $coursedesc,$now,'enroller',$sender); - my %userrequest = ( - $cdom.'_'.$cnum => { - timestamp => $now, - section => $usec, - adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, - status => 'approved', - } - ); - my $userresult = - &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname); - if ($userresult ne 'ok') { - push(@warn_approves,$uname.':'.$udom); - } - } else { - push(@enrollerrors,$uname.':'.$udom); - } - } - } else { - push(@invalidusers,$uname.':'.$udom); - } - } - my @changes = (@enrolled,@rejections); - if (@rejections) { - foreach my $user (@rejections) { - &Apache::selfenroll::send_notification($user,$rejectedmsg,$cid, - $coursedesc,$now,'enroller',$sender); - my ($uname,$udom) = split(/:/,$user); - my %userrequest = ( - $cdom.'_'.$cnum => { - timestamp => $now, - adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, - status => 'rejected', - } - ); - my $userresult = - &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname); - if ($userresult ne 'ok') { - push(@warn_rejects,$user); - } - } - } - if (@changes) { - my $delresult = &Apache::lonnet::del($namespace,\@changes,$cdom,$cnum); - if ($delresult eq 'ok') { - my $namelink = - &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}).' ('.$env{'user.name'}.':'.$env{'user.domain'}.')'; - my $chgmsg = "'Action was taken on the following enrollment requests by [_1].',$namelink"; - my ($approvedlist,$rejectedlist); - if (@enrolled) { - $approvedlist = join("\n",@enrolled); - $r->print('

    '.&mt('The following were enrolled in the course:').'

      '); - foreach my $user (@enrolled) { - my ($uname,$udom) = split(/:/,$user); - my $userlink = - &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom); - $r->print('
    • '.$userlink.'
      • '); - } - $r->print('

    '); - } - if (@rejections) { - $rejectedlist = join("\n",@rejections); - $r->print('

    '.&mt('The following enrollment requests were rejected:').'

      '); - foreach my $user (@rejections) { - $r->print('
    • '.$user.'
      • '); - } - $r->print('

    '); - } - &Apache::selfenroll::send_notification($notifylist,$chgmsg,$cid, - $coursedesc,$now,'managers', - $sender,$approvedlist,$rejectedlist); - } - } - if (@existing) { - $r->print('

    '.&mt('The following enrollment requests were deleted because the user is already enrolled in the course:').'

      '); - foreach my $user (@existing) { - $r->print('
    • '.$user.'
      • '); - } - $r->print('

    '); - } - if (@missingreq) { - $r->print('

    '.&mt('The following enrollment requests were ignored because the request is no longer in the enrollment queue:').'

      '); - foreach my $user (@missingreq) { - $r->print('
    • '.$user.'
      • '); - } - $r->print('

    '); - } - if (@invalidusers) { - $r->print('

    '.&mt('The following enrollment requests were deleted because the requestor does not have a LON-CAPA account:').'

      '); - foreach my $user (@invalidusers) { - $r->print('
    • '.$user.'
      • '); - } - $r->print('

    '); - } - if (@limitexceeded) { - $r->print('

    '.&mt('The following enrollment requests were skipped because the enrollment limit has been reached for the course:').'

      '); - foreach my $user (@limitexceeded) { - $r->print('
    • '.$user.'
      • '); - } - $r->print('

    '); - } - if (@enrollerrors) { - $r->print('

    '.&mt('The following enrollment requests could not be processed because an error occurred:').'

      '); - foreach my $user (@enrollerrors) { - $r->print('
    • '.$user.'
      • '); - } - $r->print('

    '); - } - if (@warn_approves) { - $r->print('

    '.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'

      '); - foreach my $user (@warn_approves) { - $r->print('
    • '.$user.'
      • '); - } - $r->print('

    '); - } - if (@warn_rejects) { - $r->print('

    '.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'

      '); - foreach my $user (@warn_rejects) { - $r->print('
    • '.$user.'
      • '); - } - $r->print('

    '); - } - return; -} - -sub get_student_counts { - my ($cdom,$cnum) = @_; - my (%idx,%stucounts); - my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cnum); - $idx{'type'} = &Apache::loncoursedata::CL_TYPE(); - $idx{'status'} = &Apache::loncoursedata::CL_STATUS(); - while (my ($student,$data) = each(%$classlist)) { - if (($data->[$idx{'status'}] eq 'Active') || - ($data->[$idx{'status'}] eq 'Future')) { - if ($data->[$idx{'type'}] eq 'selfenroll') { - $stucounts{'selfenroll'} ++; - } - $stucounts{'allstudents'} ++; - } - } - return (\%stucounts,\%idx,$classlist); -} - sub visible_in_cat { my ($cdom,$cnum) = @_; my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); @@ -4378,7 +4597,7 @@ sub visible_in_cat { miss => 'Your course does not currently appear in the Course Catalog for this domain.', yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.', coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.', - make => 'Make any changes to self-enrollment settings below, click "Save changes", then take action to include the course in the Catalog:', + make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:', take => 'Take the following action to ensure the course appears in the Catalog:', dc_unhide => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.', dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".', @@ -4724,6 +4943,7 @@ sub print_userchangelogs_display { $r->print(''); $r->print(<<"ENDSCRIPT"); ENDSCRIPT } } else { - $r->print(&mt('There are no records to display')); + $r->print('

    '. + &mt('There are no records to display'). + '

    '); } $r->print(''. ''); @@ -4750,7 +4973,7 @@ sub role_display_filter { my $context = 'course'; my $nolink = 1; my $output = ''; @@ -4791,20 +5014,29 @@ sub role_display_filter { foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll') { my $selstr = ''; if ($curr->{'chgcontext'} eq $chgtype) { - $output .= $selstr = ' selected="selected"'; + $selstr = ' selected="selected"'; } if (($chgtype eq 'auto') || ($chgtype eq 'updatenow')) { next if (!&Apache::lonnet::auto_run($cnum,$cdom)); } $output .= ''."\n"; } - $output .= '
    '. - ''.&mt('Changes/page:').'
    '. + ''.&mt('Changes/page:').'
    '. &Apache::lonmeta::selectbox('show',$curr->{'show'},undef, (&mt('all'),5,10,20,50,100,1000,10000)). '    		    
    '. - ''. - &mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.6.99.0 or later are displayed.'); + $output .= '' + .''; + + # Update Display button + $output .= '

    ' + .'' + .'

    '; + + # Server version info + $output .= '

    ' + .&mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.' + ,'2.6.99.0'); if ($version) { - $output .= ' '.&mt('This server is version [_3].','','',$version); } - $output .= '


    '; + $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version); + } + $output .= '


    '; return $output; } @@ -4816,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; } @@ -4901,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); @@ -5192,17 +5434,27 @@ 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($createdom,$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'}.'') - .'
    • ' + .'
      '; + if ($context eq 'requestcrs') { + $response .= &mt("(You can only define new users in the new course's domain - [_1])",$targetdom); + } else { + $response .= &mt("(You can only create new users in your current role's domain - [_1])",$targetdom); + } + $response .= '
      • ' .&mt("Set 'Domain/institution to search' to: [_1]",''.$showdom.'') .'
      • ' .&mt("Set 'Search criteria' to: [_1]username is ..... in selected LON-CAPA domain[_2]",'','') @@ -5213,11 +5465,14 @@ sub build_search_response { .'

      '; } else { my $helplink = ' href="javascript:helpMenu('."'display'".')"'; - $response .= '

      ' - .&mt("You are not authorized to create new users in your current role's domain - [_1]." - ,''.$env{'request.role.domain'}.'') - .'
      ' - .&mt('Contact the [_1]helpdesk[_2] if you need to create a new user.' + $response .= '

      '; + if ($context eq 'requestcrs') { + $response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom); + } else { + $response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom); + } + $response .= '
      ' + .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.' ,' ' ,'') .'

      '; @@ -5433,7 +5688,7 @@ sub course_level_dc { ''.$courseform.''.$lt{'rol'}.''.$lt{'grs'}.''.$lt{'sta'}.''.$lt{'end'}.''. &Apache::loncommon::end_data_table_header_row(); my $otheritems = &Apache::loncommon::start_data_table_row()."\n". - ''."\n". + ''."\n". '