--- loncom/interface/lonmodifycourse.pm 2022/02/20 19:22:30 1.79.2.9.2.2
+++ loncom/interface/lonmodifycourse.pm 2016/11/09 14:04:41 1.88
@@ -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.2 2022/02/20 19:22:30 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.88 2016/11/09 14:04:41 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,9 +39,6 @@ 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') {
@@ -52,10 +49,6 @@ 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;
}
}
@@ -79,6 +72,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');
@@ -101,7 +101,6 @@ 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'} = '';
@@ -127,7 +126,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,6 +174,8 @@ 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).' ');
}
@@ -185,6 +186,8 @@ sub print_course_search_page {
my ($actiontext,$roleoption,$settingsoption);
if ($type eq 'Community') {
$actiontext = &mt('Actions available after searching for a community:');
+ } elsif ($type eq 'Placement') {
+ $actiontext = &mt('Actions available after searching for a placement test:')
} else {
$actiontext = &mt('Actions available after searching for a course:');
}
@@ -192,30 +195,43 @@ sub print_course_search_page {
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);
+ } elsif ($type eq 'Placement') {
+ $roleoption = &mt('Enter the placement test with the role of [_1]',$cctitle);
+ $settingsoption = &mt('View or modify placement test 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) {
+ my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
+ 'adhocroles.'.$dom);
+ if (keys(%adhocroles)) {
+ my @adhoc = split(',',$adhocroles{'adhocroles.'.$dom});
+ if (@adhoc > 1) {
if ($type eq 'Community') {
- $roleoption = &mt('Enter the community with one of the available ad hoc roles');
+ $roleoption = &mt('Enter the community with one of the available ad hoc roles: [_1].',
+ join(', ',@adhoc));
+ } elsif ($type eq 'Placement') {
+ $roleoption = &mt('Enter the placement test with one of the available ad hoc roles: [_1].',
+ join(', ',@adhoc));
} else {
- $roleoption = &mt('Enter the course with one of the available ad hoc roles.');
+ $roleoption = &mt('Enter the course with one of the available ad hoc roles: [_1].',
+ join(', ',@adhoc));
}
} 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);
+ $roleoption = &mt('Enter the community with the ad hoc role of: [_1]',$adhoc[0]);
+ } elsif ($type eq 'Placement') {
+ $roleoption = &mt('Enter the placement test with the ad hoc role of: [_1]',$adhoc[0]);
} else {
- $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$rolename);
+ $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$adhoc[0]);
}
}
}
if ($type eq 'Community') {
$settingsoption = &mt('View community settings which only a [_1] may modify.',$dctitle);
+ } elsif ($type eq 'Placement') {
+ $settingsoption = &mt('View placement test settings which only a [_1] may modify.',$dctitle);
} else {
$settingsoption = &mt('View course settings which only a [_1] may modify.',$dctitle);
}
@@ -229,133 +245,14 @@ sub print_course_search_page {
}
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');
@@ -410,7 +307,6 @@ sub print_modification_menu {
'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',
);
} else {
%linktext = (
@@ -418,11 +314,10 @@ sub print_modification_menu {
'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',
);
}
if ($type eq 'Community') {
- if ($permission->{'setparms'} eq 'edit') {
+ if ($permission->{'setparms'} eq 'edit') {
$categorytitle = 'View/Modify Community Settings';
$linktext{'setparms'} = 'View/Modify community owner';
$linktext{'catsettings'} = 'View/Modify catalog settings for community';
@@ -432,7 +327,7 @@ sub print_modification_menu {
$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.');
+ $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.');
} else {
if ($permission->{'setparms'} eq 'edit') {
$categorytitle = 'View/Modify Course Settings';
@@ -457,7 +352,6 @@ sub print_modification_menu {
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');
$linktext{'viewparms'} = 'Display current settings for automated enrollment';
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
@@ -518,13 +412,13 @@ sub print_modification_menu {
{
linktext => $linktext{'viewparms'},
url => &phaseurl('viewparms'),
- permission => ($permission->{'viewparms'} && ($type ne 'Community')),
+ permission => ($permission->{'viewparms'} && ($type ne 'Community') && ($type ne 'Placement')),
#help => '',
icon => 'roles.png',
linktitle => ''
},
{
- linktext => $linktext{'selfenroll'},
+ linktext => $linktext{'selfenroll'},,
icon => 'self_enroll.png',
#help => 'Course_Self_Enrollment',
url => &phaseurl('selfenroll'),
@@ -539,14 +433,6 @@ sub print_modification_menu {
permission => $permission->{'setpostsubmit'},
linktitle => '',
},
- {
- linktext => $linktext{'setltiauth'},
- icon => 'system-lock-screen.png',
- #help => '',
- url => &phaseurl('setltiauth'),
- permission => $permission->{'setltiauth'},
- linktitle => '',
- },
]
},
);
@@ -568,7 +454,7 @@ sub print_modification_menu {
} 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 (&showcredits($dom)) {
+ 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";
@@ -577,8 +463,7 @@ sub print_modification_menu {
''.$setquota_text.' '."\n".
''.$setuploadquota_text.' '."\n".
''.$anon_text.' '."\n".
- ''.$postsubmit_text.' '."\n".
- ''.$ltiauth_text.' '."\n";
+ ''.$postsubmit_text.' '."\n";
my ($categories_link_start,$categories_link_end);
if ($permission->{'catsettings'} eq 'edit') {
$categories_link_start = '';
@@ -612,25 +497,29 @@ sub print_modification_menu {
}
sub print_adhocrole_selected {
- my ($r,$type,$permission) = @_;
+ my ($r,$type) = @_;
&print_header($r,$type);
my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
my ($newrole,$selectrole);
- if ($permission->{'adhocrole'} eq 'coord') {
+ if (&Apache::lonnet::allowed('ccc',$cdom)) {
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') {
+ } elsif (&Apache::lonnet::allowed('rar',$cdom)) {
+ my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
+ 'adhocroles.'.$cdom);
+ if (keys(%adhocroles)) {
my $possrole = $env{'form.adhocrole'};
- if (($possrole ne '') && (grep(/^\Q$possrole\E$/,@{$okroles}))) {
- my $confname = &Apache::lonnet::get_domainconfiguser($cdom);
- $newrole = "cr/$cdom/$confname/$possrole./$cdom/$cnum";
- $selectrole = 1;
+ if ($possrole ne '') {
+ my @adhoc = split(',',$adhocroles{'adhocroles.'.$cdom});
+ if (grep(/^\Q$possrole\E$/,@adhoc)) {
+ my $confname = &Apache::lonnet::get_domainconfiguser($cdom);
+ $newrole = "cr/$cdom/$confname/$possrole./$cdom/$cnum";
+ $selectrole = 1;
+ }
}
}
}
@@ -676,34 +565,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 {
@@ -831,7 +695,7 @@ sub print_set_anonsurvey_threshold {
my $hidden_elements = &hidden_form_elements();
my ($disabled,$submit);
if ($readonly) {
- $disabled = ' disabled="disabled"';
+ $disabled = ' disabled="disabled"';
} else {
$submit = ' ';
}
@@ -906,7 +770,7 @@ sub print_postsubmit_config {
$helpitem $lt{'disa'}:
$lt{'yes'}
-
+
$lt{'no'}
$lt{'nums'}
@@ -925,7 +789,7 @@ sub domain_postsubtimeout {
my ($cdom,$type,$settings) = @_;
return unless (ref($settings) eq 'HASH');
my $lctype = lc($type);
- unless ($type eq 'Community') {
+ unless (($type eq 'Community') || ($type eq 'Placement')) {
$lctype = 'unofficial';
if ($settings->{'internal.coursecode'}) {
$lctype = 'official';
@@ -988,6 +852,8 @@ sub print_catsettings {
'
'.&mt('Yes').' '.&mt('No').'');
if ($type eq 'Community') {
$r->print(&mt("If a community has been categorized using at least one of the categories defined for communities in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded."));
+ } elsif ($type eq 'Placement') {
+ $r->print(&mt("If a placement test has been categorized using at least one of the categories defined for placement tests in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded."));
} else {
$r->print(&mt("Unless excluded, a course will be listed in the domain's publicly accessible Course/Community Catalog, if at least one of the following applies").':
'.
''.&mt('Auto-cataloging is enabled and the course is assigned an institutional code.').' '.
@@ -1009,7 +875,7 @@ sub print_catsettings {
} else {
$r->print(&mt('No categories defined for this domain'));
}
- unless ($type eq 'Community') {
+ unless (($type eq 'Community') || ($type eq 'Placement')) {
$r->print(''.&mt('If auto-cataloging based on institutional code is enabled in the domain, a course will continue to be listed in the catalog of official courses, in addition to receiving a listing under any manually assigned categor(ies).').'
');
}
}
@@ -1051,12 +917,12 @@ sub print_course_modification_page {
my %enrollvar = &get_enrollment_settings($cdom,$cnum);
my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook',
'internal.selfenrollmgrdc','internal.selfenrollmgrcc',
- 'internal.mysqltables'],$cdom,$cnum);
+ 'internal.mysqltables'],
+ $cdom,$cnum);
my $type = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$crstype,\%settings);
my @specific_managebydc = split(/,/,$settings{'internal.selfenrollmgrdc'});
my @specific_managebycc = split(/,/,$settings{'internal.selfenrollmgrcc'});
my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
- my %passwdconf = &Apache::lonnet::get_passwdconf($cdom);
my @default_managebydc = split(/,/,$domdefaults{$type.'selfenrolladmdc'});
if ($crstype eq 'Community') {
$ccrole = 'co';
@@ -1109,7 +975,7 @@ 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";
}
@@ -1131,18 +997,17 @@ 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".
- $ownertable."\n".&Apache::lonhtmlcommon::row_closure());
+ ' '.&mt('Community Owner'))."\n");
} else {
$r->print(&Apache::lonhtmlcommon::row_title(
&Apache::loncommon::help_open_topic('Modify_Course_Instcode').
' '.&mt('Course Code'))."\n".
- ' '.
+ ' '.
&Apache::lonhtmlcommon::row_closure());
- if (&showcredits($cdom)) {
+ 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".
' '.
&Apache::lonhtmlcommon::row_closure());
}
@@ -1152,21 +1017,8 @@ 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".
- $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".
- ' '.
- &mt('Disable changing password for users with student role by course owner').''."\n".
- &Apache::lonhtmlcommon::row_closure());
- }
+ &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();
@@ -1176,7 +1028,8 @@ sub print_course_modification_page {
$cctitle = &mt('Course personnel');
}
- $r->print(&Apache::lonhtmlcommon::row_title(
+ $r->print($ownertable."\n".&Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_title(
&Apache::loncommon::help_open_topic('Modify_Course_Selfenrolladmin').
' '.&mt('Self-enrollment configuration')).
&Apache::loncommon::start_data_table()."\n".
@@ -1251,79 +1104,6 @@ sub print_selfenrollconfig {
return;
}
-sub print_set_ltiauth {
- my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
- my %lt = &Apache::lonlocal::texthash(
- 'requ' => 'Requirement for re-authentication for student LTI-limited launch of deep-linked item',
- 'link' => 'Link protection can be set to accept username for an enrolled student (if sent by Consumer)',
- 'logi' => 'Login needed, regardless of user information sent by LTI Consumer in (signed) parameters',
- 'used' => 'Use domain default',
- 'cour' => 'Use course-specific setting',
- 'curd' => 'Current domain default is',
- 'valu' => 'Value for this course',
- 'modi' => 'Save',
- 'back' => 'Pick another action',
- );
- my ($domdef,$checkeddom,$checkedcrs,$domdefdisplay,$divsty,$authok,$authno);
- $domdef = 0;
- $checkeddom = 'checked="checked "';
- $domdefdisplay = $lt{'logi'};
- $divsty = 'display:none';
- $authno = 'checked="checked" ';
- my %domconfig =
- &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
- if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
- $domdef = $domconfig{'coursedefaults'}{'ltiauth'};
- }
- if ($domdef) {
- $domdefdisplay = $lt{'link'};
- }
- my %settings = &Apache::lonnet::get('environment',['internal.ltiauth'],$cdom,$cnum);
- my $ltiauth = $settings{'internal.ltiauth'};
-
- if ($ltiauth ne '') {
- $checkedcrs = $checkeddom;
- $checkeddom = '';
- $divsty = 'display:inline-block';
- if ($ltiauth) {
- $authok = 'checked="checked "';
- }
- }
- &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_Course_LTI_Authen');
- $r->print(<
-$helpitem $lt{'requ'} $cdesc
-$lt{'curd'}: $domdefdisplay
-
- $lt{'used'}
-
- $lt{'cour'}
-
-$lt{'valu'}
-
- $lt{'logi'}
-
-
- $lt{'link'}
-
-
-$submit
-
-$hidden_elements
-$lt{'back'}
-
-ENDDOCUMENT
- return;
-}
-
sub modify_selfenrollconfig {
my ($r,$type,$cdesc,$coursehash) = @_;
return unless(ref($coursehash) eq 'HASH');
@@ -1422,16 +1202,12 @@ sub modify_course {
'internal.pendingco-owners','internal.selfenrollmgrdc',
'internal.selfenrollmgrcc','internal.mysqltables');
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)) {
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'};
@@ -1447,7 +1223,6 @@ sub modify_course {
} else {
%changed = ( code => 0,
owner => 0,
- passwd => 0,
);
$ccrole = 'cc';
unless ($settings{'internal.sectionnums'} eq '') {
@@ -1500,21 +1275,9 @@ sub modify_course {
$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'}=$env{'form.defaultcredits'};
+ $newattr{'defaultcredits'} =~ s/[^\d\.]//g;
}
}
@@ -1549,7 +1312,7 @@ sub modify_course {
}
}
- 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') {
@@ -1559,29 +1322,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;
- }
- }
- }
}
}
}
@@ -1627,12 +1371,6 @@ 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 .= ''.&mt('[_1] now set to: [_2]',$longtype{$attr},$shown).' ';
} else {
@@ -1645,17 +1383,11 @@ 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 .= ''.&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.'));
@@ -2316,109 +2048,6 @@ sub modify_catsettings {
return;
}
-sub modify_ltiauth {
- my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
- my %lt = &Apache::lonlocal::texthash(
- 'requ' => 'Requirement for re-authentication for student LTI-limited launch of deep-linked item',
- 'link' => 'Link protection can be set to accept username for an enrolled student (if sent by Consumer)',
- 'logi' => 'Login needed, regardless of user information sent by LTI Consumer in (signed) parameters',
- 'used' => 'Use domain default',
- 'cour' => 'Use course-specific setting',
- 'modi' => 'Save',
- 'back' => 'Pick another action',
- );
- &print_header($r,$type);
- $r->print('');
- return;
-}
-
sub print_header {
my ($r,$type,$javascript_validations) = @_;
my $phase = "start";
@@ -2439,7 +2068,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';
@@ -2447,7 +2082,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');
@@ -2574,35 +2209,6 @@ function togglePostsubmit(caller) {
ENDSCRIPT
- } elsif ($phase eq 'setltiauth') {
- $js .= <<"ENDJS";
-function toggleLTIOptions(form) {
- var radioname = 'ltiauthset';
- var divid = 'crsltiauth';
- var num = form.elements[radioname].length;
- if (num) {
- var setvis = '';
- for (var i=0; i {'onload' => "hide_searching(); courseSet(document.filterpicker.official, 'load');"},
};
- } elsif ($env{'form.phase'} eq 'setltiauth') {
- $starthash = {
- add_entries => {'onload' => "toggleLTIOptions(document.setltiauth);"},
- };
}
$r->print(&Apache::loncommon::start_page('View/Modify Course/Community Settings',
&Apache::lonhtmlcommon::scripttag($js),
@@ -2624,6 +2226,8 @@ 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';
}
@@ -2701,7 +2305,6 @@ 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;
@@ -2714,8 +2317,7 @@ sub hidden_form_elements {
'locarg','krbarg','krbver','counter','hidefromcat','usecategory',
'threshold','postsubmit','postsubtimeout','defaultcredits','uploadquota',
'selfenrollmgrdc','selfenrollmgrcc','action','state','currsec_st',
- 'sections','newsec','mysqltables','nopasswdchg','ltiauth','ltiauthset'],
- ['^selfenrollmgr_','^selfenroll_'])."\n".
+ 'sections','newsec','mysqltables'],['^selfenrollmgr_','^selfenroll_'])."\n".
' ';
return $hidden_elements;
}
@@ -2731,7 +2333,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 = (
@@ -2747,13 +2348,7 @@ sub get_permission {
catsettings => 'edit',
processcat => 'edit',
selfenroll => 'edit',
- adhocrole => 'coord',
- setltiauth => 'edit',
- processltiauth => 'edit',
);
- if ($passwdconf{'crsownerchg'}) {
- $permission{passwdchg} = 'edit';
- }
} elsif (&Apache::lonnet::allowed('rar',$dom)) {
$allowed = 1;
%permission = (
@@ -2764,32 +2359,11 @@ sub get_permission {
setparms => 'view',
catsettings => 'view',
selfenroll => 'view',
- adhocrole => 'custom',
- setltiauth => '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) {
@@ -2798,9 +2372,6 @@ 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);
@@ -2831,6 +2402,8 @@ 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";
}
@@ -2840,13 +2413,15 @@ sub handler {
{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';
}
@@ -2861,7 +2436,7 @@ sub handler {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'adhocrole')",
text=>$enter_text});
- &print_adhocrole_selected($r,$type,$permission);
+ &print_adhocrole_selected($r,$type);
} else {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'menu')",
@@ -2869,17 +2444,17 @@ sub handler {
my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
my ($readonly,$linktext);
if ($permission->{$phase} eq 'view') {
- $readonly = 1;
+ $readonly = 1;
}
if (($phase eq 'setquota') && ($permission->{'setquota'})) {
if ($permission->{'setquota'} eq 'view') {
- $linktext = 'Set quota';
+ $linktext = 'Set quota';
} else {
$linktext = 'Display quota';
}
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>$linktext});
+ text=>"$linktext"});
&print_setquota($r,$cdom,$cnum,$cdesc,$type,$readonly);
} elsif (($phase eq 'processquota') && ($permission->{'processquota'})) {
&Apache::lonhtmlcommon::add_breadcrumb
@@ -2910,7 +2485,7 @@ sub handler {
}
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>$linktext});
+ text=>"Configure submit button behavior post-submission"});
&print_postsubmit_config($r,$cdom,$cnum,$cdesc,$type,$readonly);
} elsif (($phase eq 'processpostsubmit') && ($permission->{'processpostsubmit'})) {
&Apache::lonhtmlcommon::add_breadcrumb
@@ -2930,7 +2505,7 @@ sub handler {
}
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>$linktext});
+ text=>"$linktext"});
&print_course_modification_page($r,$cdom,$cnum,$cdesc,$type,$readonly);
} elsif (($phase eq 'processparms') && ($permission->{'processparms'})) {
&Apache::lonhtmlcommon::add_breadcrumb
@@ -2965,25 +2540,14 @@ sub handler {
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=>"Requirement for re-authentication for LTI launch of deep-linked item"});
- &print_set_ltiauth($r,$cdom,$cnum,$cdesc,$type,$readonly);
- } elsif (($phase eq 'processltiauth') && ($permission->{'processltiauth'})) {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'setltiauth')",
- text=>"Requirement for re-authentication for LTI launch of deep-linked item"});
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"Result"});
- &modify_ltiauth($r,$cdom,$cnum,$cdesc,$domdesc,$type);
}
}
} 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'));
}