--- loncom/interface/lonconfigsettings.pm 2020/10/25 19:10:26 1.21.4.11.2.1 +++ loncom/interface/lonconfigsettings.pm 2022/02/01 23:13:19 1.56 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: lonconfigsettings.pm,v 1.21.4.11.2.1 2020/10/25 19:10:26 raeburn Exp $ +# $Id: lonconfigsettings.pm,v 1.56 2022/02/01 23:13:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,8 +35,9 @@ use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonlocal; +use Apache::lonparmset(); use Apache::courseclassifier(); -use LONCAPA qw(:DEFAULT :match); +use LONCAPA qw(:DEFAULT :match); sub print_header { my ($r,$phase,$context,$jscript,$container,$instcode,$dom,$values) = @_; @@ -91,7 +92,7 @@ sub print_header { var gotcode = 0; for (var i=0; i 'checkbox'})."\n"; } elsif ($phase eq 'display') { - $js .= &Apache::lonhtmlcommon::color_picker(); + $js .= &Apache::lonhtmlcommon::color_picker(); $js .= &color_pick_js()."\n"; } $js .= &Apache::loncommon::viewport_size_js().' @@ -208,25 +209,71 @@ $jscript $onload .= "toggleEmailOptions(document.display,'cancreate_emailoptions','$hascustom',". "'cancreate_emaildomain','default');"; } - } + } if (grep(/^contacts$/,@actions)) { my $customclass = 'LC_helpdesk_override'; my $optionsprefix = 'LC_options_helpdesk_'; $onload .= "toggleHelpdeskRow(document.display,'overrides','$customclass','$optionsprefix');"; } + if (grep(/^lti$/,@actions)) { + $onload .= "toggleLTI(document.display,'user','add');". + "toggleLTI(document.display,'crs','add');". + "toggleLTI(document.display,'sec','add');". + "toggleLTI(document.display,'lcauth','add');". + "toggleLTI(document.display,'lcmenu','add');". + "toggleLTI(document.display,'passback','add');". + "toggleLTI(document.display,'callback','add');"; + if (ref($values) eq 'HASH') { + if (ref($values->{'lti'}) eq 'HASH') { + my $numlti = scalar(keys(%{$values->{'lti'}})); + for (my $i=0; $i<$numlti; $i++) { + $onload .= "toggleLTI(document.display,'user','$i');". + "toggleLTI(document.display,'crs','$i');". + "toggleLTI(document.display,'sec','$i');". + "toggleLTI(document.display,'lcauth','$i');". + "toggleLTI(document.display,'lcmenu','$i');". + "toggleLTI(document.display,'passback','$i');". + "toggleLTI(document.display,'callback','$i');"; + } + } + } + } if (grep(/^ltitools$/,@actions)) { - $onload .= "toggleLTITools(document.display,'user','add');"; + $onload .= "toggleLTITools(document.display,'passback','add');". + "toggleLTITools(document.display,'roster','add');". + "toggleLTITools(document.display,'user','add');"; if (ref($values) eq 'HASH') { if (ref($values->{'ltitools'}) eq 'HASH') { my $numltitools = scalar(keys(%{$values->{'ltitools'}})); for (my $i=0; $i<$numltitools; $i++) { - $onload .= "toggleLTITools(document.display,'user','$i');"; + $onload .= "toggleLTITools(document.display,'passback','$i');". + "toggleLTITools(document.display,'roster','$i');". + "toggleLTITools(document.display,'user','$i');"; } } } } + if (grep(/^wafproxy$/,@actions)) { + $onload .= "toggleWAF();checkWAF();updateWAF();"; + } + if (grep(/^proctoring$/,@actions)) { + $onload .= "toggleProctoring(document.display,'proctorio');". + "toggleProctoring(document.display,'examity');"; + } if (grep(/^scantron$/,@actions)) { - $onload .= "toggleScantron('document.display');"; + $onload .= "toggleScantron(document.display);"; + } + if (grep(/^autoupdate$/,@actions)) { + $onload .= "toggleLastActiveDays(document.display);"; + } + if (grep(/^autoenroll$/,@actions)) { + $onload .= "toggleFailsafe(document.display);"; + } + if (grep(/^login$/,@actions)) { + my %domservers = &Apache::lonnet::get_servers($dom); + foreach my $server (sort(keys(%domservers))) { + $onload .= "toggleSamlOptions(document.display,'$server');"; + } } if ($onload) { my %loaditems = ( @@ -235,13 +282,30 @@ $jscript $additem = {'add_entries' => \%loaditems,}; } } elsif ($context eq 'course') { + my $onload; if (grep(/^courseinfo$/,@actions)) { if (@code_order) { - $additem = { - add_entries => {'onload' => "courseSet('','load');toggleCloners(document.display.cloners_instcode);"}, - }; + $onload = "courseSet('','load');toggleCloners(document.display.cloners_instcode);"; + } + } + if (grep(/^linkprotection$/,@actions)) { + if (ref($values) eq 'HASH') { + if (ref($values->{'linkprotection'}) eq 'HASH') { + my $posslti = scalar(keys(%{$values->{'linkprotection'}})); + for (my $i=0; $i<$posslti; $i++) { + if ($values->{'linkprotection'}->{'usable'}) { + $onload .= "toggleLTI(document.display,'$i','secret');"; + } + } + } } } + if ($onload) { + my %loaditems = ( + 'onload' => $onload, + ); + $additem = {'add_entries' => \%loaditems,}; + } } } $r->print(&Apache::loncommon::start_page($pagetitle,$js,$additem)); @@ -253,6 +317,9 @@ $jscript '); + if ($container) { + &Apache::lonparmset::startSettingsScreen($r,$container,$crstype); + } $r->print('
'); return; @@ -293,10 +360,13 @@ sub print_footer { if ($showbutton) { $r->print('

