--- loncom/interface/lonmodifycourse.pm 2024/08/26 10:48:59 1.79.2.9.2.7
+++ loncom/interface/lonmodifycourse.pm 2016/07/24 14:34:59 1.84
@@ -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.7 2024/08/26 10:48:59 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.84 2016/07/24 14:34:59 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;
}
}
@@ -79,6 +71,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');
@@ -97,11 +96,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'} = '';
@@ -127,7 +125,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 'nopasswdchg') {
+ || $type eq "autodropfailsafe") {
$enrollvar{$type} = $settings{$item};
} elsif ($type eq 'defaultcredits') {
if (&showcredits($cdom)) {
@@ -175,187 +173,42 @@ 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).' ');
}
$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:');
- }
- 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(&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".' ');
+ } elsif ($type eq 'Placement') {
+ $r->print(&mt('Actions available after searching for a placement test:').''.
+ ''.&mt('Enter the placement test with the role of [_1]',$cctitle).' '."\n".
+ ''.&mt('View or modify placement test 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".' ');
}
- $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 +221,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 +242,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,83 +257,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',
- 'setcrseditors' => 'View/Modify permitted course resource editors',
- );
- } 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',
- 'setcrseditors' => 'View permitted course resource editors',
- );
- }
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 (($type ne 'Placement') && (&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;
}
@@ -493,142 +299,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') && ($type ne 'Placement')),
#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'},
- linktitle => '',
- },
- {
- linktext => $linktext{'setcrseditors'},
- icon => 'crseditors.png',
- #help => '',
- url => &phaseurl('setcrseditors'),
- permission => $permission->{'setcrseditors'},
+ permission => 1,
linktitle => '',
},
]
},
);
- $r->print(
+ my $menu_html =
''
- .&mt($type).': '.$cdesc.' '
- .' '."\n");
- if ($extendedtype) {
- $r->print(''.&mt('Type').': '.&mt("$extendedtype $type").' ');
+ .&mt('View/Modify settings for: [_1]',
+ ''.$cdesc.' ')
+ .''."\n".'';
+ 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:');
+ }
+ $menu_html .= '
'."\n".'';
+ if ($type eq 'Community') {
+ $menu_html .= ''.&mt('Community owner (permitted to assign Coordinator roles in the community).').' '."\n".
+ ''.&mt('Override defaults for who configures self-enrollment for this specific community').' '."\n";
+ } 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 (($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";
+ }
+ $menu_html .= ''.$setquota_text.' '."\n".
+ ''.$setuploadquota_text.' '."\n".
+ ''.$anon_text.' '."\n".
+ ''.$postsubmit_text.' '."\n";
+ foreach my $item (@additional_params) {
+ if ($type eq 'Community') {
+ if ($item eq 'togglecats') {
+ $menu_html .= ' '.&mt('Hiding/unhiding a community from the catalog (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','',' ').' '."\n";
+ } elsif ($item eq 'categorize') {
+ $menu_html .= ' '.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','',' ').' '."\n";
+ }
+ } else {
+ if ($item eq 'togglecats') {
+ $menu_html .= ' '.&mt('Hiding/unhiding a course from the course catalog (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).','',' ').' '."\n";
+ } elsif ($item eq 'categorize') {
+ $menu_html .= ' '.&mt('Manual cataloging of a course (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).','',' ').' '."\n";
+ }
+ }
}
- $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(
@@ -657,34 +451,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 .= ''.&mt('Yes').' '."\n";
} else {
@@ -694,44 +463,32 @@ sub print_settings_display {
}
$disp_table .= &Apache::loncommon::end_data_table()."\n";
&print_header($r,$type);
- my ($enroll_link_start,$enroll_link_end,$setparms_link_start,$setparms_link_end);
- if (&Apache::lonnet::allowed('ccc',$cdom)) {
- my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
- my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
- '=1&destinationurl=/adm/populate','&<>"');
- $enroll_link_start = '';
- $enroll_link_end = ' ';
- }
- if ($permission->{'setparms'}) {
- $setparms_link_start = '';
- $setparms_link_end = ' ';
- }
- $r->print(''.&mt('Current automated enrollment settings').' '."\n".
- ''.&mt($type).': '.$cdesc.' '."\n".
+ my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
+ my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
+ '=1&destinationurl=/adm/populate','&<>"');
+ $r->print(''.&mt('Current automated enrollment settings for:').
+ ' '.$cdesc.' '.
''."\n");
- my @actions =
- (''.
- $lt{'back'}.' ');
- $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
+ $r->print(''.
+ ''.$lt{'cour'}.'
'.$disp_table.'
'.
+ ''.$lt{'back'}.' '."\n".
+ &hidden_form_elements().
+ '
'
+ );
}
sub print_setquota {
- my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$type) = @_;
my $lctype = lc($type);
- my $headline = ''.&mt("Set disk space quotas for $lctype").' '."\n".
- ''.&mt($type).': '.$cdesc.' '."\n";
+ my $headline = &mt("Set disk space quotas for $lctype: [_1]",
+ ''.$cdesc.' ');
my %lt = &Apache::lonlocal::texthash(
'gpqu' => 'Disk space for storage of group portfolio files',
'upqu' => 'Disk space for storage of content directly uploaded to course via Content Editor',
@@ -746,58 +503,44 @@ sub print_setquota {
$cdom,$cnum);
my $coursequota = $settings{'internal.coursequota'};
my $uploadquota = $settings{'internal.uploadquota'};
- if (($uploadquota eq '') || ($coursequota eq '')) {
+ if ($coursequota eq '') {
+ $coursequota = $staticdefaults{'coursequota'};
+ }
+ if ($uploadquota eq '') {
my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
my $quotatype = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$type,\%settings);
+ $uploadquota = $domdefs{$quotatype.'quota'};
if ($uploadquota eq '') {
- $uploadquota = $domdefs{$quotatype.'quota'};
- if ($uploadquota eq '') {
- $uploadquota = $staticdefaults{'uploadquota'};
- }
- }
- if ($coursequota eq '') {
- $coursequota = $domdefs{$quotatype.'coursequota'};
- if ($coursequota eq '') {
- $coursequota = $staticdefaults{'coursequota'};
- }
+ $uploadquota = $staticdefaults{'uploadquota'};
}
}
&print_header($r,$type);
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(<
+$headline
-$porthelpitem $lt{'gpqu'}: MB
+$porthelpitem $lt{'gpqu'}: MB
-$uploadhelpitem $lt{'upqu'}: MB
+$uploadhelpitem $lt{'upqu'}: MB
-$submit
+
$hidden_elements
+$lt{'back'}
ENDDOCUMENT
- my @actions =
- (''.
- $lt{'back'}.' ');
- $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
sub print_set_anonsurvey_threshold {
- my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$type) = @_;
my %lt = &Apache::lonlocal::texthash(
'resp' => 'Responder threshold for anonymous survey submissions display:',
'sufa' => 'Anonymous survey submissions displayed when responders exceeds',
@@ -807,7 +550,7 @@ sub print_set_anonsurvey_threshold {
my %settings = &Apache::lonnet::get('environment',['internal.anonsurvey_threshold'],$cdom,$cnum);
my $threshold = $settings{'internal.anonsurvey_threshold'};
if ($threshold eq '') {
- my %domconfig =
+ my %domconfig =
&Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
$threshold = $domconfig{'coursedefaults'}{'anonsurvey_threshold'};
@@ -820,33 +563,23 @@ sub print_set_anonsurvey_threshold {
}
&print_header($r,$type);
my $hidden_elements = &hidden_form_elements();
- my ($disabled,$submit);
- if ($readonly) {
- $disabled = ' disabled="disabled"';
- } else {
- $submit = ' ';
- }
my $helpitem = &Apache::loncommon::help_open_topic('Modify_Anonsurvey_Threshold');
- my $showtype = &mt($type);
$r->print(<$lt{'resp'}
-$showtype: $cdesc
ENDDOCUMENT
- my @actions =
- (''.
- $lt{'back'}.' ');
- $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
sub print_postsubmit_config {
- my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$type) = @_;
my %lt = &Apache::lonlocal::texthash (
'conf' => 'Configure submit button behavior after student makes a submission',
'disa' => 'Disable submit button/keypress following student submission',
@@ -862,11 +595,11 @@ sub print_postsubmit_config {
if ($postsubmit eq '') {
my %domconfig =
&Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
- $postsubmit = 1;
+ $postsubmit = 1;
if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'off') {
- $postsubmit = 0;
+ $postsubmit = 0;
}
}
}
@@ -887,44 +620,41 @@ sub print_postsubmit_config {
}
&print_header($r,$type);
my $hidden_elements = &hidden_form_elements();
- my ($disabled,$submit);
- if ($readonly) {
- $disabled = ' disabled="disabled"';
- } else {
- $submit = ' ';
- }
my $helpitem = &Apache::loncommon::help_open_topic('Modify_Postsubmit_Config');
- my $showtype = &mt($type);
$r->print(<$lt{'conf'}
-$showtype: $cdesc
ENDDOCUMENT
- my @actions =
- (''.
- $lt{'back'}.' ');
- $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
sub domain_postsubtimeout {
my ($cdom,$type,$settings) = @_;
- return unless (ref($settings) eq 'HASH');
- my $lctype = &get_lctype($type,$settings);
+ return unless (ref($settings) eq 'HASH');
+ my $lctype = lc($type);
+ unless (($type eq 'Community') || ($type eq 'Placement')) {
+ $lctype = 'unofficial';
+ if ($settings->{'internal.coursecode'}) {
+ $lctype = 'official';
+ } elsif ($settings->{'internal.textbook'}) {
+ $lctype = 'textbook';
+ }
+ }
my %domconfig =
&Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
my $postsubtimeout = 60;
@@ -940,24 +670,8 @@ sub domain_postsubtimeout {
return $postsubtimeout;
}
-sub get_lctype {
- my ($type,$settings) = @_;
- my $lctype = lc($type);
- unless ($type eq 'Community') {
- $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) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$type) = @_;
&print_header($r,$type);
my %lt = &Apache::lonlocal::texthash(
'back' => 'Pick another action',
@@ -973,74 +687,54 @@ sub print_catsettings {
$lt{'categ'} = &mt('Categorize Community');
$lt{'assi'} = &mt('Assign one or more subcategories to this community.');
}
- $r->print(''.$lt{'catset'}.' '."\n".
- ''.&mt($type).': '.$cdesc.' '."\n".
- ''."\n");
- my @actions =
- (''.
- $lt{'back'}.' ');
- $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
sub print_course_modification_page {
- my ($r,$cdom,$cnum,$cdesc,$crstype,$readonly) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$crstype) = @_;
my %lt=&Apache::lonlocal::texthash(
'actv' => "Active",
'inac' => "Inactive",
@@ -1071,30 +763,26 @@ sub print_course_modification_page {
'gobt' => "Save",
'sett' => 'Setting',
'domd' => 'Domain default',
- 'whom' => 'Who configures',
+ 'whom' => 'Who configures',
);
- my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname,$disabled);
+ my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname);
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.selfenrollmgrdc','internal.selfenrollmgrcc'],
+ $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,$readonly);
+ ($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar);
}
$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)) {
@@ -1105,11 +793,11 @@ sub print_course_modification_page {
$cc_status{$uname.':'.$udom} = $lt{'actv'};
}
}
- if (($enrollvar{'courseowner'} ne '') &&
+ if (($enrollvar{'courseowner'} ne '') &&
(!grep(/^$enrollvar{'courseowner'}$/,@local_ccs))) {
push(@local_ccs,$enrollvar{'courseowner'});
my ($owneruname,$ownerdom) = split(/:/,$enrollvar{'courseowner'});
- $pname{$enrollvar{'courseowner'}} =
+ $pname{$enrollvar{'courseowner'}} =
&Apache::loncommon::plainname($owneruname,$ownerdom);
my $active_cc = &Apache::loncommon::check_user_status($ownerdom,$owneruname,
$cdom,$cnum,$ccrole);
@@ -1135,11 +823,11 @@ sub print_course_modification_page {
foreach my $cc (@local_ccs) {
$ownertable .= &Apache::loncommon::start_data_table_row()."\n";
if ($cc eq $enrollvar{'courseowner'}) {
- $ownertable .= ' '."\n";
+ $ownertable .= ' '."\n";
} else {
- $ownertable .= ' '."\n";
+ $ownertable .= ' '."\n";
}
- $ownertable .=
+ $ownertable .=
''.$pname{$cc}.' '."\n".
''.$cc.' '."\n".
''.$cc_status{$cc}.' '.$ccname.' '."\n".
@@ -1149,31 +837,26 @@ sub print_course_modification_page {
}
&print_header($r,$crstype,$javascript_validations);
my $dctitle = &Apache::lonnet::plaintext('dc');
+ my $mainheader = &modifiable_only_title($crstype);
my $hidden_elements = &hidden_form_elements();
- my $showtype;
- if (($type eq 'official') || ($type eq 'unofficial') || ($type eq 'textbook')) {
- $showtype = ' ('.&mt($type).')';
- }
- $r->print(''.&modifiable_only_title($crstype).' '."\n".
- ''.&mt($crstype).': '.$cdesc.$showtype.' '."\n".
- '');
- my @actions =
- (''.
- &mt('Pick another action').' ');
- $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
+ $r->print(' value="'.$lt{'gobt'}.'" />');
return;
}
sub print_selfenrollconfig {
- my ($r,$type,$cdesc,$coursehash,$readonly) = @_;
+ my ($r,$type,$cdesc,$coursehash) = @_;
return unless(ref($coursehash) eq 'HASH');
my $cnum = $coursehash->{'num'};
my $cdom = $coursehash->{'domain'};
my %currsettings = &get_selfenroll_settings($coursehash);
&print_header($r,$type);
- $r->print(''.&mt('Self-enrollment with a student role').' '."\n".
- ''.&mt($type).': '.$cdesc.' '."\n");
+ $r->print(''.&mt('Self-enrollment with a student role in: [_1]',
+ ''.$cdesc.' ').' '."\n");
&Apache::loncreateuser::print_selfenroll_menu($r,'domain',$env{'form.pickedcourse'},
$cdom,$cnum,\%currsettings,
- &hidden_form_elements(),$readonly);
- my @actions =
- (''.
- &mt('Pick another action').' ');
- $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
- return;
-}
-
-sub print_default_overrides {
- my ($r,$cdom,$cnum,$cdesc,$type,$readonly,$item) = @_;
- my (%titles,$checkeddom,$checkedcrs,$divsty,$currcrsval,$crsdefault,%crschecked,
- $helpfile,$title,$crselements,@currcrseditors);
- %titles = &default_overrides_titles($type);
- my ($title,$domdefdisplay,$settings,$optiontext,$options) =
- &default_overrides_common($item,$cdom,$cnum,$type,\%titles);
- $checkeddom = ' checked="checked"';
- $divsty = 'display:none';
-
- if ($item eq 'ltiauth') {
- $helpfile = 'Modify_Course_LTI_Authen';
- $crsdefault = 0;
- } else {
- if ($item eq 'exttool') {
- $helpfile = 'Modify_Course_External_Tool';
- $crsdefault = 'both';
- } elsif ($item eq 'crsauthor') {
- $helpfile = 'Modify_Course_Crsauthor';
- $crsdefault = 1;
- } elsif ($item eq 'crseditors') {
- $helpfile = 'Modify_Course_Resource_Editors';
- $crsdefault = 'edit,xml';
- }
- }
- $currcrsval = $settings->{'internal.'.$item};
- if ($currcrsval ne '') {
- $checkedcrs = $checkeddom;
- $checkeddom = '';
- $divsty = 'display:inline-block';
- if ($item eq 'crseditors') {
- @currcrseditors = split(/,/,$currcrsval);
- }
- foreach my $option (@{$options}) {
- if ($item eq 'crseditors') {
- if (grep(/^\Q$option\E$/,@currcrseditors)) {
- $crschecked{$option} = ' checked="checked"';
- }
- } elsif ($currcrsval eq $option) {
- $crschecked{$option} = ' checked="checked"';
- } else {
- $crschecked{$option} = '';
- }
- }
- } else {
- if ($item eq 'crseditors') {
- my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
- @currcrseditors = split(/,/,$domdefs{'crseditors'});
- }
- foreach my $option (@{$options}) {
- if ($item eq 'crseditors') {
- if (grep(/^\Q$option\E$/,@currcrseditors)) {
- $crschecked{$option} = ' checked="checked"';
- }
- } elsif ($crsdefault eq $option) {
- $crschecked{$option} = ' checked="checked"';
- } else {
- $crschecked{$option} = '';
- }
- }
- }
- my ($disabled,$submit,$inputtype,$separator);
- if ($readonly) {
- $disabled = ' disabled="disabled"';
- } else {
- $submit = ' ';
- }
- if ($item eq 'crseditors') {
- $inputtype = 'checkbox';
- $separator = ' 'x2;
- } else {
- $inputtype = 'radio';
- $separator = ' ';
- }
- foreach my $option (@{$options}) {
- $crselements .= ''.
- ' '.$optiontext->{$option}.' '.
- ' '.$separator."\n";
- }
- &print_header($r,$type);
- my $hidden_elements = &hidden_form_elements();
- my $helpitem = &Apache::loncommon::help_open_topic($helpfile);
- my $showtype = &mt($type);
- $r->print(<$helpitem $title
-$showtype: $cdesc
-
-ENDDOCUMENT
- my @actions =
- (''.
- $titles{'back'}.' ');
- $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
+ &hidden_form_elements());
return;
}
-sub default_overrides_titles {
- my ($type) = @_;
- my %titles = &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',
- 'extt' => 'External Tool permissions',
- 'none' => 'Use of external tools not permitted',
- 'crs' => 'Only external tools defined in course may be used',
- 'dom' => 'Only external tools defined in domain may be used',
- 'both' => 'External tools defined/configured in either domain or course may be used',
- 'stan' => "'In-course' authoring of standard LON-CAPA problems",
- 'perc' => 'Permitted course resource editors',
- 'edit' => 'Standard editor (Edit)',
- 'xml' => 'Text editor (EditXML)',
- 'daxe' => 'Daxe editor (Daxe)',
- 'on' => 'In-course authoring available',
- 'off' => 'In-course authoring unavailable',
- 'used' => 'Use domain default',
- 'cour' => 'Use course-specific setting',
- 'curd' => 'Current domain default is',
- 'valu' => 'Value for this course',
- 'modi' => 'Save',
- 'back' => 'Pick another action',
- );
- if ($type eq 'Community') {
- $titles{'crs'} = &mt('Only external tools defined in community may be used');
- $titles{'both'} = &mt('External tools defined/configured in either domain or community may be used');
- $titles{'cour'} = &mt('Use community-specific setting');
- $titles{'valu'} = &mt('Value for this community');
- }
- return %titles;
-}
-
-sub default_overrides_common {
- my ($item,$cdom,$cnum,$type,$titles) = @_;
- my ($title,$domdef,$domdefdom,$domdefdisplay,%settings,%optiontext,@options);
- if ($item eq 'ltiauth') {
- %settings = &Apache::lonnet::get('environment',['internal.'.$item],$cdom,$cnum);
- $title = $titles->{'requ'};
- $domdef = 0;
- @options = ('0','1');
- %optiontext = (
- 0 => $titles->{'logi'},
- 1 => $titles->{'link'},
- );
- } else {
- %settings =
- &Apache::lonnet::get('environment',['internal.'.$item,'internal.coursecode',
- 'internal.textbook'],$cdom,$cnum);
- if ($item eq 'exttool') {
- $title = $titles->{'extt'};
- $domdefdom = 1;
- $domdef = 0;
- @options = ('both','dom','crs','none');
- map { $optiontext{$_} = $titles->{$_}; } @options;
- } elsif ($item eq 'crsauthor') {
- $title = $titles->{'stan'};
- $domdef = 1;
- @options = ('1','0');
- %optiontext = (
- 1 => $titles->{'on'},
- 0 => $titles->{'off'},
- );
- } elsif ($item eq 'crseditors') {
- $title = $titles->{'perc'};
- $domdef = 1;
- @options = ('edit','xml','daxe');
- map { $optiontext{$_} = $titles->{$_}; } @options;
- }
- }
- my %domconfig =
- &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
- if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
- if (($item eq 'ltiauth') || ($item eq 'crseditors')) {
- $domdef = $domconfig{'coursedefaults'}{$item};
- } else {
- my $lctype = &get_lctype($type,\%settings);
- if (ref($domconfig{'coursedefaults'}{$item}) eq 'HASH') {
- if (exists($domconfig{'coursedefaults'}{$item}{$lctype})) {
- $domdef = $domconfig{'coursedefaults'}{$item}{$lctype};
- }
- }
- if ($item eq 'exttool') {
- if (ref($domconfig{'coursedefaults'}{'domexttool'}) eq 'HASH') {
- if (exists($domconfig{'coursedefaults'}{'domexttool'}{$lctype})) {
- $domdefdom = $domconfig{'coursedefaults'}{'domexttool'}{$lctype};
- }
- }
- }
- }
- }
- if ($item eq 'ltiauth') {
- if ($domdef) {
- $domdefdisplay = $titles->{'link'};
- } else {
- $domdefdisplay = $titles->{'logi'};
- }
- } elsif ($item eq 'exttool') {
- if ($domdef && $domdefdom) {
- $domdefdisplay = $titles->{'both'};
- } elsif ($domdef) {
- $domdefdisplay = $titles->{'crs'};
- } elsif ($domdefdom) {
- $domdefdisplay = $titles->{'dom'};
- } else {
- $domdefdisplay = $titles->{'none'};
- }
- } elsif ($item eq 'crsauthor') {
- if ($domdef) {
- $domdefdisplay = $titles->{'on'};
- } else {
- $domdefdisplay = $titles->{'off'};
- }
- } elsif ($item eq 'crseditors') {
- if (ref($domdef) eq 'ARRAY') {
- if (@{$domdef} == 0) {
- $domdefdisplay = &mt('No permitted editors');
- } elsif (@{$domdef} == 1) {
- $domdefdisplay = $titles->{$domdef->[0]}.' ('.&mt('only').')';
- } else {
- $domdefdisplay = join(', ', map { $titles->{$_}; } @{$domdef});
- }
- } else {
- $domdefdisplay = join(', ', map { $titles->{$_}; } ('edit','xml'));
- }
- }
- return ($title,$domdefdisplay,\%settings,\%optiontext,\@options);
-}
-
sub modify_selfenrollconfig {
my ($r,$type,$cdesc,$coursehash) = @_;
return unless(ref($coursehash) eq 'HASH');
@@ -1535,17 +951,13 @@ sub modify_selfenrollconfig {
my $cdom = $coursehash->{'domain'};
my %currsettings = &get_selfenroll_settings($coursehash);
&print_header($r,$type);
- $r->print(''.&mt('Self-enrollment with a student role').' '.
- ''.&mt($type).': '.$cdesc.' '."\n".
- '');
- my @actions =
- (''.
- &mt('Pick another action').' ');
- $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -1577,14 +989,14 @@ sub modifiable_only_title {
my ($type) = @_;
my $dctitle = &Apache::lonnet::plaintext('dc');
if ($type eq 'Community') {
- return &mt('Community settings modifiable only by [_1]',$dctitle);
+ return &mt('Community settings modifiable only by [_1] for:',$dctitle);
} else {
- return &mt('Course settings modifiable only by [_1]',$dctitle);
+ return &mt('Course settings modifiable only by [_1] for:',$dctitle);
}
}
sub gather_authenitems {
- my ($cdom,$enrollvar,$readonly) = @_;
+ my ($cdom,$enrollvar) = @_;
my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($cdom);
my $curr_authtype = '';
my $curr_authfield = '';
@@ -1595,14 +1007,12 @@ sub gather_authenitems {
$curr_authtype = 'int';
} elsif ($enrollvar->{'authtype'} eq 'localauth' ) {
$curr_authtype = 'loc';
- } elsif ($enrollvar->{'authtype'} eq 'lti' ) {
- $curr_authtype = 'lti';
}
}
unless ($curr_authtype eq '') {
$curr_authfield = $curr_authtype.'arg';
}
- my $javascript_validations =
+ my $javascript_validations =
&Apache::lonuserutils::javascript_validations('modifycourse',$krbdefdom,
$curr_authtype,$curr_authfield);
my %param = ( formname => 'document.'.$env{'form.phase'},
@@ -1610,15 +1020,13 @@ sub gather_authenitems {
kerb_def_auth => $krbdef,
mode => 'modifycourse',
curr_authtype => $curr_authtype,
- curr_autharg => $enrollvar->{'autharg'},
- readonly => $readonly,
+ curr_autharg => $enrollvar->{'autharg'}
);
my (%authform,$authenitems);
$authform{'krb'} = &Apache::loncommon::authform_kerberos(%param);
$authform{'int'} = &Apache::loncommon::authform_internal(%param);
$authform{'loc'} = &Apache::loncommon::authform_local(%param);
- $authform{'lti'} = &Apache::loncommon::authform_lti(%param);
- foreach my $item ('krb','int','loc','lti') {
+ foreach my $item ('krb','int','loc') {
if ($authform{$item} ne '') {
$authenitems .= $authform{$item}.' ';
}
@@ -1631,18 +1039,14 @@ sub modify_course {
my %longtype = &course_settings_descrip($type);
my @items = ('internal.courseowner','description','internal.co-owners',
'internal.pendingco-owners','internal.selfenrollmgrdc',
- 'internal.selfenrollmgrcc','internal.mysqltables');
+ 'internal.selfenrollmgrcc');
my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles();
- unless ($type eq 'Community') {
+ unless (($type eq 'Community') || ($type eq 'Placement')) {
push(@items,('internal.coursecode','internal.authtype','internal.autharg',
'internal.sectionnums','internal.crosslistings'));
- if (&showcredits($cdom)) {
+ if (&showcredits($cdom)) {
push(@items,'internal.defaultcredits');
}
- my %passwdconf = &Apache::lonnet::get_passwdconf($cdom);
- if ($passwdconf{'crsownerchg'}) {
- push(@items,'internal.nopasswdchg');
- }
}
my %settings = &Apache::lonnet::get('environment',\@items,$cdom,$cnum);
my $description = $settings{'description'};
@@ -1658,7 +1062,6 @@ sub modify_course {
} else {
%changed = ( code => 0,
owner => 0,
- passwd => 0,
);
$ccrole = 'cc';
unless ($settings{'internal.sectionnums'} eq '') {
@@ -1689,8 +1092,6 @@ sub modify_course {
if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
$newattr{'autharg'} = $env{'form.locarg'};
}
- } elsif ($env{'form.login'} eq 'lti') {
- $newattr{'authtype'} = 'lti';
}
if ( $newattr{'authtype'}=~ /^krb/) {
if ($newattr{'autharg'} eq '') {
@@ -1709,25 +1110,10 @@ sub modify_course {
$changed{'code'} = 1;
}
}
- if ( exists($env{'form.mysqltables'}) ) {
- $newattr{'mysqltables'} = $env{'form.mysqltables'};
- $newattr{'mysqltables'} =~ s/\D+//g;
- }
- if ($type ne 'Placement') {
- if (&showcredits($cdom) && exists($env{'form.defaultcredits'})) {
- $newattr{'defaultcredits'}=$env{'form.defaultcredits'};
- $newattr{'defaultcredits'} =~ s/[^\d\.]//g;
- }
- if (grep(/^nopasswdchg$/,@modifiable_params)) {
- if ($env{'form.nopasswdchg'}) {
- $newattr{'nopasswdchg'} = 1;
- unless ($currattr{'nopasswdchg'}) {
- $changed{'passwd'} = 1;
- }
- } elsif ($currattr{'nopasswdchg'}) {
- $changed{'passwd'} = 1;
- }
- }
+
+ if (($type ne 'Placement') && (&showcredits($cdom) && exists($env{'form.defaultcredits'}))) {
+ $newattr{'defaultcredits'} =~ s/[^\d\.]//g;
+ $newattr{'defaultcredits'}=$env{'form.defaultcredits'};
}
}
@@ -1759,10 +1145,10 @@ sub modify_course {
$newattr{'courseowner'}=$env{'form.courseowner'};
unless ( $newattr{'courseowner'} eq $currattr{'courseowner'} ) {
$changed{'owner'} = 1;
- }
+ }
}
- if ($changed{'owner'} || $changed{'code'} || $changed{'passwd'}) {
+ if ($changed{'owner'} || $changed{'code'}) {
my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,
undef,undef,'.');
if (ref($crsinfo{$env{'form.pickedcourse'}}) eq 'HASH') {
@@ -1772,29 +1158,10 @@ sub modify_course {
if ($changed{'owner'}) {
$crsinfo{$env{'form.pickedcourse'}}{'owner'} = $env{'form.courseowner'};
}
- if ($changed{'passwd'}) {
- if ($env{'form.nopasswdchg'}) {
- $crsinfo{$env{'form.pickedcourse'}}{'nopasswdchg'} = 1;
- } else {
- delete($crsinfo{'nopasswdchg'});
- }
- }
my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
my $putres = &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime');
- if (($putres eq 'ok') && (($changed{'owner'} || $changed{'code'}))) {
+ if ($putres eq 'ok') {
&update_coowners($cdom,$cnum,$chome,\%settings,\%newattr);
- if ($changed{'code'}) {
- &Apache::lonnet::devalidate_cache_new('instcats',$cdom);
- # Update cache of self-cataloging courses on institution's server(s).
- if (&Apache::lonnet::shared_institution($cdom)) {
- unless ($registered_cleanup) {
- my $handlers = $r->get_handlers('PerlCleanupHandler');
- $r->set_handlers('PerlCleanupHandler' => [\&devalidate_remote_instcats,@{$handlers}]);
- $registered_cleanup=1;
- $modified_dom = $cdom;
- }
- }
- }
}
}
}
@@ -1826,7 +1193,7 @@ sub modify_course {
} else {
if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') {
my %newenv;
- map { $newenv{'course.'.$cdom.'_'.$cnum.'.internal.'.$_} = $newattr{$_}; } @changes;
+ map { $newenv{'course.'.$cdom.'_'.$cnum.'.internal.'.$_} = $newattr{$_}; } @changes;
&Apache::lonnet::appenv(\%newenv);
}
foreach my $attr (@modifiable_params) {
@@ -1838,14 +1205,6 @@ sub modify_course {
$shown = &selfenroll_config_status(\@newmgrcc,$selfenrolltitles);
} elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
$shown = &mt('None');
- } elsif (($attr eq 'mysqltables') && ($shown eq '')) {
- $shown = &mt('domain default');
- } elsif ($attr eq 'nopasswdchg') {
- if ($shown) {
- $shown = &mt('Yes');
- } else {
- $shown = &mt('No');
- }
}
$chgresponse .= ''.&mt('[_1] now set to: [_2]',$longtype{$attr},$shown).' ';
} else {
@@ -1856,19 +1215,11 @@ sub modify_course {
$shown = &selfenroll_config_status(\@currmgrcc,$selfenrolltitles);
} elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
$shown = &mt('None');
- } elsif (($attr eq 'mysqltables') && ($shown eq '')) {
- $shown = &mt('domain default');
- } elsif ($attr eq 'nopasswdchg') {
- if ($shown) {
- $shown = &mt('Yes');
- } else {
- $shown = &mt('No');
- }
}
$nochgresponse .= ''.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).' ';
}
}
- if (($type ne 'Community') && ($changed{'code'} || $changed{'owner'})) {
+ if (($type ne 'Community') && ($type ne 'Placement') && ($changed{'code'} || $changed{'owner'})) {
if ( $newattr{'courseowner'} eq '') {
push(@warnings,&mt('There is no owner associated with this LON-CAPA course.').
' '.&mt('If automated enrollment at your institution requires validation of course owners, automated enrollment will fail.'));
@@ -1885,6 +1236,7 @@ sub modify_course {
if ($course_check eq 'ok') {
my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'},$coowners);
unless ($outcome eq 'ok') {
+
push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome).' ');
}
} else {
@@ -1934,8 +1286,6 @@ sub modify_course {
$shown = &selfenroll_config_status(\@currmgrcc,$selfenrolltitles);
} elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
$shown = &mt('None');
- } elsif (($attr eq 'mysqltables') && ($shown eq '')) {
- $shown = &mt('domain default');
}
$nochgresponse .= ''.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).' ';
}
@@ -1948,7 +1298,7 @@ sub modify_course {
$nochgresponse .= " ";
}
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).'
';
foreach my $warn (@warnings) {
@@ -1962,8 +1312,8 @@ sub modify_course {
$reply = $chgresponse.$nochgresponse.$warning;
}
&print_header($r,$type);
- $reply = ''.&modifiable_only_title($type).' '."\n".
- ''.&mt($type).': '.$cdesc.' '."\n".
+ my $mainheader = &modifiable_only_title($type);
+ $reply = ''.$mainheader.' '.$cdesc.' '."\n".
''.$reply.'
'."\n".
' '.
- ' '.&Apache::lonhtmlcommon::actionbox(\@actions);
+ $reply .= &Apache::lonhtmlcommon::actionbox(\@actions).'';
$r->print($reply);
return;
}
@@ -2148,9 +1497,10 @@ sub modify_quota {
my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
&print_header($r,$type);
my $lctype = lc($type);
- $r->print(''.&mt("Disk space quotas for $lctype")." \n".
- ''.&mt($type).' :'.$cdesc.' '."\n".
- '');
- my @actions =
- (''.
- &mt('Pick another action').' ');
- $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
sub modify_anonsurvey_threshold {
my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
&print_header($r,$type);
- $r->print(''.&mt('Responder threshold required for display of anonymous survey submissions').' '."\n".
- ''.&mt($type).': '.$cdesc.' '."\n".
- '');
- my @actions =
- (''.
- &mt('Pick another action').' ');
- $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -2325,19 +1673,18 @@ sub modify_postsubmit_config {
unch => 'Post submission behavior of the Submit button is unchanged.',
erro => 'An error occurred when saving your proposed changes.',
inva => 'An invalid response was recorded.',
- back => 'Pick another action',
+ pick => 'Pick another action',
);
- $r->print(''.$lt{'subb'}.' '."\n".
- ''.&mt($type).': '.$cdesc.' '."\n".
- '');
- my @actions =
- (''.
- $lt{'back'}.' ');
- $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
+ $r->print(''.
+ ''.
+ &mt('Pick another action').'
');
+ $r->print(&hidden_form_elements().'');
return;
}
@@ -2408,16 +1754,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_default_overrides {
- my ($r,$cdom,$cnum,$cdesc,$domdesc,$type,$item) = @_;
- my (%titles,$oldcrsval,$newcrsval,%resulttext,$itemvalue,$nochange,$change,$status,$error);
- %titles = &default_overrides_titles($type);
- my ($title,$domdefdisplay,$oldsettings,$optiontext,$options) =
- &default_overrides_common($item,$cdom,$cnum,$type,\%titles);
- $oldcrsval = $oldsettings->{'internal.'.$item};
- if ($item eq 'ltiauth') {
- %resulttext =
- &Apache::lonlocal::texthash(
- chg => 'Re-authentication requirement for LTI launch of deep-linked changed',
- nochg => 'Re-authentication requirement for LTI launch of deep-linked item is unchanged',
- );
- } elsif ($item eq 'exttool') {
- %resulttext =
- &Apache::lonlocal::texthash(
- chg => 'External Tool permissions changed',
- nochg => 'External Tool permissions unchanged',
- );
- } elsif ($item eq 'crsauthor') {
- %resulttext =
- &Apache::lonlocal::texthash(
- chg => 'In-course authoring permissions changed',
- nochg => 'In-course authoring permissions unchanged',
- );
- } elsif ($item eq 'crseditors') {
- %resulttext =
- &Apache::lonlocal::texthash(
- chg => 'Permitted course resource editors changed',
- nochg => 'Permitted course resource editors unchanged',
- );
- }
- &print_header($r,$type);
- $r->print(''.$title.' '."\n".
- ''.&mt($type).': '.$cdesc.' '."\n".
- '');
- my @actions =
- (''.
- $titles{'back'}.' ');
- $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
+ $r->print(' '."\n".
+ ''.
+ &mt('Pick another action').' ');
+ $r->print(&hidden_form_elements().'');
return;
}
@@ -2676,7 +1898,13 @@ function changePage(formname,newphase) {
if ($phase eq 'setparms') {
$js .= $javascript_validations;
} elsif ($phase eq 'courselist') {
- $js .= <<"ENDJS";
+ $js .= qq|
+
+function gochoose(cname,cdom,cdesc) {
+ document.courselist.pickedcourse.value = cdom+'_'+cname;
+ document.courselist.submit();
+}
+
function hide_searching() {
if (document.getElementById('searching')) {
document.getElementById('searching').style.display = 'none';
@@ -2684,7 +1912,7 @@ function hide_searching() {
return;
}
-ENDJS
+|;
} elsif ($phase eq 'setquota') {
my $invalid = &mt('The quota you entered contained invalid characters.');
my $alert = &mt('You must enter a number');
@@ -2694,10 +1922,9 @@ ENDJS
$js .= <<"ENDSCRIPT";
function verify_quota() {
- var newcoursequota = document.setquota.coursequota.value;
- var newuploadquota = document.setquota.uploadquota.value;
+ var newquota = document.setquota.coursequota.value;
var num_reg = $regexp;
- if ((num_reg.test(newcoursequota)) && (num_reg.test(newuploadquota))) {
+ if (num_reg.test(newquota)) {
changePage(document.setquota,'processquota');
} else {
alert("$invalid\\n$alert");
@@ -2742,7 +1969,7 @@ ENDSCRIPT
&js_escape(\$alert);
my $regexp = ' /^\s*\d+\s*$/';
- $js .= <<"ENDSCRIPT";
+ $js .= <<"ENDSCRIPT";
function verify_postsubmit() {
var optionsElement = document.setpostsubmit.postsubmit;
@@ -2774,7 +2001,7 @@ function verify_postsubmit() {
}
} else {
if (currval == 0) {
- verified = 'ok';
+ verified = 'ok';
} else {
alert('$invalid');
return false;
@@ -2792,7 +2019,7 @@ function togglePostsubmit(caller) {
var optionsElement = document.setpostsubmit.postsubmit;
if (document.getElementById(caller)) {
var divitem = document.getElementById(caller);
- var optionsElement = document.setpostsubmit.postsubmit;
+ var optionsElement = document.setpostsubmit.postsubmit;
if (optionsElement.length) {
var currval;
for (var i=0; i {'onload' => "javascript:document.adhocrole.submit();"},
+ add_entries => {'onload' => "javascript:document.ccrole.submit();"},
};
} elsif ($phase eq 'courselist') {
$starthash = {
add_entries => {'onload' => "hide_searching(); courseSet(document.filterpicker.official, 'load');"},
};
- } elsif ($env{'form.phase'} =~ /^set(ltiauth|exttool|crseditors)$/) {
- $starthash = {
- add_entries => {'onload' => "toggleOptions(document.$env{'form.phase'},'$env{'form.phase'}');"},
- };
}
$r->print(&Apache::loncommon::start_page('View/Modify Course/Community Settings',
&Apache::lonhtmlcommon::scripttag($js),
@@ -2876,18 +2056,12 @@ ENDJS
my $bread_text = "View/Modify Courses/Communities";
if ($type eq 'Community') {
$bread_text = 'Community Settings';
+ } elsif ($type eq 'Placement') {
+ $bread_text = 'Placement Test Settings';
} else {
$bread_text = 'Course Settings';
}
- my $helpcomponent;
- if ($env{'form.phase'} eq 'menu') {
- if ($type eq 'Community') {
- $helpcomponent = 'Domain_Modify_Community';
- } else {
- $helpcomponent = 'Domain_Modify_Course';
- }
- }
- $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text,$helpcomponent));
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text));
return;
}
@@ -2938,7 +2112,6 @@ sub course_settings_descrip {
'co-owners' => "Username:domain of each co-owner",
'selfenrollmgrdc' => "Community-specific self-enrollment configuration by Domain Coordinator",
'selfenrollmgrcc' => "Community-specific self-enrollment configuration by Community personnel",
- 'mysqltables' => '"Temporary" student performance tables lifetime (seconds)',
);
} else {
%longtype = &Apache::lonlocal::texthash(
@@ -2960,23 +2133,20 @@ sub course_settings_descrip {
'autodropfailsafe' => "Failsafe section enrollment count",
'selfenrollmgrdc' => "Course-specific self-enrollment configuration by Domain Coordinator",
'selfenrollmgrcc' => "Course-specific self-enrollment configuration by Course personnel",
- 'mysqltables' => '"Temporary" student performance tables lifetime (seconds)',
- 'nopasswdchg' => 'Disable changing password for users with student role by course owner',
+
);
}
return %longtype;
}
sub hidden_form_elements {
- my $hidden_elements =
+ my $hidden_elements =
&Apache::lonhtmlcommon::echo_form_input(['gosearch','updater','coursecode',
'prevphase','numlocalcc','courseowner','login','coursequota','intarg',
'locarg','krbarg','krbver','counter','hidefromcat','usecategory',
'threshold','postsubmit','postsubtimeout','defaultcredits','uploadquota',
'selfenrollmgrdc','selfenrollmgrcc','action','state','currsec_st',
- 'sections','newsec','mysqltables','nopasswdchg','ltiauth','ltiauthset',
- 'exttoolset','exttool','crseditorsset','crseditors'],
- ['^selfenrollmgr_','^selfenroll_'])."\n".
+ 'sections','newsec'],['^selfenrollmgr_'])."\n".
' ';
return $hidden_elements;
}
@@ -2989,74 +2159,6 @@ sub showcredits {
}
}
-sub get_permission {
- my ($dom) = @_;
- my ($allowed,%permission);
- my %passwdconf = &Apache::lonnet::get_passwdconf($dom);
- if (&Apache::lonnet::allowed('ccc',$dom)) {
- $allowed = 1;
- %permission = (
- setquota => 'edit',
- processquota => 'edit',
- setanon => 'edit',
- processthreshold => 'edit',
- setpostsubmit => 'edit',
- processpostsubmit => 'edit',
- viewparms => 'view',
- setparms => 'edit',
- processparms => 'edit',
- catsettings => 'edit',
- processcat => 'edit',
- selfenroll => 'edit',
- adhocrole => 'coord',
- setltiauth => 'edit',
- processltiauth => 'edit',
- setexttool => 'edit',
- processexttool => 'edit',
- setcrseditors => 'edit',
- processcrseditors => 'edit',
- );
- if ($passwdconf{'crsownerchg'}) {
- $permission{passwdchg} = 'edit';
- }
- } elsif (&Apache::lonnet::allowed('rar',$dom)) {
- $allowed = 1;
- %permission = (
- setquota => 'view',
- viewparms => 'view',
- setanon => 'view',
- setpostsubmit => 'view',
- setparms => 'view',
- catsettings => 'view',
- selfenroll => 'view',
- adhocrole => 'custom',
- setltiauth => 'view',
- setexttool => 'view',
- setcrseditors => 'view',
- );
- if ($passwdconf{'crsownerchg'}) {
- $permission{passwdchg} = 'view';
- }
- }
- return ($allowed,\%permission);
-}
-
-sub devalidate_remote_instcats {
- if ($modified_dom ne '') {
- my %servers = &Apache::lonnet::internet_dom_servers($modified_dom);
- my %thismachine;
- map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
- if (keys(%servers)) {
- foreach my $server (keys(%servers)) {
- next if ($thismachine{$server});
- &Apache::lonnet::remote_devalidate_cache($server,['instcats:'.$modified_dom]);
- }
- }
- $modified_dom = '';
- }
- return;
-}
-
sub handler {
my $r = shift;
if ($r->header_only) {
@@ -3065,13 +2167,10 @@ sub handler {
return OK;
}
- $registered_cleanup=0;
- $modified_dom = '';
-
my $dom = $env{'request.role.domain'};
my $domdesc = &Apache::lonnet::domain($dom,'description');
- my ($allowed,$permission) = &get_permission($dom);
- if ($allowed) {
+
+ if (&Apache::lonnet::allowed('ccc',$dom)) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -3098,22 +2197,26 @@ sub handler {
}
if ($type eq 'Community') {
$choose_text = "Choose a community";
+ } elsif ($type eq 'Placement') {
+ $choose_text = "Choose a placement test";
} else {
$choose_text = "Choose a course";
- }
+ }
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$firstform,'')",
text=>"Course/Community search"},
{href=>"javascript:changePage(document.$phase,'courselist')",
text=>$choose_text});
if ($phase eq 'courselist') {
- &print_course_selection_page($r,$dom,$domdesc,$permission);
+ &print_course_selection_page($r,$dom,$domdesc);
} else {
my ($checked,$cdesc,$coursehash) = &check_course($dom,$domdesc);
if ($checked eq 'ok') {
my $enter_text;
if ($type eq 'Community') {
$enter_text = 'Enter community';
+ } elsif ($type eq 'Placement') {
+ $enter_text = 'Enter placement test';
} else {
$enter_text = 'Enter course';
}
@@ -3122,33 +2225,23 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'menu')",
text=>"Pick action"});
&print_modification_menu($r,$cdesc,$domdesc,$dom,$type,
- $env{'form.pickedcourse'},$coursehash,
- $permission);
- } elsif ($phase eq 'adhocrole') {
+ $env{'form.pickedcourse'},$coursehash);
+ } elsif ($phase eq 'ccrole') {
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'adhocrole')",
+ ({href=>"javascript:changePage(document.$phase,'ccrole')",
text=>$enter_text});
- &print_adhocrole_selected($r,$type,$permission);
+ &print_ccrole_selected($r,$type);
} else {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'menu')",
text=>"Pick action"});
my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
- my ($readonly,$linktext);
- if ($permission->{$phase} eq 'view') {
- $readonly = 1;
- }
- if (($phase eq 'setquota') && ($permission->{'setquota'})) {
- if ($permission->{'setquota'} eq 'view') {
- $linktext = 'Set quota';
- } else {
- $linktext = 'Display quota';
- }
+ if ($phase eq 'setquota') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>$linktext});
- &print_setquota($r,$cdom,$cnum,$cdesc,$type,$readonly);
- } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) {
+ text=>"Set quota"});
+ &print_setquota($r,$cdom,$cnum,$cdesc,$type);
+ } elsif ($phase eq 'processquota') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'setquota')",
text=>"Set quota"});
@@ -3156,12 +2249,12 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_quota($r,$cdom,$cnum,$cdesc,$domdesc,$type);
- } elsif (($phase eq 'setanon') && ($permission->{'setanon'})) {
+ } elsif ($phase eq 'setanon') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Threshold for anonymous submissions display"});
- &print_set_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$type,$readonly);
- } elsif (($phase eq 'processthreshold') && ($permission->{'processthreshold'})) {
+ &print_set_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$type);
+ } elsif ($phase eq 'processthreshold') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'setanon')",
text=>"Threshold for anonymous submissions display"});
@@ -3169,37 +2262,27 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$domdesc,$type);
- } elsif (($phase eq 'setpostsubmit') && ($permission->{'setpostsubmit'})) {
- if ($permission->{'setpostsubmit'} eq 'view') {
- $linktext = 'Submit button behavior post-submission';
- } else {
- $linktext = 'Configure submit button behavior post-submission';
- }
+ } elsif ($phase eq 'setpostsubmit') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>$linktext});
- &print_postsubmit_config($r,$cdom,$cnum,$cdesc,$type,$readonly);
- } elsif (($phase eq 'processpostsubmit') && ($permission->{'processpostsubmit'})) {
+ text=>"Configure submit button behavior post-submission"});
+ &print_postsubmit_config($r,$cdom,$cnum,$cdesc,$type);
+ } elsif ($phase eq 'processpostsubmit') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_postsubmit_config($r,$cdom,$cnum,$cdesc,$domdesc,$type);
- } elsif (($phase eq 'viewparms') && ($permission->{'viewparms'})) {
+ } elsif ($phase eq 'viewparms') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'viewparms')",
text=>"Display settings"});
- &print_settings_display($r,$cdom,$cnum,$cdesc,$type,$permission);
- } elsif (($phase eq 'setparms') && ($permission->{'setparms'})) {
- if ($permission->{'setparms'} eq 'view') {
- $linktext = 'Display settings';
- } else {
- $linktext = 'Change settings';
- }
+ &print_settings_display($r,$cdom,$cnum,$cdesc,$type);
+ } elsif ($phase eq 'setparms') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>$linktext});
- &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type,$readonly);
- } elsif (($phase eq 'processparms') && ($permission->{'processparms'})) {
+ text=>"Change settings"});
+ &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type);
+ } elsif ($phase eq 'processparms') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'setparms')",
text=>"Change settings"});
@@ -3207,12 +2290,12 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_course($r,$cdom,$cnum,$cdesc,$domdesc,$type);
- } elsif (($phase eq 'catsettings') && ($permission->{'catsettings'})) {
+ } elsif ($phase eq 'catsettings') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Catalog settings"});
- &print_catsettings($r,$cdom,$cnum,$cdesc,$type,$readonly);
- } elsif (($phase eq 'processcat') && ($permission->{'processcat'})) {
+ &print_catsettings($r,$cdom,$cnum,$cdesc,$type);
+ } elsif ($phase eq 'processcat') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'catsettings')",
text=>"Catalog settings"});
@@ -3220,60 +2303,26 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_catsettings($r,$cdom,$cnum,$cdesc,$domdesc,$type);
- } elsif (($phase eq 'selfenroll') && ($permission->{'selfenroll'})) {
+ } elsif ($phase eq 'selfenroll') {
&Apache::lonhtmlcommon::add_breadcrumb
({href => "javascript:changePage(document.$phase,'$phase')",
text => "Self-enrollment settings"});
if (!exists($env{'form.state'})) {
- &print_selfenrollconfig($r,$type,$cdesc,$coursehash,$readonly);
+ &print_selfenrollconfig($r,$type,$cdesc,$coursehash);
} elsif ($env{'form.state'} eq 'done') {
- &Apache::lonhtmlcommon::add_breadcrumb
+ &Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_selfenrollconfig($r,$type,$cdesc,$coursehash);
}
- } elsif (($phase eq 'setltiauth') && ($permission->{'setltiauth'})) {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"Authentication post-LTI launch"});
- &print_default_overrides($r,$cdom,$cnum,$cdesc,$type,$readonly,'ltiauth');
- } elsif (($phase eq 'processltiauth') && ($permission->{'processltiauth'})) {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'setltiauth')",
- text=>"Authentication post-LTI launch"},
- {href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"Result"});
- &modify_default_overrides($r,$cdom,$cnum,$cdesc,$domdesc,$type,'ltiauth');
- } elsif (($phase eq 'setexttool') && ($permission->{'setexttool'})) {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"External Tool permission"});
- &print_default_overrides($r,$cdom,$cnum,$cdesc,$type,$readonly,'exttool');
- } elsif (($phase eq 'processexttool') && ($permission->{'processexttool'})) {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'setexttool')",
- text=>"External Tool permission"},
- {href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"Result"});
- &modify_default_overrides($r,$cdom,$cnum,$cdesc,$domdesc,$type,'exttool');
- } elsif (($phase eq 'setcrseditors') && ($permission->{'setcrseditors'})) {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"Available course resource editors"});
- &print_default_overrides($r,$cdom,$cnum,$cdesc,$type,$readonly,'crseditors');
- } elsif (($phase eq 'processcrseditors') && ($permission->{'processcrseditors'})) {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'setcrseditors')",
- text=>"Available course resource editors"},
- {href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"Result"});
- &modify_default_overrides($r,$cdom,$cnum,$cdesc,$domdesc,$type,'crseditors');
}
}
} else {
$r->print('');
if ($type eq 'Community') {
$r->print(&mt('The community you selected is not a valid community in this domain'));
+ } elsif ($type eq 'Placement') {
+ $r->print(&mt('The course you selected is not a valid placement test in this domain'));
} else {
$r->print(&mt('The course you selected is not a valid course in this domain'));
}