--- loncom/interface/lonmodifycourse.pm 2016/10/27 21:01:01 1.87
+++ loncom/interface/lonmodifycourse.pm 2023/04/11 20:35:19 1.99
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.87 2016/10/27 21:01:01 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.99 2023/04/11 20:35:19 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;
}
}
@@ -101,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'} = '';
@@ -126,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)) {
@@ -203,28 +211,24 @@ sub print_course_search_page {
$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: [_1].',
- join(', ',@adhoc));
+ $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]',$adhoc[0]);
+ $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);
}
}
}
@@ -245,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");
+
+
+
+
$lt{'preamble'}
+
+
$lt{'cancel'}
+
+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');
@@ -288,8 +411,7 @@ sub get_filters {
sub print_modification_menu {
my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash,$permission) = @_;
&print_header($r,$type);
- my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$setparams_text,$cat_text,
- $cdom,$cnum);
+ my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$cdom,$cnum);
if (ref($coursehash) eq 'HASH') {
$cdom = $coursehash->{'domain'};
$cnum = $coursehash->{'num'};
@@ -301,26 +423,65 @@ sub print_modification_menu {
} else {
$ccrole = 'cc';
}
+ my %linktext;
+ if ($permission->{'setparms'} eq 'edit') {
+ %linktext = (
+ 'setquota' => 'View/Modify quotas for group portfolio files, and for uploaded content',
+ '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 = (
+ 'setquota' => 'View quotas for group portfolio files, and for uploaded content',
+ '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') {
- $categorytitle = 'View/Modify Community Settings';
+ if ($permission->{'setparms'} eq 'edit') {
+ $categorytitle = 'View/Modify Community Settings';
+ $linktext{'setparms'} = 'View/Modify community owner';
+ $linktext{'catsettings'} = 'View/Modify catalog settings for community';
+ } else {
+ $categorytitle = 'View Community Settings';
+ $linktext{'setparms'} = 'View community owner';
+ $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.');
- $setparams_text = 'View/Modify community owner';
- $cat_text = 'View/Modify catalog settings for community';
} else {
- $categorytitle = 'View/Modify Course Settings';
- $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.');
- $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a course via Content Editor.');
- if (($type ne 'Placement') && (&showcredits($dom))) {
- $setparams_text = 'View/Modify course owner, institutional code, default authentication, credits, self-enrollment and table lifetime';
+ if ($permission->{'setparms'} eq 'edit') {
+ $categorytitle = 'View/Modify Course Settings';
+ $linktext{'catsettings'} = 'View/Modify catalog settings for course';
+ if (($type ne 'Placement') && (&showcredits($dom))) {
+ $linktext{'setparms'} = 'View/Modify course owner, institutional code, default authentication, credits, self-enrollment and table lifetime';
+ } else {
+ $linktext{'setparms'} = 'View/Modify course owner, institutional code, default authentication, self-enrollment and table lifetime';
+ }
} else {
- $setparams_text = 'View/Modify course owner, institutional code, default authentication, self-enrollment and table lifetime';
+ $categorytitle = 'View Course Settings';
+ $linktext{'catsettings'} = 'View catalog settings for course';
+ if (($type ne 'Placement') && (&showcredits($dom))) {
+ $linktext{'setparms'} = 'View course owner, institutional code, default authentication, credits, self-enrollment and table lifetime';
+ } else {
+ $linktext{'setparms'} = 'View course owner, institutional code, default authentication, self-enrollment and table lifetime';
+ }
}
- $cat_text = 'View/Modify catalog settings for course';
+ $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.');
+ $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a course via Content Editor.');
}
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);
my @additional_params = &catalog_settable($domconf{'coursecategories'},$type);
@@ -346,7 +507,7 @@ sub print_modification_menu {
({ categorytitle => $categorytitle,
items => [
{
- linktext => $setparams_text,
+ linktext => $linktext{'setparms'},
url => &phaseurl('setparms'),
permission => $permission->{'setparms'},
#help => '',
@@ -354,7 +515,7 @@ sub print_modification_menu {
linktitle => ''
},
{
- linktext => 'View/Modify quotas for group portfolio files, and for uploaded content.',
+ linktext => $linktext{'setquota'},
url => &phaseurl('setquota'),
permission => $permission->{'setquota'},
#help => '',
@@ -362,7 +523,7 @@ sub print_modification_menu {
linktitle => ''
},
{
- linktext => 'View/Modify responders threshold for anonymous survey submissions display',
+ linktext => $linktext{'setanon'},
url => &phaseurl('setanon'),
permission => $permission->{'setanon'},
#help => '',
@@ -370,7 +531,7 @@ sub print_modification_menu {
linktitle => ''
},
{
- linktext => $cat_text,
+ linktext => $linktext{'catsettings'},
url => &phaseurl('catsettings'),
permission => (($permission->{'catsettings'}) && (@additional_params > 0)),
#help => '',
@@ -378,7 +539,7 @@ sub print_modification_menu {
linktitle => ''
},
{
- linktext => 'Display current settings for automated enrollment',
+ linktext => $linktext{'viewparms'},
url => &phaseurl('viewparms'),
permission => ($permission->{'viewparms'} && ($type ne 'Community') && ($type ne 'Placement')),
#help => '',
@@ -386,7 +547,7 @@ sub print_modification_menu {
linktitle => ''
},
{
- linktext => 'View/Modify Self-Enrollment configuration',
+ linktext => $linktext{'selfenroll'},
icon => 'self_enroll.png',
#help => 'Course_Self_Enrollment',
url => &phaseurl('selfenroll'),
@@ -394,13 +555,29 @@ sub print_modification_menu {
linktitle => 'Configure user self-enrollment.',
},
{
- linktext => 'View/Modify submit button behavior, post-submission',
+ linktext => $linktext{'setpostsubmit'},
icon => 'emblem-readonly.png',
#help => '',
url => &phaseurl('setpostsubmit'),
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 => '',
+ },
]
},
);
@@ -431,9 +608,11 @@ 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'}) {
+ if ($permission->{'catsettings'} eq 'edit') {
$categories_link_start = '';
$categories_link_end = '';
}
@@ -465,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;
}
}
}
@@ -533,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 {
@@ -577,7 +777,7 @@ sub print_settings_display {
}
sub print_setquota {
- my ($r,$cdom,$cnum,$cdesc,$type) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
my $lctype = lc($type);
my $headline = &mt("Set disk space quotas for $lctype: [_1]",
''.$cdesc.'');
@@ -610,19 +810,25 @@ sub print_setquota {
my $hidden_elements = &hidden_form_elements();
my $porthelpitem = &Apache::loncommon::help_open_topic('Modify_Course_Quota');
my $uploadhelpitem = &Apache::loncommon::help_open_topic('Modify_Course_Upload_Quota');
+ my ($disabled,$submit);
+ if ($readonly) {
+ $disabled = ' disabled="disabled"';
+ } else {
+ $submit = '';
+ }
$r->print(<
');
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') {
@@ -814,7 +1044,7 @@ sub print_catsettings {
if (ref($cathash) eq 'HASH') {
$r->print($lt{'assi'}.'
'.
&Apache::loncommon::assign_categories_table($cathash,
- $currsettings{'categories'},$type));
+ $currsettings{'categories'},$type,$disabled));
} else {
$r->print(&mt('No categories defined for this domain'));
}
@@ -825,8 +1055,10 @@ sub print_catsettings {
$r->print('
'.&mt('If auto-cataloging based on institutional code is enabled in the domain, a course will continue to be listed in the catalog of official courses, in addition to receiving a listing under any manually assigned categor(ies).').'
');
}
}
- $r->print('');
+ unless ($readonly) {
+ $r->print('');
+ }
} else {
$r->print('');
if ($type eq 'Community') {
@@ -843,7 +1075,7 @@ sub print_catsettings {
}
sub print_course_modification_page {
- my ($r,$cdom,$cnum,$cdesc,$crstype) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$crstype,$readonly) = @_;
my %lt=&Apache::lonlocal::texthash(
'actv' => "Active",
'inac' => "Inactive",
@@ -857,25 +1089,28 @@ sub print_course_modification_page {
'domd' => 'Domain default',
'whom' => 'Who configures',
);
- my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname);
+ my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname,$disabled);
my %enrollvar = &get_enrollment_settings($cdom,$cnum);
my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook',
'internal.selfenrollmgrdc','internal.selfenrollmgrcc',
- 'internal.mysqltables'],
- $cdom,$cnum);
+ 'internal.mysqltables'],$cdom,$cnum);
my $type = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$crstype,\%settings);
my @specific_managebydc = split(/,/,$settings{'internal.selfenrollmgrdc'});
my @specific_managebycc = split(/,/,$settings{'internal.selfenrollmgrcc'});
my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
+ my %passwdconf = &Apache::lonnet::get_passwdconf($cdom);
my @default_managebydc = split(/,/,$domdefaults{$type.'selfenrolladmdc'});
if ($crstype eq 'Community') {
$ccrole = 'co';
$lt{'nocc'} = &mt('There is currently no owner set for this community.');
} else {
$ccrole ='cc';
- ($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar);
+ ($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar,$readonly);
}
$ccname = &Apache::lonnet::plaintext($ccrole,$crstype);
+ if ($readonly) {
+ $disabled = ' disabled="disabled"';
+ }
my %roleshash = &Apache::lonnet::get_my_roles($cnum,$cdom,'','',[$ccrole]);
my (@local_ccs,%cc_status,%pname);
foreach my $item (keys(%roleshash)) {
@@ -916,9 +1151,9 @@ sub print_course_modification_page {
foreach my $cc (@local_ccs) {
$ownertable .= &Apache::loncommon::start_data_table_row()."\n";
if ($cc eq $enrollvar{'courseowner'}) {
- $ownertable .= '