--- loncom/interface/lonconfigsettings.pm	2017/08/15 23:41:34	1.21.4.9.2.1
+++ loncom/interface/lonconfigsettings.pm	2017/07/26 19:45:45	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: lonconfigsettings.pm,v 1.21.4.9.2.1 2017/08/15 23:41:34 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.34 2017/07/26 19:45:45 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) = @_;
@@ -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;
                                 }
                             }
@@ -149,11 +150,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().'
@@ -184,40 +185,30 @@ $jscript
             }
             if (grep(/^selfcreation$/,@actions)) {
                 my $prefix = 'cancreate_emailverified';
-                my $customclass = 'LC_selfcreate_email';
-                my $classprefix = 'LC_canmodify_emailusername_';
-                my $optionsprefix = 'LC_options_emailusername_';
-                $onload .= "toggleRows(document.display,'cancreate_email','selfassign','$customclass','$classprefix','$optionsprefix');";
-                my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-                my $hascustom;
-                my ($emailrules,$emailruleorder) = &Apache::lonnet::inst_userrules($dom,'email');
-                if (ref($emailrules) eq 'HASH') {
-                    if (keys(%{$emailrules}) > 0) {
-                        $hascustom = 'cancreate_emailrule';
-                    }
-                }
-                my @posstypes;
-                if (ref($types) eq 'ARRAY') {
-                    @posstypes = @{$types};
-                    push(@posstypes,'default');
-                    foreach my $type (@posstypes) {
-                        $onload .= "toggleEmailOptions(document.display,'cancreate_emailoptions','$hascustom',".
-                                                               "'cancreate_emaildomain','$type');";
+                my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+                if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') {
+                    my $order = $domdefaults{'inststatusguest'};
+                    if (ref($order) eq 'ARRAY') {
+                        foreach my $type (@{$order}) {
+                            if (($type ne '') && ($type ne 'default')) {
+                                my $name = $prefix.'_'.$type;
+                                $onload .= "toggleDisplay(document.display,'$name');";
+                            }
+                        }
                     }
-                } else {
-                    $onload .= "toggleEmailOptions(document.display,'cancreate_emailoptions','$hascustom',".
-                                                       "'cancreate_emaildomain','default');";
                 }
+                $onload .= "toggleDisplay(document.display,'$prefix');".
+                           "toggleDisplay(document.display,'emailoptions');".
             }
             if ($onload) {
                 my %loaditems = (
-                                  'onload' => $onload,
+                                  'onload' => $onload;
                                 );
                 $additem = {'add_entries' => \%loaditems,};
             }
         } elsif ($context eq 'course') {
             if (grep(/^courseinfo$/,@actions)) {
-                if (@code_order) {
+                if (@code_order) { 
                     $additem = {
                                    add_entries => {'onload' => "courseSet('','load');toggleCloners(document.display.cloners_instcode);"},
                                };
@@ -234,6 +225,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;
@@ -274,10 +268,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;
@@ -371,21 +368,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'};
@@ -402,7 +402,7 @@ sub display_settings {
                                 my $inststatus = {
                                                    inststatustypes => $usertypes,
                                                    inststatusorder => $types,
-                                                   inststatusguest => [],
+                                                   inststatusguest => [], 
                                                  };
                                 if (ref($values->{defaults}) eq 'HASH') {
                                     $settings = {%{$inststatus},%{$values->{'defaults'}}};
@@ -435,6 +435,9 @@ sub display_settings {
         }
         $r->print('</form>');
     }
+    if ($container) {
+        &Apache::lonparmset::endSettingsScreen($r);
+    }
     $r->print(&Apache::loncommon::end_page());
     return;
 }
@@ -497,6 +500,9 @@ sub display_choices {
     }
     $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;
 }