--- loncom/interface/lonmodifycourse.pm 2016/11/10 21:57:10 1.79.2.4 +++ loncom/interface/lonmodifycourse.pm 2023/06/05 02:22:29 1.100 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # handler for DC-only modifiable course settings # -# $Id: lonmodifycourse.pm,v 1.79.2.4 2016/11/10 21:57:10 raeburn Exp $ +# $Id: lonmodifycourse.pm,v 1.100 2023/06/05 02:22:29 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,6 +39,9 @@ use Apache::lonpickcourse; use lib '/home/httpd/lib/perl'; use LONCAPA qw(:DEFAULT :match); +my $registered_cleanup; +my $modified_dom; + sub get_dc_settable { my ($type,$cdom) = @_; if ($type eq 'Community') { @@ -49,6 +52,10 @@ sub get_dc_settable { if (&showcredits($cdom)) { push(@items,'defaultcredits'); } + my %passwdconf = &Apache::lonnet::get_passwdconf($cdom); + if (($passwdconf{'crsownerchg'}) && ($type ne 'Placement')) { + push(@items,'nopasswdchg'); + } return @items; } } @@ -72,6 +79,13 @@ sub catalog_settable { if ($confhash->{'categorizecomm'} ne 'comm') { push(@settable,'categorize'); } + } elsif ($type eq 'Placement') { + if ($confhash->{'togglecatsplace'} ne 'place') { + push(@settable,'togglecats'); + } + if ($confhash->{'categorizeplace'} ne 'place') { + push(@settable,'categorize'); + } } else { if ($confhash->{'togglecats'} ne 'crs') { push(@settable,'togglecats'); @@ -94,6 +108,7 @@ sub get_enrollment_settings { @items = map { 'internal.'.$_; } (@{$internals}); push(@items,@{$accessdates}); } + push(@items,'internal.nopasswdchg'); my %settings = &Apache::lonnet::get('environment',\@items,$cdom,$cnum); my %enrollvar; $enrollvar{'autharg'} = ''; @@ -119,7 +134,7 @@ sub get_enrollment_settings { } elsif ($type eq "authtype" || $type eq "autharg" || $type eq "coursecode" || $type eq "crosslistings" || $type eq "selfenrollmgr" - || $type eq "autodropfailsafe") { + || $type eq "autodropfailsafe" || $type eq 'nopasswdchg') { $enrollvar{$type} = $settings{$item}; } elsif ($type eq 'defaultcredits') { if (&showcredits($cdom)) { @@ -167,6 +182,8 @@ sub print_course_search_page { $r->print(&Apache::loncommon::js_changer()); if ($type eq 'Community') { $r->print('

'.&mt('Search for a community in the [_1] domain',$domdesc).'

'); + } elsif ($type eq 'Placement') { + $r->print('

'.&mt('Search for a placement test in the [_1] domain',$domdesc).'

'); } else { $r->print('

'.&mt('Search for a course in the [_1] domain',$domdesc).'

