--- loncom/interface/lonmodifycourse.pm 2017/01/05 16:17:11 1.90
+++ loncom/interface/lonmodifycourse.pm 2019/07/25 20:23:52 1.95
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.90 2017/01/05 16:17:11 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.95 2019/07/25 20:23:52 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,6 +39,9 @@ use Apache::lonpickcourse;
use lib '/home/httpd/lib/perl';
use LONCAPA qw(:DEFAULT :match);
+my $registered_cleanup;
+my $modified_dom;
+
sub get_dc_settable {
my ($type,$cdom) = @_;
if ($type eq 'Community') {
@@ -49,6 +52,10 @@ sub get_dc_settable {
if (&showcredits($cdom)) {
push(@items,'defaultcredits');
}
+ my %passwdconf = &Apache::lonnet::get_passwdconf($cdom);
+ if (($passwdconf{'crsownerchg'}) && ($type ne 'Placement')) {
+ push(@items,'nopasswdchg');
+ }
return @items;
}
}
@@ -101,6 +108,7 @@ sub get_enrollment_settings {
@items = map { 'internal.'.$_; } (@{$internals});
push(@items,@{$accessdates});
}
+ push(@items,'internal.nopasswdchg');
my %settings = &Apache::lonnet::get('environment',\@items,$cdom,$cnum);
my %enrollvar;
$enrollvar{'autharg'} = '';
@@ -126,7 +134,7 @@ sub get_enrollment_settings {
} elsif ($type eq "authtype"
|| $type eq "autharg" || $type eq "coursecode"
|| $type eq "crosslistings" || $type eq "selfenrollmgr"
- || $type eq "autodropfailsafe") {
+ || $type eq "autodropfailsafe" || $type eq 'nopasswdchg') {
$enrollvar{$type} = $settings{$item};
} elsif ($type eq 'defaultcredits') {
if (&showcredits($cdom)) {
@@ -289,10 +297,12 @@ function gochoose(cname,cdom,cdesc) {
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");
@@ -338,7 +348,7 @@ function gochoose(cname,cdom,cdesc) {
// ]]>
</script>
-<div id="LC_adhocrole_chooser" title="$lt{'title'}">
+<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">
@@ -1031,6 +1041,7 @@ sub print_course_modification_page {
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';
@@ -1105,17 +1116,18 @@ sub print_course_modification_page {
if ($crstype eq 'Community') {
$r->print(&Apache::lonhtmlcommon::row_title(
&Apache::loncommon::help_open_topic('Modify_Community_Owner').
- ' '.&mt('Community Owner'))."\n");
+ ' '.&mt('Community Owner'))."\n".
+ $ownertable."\n".&Apache::lonhtmlcommon::row_closure());
} else {
$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'}.'"'.$disabled.'/>'.
+ '<input type="text" size="15" name="coursecode" value="'.$enrollvar{'coursecode'}.'"'.$disabled.' />'.
&Apache::lonhtmlcommon::row_closure());
if (($crstype eq 'Course') && (&showcredits($cdom))) {
$r->print(&Apache::lonhtmlcommon::row_title(
&Apache::loncommon::help_open_topic('Modify_Course_Credithours').
- ' '.&mt('Credits (students)'))."\n".
+ ' '.&mt('Credits (students)'))."\n".
'<input type="text" size="3" name="defaultcredits" value="'.$enrollvar{'defaultcredits'}.'"'.$disabled.' />'.
&Apache::lonhtmlcommon::row_closure());
}
@@ -1125,8 +1137,21 @@ sub print_course_modification_page {
$authenitems."\n".
&Apache::lonhtmlcommon::row_closure().
&Apache::lonhtmlcommon::row_title(
- &Apache::loncommon::help_open_topic('Modify_Course_Owner').
- ' '.&mt('Course Owner'))."\n");
+ &Apache::loncommon::help_open_topic('Modify_Course_Owner').
+ ' '.&mt('Course Owner'))."\n".
+ $ownertable."\n".&Apache::lonhtmlcommon::row_closure());
+ if (($passwdconf{'crsownerchg'}) && ($type ne 'Placement')) {
+ my $checked;
+ if ($enrollvar{'nopasswdchg'}) {
+ $checked = ' checked="checked"';
+ }
+ $r->print(&Apache::lonhtmlcommon::row_title(
+ &Apache::loncommon::help_open_topic('Modify_Course_Chgpasswd').
+ ' '.&mt('Changing passwords (internal)'))."\n".
+ '<label><input type="checkbox" value="1" name="nopasswdchg"'.$checked.$disabled.' />'.
+ &mt('Disable changing password for users with student role by course owner').'<label>'."\n".
+ &Apache::lonhtmlcommon::row_closure());
+ }
}
my ($cctitle,$rolename,$currmanages,$ccchecked,$dcchecked,$defaultchecked);
my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles();
@@ -1136,8 +1161,7 @@ sub print_course_modification_page {
$cctitle = &mt('Course personnel');
}
- $r->print($ownertable."\n".&Apache::lonhtmlcommon::row_closure().
- &Apache::lonhtmlcommon::row_title(
+ $r->print(&Apache::lonhtmlcommon::row_title(
&Apache::loncommon::help_open_topic('Modify_Course_Selfenrolladmin').
' '.&mt('Self-enrollment configuration')).
&Apache::loncommon::start_data_table()."\n".
@@ -1275,6 +1299,8 @@ 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 '') {
@@ -1295,7 +1321,8 @@ sub gather_authenitems {
$authform{'krb'} = &Apache::loncommon::authform_kerberos(%param);
$authform{'int'} = &Apache::loncommon::authform_internal(%param);
$authform{'loc'} = &Apache::loncommon::authform_local(%param);
- foreach my $item ('krb','int','loc') {
+ $authform{'lti'} = &Apache::loncommon::authform_lti(%param);
+ foreach my $item ('krb','int','loc','lti') {
if ($authform{$item} ne '') {
$authenitems .= $authform{$item}.'<br />';
}
@@ -1316,6 +1343,10 @@ sub modify_course {
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'};
@@ -1331,6 +1362,7 @@ sub modify_course {
} else {
%changed = ( code => 0,
owner => 0,
+ passwd => 0,
);
$ccrole = 'cc';
unless ($settings{'internal.sectionnums'} eq '') {
@@ -1361,6 +1393,8 @@ 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 '') {
@@ -1383,9 +1417,21 @@ sub modify_course {
$newattr{'mysqltables'} = $env{'form.mysqltables'};
$newattr{'mysqltables'} =~ s/\D+//g;
}
- if (($type ne 'Placement') && (&showcredits($cdom) && exists($env{'form.defaultcredits'}))) {
- $newattr{'defaultcredits'}=$env{'form.defaultcredits'};
- $newattr{'defaultcredits'} =~ 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;
+ }
+ }
}
}
@@ -1420,7 +1466,7 @@ sub modify_course {
}
}
- if ($changed{'owner'} || $changed{'code'}) {
+ if ($changed{'owner'} || $changed{'code'} || $changed{'passwd'}) {
my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,
undef,undef,'.');
if (ref($crsinfo{$env{'form.pickedcourse'}}) eq 'HASH') {
@@ -1430,10 +1476,29 @@ 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') {
+ if (($putres eq 'ok') && (($changed{'owner'} || $changed{'code'}))) {
&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;
+ }
+ }
+ }
}
}
}
@@ -1479,6 +1544,12 @@ sub modify_course {
$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 .= '<li>'.&mt('[_1] now set to: [_2]',$longtype{$attr},$shown).'</li>';
} else {
@@ -1491,6 +1562,12 @@ sub modify_course {
$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 .= '<li>'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'</li>';
}
@@ -2407,6 +2484,7 @@ sub course_settings_descrip {
'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;
@@ -2419,7 +2497,8 @@ sub hidden_form_elements {
'locarg','krbarg','krbver','counter','hidefromcat','usecategory',
'threshold','postsubmit','postsubtimeout','defaultcredits','uploadquota',
'selfenrollmgrdc','selfenrollmgrcc','action','state','currsec_st',
- 'sections','newsec','mysqltables'],['^selfenrollmgr_','^selfenroll_'])."\n".
+ 'sections','newsec','mysqltables','nopasswdchg'],
+ ['^selfenrollmgr_','^selfenroll_'])."\n".
'<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />';
return $hidden_elements;
}
@@ -2435,6 +2514,7 @@ 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 = (
@@ -2452,6 +2532,9 @@ sub get_permission {
selfenroll => 'edit',
adhocrole => 'coord',
);
+ if ($passwdconf{'crsownerchg'}) {
+ $permission{passwdchg} = 'edit';
+ }
} elsif (&Apache::lonnet::allowed('rar',$dom)) {
$allowed = 1;
%permission = (
@@ -2464,10 +2547,29 @@ sub get_permission {
selfenroll => 'view',
adhocrole => 'custom',
);
+ 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) {
@@ -2476,6 +2578,9 @@ 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);