--- loncom/interface/lonmodifycourse.pm 2015/06/09 21:22:56 1.78
+++ loncom/interface/lonmodifycourse.pm 2019/07/26 17:43:54 1.79.2.7
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.78 2015/06/09 21:22:56 damieng Exp $
+# $Id: lonmodifycourse.pm,v 1.79.2.7 2019/07/26 17:43:54 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,12 +39,16 @@ 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');
+ my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc',
+ 'selfenrollmgrcc','mysqltables');
if (&showcredits($cdom)) {
push(@items,'defaultcredits');
}
@@ -55,7 +59,7 @@ sub get_dc_settable {
sub autoenroll_keys {
my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits',
'autoadds','autodrops','autostart','autoend','sectionnums',
- 'crosslistings','co-owners'];
+ 'crosslistings','co-owners','autodropfailsafe'];
my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date'];
return ($internals,$accessdates);
}
@@ -117,14 +121,13 @@ sub get_enrollment_settings {
$enrollvar{$type} =~ s/,/, /g;
} elsif ($type eq "authtype"
|| $type eq "autharg" || $type eq "coursecode"
- || $type eq "crosslistings") {
+ || $type eq "crosslistings" || $type eq "selfenrollmgr"
+ || $type eq "autodropfailsafe") {
$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};
@@ -173,29 +176,181 @@ 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') {
- $r->print(&mt('Actions available after searching for a community:').'<ul>'.
- '<li>'.&mt('Enter the community with the role of [_1]',$cctitle).'</li>'."\n".
- '<li>'.&mt('View or modify community settings which only a [_1] may modify.',$dctitle).
- '</li>'."\n".'</ul>');
- } else {
- $r->print(&mt('Actions available after searching for a course:').'<ul>'.
- '<li>'.&mt('Enter the course with the role of [_1]',$cctitle).'</li>'."\n".
- '<li>'.&mt('View or modify course settings which only a [_1] may modify.',$dctitle).
- '</li>'."\n".'</ul>');
+ $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.'<ul>');
+ if ($roleoption) {
+ $r->print('<li>'.$roleoption.'</li>'."\n");
+ }
+ $r->print('<li>'.$settingsoption.'</li>'."\n".'</ul>');
return;
}
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");
+<script type="text/javascript">
+// <![CDATA[
+\$(document).ready(function(){
+ \$( "#LC_adhocrole_chooser" ).dialog({ autoOpen: false });
+});
+
+function gochoose(cname,cdom,cdesc) {
+ document.courselist.pickedcourse.value = cdom+'_'+cname;
+ \$("#LC_choose_adhoc").empty();
+ var pickedaction = \$('input[name=phase]:checked', '#LCcoursepicker').val();
+ if (pickedaction == 'adhocrole') {
+ var http = new XMLHttpRequest();
+ var url = "/adm/pickcourse";
+ var params = "cid="+cdom+"_"+cname+"&context=adhoc";
+ http.open("POST", url, true);
+ http.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+ http.onreadystatechange = function() {
+ if (http.readyState == 4 && http.status == 200) {
+ var data = \$.parseJSON(http.responseText);
+ var len = data.roles.length;
+ if (len == '' || len == null || len == 0) {
+ alert('$jslt{none}');
+ } else {
+ if (len == 1) {
+ \$( '[name="adhocrole"]' )[0].value = data.roles[0].name;
+ document.courselist.submit();
+ } else {
+ var str = '';
+ \$("#LC_choose_adhoc").empty();
+ for (var i=0; i<data.roles.length; i++) {
+ \$("<label><input type='radio' value='"+data.roles[i].name+"' name='LC_get_role' id='LC_get_role_"+i+"' />"+data.roles[i].desc+"</label><span> </span>")
+ .appendTo("#LC_choose_adhoc");
+ }
+ \$( "#LC_adhocrole_chooser" ).toggle( true );
+ \$( "#LC_get_role_0").prop("checked", true);
+ \$( "#LC_adhocrole_chooser" ).dialog({ autoOpen: false });
+ \$( "#LC_adhocrole_chooser" ).dialog("open");
+ \$( "#LC_adhocrole_chooser" ).dialog({
+ height: 400,
+ width: 500,
+ modal: true,
+ resizable: false,
+ buttons: [
+ {
+ text: "$jslt{'ok'}",
+ click: function() {
+ var rolename = \$('input[name=LC_get_role]:checked', '#LChelpdeskpicker').val();
+ \$( '[name="adhocrole"]' )[0].value = rolename;
+ document.courselist.submit();
+ }
+ },
+ {
+ text: "$jslt{'exit'}",
+ click: function() {
+ \$("#LC_adhocrole_chooser").dialog( "close" );
+ }
+ }
+ ],
+ });
+ \$( "#LC_adhocrole_chooser" ).find( "form" ).on( "submit", function( event ) {
+ event.preventDefault();
+ var rolename = \$('input[name=LC_get_role]:checked', '#LChelpdeskpicker').val()
+ \$( '[name="adhocrole"]' )[0].value = rolename;
+ document.courselist.submit();
+ \$("#LC_adhocrole_chooser").dialog( "close" );
+ });
+ }
+ }
+ }
+ }
+ http.send(params);
+ } else {
+ document.courselist.submit();
+ }
+ return;
+}
+// ]]>
+</script>
+
+<div id="LC_adhocrole_chooser" title="$lt{'title'}" style="display:none">
+ <p>$lt{'preamble'}</p>
+ <form name="LChelpdeskadhoc" id="LChelpdeskpicker" action="">
+ <div id="LC_choose_adhoc">
+ </div>
+ <input type="hidden" name="adhocrole" id="LCadhocrole" value="" />
+ <input type="submit" tabindex="-1" style="position:absolute; top:-1000px" />
+ </form>
+ <p>$lt{'cancel'}</p>
+</div>
+END
+ } elsif ($permission->{'adhocrole'} eq 'coord') {
+ $r->print(<<"END");
+<script type="text/javascript">
+// <![CDATA[
+
+function gochoose(cname,cdom,cdesc) {
+ document.courselist.pickedcourse.value = cdom+'_'+cname;
+ document.courselist.submit();
+ return;
+}
+
+// ]]>
+</script>
+END
+ }
+
+# Criteria for course search
my ($filterlist,$filter) = &get_filters();
my $action = '/adm/modifycourse';
my $dctitle = &Apache::lonnet::plaintext('dc');
@@ -208,7 +363,7 @@ sub print_course_selection_page {
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,
- undef,undef,%courses);
+ $dom,undef,%courses);
return;
}
@@ -229,10 +384,9 @@ sub get_filters {
}
sub print_modification_menu {
- my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash) = @_;
+ 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'};
@@ -244,36 +398,72 @@ 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',
+ );
+ } 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',
+ );
+ }
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';
+ $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.');
} 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 (&showcredits($dom)) {
- $setparams_text = 'View/Modify course owner, institutional code, default authentication, credits, and self-enrollment';
+ 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, and self-enrollment';
+ $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.');
+ $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);
sub manage_selfenrollment {
- 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;
- }
+ 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;
+ }
+ }
}
return 0;
}
@@ -286,59 +476,59 @@ sub print_modification_menu {
({ categorytitle => $categorytitle,
items => [
{
- linktext => $setparams_text,
+ linktext => $linktext{'setparms'},
url => &phaseurl('setparms'),
- permission => 1,
+ permission => $permission->{'setparms'},
#help => '',
icon => 'crsconf.png',
linktitle => ''
},
{
- linktext => 'View/Modify quotas for group portfolio files, and for uploaded content.',
+ linktext => $linktext{'setquota'},
url => &phaseurl('setquota'),
- permission => 1,
+ permission => $permission->{'setquota'},
#help => '',
icon => 'groupportfolioquota.png',
linktitle => ''
},
{
- linktext => 'View/Modify responders threshold for anonymous survey submissions display',
+ linktext => $linktext{'setanon'},
url => &phaseurl('setanon'),
- permission => 1,
+ permission => $permission->{'setanon'},
#help => '',
icon => 'anonsurveythreshold.png',
linktitle => ''
},
{
- linktext => $cat_text,
+ linktext => $linktext{'catsettings'},
url => &phaseurl('catsettings'),
- permission => (@additional_params > 0),
+ permission => (($permission->{'catsettings'}) && (@additional_params > 0)),
#help => '',
icon => 'ccatconf.png',
linktitle => ''
},
{
- linktext => 'Display current settings for automated enrollment',
+ linktext => $linktext{'viewparms'},
url => &phaseurl('viewparms'),
- permission => ($type ne 'Community'),
+ permission => ($permission->{'viewparms'} && ($type ne 'Community')),
#help => '',
icon => 'roles.png',
linktitle => ''
},
{
- linktext => 'View/Modify Self-Enrollment configuration',
+ linktext => $linktext{'selfenroll'},
icon => 'self_enroll.png',
#help => 'Course_Self_Enrollment',
url => &phaseurl('selfenroll'),
- permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash),
+ permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash,$permission),
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 => 1,
+ permission => $permission->{'setpostsubmit'},
linktitle => '',
},
]
@@ -367,22 +557,28 @@ sub print_modification_menu {
}
$menu_html .= ' <li>'.&mt('Override defaults for who configures self-enrollment for this specific course.').'</li>'."\n";
}
- $menu_html .= '<li>'.$setquota_text.'</li>'."\n".
+ $menu_html .= '<li>'.$mysqltables_text.'</li>'."\n".
+ '<li>'.$setquota_text.'</li>'."\n".
'<li>'.$setuploadquota_text.'</li>'."\n".
'<li>'.$anon_text.'</li>'."\n".
'<li>'.$postsubmit_text.'</li>'."\n";
+ my ($categories_link_start,$categories_link_end);
+ if ($permission->{'catsettings'} eq 'edit') {
+ $categories_link_start = '<a href="/adm/domainprefs?actions=coursecategories&phase=display">';
+ $categories_link_end = '</a>';
+ }
foreach my $item (@additional_params) {
if ($type eq 'Community') {
if ($item eq 'togglecats') {
- $menu_html .= ' <li>'.&mt('Hiding/unhiding a community from the catalog (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
+ $menu_html .= ' <li>'.&mt('Hiding/unhiding a community from the catalog (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).',$categories_link_start,$categories_link_end).'</li>'."\n";
} elsif ($item eq 'categorize') {
- $menu_html .= ' <li>'.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
+ $menu_html .= ' <li>'.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).',$categories_link_start,$categories_link_end).'</li>'."\n";
}
} else {
if ($item eq 'togglecats') {
- $menu_html .= ' <li>'.&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).','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
+ $menu_html .= ' <li>'.&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).',$categories_link_start,$categories_link_end).'</li>'."\n";
} elsif ($item eq 'categorize') {
- $menu_html .= ' <li>'.&mt('Manual cataloging of a course (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
+ $menu_html .= ' <li>'.&mt('Manual cataloging of a course (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).',$categories_link_start,$categories_link_end).'</li>'."\n";
}
}
}
@@ -398,18 +594,43 @@ sub print_modification_menu {
return;
}
-sub print_ccrole_selected {
- my ($r,$type) = @_;
+sub print_adhocrole_selected {
+ my ($r,$type,$permission) = @_;
&print_header($r,$type);
my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
- $r->print('<form name="ccrole" method="post" action="/adm/roles">
-<input type="hidden" name="selectrole" value="1" />
-<input type="hidden" name="newrole" value="cc./'.$cdom.'/'.$cnum.'" />
+ 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('<form name="adhocrole" method="post" action="/adm/roles">
+<input type="hidden" name="selectrole" value="'.$selectrole.'" />
+<input type="hidden" name="newrole" value="'.$newrole.'" />
</form>');
+ } else {
+ $r->print('<form name="ccrole" method="post" action="/adm/modifycourse">'.
+ '</form>');
+ }
+ return;
}
sub print_settings_display {
- my ($r,$cdom,$cnum,$cdesc,$type) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$type,$permission) = @_;
my %enrollvar = &get_enrollment_settings($cdom,$cnum);
my %longtype = &course_settings_descrip($type);
my %lt = &Apache::lonlocal::texthash(
@@ -450,29 +671,39 @@ sub print_settings_display {
}
$disp_table .= &Apache::loncommon::end_data_table()."\n";
&print_header($r,$type);
- my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
- my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
- '=1&destinationurl=/adm/populate','&<>"');
+ 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 = '<a href="'.$escuri.'">';
+ $enroll_link_end = '</a>';
+ }
+ if ($permission->{'setparms'}) {
+ $setparms_link_start = '<a href="javascript:changePage(document.viewparms,'."'setparms'".');">';
+ $setparms_link_end = '</a>';
+ }
$r->print('<h3>'.&mt('Current automated enrollment settings for:').
' <span class="LC_nobreak">'.$cdesc.'</span></h3>'.
'<form action="/adm/modifycourse" method="post" name="viewparms">'."\n".
'<p>'.$lt{'cose'}.'<ul>'.
- '<li>'.&mt('Settings modifiable by a [_1] via the [_2]Automated Enrollment Manager[_3] in a course.',$cctitle,'<a href="'.$escuri.'">','</a>').'</li>');
+ '<li>'.&mt('Settings modifiable by a [_1] via the [_2]Automated Enrollment Manager[_3] in a course.',
+ $cctitle,$enroll_link_start,$enroll_link_end).'</li>');
if (&showcredits($cdom)) {
- $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, credits, and self-enrollment[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
+ $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, credits, and self-enrollment[_3].',$dctitle,$setparms_link_start,$setparms_link_end)."\n");
} else {
- $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, and self-enrollment[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
+ $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, and self-enrollment[_3].',$dctitle,$setparms_link_start,$setparms_link_end)."\n");
}
$r->print('</li></ul></p>'.
'<p>'.$lt{'cour'}.'</p><p>'.$disp_table.'</p><p>'.
'<a href="javascript:changePage(document.viewparms,'."'menu'".')">'.$lt{'back'}.'</a>'."\n".
&hidden_form_elements().
'</p></form>'
- );
+ );
}
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]",
'<span class="LC_nobreak">'.$cdesc.'</span>');
@@ -505,19 +736,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 = '<input type="submit" value="'.$lt{'modi'}.'" />';
+ }
$r->print(<<ENDDOCUMENT);
<form action="/adm/modifycourse" method="post" name="setquota" onsubmit="return verify_quota();">
<h3>$headline</h3>
<p><span class="LC_nobreak">
-$porthelpitem $lt{'gpqu'}: <input type="text" size="4" name="coursequota" value="$coursequota" /> MB
+$porthelpitem $lt{'gpqu'}: <input type="text" size="4" name="coursequota" value="$coursequota" $disabled /> MB
</span>
<br />
<span class="LC_nobreak">
-$uploadhelpitem $lt{'upqu'}: <input type="text" size="4" name="uploadquota" value="$uploadquota" /> MB
+$uploadhelpitem $lt{'upqu'}: <input type="text" size="4" name="uploadquota" value="$uploadquota" $disabled /> MB
</span>
</p>
<p>
-<input type="submit" value="$lt{'modi'}" />
+$submit
</p>
$hidden_elements
<a href="javascript:changePage(document.setquota,'menu')">$lt{'back'}</a>
@@ -527,7 +764,7 @@ ENDDOCUMENT
}
sub print_set_anonsurvey_threshold {
- my ($r,$cdom,$cnum,$cdesc,$type) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
my %lt = &Apache::lonlocal::texthash(
'resp' => 'Responder threshold for anonymous survey submissions display:',
'sufa' => 'Anonymous survey submissions displayed when responders exceeds',
@@ -550,13 +787,19 @@ 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 = '<input type="submit" value="'.$lt{'modi'}.'" />';
+ }
my $helpitem = &Apache::loncommon::help_open_topic('Modify_Anonsurvey_Threshold');
$r->print(<<ENDDOCUMENT);
<form action="/adm/modifycourse" method="post" name="setanon" onsubmit="return verify_anon_threshold();">
<h3>$lt{'resp'} <span class="LC_nobreak">$cdesc</span></h3>
<p>
-$helpitem $lt{'sufa'}: <input type="text" size="4" name="threshold" value="$threshold" />
-<input type="submit" value="$lt{'modi'}" />
+$helpitem $lt{'sufa'}: <input type="text" size="4" name="threshold" value="$threshold" $disabled />
+$submit
</p>
$hidden_elements
<a href="javascript:changePage(document.setanon,'menu')">$lt{'back'}</a>
@@ -566,7 +809,7 @@ ENDDOCUMENT
}
sub print_postsubmit_config {
- my ($r,$cdom,$cnum,$cdesc,$type) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
my %lt = &Apache::lonlocal::texthash (
'conf' => 'Configure submit button behavior after student makes a submission',
'disa' => 'Disable submit button/keypress following student submission',
@@ -607,21 +850,27 @@ sub print_postsubmit_config {
}
&print_header($r,$type);
my $hidden_elements = &hidden_form_elements();
+ my ($disabled,$submit);
+ if ($readonly) {
+ $disabled = ' disabled="disabled"';
+ } else {
+ $submit = '<input type="submit" value="'.$lt{'modi'}.'" />';
+ }
my $helpitem = &Apache::loncommon::help_open_topic('Modify_Postsubmit_Config');
$r->print(<<ENDDOCUMENT);
<form action="/adm/modifycourse" method="post" name="setpostsubmit" onsubmit="return verify_postsubmit();">
<h3>$lt{'conf'} <span class="LC_nobreak">($cdesc)</span></h3>
<p>
$helpitem $lt{'disa'}:
-<label><input type="radio" name="postsubmit" $checkedon onclick="togglePostsubmit('studentsubmission');" value="1" />
+<label><input type="radio" name="postsubmit" $checkedon onclick="togglePostsubmit('studentsubmission');" value="1" $disabled />
$lt{'yes'}</label>
-<label><input type="radio" name="postsubmit" $checkedoff onclick="togglePostsubmit('studentsubmission');" value="0" />
+<label><input type="radio" name="postsubmit" $checkedoff onclick="togglePostsubmit('studentsubmission');" value="0" $disabled />
$lt{'no'}</label>
<div id="studentsubmission" style="display: $display">
-$lt{'nums'} <input type="text" name="postsubtimeout" value="$postsubtimeout" /><br />
+$lt{'nums'} <input type="text" name="postsubtimeout" value="$postsubtimeout" $disabled /><br />
$zero</div>
<br />
-<input type="submit" value="$lt{'modi'}" />
+$submit
</p>
$hidden_elements
<a href="javascript:changePage(document.setpostsubmit,'menu')">$lt{'back'}</a>
@@ -658,7 +907,7 @@ sub domain_postsubtimeout {
}
sub print_catsettings {
- my ($r,$cdom,$cnum,$cdesc,$type) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
&print_header($r,$type);
my %lt = &Apache::lonlocal::texthash(
'back' => 'Pick another action',
@@ -679,6 +928,10 @@ sub print_catsettings {
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
my @cat_params = &catalog_settable($domconf{'coursecategories'},$type);
if (@cat_params > 0) {
+ my $disabled;
+ if ($readonly) {
+ $disabled = ' disabled="disabled"';
+ }
my %currsettings =
&Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
if (grep(/^togglecats$/,@cat_params)) {
@@ -690,7 +943,7 @@ sub print_catsettings {
}
$r->print('<br /><h4>'.$lt{'visi'}.'</h4>'.
$lt{'exclude'}.
- ' <label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.' />'.&mt('Yes').'</label> <label><input name="hidefromcat" type="radio" value="" '.$excludeoff.' />'.&mt('No').'</label><br /><p>');
+ ' <label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.$disabled.' />'.&mt('Yes').'</label> <label><input name="hidefromcat" type="radio" value="" '.$excludeoff.$disabled.' />'.&mt('No').'</label><br /><p>');
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."));
} else {
@@ -707,7 +960,7 @@ sub print_catsettings {
if (ref($cathash) eq 'HASH') {
$r->print($lt{'assi'}.'<br /><br />'.
&Apache::loncommon::assign_categories_table($cathash,
- $currsettings{'categories'},$type));
+ $currsettings{'categories'},$type,$disabled));
} else {
$r->print(&mt('No categories defined for this domain'));
}
@@ -718,8 +971,10 @@ sub print_catsettings {
$r->print('<p>'.&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).').'</p>');
}
}
- $r->print('<p><input type="button" name="chgcatsettings" value="'.
- &mt('Save').'" onclick="javascript:changePage(document.catsettings,'."'processcat'".');" /></p>');
+ unless ($readonly) {
+ $r->print('<p><input type="button" name="chgcatsettings" value="'.
+ &mt('Save').'" onclick="javascript:changePage(document.catsettings,'."'processcat'".');" /></p>');
+ }
} else {
$r->print('<span class="LC_warning">');
if ($type eq 'Community') {
@@ -736,7 +991,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",
@@ -750,11 +1005,11 @@ 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'],
- $cdom,$cnum);
+ 'internal.selfenrollmgrdc','internal.selfenrollmgrcc',
+ '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'});
@@ -765,9 +1020,12 @@ sub print_course_modification_page {
$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)) {
@@ -808,9 +1066,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 .= '<td><input type="radio" name="courseowner" value="'.$cc.'" checked="checked" /></td>'."\n";
+ $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" checked="checked"'.$disabled.' /></td>'."\n";
} else {
- $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" /></td>'."\n";
+ $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'"'.$disabled.' /></td>'."\n";
}
$ownertable .=
'<td>'.$pname{$cc}.'</td>'."\n".
@@ -835,23 +1093,23 @@ sub print_course_modification_page {
$r->print(&Apache::lonhtmlcommon::row_title(
&Apache::loncommon::help_open_topic('Modify_Course_Instcode').
' '.&mt('Course Code'))."\n".
- '<input type="text" size="15" name="coursecode" value="'.$enrollvar{'coursecode'}.'" />'.
+ '<input type="text" size="15" name="coursecode" value="'.$enrollvar{'coursecode'}.'"'.$disabled.' />'.
&Apache::lonhtmlcommon::row_closure());
if (&showcredits($cdom)) {
$r->print(&Apache::lonhtmlcommon::row_title(
&Apache::loncommon::help_open_topic('Modify_Course_Credithours').
' '.&mt('Credits (students)'))."\n".
- '<input type="text" size="3" name="defaultcredits" value="'.$enrollvar{'defaultcredits'}.'" />'.
+ '<input type="text" size="3" name="defaultcredits" value="'.$enrollvar{'defaultcredits'}.'"'.$disabled.' />'.
&Apache::lonhtmlcommon::row_closure());
- }
- $r->print(&Apache::lonhtmlcommon::row_title(
- &Apache::loncommon::help_open_topic('Modify_Course_Defaultauth').
- ' '.&mt('Default Authentication method'))."\n".
- $authenitems."\n".
- &Apache::lonhtmlcommon::row_closure().
- &Apache::lonhtmlcommon::row_title(
- &Apache::loncommon::help_open_topic('Modify_Course_Owner').
- ' '.&mt('Course Owner'))."\n");
+ }
+ $r->print(&Apache::lonhtmlcommon::row_title(
+ &Apache::loncommon::help_open_topic('Modify_Course_Defaultauth').
+ ' '.&mt('Default Authentication method'))."\n".
+ $authenitems."\n".
+ &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_title(
+ &Apache::loncommon::help_open_topic('Modify_Course_Owner').
+ ' '.&mt('Course Owner'))."\n");
}
my ($cctitle,$rolename,$currmanages,$ccchecked,$dcchecked,$defaultchecked);
my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles();
@@ -895,27 +1153,35 @@ sub print_course_modification_page {
foreach my $option ('','0','1') {
$r->print('<span class="LC_nobreak"><label>'.
'<input type="radio" name="selfenrollmgr_'.$item.'" '.
- 'value="'.$option.'"'.$checked{$option}.' />'.
+ 'value="'.$option.'"'.$checked{$option}.$disabled.' />'.
$optionname{$option}.'</label></span><br />');
}
$r->print('</td>'."\n".
&Apache::loncommon::end_data_table_row()."\n");
}
$r->print(&Apache::loncommon::end_data_table()."\n".
- '<br />'.&Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box().'</p><p>'.$hidden_elements.
- '<input type="button" onclick="javascript:changePage(this.form,'."'processparms'".');');
- if ($crstype eq 'Community') {
- $r->print('this.form.submit();"');
- } else {
- $r->print('javascript:verify_message(this.form);"');
+ '<br />'.&Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_title(
+ &Apache::loncommon::help_open_topic('Modify_Course_Table_Lifetime').
+ ' '.&mt('"Temporary" Tables Lifetime (s)'))."\n".
+ '<input type="text" size="10" name="mysqltables" value="'.$settings{'internal.mysqltables'}.'"'.$disabled.' />'.
+ &Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::end_pick_box().'</p><p>'.$hidden_elements);
+ unless ($readonly) {
+ $r->print('<input type="button" onclick="javascript:changePage(this.form,'."'processparms'".');');
+ if ($crstype eq 'Community') {
+ $r->print('this.form.submit();"');
+ } else {
+ $r->print('javascript:verify_message(this.form);"');
+ }
+ $r->print(' value="'.$lt{'gobt'}.'" />');
}
- $r->print(' value="'.$lt{'gobt'}.'" /></p></form>');
+ $r->print('</p></form>');
return;
}
sub print_selfenrollconfig {
- my ($r,$type,$cdesc,$coursehash) = @_;
+ my ($r,$type,$cdesc,$coursehash,$readonly) = @_;
return unless(ref($coursehash) eq 'HASH');
my $cnum = $coursehash->{'num'};
my $cdom = $coursehash->{'domain'};
@@ -925,7 +1191,7 @@ sub print_selfenrollconfig {
'<span class="LC_nobreak">'.$cdesc.'</span>').'</h3>'."\n");
&Apache::loncreateuser::print_selfenroll_menu($r,'domain',$env{'form.pickedcourse'},
$cdom,$cnum,\%currsettings,
- &hidden_form_elements());
+ &hidden_form_elements(),$readonly);
return;
}
@@ -981,7 +1247,7 @@ sub modifiable_only_title {
}
sub gather_authenitems {
- my ($cdom,$enrollvar) = @_;
+ my ($cdom,$enrollvar,$readonly) = @_;
my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($cdom);
my $curr_authtype = '';
my $curr_authfield = '';
@@ -1005,7 +1271,8 @@ sub gather_authenitems {
kerb_def_auth => $krbdef,
mode => 'modifycourse',
curr_authtype => $curr_authtype,
- curr_autharg => $enrollvar->{'autharg'}
+ curr_autharg => $enrollvar->{'autharg'},
+ readonly => $readonly,
);
my (%authform,$authenitems);
$authform{'krb'} = &Apache::loncommon::authform_kerberos(%param);
@@ -1024,7 +1291,7 @@ 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.selfenrollmgrcc','internal.mysqltables');
my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles();
unless ($type eq 'Community') {
push(@items,('internal.coursecode','internal.authtype','internal.autharg',
@@ -1095,10 +1362,13 @@ sub modify_course {
$changed{'code'} = 1;
}
}
-
+ if ( exists($env{'form.mysqltables'}) ) {
+ $newattr{'mysqltables'} = $env{'form.mysqltables'};
+ $newattr{'mysqltables'} =~ s/\D+//g;
+ }
if (&showcredits($cdom) && exists($env{'form.defaultcredits'})) {
- $newattr{'defaultcredits'} =~ s/[^\d\.]//g;
$newattr{'defaultcredits'}=$env{'form.defaultcredits'};
+ $newattr{'defaultcredits'} =~ s/[^\d\.]//g;
}
}
@@ -1147,6 +1417,18 @@ sub modify_course {
my $putres = &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime');
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;
+ }
+ }
+ }
}
}
}
@@ -1190,6 +1472,8 @@ 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');
}
$chgresponse .= '<li>'.&mt('[_1] now set to: [_2]',$longtype{$attr},$shown).'</li>';
} else {
@@ -1200,6 +1484,8 @@ 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 .= '<li>'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'</li>';
}
@@ -1271,6 +1557,8 @@ 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 .= '<li>'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'</li>';
}
@@ -1883,13 +2171,7 @@ function changePage(formname,newphase) {
if ($phase eq 'setparms') {
$js .= $javascript_validations;
} elsif ($phase eq 'courselist') {
- $js .= qq|
-
-function gochoose(cname,cdom,cdesc) {
- document.courselist.pickedcourse.value = cdom+'_'+cname;
- document.courselist.submit();
-}
-
+ $js .= <<"ENDJS";
function hide_searching() {
if (document.getElementById('searching')) {
document.getElementById('searching').style.display = 'none';
@@ -1897,7 +2179,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');
@@ -2026,9 +2308,9 @@ ENDSCRIPT
}
my $starthash;
- if ($env{'form.phase'} eq 'ccrole') {
+ if ($env{'form.phase'} eq 'adhocrole') {
$starthash = {
- add_entries => {'onload' => "javascript:document.ccrole.submit();"},
+ add_entries => {'onload' => "javascript:document.adhocrole.submit();"},
};
} elsif ($phase eq 'courselist') {
$starthash = {
@@ -2095,6 +2377,7 @@ 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(
@@ -2113,9 +2396,10 @@ sub course_settings_descrip {
'sectionnums' => 'Course section number:LON-CAPA section',
'crosslistings' => 'Crosslisted class:LON-CAPA section',
'defaultcredits' => 'Credits',
+ '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)',
);
}
return %longtype;
@@ -2128,7 +2412,7 @@ sub hidden_form_elements {
'locarg','krbarg','krbver','counter','hidefromcat','usecategory',
'threshold','postsubmit','postsubtimeout','defaultcredits','uploadquota',
'selfenrollmgrdc','selfenrollmgrcc','action','state','currsec_st',
- 'sections','newsec'],['^selfenrollmgr_'])."\n".
+ 'sections','newsec','mysqltables'],['^selfenrollmgr_','^selfenroll_'])."\n".
'<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />';
return $hidden_elements;
}
@@ -2136,11 +2420,63 @@ sub hidden_form_elements {
sub showcredits {
my ($dom) = @_;
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
- if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbokcredits'}) {
+ if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'}) {
return 1;
}
}
+sub get_permission {
+ my ($dom) = @_;
+ my ($allowed,%permission);
+ 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',
+ );
+ } 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',
+ );
+ }
+ 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) {
@@ -2149,10 +2485,13 @@ sub handler {
return OK;
}
+ $registered_cleanup=0;
+ $modified_dom = '';
+
my $dom = $env{'request.role.domain'};
my $domdesc = &Apache::lonnet::domain($dom,'description');
-
- if (&Apache::lonnet::allowed('ccc',$dom)) {
+ my ($allowed,$permission) = &get_permission($dom);
+ if ($allowed) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -2188,7 +2527,7 @@ sub handler {
{href=>"javascript:changePage(document.$phase,'courselist')",
text=>$choose_text});
if ($phase eq 'courselist') {
- &print_course_selection_page($r,$dom,$domdesc);
+ &print_course_selection_page($r,$dom,$domdesc,$permission);
} else {
my ($checked,$cdesc,$coursehash) = &check_course($dom,$domdesc);
if ($checked eq 'ok') {
@@ -2203,23 +2542,33 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'menu')",
text=>"Pick action"});
&print_modification_menu($r,$cdesc,$domdesc,$dom,$type,
- $env{'form.pickedcourse'},$coursehash);
- } elsif ($phase eq 'ccrole') {
+ $env{'form.pickedcourse'},$coursehash,
+ $permission);
+ } elsif ($phase eq 'adhocrole') {
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'ccrole')",
+ ({href=>"javascript:changePage(document.$phase,'adhocrole')",
text=>$enter_text});
- &print_ccrole_selected($r,$type);
+ &print_adhocrole_selected($r,$type,$permission);
} else {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'menu')",
text=>"Pick action"});
my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
- if ($phase eq 'setquota') {
+ 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';
+ }
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"Set quota"});
- &print_setquota($r,$cdom,$cnum,$cdesc,$type);
- } elsif ($phase eq 'processquota') {
+ text=>$linktext});
+ &print_setquota($r,$cdom,$cnum,$cdesc,$type,$readonly);
+ } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'setquota')",
text=>"Set quota"});
@@ -2227,12 +2576,12 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_quota($r,$cdom,$cnum,$cdesc,$domdesc,$type);
- } elsif ($phase eq 'setanon') {
+ } elsif (($phase eq 'setanon') && ($permission->{'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);
- } elsif ($phase eq 'processthreshold') {
+ &print_set_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$type,$readonly);
+ } elsif (($phase eq 'processthreshold') && ($permission->{'processthreshold'})) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'setanon')",
text=>"Threshold for anonymous submissions display"});
@@ -2240,27 +2589,37 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$domdesc,$type);
- } elsif ($phase eq 'setpostsubmit') {
+ } 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';
+ }
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"Configure submit button behavior post-submission"});
- &print_postsubmit_config($r,$cdom,$cnum,$cdesc,$type);
- } elsif ($phase eq 'processpostsubmit') {
+ text=>$linktext});
+ &print_postsubmit_config($r,$cdom,$cnum,$cdesc,$type,$readonly);
+ } elsif (($phase eq 'processpostsubmit') && ($permission->{'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') {
+ } elsif (($phase eq 'viewparms') && ($permission->{'viewparms'})) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'viewparms')",
text=>"Display settings"});
- &print_settings_display($r,$cdom,$cnum,$cdesc,$type);
- } elsif ($phase eq 'setparms') {
+ &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';
+ }
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"Change settings"});
- &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type);
- } elsif ($phase eq 'processparms') {
+ text=>$linktext});
+ &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type,$readonly);
+ } elsif (($phase eq 'processparms') && ($permission->{'processparms'})) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'setparms')",
text=>"Change settings"});
@@ -2268,12 +2627,12 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_course($r,$cdom,$cnum,$cdesc,$domdesc,$type);
- } elsif ($phase eq 'catsettings') {
+ } elsif (($phase eq 'catsettings') && ($permission->{'catsettings'})) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Catalog settings"});
- &print_catsettings($r,$cdom,$cnum,$cdesc,$type);
- } elsif ($phase eq 'processcat') {
+ &print_catsettings($r,$cdom,$cnum,$cdesc,$type,$readonly);
+ } elsif (($phase eq 'processcat') && ($permission->{'processcat'})) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'catsettings')",
text=>"Catalog settings"});
@@ -2281,12 +2640,12 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_catsettings($r,$cdom,$cnum,$cdesc,$domdesc,$type);
- } elsif ($phase eq 'selfenroll') {
+ } elsif (($phase eq 'selfenroll') && ($permission->{'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);
+ &print_selfenrollconfig($r,$type,$cdesc,$coursehash,$readonly);
} elsif ($env{'form.state'} eq 'done') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",