--- loncom/interface/domainprefs.pm	2013/09/10 01:52:35	1.160.6.24
+++ loncom/interface/domainprefs.pm	2013/12/19 08:25:48	1.160.6.28
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.24 2013/09/10 01:52:35 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.28 2013/12/19 08:25:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,7 +86,7 @@ $dom,$settings,$rowtotal,$action.
 
 $dom is the domain, $settings is a reference to a hash of current settings for
 the current context, $rowtotal is a reference to the scalar used to record the 
-number of rows displayed on the page, and $action is the context (quotas,
+number of rows displayed on the page, and $action is the context (quotas, 
 requestcourses or requestauthor).
 
 The print_quotas routine was orginally created to display/store information
@@ -97,7 +97,6 @@ i.e., blogs, aboutme page, and portfolio
 used by course owners to request creation of a course, and to display/store
 default quota sizes for authoring spaces.
 
-
 Outputs: 1
 
 $datatable  - HTML containing form elements which allow settings to be changed. 
@@ -258,7 +257,7 @@ sub handler {
                       help => 'Domain_Configuration_Quotas',
                       header => [{col1 => 'User affiliation',
                                   col2 => 'Available tools',
-                                  col3 => 'Quotas, Mb; (Authoring requires role)',}],
+                                  col3 => 'Quotas, MB; (Authoring requires role)',}],
                     },
         'autoenroll' =>
                    { text => 'Auto-enrollment settings',
@@ -401,14 +400,15 @@ sub handler {
     my $confname = $dom.'-domainconfig';
 
     if ($phase eq 'process') {
-        if (&Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,
-                                                     \%prefs,\%domconfig,$confname,\@roles) eq 'update') {
+        my $result = &Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,
+                                                              \%prefs,\%domconfig,$confname,\@roles);
+        if (ref($result) eq 'HASH') {
             $r->rflush();
-            &devalidate_remote_domconfs($dom);
+            &devalidate_remote_domconfs($dom,$result);
         }
     } elsif ($phase eq 'display') {
         my $js = &recaptcha_js().
-                 &credits_js(); 
+                 &credits_js();
         if ((keys(%servers) > 1) || (keys(%existing) > 0)) {
             my ($othertitle,$usertypes,$types) =
                 &Apache::loncommon::sorted_inst_types($dom);
@@ -422,7 +422,7 @@ sub handler {
     } else {
 # check if domconfig user exists for the domain.
         my $servadm = $r->dir_config('lonAdmEMail');
-        my ($configuserok,$author_ok,$switchserver) = 
+        my ($configuserok,$author_ok,$switchserver) =
             &config_check($dom,$confname,$servadm);
         unless ($configuserok eq 'ok') {
             &Apache::lonconfigsettings::print_header($r,$phase,$context);
@@ -499,7 +499,7 @@ sub process_changes {
         $output = &modify_rolecolors($r,$dom,$confname,$roles,
                                      $lastactref,%domconfig);
     } elsif ($action eq 'quotas') {
-        $output = &modify_quotas($dom,$action,%domconfig);
+        $output = &modify_quotas($dom,$action,$lastactref,%domconfig);
     } elsif ($action eq 'autoenroll') {
         $output = &modify_autoenroll($dom,$lastactref,%domconfig);
     } elsif ($action eq 'autoupdate') {
@@ -515,7 +515,7 @@ sub process_changes {
     } elsif ($action eq 'contacts') {
         $output = &modify_contacts($dom,$lastactref,%domconfig);
     } elsif ($action eq 'defaults') {
-        $output = &modify_defaults($dom,$r,%domconfig);
+        $output = &modify_defaults($dom,$lastactref,%domconfig);
     } elsif ($action eq 'scantron') {
         $output = &modify_scantron($r,$dom,$confname,$lastactref,%domconfig);
     } elsif ($action eq 'coursecategories') {
@@ -523,13 +523,13 @@ sub process_changes {
     } elsif ($action eq 'serverstatuses') {
         $output = &modify_serverstatuses($dom,%domconfig);
     } elsif ($action eq 'requestcourses') {
-        $output = &modify_quotas($dom,$action,%domconfig);
+        $output = &modify_quotas($dom,$action,$lastactref,%domconfig);
     } elsif ($action eq 'requestauthor') {
-        $output = &modify_quotas($dom,$action,%domconfig);
+        $output = &modify_quotas($dom,$action,$lastactref,%domconfig);
     } elsif ($action eq 'coursedefaults') {
-        $output = &modify_coursedefaults($dom,%domconfig);
+        $output = &modify_coursedefaults($dom,$lastactref,%domconfig);
     } elsif ($action eq 'usersessions') {
-        $output = &modify_usersessions($dom,%domconfig);
+        $output = &modify_usersessions($dom,$lastactref,%domconfig);
     } elsif ($action eq 'loadbalancing') {
         $output = &modify_loadbalancing($dom,%domconfig);
     }
@@ -773,7 +773,7 @@ sub print_config_box {
         } elsif ($action eq 'contacts') {
             $output .= &print_contacts($dom,$settings,\$rowtotal);
         } elsif ($action eq 'defaults') {
-            $output .= &print_defaults($dom,\$rowtotal);
+            $output .= &print_defaults($dom,$settings,\$rowtotal);
         } elsif ($action eq 'scantron') {
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'serverstatuses') {
@@ -1944,7 +1944,7 @@ sub print_quotas {
 
 sub print_requestmail {
     my ($dom,$action,$settings,$rowtotal) = @_;
-    my ($now,$datatable,%currapp,$rows);
+    my ($now,$datatable,%currapp);
     $now = time;
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{'notify'}) eq 'HASH') {
@@ -2978,7 +2978,7 @@ sub print_loadbalancing {
     }
     my ($othertitle,$usertypes,$types) =
         &Apache::loncommon::sorted_inst_types($dom);
-    my $rownum = 6;
+    my $rownum = 8;
     if (ref($types) eq 'ARRAY') {
         $rownum += scalar(@{$types});
     }
@@ -3157,7 +3157,7 @@ sub loadbalancing_rules {
             if (ref($currrules) eq 'HASH') {
                 $current = $currrules->{$type};
             }
-            if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) {
+            if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) {
                 if ($dom ne &Apache::lonnet::host_domain($lonhost)) {
                     $current = '';
                 }
@@ -3178,8 +3178,10 @@ sub loadbalancing_titles {
            '_LC_author'      => &mt('Users from [_1] with author role',$dom),
            '_LC_internetdom' => &mt('Users not from [_1], but from [_2]',$dom,$intdom),
            '_LC_external'    => &mt('Users not from [_1]',$intdom),
+           '_LC_ipchangesso' => &mt('SSO users from [_1], with IP mismatch',$dom),
+           '_LC_ipchange'    => &mt('Non-SSO users with IP mismatch'),
                      );
-    my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external');
+    my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external','_LC_ipchangesso','_LC_ipchange');
     if (ref($types) eq 'ARRAY') {
         unshift(@alltypes,@{$types},'default');
     }
@@ -3204,16 +3206,21 @@ sub loadbalancing_titles {
 sub loadbalance_rule_row {
     my ($type,$title,$current,$servers,$currbalancer,$lonhost,$dom,
         $targets_div_style,$homedom_div_style,$css_class,$balnum,$num,$islast) = @_;
-    my @rulenames = ('default','homeserver');
+    my @rulenames;
     my %ruletitles = &offloadtype_text();
-    if ($type eq '_LC_external') {
-        push(@rulenames,'externalbalancer');
+    if (($type eq '_LC_ipchangesso') || ($type eq '_LC_ipchange')) {
+        @rulenames = ('balancer','offloadedto');
     } else {
-        push(@rulenames,'specific');
+        @rulenames = ('default','homeserver');
+        if ($type eq '_LC_external') {
+            push(@rulenames,'externalbalancer');
+        } else {
+            push(@rulenames,'specific');
+        }
+        push(@rulenames,'none');
     }
-    push(@rulenames,'none');
     my $style = $targets_div_style;
-    if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) {
+    if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) {
         $style = $homedom_div_style;
     }
     my $space;
@@ -3278,6 +3285,8 @@ sub offloadtype_text {
            'externalbalancer' => "Offloads to Load Balancer in user's domain",
            'specific'         => 'Offloads to specific server',
            'none'             => 'No offload',
+           'balancer'         => 'Session hosted on Load Balancer, after re-authentication',
+           'offloadedto'      => 'Session hosted on offload server, after re-authentication',
     );
     return %ruletitles;
 }
@@ -3731,10 +3740,18 @@ sub print_usermodification {
 }
 
 sub print_defaults {
-    my ($dom,$rowtotal) = @_;
+    my ($dom,$settings,$rowtotal) = @_;
     my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
                  'datelocale_def','portal_def');
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+    my %defaults;
+    if (ref($settings) eq 'HASH') {
+        %defaults = %{$settings};
+    } else {
+        my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
+        foreach my $item (@items) {
+            $defaults{$item} = $domdefaults{$item};
+        }
+    }
     my $titles = &defaults_titles($dom);
     my $rownum = 0;
     my ($datatable,$css_class);
@@ -3758,7 +3775,7 @@ sub print_defaults {
             my %authnames = &authtype_names();
             foreach my $auth (@authtypes) {
                 my $checked = ' ';
-                if ($domdefaults{$item} eq $auth) {
+                if ($defaults{$item} eq $auth) {
                     $checked = ' checked="checked" ';
                 }
                 $datatable .= '<label><input type="radio" name="'.$item.
@@ -3767,15 +3784,15 @@ sub print_defaults {
             }
         } elsif ($item eq 'timezone_def') {
             my $includeempty = 1;
-            $datatable .= &Apache::loncommon::select_timezone($item,$domdefaults{$item},undef,$includeempty);
+            $datatable .= &Apache::loncommon::select_timezone($item,$defaults{$item},undef,$includeempty);
         } elsif ($item eq 'datelocale_def') {
             my $includeempty = 1;
-            $datatable .= &Apache::loncommon::select_datelocale($item,$domdefaults{$item},undef,$includeempty);
+            $datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty);
         } elsif ($item eq 'lang_def') {
             my %langchoices = &get_languages_hash();
             $langchoices{''} = 'No language preference';
             %langchoices = &Apache::lonlocal::texthash(%langchoices);
-            $datatable .= &Apache::loncommon::select_form($domdefaults{$item},$item,
+            $datatable .= &Apache::loncommon::select_form($defaults{$item},$item,
                                                           \%langchoices);
         } else {
             my $size;
@@ -3783,7 +3800,7 @@ sub print_defaults {
                 $size = ' size="25"';
             }
             $datatable .= '<input type="text" name="'.$item.'" value="'.
-                          $domdefaults{$item}.'"'.$size.' />';
+                          $defaults{$item}.'"'.$size.' />';
         }
         $datatable .= '</td></tr>';
         $rownum ++;
@@ -3961,7 +3978,7 @@ sub print_scantronformat {
             } 
             $datatable .= '<td>'.$errorstr.'</td><td>&nbsp;';
         } elsif ($scantronurl) {
-           my $link =  &Apache::loncommon::modal_link($scantronurl,&mt('Custom bubblesheet format file'),600,500,
+            my $link =  &Apache::loncommon::modal_link($scantronurl,&mt('Custom bubblesheet format file'),600,500,
                                                        undef,undef,undef,undef,'background-color:#ffffff');
             $datatable .= '<td><span class="LC_nobreak">'.
                           $link.
@@ -4952,7 +4969,9 @@ sub modify_login {
         }
         if (keys(%changes) > 0 || $colchgtext) {
             &Apache::loncommon::devalidate_domconfig_cache($dom);
-            $$lastactref = 'update';
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'domainconfig'} = 1;
+            }
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (sort(keys(%changes))) {
                 if ($item eq 'loginvia') {
@@ -5100,7 +5119,9 @@ sub modify_rolecolors {
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             &Apache::loncommon::devalidate_domconfig_cache($dom);
-            $$lastactref = 'update';
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'domainconfig'} = 1;
+            }
             $resulttext = &display_colorchgs($dom,\%changes,$roles,
                                              $rolehash{'rolecolors'});
         } else {
@@ -5520,7 +5541,7 @@ sub publishlogo {
     if ($fname=~m|/|) {
         ($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|);
     }
-    my @parts=split(/\//,"$filepath/$relpath/$fnamepath");  
+    my @parts=split(/\//,"$filepath/$relpath/$fnamepath");
     my $count;
     for ($count=5;$count<=$#parts;$count++) {
         $filepath.="/$parts[$count]";
@@ -5532,7 +5553,7 @@ sub publishlogo {
     if ($file=~/\.(\w+)$/ &&
         (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
         $output = 
-            &mt('Invalid file extension ([_1]) - reserved for LONCAPA use.',$1); 
+            &mt('Invalid file extension ([_1]) - reserved for internal use.',$1); 
     } elsif ($file=~/\.(\w+)$/ &&
         !defined(&Apache::loncommon::fileembstyle($1))) {
         $output = &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1);
@@ -5781,12 +5802,12 @@ sub check_switchserver {
 }
 
 sub modify_quotas {
-    my ($dom,$action,%domconfig) = @_;
+    my ($dom,$action,$lastactref,%domconfig) = @_;
     my ($context,@usertools,@options,%validations,%titles,%confhash,%toolshash,
         %limithash,$toolregexp,%conditions,$resulttext,%changes);
     if ($action eq 'quotas') {
         $context = 'tools'; 
-    } else { 
+    } else {
         $context = $action;
     }
     if ($context eq 'requestcourses') {
@@ -5803,7 +5824,7 @@ sub modify_quotas {
         @usertools = ('aboutme','blog','webdav','portfolio');
         %titles = &tool_titles();
     }
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
     my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
     foreach my $key (keys(%env)) {
         if ($context eq 'requestcourses') {
@@ -6002,7 +6023,9 @@ sub modify_quotas {
         if (keys(%changes) > 0) {
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
-
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'domdefaults'} = 1;
+            }
             $resulttext = &mt('Changes made:').'<ul>';
             unless (($context eq 'requestcourses') ||
                     ($context eq 'requestauthor')) {
@@ -6014,7 +6037,7 @@ sub modify_quotas {
                             if ($type eq 'default') {
                                 $typetitle = $othertitle;
                             }
-                            $resulttext .= '<li>'.&mt('[_1] set to [_2] Mb',$typetitle,$confhash{'defaultquota'}{$type}).'</li>';
+                            $resulttext .= '<li>'.&mt('[_1] set to [_2] MB',$typetitle,$confhash{'defaultquota'}{$type}).'</li>';
                         }
                     }
                     $resulttext .= '</ul></li>';
@@ -6027,7 +6050,7 @@ sub modify_quotas {
                             if ($type eq 'default') {
                                 $typetitle = $othertitle;
                             }
-                            $resulttext .= '<li>'.&mt('[_1] set to [_2] Mb',$typetitle,$confhash{'authorquota'}{$type}).'</li>';
+                            $resulttext .= '<li>'.&mt('[_1] set to [_2] MB',$typetitle,$confhash{'authorquota'}{$type}).'</li>';
                         }
                     }
                     $resulttext .= '</ul></li>';
@@ -6213,7 +6236,9 @@ sub modify_autoenroll {
             if ($changes{'coowners'}) {
                 $resulttext .= '<li>'.&mt("$title{'coowners'} set to $offon[$env{'form.autoassign_coowners'}]").'</li>';
                 &Apache::loncommon::devalidate_domconfig_cache($dom);
-                $$lastactref = 'update';
+                if (ref($lastactref) eq 'HASH') {
+                    $lastactref->{'domainconfig'} = 1;
+                }
             }
             $resulttext .= '</ul>';
         } else {
@@ -6771,7 +6796,9 @@ sub modify_contacts {
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             &Apache::loncommon::devalidate_domconfig_cache($dom);
-            $$lastactref = 'update';
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'domainconfig'} = 1;
+            }
             my ($titles,$short_titles)  = &contact_titles();
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (@contacts) {
@@ -6846,7 +6873,7 @@ sub modify_usercreation {
     foreach my $item(@contexts) {
         if ($item eq 'selfcreate') {
             @{$cancreate{$item}} = &Apache::loncommon::get_env_multiple('form.can_createuser_'.$item);
-            my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+            my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
             if (!((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth'))) {
                 if (ref($cancreate{$item}) eq 'ARRAY') { 
                     if (grep(/^login$/,@{$cancreate{$item}})) {
@@ -7413,9 +7440,9 @@ sub modify_usermodification {
 }
 
 sub modify_defaults {
-    my ($dom,$r,%domconfig) = @_;
+    my ($dom,$lastactref,%domconfig) = @_;
     my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors);
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
     my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def','portal_def');
     my @authtypes = ('internal','krb4','krb5','localauth');
     foreach my $item (@items) {
@@ -7475,7 +7502,7 @@ sub modify_defaults {
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
-            my $version = $r->dir_config('lonVersion');
+            my $version = &Apache::lonnet::get_server_loncaparev($dom);
             my $mailmsgtext = "Changes made to domain settings in a LON-CAPA installation - domain: $dom (running version: $version) - dns_domain.tab needs to be updated with the following changes, to support legacy 2.4, 2.5 and 2.6 versions of LON-CAPA.\n\n";
             foreach my $item (sort(keys(%changes))) {
                 my $value = $env{'form.'.$item};
@@ -7498,6 +7525,9 @@ sub modify_defaults {
             $mailmsgtext .= "\n";
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'domdefaults'} = 1;
+            }
             if ($changes{'auth_def'} || $changes{'auth_arg_def'} || $changes{'lang_def'} || $changes{'datelocale_def'}) {
                 my $notify = 1;
                 if (ref($domconfig{'contacts'}) eq 'HASH') {
@@ -7590,7 +7620,9 @@ sub modify_scantron {
                 }
                 $resulttext .= '</ul>';
                 &Apache::loncommon::devalidate_domconfig_cache($dom);
-                $$lastactref = 'update';
+                if (ref($lastactref) eq 'HASH') {
+                    $lastactref->{'domainconfig'} = 1;
+                }
             } else {
                 $resulttext = &mt('No changes made to bubblesheet format file');
             }
@@ -7980,7 +8012,7 @@ sub modify_helpsettings {
                 } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
                     $changes{$item} = 1;
                 }
-	    }
+            }
             if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) {
                 $helphash{'helpsettings'}{$item} = $env{'form.'.$item};
             }
@@ -8014,7 +8046,7 @@ sub modify_helpsettings {
 }
 
 sub modify_coursedefaults {
-    my ($dom,%domconfig) = @_;
+    my ($dom,$lastactref,%domconfig) = @_;
     my ($resulttext,$errors,%changes,%defaultshash);
     my %defaultchecked = ('canuse_pdfforms' => 'off');
     my @toggles = ('canuse_pdfforms');
@@ -8055,7 +8087,7 @@ sub modify_coursedefaults {
         }
         foreach my $item (@numbers) {
             my ($currdef,$newdef);
-            my $newdef = $env{'form.'.$item};
+            $newdef = $env{'form.'.$item};
             if ($item eq 'anonsurvey_threshold') {
                 $currdef = $domconfig{'coursedefaults'}{$item};
                 $newdef =~ s/\D//g;
@@ -8105,10 +8137,9 @@ sub modify_coursedefaults {
     my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
                                              $dom);
     if ($putresult eq 'ok') {
-        my %domdefaults;
         if (keys(%changes) > 0) {
+            my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
             if (($changes{'canuse_pdfforms'}) || ($changes{'coursecredits'}) || ($changes{'uploadquota'})) {
-                %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
                 if ($changes{'canuse_pdfforms'}) {
                     $domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'};
                 }
@@ -8129,6 +8160,9 @@ sub modify_coursedefaults {
                 }
                 my $cachetime = 24*60*60;
                 &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+                if (ref($lastactref) eq 'HASH') {
+                    $lastactref->{'domdefaults'} = 1;
+                }
             }
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (sort(keys(%changes))) {
@@ -8139,7 +8173,7 @@ sub modify_coursedefaults {
                         $resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>';
                     }
                 } elsif ($item eq 'anonsurvey_threshold') {
-                        $resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>';
+                    $resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>';
                 } elsif ($item eq 'uploadquota') {
                     if (ref($defaultshash{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
                         $resulttext .= '<li>'.&mt('Default quota for content uploaded to a course/community via Course Editor set as follows:').'<ul>'.
@@ -8180,7 +8214,7 @@ sub modify_coursedefaults {
 }
 
 sub modify_usersessions {
-    my ($dom,%domconfig) = @_;
+    my ($dom,$lastactref,%domconfig) = @_;
     my @hostingtypes = ('version','excludedomain','includedomain');
     my @offloadtypes = ('primary','default');
     my %types = (
@@ -8197,7 +8231,7 @@ sub modify_usersessions {
     foreach my $prefix (@prefixes) {
         $defaultshash{'usersessions'}{$prefix} = {};
     }
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
     my $resulttext;
     my %iphost = &Apache::lonnet::get_iphost();
     foreach my $prefix (@prefixes) {
@@ -8373,6 +8407,9 @@ sub modify_usersessions {
             }
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'domdefaults'} = 1;
+            }
             if (keys(%changes) > 0) {
                 my %lt = &usersession_titles();
                 $resulttext = &mt('Changes made:').'<ul>';
@@ -8384,7 +8421,8 @@ sub modify_usersessions {
                                 foreach my $lonhost (sort(keys(%{$changes{$prefix}}))) {
                                     $resulttext .= '<li><b>'.$lonhost.'</b> ';
                                     my $lonhostdom = &Apache::lonnet::host_domain($lonhost);
-                                    &Apache::lonnet::remote_devalidate_cache($lonhost,'spares',$lonhostdom);
+                                    my $cachekey = &escape('spares').':'.&escape($lonhostdom);
+                                    &Apache::lonnet::remote_devalidate_cache($lonhost,[$cachekey]);
                                     if (ref($changes{$prefix}{$lonhost}) eq 'HASH') {
                                         foreach my $type (@{$types{$prefix}}) {
                                             if ($changes{$prefix}{$lonhost}{$type}) {
@@ -8566,13 +8604,13 @@ sub modify_loadbalancing {
         }
         my $putresult = &Apache::lonnet::put_dom('configuration',
                                                  \%defaultshash,$dom);
-
         if ($putresult eq 'ok') {
             if (keys(%changes) > 0) {
                 if (ref($changes{'delete'}) eq 'ARRAY') {
                     foreach my $balancer (sort(@{$changes{'delete'}})) {
                         $resulttext .= '<li>'.&mt('Load Balancing discontinued for: [_1]',$balancer).'</li>';
-                        &Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom);
+                        my $cachekey = &escape('loadbalancing').':'.&escape($dom);
+                        &Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]);
                     }
                 }
                 if (ref($changes{'add'}) eq 'ARRAY') {
@@ -8617,17 +8655,19 @@ sub modify_loadbalancing {
                                         my $balancetext;
                                         if ($rule eq '') {
                                             $balancetext =  $ruletitles{'default'};
-                                        } elsif (($rule eq 'homeserver') || ($rule eq 'externalbalancer')) {
+                                        } elsif (($rule eq 'homeserver') || ($rule eq 'externalbalancer') ||
+                                                 ($rule eq 'balancer') || ($rule eq 'offloadedto')) {
                                             $balancetext =  $ruletitles{$rule};
                                         } else {
                                             $balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type});
                                         }
-                                        $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- balancing for [_2] set to - "[_3]"',$balancer,$titles->{$type},$balancetext).'</li>'; 
+                                        $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- balancing for [_2] set to - "[_3]"',$balancer,$titles->{$type},$balancetext).'</li>';
                                     }
                                 }
                             }
                         }
-                        &Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom);
+                        my $cachekey = &scape('loadbalancing').':'.&escape($dom);
+                        &Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]);
                     }
                 }
                 if ($resulttext ne '') {
@@ -8682,7 +8722,7 @@ sub recurse_cat_deletes {
                 delete($coursecategories->{$subitem});
                 $deletions->{$subitem} = 1;
                 &recurse_cat_deletes($subitem,$coursecategories,$deletions);
-            }  
+            }
         }
     }
     return;
@@ -8920,7 +8960,6 @@ function showSpares(balancer,ishomedom,b
             } else {
                 document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='none';
                 document.getElementById('balancerule_'+balnum+'_'+insttypes[k]).style.display='none';
-
             }
         } else {
             document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='block';
@@ -8937,7 +8976,6 @@ function showSpares(balancer,ishomedom,b
                 if ((currBalancers.indexOf(alltargets[m]) == -1) && (alltargets[m] != balancer)) {
                     idx ++;
                     item.options[idx] = new Option(alltargets[m],alltargets[m],false,false);
-
                 }
             }
         }
@@ -9010,7 +9048,7 @@ function singleServerToggle(balnum,type)
 
 function balanceruleChange(formname,balnum,type) {
     if (type == '_LC_external') {
-        return; 
+        return;
     }
     var typesRules = getIndicesByName(formname,'loadbalancing_rules_'+balnum+'_'+type);
     for (var i=0; i<typesRules.length; i++) {
@@ -9351,16 +9389,24 @@ sub captcha_phrases {
 }
 
 sub devalidate_remote_domconfs {
-    my ($dom) = @_;
-    my $primary_id = &Apache::lonnet::domain($dom,'primary');
-    my $intdom = &Apache::lonnet::internet_dom($primary_id);
+    my ($dom,$cachekeys) = @_;
+    return unless (ref($cachekeys) eq 'HASH');
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
     my %thismachine;
     map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
+    my @posscached = ('domainconfig','domdefaults');
     if (keys(%servers) > 1) {
         foreach my $server (keys(%servers)) {
             next if ($thismachine{$server});
-            &Apache::lonnet::remote_devalidate_cache($server,'domainconfig',$dom);
+            my @cached;
+            foreach my $name (@posscached) {
+                if ($cachekeys->{$name}) {
+                    push(@cached,&escape($name).':'.&escape($dom));
+                }
+            }
+            if (@cached) {
+                &Apache::lonnet::remote_devalidate_cache($server,\@cached);
+            }
         }
     }
     return;