--- loncom/interface/lonmodifycourse.pm 2024/08/26 10:48:59 1.79.2.9.2.7 +++ 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.7 2024/08/26 10:48:59 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'); @@ -97,11 +97,10 @@ sub get_enrollment_settings { my ($cdom,$cnum) = @_; my ($internals,$accessdates) = &autoenroll_keys(); my @items; - if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) { + if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) { @items = map { 'internal.'.$_; } (@{$internals}); push(@items,@{$accessdates}); } - push(@items,'internal.nopasswdchg'); my %settings = &Apache::lonnet::get('environment',\@items,$cdom,$cnum); my %enrollvar; $enrollvar{'autharg'} = ''; @@ -127,7 +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"); - - - -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'); @@ -391,8 +288,7 @@ sub get_filters { sub print_modification_menu { my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash,$permission) = @_; &print_header($r,$type); - my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$cdom,$cnum, - $extendedtype); + my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$cdom,$cnum); if (ref($coursehash) eq 'HASH') { $cdom = $coursehash->{'domain'}; $cnum = $coursehash->{'num'}; @@ -411,9 +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', - 'setexttool' => 'View/Modify External Tools permissions', - 'setcrseditors' => 'View/Modify permitted course resource editors', ); } else { %linktext = ( @@ -421,23 +314,20 @@ 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', - 'setcrseditors' => 'View permitted course resource editors', ); } 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, self-enrollment and table lifetime'; + $linktext{'setparms'} = 'View/Modify community owner'; $linktext{'catsettings'} = 'View/Modify catalog settings for community'; } else { $categorytitle = 'View Community Settings'; - $linktext{'setparms'} = 'View community owner, self-enrollment and table lifetime'; + $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.'); + $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'; @@ -458,15 +348,10 @@ sub print_modification_menu { } $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.'); $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a course via Content Editor.'); - my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook'], - $cdom,$cnum); - $extendedtype = ucfirst(&Apache::lonuserutils::get_extended_type($cdom,$cnum,$type,\%settings)); } 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 $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); @@ -527,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'), @@ -548,70 +433,93 @@ 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 => '', - }, - { - linktext => $linktext{'setcrseditors'}, - icon => 'crseditors.png', - #help => '', - url => &phaseurl('setcrseditors'), - permission => $permission->{'setcrseditors'}, - linktitle => '', - }, ] }, ); - $r->print( + my $menu_html = '

' - .&mt($type).': '.$cdesc.'' - .'

'."\n"); - if ($extendedtype) { - $r->print('

'.&mt('Type').': '.&mt("$extendedtype $type").'

'); + .&mt('View/Modify settings for: [_1]', + ''.$cdesc.'') + .''."\n".'

'; + if ($type eq 'Community') { + $menu_html .= &mt('Although almost all community settings can be modified by a Coordinator, the following may only be set or modified by a Domain Coordinator:'); + } else { + $menu_html .= &mt('Although almost all course settings can be modified by a Course Coordinator, the following may only be set or modified by a Domain Coordinator:'); } - $r->print( - '

' + $menu_html .= '

'."\n".'' + .'' ."\n" - .&hidden_form_elements() - .&Apache::lonhtmlcommon::generate_menu(@menu) - .'
'); + .&hidden_form_elements(); + + $r->print($menu_html); + $r->print(&Apache::lonhtmlcommon::generate_menu(@menu)); + $r->print(''); return; } sub print_adhocrole_selected { - my ($r,$type,$permission) = @_; + 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; + } } } } @@ -657,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 { @@ -706,32 +589,30 @@ sub print_settings_display { $setparms_link_start = ''; $setparms_link_end = ''; } - $r->print('

'.&mt('Current automated enrollment settings').'

'."\n". - '

'.&mt($type).': '.$cdesc.'

'."\n". + $r->print('

'.&mt('Current automated enrollment settings for:'). + ' '.$cdesc.'

'. '
'."\n". - '

'.$lt{'cose'}.'

'. + '

'.$lt{'cour'}.'

'.$disp_table.'

'. + ''.$lt{'back'}.''."\n". + &hidden_form_elements(). + '

' + ); } sub print_setquota { my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; my $lctype = lc($type); - my $headline = '

'.&mt("Set disk space quotas for $lctype").'

'."\n". - '

'.&mt($type).': '.$cdesc.'

'."\n"; + my $headline = &mt("Set disk space quotas for $lctype: [_1]", + ''.$cdesc.''); my %lt = &Apache::lonlocal::texthash( 'gpqu' => 'Disk space for storage of group portfolio files', 'upqu' => 'Disk space for storage of content directly uploaded to course via Content Editor', @@ -746,20 +627,15 @@ sub print_setquota { $cdom,$cnum); my $coursequota = $settings{'internal.coursequota'}; my $uploadquota = $settings{'internal.uploadquota'}; - if (($uploadquota eq '') || ($coursequota eq '')) { + if ($coursequota eq '') { + $coursequota = $staticdefaults{'coursequota'}; + } + if ($uploadquota eq '') { my %domdefs = &Apache::lonnet::get_domain_defaults($cdom); my $quotatype = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$type,\%settings); + $uploadquota = $domdefs{$quotatype.'quota'}; if ($uploadquota eq '') { - $uploadquota = $domdefs{$quotatype.'quota'}; - if ($uploadquota eq '') { - $uploadquota = $staticdefaults{'uploadquota'}; - } - } - if ($coursequota eq '') { - $coursequota = $domdefs{$quotatype.'coursequota'}; - if ($coursequota eq '') { - $coursequota = $staticdefaults{'coursequota'}; - } + $uploadquota = $staticdefaults{'uploadquota'}; } } &print_header($r,$type); @@ -773,8 +649,8 @@ sub print_setquota { $submit = ''; } $r->print(< +

$headline

