--- loncom/interface/lonmodifycourse.pm 2023/09/05 03:50:51 1.79.2.9.2.5 +++ loncom/interface/lonmodifycourse.pm 2024/12/30 00:34:19 1.79.2.10 @@ -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.5 2023/09/05 03:50:51 raeburn Exp $ +# $Id: lonmodifycourse.pm,v 1.79.2.10 2024/12/30 00:34:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -97,7 +97,7 @@ 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}); } @@ -391,8 +391,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,8 +410,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', ); } else { %linktext = ( @@ -420,18 +417,16 @@ 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') { $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.'); @@ -456,15 +451,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); @@ -546,39 +536,66 @@ 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 => '', - }, ] }, ); - $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:'); + } + $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; } @@ -696,32 +713,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', @@ -736,20 +751,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); @@ -763,8 +773,8 @@ sub print_setquota { $submit = ''; } $r->print(< +

$headline

$porthelpitem $lt{'gpqu'}: MB @@ -777,12 +787,9 @@ $uploadhelpitem $lt{'upqu'}: $hidden_elements +$lt{'back'} ENDDOCUMENT - my @actions = - (''. - $lt{'back'}.''); - $r->print('
'.&Apache::lonhtmlcommon::actionbox(\@actions)); return; } @@ -797,7 +804,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'}; @@ -817,21 +824,17 @@ sub print_set_anonsurvey_threshold { $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; } @@ -852,11 +855,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; } } } @@ -884,37 +887,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{'no'}
$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') { + $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; @@ -930,22 +936,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); @@ -963,9 +953,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) { @@ -973,63 +962,48 @@ 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.")); } 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') { + $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(''); @@ -1038,13 +1012,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; } @@ -1061,7 +1033,7 @@ 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); @@ -1095,11 +1067,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); @@ -1125,11 +1097,11 @@ sub print_course_modification_page { foreach my $cc (@local_ccs) { $ownertable .= &Apache::loncommon::start_data_table_row()."\n"; if ($cc eq $enrollvar{'courseowner'}) { - $ownertable .= ''."\n"; + $ownertable .= ''."\n"; } else { $ownertable .= ''."\n"; } - $ownertable .= + $ownertable .= ''.$pname{$cc}.''."\n". ''.$cc.''."\n". ''.$cc_status{$cc}.' '.$ccname.''."\n". @@ -1139,14 +1111,10 @@ 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( @@ -1159,7 +1127,7 @@ sub print_course_modification_page { ' '.&mt('Course Code'))."\n". ''. &Apache::lonhtmlcommon::row_closure()); - if (($crstype eq 'Course') && (&showcredits($cdom))) { + if (&showcredits($cdom)) { $r->print(&Apache::lonhtmlcommon::row_title( &Apache::loncommon::help_open_topic('Modify_Course_Credithours'). ' '.&mt('Credits (students)'))."\n". @@ -1184,7 +1152,7 @@ sub print_course_modification_page { &Apache::loncommon::help_open_topic('Modify_Course_Chgpasswd'). ' '.&mt('Changing passwords (internal)'))."\n". ''."\n". + &mt('Disable changing password for users with student role by course owner').'

'.$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; } @@ -1267,220 +1231,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_set_ltiauth { - my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; - my %lt = &Apache::lonlocal::texthash( - 'requ' => 'Requirement for re-authentication for student LTI-limited launch of deep-linked item', - 'link' => 'Link protection can be set to accept username for an enrolled student (if sent by Consumer)', - 'logi' => 'Login needed, regardless of user information sent by LTI Consumer in (signed) parameters', - 'used' => 'Use domain default', - 'cour' => 'Use course-specific setting', - 'curd' => 'Current domain default is', - 'valu' => 'Value for this course', - 'modi' => 'Save', - 'back' => 'Pick another action', - ); - my ($domdef,$checkeddom,$checkedcrs,$domdefdisplay,$divsty,$authok,$authno); - $domdef = 0; - $checkeddom = ' checked="checked"'; - $domdefdisplay = $lt{'logi'}; - $divsty = 'display:none'; - $authno = ' checked="checked"'; - my %domconfig = - &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom); - if (ref($domconfig{'coursedefaults'}) eq 'HASH') { - $domdef = $domconfig{'coursedefaults'}{'ltiauth'}; - } - if ($domdef) { - $domdefdisplay = $lt{'link'}; - } - my %settings = &Apache::lonnet::get('environment',['internal.ltiauth'],$cdom,$cnum); - my $ltiauth = $settings{'internal.ltiauth'}; - - if ($ltiauth ne '') { - $checkedcrs = $checkeddom; - $checkeddom = ''; - $divsty = 'display:inline-block'; - if ($ltiauth) { - $authok = ' checked="checked"'; - } - } - &print_header($r,$type); - my $hidden_elements = &hidden_form_elements(); - my ($disabled,$submit); - if ($readonly) { - $disabled = ' disabled="disabled"'; - } else { - $submit = ''; - } - my $helpitem = &Apache::loncommon::help_open_topic('Modify_Course_LTI_Authen'); - my $showtype = &mt($type); - $r->print(<$helpitem $lt{'requ'} -

$showtype: $cdesc

-
-

$lt{'curd'}: $domdefdisplay

-

-
- -

-
-$lt{'valu'} - - -
- - - -

-$submit -$hidden_elements -

-
-ENDDOCUMENT - my @actions = - (''. - $lt{'back'}.''); - $r->print('
'.&Apache::lonhtmlcommon::actionbox(\@actions)); 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 = ''; - } - my $helpitem = &Apache::loncommon::help_open_topic('Modify_Course_External_Tool'); - my $showtype = &mt($type); - $r->print(<$helpitem $titles{'extt'} -

$showtype: $cdesc

-
-

$titles{'curd'}: $domdefdisplay

-

-
- -

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

-$submit -$hidden_elements -

-
-ENDDOCUMENT - my @actions = - (''. - $titles{'back'}.''); - $r->print('
'.&Apache::lonhtmlcommon::actionbox(\@actions)); - 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'); @@ -1488,17 +1246,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; } @@ -1530,9 +1284,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); } } @@ -1548,14 +1302,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'}, @@ -1570,8 +1322,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}.'
'; } @@ -1589,7 +1340,7 @@ sub modify_course { unless ($type eq 'Community') { 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); @@ -1642,8 +1393,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 '') { @@ -1712,7 +1461,7 @@ sub modify_course { $newattr{'courseowner'}=$env{'form.courseowner'}; unless ( $newattr{'courseowner'} eq $currattr{'courseowner'} ) { $changed{'owner'} = 1; - } + } } if ($changed{'owner'} || $changed{'code'} || $changed{'passwd'}) { @@ -1779,7 +1528,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) { @@ -1838,6 +1587,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 { @@ -1901,7 +1651,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) { @@ -1915,8 +1665,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(); @@ -1931,8 +1681,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; } @@ -2101,9 +1850,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, @@ -2133,7 +1883,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.').'
    '); @@ -2146,7 +1896,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') { @@ -2156,7 +1906,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}).'
    '); @@ -2199,24 +1949,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 '') { @@ -2262,11 +2011,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; } @@ -2278,19 +2026,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, @@ -2306,12 +2053,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)); } @@ -2325,7 +2072,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, @@ -2340,11 +2087,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; } @@ -2361,16 +2107,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'); @@ -2416,9 +2162,9 @@ sub modify_catsettings { foreach my $cat (@newcategories) { if (!grep(/^\Q$cat\E$/,@currcategories)) { $catchg = 1; - last; - } - } + last; + } + } } } else { if (@newcategories > 0) { @@ -2478,224 +2224,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_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('

    '.$lt{'requ'}.'

    '."\n". - '

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

    '."\n". - '
    '."\n"); - 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 .= ''.$lt{'link'}.''; - } else { - $status .= ''.$lt{'logi'}.''; - } - } else { - $status = $lt{'cour'}.': '; - if ($ltiauth) { - $status .= ''.$lt{'link'}.''; - } else { - $status .= ''.$lt{'logi'}.''; - } - } - if ($error) { - $r->print('

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

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

    '); - 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('
    '.$status.'

    '. - &hidden_form_elements().'
    '); - my @actions = - (''. - $lt{'back'}.''); - $r->print('
    '.&Apache::lonhtmlcommon::actionbox(\@actions)); - return; -} - -sub modify_exttool { - my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_; - my %titles = &exttool_titles($type); - &print_header($r,$type); - $r->print('

    '.$titles{'extt'}.'

    '."\n". - '

    '.$type.': '.$cdesc.'

    '."\n". - '
    '."\n"); - 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'}.': '.$domdefdisplay.''; - } else { - $status = $titles{'cour'}.': '.$titles{$exttool}.''; - } - if ($error) { - $r->print('

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

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

    '); - if ($nochange) { - $r->print(&mt('External Tool permissions unchanged')); - } elsif ($change) { - $r->print(&mt('External Tool permissions changed')); - } - $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; } @@ -2737,10 +2269,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"); @@ -2785,7 +2316,7 @@ ENDSCRIPT &js_escape(\$alert); my $regexp = ' /^\s*\d+\s*$/'; - $js .= <<"ENDSCRIPT"; + $js .= <<"ENDSCRIPT"; function verify_postsubmit() { var optionsElement = document.setpostsubmit.postsubmit; @@ -2817,7 +2348,7 @@ function verify_postsubmit() { } } else { if (currval == 0) { - verified = 'ok'; + verified = 'ok'; } else { alert('$invalid'); return false; @@ -2835,7 +2366,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'} 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), @@ -2941,15 +2406,7 @@ ENDJS } 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; } @@ -3030,14 +2487,14 @@ sub course_settings_descrip { } 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'],['^selfenrollmgr_','^selfenroll_'])."\n". + 'sections','newsec','mysqltables','nopasswdchg'], + ['^selfenrollmgr_','^selfenroll_'])."\n". ''; return $hidden_elements; } @@ -3070,10 +2527,6 @@ sub get_permission { processcat => 'edit', selfenroll => 'edit', adhocrole => 'coord', - setltiauth => 'edit', - processltiauth => 'edit', - setexttool => 'edit', - processexttool => 'edit', ); if ($passwdconf{'crsownerchg'}) { $permission{passwdchg} = 'edit'; @@ -3089,8 +2542,6 @@ sub get_permission { catsettings => 'view', selfenroll => 'view', adhocrole => 'custom', - setltiauth => 'view', - setexttool => 'view', ); if ($passwdconf{'crsownerchg'}) { $permission{passwdchg} = 'view'; @@ -3112,7 +2563,7 @@ sub devalidate_remote_instcats { } $modified_dom = ''; } - return; + return OK; } sub handler { @@ -3158,7 +2609,7 @@ sub handler { $choose_text = "Choose a community"; } else { $choose_text = "Choose a course"; - } + } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$firstform,'')", text=>"Course/Community search"}, @@ -3206,7 +2657,7 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'$phase')", 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"}); @@ -3285,35 +2736,11 @@ 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=>"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 {