--- loncom/interface/lonuserutils.pm 2007/12/22 00:47:25 1.23 +++ loncom/interface/lonuserutils.pm 2007/12/26 14:38:13 1.36 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Utility functions for managing LON-CAPA user accounts # -# $Id: lonuserutils.pm,v 1.23 2007/12/22 00:47:25 raeburn Exp $ +# $Id: lonuserutils.pm,v 1.36 2007/12/26 14:38:13 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -304,7 +304,7 @@ sub print_upload_manager_header { my $javascript_validations = &javascript_validations('upload',$krbdefdom,$password_choice,undef, $env{'request.role.domain'},$context, - $permission,$groupslist); + $groupslist); my $checked=(($env{'form.noFirstLine'})?' checked="checked" ':''); $r->print(&mt('Total number of records found in file: [_1].',$distotal). "
\n"); @@ -332,7 +332,7 @@ sub print_upload_manager_header { ############################################################### sub javascript_validations { my ($mode,$krbdefdom,$curr_authtype,$curr_authfield,$domain, - $context,$permission,$groupslist)=@_; + $context,$groupslist)=@_; my %param = ( kerb_def_dom => $krbdefdom, @@ -738,13 +738,13 @@ sub print_upload_manager_footer { } if ($context eq 'author') { $Str .= '

'.&mt('Default role')."

\n". - &mt('Choose the role to assign to users without one specified in the uploaded file'); + &mt('Choose the role to assign to users without a value specified in the uploaded file'); } elsif ($context eq 'course') { $Str .= '

'.&mt('Default role and section')."

\n". - &mt('Choose the role and/or section to assign to users without one specified in the uploaded file'); + &mt('Choose the role and/or section(s) to assign to users without values specified in the uploaded file'); } else { - $Str .= '

'.&mt('Default role and/or section')."
\n". - &mt('Role and/or section for users without one in the uploaded file.'); + $Str .= '

'.&mt('Default role and/or section(s)')."
\n". + &mt('Role and/or section(s) for users without values specified in the uploaded file.'); } $Str .= '
'; if (($context eq 'domain') || ($context eq 'author')) { @@ -761,8 +761,7 @@ sub print_upload_manager_footer { $permission,$context,'upload'); $Str .= $secbox."

".&mt('Full Update')."

\n". '

\n"; + ' '.&mt('Display students with current/future access who are not in the uploaded file.').'
'.&mt('Students selected from this list can be dropped.').'

'."\n"; } if ($context eq 'course' || $context eq 'domain') { $Str .= &forceid_change($context); @@ -786,13 +785,14 @@ sub forceid_change { "

\n".'
'."\n". - &mt('(only do if you know what you are doing.)')."

\n"; + &mt('(only do if you know what you are doing.)')."\n"; if ($context eq 'domain') { - $output .= '

'."\n"; + ''."\n"; } + $output .= '

'; return $output; } @@ -962,7 +962,7 @@ sub date_setting_table { ($env{'form.action'} eq 'upload')) { if ($env{'request.course.sec'} eq '') { $dateDefault = ''. - ''; } @@ -1001,14 +1001,14 @@ sub make_dates_default { {'default_enrollment_start_date'=>$startdate, 'default_enrollment_end_date' =>$enddate},$cdom,$cnum); if ($put_result eq 'ok') { - $result .= &mt('Set default start and end dates for course'). + $result .= &mt('Set default start and end access dates for course.'). '
'."\n"; # # Refresh the course environment &Apache::lonnet::coursedescription($env{'request.course.id'}, {'freshen_cache' => 1}); } else { - $result .= &mt('Unable to set default dates for course').":".$put_result. + $result .= &mt('Unable to set default access dates for course.').":".$put_result. '
'; } } @@ -1263,7 +1263,7 @@ sub print_userlist { if ($env{'form.showrole'} eq 'Any') { $roleselected = ' selected="selected" '; } - my $role_select; + my ($role_select,$cnum,$cdom); if ($context eq 'domain') { $role_select = &domain_roles_select(); $r->print(''); @@ -1287,9 +1287,14 @@ sub print_userlist { } $role_select .= ''; $r->print(''); + if ($context eq 'course') { + ($cnum,$cdom) = &get_course_identity(); + $r->print(§ion_group_filter($cnum,$cdom)); + } } if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) { - $r->print(&list_submit_button(&mt('Update Display'))."\n

\n"); + $r->print(' '.&list_submit_button(&mt('Update Display')). + "\n

\n"); } my ($indexhash,$keylist) = &make_keylist_array(); my (%userlist,%userinfo); @@ -1305,7 +1310,7 @@ sub print_userlist { &Apache::lonhtmlcommon::row_closure(1). &Apache::lonhtmlcommon::end_pick_box().'

'. '

'.&list_submit_button(&mt('Update Display')). - "\n

\n"); + "\n".'

'.&mt('Warning: data retrieval for multiple courses can take considerable time, as this operation is not currently optimized.').''."\n"); if ($env{'form.coursepick'}) { $r->print('
'.&mt('Searching').' ...
 
