--- loncom/interface/lonconfigsettings.pm	2024/08/22 20:18:08	1.21.4.13.2.12
+++ loncom/interface/lonconfigsettings.pm	2023/03/19 16:05:48	1.68
@@ -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.12 2024/08/22 20:18:08 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.68 2023/03/19 16:05:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,7 @@ use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
+use Apache::lonparmset();
 use Apache::courseclassifier();
 use LONCAPA qw(:DEFAULT :match);
 use File::Copy;
@@ -92,7 +93,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;
                                 }
                             }
@@ -231,7 +232,7 @@ $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_';
@@ -288,6 +289,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);";
             }
@@ -341,8 +346,7 @@ $jscript
                                     $onload .= "toggleChgSecret(document.display,'$num','secret','linkprot');";
                                 }
                             }
-                            $onload .= "toggleLinkProtExtra(document.display,'returnurl','divurlparam','1','inline-block','$num');".
-                                       "toggleLinkProtExtra(document.display,'passback','passbackparam','1','inline-block','$num');";
+                            $onload .= "toggleLinkProtExtra(document.display,'returnurl','divurlparam','1','inline-block','$num');";
                             if ($ltiauth) {
                                 $onload .= "toggleLinkProtExtra(document.display,'requser','optional','1','block','$num');".
                                            "toggleLinkProtExtra(document.display,'mapuser','userfield','other','inline-block','$num');";
@@ -385,9 +389,6 @@ $jscript
             if (grep(/^localization$/,@actions)) {
                 $onload .= "toggleTimeZone();";
             }
-            if (grep(/^grading$/,@actions)) {
-                $onload .= 'toggleGrading(document.display);toggleHiddenTotalsSec(document.display);';
-            }
             if ($onload) {
                 my %loaditems = (
                                   'onload' => $onload,
@@ -405,6 +406,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;
@@ -499,7 +503,7 @@ ENDJS
             &Apache::loncommon::passwd_validation_js($name.'secretinput',$dom,$name,'add');
         if ($numrules) {
             $js .= <<ENDJS
-${name}secretinput = document.display.elements['${name}_secret_add'].value;
+${name}secretinput = document.display.elements['${name}_add_secret'].value;
 if (document.display.elements['${name}_add'].checked) {
     $intargjs
 }
@@ -508,7 +512,7 @@ ENDJS
         }
         $js .= <<ENDJS;
 uncheckLinkProtMakeVis('$name','visible','add');
-document.display.elements['${name}_secret_add'].type = 'password';
+document.display.elements['${name}_add_secret'].type = 'password';
 
 ENDJS
     }
@@ -565,10 +569,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;
@@ -645,8 +652,8 @@ sub make_changes {
     if ($context eq 'course') {
         $footer_text = 'Back to display/edit settings'; 
     }
-    $r->print('</p>');
     &print_footer($r,$phase,'display',$footer_text,\@actions,$container,$parm_permission);
+    $r->print('</p>');
     return \%lastact;
 }
 
@@ -673,15 +680,18 @@ sub display_settings {
                     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'};
@@ -698,7 +708,7 @@ sub display_settings {
                                 my $inststatus = {
                                                    inststatustypes => $usertypes,
                                                    inststatusorder => $types,
-                                                   inststatusguest => [],
+                                                   inststatusguest => [], 
                                                  };
                                 if (ref($values->{defaults}) eq 'HASH') {
                                     $settings = {%{$inststatus},%{$values->{'defaults'}}};
@@ -767,6 +777,9 @@ sub display_settings {
         }
         $r->print('</form>');
     }
+    if ($container) {
+        &Apache::lonparmset::endSettingsScreen($r);
+    }
     $r->print(&Apache::loncommon::end_page());
     return;
 }
@@ -829,6 +842,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;
 }