--- loncom/interface/lonconfigsettings.pm	2022/04/05 16:43:34	1.21.4.13.2.6
+++ loncom/interface/lonconfigsettings.pm	2024/07/03 16:35:11	1.21.4.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: lonconfigsettings.pm,v 1.21.4.13.2.6 2022/04/05 16:43:34 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.21.4.14 2024/07/03 16:35:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,9 +39,9 @@ use Apache::courseclassifier();
 use LONCAPA qw(:DEFAULT :match);
 
 sub print_header {
-    my ($r,$phase,$context,$jscript,$container,$instcode,$dom,$confname,$values) = @_;
+    my ($r,$phase,$context,$jscript,$container,$instcode,$dom) = @_;
     my ($pagetitle,$brcrumtitle,$action,$call_category_check,$instcode_check,
-        $linkprot_check,$crstype,@actions,@code_order);
+        $crstype,@actions,@code_order);
     if ($phase eq 'display') {
         @actions = &Apache::loncommon::get_env_multiple('form.actions');
     }
@@ -115,113 +115,6 @@ sub print_header {
 ENDSCRIPT
                 }
             }
-            if (($context eq 'course') && ($phase eq 'display') &&
-                (grep(/^linkprot$/,@actions))) {
-                my $allowed;
-                my $home = &Apache::lonnet::homeserver($confname,$dom);
-                unless ($home eq 'no_host') {
-                    my @ids=&Apache::lonnet::current_machine_ids();
-                    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
-                }
-                if ($allowed) {
-                    my (@changeable,@settable);
-                    if (ref($values->{'linkprot'}) eq 'HASH') {
-                        if (keys(%{$values->{'linkprot'}})) {
-                            my @current = sort { $a <=> $b } keys(%{$values->{'linkprot'}});
-                            if (@current) {
-                                for (my $i=0; $i<@current; $i++) {
-                                    my $num = $current[$i];
-                                    if (ref($values->{'linkprot'}->{$num}) eq 'HASH') {
-                                        if ($values->{'linkprot'}->{$num}->{'usable'}) {
-                                            push(@changeable,$i);
-                                        } else {
-                                            push(@settable,$i);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    my ($numrules,$intargjs);
-$linkprot_check .= <<ENDJS;
-
-var linkprotradio = '';
-var secretinput = '';
-var posscheck = '';
-
-ENDJS
-                    if (@changeable) {
-                        foreach my $num (@changeable) {
-                            ($numrules,$intargjs) =
-                                &Apache::loncommon::passwd_validation_js('secretinput',$dom,'linkprot',$num);
-                            $linkprot_check .= <<ENDJS;
-posscheck = '';
-linkprotradio = document.display.elements['linkprot_changesecret_$num'];
-if (linkprotradio.length) {
-    for (var i=0; i<linkprotradio.length; i++) {
-        if (linkprotradio[i].checked) {
-            if (linkprotradio[i].value == 1) {
-                posscheck = 1;
-            }
-        }
-    }
-}
-
-ENDJS
-                            if ($numrules) {
-                                $linkprot_check .= <<ENDJS;
-if (posscheck) {
-    secretinput = document.display.elements['linkprot_secret_$num'].value;
-    $intargjs
-}
-
-ENDJS
-                            }
-                            $linkprot_check .= <<ENDJS;
-if (posscheck) {
-    uncheckLinkProtMakeVis('visible','$num');
-    document.display.elements['linkprot_secret_$num'].type = 'password';
-}
-
-ENDJS
-                        }
-                    }
-                    if (@settable) {
-                        foreach my $num (@settable) {
-                            ($numrules,$intargjs) =
-                                &Apache::loncommon::passwd_validation_js('secretinput',$dom,'linkprot',$num);
-                            if ($numrules) {
-                                $linkprot_check .= <<ENDJS;
-secretinput = document.display.elements['linkprot_secret_$num'].value;
-$intargjs
-
-ENDJS
-                            }
-                            $linkprot_check .= <<ENDJS;
-uncheckLinkProtMakeVis('visible','$num');
-document.display.elements['linkprot_secret_$num'].type = 'password';
-
-ENDJS
-                        }
-                    }
-                    ($numrules,$intargjs) =
-                        &Apache::loncommon::passwd_validation_js('secretinput',$dom,'linkprot','add');
-                    if ($numrules) {
-                        $linkprot_check .= <<ENDJS
-secretinput = document.display.elements['linkprot_secret_add'].value;
-if (document.display.elements['linkprot_add'].checked) {
-    $intargjs
-}
-
-ENDJS
-                    }
-                    $linkprot_check .= <<ENDJS;
-uncheckLinkProtMakeVis('visible','add');
-document.display.elements['linkprot_secret_add'].type = 'password';
-
-ENDJS
-                }
-            }
         }
     }
     my $alert = &mt('You must select at least one functionality type to display.');
@@ -252,7 +145,7 @@ function changePage(formname,newphase) {
             return;
         }
     }
-    '.$instcode_check.$call_category_check.$linkprot_check.'
+    '.$instcode_check.$call_category_check.'
     formname.submit();
 }'."\n";
     if ($phase eq 'pickactions') {
@@ -321,24 +214,6 @@ $jscript
                 my $optionsprefix = 'LC_options_helpdesk_';
                 $onload .= "toggleHelpdeskRow(document.display,'overrides','$customclass','$optionsprefix');";
             }
-            if (grep(/^lti$/,@actions)) {
-                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,'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');";
-                        }
-                    }
-                }
-            }
             if (grep(/^wafproxy$/,@actions)) {
                 $onload .= "toggleWAF();checkWAF();updateWAF();";
             }