'); } @@ -1329,8 +1334,6 @@ sub print_userlist { $userlist{$student} = $classlist->{$student}; } } - my $cid = $env{'request.course.id'}; - my ($cnum,$cdom) = &get_course_identity($cid); my $showroles; if ($env{'form.showrole'} ne 'Any') { $showroles = [$env{'form.showrole'}]; @@ -1466,6 +1469,62 @@ sub print_userlist { $env{'form.phase'}.'" />'); } +sub section_group_filter { + my ($cnum,$cdom) = @_; + my @filters; + if ($env{'request.course.sec'} eq '') { + @filters = ('sec'); + } + push(@filters,'grp'); + my %name = ( + sec => 'secfilter', + grp => 'grpfilter', + ); + my %title = &Apache::lonlocal::texthash ( + sec => 'Section(s)', + grp => 'Group(s)', + all => 'all', + none => 'none', + ); + my ($output,@options); + foreach my $item (@filters) { + my $markup; + if ($env{'form.'.$name{$item}} eq '') { + $env{'form.'.$name{$item}} = 'all'; + } + if ($item eq 'sec') { + if ($env{'form.showrole'} eq 'cc') { + $env{'form.'.$name{$item}} = 'none'; + } + my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum); + @options = sort(keys(%sections_count)); + } elsif ($item eq 'grp') { + my %curr_groups = &Apache::longroup::coursegroups(); + @options = sort(keys(%curr_groups)); + } + if (@options > 0) { + my $currsel; + $markup = ''."\n"; + $output .= (' 'x3).''; + } + } + return $output; +} + sub list_submit_button { my ($text) = @_; return ''; @@ -1479,7 +1538,8 @@ sub gather_userinfo { ($userdata{'username'},$userdata{'domain'},$userdata{'role'}) = split(/:/,$item); ($userdata{'start'},$userdata{'end'})=split(/:/,$rolehash->{$item}); - &build_user_record(\%userdata,$userinfo,$indexhash,$item,$userlist); + &build_user_record($context,\%userdata,$userinfo,$indexhash, + $item,$userlist); } elsif ($context eq 'course') { my $viewablesec = &viewable_section($permission); ($userdata{'username'},$userdata{'domain'},$userdata{'role'}, @@ -1488,13 +1548,15 @@ sub gather_userinfo { if (($viewablesec ne '') && ($userdata{'section'} ne '')) { next if ($viewablesec ne $userdata{'section'}); } - &build_user_record(\%userdata,$userinfo,$indexhash,$item,$userlist); + &build_user_record($context,\%userdata,$userinfo,$indexhash, + $item,$userlist); } elsif ($context eq 'domain') { if ($env{'form.roletype'} eq 'domain') { ($userdata{'role'},$userdata{'username'},$userdata{'domain'}) = split(/:/,$item); ($userdata{'end'},$userdata{'start'})=split(/:/,$rolehash->{$item}); - &build_user_record(\%userdata,$userinfo,$indexhash,$item,$userlist); + &build_user_record($context,\%userdata,$userinfo,$indexhash, + $item,$userlist); } elsif ($env{'form.roletype'} eq 'author') { if (ref($rolehash->{$item}) eq 'HASH') { $userdata{'extent'} = $item; @@ -1503,7 +1565,8 @@ sub gather_userinfo { ($userdata{'start'},$userdata{'end'}) = split(/:/,$rolehash->{$item}{$key}); my $uniqid = $key.':'.$item; - &build_user_record(\%userdata,$userinfo,$indexhash,$uniqid,$userlist); + &build_user_record($context,\%userdata,$userinfo, + $indexhash,$uniqid,$userlist); } } } elsif ($env{'form.roletype'} eq 'course') { @@ -1521,9 +1584,9 @@ sub gather_userinfo { # FIXME: actions on courses disabled for now # if ($permission->{'cusr'}) { # if ($numcids > 1) { -# $spanstart .= ''; +# $spanstart .= ' '; # } else { -# $spanstart .= ''; +# $spanstart .= ' '; # } # } $spanend = '
'; @@ -1533,13 +1596,20 @@ sub gather_userinfo { $rolehash->{$item}{$cid}{'desc'}.$space; if (ref($rolehash->{$item}{$cid}{'secs'}) eq 'HASH') { foreach my $sec (sort(keys(%{$rolehash->{$item}{$cid}{'secs'}}))) { - $userdata{'extent'} .= $sec.$space.$rolehash->{$item}{$cid}{'secs'}{$sec}.$spanend; + if (($env{'form.Status'} eq 'Any') || + ($env{'form.Status'} eq $rolehash->{$item}{$cid}{'secs'}{$sec})) { + $userdata{'extent'} .= $sec.$space.$rolehash->{$item}{$cid}{'secs'}{$sec}.$spanend; + $userdata{'status'} = $rolehash->{$item}{$cid}{'secs'}{$sec}; + } } } } } } - &build_user_record(\%userdata,$userinfo,$indexhash,$item,$userlist); + if ($userdata{'status'} ne '') { + &build_user_record($context,\%userdata,$userinfo, + $indexhash,$item,$userlist); + } } } } @@ -1547,14 +1617,15 @@ sub gather_userinfo { } sub build_user_record { - my ($userdata,$userinfo,$indexhash,$record_key,$userlist) = @_; + my ($context,$userdata,$userinfo,$indexhash,$record_key,$userlist) = @_; next if ($userdata->{'start'} eq '-1' && $userdata->{'end'} eq '-1'); - &process_date_info($userdata); + if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) { + &process_date_info($userdata); + } my $username = $userdata->{'username'}; my $domain = $userdata->{'domain'}; if (ref($userinfo->{$username.':'.$domain}) eq 'HASH') { - $userdata->{'fullname'} = - $userinfo->{$username.':'.$domain}{'fullname'}; + $userdata->{'fullname'} = $userinfo->{$username.':'.$domain}{'fullname'}; $userdata->{'id'} = $userinfo->{$username.':'.$domain}{'id'}; } else { &aggregate_user_info($domain,$username,$userinfo); @@ -1844,8 +1915,8 @@ END if ($mode ne 'autoenroll') { my $check_uncheck_js = &Apache::loncommon::check_uncheck_jscript(); my $alert = &mt("You must select at least one user by checking a user's 'Select' checkbox"); - my $singconfirm = &mt(' for a single user'); - my $multconfirm = &mt(' for multiple users'); + my $singconfirm = &mt(' for a single user?'); + my $multconfirm = &mt(' for multiple users?'); my $date_sec_selector = &date_section_javascript($context,$setting,$statusmode); $r->print(<print(''.$results_description.'
'); } - my ($output,$actionselect); + my ($output,$actionselect,%canchange,%canchangesec); if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll') { if ($mode ne 'autoenroll') { if ($permission->{'cusr'}) { @@ -2015,6 +2086,45 @@ $lt{'ac'}: $actionselect   END + my @allroles; + if ($env{'form.showrole'} eq 'Any') { + my $custom = 1; + if ($context eq 'domain') { + @allroles = &roles_by_context($setting,$custom); + } else { + @allroles = &roles_by_context($context,$custom); + } + } else { + @allroles = ($env{'form.showrole'}); + } + foreach my $role (@allroles) { + if ($context eq 'domain') { + if ($setting eq 'domain') { + if (&Apache::lonnet::allowed('c'.$role, + $env{'request.role.domain'})) { + $canchange{$role} = 1; + } + } elsif ($setting eq 'author') { + if (&Apache::lonnet::allowed('c'.$role, + $env{'request.role.domain'})) { + $canchange{$role} = 1; + } + } + } elsif ($context eq 'author') { + if (&Apache::lonnet::allowed('c'.$role, + $env{'user.domain'}.'/'.$env{'user.name'})) { + $canchange{$role} = 1; + } + } elsif ($context eq 'course') { + if (&Apache::lonnet::allowed('c'.$role,$env{'request.course.id'})) { + $canchange{$role} = 1; + } elsif ($env{'request.course.sec'} ne '') { + if (&Apache::lonnet::allowed('c'.$role,$env{'request.course.id'}.'/'.$env{'request.course.sec'})) { + $canchangesec{$role} = $env{'request.course.sec'}; + } + } + } + } } } $output .= "\n

\n". @@ -2110,6 +2220,17 @@ END $index{$idx} = $i++; } my $usercount = 0; + my ($secfilter,$grpfilter); + if ($context eq 'course') { + $secfilter = $env{'form.secfilter'}; + $grpfilter = $env{'form.grpfilter'}; + if ($secfilter eq '') { + $secfilter = 'all'; + } + if ($grpfilter eq '') { + $grpfilter = 'all'; + } + } # Get groups, role, permanent e-mail so we can sort on them if # necessary. foreach my $user (keys(%{$userlist})) { @@ -2147,11 +2268,40 @@ END delete($userlist->{$user}); next; } - if (ref($classgroups) eq 'HASH') { - $groups = $classgroups->{$user}; - } - if (ref($groups->{active}) eq 'HASH') { - $userlist->{$user}->[$index{'groups'}] = join(', ',keys(%{$groups->{'active'}})); + if ($context eq 'course') { + my @ac_groups; + if (ref($classgroups) eq 'HASH') { + $groups = $classgroups->{$user}; + } + if (ref($groups->{'active'}) eq 'HASH') { + @ac_groups = keys(%{$groups->{'active'}}); + $userlist->{$user}->[$index{'groups'}] = join(', ',@ac_groups); + } + if ($mode ne 'autoenroll') { + my $section = $userlist->{$user}->[$index{'section'}]; + if ($secfilter eq 'none') { + if ($section ne '') { + delete($userlist->{$user}); + next; + } + } elsif ($secfilter ne 'all') { + if ($section ne $secfilter) { + delete($userlist->{$user}); + next; + } + } + if ($grpfilter eq 'none') { + if (@ac_groups > 0) { + delete($userlist->{$user}); + next; + } + } elsif ($grpfilter ne 'all') { + if (!grep(/^\Q$grpfilter\E$/,@ac_groups)) { + delete($userlist->{$user}); + next; + } + } + } } my %emails = &Apache::loncommon::getemails($uname,$udom); if ($emails{'permanentemail'} =~ /\S/) { @@ -2226,20 +2376,39 @@ END $r->print("$cellentry\n"); } else { $r->print("$rowcount\n"); - $checkval; if ($actionselect) { - $checkval = $user; - if ($context eq 'course') { - if ($role eq 'st') { - $checkval .= ':st'; + my $showcheckbox; + if ($role =~ /^cr\//) { + $showcheckbox = $canchange{'cr'}; + } else { + $showcheckbox = $canchange{$role}; + } + if (!$showcheckbox) { + if ($context eq 'course') { + if ($canchangesec{$role} ne '') { + if ($canchangesec{$role} eq $in{'section'}) { + $showcheckbox = 1; + } + } } - $checkval .= ':'.$in{'section'}; - if ($role eq 'st') { - $checkval .= ':'.$in{'type'}.':'.$in{'lockedtype'}; + } + if ($showcheckbox) { + $checkval = $user; + if ($context eq 'course') { + if ($role eq 'st') { + $checkval .= ':st'; + } + $checkval .= ':'.$in{'section'}; + if ($role eq 'st') { + $checkval .= ':'.$in{'type'}.':'. + $in{'lockedtype'}; + } } + $r->print(''); + } else { + $r->print(' '); } - $r->print(''); } } foreach my $item (@cols) { @@ -2372,6 +2541,20 @@ sub select_actions { if ($context eq 'domain' && $setting eq 'course') { return; } + if ($context eq 'course') { + if ($env{'form.showrole'} ne 'Any') { + if (!&Apache::lonnet::allowed('c'.$env{'form.showrole'}, + $env{'request.course.id'})) { + if ($env{'request.course.sec'} eq '') { + return; + } else { + if (!&Apache::lonnet::allowed('c'.$env{'form.showrole'},$env{'request.course.id'}.'/'.$env{'request.course.sec'})) { + return; + } + } + } + } + } if ($statusmode eq 'Any') { $options .= ' '; @@ -2398,7 +2581,7 @@ sub select_actions { '; } if (($context eq 'course') || ($context eq 'domain' && $setting eq 'course')) { - if ($statusmode ne 'Expired') { + if (($statusmode ne 'Expired') && ($env{'request.course.sec'} eq '')) { $options .= ' '; $choices{'sections'} = 1; @@ -2505,7 +2688,8 @@ END if (($env{'form.bulkaction'} eq 'reenable') || ($env{'form.bulkaction'} eq 'activate') || ($env{'form.bulkaction'} eq 'chgdates')) { - $output .= <<"END"; + if ($env{'request.course.sec'} eq '') { + $output .= <<"END"; if (formname.makedatesdefault.checked == true) { opener.document.$callingform.makedatesdefault.value = 1; @@ -2515,6 +2699,7 @@ END } END + } } } $output .= <<"END"; @@ -2564,12 +2749,10 @@ END $date_items; if ($context eq 'course' && $env{'form.bulkaction'} eq 'chgsec') { my ($cnum,$cdom) = &get_course_identity(); - my %sections_count = - &Apache::loncommon::get_sections($cdom,$cnum); my $info; if ($env{'form.showrole'} eq 'st') { $output .= '

'.$lt{'fors'}.'

'; - } elsif ($env{'form.shorole'} eq 'Any') { + } elsif ($env{'form.showrole'} eq 'Any') { $output .= '

'.$lt{'fors'}.'

'. '

'.$lt{'forn'}.' '; $info = $lt{'reta'}; @@ -2590,7 +2773,6 @@ END } else { $info = ''; } - my $sections_select .= &course_sections(\%sections_count,$env{'form.showrole'}); my $rowtitle = &mt('New section to assign'); my $secbox = §ion_picker($cdom,$cnum,$env{'form.showrole'},$rowtitle,$permission,$context); $output .= $info.$secbox; @@ -2633,13 +2815,15 @@ sub section_picker { } sub results_header_row { - my ($rolefilter,$statusmode,$context,$permission) = @_; + my ($rolefilter,$statusmode,$context,$permission,$mode) = @_; my ($description,$showfilter); if ($rolefilter ne 'Any') { $showfilter = $rolefilter; } if ($context eq 'course') { - $description = &mt('Course - ').$env{'course.'.$env{'request.course.id'}.'.description'}.': '; + if ($mode eq 'csv' || $mode eq 'excel') { + $description = &mt('Course - ').$env{'course.'.$env{'request.course.id'}.'.description'}.': '; + } if ($statusmode eq 'Expired') { $description .= &mt('Users in course with expired [_1] roles',$showfilter); } elsif ($statusmode eq 'Future') { @@ -2653,13 +2837,48 @@ sub results_header_row { $description .= &mt('All users in course with [_1] roles',$rolefilter); } } - if (exists($permission->{'view_section'})) { + my $constraint; + my $viewablesec = &viewable_section($permission); + if ($viewablesec ne '') { if ($env{'form.showrole'} eq 'st') { - $description .= ' '.&mt('(section [_1] only)',$permission->{'view_section'}); - } elsif ($env{'form.showrole'} eq 'any') { - $description .= ' '.&mt('(section [_1] only)',$permission->{'view_section'}); + $constraint = &mt('only users in section "[_1]"',$viewablesec); + } elsif ($env{'form.showrole'} ne 'cc') { + $constraint = &mt('only users affiliated with no section or section "[_1]"',$viewablesec); + } + if (($env{'form.grpfilter'} ne 'all') && ($env{'form.grpfilter'} ne '')) { + if ($env{'form.grpfilter'} eq 'none') { + $constraint .= &mt(' and not in any group'); + } else { + $constraint .= &mt(' and members of group: "[_1]"',$env{'form.grpfilter'}); + } + } + } else { + if (($env{'form.secfilter'} ne 'all') && ($env{'form.secfilter'} ne '')) { + if ($env{'form.secfilter'} eq 'none') { + $constraint = &mt('only users affiliated with no section'); + } else { + $constraint = &mt('only users affiliated with section "[_1]"',$env{'form.secfilter'}); + } + } + if (($env{'form.grpfilter'} ne 'all') && ($env{'form.grpfilter'} ne '')) { + if ($env{'form.grpfilter'} eq 'none') { + if ($constraint eq '') { + $constraint = &mt('only users not in any group'); + } else { + $constraint .= &mt(' and also not in any group'); + } + } else { + if ($constraint eq '') { + $constraint = &mt('only members of group: "[_1]"',$env{'form.grpfilter'}); + } else { + $constraint .= &mt(' and also members of group: "[_1]"'.$env{'form.grpfilter'}); + } + } } } + if ($constraint ne '') { + $description .= ' ('.$constraint.')'; + } } elsif ($context eq 'author') { $description = &mt('Author space for [_1]', @@ -2757,8 +2976,8 @@ sub viewable_section { ################################################# ################################################# sub show_drop_list { - my ($r,$classlist,$keylist,$nosort,$permission)=@_; - my $cid=$env{'request.course.id'}; + my ($r,$classlist,$nosort,$permission) = @_; + my $cid = $env{'request.course.id'}; my ($cnum,$cdom) = &get_course_identity($cid); if (! exists($env{'form.sortby'})) { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, @@ -2768,9 +2987,6 @@ sub show_drop_list { if ($sortby !~ /^(username|domain|section|groups|fullname|id|start|end)$/) { $sortby = 'username'; } - my ($classgroups) = &Apache::loncoursedata::get_group_memberships( - $classlist,$keylist,$cdom,$cnum); - # my $action = "drop"; my $check_uncheck_js = &Apache::loncommon::check_uncheck_jscript(); $r->print(< END - -my %lt=&Apache::lonlocal::texthash('usrn' => "username", - 'dom' => "domain", - 'sn' => "student name", - 'sec' => "section", - 'start' => "start date", - 'end' => "end date", - 'groups' => "active groups", - ); + my ($indexhash,$keylist) = &make_keylist_array(); + my $studentcount = 0; + if (ref($classlist) eq 'HASH') { + foreach my $student (keys(%{$classlist})) { + my $sdata = $classlist->{$student}; + my $status = $sdata->[$indexhash->{'status'}]; + my $section = $sdata->[$indexhash->{'section'}]; + if ($status ne 'Active') { + delete($classlist->{$student}); + next; + } + if ($env{'request.course.sec'} ne '') { + if ($section ne $env{'request.course.sec'}) { + delete($classlist->{$student}); + next; + } + } + $studentcount ++; + } + } + if (!$studentcount) { + $r->print(&mt('There are no students to drop.')); + return; + } + my ($classgroups) = &Apache::loncoursedata::get_group_memberships( + $classlist,$keylist,$cdom,$cnum); + my %lt=&Apache::lonlocal::texthash('usrn' => "username", + 'dom' => "domain", + 'sn' => "student name", + 'sec' => "section", + 'start' => "start date", + 'end' => "end date", + 'groups' => "active groups", + ); if ($nosort) { $r->print(&Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row()); @@ -2834,32 +3075,26 @@ END } # # Sort the students - my %index; - my $i; - foreach (@$keylist) { - $index{$_} = $i++; - } - $index{'groups'} = scalar(@$keylist); - my $index = $index{$sortby}; - my $second = $index{'username'}; - my $third = $index{'domain'}; + my $index = $indexhash->{$sortby}; + my $second = $indexhash->{'username'}; + my $third = $indexhash->{'domain'}; my @Sorted_Students = sort { lc($classlist->{$a}->[$index]) cmp lc($classlist->{$b}->[$index]) || lc($classlist->{$a}->[$second]) cmp lc($classlist->{$b}->[$second]) || lc($classlist->{$a}->[$third]) cmp lc($classlist->{$b}->[$third]) - } (keys(%$classlist)); + } (keys(%{$classlist})); foreach my $student (@Sorted_Students) { my $error; my $sdata = $classlist->{$student}; - my $username = $sdata->[$index{'username'}]; - my $domain = $sdata->[$index{'domain'}]; - my $section = $sdata->[$index{'section'}]; - my $name = $sdata->[$index{'fullname'}]; - my $id = $sdata->[$index{'id'}]; - my $start = $sdata->[$index{'start'}]; - my $end = $sdata->[$index{'end'}]; + my $username = $sdata->[$indexhash->{'username'}]; + my $domain = $sdata->[$indexhash->{'domain'}]; + my $section = $sdata->[$indexhash->{'section'}]; + my $name = $sdata->[$indexhash->{'fullname'}]; + my $id = $sdata->[$indexhash->{'id'}]; + my $start = $sdata->[$indexhash->{'start'}]; + my $end = $sdata->[$indexhash->{'end'}]; my $groups = $classgroups->{$student}; my $active_groups; if (ref($groups->{active}) eq 'HASH') { @@ -2875,25 +3110,18 @@ END } else { $end = &Apache::lonlocal::locallocaltime($end); } - my $status = $sdata->[$index{'status'}]; - next if ($status ne 'Active'); - if ($env{'request.course.sec'} ne '') { - if ($section ne $env{'request.course.sec'}) { - next; - } - } my $studentkey = $student.':'.$section; - my $startitem = ''; + my $startitem = ''; # $r->print(&Apache::loncommon::start_data_table_row()); $r->print(<<"END"); - + $username $domain $id $name $section - $start + $start $startitem $end $active_groups END @@ -2901,7 +3129,7 @@ END } $r->print(&Apache::loncommon::end_data_table().'
'); %lt=&Apache::lonlocal::texthash( - 'dp' => "Expire Users' Roles", + 'dp' => "Drop Students", 'ca' => "check all", 'ua' => "uncheck all", ); @@ -2958,6 +3186,10 @@ sub upfile_drop_add { $fields{$env{'form.f'.$i}}=$keyfields[$i]; } } + if ($env{'form.fullup'} ne 'yes') { + $r->print('

'."\n". + ''); + } # # Store the field choices away foreach my $field (qw/username names @@ -2979,7 +3211,7 @@ sub upfile_drop_add { # my ($startdate,$enddate) = &get_dates_from_form(); if ($env{'form.makedatesdefault'}) { - $r->print(&make_dates_default($startdate,$enddate)); + $r->print(&make_dates_default($startdate,$enddate,$context)); } # Determine domain and desired host (home server) my $domain=$env{'request.role.domain'}; @@ -3032,22 +3264,59 @@ sub upfile_drop_add { $defaultrole = $env{'form.defaultrole'}; } elsif ($setting eq 'course') { $defaultrole = $env{'form.courserole'}; + $defaultsec = $env{'form.sections'}; } } elsif ($context eq 'author') { $defaultrole = $env{'form.defaultrole'}; - } - if ($context eq 'domain' && $setting eq 'course') { - if ($env{'form.newsec'} ne '') { - $defaultsec = $env{'form.newsec'}; - } elsif ($env{'form.defaultsec'} ne '') { - $defaultsec = $env{'form.defaultsec'} - } + } elsif ($context eq 'course') { + $defaultrole = $env{'form.defaultrole'}; + $defaultsec = $env{'form.sections'}; } if ($env{'request.course.id'} ne '') { $cid = $env{'request.course.id'}; - } elsif ($env{'form.defaultdomain'} ne '' && $env{'form.defaultcourse'} ne '') { - $cid = $env{'form.defaultdomain'}.'_'. - $env{'form.defaultcourse'}; + } elsif ($setting eq 'course') { + if (&Apache::lonnet::is_course($env{'form.dcdomain'},$env{'form.dccourse'})) { + $cid = $env{'form.dcdomain'}.'_'.$env{'form.dccourse'}; + } + } + # Check to see if user information can be changed + my @userinfo = ('firstname','middlename','lastname','generation', + 'permanentemail','id'); + my %canmodify; + if (&Apache::lonnet::allowed('mau',$domain)) { + foreach my $field (@userinfo) { + $canmodify{$field} = 1; + } + } + my (%userlist,%modifiable_fields,@poss_roles); + my $secidx = &Apache::loncoursedata::CL_SECTION(); + my @courseroles = &roles_by_context('course',1); + if (!&Apache::lonnet::allowed('mau',$domain)) { + if ($context eq 'course' || $context eq 'author') { + @poss_roles = &curr_role_permissions($context); + my @statuses = ('active','future'); + my ($indexhash,$keylist) = &make_keylist_array(); + my %info; + foreach my $role (@poss_roles) { + %{$modifiable_fields{$role}} = &can_modify_userinfo($context,$domain, + \@userinfo,[$role]); + } + if ($context eq 'course') { + my ($cnum,$cdom) = &get_course_identity(); + my $roster = &Apache::loncoursedata::get_classlist(); + %userlist = %{$roster}; + my %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef, + \@statuses,\@poss_roles); + &gather_userinfo($context,'view',\%userlist,$indexhash,\%info, + \%advrolehash,$permission); + } elsif ($context eq 'author') { + my %cstr_roles = &Apache::lonnet::get_my_roles(undef,undef,undef, + \@statuses,\@poss_roles); + &gather_userinfo($context,'view',\%userlist,$indexhash,\%info, + \%cstr_roles,$permission); + + } + } } if ( $domain eq &LONCAPA::clean_domain($domain) && ($amode ne '')) { @@ -3068,16 +3337,50 @@ sub upfile_drop_add { ); my $flushc=0; my %student=(); - my %curr_groups; + my (%curr_groups,@sections,@cleansec,@secs,$defaultwarn,$groupwarn); my %userchg; - if ($context eq 'course') { - # Get information about course groups - %curr_groups = &Apache::longroup::coursegroups(); + if ($context eq 'course' || $setting eq 'course') { + if ($context eq 'course') { + # Get information about course groups + %curr_groups = &Apache::longroup::coursegroups(); + } elsif ($setting eq 'course') { + if ($cid) { + %curr_groups = + &Apache::longroup::coursegroups($env{'form.dcdomain'}, + $env{'form.dccourse'}); + } + } + # determine section number + if ($defaultsec =~ /,/) { + push(@sections,split(/,/,$defaultsec)); + } else { + push(@sections,$defaultsec); + } + # remove non alphanumeric values from section + foreach my $item (@sections) { + $item =~ s/\W//g; + if ($item eq "none" || $item eq 'all') { + $defaultwarn = &mt('Default section name [_1] could not be used as it is a reserved word.',$item); + } elsif ($item ne '' && exists($curr_groups{$item})) { + $groupwarn = &mt('Default section name "[_1]" is the name of a course group. Section names and group names must be distinct.',$item); + } elsif ($item ne '') { + push(@cleansec,$item); + } + } + if ($defaultwarn) { + $r->print($defaultwarn.'
'); + } + if ($groupwarn) { + $r->print($groupwarn.'
'); + } } my (%curr_rules,%got_rules,%alerts); + my %customroles = &my_custom_roles(); + my ($custom_ok,@permitted_roles) = + &roles_on_upload($context,%customroles); # Get new users list - foreach (@userdata) { - my %entries=&Apache::loncommon::record_sep($_); + foreach my $line (@userdata) { + my %entries=&Apache::loncommon::record_sep($line); # Determine user name unless (($entries{$fields{'username'}} eq '') || (!defined($entries{$fields{'username'}}))) { @@ -3105,30 +3408,43 @@ sub upfile_drop_add { &mt('[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]', $entries{$fields{'username'}},$fname,$mname,$lname,$gen). ''); + next; } else { my $username = $entries{$fields{'username'}}; - my $sec; - if ($context eq 'course' || $setting eq 'course') { - # determine section number - if (defined($fields{'sec'})) { - if (defined($entries{$fields{'sec'}})) { - $sec=$entries{$fields{'sec'}}; + if (defined($fields{'sec'})) { + if (defined($entries{$fields{'sec'}})) { + my $item = $entries{$fields{'sec'}}; + $item =~ s/(\s+$|^\s+)//g; + if ($item eq "none" || $item eq 'all') { + $r->print('
'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a reserved word.',$username,$fname,$mname,$lname,$gen,$item)); + next; + } elsif (exists($curr_groups{$item})) { + $r->print('
'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a course group.',$username,$fname,$mname,$lname,$gen,$item).' '.&mt('Section names and group names must be distinct.')); + next; + } else { + push(@secs,$item); } - } else { - $sec = $defaultsec; } - # remove non alphanumeric values from section - $sec =~ s/\W//g; - if ($sec eq "none" || $sec eq 'all') { - $r->print('
'. - &mt('[_1]: Unable to enroll: section name "[_2]" for user [_3] [_4] [_5] [_6] is a reserved word.', - $username,$sec,$fname,$mname,$lname,$gen)); - next; - } elsif (($sec ne '') && (exists($curr_groups{$sec}))) { - $r->print('
'. - &mt('[_1]: Unable to enroll: section name "[_2]" for user [_3] [_4] [_5] [_6] is a course group. Section names and group names must be distinct.', - $username,$sec,$fname,$mname,$lname,$gen)); - next; + } + if ($env{'request.course.sec'} ne '') { + @secs = ($env{'request.course.sec'}); + if (ref($userlist{$username.':'.$domain}) eq 'ARRAY') { + my $currsec = $userlist{$username.':'.$domain}[$secidx]; + if ($currsec ne $env{'request.course.sec'}) { + $r->print('
'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]".',$username,$fname,$mname,$lname,$gen,$secs[0]).'
'); + if ($currsec eq '') { + $r->print(&mt('This user already has an active/future student role in the course, unaffiliated to any section.')); + + } else { + $r->print(&mt('This user already has an active/future role in section "[_1]" of the course.',$currsec)); + } + $r->print('
'.&mt('Although your current role has privileges to add students to section "[_1]", you do not have privileges to modify existing enrollments in other sections.',$secs[0]).'
'); + next; + } + } + } elsif ($context eq 'course' || $setting eq 'course') { + if (@secs == 0) { + @secs = @cleansec; } } # determine id number @@ -3157,12 +3473,17 @@ sub upfile_drop_add { my $role = ''; if (defined($fields{'role'})) { if ($entries{$fields{'role'}}) { - my @poss_roles = - &curr_role_permissions($context,$setting); - if (grep(/^\Q$entries{$fields{'role'}}\E/,@poss_roles)) { + if (grep(/^\Q$entries{$fields{'role'}}\E$/,@permitted_roles)) { $role=$entries{$fields{'role'}}; - } else { - my $rolestr = join(', ',@poss_roles); + $role =~ s/(\s+$|^\s+)//g; + } + if ($custom_ok) { + if ($customroles{$role}) { + $role = 'cr_'.$env{'user.domain'}.'_'.$env{'user.name'}.'_'.$entries{$fields{'role'}}; + } + } + if ($role eq '') { + my $rolestr = join(', ',@permitted_roles); $r->print('
'. &mt('[_1]: You do not have permission to add the requested role [_2] for the user.',$entries{$fields{'username'}},$entries{$fields{'role'}}).'
'.&mt('Allowable role(s) is/are: [_1].',$rolestr)."\n"); next; @@ -3174,7 +3495,7 @@ sub upfile_drop_add { } # Clean up whitespace foreach (\$domain,\$username,\$id,\$fname,\$mname, - \$lname,\$gen,\$sec,\$role) { + \$lname,\$gen) { $$_ =~ s/(\s+$|^\s+)//g; } # check against rules @@ -3197,7 +3518,35 @@ sub upfile_drop_add { } } } else { -# FIXME check if user info can be updated. + if ($context eq 'course' || $context eq 'author') { + if ($role eq '') { + my @checkroles; + foreach my $role (@poss_roles) { + my $endkey; + if ($role ne 'st') { + $endkey = ':'.$role; + } + if (exists($userlist{$username.':'.$domain.$endkey})) { + if (!grep(/^\Q$role\E$/,@checkroles)) { + push(@checkroles,$role); + } + } + } + if (@checkroles > 0) { + %canmodify = &can_modify_userinfo($context,$domain,\@userinfo,\@checkroles); + } + } elsif (ref($modifiable_fields{$role}) eq 'HASH') { + %canmodify = %{$modifiable_fields{$role}}; + } + } + my @newinfo = (\$fname,\$mname,\$lname,\$gen,\$email,\$id); + for (my $i=0; $i<@userinfo; $i++) { + if (${$newinfo[$i]} ne '') { + if (!$canmodify{$userinfo[$i]}) { + ${$newinfo[$i]} = ''; + } + } + } } if ($id ne '') { if (!$newuser) { @@ -3222,29 +3571,73 @@ sub upfile_drop_add { } } if ($password || $env{'form.login'} eq 'loc') { - my ($userresult,$authresult,$roleresult); + my $multiple = 0; + my ($userresult,$authresult,$roleresult,$idresult); + my (%userres,%authres,%roleres,%idres); if ($role eq 'st') { - &modifystudent($domain,$username,$cid,$sec, - $desiredhost); - $roleresult = - &Apache::lonnet::modifystudent - ($domain,$username,$id,$amode,$password, - $fname,$mname,$lname,$gen,$sec,$enddate, - $startdate,$env{'form.forceid'}, - $desiredhost,$email); + my $sec; + if ($cid) { + if (@secs > 0) { + $sec = $secs[0]; + } + &modifystudent($domain,$username,$cid,$sec, + $desiredhost); + $roleresult = + &Apache::lonnet::modifystudent + ($domain,$username,$id,$amode,$password, + $fname,$mname,$lname,$gen,$sec,$enddate, + $startdate,$env{'form.forceid'}, + $desiredhost,$email,'manual','',$cid); + $userresult = $roleresult; + } } else { - ($userresult,$authresult,$roleresult) = - &modifyuserrole($context,$setting, - $changeauth,$cid,$domain,$username, - $id,$amode,$password,$fname, - $mname,$lname,$gen,$sec, - $env{'form.forceid'},$desiredhost, - $email,$role,$enddate,$startdate,$checkid); + if (($context eq 'course') || + (grep(/^\Q$role\E$/,@courseroles))) { + if (!$cid) { + next; + } + } + my $singlesec; + if ((grep(/^\Q$role\E$/,@courseroles)) && ($role ne 'cc')) { + if (@secs > 1) { + $multiple = 1; + foreach my $sec (@secs) { + ($userres{$sec},$authres{$sec},$roleres{$sec},$idres{$sec}) = + &modifyuserrole($context,$setting, + $changeauth,$cid,$domain,$username, + $id,$amode,$password,$fname, + $mname,$lname,$gen,$sec, + $env{'form.forceid'},$desiredhost, + $email,$role,$enddate,$startdate,$checkid); + } + } elsif (@secs > 0) { + $singlesec = $secs[0]; + } + } + if (!$multiple) { + ($userresult,$authresult,$roleresult,$idresult) = + &modifyuserrole($context,$setting, + $changeauth,$cid,$domain,$username, + $id,$amode,$password,$fname, + $mname,$lname,$gen,$singlesec, + $env{'form.forceid'},$desiredhost, + $email,$role,$enddate,$startdate,$checkid); + } + } + if ($multiple) { + foreach my $sec (sort(keys(%userres))) { + $flushc = + &user_change_result($r,$userres{$sec},$authres{$sec}, + $roleres{$sec},$idres{$sec},\%counts,$flushc, + $username,\%userchg); + + } + } else { + $flushc = + &user_change_result($r,$userresult,$authresult, + $roleresult,$idresult,\%counts,$flushc, + $username,\%userchg); } - $flushc = - &user_change_result($r,$userresult,$authresult, - $roleresult,\%counts,$flushc, - $username,%userchg); } else { if ($context eq 'course') { $r->print('
'. @@ -3265,11 +3658,13 @@ sub upfile_drop_add { } # end of foreach (@userdata) # Flush the course logs so reverse user roles immediately updated &Apache::lonnet::flushcourselogs(); - $r->print("