$porthelpitem $lt{'gpqu'}: MB @@ -787,12 +663,9 @@ $uploadhelpitem $lt{'upqu'}: $hidden_elements +$lt{'back'} ENDDOCUMENT - my @actions = - (''. - $lt{'back'}.''); - $r->print('
'.&Apache::lonhtmlcommon::actionbox(\@actions)); return; } @@ -807,7 +680,7 @@ sub print_set_anonsurvey_threshold { my %settings = &Apache::lonnet::get('environment',['internal.anonsurvey_threshold'],$cdom,$cnum); my $threshold = $settings{'internal.anonsurvey_threshold'}; if ($threshold eq '') { - my %domconfig = + my %domconfig = &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom); if (ref($domconfig{'coursedefaults'}) eq 'HASH') { $threshold = $domconfig{'coursedefaults'}{'anonsurvey_threshold'}; @@ -822,26 +695,22 @@ sub print_set_anonsurvey_threshold { my $hidden_elements = &hidden_form_elements(); my ($disabled,$submit); if ($readonly) { - $disabled = ' disabled="disabled"'; + $disabled = ' disabled="disabled"'; } else { $submit = ''; } my $helpitem = &Apache::loncommon::help_open_topic('Modify_Anonsurvey_Threshold'); - my $showtype = &mt($type); $r->print(<$lt{'resp'} -

$showtype: $cdesc

+

$lt{'resp'} $cdesc

-$helpitem $lt{'sufa'}:     

+$helpitem $lt{'sufa'}:      $submit +

$hidden_elements +$lt{'back'}
ENDDOCUMENT - my @actions = - (''. - $lt{'back'}.''); - $r->print('

'.&Apache::lonhtmlcommon::actionbox(\@actions)); return; } @@ -862,11 +731,11 @@ sub print_postsubmit_config { if ($postsubmit eq '') { my %domconfig = &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom); - $postsubmit = 1; + $postsubmit = 1; if (ref($domconfig{'coursedefaults'}) eq 'HASH') { if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') { if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'off') { - $postsubmit = 0; + $postsubmit = 0; } } } @@ -894,37 +763,40 @@ sub print_postsubmit_config { $submit = ''; } my $helpitem = &Apache::loncommon::help_open_topic('Modify_Postsubmit_Config'); - my $showtype = &mt($type); $r->print(<$lt{'conf'} -

$showtype: $cdesc

+

$lt{'conf'} ($cdesc)

-$helpitem $lt{'disa'}: +$helpitem $lt{'disa'}:    -

+
$lt{'nums'}
$zero
-

+
$submit

$hidden_elements +$lt{'back'}
ENDDOCUMENT - my @actions = - (''. - $lt{'back'}.''); - $r->print('
'.&Apache::lonhtmlcommon::actionbox(\@actions)); return; } sub domain_postsubtimeout { my ($cdom,$type,$settings) = @_; - return unless (ref($settings) eq 'HASH'); - my $lctype = &get_lctype($type,$settings); + return unless (ref($settings) eq 'HASH'); + my $lctype = lc($type); + unless (($type eq 'Community') || ($type eq 'Placement')) { + $lctype = 'unofficial'; + if ($settings->{'internal.coursecode'}) { + $lctype = 'official'; + } elsif ($settings->{'internal.textbook'}) { + $lctype = 'textbook'; + } + } my %domconfig = &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom); my $postsubtimeout = 60; @@ -940,22 +812,6 @@ sub domain_postsubtimeout { return $postsubtimeout; } -sub get_lctype { - my ($type,$settings) = @_; - my $lctype = lc($type); - unless ($type eq 'Community') { - $lctype = 'unofficial'; - if (ref($settings) eq 'HASH') { - if ($settings->{'internal.coursecode'}) { - $lctype = 'official'; - } elsif ($settings->{'internal.textbook'}) { - $lctype = 'textbook'; - } - } - } - return $lctype; -} - sub print_catsettings { my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; &print_header($r,$type); @@ -973,9 +829,8 @@ sub print_catsettings { $lt{'categ'} = &mt('Categorize Community'); $lt{'assi'} = &mt('Assign one or more subcategories to this community.'); } - $r->print('

'.$lt{'catset'}.'

'."\n". - '

'.&mt($type).': '.$cdesc.'

'."\n". - '
'."\n"); + $r->print(''. + '

'.$lt{'catset'}.' '.$cdesc.'

'); my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); my @cat_params = &catalog_settable($domconf{'coursecategories'},$type); if (@cat_params > 0) { @@ -983,63 +838,50 @@ sub print_catsettings { if ($readonly) { $disabled = ' disabled="disabled"'; } - my %currsettings = + my %currsettings = &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum); if (grep(/^togglecats$/,@cat_params)) { my $excludeon = ''; my $excludeoff = ' checked="checked" '; if ($currsettings{'hidefromcat'} eq 'yes') { $excludeon = $excludeoff; - $excludeoff = ''; + $excludeoff = ''; } $r->print('

'.$lt{'visi'}.'

'. - '

'. $lt{'exclude'}. - '    

'); + '    

'); 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.").'

'); + $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").':

    '. + $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.').'
      • '. '
    • '.&mt('The course has been categorized using at least one of the course categories defined for the domain.').'
    '); } + $r->print('

'); } - my $savebutton; - unless ($readonly) { - $savebutton = '


'; - } - my $shownsave; if (grep(/^categorize$/,@cat_params)) { - my $categheader = '

'.$lt{'categ'}.'

'; + $r->print('

'.$lt{'categ'}.'

'); if (ref($domconf{'coursecategories'}) eq 'HASH') { my $cathash = $domconf{'coursecategories'}{'cats'}; if (ref($cathash) eq 'HASH') { - $r->print($categheader. - '

'.$lt{'assi'}.'

'. + $r->print($lt{'assi'}.'

'. &Apache::loncommon::assign_categories_table($cathash, $currsettings{'categories'},$type,$disabled)); } else { - $r->print($savebutton.$categheader. - '

'.&mt('No categories defined for this domain.')); - $shownsave = 1; + $r->print(&mt('No categories defined for this domain')); } } else { - $r->print($savebutton.$categheader. - '

'.&mt('No categories defined for this domain.')); - $shownsave = 1; + $r->print(&mt('No categories defined for this domain')); } - if ($type eq 'Community') { - $r->print('

'); - } elsif ($shownsave) { - $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.').'

'); - } else { - $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).').'

'); + 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).').'

'); } } - unless ($readonly || $shownsave) { - $r->print($savebutton); + unless ($readonly) { + $r->print('

'); } } else { $r->print(''); @@ -1048,13 +890,11 @@ sub print_catsettings { } else { $r->print(&mt('Catalog settings in this domain are set in course context via "Course Configuration".')); } - $r->print(''."\n"); + $r->print('

