--- loncom/interface/lonmodifycourse.pm 2023/09/05 03:50:51 1.79.2.9.2.5
+++ loncom/interface/lonmodifycourse.pm 2016/04/02 04:30:21 1.80
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.79.2.9.2.5 2023/09/05 03:50:51 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.80 2016/04/02 04:30:21 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,23 +39,15 @@ 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') {
return ('courseowner','selfenrollmgrdc','selfenrollmgrcc');
} else {
- my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc',
- 'selfenrollmgrcc','mysqltables');
+ my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc','selfenrollmgrcc');
if (&showcredits($cdom)) {
push(@items,'defaultcredits');
}
- my %passwdconf = &Apache::lonnet::get_passwdconf($cdom);
- if (($passwdconf{'crsownerchg'}) && ($type ne 'Placement')) {
- push(@items,'nopasswdchg');
- }
return @items;
}
}
@@ -63,7 +55,7 @@ sub get_dc_settable {
sub autoenroll_keys {
my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits',
'autoadds','autodrops','autostart','autoend','sectionnums',
- 'crosslistings','co-owners','autodropfailsafe'];
+ 'crosslistings','co-owners'];
my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date'];
return ($internals,$accessdates);
}
@@ -97,11 +89,10 @@ sub get_enrollment_settings {
my ($cdom,$cnum) = @_;
my ($internals,$accessdates) = &autoenroll_keys();
my @items;
- if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) {
+ if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) {
@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,13 +117,14 @@ sub get_enrollment_settings {
$enrollvar{$type} =~ s/,/, /g;
} elsif ($type eq "authtype"
|| $type eq "autharg" || $type eq "coursecode"
- || $type eq "crosslistings" || $type eq "selfenrollmgr"
- || $type eq "autodropfailsafe" || $type eq 'nopasswdchg') {
+ || $type eq "crosslistings") {
$enrollvar{$type} = $settings{$item};
} elsif ($type eq 'defaultcredits') {
if (&showcredits($cdom)) {
$enrollvar{$type} = $settings{$item};
}
+ } elsif ($type eq 'selfenrollmgr') {
+ $enrollvar{$type} = $settings{$item};
} elsif ($type eq 'courseowner') {
if ($settings{$item} =~ /^[^:]+:[^:]+$/) {
$enrollvar{$type} = $settings{$item};
@@ -181,181 +173,29 @@ sub print_course_search_page {
$r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
\$numtitles,'modifycourse',undef,undef,undef,
\@codetitles,$dom));
-
- my ($actiontext,$roleoption,$settingsoption);
if ($type eq 'Community') {
- $actiontext = &mt('Actions available after searching for a community:');
- } else {
- $actiontext = &mt('Actions available after searching for a course:');
+ $r->print(&mt('Actions available after searching for a community:').'
'.
+ '
'.&mt('Enter the community with the role of [_1]',$cctitle).'
'."\n".
+ '
'.&mt('View or modify community settings which only a [_1] may modify.',$dctitle).
+ '
'."\n".'
');
+ } else {
+ $r->print(&mt('Actions available after searching for a course:').'
'.
+ '
'.&mt('Enter the course with the role of [_1]',$cctitle).'
'."\n".
+ '
'.&mt('View or modify course settings which only a [_1] may modify.',$dctitle).
+ '
'."\n".'
');
}
- if (&Apache::lonnet::allowed('ccc',$dom)) {
- 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);
- } 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 ($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');
- } else {
- $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]',$rolename);
- } else {
- $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);
- } else {
- $settingsoption = &mt('View course settings which only a [_1] may modify.',$dctitle);
- }
- }
- $r->print($actiontext.'
');
- if ($roleoption) {
- $r->print('
'.$roleoption.'
'."\n");
- }
- $r->print('
'.$settingsoption.'
'."\n".'
');
return;
}
sub print_course_selection_page {
- my ($r,$dom,$domdesc,$permission) = @_;
+ my ($r,$dom,$domdesc) = @_;
my $type = $env{'form.type'};
if (!defined($type)) {
$type = 'Course';
}
&print_header($r,$type);
- 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
+# Criteria for course search
my ($filterlist,$filter) = &get_filters();
my $action = '/adm/modifycourse';
my $dctitle = &Apache::lonnet::plaintext('dc');
@@ -368,7 +208,7 @@ END
my %courses = &Apache::loncommon::search_courses($dom,$type,$filter,$numtitles,
undef,undef,undef,\@codetitles);
&Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,undef,undef,
- $dom,undef,%courses);
+ undef,undef,%courses);
return;
}
@@ -389,10 +229,10 @@ sub get_filters {
}
sub print_modification_menu {
- my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash,$permission) = @_;
+ my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash) = @_;
&print_header($r,$type);
- my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$cdom,$cnum,
- $extendedtype);
+ my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$setparams_text,$cat_text,
+ $cdom,$cnum);
if (ref($coursehash) eq 'HASH') {
$cdom = $coursehash->{'domain'};
$cnum = $coursehash->{'num'};
@@ -404,81 +244,36 @@ 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') {
- if ($permission->{'setparms'} eq 'edit') {
- $categorytitle = 'View/Modify Community Settings';
- $linktext{'setparms'} = 'View/Modify community owner, self-enrollment and table lifetime';
- $linktext{'catsettings'} = 'View/Modify catalog settings for community';
- } else {
- $categorytitle = 'View Community Settings';
- $linktext{'setparms'} = 'View community owner, self-enrollment and table lifetime';
- $linktext{'catsettings'} = 'View catalog settings for community';
- }
+ $categorytitle = 'View/Modify Community Settings';
$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.');
+ $setparams_text = 'View/Modify community owner';
+ $cat_text = 'View/Modify catalog settings for community';
} else {
- 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 {
- $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';
- }
- }
+ $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.');
- my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook'],
- $cdom,$cnum);
- $extendedtype = ucfirst(&Apache::lonuserutils::get_extended_type($cdom,$cnum,$type,\%settings));
+ if (&showcredits($dom)) {
+ $setparams_text = 'View/Modify course owner, institutional code, default authentication, credits, and self-enrollment';
+ } else {
+ $setparams_text = 'View/Modify course owner, institutional code, default authentication, and self-enrollment';
+ }
+ $cat_text = 'View/Modify catalog settings for course';
}
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 $postsubmit_text = &mt('Override defaults for submit button behavior post-submission for this specific course.');
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
my @additional_params = &catalog_settable($domconf{'coursecategories'},$type);
sub manage_selfenrollment {
- my ($cdom,$cnum,$type,$coursehash,$permission) = @_;
- if ($permission->{'selfenroll'}) {
- my ($managed_by_cc,$managed_by_dc) = &Apache::lonuserutils::selfenrollment_administration($cdom,$cnum,$type,$coursehash);
- if (ref($managed_by_dc) eq 'ARRAY') {
- if (@{$managed_by_dc}) {
- return 1;
- }
- }
+ my ($cdom,$cnum,$type,$coursehash) = @_;
+ my ($managed_by_cc,$managed_by_dc) = &Apache::lonuserutils::selfenrollment_administration($cdom,$cnum,$type,$coursehash);
+ if (ref($managed_by_dc) eq 'ARRAY') {
+ if (@{$managed_by_dc}) {
+ return 1;
+ }
}
return 0;
}
@@ -491,134 +286,130 @@ sub print_modification_menu {
({ categorytitle => $categorytitle,
items => [
{
- linktext => $linktext{'setparms'},
+ linktext => $setparams_text,
url => &phaseurl('setparms'),
- permission => $permission->{'setparms'},
+ permission => 1,
#help => '',
icon => 'crsconf.png',
linktitle => ''
},
{
- linktext => $linktext{'setquota'},
+ linktext => 'View/Modify quotas for group portfolio files, and for uploaded content.',
url => &phaseurl('setquota'),
- permission => $permission->{'setquota'},
+ permission => 1,
#help => '',
icon => 'groupportfolioquota.png',
linktitle => ''
},
{
- linktext => $linktext{'setanon'},
+ linktext => 'View/Modify responders threshold for anonymous survey submissions display',
url => &phaseurl('setanon'),
- permission => $permission->{'setanon'},
+ permission => 1,
#help => '',
icon => 'anonsurveythreshold.png',
linktitle => ''
},
{
- linktext => $linktext{'catsettings'},
+ linktext => $cat_text,
url => &phaseurl('catsettings'),
- permission => (($permission->{'catsettings'}) && (@additional_params > 0)),
+ permission => (@additional_params > 0),
#help => '',
icon => 'ccatconf.png',
linktitle => ''
},
{
- linktext => $linktext{'viewparms'},
+ linktext => 'Display current settings for automated enrollment',
url => &phaseurl('viewparms'),
- permission => ($permission->{'viewparms'} && ($type ne 'Community')),
+ permission => ($type ne 'Community'),
#help => '',
icon => 'roles.png',
linktitle => ''
},
{
- linktext => $linktext{'selfenroll'},
+ linktext => 'View/Modify Self-Enrollment configuration',
icon => 'self_enroll.png',
#help => 'Course_Self_Enrollment',
url => &phaseurl('selfenroll'),
- permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash,$permission),
+ permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash),
linktitle => 'Configure user self-enrollment.',
},
{
- linktext => $linktext{'setpostsubmit'},
+ linktext => 'View/Modify submit button behavior, post-submission',
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'},
+ permission => 1,
linktitle => '',
},
]
},
);
- $r->print(
+ my $menu_html =
'
';
+ if ($type eq 'Community') {
+ $menu_html .= &mt('Although almost all community settings can be modified by a Coordinator, the following may only be set or modified by a Domain Coordinator:');
+ } else {
+ $menu_html .= &mt('Although almost all course settings can be modified by a Course Coordinator, the following may only be set or modified by a Domain Coordinator:');
}
- $r->print(
- '
');
+ .&hidden_form_elements();
+
+ $r->print($menu_html);
+ $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
+ $r->print('');
return;
}
-sub print_adhocrole_selected {
- my ($r,$type,$permission) = @_;
+sub print_ccrole_selected {
+ my ($r,$type) = @_;
&print_header($r,$type);
my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
- my ($newrole,$selectrole);
- if ($permission->{'adhocrole'} eq 'coord') {
- if ($type eq 'Community') {
- $newrole = "co./$cdom/$cnum";
- } else {
- $newrole = "cc./$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;
- }
- }
- }
- if ($selectrole) {
- $r->print('');
- } else {
- $r->print('');
- }
- return;
}
sub print_settings_display {
- my ($r,$cdom,$cnum,$cdesc,$type,$permission) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$type) = @_;
my %enrollvar = &get_enrollment_settings($cdom,$cnum);
my %longtype = &course_settings_descrip($type);
my %lt = &Apache::lonlocal::texthash(
@@ -647,34 +438,9 @@ 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".
- "
$shown
\n";
+ "
$enrollvar{$item}
\n";
if (grep(/^\Q$item\E$/,@modifiable_params)) {
$disp_table .= '
";
}
my ($warning,$numwarnings);
- my $numwarnings = scalar(@warnings);
+ my $numwarnings = scalar(@warnings);
if ($numwarnings) {
$warning = &mt('The following [quant,_1,warning was,warnings were] generated when applying your changes to automated enrollment:',$numwarnings).'
');
+ $r->print(&hidden_form_elements().'');
return;
}
@@ -2361,16 +1739,16 @@ sub modify_catsettings {
$desc{'categories'} = &mt('Assigned categories for this course');
$ccrole = 'cc';
}
- $r->print('
'.&mt('Category settings').'
'."\n".
- '
'.&mt($type).': '.$cdesc.'
'."\n".
- '');
- my @actions =
- (''.
- &mt('Pick another action').'');
- $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
- return;
-}
-
-sub modify_ltiauth {
- my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
- my %lt = &Apache::lonlocal::texthash(
- 'requ' => 'Requirement for re-authentication for student LTI-limited launch of deep-linked item',
- 'link' => 'Link protection can be set to accept username for an enrolled student (if sent by Consumer)',
- 'logi' => 'Login needed, regardless of user information sent by LTI Consumer in (signed) parameters',
- 'used' => 'Use domain default',
- 'cour' => 'Use course-specific setting',
- 'modi' => 'Save',
- 'back' => 'Pick another action',
- );
- &print_header($r,$type);
- $r->print('