\n

\n".&mt('Processed [_1] user(s).',$counts{'user'}). + $r->print("

\n

\n".&mt('Processed [quant,_1,user].',$counts{'user'}). "

\n"); if ($counts{'role'} > 0) { $r->print("

\n". - &mt('Roles added for [_1] users. If user is active, the new role will be available when the user next logs in to LON-CAPA.',$counts{'role'})."

\n"); + &mt('Roles added for [quant,_1,user].',$counts{'role'}).' '.&mt('If a user is currently logged-in to LON-CAPA, any new roles which are active will be available when the user next logs in.')."

\n"); + } else { + $r->print('

'.&mt('No roles added').'

'); } if ($counts{'auth'} > 0) { $r->print("

\n". @@ -3277,23 +3672,22 @@ sub upfile_drop_add { $counts{'auth'})."

\n"); } $r->print(&print_namespacing_alerts($domain,\%alerts,\%curr_rules)); - $r->print(''); - $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','prevphase','currstate'])); - $r->print('
'); ##################################### - # Drop students # + # Display list of students to drop # ##################################### if ($env{'form.fullup'} eq 'yes') { - $r->print('

'.&mt('Dropping Students')."

\n"); + $r->print('

'.&mt('Students to Drop')."

\n"); # Get current classlist - my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist(); + my $classlist = &Apache::loncoursedata::get_classlist(); if (! defined($classlist)) { - $r->print(&mt('There are no students currently enrolled.'). - "\n"); + $r->print('
'. + ''. + &mt('There are no students with current/future access to the course.'). + '
'."\n"); } else { # Remove the students we just added from the list of students. - foreach (@userdata) { - my %entries=&Apache::loncommon::record_sep($_); + foreach my $line (@userdata) { + my %entries=&Apache::loncommon::record_sep($line); unless (($entries{$fields{'username'}} eq '') || (!defined($entries{$fields{'username'}}))) { delete($classlist->{$entries{$fields{'username'}}. @@ -3301,10 +3695,13 @@ sub upfile_drop_add { } } # Print out list of dropped students. - &show_drop_list($r,$classlist,$keylist,'nosort'); + &show_drop_list($r,$classlist,'nosort',$permission); } } } # end of unless + if ($env{'form.fullup'} ne 'yes') { + $r->print(''); + } } sub print_namespacing_alerts { @@ -3348,8 +3745,8 @@ sub print_namespacing_alerts { } sub user_change_result { - my ($r,$userresult,$authresult,$roleresult,$counts,$flushc,$username, - $userchg) = @_; + my ($r,$userresult,$authresult,$roleresult,$idresult,$counts,$flushc, + $username,$userchg) = @_; my $okresult = 0; if ($userresult ne 'ok') { if ($userresult =~ /^error:(.+)$/) { @@ -3390,6 +3787,9 @@ sub user_change_result { $flushc=0; } } + if ($idresult) { + $r->print($idresult); + } return $flushc; } @@ -3398,14 +3798,12 @@ sub print_drop_menu { my ($r,$context,$permission) = @_; $r->print('