'."\n". + ''. + $lt{'back'}.''); } $r->print(&hidden_form_elements().'
'."\n"); - my @actions = - (''. - $lt{'back'}.''); - $r->print('
'.&Apache::lonhtmlcommon::actionbox(\@actions)); return; } @@ -1071,18 +911,18 @@ sub print_course_modification_page { 'gobt' => "Save", 'sett' => 'Setting', 'domd' => 'Domain default', - 'whom' => 'Who configures', + 'whom' => 'Who configures', ); my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname,$disabled); my %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'; @@ -1105,11 +945,11 @@ sub print_course_modification_page { $cc_status{$uname.':'.$udom} = $lt{'actv'}; } } - if (($enrollvar{'courseowner'} ne '') && + if (($enrollvar{'courseowner'} ne '') && (!grep(/^$enrollvar{'courseowner'}$/,@local_ccs))) { push(@local_ccs,$enrollvar{'courseowner'}); my ($owneruname,$ownerdom) = split(/:/,$enrollvar{'courseowner'}); - $pname{$enrollvar{'courseowner'}} = + $pname{$enrollvar{'courseowner'}} = &Apache::loncommon::plainname($owneruname,$ownerdom); my $active_cc = &Apache::loncommon::check_user_status($ownerdom,$owneruname, $cdom,$cnum,$ccrole); @@ -1139,7 +979,7 @@ sub print_course_modification_page { } else { $ownertable .= ''."\n"; } - $ownertable .= + $ownertable .= ''.$pname{$cc}.''."\n". ''.$cc.''."\n". ''.$cc_status{$cc}.' '.$ccname.''."\n". @@ -1149,30 +989,25 @@ sub print_course_modification_page { } &print_header($r,$crstype,$javascript_validations); my $dctitle = &Apache::lonnet::plaintext('dc'); + my $mainheader = &modifiable_only_title($crstype); my $hidden_elements = &hidden_form_elements(); - my $showtype; - if (($type eq 'official') || ($type eq 'unofficial') || ($type eq 'textbook')) { - $showtype = ' ('.&mt($type).')'; - } - $r->print('

'.&modifiable_only_title($crstype).'

'."\n". - '

'.&mt($crstype).': '.$cdesc.$showtype.'


'."\n". - '
'."\n". + $r->print(''."\n". + '

'.$mainheader.' '.$cdesc.'

'. &Apache::lonhtmlcommon::start_pick_box()); 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 (($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()); } @@ -1182,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". - ''."\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(); @@ -1206,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". @@ -1216,7 +1039,7 @@ sub print_course_modification_page { ''.$lt{'whom'}.''. &Apache::loncommon::end_data_table_header_row()."\n"); my %optionname; - $optionname{''} = &mt('Use domain default'); + $optionname{''} = &mt('Use domain default'); $optionname{'0'} = $dctitle; $optionname{'1'} = $cctitle; foreach my $item (@{$selfenrollrows}) { @@ -1231,12 +1054,12 @@ sub print_course_modification_page { $checked{'1'} = ' checked="checked"'; } else { $checked{''} = ' checked="checked"'; - } + } $r->print(&Apache::loncommon::start_data_table_row()."\n". ''.$selfenrolltitles->{$item}.''."\n". ''.&mt('[_1] configures',$default).''."\n". ''); - foreach my $option ('','0','1') { + foreach my $option ('','0','1') { $r->print('

'.$hidden_elements); unless ($readonly) { $r->print('print(' value="'.$lt{'gobt'}.'" />'); } - $r->print('

'); - my @actions = - (''. - &mt('Pick another action').''); - $r->print('

'.&Apache::lonhtmlcommon::actionbox(\@actions)); + $r->print('

'); return; } @@ -1277,257 +1096,14 @@ sub print_selfenrollconfig { my $cdom = $coursehash->{'domain'}; my %currsettings = &get_selfenroll_settings($coursehash); &print_header($r,$type); - $r->print('

'.&mt('Self-enrollment with a student role').'

'."\n". - '

'.&mt($type).': '.$cdesc.'

'."\n"); + $r->print('

'.&mt('Self-enrollment with a student role in: [_1]', + ''.$cdesc.'').'

'."\n"); &Apache::loncreateuser::print_selfenroll_menu($r,'domain',$env{'form.pickedcourse'}, $cdom,$cnum,\%currsettings, &hidden_form_elements(),$readonly); - my @actions = - (''. - &mt('Pick another action').''); - $r->print('

'.&Apache::lonhtmlcommon::actionbox(\@actions)); - return; -} - -sub print_default_overrides { - my ($r,$cdom,$cnum,$cdesc,$type,$readonly,$item) = @_; - my (%titles,$checkeddom,$checkedcrs,$divsty,$currcrsval,$crsdefault,%crschecked, - $helpfile,$title,$crselements,@currcrseditors); - %titles = &default_overrides_titles($type); - my ($title,$domdefdisplay,$settings,$optiontext,$options) = - &default_overrides_common($item,$cdom,$cnum,$type,\%titles); - $checkeddom = ' checked="checked"'; - $divsty = 'display:none'; - - if ($item eq 'ltiauth') { - $helpfile = 'Modify_Course_LTI_Authen'; - $crsdefault = 0; - } else { - if ($item eq 'exttool') { - $helpfile = 'Modify_Course_External_Tool'; - $crsdefault = 'both'; - } elsif ($item eq 'crsauthor') { - $helpfile = 'Modify_Course_Crsauthor'; - $crsdefault = 1; - } elsif ($item eq 'crseditors') { - $helpfile = 'Modify_Course_Resource_Editors'; - $crsdefault = 'edit,xml'; - } - } - $currcrsval = $settings->{'internal.'.$item}; - if ($currcrsval ne '') { - $checkedcrs = $checkeddom; - $checkeddom = ''; - $divsty = 'display:inline-block'; - if ($item eq 'crseditors') { - @currcrseditors = split(/,/,$currcrsval); - } - foreach my $option (@{$options}) { - if ($item eq 'crseditors') { - if (grep(/^\Q$option\E$/,@currcrseditors)) { - $crschecked{$option} = ' checked="checked"'; - } - } elsif ($currcrsval eq $option) { - $crschecked{$option} = ' checked="checked"'; - } else { - $crschecked{$option} = ''; - } - } - } else { - if ($item eq 'crseditors') { - my %domdefs = &Apache::lonnet::get_domain_defaults($cdom); - @currcrseditors = split(/,/,$domdefs{'crseditors'}); - } - foreach my $option (@{$options}) { - if ($item eq 'crseditors') { - if (grep(/^\Q$option\E$/,@currcrseditors)) { - $crschecked{$option} = ' checked="checked"'; - } - } elsif ($crsdefault eq $option) { - $crschecked{$option} = ' checked="checked"'; - } else { - $crschecked{$option} = ''; - } - } - } - my ($disabled,$submit,$inputtype,$separator); - if ($readonly) { - $disabled = ' disabled="disabled"'; - } else { - $submit = ''; - } - if ($item eq 'crseditors') { - $inputtype = 'checkbox'; - $separator = ' 'x2; - } else { - $inputtype = 'radio'; - $separator = '
'; - } - foreach my $option (@{$options}) { - $crselements .= ''. - ''. - ''.$separator."\n"; - } - &print_header($r,$type); - my $hidden_elements = &hidden_form_elements(); - my $helpitem = &Apache::loncommon::help_open_topic($helpfile); - my $showtype = &mt($type); - $r->print(<$helpitem $title -

$showtype: $cdesc

-
-

$titles{'curd'}: $domdefdisplay

-

-
- -

-
-$titles{'valu'} -$crselements -

-$submit -$hidden_elements -

-
-ENDDOCUMENT - my @actions = - (''. - $titles{'back'}.''); - $r->print('
'.&Apache::lonhtmlcommon::actionbox(\@actions)); return; } -sub default_overrides_titles { - my ($type) = @_; - my %titles = &Apache::lonlocal::texthash( - 'requ' => 'Requirement for re-authentication for student LTI-limited launch of deep-linked item', - 'link' => 'Link protection can be set to accept username for an enrolled student (if sent by Consumer)', - 'logi' => 'Login needed, regardless of user information sent by LTI Consumer in (signed) parameters', - 'extt' => 'External Tool permissions', - 'none' => 'Use of external tools not permitted', - 'crs' => 'Only external tools defined in course may be used', - 'dom' => 'Only external tools defined in domain may be used', - 'both' => 'External tools defined/configured in either domain or course may be used', - 'stan' => "'In-course' authoring of standard LON-CAPA problems", - 'perc' => 'Permitted course resource editors', - 'edit' => 'Standard editor (Edit)', - 'xml' => 'Text editor (EditXML)', - 'daxe' => 'Daxe editor (Daxe)', - 'on' => 'In-course authoring available', - 'off' => 'In-course authoring unavailable', - 'used' => 'Use domain default', - 'cour' => 'Use course-specific setting', - 'curd' => 'Current domain default is', - 'valu' => 'Value for this course', - 'modi' => 'Save', - 'back' => 'Pick another action', - ); - if ($type eq 'Community') { - $titles{'crs'} = &mt('Only external tools defined in community may be used'); - $titles{'both'} = &mt('External tools defined/configured in either domain or community may be used'); - $titles{'cour'} = &mt('Use community-specific setting'); - $titles{'valu'} = &mt('Value for this community'); - } - return %titles; -} - -sub default_overrides_common { - my ($item,$cdom,$cnum,$type,$titles) = @_; - my ($title,$domdef,$domdefdom,$domdefdisplay,%settings,%optiontext,@options); - if ($item eq 'ltiauth') { - %settings = &Apache::lonnet::get('environment',['internal.'.$item],$cdom,$cnum); - $title = $titles->{'requ'}; - $domdef = 0; - @options = ('0','1'); - %optiontext = ( - 0 => $titles->{'logi'}, - 1 => $titles->{'link'}, - ); - } else { - %settings = - &Apache::lonnet::get('environment',['internal.'.$item,'internal.coursecode', - 'internal.textbook'],$cdom,$cnum); - if ($item eq 'exttool') { - $title = $titles->{'extt'}; - $domdefdom = 1; - $domdef = 0; - @options = ('both','dom','crs','none'); - map { $optiontext{$_} = $titles->{$_}; } @options; - } elsif ($item eq 'crsauthor') { - $title = $titles->{'stan'}; - $domdef = 1; - @options = ('1','0'); - %optiontext = ( - 1 => $titles->{'on'}, - 0 => $titles->{'off'}, - ); - } elsif ($item eq 'crseditors') { - $title = $titles->{'perc'}; - $domdef = 1; - @options = ('edit','xml','daxe'); - map { $optiontext{$_} = $titles->{$_}; } @options; - } - } - my %domconfig = - &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom); - if (ref($domconfig{'coursedefaults'}) eq 'HASH') { - if (($item eq 'ltiauth') || ($item eq 'crseditors')) { - $domdef = $domconfig{'coursedefaults'}{$item}; - } else { - my $lctype = &get_lctype($type,\%settings); - if (ref($domconfig{'coursedefaults'}{$item}) eq 'HASH') { - if (exists($domconfig{'coursedefaults'}{$item}{$lctype})) { - $domdef = $domconfig{'coursedefaults'}{$item}{$lctype}; - } - } - if ($item eq 'exttool') { - if (ref($domconfig{'coursedefaults'}{'domexttool'}) eq 'HASH') { - if (exists($domconfig{'coursedefaults'}{'domexttool'}{$lctype})) { - $domdefdom = $domconfig{'coursedefaults'}{'domexttool'}{$lctype}; - } - } - } - } - } - if ($item eq 'ltiauth') { - if ($domdef) { - $domdefdisplay = $titles->{'link'}; - } else { - $domdefdisplay = $titles->{'logi'}; - } - } elsif ($item eq 'exttool') { - if ($domdef && $domdefdom) { - $domdefdisplay = $titles->{'both'}; - } elsif ($domdef) { - $domdefdisplay = $titles->{'crs'}; - } elsif ($domdefdom) { - $domdefdisplay = $titles->{'dom'}; - } else { - $domdefdisplay = $titles->{'none'}; - } - } elsif ($item eq 'crsauthor') { - if ($domdef) { - $domdefdisplay = $titles->{'on'}; - } else { - $domdefdisplay = $titles->{'off'}; - } - } elsif ($item eq 'crseditors') { - if (ref($domdef) eq 'ARRAY') { - if (@{$domdef} == 0) { - $domdefdisplay = &mt('No permitted editors'); - } elsif (@{$domdef} == 1) { - $domdefdisplay = $titles->{$domdef->[0]}.' ('.&mt('only').')'; - } else { - $domdefdisplay = join(', ', map { $titles->{$_}; } @{$domdef}); - } - } else { - $domdefdisplay = join(', ', map { $titles->{$_}; } ('edit','xml')); - } - } - return ($title,$domdefdisplay,\%settings,\%optiontext,\@options); -} - sub modify_selfenrollconfig { my ($r,$type,$cdesc,$coursehash) = @_; return unless(ref($coursehash) eq 'HASH'); @@ -1535,17 +1111,13 @@ sub modify_selfenrollconfig { my $cdom = $coursehash->{'domain'}; my %currsettings = &get_selfenroll_settings($coursehash); &print_header($r,$type); - $r->print('

'.&mt('Self-enrollment with a student role').'

'. - '

'.&mt($type).': '.$cdesc.'

'."\n". - '
'."\n". + $r->print('

'.&mt('Self-enrollment with a student role in: [_1]', + ''.$cdesc.'').'

'."\n"); + $r->print(''."\n". &hidden_form_elements().'
'); &Apache::loncreateuser::update_selfenroll_config($r,$env{'form.pickedcourse'}, $cdom,$cnum,'domain',$type,\%currsettings); $r->print('
'); - my @actions = - (''. - &mt('Pick another action').''); - $r->print('

'.&Apache::lonhtmlcommon::actionbox(\@actions)); return; } @@ -1577,9 +1149,9 @@ sub modifiable_only_title { my ($type) = @_; my $dctitle = &Apache::lonnet::plaintext('dc'); if ($type eq 'Community') { - return &mt('Community settings modifiable only by [_1]',$dctitle); + return &mt('Community settings modifiable only by [_1] for:',$dctitle); } else { - return &mt('Course settings modifiable only by [_1]',$dctitle); + return &mt('Course settings modifiable only by [_1] for:',$dctitle); } } @@ -1595,14 +1167,12 @@ sub gather_authenitems { $curr_authtype = 'int'; } elsif ($enrollvar->{'authtype'} eq 'localauth' ) { $curr_authtype = 'loc'; - } elsif ($enrollvar->{'authtype'} eq 'lti' ) { - $curr_authtype = 'lti'; } } unless ($curr_authtype eq '') { $curr_authfield = $curr_authtype.'arg'; } - my $javascript_validations = + my $javascript_validations = &Apache::lonuserutils::javascript_validations('modifycourse',$krbdefdom, $curr_authtype,$curr_authfield); my %param = ( formname => 'document.'.$env{'form.phase'}, @@ -1617,8 +1187,7 @@ sub gather_authenitems { $authform{'krb'} = &Apache::loncommon::authform_kerberos(%param); $authform{'int'} = &Apache::loncommon::authform_internal(%param); $authform{'loc'} = &Apache::loncommon::authform_local(%param); - $authform{'lti'} = &Apache::loncommon::authform_lti(%param); - foreach my $item ('krb','int','loc','lti') { + foreach my $item ('krb','int','loc') { if ($authform{$item} ne '') { $authenitems .= $authform{$item}.'
'; } @@ -1633,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)) { + if (&showcredits($cdom)) { push(@items,'internal.defaultcredits'); } - my %passwdconf = &Apache::lonnet::get_passwdconf($cdom); - if ($passwdconf{'crsownerchg'}) { - push(@items,'internal.nopasswdchg'); - } } my %settings = &Apache::lonnet::get('environment',\@items,$cdom,$cnum); my $description = $settings{'description'}; @@ -1658,7 +1223,6 @@ sub modify_course { } else { %changed = ( code => 0, owner => 0, - passwd => 0, ); $ccrole = 'cc'; unless ($settings{'internal.sectionnums'} eq '') { @@ -1689,8 +1253,6 @@ sub modify_course { if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) { $newattr{'autharg'} = $env{'form.locarg'}; } - } elsif ($env{'form.login'} eq 'lti') { - $newattr{'authtype'} = 'lti'; } if ( $newattr{'authtype'}=~ /^krb/) { if ($newattr{'autharg'} eq '') { @@ -1713,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; } } @@ -1759,10 +1309,10 @@ sub modify_course { $newattr{'courseowner'}=$env{'form.courseowner'}; unless ( $newattr{'courseowner'} eq $currattr{'courseowner'} ) { $changed{'owner'} = 1; - } + } } - if ($changed{'owner'} || $changed{'code'} || $changed{'passwd'}) { + if ($changed{'owner'} || $changed{'code'}) { my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum, undef,undef,'.'); if (ref($crsinfo{$env{'form.pickedcourse'}}) eq 'HASH') { @@ -1772,29 +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; - } - } - } } } } @@ -1826,7 +1357,7 @@ sub modify_course { } else { if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') { my %newenv; - map { $newenv{'course.'.$cdom.'_'.$cnum.'.internal.'.$_} = $newattr{$_}; } @changes; + map { $newenv{'course.'.$cdom.'_'.$cnum.'.internal.'.$_} = $newattr{$_}; } @changes; &Apache::lonnet::appenv(\%newenv); } foreach my $attr (@modifiable_params) { @@ -1840,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 { @@ -1858,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.')); @@ -1885,6 +1404,7 @@ sub modify_course { if ($course_check eq 'ok') { my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'},$coowners); unless ($outcome eq 'ok') { + push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome).'
    '); } } else { @@ -1948,7 +1468,7 @@ sub modify_course { $nochgresponse .= "

    "; } my ($warning,$numwarnings); - my $numwarnings = scalar(@warnings); + my $numwarnings = scalar(@warnings); if ($numwarnings) { $warning = &mt('The following [quant,_1,warning was,warnings were] generated when applying your changes to automated enrollment:',$numwarnings).'

      '; foreach my $warn (@warnings) { @@ -1962,8 +1482,8 @@ sub modify_course { $reply = $chgresponse.$nochgresponse.$warning; } &print_header($r,$type); - $reply = '

      '.&modifiable_only_title($type).'

      '."\n". - '

      '.&mt($type).': '.$cdesc.'

      '."\n". + my $mainheader = &modifiable_only_title($type); + $reply = '

      '.$mainheader.' '.$cdesc.'

      '."\n". '

      '.$reply.'

      '."\n". '
      '. &hidden_form_elements(); @@ -1978,8 +1498,7 @@ sub modify_course { push(@actions, ''. &mt('Go to Automated Enrollment Manager for course').''); } - $reply .= '
      '. - '
      '.&Apache::lonhtmlcommon::actionbox(\@actions); + $reply .= &Apache::lonhtmlcommon::actionbox(\@actions).''; $r->print($reply); return; } @@ -2148,9 +1667,10 @@ sub modify_quota { my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_; &print_header($r,$type); my $lctype = lc($type); - $r->print('

      '.&mt("Disk space quotas for $lctype")."

      \n". - '

      '.&mt($type).' :'.$cdesc.'

      '."\n". - '
      '."\n"); + my $headline = &mt("Disk space quotas for $lctype: [_1]", + ''.$cdesc.''); + $r->print(''."\n". + '

      '.$headline.'

      '); my %oldsettings = &Apache::lonnet::get('environment',['internal.coursequota','internal.uploadquota'],$cdom,$cnum); my %staticdefaults = ( coursequota => 20, @@ -2180,7 +1700,7 @@ sub modify_quota { $showresult{$item} = 1; } } else { - if ($item eq 'coursequota') { + if ($item eq 'coursequota') { $r->print(&mt('The proposed group portfolio quota contained invalid characters, so the quota is unchanged.').'
      '); } else { $r->print(&mt('The proposed quota for content uploaded via the Content Editor contained invalid characters, so the quota is unchanged.').'
      '); @@ -2193,7 +1713,7 @@ sub modify_quota { my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom, $cnum); foreach my $key (sort(keys(%showresult))) { - if (($oldsettings{'internal.'.$key} eq '') && + if (($oldsettings{'internal.'.$key} eq '') && ($env{'form.'.$key} == $default{$key})) { if ($key eq 'uploadquota') { if ($type eq 'Community') { @@ -2203,7 +1723,7 @@ sub modify_quota { $r->print(&mt('The disk space allocated for files uploaded to this course via the Content Editor is the default quota for this domain: [_1] MB.', $default{$key}).'
      '); } - } else { + } else { if ($type eq 'Community') { $r->print(&mt('The disk space allocated for group portfolio files in this community is the default quota for this domain: [_1] MB.', $default{$key}).'
      '); @@ -2246,24 +1766,23 @@ sub modify_quota { $putreply); } } + $r->print('

      '. + ''. + &mt('Pick another action').''); $r->print(&hidden_form_elements().'

      '); - my @actions = - (''. - &mt('Pick another action').''); - $r->print('
      '.&Apache::lonhtmlcommon::actionbox(\@actions)); return; } sub modify_anonsurvey_threshold { my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_; &print_header($r,$type); - $r->print('

      '.&mt('Responder threshold required for display of anonymous survey submissions').'

      '."\n". - '

      '.&mt($type).': '.$cdesc.'

      '."\n". - '
      '."\n"); + $r->print(''."\n". + '

      '.&mt('Responder threshold required for display of anonymous survey submissions:'). + ' '.$cdesc.'


      '); my %oldsettings = &Apache::lonnet::get('environment',['internal.anonsurvey_threshold'],$cdom,$cnum); my %domconfig = &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom); - my $defaultthreshold; + my $defaultthreshold; if (ref($domconfig{'coursedefaults'}) eq 'HASH') { $defaultthreshold = $domconfig{'coursedefaults'}{'anonsurvey_threshold'}; if ($defaultthreshold eq '') { @@ -2309,11 +1828,10 @@ sub modify_anonsurvey_threshold { $r->print(&mt('The proposed responder threshold for display of anonymous submissions contained invalid characters, so the threshold is unchanged.')); } } + $r->print('

      '. + ''. + &mt('Pick another action').'

      '); $r->print(&hidden_form_elements().'
      '); - my @actions = - (''. - &mt('Pick another action').''); - $r->print('
      '.&Apache::lonhtmlcommon::actionbox(\@actions)); return; } @@ -2325,19 +1843,18 @@ sub modify_postsubmit_config { unch => 'Post submission behavior of the Submit button is unchanged.', erro => 'An error occurred when saving your proposed changes.', inva => 'An invalid response was recorded.', - back => 'Pick another action', + pick => 'Pick another action', ); - $r->print('

      '.$lt{'subb'}.'

      '."\n". - '

      '.&mt($type).': '.$cdesc.'

      '."\n". - '

      '."\n"); - my %oldsettings = + $r->print(''."\n". + '

      '.$lt{'subb'}.' ('.$cdesc.')


      '); + my %oldsettings = &Apache::lonnet::get('environment',['internal.postsubmit','internal.postsubtimeout','internal.coursecode','internal.textbook'],$cdom,$cnum); my $postsubmit = $env{'form.postsubmit'}; if ($postsubmit eq '1') { my $postsubtimeout = $env{'form.postsubtimeout'}; $postsubtimeout =~ s/[^\d\.]+//g; if (($oldsettings{'internal.postsubmit'} eq $postsubmit) && ($oldsettings{'internal.postsubtimeout'} eq $postsubtimeout)) { - $r->print($lt{'unch'}); + $r->print($lt{'unch'}); } else { my %cenv = ( 'internal.postsubmit' => $postsubmit, @@ -2353,12 +1870,12 @@ sub modify_postsubmit_config { } else { $r->print($lt{'erro'}); } - } else { + } else { $cenv{'internal.postsubtimeout'} = $postsubtimeout; my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum); if ($putreply eq 'ok') { if ($postsubtimeout eq '0') { - $r->print(&mt('Submit button will be disabled after student submission until page is reloaded.')); + $r->print(&mt('Submit button will be disabled after student submission until page is reloaded.')); } else { $r->print(&mt('Submit button will be disabled after student submission for [quant,_1,second].',$postsubtimeout)); } @@ -2372,7 +1889,7 @@ sub modify_postsubmit_config { $r->print($lt{'unch'}); } else { if (exists($oldsettings{'internal.postsubtimeout'})) { - &Apache::lonnet::del('environment',['internal.postsubtimeout'],$cdom,$cnum); + &Apache::lonnet::del('environment',['internal.postsubtimeout'],$cdom,$cnum); } my %cenv = ( 'internal.postsubmit' => $postsubmit, @@ -2387,11 +1904,10 @@ sub modify_postsubmit_config { } else { $r->print($lt{'inva'}.' '.$lt{'unch'}); } - $r->print('

      '.&hidden_form_elements().'
      '); - my @actions = - (''. - $lt{'back'}.''); - $r->print('
      '.&Apache::lonhtmlcommon::actionbox(\@actions)); + $r->print('

      '. + ''. + &mt('Pick another action').'

      '); + $r->print(&hidden_form_elements().''); return; } @@ -2408,16 +1924,16 @@ sub modify_catsettings { $desc{'categories'} = &mt('Assigned categories for this course'); $ccrole = 'cc'; } - $r->print('

      '.&mt('Category settings').'

      '."\n". - '

      '.&mt($type).': '.$cdesc.'

      '."\n". - '

      '."\n"); + $r->print(' + +

      '.&mt('Category settings').'

      '); my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); my @cat_params = &catalog_settable($domconf{'coursecategories'},$type); if (@cat_params > 0) { my (%cenv,@changes,@nochanges); my %currsettings = &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum); - my (@newcategories,%showitem); + my (@newcategories,%showitem); if (grep(/^togglecats$/,@cat_params)) { if ($currsettings{'hidefromcat'} ne $env{'form.hidefromcat'}) { push(@changes,'hidefromcat'); @@ -2463,9 +1979,9 @@ sub modify_catsettings { foreach my $cat (@newcategories) { if (!grep(/^\Q$cat\E$/,@currcategories)) { $catchg = 1; - last; - } - } + last; + } + } } } else { if (@newcategories > 0) { @@ -2525,134 +2041,10 @@ sub modify_catsettings { $r->print(&mt('Category settings for courses in this domain should be modified in course context (via "[_1]Course Configuration[_2]").','','').'
      '); } } - $r->print('
      '.&hidden_form_elements().'
      '); - my @actions = - (''. - &mt('Pick another action').''); - $r->print('
      '.&Apache::lonhtmlcommon::actionbox(\@actions)); - return; -} - -sub modify_default_overrides { - my ($r,$cdom,$cnum,$cdesc,$domdesc,$type,$item) = @_; - my (%titles,$oldcrsval,$newcrsval,%resulttext,$itemvalue,$nochange,$change,$status,$error); - %titles = &default_overrides_titles($type); - my ($title,$domdefdisplay,$oldsettings,$optiontext,$options) = - &default_overrides_common($item,$cdom,$cnum,$type,\%titles); - $oldcrsval = $oldsettings->{'internal.'.$item}; - if ($item eq 'ltiauth') { - %resulttext = - &Apache::lonlocal::texthash( - chg => 'Re-authentication requirement for LTI launch of deep-linked changed', - nochg => 'Re-authentication requirement for LTI launch of deep-linked item is unchanged', - ); - } elsif ($item eq 'exttool') { - %resulttext = - &Apache::lonlocal::texthash( - chg => 'External Tool permissions changed', - nochg => 'External Tool permissions unchanged', - ); - } elsif ($item eq 'crsauthor') { - %resulttext = - &Apache::lonlocal::texthash( - chg => 'In-course authoring permissions changed', - nochg => 'In-course authoring permissions unchanged', - ); - } elsif ($item eq 'crseditors') { - %resulttext = - &Apache::lonlocal::texthash( - chg => 'Permitted course resource editors changed', - nochg => 'Permitted course resource editors unchanged', - ); - } - &print_header($r,$type); - $r->print('

      '.$title.'

      '."\n". - '

      '.&mt($type).': '.$cdesc.'

      '."\n". - '
      '."\n"); - if ($env{'form.'.$item.'set'} eq 'dom') { - if ($oldcrsval eq '') { - $nochange = 1; - } else { - $change = 1; - } - } elsif ($env{'form.'.$item.'set'} eq 'course') { - if ($item eq 'crseditors') { - my @neweditors; - my @posseditors = &Apache::loncommon::get_env_multiple('form.'.$item); - foreach my $editor (@posseditors) { - if (grep(/^\Q$editor\E$/,@{$options})) { - push(@neweditors,$editor); - } - } - $newcrsval = join(',',@neweditors); - } else { - my $posscrsval = $env{'form.'.$item}; - if (grep(/^\Q$posscrsval\E$/,@{$options})) { - $newcrsval = $posscrsval; - } - } - if ($oldcrsval eq $newcrsval) { - $nochange = 1; - } else { - $change = 1; - } - } - if ($change) { - if ($newcrsval ne '') { - my %cenv = ( - 'internal.'.$item => $newcrsval, - ); - if (&Apache::lonnet::put('environment',\%cenv,$cdom,$cnum) eq 'ok') { - if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') { - &Apache::lonnet::appenv( - {'course.'.$cdom.'_'.$cnum.'.internal.'.$item => $newcrsval}); - } - } else { - $error = 1; - } - } else { - if (&Apache::lonnet::del('environment',['internal.'.$item],$cdom,$cnum) eq 'ok') { - if (exists($env{'course.'.$cdom.'_'.$cnum.'.internal.'.$item})) { - &Apache::lonnet::delenv('course.'.$cdom.'_'.$cnum.'.internal.'.$item); - } - } else { - $error = 1; - } - } - } - if ($error) { - $nochange = 1; - } - if ($nochange) { - $itemvalue = $oldcrsval; - } else { - $itemvalue = $newcrsval; - } - if ($itemvalue eq '') { - $status = $titles{'used'}.': '. - ''.$domdefdisplay.''; - } elsif ($item eq 'crseditors') { - $status = $titles{'cour'}.': '. - ''.join(', ', map { $titles{$_}; } split(/,/,$itemvalue)).''; - } else { - $status = $titles{'cour'}.': '. - ''.$optiontext->{$itemvalue}.''; - } - if ($error) { - $r->print('

      '.&mt('An error occurred when saving your changes').'

      '); - } - $r->print('

      '); - if ($nochange) { - $r->print($resulttext{'nochg'}); - } elsif ($change) { - $r->print($resulttext{'chg'}); - } - $r->print('
      '.$status.'

      '. - &hidden_form_elements().'
      '); - my @actions = - (''. - $titles{'back'}.''); - $r->print('
      '.&Apache::lonhtmlcommon::actionbox(\@actions)); + $r->print('
      '."\n". + ''. + &mt('Pick another action').''); + $r->print(&hidden_form_elements().''); return; } @@ -2676,7 +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'; @@ -2684,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'); @@ -2694,10 +2092,9 @@ ENDJS $js .= <<"ENDSCRIPT"; function verify_quota() { - var newcoursequota = document.setquota.coursequota.value; - var newuploadquota = document.setquota.uploadquota.value; + var newquota = document.setquota.coursequota.value; var num_reg = $regexp; - if ((num_reg.test(newcoursequota)) && (num_reg.test(newuploadquota))) { + if (num_reg.test(newquota)) { changePage(document.setquota,'processquota'); } else { alert("$invalid\\n$alert"); @@ -2742,7 +2139,7 @@ ENDSCRIPT &js_escape(\$alert); my $regexp = ' /^\s*\d+\s*$/'; - $js .= <<"ENDSCRIPT"; + $js .= <<"ENDSCRIPT"; function verify_postsubmit() { var optionsElement = document.setpostsubmit.postsubmit; @@ -2774,7 +2171,7 @@ function verify_postsubmit() { } } else { if (currval == 0) { - verified = 'ok'; + verified = 'ok'; } else { alert('$invalid'); return false; @@ -2792,7 +2189,7 @@ function togglePostsubmit(caller) { var optionsElement = document.setpostsubmit.postsubmit; if (document.getElementById(caller)) { var divitem = document.getElementById(caller); - var optionsElement = document.setpostsubmit.postsubmit; + var optionsElement = document.setpostsubmit.postsubmit; if (optionsElement.length) { var currval; for (var i=0; i {'onload' => "hide_searching(); courseSet(document.filterpicker.official, 'load');"}, }; - } elsif ($env{'form.phase'} =~ /^set(ltiauth|exttool|crseditors)$/) { - $starthash = { - add_entries => {'onload' => "toggleOptions(document.$env{'form.phase'},'$env{'form.phase'}');"}, - }; } $r->print(&Apache::loncommon::start_page('View/Modify Course/Community Settings', &Apache::lonhtmlcommon::scripttag($js), @@ -2876,18 +2226,12 @@ ENDJS my $bread_text = "View/Modify Courses/Communities"; if ($type eq 'Community') { $bread_text = 'Community Settings'; + } elsif ($type eq 'Placement') { + $bread_text = 'Placement Test Settings'; } else { $bread_text = 'Course Settings'; } - my $helpcomponent; - if ($env{'form.phase'} eq 'menu') { - if ($type eq 'Community') { - $helpcomponent = 'Domain_Modify_Community'; - } else { - $helpcomponent = 'Domain_Modify_Course'; - } - } - $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text,$helpcomponent)); + $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text)); return; } @@ -2961,22 +2305,19 @@ 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; } sub hidden_form_elements { - my $hidden_elements = + my $hidden_elements = &Apache::lonhtmlcommon::echo_form_input(['gosearch','updater','coursecode', 'prevphase','numlocalcc','courseowner','login','coursequota','intarg', 'locarg','krbarg','krbver','counter','hidefromcat','usecategory', 'threshold','postsubmit','postsubtimeout','defaultcredits','uploadquota', 'selfenrollmgrdc','selfenrollmgrcc','action','state','currsec_st', - 'sections','newsec','mysqltables','nopasswdchg','ltiauth','ltiauthset', - 'exttoolset','exttool','crseditorsset','crseditors'], - ['^selfenrollmgr_','^selfenroll_'])."\n". + 'sections','newsec','mysqltables'],['^selfenrollmgr_','^selfenroll_'])."\n". ''; return $hidden_elements; } @@ -2992,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 = ( @@ -3008,17 +2348,7 @@ sub get_permission { catsettings => 'edit', processcat => 'edit', selfenroll => 'edit', - adhocrole => 'coord', - setltiauth => 'edit', - processltiauth => 'edit', - setexttool => 'edit', - processexttool => 'edit', - setcrseditors => 'edit', - processcrseditors => 'edit', ); - if ($passwdconf{'crsownerchg'}) { - $permission{passwdchg} = 'edit'; - } } elsif (&Apache::lonnet::allowed('rar',$dom)) { $allowed = 1; %permission = ( @@ -3029,34 +2359,11 @@ sub get_permission { setparms => 'view', catsettings => 'view', selfenroll => 'view', - adhocrole => 'custom', - setltiauth => 'view', - setexttool => 'view', - setcrseditors => 'view', ); - if ($passwdconf{'crsownerchg'}) { - $permission{passwdchg} = 'view'; - } } return ($allowed,\%permission); } -sub devalidate_remote_instcats { - if ($modified_dom ne '') { - my %servers = &Apache::lonnet::internet_dom_servers($modified_dom); - my %thismachine; - map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); - if (keys(%servers)) { - foreach my $server (keys(%servers)) { - next if ($thismachine{$server}); - &Apache::lonnet::remote_devalidate_cache($server,['instcats:'.$modified_dom]); - } - } - $modified_dom = ''; - } - return; -} - sub handler { my $r = shift; if ($r->header_only) { @@ -3065,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); @@ -3098,22 +2402,26 @@ sub handler { } if ($type eq 'Community') { $choose_text = "Choose a community"; + } elsif ($type eq 'Placement') { + $choose_text = "Choose a placement test"; } else { $choose_text = "Choose a course"; - } + } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$firstform,'')", text=>"Course/Community search"}, {href=>"javascript:changePage(document.$phase,'courselist')", text=>$choose_text}); if ($phase eq 'courselist') { - &print_course_selection_page($r,$dom,$domdesc,$permission); + &print_course_selection_page($r,$dom,$domdesc); } else { my ($checked,$cdesc,$coursehash) = &check_course($dom,$domdesc); if ($checked eq 'ok') { my $enter_text; if ($type eq 'Community') { $enter_text = 'Enter community'; + } elsif ($type eq 'Placement') { + $enter_text = 'Enter placement test'; } else { $enter_text = 'Enter course'; } @@ -3128,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')", @@ -3136,19 +2444,19 @@ 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'})) { + } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'setquota')", text=>"Set quota"}); @@ -3177,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 @@ -3197,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 @@ -3227,53 +2535,19 @@ sub handler { if (!exists($env{'form.state'})) { &print_selfenrollconfig($r,$type,$cdesc,$coursehash,$readonly); } elsif ($env{'form.state'} eq 'done') { - &Apache::lonhtmlcommon::add_breadcrumb + &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Result"}); &modify_selfenrollconfig($r,$type,$cdesc,$coursehash); } - } elsif (($phase eq 'setltiauth') && ($permission->{'setltiauth'})) { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:changePage(document.$phase,'$phase')", - text=>"Authentication post-LTI launch"}); - &print_default_overrides($r,$cdom,$cnum,$cdesc,$type,$readonly,'ltiauth'); - } elsif (($phase eq 'processltiauth') && ($permission->{'processltiauth'})) { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:changePage(document.$phase,'setltiauth')", - text=>"Authentication post-LTI launch"}, - {href=>"javascript:changePage(document.$phase,'$phase')", - text=>"Result"}); - &modify_default_overrides($r,$cdom,$cnum,$cdesc,$domdesc,$type,'ltiauth'); - } elsif (($phase eq 'setexttool') && ($permission->{'setexttool'})) { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:changePage(document.$phase,'$phase')", - text=>"External Tool permission"}); - &print_default_overrides($r,$cdom,$cnum,$cdesc,$type,$readonly,'exttool'); - } elsif (($phase eq 'processexttool') && ($permission->{'processexttool'})) { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:changePage(document.$phase,'setexttool')", - text=>"External Tool permission"}, - {href=>"javascript:changePage(document.$phase,'$phase')", - text=>"Result"}); - &modify_default_overrides($r,$cdom,$cnum,$cdesc,$domdesc,$type,'exttool'); - } elsif (($phase eq 'setcrseditors') && ($permission->{'setcrseditors'})) { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:changePage(document.$phase,'$phase')", - text=>"Available course resource editors"}); - &print_default_overrides($r,$cdom,$cnum,$cdesc,$type,$readonly,'crseditors'); - } elsif (($phase eq 'processcrseditors') && ($permission->{'processcrseditors'})) { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:changePage(document.$phase,'setcrseditors')", - text=>"Available course resource editors"}, - {href=>"javascript:changePage(document.$phase,'$phase')", - text=>"Result"}); - &modify_default_overrides($r,$cdom,$cnum,$cdesc,$domdesc,$type,'crseditors'); } } } else { $r->print(''); if ($type eq 'Community') { $r->print(&mt('The community you selected is not a valid community in this domain')); + } elsif ($type eq 'Placement') { + $r->print(&mt('The course you selected is not a valid placement test in this domain')); } else { $r->print(&mt('The course you selected is not a valid course in this domain')); }