'); } @@ -177,6 +194,8 @@ sub print_course_search_page { my ($actiontext,$roleoption,$settingsoption); if ($type eq 'Community') { $actiontext = &mt('Actions available after searching for a community:'); + } elsif ($type eq 'Placement') { + $actiontext = &mt('Actions available after searching for a placement test:') } else { $actiontext = &mt('Actions available after searching for a course:'); } @@ -184,33 +203,39 @@ sub print_course_search_page { if ($type eq 'Community') { $roleoption = &mt('Enter the community with the role of [_1]',$cctitle); $settingsoption = &mt('View or modify community settings which only a [_1] may modify.',$dctitle); + } elsif ($type eq 'Placement') { + $roleoption = &mt('Enter the placement test with the role of [_1]',$cctitle); + $settingsoption = &mt('View or modify placement test settings which only a [_1] may modify.',$dctitle); } else { $roleoption = &mt('Enter the course with the role of [_1]',$cctitle); $settingsoption = &mt('View or modify course settings which only a [_1] may modify.',$dctitle); } } elsif (&Apache::lonnet::allowed('rar',$dom)) { - my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'}, - 'adhocroles.'.$dom); - if (keys(%adhocroles)) { - my @adhoc = split(',',$adhocroles{'adhocroles.'.$dom}); - if (@adhoc > 1) { + my ($roles_by_num,$description,$accessref,$accessinfo) = &Apache::lonnet::get_all_adhocroles($dom); + if ((ref($roles_by_num) eq 'ARRAY') && (ref($description) eq 'HASH')) { + if (@{$roles_by_num} > 1) { if ($type eq 'Community') { - $roleoption = &mt('Enter the community with one of the available ad hoc roles: [_1].', - join(', ',@adhoc)); + $roleoption = &mt('Enter the community with one of the available ad hoc roles'); + } elsif ($type eq 'Placement') { + $roleoption = &mt('Enter the placement test with one of the available ad hoc roles.'); } else { - $roleoption = &mt('Enter the course with one of the available ad hoc roles: [_1].', - join(', ',@adhoc)); + $roleoption = &mt('Enter the course with one of the available ad hoc roles.'); } } else { + my $rolename = $description->{$roles_by_num->[0]}; if ($type eq 'Community') { - $roleoption = &mt('Enter the community with the ad hoc role of: [_1]',$adhoc[0]); + $roleoption = &mt('Enter the community with the ad hoc role of: [_1]',$rolename); + } elsif ($type eq 'Placement') { + $roleoption = &mt('Enter the placement test with the ad hoc role of: [_1]',$rolename); } else { - $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$adhoc[0]); + $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$rolename); } } } if ($type eq 'Community') { $settingsoption = &mt('View community settings which only a [_1] may modify.',$dctitle); + } elsif ($type eq 'Placement') { + $settingsoption = &mt('View placement test settings which only a [_1] may modify.',$dctitle); } else { $settingsoption = &mt('View course settings which only a [_1] may modify.',$dctitle); } @@ -224,14 +249,133 @@ sub print_course_search_page { } sub print_course_selection_page { - my ($r,$dom,$domdesc) = @_; + my ($r,$dom,$domdesc,$permission) = @_; my $type = $env{'form.type'}; if (!defined($type)) { $type = 'Course'; } &print_header($r,$type); -# Criteria for course search + if ($permission->{'adhocrole'} eq 'custom') { + my %lt = &Apache::lonlocal::texthash( + title => 'Ad hoc role selection', + preamble => 'Please choose an ad hoc role in the course.', + cancel => 'Click "OK" to enter the course, or "Cancel" to choose a different course.', + ); + my %jslt = &Apache::lonlocal::texthash ( + none => 'You are not eligible to use an ad hoc role for the selected course', + ok => 'OK', + exit => 'Cancel', + ); + &js_escape(\%jslt); + $r->print(<<"END"); + + + +END + } elsif ($permission->{'adhocrole'} eq 'coord') { + $r->print(<<"END"); + +END + } + +# Criteria for course search my ($filterlist,$filter) = &get_filters(); my $action = '/adm/modifycourse'; my $dctitle = &Apache::lonnet::plaintext('dc'); @@ -286,6 +430,8 @@ sub print_modification_menu { 'setanon' => 'View/Modify responders threshold for anonymous survey submissions display', 'selfenroll' => 'View/Modify Self-Enrollment configuration', 'setpostsubmit' => 'View/Modify submit button behavior, post-submission', + 'setltiauth' => 'View/Modify re-authentication requirement for LTI launch of deep-linked item', + 'setexttool' => 'View/Modify External Tools permissions', ); } else { %linktext = ( @@ -293,10 +439,12 @@ sub print_modification_menu { 'setanon' => 'View responders threshold for anonymous survey submissions display', 'selfenroll' => 'View Self-Enrollment configuration', 'setpostsubmit' => 'View submit button behavior, post-submission', + 'setltiauth' => 'View re-authentication requirement for LTI launch of deep-linked item', + 'setexttool' => 'View External Tools permissions', ); } if ($type eq 'Community') { - if ($permission->{'setparms'} eq 'edit') { + if ($permission->{'setparms'} eq 'edit') { $categorytitle = 'View/Modify Community Settings'; $linktext{'setparms'} = 'View/Modify community owner'; $linktext{'catsettings'} = 'View/Modify catalog settings for community'; @@ -306,7 +454,7 @@ sub print_modification_menu { $linktext{'catsettings'} = 'View catalog settings for community'; } $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a community.'); - $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.'); + $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.'); } else { if ($permission->{'setparms'} eq 'edit') { $categorytitle = 'View/Modify Course Settings'; @@ -331,6 +479,8 @@ sub print_modification_menu { my $anon_text = &mt('Responder threshold required to display anonymous survey submissions.'); my $postsubmit_text = &mt('Override defaults for submit button behavior post-submission for this specific course.'); my $mysqltables_text = &mt('Override default for lifetime of "temporary" MySQL tables containing student performance data.'); + my $ltiauth_text = &mt('Override default for requirement for re-authentication for LTI-limited launch of deep-linked item.'); + my $exttool_text = &mt('Override default permissions for external tools use for this specific course.'); $linktext{'viewparms'} = 'Display current settings for automated enrollment'; my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom); @@ -391,7 +541,7 @@ sub print_modification_menu { { linktext => $linktext{'viewparms'}, url => &phaseurl('viewparms'), - permission => ($permission->{'viewparms'} && ($type ne 'Community')), + permission => ($permission->{'viewparms'} && ($type ne 'Community') && ($type ne 'Placement')), #help => '', icon => 'roles.png', linktitle => '' @@ -412,6 +562,22 @@ sub print_modification_menu { permission => $permission->{'setpostsubmit'}, linktitle => '', }, + { + linktext => $linktext{'setltiauth'}, + icon => 'system-lock-screen.png', + #help => '', + url => &phaseurl('setltiauth'), + permission => $permission->{'setltiauth'}, + linktitle => '', + }, + { + linktext => $linktext{'setexttool'}, + icon => 'exttool.png', + #help => '', + url => &phaseurl('setexttool'), + permission => $permission->{'setexttool'}, + linktitle => '', + }, ] }, ); @@ -433,7 +599,7 @@ sub print_modification_menu { } else { $menu_html .= '
  • '.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'
  • '."\n". '
  • '.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'
  • '."\n"; - if (&showcredits($dom)) { + if (($type ne 'Placement') && &showcredits($dom)) { $menu_html .= '
  • '.&mt('Default credits earned by student on course completion.').'
  • '."\n"; } $menu_html .= '
  • '.&mt('Override defaults for who configures self-enrollment for this specific course.').'
  • '."\n"; @@ -442,7 +608,9 @@ sub print_modification_menu { '
  • '.$setquota_text.'
  • '."\n". '
  • '.$setuploadquota_text.'
  • '."\n". '
  • '.$anon_text.'
  • '."\n". - '
  • '.$postsubmit_text.'
  • '."\n"; + '
  • '.$postsubmit_text.'
  • '."\n". + '
  • '.$ltiauth_text.'
  • '."\n". + '
  • '.$exttool_text.'
  • '."\n"; my ($categories_link_start,$categories_link_end); if ($permission->{'catsettings'} eq 'edit') { $categories_link_start = ''; @@ -476,29 +644,25 @@ sub print_modification_menu { } sub print_adhocrole_selected { - my ($r,$type) = @_; + my ($r,$type,$permission) = @_; &print_header($r,$type); my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'}); my ($newrole,$selectrole); - if (&Apache::lonnet::allowed('ccc',$cdom)) { + if ($permission->{'adhocrole'} eq 'coord') { if ($type eq 'Community') { $newrole = "co./$cdom/$cnum"; } else { $newrole = "cc./$cdom/$cnum"; } $selectrole = 1; - } elsif (&Apache::lonnet::allowed('rar',$cdom)) { - my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'}, - 'adhocroles.'.$cdom); - if (keys(%adhocroles)) { - my $possrole = $env{'form.adhocrole'}; - if ($possrole ne '') { - my @adhoc = split(',',$adhocroles{'adhocroles.'.$cdom}); - if (grep(/^\Q$possrole\E$/,@adhoc)) { - my $confname = &Apache::lonnet::get_domainconfiguser($cdom); - $newrole = "cr/$cdom/$confname/$possrole./$cdom/$cnum"; - $selectrole = 1; - } + } elsif ($permission->{'adhocrole'} eq 'custom') { + my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1); + if (ref($okroles) eq 'ARRAY') { + my $possrole = $env{'form.adhocrole'}; + if (($possrole ne '') && (grep(/^\Q$possrole\E$/,@{$okroles}))) { + my $confname = &Apache::lonnet::get_domainconfiguser($cdom); + $newrole = "cr/$cdom/$confname/$possrole./$cdom/$cnum"; + $selectrole = 1; } } } @@ -544,9 +708,34 @@ sub print_settings_display { "$lt{'dcon'}\n". &Apache::loncommon::end_data_table_header_row()."\n"; foreach my $item (@items) { + my $shown = $enrollvar{$item}; + if ($item eq 'crosslistings') { + my (@xlists,@lcsecs); + foreach my $entry (split(/,/,$enrollvar{$item})) { + my ($xlist,$lc_sec) = split(/:/,$entry); + push(@xlists,$xlist); + push(@lcsecs,$lc_sec); + } + if (@xlists) { + my $crskey = $cnum.':'.$enrollvar{'coursecode'}; + my %reformatted = + &Apache::lonnet::auto_instsec_reformat($cdom,'declutter', + {$crskey => \@xlists}); + if (ref($reformatted{$crskey}) eq 'ARRAY') { + my @show; + my @xlcodes = @{$reformatted{$crskey}}; + for (my $i=0; $i<@xlcodes; $i++) { + push(@show,$xlcodes[$i].':'.$lcsecs[$i]); + } + if (@show) { + $shown = join(',',@show); + } + } + } + } $disp_table .= &Apache::loncommon::start_data_table_row()."\n". "$longtype{$item}\n". - "$enrollvar{$item}\n"; + "$shown\n"; if (grep(/^\Q$item\E$/,@modifiable_params)) { $disp_table .= ''.&mt('Yes').''."\n"; } else { @@ -674,7 +863,7 @@ sub print_set_anonsurvey_threshold { my $hidden_elements = &hidden_form_elements(); my ($disabled,$submit); if ($readonly) { - $disabled = ' disabled="disabled"'; + $disabled = ' disabled="disabled"'; } else { $submit = ''; } @@ -767,15 +956,7 @@ ENDDOCUMENT sub domain_postsubtimeout { my ($cdom,$type,$settings) = @_; return unless (ref($settings) eq 'HASH'); - my $lctype = lc($type); - unless ($type eq 'Community') { - $lctype = 'unofficial'; - if ($settings->{'internal.coursecode'}) { - $lctype = 'official'; - } elsif ($settings->{'internal.textbook'}) { - $lctype = 'textbook'; - } - } + my $lctype = &get_lctype($type,$settings); my %domconfig = &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom); my $postsubtimeout = 60; @@ -791,6 +972,22 @@ sub domain_postsubtimeout { return $postsubtimeout; } +sub get_lctype { + my ($type,$settings) = @_; + my $lctype = lc($type); + unless (($type eq 'Community') || ($type eq 'Placement')) { + $lctype = 'unofficial'; + if (ref($settings) eq 'HASH') { + if ($settings->{'internal.coursecode'}) { + $lctype = 'official'; + } elsif ($settings->{'internal.textbook'}) { + $lctype = 'textbook'; + } + } + } + return $lctype; +} + sub print_catsettings { my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; &print_header($r,$type); @@ -831,6 +1028,8 @@ sub print_catsettings { '    

    '); if ($type eq 'Community') { $r->print(&mt("If a community has been categorized using at least one of the categories defined for communities in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded.")); + } elsif ($type eq 'Placement') { + $r->print(&mt("If a placement test has been categorized using at least one of the categories defined for placement tests in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded.")); } else { $r->print(&mt("Unless excluded, a course will be listed in the domain's publicly accessible Course/Community Catalog, if at least one of the following applies").':