'.&mt("Drop Students").'

'."\n". '
'."\n"); - my $cid=$env{'request.course.id'}; - my ($classlist,$keylist) = &Apache::loncoursedata::get_classlist(); + my $classlist = &Apache::loncoursedata::get_classlist(); if (! defined($classlist)) { $r->print(&mt('There are no students currently enrolled.')."\n"); - return; + } else { + &show_drop_list($r,$classlist,'nosort',$permission); } - # Print out the available choices - &show_drop_list($r,$classlist,$keylist,$permission); $r->print('
'. &Apache::loncommon::end_page()); return; } @@ -3417,10 +3815,10 @@ sub update_user_list { my $now = time; my $count=0; my @changelist; - if ($choice ne '') { - @changelist = &Apache::loncommon::get_env_multiple('form.actionlist'); - } else { + if ($choice eq 'drop') { @changelist = &Apache::loncommon::get_env_multiple('form.droplist'); + } else { + @changelist = &Apache::loncommon::get_env_multiple('form.actionlist'); } my %result_text = ( ok => { 'revoke' => 'Revoked', 'delete' => 'Deleted', @@ -3487,7 +3885,6 @@ sub update_user_list { } } my $plrole = &Apache::lonnet::plaintext($role); - my ($uid,$first,$middle,$last,$gene,$sec); my $start = $env{'form.'.$item.'_start'}; my $end = $env{'form.'.$item.'_end'}; if ($choice eq 'drop') { @@ -3507,16 +3904,12 @@ sub update_user_list { &Apache::lonnet::revokerole($udom,$uname,$scope,$role); } } elsif ($choice eq 'delete') { - $start = -1; - $end = -1; if ($role eq 'st') { -# FIXME - how does role deletion affect classlist? - &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid); - } else { - $result = - &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$now, - 0,1); - } + &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$now,$start,$type,$locktype,$cid); + } + $result = + &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$now, + $start,1); } else { #reenable, activate, change access dates or change section if ($choice ne 'chgsec') { @@ -3558,27 +3951,36 @@ sub update_user_list { $nochg = 1; } } else { - if (!grep(/^\Q$sec\E$/,@newsecs)) { - $revresult = - &Apache::lonnet::revokerole($udom,$uname,$scope,$role); + if (@newsecs > 0) { + if (grep(/^\Q$sec\E$/,@newsecs)) { + push(@retained,$sec); + } else { + $revresult = + &Apache::lonnet::revokerole($udom,$uname, + $scope,$role); + } } else { - push(@retained,$sec); + $revresult = + &Apache::lonnet::revokerole($udom,$uname, + $scope,$role); } } } else { - push(@retained,$sec); + if ($sec eq '') { + $nochg = 1; + } else { + push(@retained,$sec); + } } # add new sections if (@newsecs == 0) { if (!$nochg) { - if ($sec ne '') { - if ($role eq 'st') { - $result = - &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid); - } else { - my $newscope = $scopestem; - $result = &Apache::lonnet::assignrole($udom,$uname,$newscope,$role,$end,$start); - } + if ($role eq 'st') { + $result = + &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid); + } else { + my $newscope = $scopestem; + $result = &Apache::lonnet::assignrole($udom,$uname,$newscope,$role,$end,$start); } } } else { @@ -3612,11 +4014,24 @@ sub update_user_list { $count++; } else { $r->print( - &mt("Error $result_text{'error'}{$choice} [_1] in [_2] for [_3]:[_4]", + &mt("Error $result_text{'error'}{$choice} [_1] in [_2] for [_3]: [_4].", $plrole,$extent,$uname.':'.$udom,$result).'
'); } } - $r->print('