'); - } + } } if ($phase eq 'process') { $r->print('
'); + if ($container) { + &Apache::lonparmset::endSettingsScreen($r); + } $r->print(&Apache::loncommon::end_page()); } return; @@ -314,7 +384,7 @@ sub make_changes { {href=>"javascript:changePage(document.$phase,'$phase')", text=>"Updated"}); &print_header($r,$phase,$context,undef,$container); - my ($crstype,%lastact); + my ($crstype,%lastact,$errors); if ($context eq 'course') { $crstype = &Apache::loncommon::course_type(); } @@ -328,9 +398,10 @@ sub make_changes { $confname,$item,$roles,$values,\%lastact)); } else { $changes{$item} = {}; - &Apache::courseprefs::process_changes($dom,$item,$values, - $prefs->{$item},$changes{$item}, - $allitems,\%disallowed,$crstype); + $errors = + &Apache::courseprefs::process_changes($dom,$confname,$item,$values, + $prefs->{$item},$changes{$item}, + $allitems,\%disallowed,$crstype); if (keys(%{$changes{$item}}) > 0) { $numchanged ++; } @@ -362,6 +433,9 @@ sub make_changes { } $r->print('

'); } + if ($errors) { + $r->print('

'.$errors.'

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

'); my $footer_text = 'Back to configuration display'; @@ -390,21 +464,24 @@ sub display_settings { if ((ref($prefs_order) eq 'ARRAY') && (ref($prefs) eq 'HASH') && (ref($values) eq 'HASH')) { if (@actions > 0) { my $rowsum = 0; - my (%output,%rowtotal,@items); + my (%output,%rowtotal,@items,$got_check_uncheck); foreach my $item (@{$prefs_order}) { if (grep(/^\Q$item\E$/,@actions)) { push(@items,$item); if ($context eq 'domain') { my $settings; - if (ref($values) eq 'HASH') { + if (ref($values) eq 'HASH') { $settings = $values->{$item}; } - if ($item eq 'usersessions') { - $r->print(''."\n"); + if (($item eq 'usersessions') || ($item eq 'ssl')) { + unless ($got_check_uncheck) { + $r->print(''."\n"); + $got_check_uncheck = 1; + } } elsif ($item eq 'selfcreation') { if (ref($values) eq 'HASH') { $settings = $values->{'usercreation'}; @@ -421,7 +498,7 @@ sub display_settings { my $inststatus = { inststatustypes => $usertypes, inststatusorder => $types, - inststatusguest => [], + inststatusguest => [], }; if (ref($values->{defaults}) eq 'HASH') { $settings = {%{$inststatus},%{$values->{'defaults'}}}; @@ -435,7 +512,7 @@ sub display_settings { $phase,$item,$prefs->{$item},$settings); } else { ($output{$item},$rowtotal{$item}) = - &Apache::courseprefs::print_config_box($r,$dom,$phase, + &Apache::courseprefs::print_config_box($r,$dom,$confname,$phase, $item,$prefs->{$item},$values,$allitems,$crstype,$parm_permission); } $rowsum += $rowtotal{$item}; @@ -454,6 +531,9 @@ sub display_settings { } $r->print(''); } + if ($container) { + &Apache::lonparmset::endSettingsScreen($r); + } $r->print(&Apache::loncommon::end_page()); return; } @@ -512,10 +592,13 @@ sub display_choices { $thirddiv = 1; } } - $r->print('
'); } + $r->print('

'); $r->print(&print_footer($r,$phase,'display','Display',undef,$container,$parm_permission)); $r->print(''); + if ($container) { + &Apache::lonparmset::endSettingsScreen($r); + } $r->print(&Apache::loncommon::end_page()); return; }