--- loncom/interface/lonconfigsettings.pm	2022/02/21 16:12:49	1.21.4.13.2.4
+++ loncom/interface/lonconfigsettings.pm	2022/09/08 01:41:13	1.67
@@ -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.4 2022/02/21 16:12:49 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.67 2022/09/08 01:41:13 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,$confname,$values) = @_;
@@ -91,7 +92,7 @@ sub print_header {
                             var gotcode = 0;
                             for (var i=0; i<codes.length; i++) {
                                 if (codes[i].selectedIndex != 0) {
-                                     gotcode = 1;
+                                     gotcode = 1; 
                                      break;
                                 }
                             }
@@ -146,40 +147,62 @@ ENDSCRIPT
 $linkprot_check .= <<ENDJS;
 
 var linkprotradio = '';
-var secretinput = '';
+var secretinput = ''; 
+var posscheck = '';
+
 ENDJS
                     if (@changeable) {
                         foreach my $num (@changeable) {
                             ($numrules,$intargjs) =
                                 &Apache::loncommon::passwd_validation_js('secretinput',$dom,'linkprot',$num);
-                            if ($numrules) {
-                                $linkprot_check .= <<ENDJS;
-
+                            $linkprot_check .= <<ENDJS;
+posscheck = '';
 linkprotradio = document.display.elements['linkprot_changesecret_$num'];
-secretinput = document.display.elements['linkprot_secret_$num'].value;
 if (linkprotradio.length) {
     for (var i=0; i<linkprotradio.length; i++) {
         if (linkprotradio[i].checked) {
             if (linkprotradio[i].value == 1) {
-                $intargjs
+                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 (@changeable) {
+                        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) =
@@ -190,8 +213,14 @@ secretinput = document.display.elements[
 if (document.display.elements['linkprot_add'].checked) {
     $intargjs
 }
+
 ENDJS
                     }
+                    $linkprot_check .= <<ENDJS;
+uncheckLinkProtMakeVis('visible','add');
+document.display.elements['linkprot_secret_add'].type = 'password';
+
+ENDJS
                 }
             }
         }
@@ -228,11 +257,11 @@ function changePage(formname,newphase) {
     formname.submit();
 }'."\n";
     if ($phase eq 'pickactions') {
-        $js .= &Apache::lonhtmlcommon::color_picker();
+	$js .= &Apache::lonhtmlcommon::color_picker();
         $js .=
             &Apache::lonhtmlcommon::set_form_elements({actions => '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().'
@@ -287,13 +316,34 @@ $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');";
+                        }
+                    }
+                }
                 my %servers = &Apache::lonnet::get_servers($dom,'library');
                 foreach my $server (keys(%servers)) {
                     $onload .= "togglePrivKey(document.display,'$server');";
@@ -301,12 +351,16 @@ $jscript
                 $onload .= "toggleLTIEncKey(document.display);";
             }
             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');";
                         }
                     }
                 }
@@ -314,6 +368,10 @@ $jscript
             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);";
             }
@@ -352,6 +410,12 @@ $jscript
                             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;
@@ -363,14 +427,24 @@ $jscript
                                     $onload .= "toggleLinkProt(document.display,'$num','secret');";
                                 }
                             }
+                            $onload .= "toggleLinkProtExtra(document.display,'returnurl','divurlparam','1','inline-block','$num');";
                             if ($ltiauth) {
-                                $onload .= "toggleLinkProtReqUser(document.display,'requser','optional','1','block','$num');".
-                                           "toggleLinkProtReqUser(document.display,'mapuser','userfield','other','inline-block','$num');";
+                                $onload .= "toggleLinkProtExtra(document.display,'requser','optional','1','block','$num');".
+                                           "toggleLinkProtExtra(document.display,'mapuser','userfield','other','inline-block','$num');";
+                            }
+                            if ($ishome) {
+                                $onload .= "uncheckLinkProtMakeVis('visible','$num');";
                             }
                         }
                     }
                 }
             }
+            if (grep(/^appearance$/,@actions)) {
+                $onload .= "toggleExtRes();";
+            }
+            if (grep(/^localization$/,@actions)) {
+                $onload .= "toggleTimeZone();";
+            }
             if ($onload) {
                 my %loaditems = (
                                   'onload' => $onload,
@@ -388,6 +462,9 @@ $jscript
 <input type="hidden" name="pres_value" />
 </form>
 ');
+    if ($container) {
+       &Apache::lonparmset::startSettingsScreen($r,$container,$crstype);
+    }
     $r->print('<form method="post" name="'.$phase.'" action="'.$action.'"'.
               ' enctype="multipart/form-data">');
     return;
@@ -428,10 +505,13 @@ sub print_footer {
         if ($showbutton) {
             $r->print('<p><input type="button" name="store" value="'.
                       $button_text.'" onclick='.$onclick.' /></p>');
-        }
+        } 
     }
     if ($phase eq 'process') {
         $r->print('</form>');
+        if ($container) {
+           &Apache::lonparmset::endSettingsScreen($r);
+        }
         $r->print(&Apache::loncommon::end_page());
     }
     return;
@@ -466,7 +546,8 @@ sub make_changes {
                     $errors =
                         &Apache::courseprefs::process_changes($dom,$confname,$item,$values,
                                                               $prefs->{$item},$changes{$item},
-                                                              $allitems,\%disallowed,$crstype);
+                                                              $allitems,\%disallowed,$crstype,
+                                                              \%lastact);
                     if (keys(%{$changes{$item}}) > 0) {
                         $numchanged ++;
                     }
@@ -529,21 +610,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('<script type="text/javascript">'."\n".
-                                      '// <![CDATA['."\n".
-                                      &Apache::loncommon::check_uncheck_jscript()."\n".
-                                      '// ]]>'."\n".
-                                      '</script>'."\n");
+                        if (($item eq 'usersessions') || ($item eq 'ssl')) {
+                            unless ($got_check_uncheck) {
+                                $r->print('<script type="text/javascript">'."\n".
+                                          '// <![CDATA['."\n".
+                                          &Apache::loncommon::check_uncheck_jscript()."\n".
+                                          '// ]]>'."\n".
+                                          '</script>'."\n");
+                                $got_check_uncheck = 1;
+                            }
                         } elsif ($item eq 'selfcreation') {
                             if (ref($values) eq 'HASH') {
                                 $settings = $values->{'usercreation'};
@@ -560,7 +644,7 @@ sub display_settings {
                                 my $inststatus = {
                                                    inststatustypes => $usertypes,
                                                    inststatusorder => $types,
-                                                   inststatusguest => [],
+                                                   inststatusguest => [], 
                                                  };
                                 if (ref($values->{defaults}) eq 'HASH') {
                                     $settings = {%{$inststatus},%{$values->{'defaults'}}};
@@ -570,7 +654,13 @@ sub display_settings {
                             }
                         } elsif ($item eq 'lti') {
                             if (ref($values->{'ltisec'}) eq 'HASH') {
-                                $settings = $values->{'ltisec'};
+                                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}) =
@@ -597,6 +687,9 @@ sub display_settings {
         }
         $r->print('</form>');
     }
+    if ($container) {
+        &Apache::lonparmset::endSettingsScreen($r);
+    }
     $r->print(&Apache::loncommon::end_page());
     return;
 }
@@ -659,6 +752,9 @@ sub display_choices {
     $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) {
+        &Apache::lonparmset::endSettingsScreen($r);
+    }
     $r->print(&Apache::loncommon::end_page());
     return;
 }