@@ -370,43 +245,8 @@ $jscript
                     $onload = "courseSet('','load');toggleCloners(document.display.cloners_instcode);";
                 }
             }
-            if (grep(/^linkprot$/,@actions)) {
-                if (ref($values) eq 'HASH') {
-                    if (ref($values->{'linkprot'}) 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 $ishome;
-                        my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
-                        unless (($chome eq 'no_host') || ($chome eq '')) {
-                            my @ids=&Apache::lonnet::current_machine_ids();
-                            foreach my $id (@ids) { if ($id eq $chome) { $ishome=1; } }
-                        }
-                        my $posslti = scalar(keys(%{$values->{'linkprot'}}));
-                        for (my $i=0; $i<=$posslti; $i++) {
-                            my $num = $i;
-                            if ($i == $posslti) {
-                                $num = 'add';
-                            }
-                            if (ref($values->{'linkprot'}->{$i}) eq 'HASH') {
-                                if ($values->{'linkprot'}->{$i}->{'usable'}) {
-                                    $onload .= "toggleLinkProt(document.display,'$num','secret');";
-                                }
-                            }
-                            if ($ltiauth) {
-                                $onload .= "toggleLinkProtReqUser(document.display,'requser','optional','1','block','$num');".
-                                           "toggleLinkProtReqUser(document.display,'mapuser','userfield','other','inline-block','$num');";
-                            }
-                            if ($ishome) {
-                                $onload .= "uncheckLinkProtMakeVis('visible','$num');";
-                            }
-                        }
-                    }
-                }
+            if (grep(/^grading$/,@actions)) {
+                $onload .= 'toggleGrading(document.display);toggleHiddenTotalsSec(document.display);';
             }
             if ($onload) {
                 my %loaditems = (
@@ -501,10 +341,9 @@ sub make_changes {
                 } else {
                     $changes{$item} = {};
                     $errors =
-                        &Apache::courseprefs::process_changes($dom,$confname,$item,$values,
+                        &Apache::courseprefs::process_changes($dom,$item,$values,
                                                               $prefs->{$item},$changes{$item},
-                                                              $allitems,\%disallowed,$crstype,
-                                                              \%lastact);
+                                                              $allitems,\%disallowed,$crstype);
                     if (keys(%{$changes{$item}}) > 0) {
                         $numchanged ++;
                     }
@@ -562,7 +401,7 @@ sub display_settings {
     if (ref($values) eq 'HASH') {
         $instcode = $values->{'internal.coursecode'};
     }
-    &print_header($r,$phase,$context,$jscript,$container,$instcode,$dom,$confname,$values);
+    &print_header($r,$phase,$context,$jscript,$container,$instcode,$dom);
     my $divwidth = 900;
     if ((ref($prefs_order) eq 'ARRAY') && (ref($prefs) eq 'HASH') && (ref($values) eq 'HASH')) { 
         if (@actions > 0) {
@@ -606,17 +445,13 @@ sub display_settings {
                                     $settings = $inststatus;
                                 }
                             }
-                        } elsif ($item eq 'lti') {
-                            if (ref($values->{'ltisec'}) eq 'HASH') {
-                                $settings = $values->{'ltisec'};
-                            }
                         }
                         ($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,$confname,$phase,
+                            &Apache::courseprefs::print_config_box($r,$dom,$phase,
                                 $item,$prefs->{$item},$values,$allitems,$crstype,$parm_permission);
                     }
                     $rowsum += $rowtotal{$item};