'.&mt("$result_text{'ok'}{$choice} role(s) for [quant,_1,user,users,users].",$count).'

'); + $r->print('
'."\n"); + if ($choice eq 'drop') { + $r->print(''."\n". + ''."\n". + ''."\n"); + } else { + foreach my $item ('action','sortby','roletype','showrole','Status','secfilter','grpfilter') { + if ($env{'form.'.$item} ne '') { + $r->print(''."\n"); + } + } + } + $r->print('

'.&mt("$result_text{'ok'}{$choice} role(s) for [quant,_1,user,users,no users].",$count).'

'); if ($count > 0) { if ($choice eq 'revoke' || $choice eq 'drop') { $r->print('

'.&mt('Re-enabling will re-activate data for the role.

')); @@ -3626,23 +4041,25 @@ sub update_user_list { } if ($env{'form.makedatesdefault'}) { if ($choice eq 'chgdates' || $choice eq 'reenable' || $choice eq 'activate') { - $r->print(&make_dates_default($startdate,$enddate)); + $r->print(&make_dates_default($startdate,$enddate,$context)); } } + my $linktext = &mt('Display User Lists'); + if ($choice eq 'drop') { + $linktext = &mt('Display current class roster'); + } + $r->print(''.$linktext.'
'."\n"); } sub classlist_drop { - my ($scope,$uname,$udom,$now,$action) = @_; + my ($scope,$uname,$udom,$now) = @_; my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)}); - my $cid=$cdom.'_'.$cnum; - my $user = $uname.':'.$udom; - if ($action eq 'drop') { + if (&Apache::lonnet::is_course($cdom,$cnum)) { + my $user = $uname.':'.$udom; if (!&active_student_roles($cnum,$cdom,$uname,$udom)) { my $result = &Apache::lonnet::cput('classlist', - { $user => $now }, - $env{'course.'.$cid.'.domain'}, - $env{'course.'.$cid.'.num'}); + { $user => $now },$cdom,$cnum); return &mt('Drop from classlist: [_1]', ''.$result.'').'
'; } @@ -3712,16 +4129,26 @@ sub course_sections { my ($sections_count,$role) = @_; my $output = ''; my @sections = (sort {$a <=> $b} keys %{$sections_count}); - if (scalar(@sections) == 1) { + my $numsec = scalar(@sections); + if ($numsec <= 1) { $output = ''."\n"; + if ($role eq 'st') { + $output .= '>'."\n". + ' '."\n". + ' \n"; + } else { + $output .= 'multiple="multiple" size="'.$multiple.'">'."\n"; + } foreach my $sec (@sections) { $output .= '\n"; } @@ -3741,16 +4168,27 @@ sub get_groupslist { } sub setsections_javascript { - my ($form,$groupslist) = @_; - my ($checkincluded,$finish,$roleplace,$setsection_js); - if ($form eq 'cu') { + my ($formname,$groupslist,$mode) = @_; + my ($checkincluded,$finish,$rolecode,$setsection_js); + if ($mode eq 'upload') { + $checkincluded = 'formname.name == "'.$formname.'"'; + $finish = "return 'ok';"; + $rolecode = "var role = formname.defaultrole.options[formname.defaultrole.selectedIndex].value;\n"; + } elsif ($formname eq 'cu') { $checkincluded = 'formname.elements[i-1].checked == true'; $finish = 'formname.submit()'; - $roleplace = 3; + $rolecode = "var match = str.split('_'); + var role = match[3];\n"; + } elsif ($formname eq 'enrollstudent') { + $checkincluded = 'formname.name == "'.$formname.'"'; + $finish = 'formname.submit()'; + $rolecode = "var match = str.split('_'); + var role = match[1];\n"; } else { - $checkincluded = 'formname.name == "'.$form.'"'; + $checkincluded = 'formname.name == "'.$formname.'"'; $finish = "seccheck = 'ok';"; - $roleplace = 1; + $rolecode = "var match = str.split('_'); + var role = match[1];\n"; $setsection_js = "var seccheck = 'alert';"; } my %alerts = &Apache::lonlocal::texthash( @@ -3775,8 +4213,7 @@ function setSections(formname) { var checkcurr = str.match(re1); if (checkcurr != null) { if ($checkincluded) { - var match = str.split('_'); - var role = match[$roleplace]; + $rolecode if (role == 'cc') { alert("$alerts{'secd'}\\n$alerts{'accr'}"); } @@ -3851,6 +4288,9 @@ sub can_create_user { my ($dom,$context,$usertype) = @_; my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom); my $cancreate = 1; + if (&Apache::lonnet::allowed('mau',$dom)) { + return $cancreate; + } if (ref($domconf{'usercreation'}) eq 'HASH') { if (ref($domconf{'usercreation'}{'cancreate'}) eq 'HASH') { if ($context eq 'course' || $context eq 'author') { @@ -4005,7 +4445,8 @@ sub get_permission { } else { my @allroles = &roles_by_context($context); foreach my $role (@allroles) { - if (&Apache::lonnet::allowed('c'.$role,$env{'request.role.domain'})) { $permission{'cusr'} = 1; + if (&Apache::lonnet::allowed('c'.$role,$env{'request.role.domain'})) { + $permission{'cusr'} = 1; last; } } @@ -4034,6 +4475,27 @@ sub authorpriv { || (&Apache::lonnet::allowed('caa',$audom.'/'.$auname))) { return ''; } return 1; } +sub roles_on_upload { + my ($context,%customroles) = @_; + my (@possible_roles,@permitted_roles); + if ($context eq 'domain') { + @possible_roles = &curr_role_permissions($context,undef,1); + push(@possible_roles,&curr_role_permissions($context,'course',1)); + } else { + @possible_roles = &curr_role_permissions($context,undef,1); + } + my $custom_ok = 0; + foreach my $role (@possible_roles) { + if ($role eq 'cr') { + $custom_ok = 1; + push(@permitted_roles,keys(%customroles)); + } else { + push(@permitted_roles,$role); + } + } + return ($custom_ok,@permitted_roles); +} + sub get_course_identity { my ($cid) = @_; my ($cnum,$cdom,$cdesc); @@ -4193,6 +4655,5 @@ sub sectioncheck_alerts { return %alerts; } - 1;