--- loncom/interface/lonconfigsettings.pm	2017/11/30 15:15:15	1.40
+++ loncom/interface/lonconfigsettings.pm	2022/02/14 02:48:46	1.58
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: lonconfigsettings.pm,v 1.40 2017/11/30 15:15:15 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.58 2022/02/14 02:48:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -218,31 +218,68 @@ $jscript
             if (grep(/^lti$/,@actions)) {
                 $onload .= "toggleLTI(document.display,'user','add');".
                            "toggleLTI(document.display,'crs','add');".
-                           "toggleLTI(document.display,'sec','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,'sec','$i');".
+                                       "toggleLTI(document.display,'lcauth','$i');".
+                                       "toggleLTI(document.display,'lcmenu','$i');".
+                                       "toggleLTI(document.display,'passback','$i');".
+                                       "toggleLTI(document.display,'callback','$i');";
                         }
                     }
-                } 
+                }
+                my %servers = &Apache::lonnet::get_servers($dom,'library');
+                foreach my $server (keys(%servers)) {
+                    $onload .= "togglePrivKey(document.display,'$server');";
+                }
+                $onload .= "toggleLTIEncKey(document.display);";
             }
             if (grep(/^ltitools$/,@actions)) {
                 $onload .= "toggleLTITools(document.display,'passback','add');".
-                           "toggleLTITools(document.display,'roster','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,'passback','$i');".
-                                       "toggleLTITools(document.display,'roster','$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);";
+            }
+            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 = (
                                   'onload' => $onload,
@@ -250,13 +287,47 @@ $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);"},
-                               };
+                if (@code_order) {
+                    $onload = "courseSet('','load');toggleCloners(document.display.cloners_instcode);";
+                }
+            }
+            if (grep(/^linkprotection$/,@actions)) {
+                if (ref($values) eq 'HASH') {
+                    if (ref($values->{'linkprotection'}) eq 'HASH') {
+                        my $ltiauth;
+                        if (exists($env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'})) {
+                            $ltiauth = $env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'};
+                        } else {
+                            my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
+                            $ltiauth = $domdefs{'crsltiauth'};
+                        }
+                        my $posslti = scalar(keys(%{$values->{'linkprotection'}}));
+                        for (my $i=0; $i<=$posslti; $i++) {
+                            my $num = $i;
+                            if ($i == $posslti) {
+                                $num = 'add';
+                            }
+                            if (ref($values->{'linkprotection'}->{$i}) eq 'HASH') {
+                                if ($values->{'linkprotection'}->{$i}->{'usable'}) {
+                                    $onload .= "toggleLTI(document.display,'$num','secret');";
+                                }
+                            }
+                            if ($ltiauth) {
+                                $onload .= "toggleLTIReqUser(document.display,'requser','optional','1','block','$num');".
+                                           "toggleLTIReqUser(document.display,'mapuser','userfield','other','inline-block','$num');";
+                            }
+                        }
+                    }
                 }
             }
+            if ($onload) {
+                my %loaditems = (
+                                  'onload' => $onload,
+                                );
+                $additem = {'add_entries' => \%loaditems,};
+            }
         }
     }
     $r->print(&Apache::loncommon::start_page($pagetitle,$js,$additem));
@@ -335,7 +406,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();
     }
@@ -349,9 +420,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 ++;
                     }
@@ -383,6 +455,9 @@ sub make_changes {
             }
             $r->print('</p>');
         }
+        if ($errors) {
+            $r->print('<p>'.$errors.'</p>');
+        }
     }
     $r->print('<p>');
     my $footer_text = 'Back to configuration display';
@@ -453,13 +528,23 @@ sub display_settings {
                                     $settings = $inststatus;
                                 }
                             }
+                        } elsif ($item eq 'lti') {
+                            if (ref($values->{'ltisec'}) eq 'HASH') {
+                                if (ref($values->{'lti'}) eq 'HASH') {
+                                    $settings = {%{$values->{'lti'}},%{$values->{'ltisec'}}};
+                                } else {
+                                    $settings = $values->{'ltisec'};
+                                }
+                            } elsif (ref($values->{'lti'}) eq 'HASH') {
+                                $settings = $values->{'lti'};   
+                            }
                         }
                         ($output{$item},$rowtotal{$item}) =
                             &Apache::domainprefs::print_config_box($r,$dom,$confname,
                                 $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};
@@ -539,8 +624,8 @@ sub display_choices {
                 $thirddiv = 1;
             }
         }
-        $r->print('</div><br clear="all" />');
     }
+    $r->print('</div><div style="padding:0;clear:both;margin:0;border:0"></div>');
     $r->print(&print_footer($r,$phase,'display','Display',undef,$container,$parm_permission));
     $r->print('</form>');
     if ($container) {