--- loncom/interface/lonmodifycourse.pm 2017/01/22 19:23:35 1.79.2.5 +++ loncom/interface/lonmodifycourse.pm 2023/04/11 20:35:19 1.99 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # handler for DC-only modifiable course settings # -# $Id: lonmodifycourse.pm,v 1.79.2.5 2017/01/22 19:23:35 raeburn Exp $ +# $Id: lonmodifycourse.pm,v 1.99 2023/04/11 20:35:19 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; } } @@ -72,6 +79,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'); @@ -94,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'} = ''; @@ -119,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)) { @@ -167,6 +182,8 @@ sub print_course_search_page { $r->print(&Apache::loncommon::js_changer()); if ($type eq 'Community') { $r->print('<h3>'.&mt('Search for a community in the [_1] domain',$domdesc).'</h3>'); + } elsif ($type eq 'Placement') { + $r->print('<h3>'.&mt('Search for a placement test in the [_1] domain',$domdesc).'</h3>'); } else { $r->print('<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>'); } @@ -177,6 +194,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:'); } @@ -184,6 +203,9 @@ 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); @@ -194,6 +216,8 @@ sub print_course_search_page { if (@{$roles_by_num} > 1) { if ($type eq 'Community') { $roleoption = &mt('Enter the community with one of the available ad hoc roles'); + } elsif ($type eq 'Placement') { + $roleoption = &mt('Enter the placement test with one of the available ad hoc roles.'); } else { $roleoption = &mt('Enter the course with one of the available ad hoc roles.'); } @@ -201,6 +225,8 @@ sub print_course_search_page { my $rolename = $description->{$roles_by_num->[0]}; if ($type eq 'Community') { $roleoption = &mt('Enter the community with the ad hoc role of: [_1]',$rolename); + } elsif ($type eq 'Placement') { + $roleoption = &mt('Enter the placement test with the ad hoc role of: [_1]',$rolename); } else { $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$rolename); } @@ -208,6 +234,8 @@ sub print_course_search_page { } 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); } @@ -269,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"); @@ -318,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"> @@ -400,6 +430,8 @@ 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', + 'setexttool' => 'View/Modify External Tools permissions', ); } else { %linktext = ( @@ -407,10 +439,12 @@ 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', + 'setexttool' => 'View External Tools permissions', ); } 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'; @@ -420,7 +454,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'; @@ -445,6 +479,8 @@ 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.'); + my $exttool_text = &mt('Override default permissions for external tools use for this specific course.'); $linktext{'viewparms'} = 'Display current settings for automated enrollment'; my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom); @@ -505,7 +541,7 @@ 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 => '' @@ -526,6 +562,22 @@ sub print_modification_menu { permission => $permission->{'setpostsubmit'}, linktitle => '', }, + { + linktext => $linktext{'setltiauth'}, + icon => 'system-lock-screen.png', + #help => '', + url => &phaseurl('setltiauth'), + permission => $permission->{'setltiauth'}, + linktitle => '', + }, + { + linktext => $linktext{'setexttool'}, + icon => 'exttool.png', + #help => '', + url => &phaseurl('setexttool'), + permission => $permission->{'setexttool'}, + linktitle => '', + }, ] }, ); @@ -547,7 +599,7 @@ sub print_modification_menu { } else { $menu_html .= '<li>'.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'</li>'."\n". '<li>'.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'</li>'."\n"; - if (&showcredits($dom)) { + if (($type ne 'Placement') && &showcredits($dom)) { $menu_html .= '<li>'.&mt('Default credits earned by student on course completion.').'</li>'."\n"; } $menu_html .= ' <li>'.&mt('Override defaults for who configures self-enrollment for this specific course.').'</li>'."\n"; @@ -556,7 +608,9 @@ sub print_modification_menu { '<li>'.$setquota_text.'</li>'."\n". '<li>'.$setuploadquota_text.'</li>'."\n". '<li>'.$anon_text.'</li>'."\n". - '<li>'.$postsubmit_text.'</li>'."\n"; + '<li>'.$postsubmit_text.'</li>'."\n". + '<li>'.$ltiauth_text.'</li>'."\n"; + '<li>'.$exttool_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">'; @@ -602,9 +656,9 @@ sub print_adhocrole_selected { } $selectrole = 1; } elsif ($permission->{'adhocrole'} eq 'custom') { - my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1); + my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1); if (ref($okroles) eq 'ARRAY') { - my $possrole = $env{'form.adhocrole'}; + 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"; @@ -654,9 +708,34 @@ sub print_settings_display { "<th>$lt{'dcon'}</th>\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". "<td><b>$longtype{$item}</b></td>\n". - "<td>$enrollvar{$item}</td>\n"; + "<td>$shown</td>\n"; if (grep(/^\Q$item\E$/,@modifiable_params)) { $disp_table .= '<td align="right">'.&mt('Yes').'</td>'."\n"; } else { @@ -784,7 +863,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 = '<input type="submit" value="'.$lt{'modi'}.'" />'; } @@ -877,15 +956,7 @@ ENDDOCUMENT sub domain_postsubtimeout { my ($cdom,$type,$settings) = @_; return unless (ref($settings) eq 'HASH'); - my $lctype = lc($type); - unless ($type eq 'Community') { - $lctype = 'unofficial'; - if ($settings->{'internal.coursecode'}) { - $lctype = 'official'; - } elsif ($settings->{'internal.textbook'}) { - $lctype = 'textbook'; - } - } + my $lctype = &get_lctype($type,$settings); my %domconfig = &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom); my $postsubtimeout = 60; @@ -901,6 +972,22 @@ sub domain_postsubtimeout { return $postsubtimeout; } +sub get_lctype { + my ($type,$settings) = @_; + my $lctype = lc($type); + unless (($type eq 'Community') || ($type eq 'Placement')) { + $lctype = 'unofficial'; + if (ref($settings) eq 'HASH') { + if ($settings->{'internal.coursecode'}) { + $lctype = 'official'; + } elsif ($settings->{'internal.textbook'}) { + $lctype = 'textbook'; + } + } + } + return $lctype; +} + sub print_catsettings { my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; &print_header($r,$type); @@ -941,6 +1028,8 @@ sub print_catsettings { ' <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.")); + } 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").':<ul>'. '<li>'.&mt('Auto-cataloging is enabled and the course is assigned an institutional code.').'</li>'. @@ -962,7 +1051,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('<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>'); } } @@ -1009,6 +1098,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'; @@ -1061,7 +1151,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 .= '<td><input type="radio" name="courseowner" value="'.$cc.'" checked="checked"'.$disabled.' /></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.'"'.$disabled.' /></td>'."\n"; } @@ -1083,17 +1173,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.' />'. &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". '<input type="text" size="3" name="defaultcredits" value="'.$enrollvar{'defaultcredits'}.'"'.$disabled.' />'. &Apache::lonhtmlcommon::row_closure()); } @@ -1103,8 +1194,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(); @@ -1114,8 +1218,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". @@ -1190,6 +1293,199 @@ 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 = '<input type="button" onclick="javascript:changePage(this.form,'."'processltiauth'".');" value="'.$lt{'modi'}.'" />'; + } + my $helpitem = &Apache::loncommon::help_open_topic('Modify_Course_LTI_Authen'); + $r->print(<<ENDDOCUMENT); +<form action="/adm/modifycourse" method="post" name="setltiauth"> +<h3>$helpitem $lt{'requ'} <span class="LC_nobreak">$cdesc</span></h3> +<p><span class="LC_nobreak">$lt{'curd'}: <span style="font-style:italic">$domdefdisplay</span></span</p> +<p><span class="LC_nobreak"> +<label><input type="radio" name="ltiauthset" value="dom" onclick="toggleLTIOptions(this.form);"$checkeddom$disabled />$lt{'used'}</label></span><br /> +<span class="LC_nobreak"> +<label><input type="radio" name="ltiauthset" value="course" onclick="toggleLTIOptions(this.form);"$checkedcrs$disabled />$lt{'cour'}</label></span> +<fieldset id="crsltiauth" style="$divsty"> +<legend>$lt{'valu'}</legend> +<span class="LC_nobreak"> +<label><input type="radio" name="ltiauth" value="0"$authno$disabled />$lt{'logi'}</label> +</span><br /> +<span class="LC_nobreak"> +<label><input type="radio" name="ltiauth" value="1"$authok$disabled />$lt{'link'}</label> +</span> +</fieldset> +$submit +</p> +$hidden_elements +<a href="javascript:changePage(document.setltiauth,'menu')">$lt{'back'}</a> +</form> +ENDDOCUMENT + return; +} + +sub print_set_exttool { + my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; + my %titles = &exttool_titles($type); + my ($domdef,$domdefdom,$checkeddom,$checkedcrs,$domdefdisplay,$divsty); + $domdef = 0; + $domdefdom = 1; + $checkeddom = ' checked="checked"'; + $divsty = 'display:none'; + my %settings = &Apache::lonnet::get('environment',['internal.coursecode', + 'internal.textbook'],$cdom,$cnum); + my $lctype = &get_lctype($type,\%settings); + my %domconfig = + &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom); + if (ref($domconfig{'coursedefaults'}) eq 'HASH') { + if (ref($domconfig{'coursedefaults'}{'exttool'}) eq 'HASH') { + if (exists($domconfig{'coursedefaults'}{'exttool'}{$lctype})) { + $domdef = $domconfig{'coursedefaults'}{'exttool'}{$lctype}; + } + } + if (ref($domconfig{'coursedefaults'}{'domexttool'}) eq 'HASH') { + if (exists($domconfig{'coursedefaults'}{'domexttool'}{$lctype})) { + $domdefdom = $domconfig{'coursedefaults'}{'domexttool'}{$lctype}; + } + } + } + if ($domdef && $domdefdom) { + $domdefdisplay = $titles{'both'}; + } elsif ($domdef) { + $domdefdisplay = $titles{'crs'}; + } elsif ($domdefdom) { + $domdefdisplay = $titles{'dom'}; + } else { + $domdefdisplay = $titles{'none'}; + } + my %settings = &Apache::lonnet::get('environment',['internal.exttool'],$cdom,$cnum); + my $crsexttool = $settings{'internal.exttool'}; + my %crschecked = ( + both => ' checked="checked"', + dom => '', + crs => '', + none => '', + ); + if ($crsexttool ne '') { + $checkedcrs = $checkeddom; + $checkeddom = ''; + $divsty = 'display:inline-block'; + foreach my $option ('both','dom','crs','none') { + if ($crsexttool eq $option) { + $crschecked{$option} = ' checked="checked"'; + } else { + $crschecked{$option} = ''; + } + } + } + &print_header($r,$type); + my $hidden_elements = &hidden_form_elements(); + my ($disabled,$submit); + if ($readonly) { + $disabled = ' disabled="disabled"'; + } else { + $submit = '<input type="button" onclick="javascript:changePage(this.form,'."'processexttool'".');" value="'.$titles{'modi'}.'" />'; + } + my $helpitem = &Apache::loncommon::help_open_topic('Modify_Course_External_Tool'); + $r->print(<<ENDDOCUMENT); +<form action="/adm/modifycourse" method="post" name="setexttool"> +<h3>$helpitem $titles{'extt'}</h3> +<h4><span class="LC_nobreak">$type: $cdesc</span></h4> +<p><span class="LC_nobreak">$titles{'curd'}: <span style="font-style:italic">$domdefdisplay</span></span</p> +<p><span class="LC_nobreak"> +<label><input type="radio" name="exttoolset" value="dom" onclick="toggleExtToolOptions(this.form);"$checkeddom$disabled />$titles{'used'}</label></span><br /> +<span class="LC_nobreak"> +<label><input type="radio" name="exttoolset" value="course" onclick="toggleExtToolOptions(this.form);"$checkedcrs$disabled />$titles{'cour'}</label></span> +<fieldset id="crsexttool" style="$divsty"> +<legend>$titles{'valu'}</legend> +<span class="LC_nobreak"> +<label><input type="radio" name="exttool" value="both"$crschecked{'both'}$disabled />$titles{'both'}</label> +</span><br /> +<span class="LC_nobreak"> +<label><input type="radio" name="exttool" value="dom"$crschecked{'dom'}$disabled />$titles{'dom'}</label> +</span><br /> +<span class="LC_nobreak"> +<label><input type="radio" name="exttool" value="crs"$crschecked{'crs'}$disabled />$titles{'crs'}</label> +</span><br /> +<span class="LC_nobreak"> +<label><input type="radio" name="exttool" value="none"$crschecked{'none'}$disabled />$titles{'none'}</label> +</span> +</fieldset><br /> +$submit +</p> +$hidden_elements +<a href="javascript:changePage(document.setexttool,'menu')">$titles{'back'}</a> +</form> +ENDDOCUMENT + return; +} + +sub exttool_titles { + my ($type) = @_; + my %titles = &Apache::lonlocal::texthash( + 'extt' => 'External Tool permissions', + 'none' => 'Use of external tools not permitted', + 'crs' => 'Only external tools defined in course may be used', + 'dom' => 'Only external tools defined in domain may be used', + 'both' => 'External tools defined/configured in either domain or course may be used', + 'used' => 'Use domain default', + 'cour' => 'Use course-specific setting', + 'curd' => 'Current domain default is', + 'valu' => 'Value for this course', + 'modi' => 'Save', + 'back' => 'Pick another action', + ); + if ($type eq 'Community') { + $titles{'crs'} = &mt('Only external tools defined in community may be used'); + $titles{'both'} = &mt('External tools defined/configured in either domain or community may be used'); + $titles{'cour'} = &mt('Use community-specific setting'); + $titles{'valu'} = &mt('Value for this community'); + } + return %titles; +} + sub modify_selfenrollconfig { my ($r,$type,$cdesc,$coursehash) = @_; return unless(ref($coursehash) eq 'HASH'); @@ -1253,6 +1549,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 '') { @@ -1273,7 +1571,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 />'; } @@ -1288,12 +1587,16 @@ 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'}; @@ -1309,6 +1612,7 @@ sub modify_course { } else { %changed = ( code => 0, owner => 0, + passwd => 0, ); $ccrole = 'cc'; unless ($settings{'internal.sectionnums'} eq '') { @@ -1339,6 +1643,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 '') { @@ -1361,9 +1667,21 @@ sub modify_course { $newattr{'mysqltables'} = $env{'form.mysqltables'}; $newattr{'mysqltables'} =~ s/\D+//g; } - if (&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; + } + } } } @@ -1398,7 +1716,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') { @@ -1408,10 +1726,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; + } + } + } } } } @@ -1457,6 +1794,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 { @@ -1469,11 +1812,17 @@ 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>'; } } - 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.'). '<br />'.&mt('If automated enrollment at your institution requires validation of course owners, automated enrollment will fail.')); @@ -2134,6 +2483,217 @@ 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('<form action="/adm/modifycourse" method="post" name="processltiauth">'."\n". + '<h3>'.$lt{'requ'}. + ' <span class="LC_nobreak">'.$cdesc.'</span></h3>'); + my %oldsettings = &Apache::lonnet::get('environment',['internal.ltiauth'],$cdom,$cnum); + my $oldltiauth = $oldsettings{'internal.ltiauth'}; + my $domdef; + my %domconfig = + &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom); + if (ref($domconfig{'coursedefaults'}) eq 'HASH') { + $domdef = $domconfig{'coursedefaults'}{'ltiauth'}; + } + my ($newltiauth,$nochange,$change,$status,$error,$ltiauth); + if ($env{'form.ltiauthset'} eq 'dom') { + if ($oldltiauth eq '') { + $nochange = 1; + } else { + $change = 1; + } + } elsif ($env{'form.ltiauthset'} eq 'course') { + if ($env{'form.ltiauth'} =~ /^0|1$/) { + $newltiauth = $env{'form.ltiauth'}; + } + if ($oldltiauth == $newltiauth) { + $nochange = 1; + } else { + $change = 1; + } + } + if ($change) { + if ($newltiauth ne '') { + my %cenv = ( + 'internal.ltiauth' => $newltiauth, + ); + if (&Apache::lonnet::put('environment',\%cenv,$cdom,$cnum) eq 'ok') { + if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') { + &Apache::lonnet::appenv( + {'course.'.$cdom.'_'.$cnum.'.internal.ltiauth' => $newltiauth}); + } + } else { + $error = 1; + } + } else { + if (&Apache::lonnet::del('environment',['internal.ltiauth'],$cdom,$cnum) eq 'ok') { + if (exists($env{'course.'.$cdom.'_'.$cnum.'.internal.ltiauth'})) { + &Apache::lonnet::delenv('course.'.$cdom.'_'.$cnum.'.internal.ltiauth'); + } + } else { + $error = 1; + } + } + } + if ($error) { + $nochange = 1; + } + if ($nochange) { + $ltiauth = $oldltiauth; + } else { + $ltiauth = $newltiauth; + } + if ($ltiauth eq '') { + $status = $lt{'used'}.': '; + if ($domdef) { + $status .= '<span style="font-style:italic">'.$lt{'link'}.'</span>'; + } else { + $status .= '<span style="font-style:italic">'.$lt{'logi'}.'</span>'; + } + } else { + $status = $lt{'cour'}.': '; + if ($ltiauth) { + $status .= '<span style="font-style:italic">'.$lt{'link'}.'</span>'; + } else { + $status .= '<span style="font-style:italic">'.$lt{'logi'}.'</span>'; + } + } + if ($error) { + $r->print('<p class="LC_warning">'.&mt('An error occurred when saving your changes').'</p>'); + } + $r->print('<p>'); + if ($nochange) { + $r->print(&mt('Re-authentication requirement for LTI launch of deep-linked item is unchanged')); + } elsif ($change) { + $r->print(&mt('Re-authentication requirement for LTI launch of deep-linked changed')); + } + $r->print('<br />'.$status); + $r->print('</p><p>'. + '<a href="javascript:changePage(document.processltiauth,'."'menu'".')">'. + $lt{'back'}.'</a></p>'); + $r->print(&hidden_form_elements().'</form>'); + return; +} + +sub modify_exttool { + my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_; + my %titles = &exttool_titles($type); + &print_header($r,$type); + $r->print('<form action="/adm/modifycourse" method="post" name="processexttool">'."\n". + '<h3>'.$titles{'extt'}.'</h3>'. + '<h4><span class="LC_nobreak">'.$type.': '.$cdesc.'</span></h4>'); + my %oldsettings = &Apache::lonnet::get('environment',['internal.exttool'],$cdom,$cnum); + my $oldcrsexttool = $oldsettings{'internal.exttool'}; + my $domdefdom = 1; + my $domdef = 0; + my $domdefdisplay; + my %settings = &Apache::lonnet::get('environment',['internal.coursecode', + 'internal.textbook'],$cdom,$cnum); + my $lctype = &get_lctype($type,\%settings); + my %domconfig = + &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom); + if (ref($domconfig{'coursedefaults'}) eq 'HASH') { + if (ref($domconfig{'coursedefaults'}{'domexttool'}) eq 'HASH') { + if (exists($domconfig{'coursedefaults'}{'domexttool'}{$lctype})) { + $domdefdom = $domconfig{'coursedefaults'}{'domexttool'}{$lctype}; + } + } + if (ref($domconfig{'coursedefaults'}{'exttool'}) eq 'HASH') { + if (exists($domconfig{'coursedefaults'}{'exttool'}{$lctype})) { + $domdef = $domconfig{'coursedefaults'}{'exttool'}{$lctype}; + } + } + } + if ($domdef && $domdefdom) { + $domdefdisplay = $titles{'both'}; + } elsif ($domdef) { + $domdefdisplay = $titles{'crs'}; + } elsif ($domdefdom) { + $domdefdisplay = $titles{'dom'}; + } else { + $domdefdisplay = $titles{'none'}; + } + my ($newcrsexttool,$nochange,$change,$status,$error,$exttool); + if ($env{'form.exttoolset'} eq 'dom') { + if ($oldcrsexttool eq '') { + $nochange = 1; + } else { + $change = 1; + } + } elsif ($env{'form.exttoolset'} eq 'course') { + if ($env{'form.exttool'} =~ /^both|dom|crs|none$/) { + $newcrsexttool = $env{'form.exttool'}; + } + if ($oldcrsexttool eq $newcrsexttool) { + $nochange = 1; + } else { + $change = 1; + } + } + if ($change) { + if ($newcrsexttool ne '') { + my %cenv = ( + 'internal.exttool' => $newcrsexttool, + ); + if (&Apache::lonnet::put('environment',\%cenv,$cdom,$cnum) eq 'ok') { + if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') { + &Apache::lonnet::appenv( + {'course.'.$cdom.'_'.$cnum.'.internal.exttool' => $newcrsexttool}); + } + } else { + $error = 1; + } + } else { + if (&Apache::lonnet::del('environment',['internal.exttool'],$cdom,$cnum) eq 'ok') { + if (exists($env{'course.'.$cdom.'_'.$cnum.'.internal.exttool'})) { + &Apache::lonnet::delenv('course.'.$cdom.'_'.$cnum.'.internal.exttool'); + } + } else { + $error = 1; + } + } + } + if ($error) { + $nochange = 1; + } + if ($nochange) { + $exttool = $oldcrsexttool; + } else { + $exttool = $newcrsexttool; + } + if ($exttool eq '') { + $status = $titles{'used'}.': <span style="font-style:italic">'.$domdefdisplay.'</span>'; + } else { + $status = $titles{'cour'}.': <span style="font-style:italic">'.$titles{$exttool}.'</span>'; + } + if ($error) { + $r->print('<p class="LC_warning">'.&mt('An error occurred when saving your changes').'</p>'); + } + $r->print('<p>'); + if ($nochange) { + $r->print(&mt('External Tool permissions unchanged')); + } elsif ($change) { + $r->print(&mt('External Tool permissions changed')); + } + $r->print('<br />'.$status); + $r->print('</p><p>'. + '<a href="javascript:changePage(document.processexttool,'."'menu'".')">'. + $titles{'back'}.'</a></p>'); + $r->print(&hidden_form_elements().'</form>'); + return; +} + sub print_header { my ($r,$type,$javascript_validations) = @_; my $phase = "start"; @@ -2289,6 +2849,64 @@ 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<num; i++) { + if (form.elements[radioname][i].checked) { + if (form.elements[radioname][i].value == 'course') { + if (document.getElementById(divid)) { + document.getElementById(divid).style.display = 'inline-block'; + } + setvis = 1; + } + break; + } + } + if (!setvis) { + if (document.getElementById(divid)) { + document.getElementById(divid).style.display = 'none'; + } + } + } + return; +} + +ENDJS + } elsif ($phase eq 'setexttool') { + $js .= <<"ENDJS"; +function toggleExtToolOptions(form) { + var radioname = 'exttoolset'; + var divid = 'crsexttool'; + var num = form.elements[radioname].length; + if (num) { + var setvis = ''; + for (var i=0; i<num; i++) { + if (form.elements[radioname][i].checked) { + if (form.elements[radioname][i].value == 'course') { + if (document.getElementById(divid)) { + document.getElementById(divid).style.display = 'inline-block'; + } + setvis = 1; + } + break; + } + } + if (!setvis) { + if (document.getElementById(divid)) { + document.getElementById(divid).style.display = 'none'; + } + } + } + return; +} + +ENDJS } my $starthash; if ($env{'form.phase'} eq 'adhocrole') { @@ -2299,6 +2917,14 @@ ENDSCRIPT $starthash = { add_entries => {'onload' => "hide_searching(); courseSet(document.filterpicker.official, 'load');"}, }; + } elsif ($env{'form.phase'} eq 'setltiauth') { + $starthash = { + add_entries => {'onload' => "toggleLTIOptions(document.setltiauth);"}, + }; + } elsif ($env{'form.phase'} eq 'setexttool') { + $starthash = { + add_entries => {'onload' => "toggleExtToolOptions(document.setexttool);"}, + }; } $r->print(&Apache::loncommon::start_page('View/Modify Course/Community Settings', &Apache::lonhtmlcommon::scripttag($js), @@ -2306,6 +2932,8 @@ ENDSCRIPT 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'; } @@ -2383,6 +3011,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; @@ -2395,7 +3024,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','ltiauth','ltiauthset', + 'exttoolset','exttool'],['^selfenrollmgr_','^selfenroll_'])."\n". '<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />'; return $hidden_elements; } @@ -2411,6 +3041,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 = ( @@ -2427,7 +3058,14 @@ sub get_permission { processcat => 'edit', selfenroll => 'edit', adhocrole => 'coord', + setltiauth => 'edit', + processltiauth => 'edit', + setexttool => 'edit', + processexttool => 'edit', ); + if ($passwdconf{'crsownerchg'}) { + $permission{passwdchg} = 'edit'; + } } elsif (&Apache::lonnet::allowed('rar',$dom)) { $allowed = 1; %permission = ( @@ -2439,11 +3077,32 @@ sub get_permission { catsettings => 'view', selfenroll => 'view', adhocrole => 'custom', + setltiauth => 'view', + setexttool => '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) { @@ -2452,6 +3111,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); @@ -2482,6 +3144,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"; } @@ -2498,6 +3162,8 @@ sub handler { 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'; } @@ -2520,11 +3186,11 @@ 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'; } @@ -2616,12 +3282,38 @@ 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"}, + {href=>"javascript:changePage(document.$phase,'$phase')", + text=>"Result"}); + &modify_ltiauth($r,$cdom,$cnum,$cdesc,$domdesc,$type); + } elsif (($phase eq 'setexttool') && ($permission->{'setexttool'})) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:changePage(document.$phase,'$phase')", + text=>"External Tool permission"}); + &print_set_exttool($r,$cdom,$cnum,$cdesc,$type,$readonly); + } elsif (($phase eq 'processexttool') && ($permission->{'processexttool'})) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:changePage(document.$phase,'setexttool')", + text=>"External Tool permission"}, + {href=>"javascript:changePage(document.$phase,'$phase')", + text=>"Result"}); + &modify_exttool($r,$cdom,$cnum,$cdesc,$domdesc,$type); } } } else { $r->print('<span class="LC_error">'); 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')); }