--- loncom/interface/domainprefs.pm	2023/06/03 19:18:11	1.425
+++ loncom/interface/domainprefs.pm	2023/06/20 14:03:52	1.427
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.425 2023/06/03 19:18:11 raeburn Exp $
+# $Id: domainprefs.pm,v 1.427 2023/06/20 14:03:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -568,7 +568,7 @@ sub handler {
                   modify => \&modify_selfenrollment,
                  },
         'privacy' => 
-                 {text   => 'Availability of User Information',
+                 {text   => 'Role assignments and user privacy',
                   help   => 'Domain_Configuration_User_Privacy',
                   header => [{col1 => 'Role assigned in different domain',
                               col2 => 'Approval options'},
@@ -882,7 +882,7 @@ sub process_changes {
     } elsif ($action eq 'lti') {
         $output = &modify_lti($r,$dom,$action,$lastactref,%domconfig);
     } elsif ($action eq 'privacy') {
-        $output = &modify_privacy($dom,%domconfig);
+        $output = &modify_privacy($dom,$lastactref,%domconfig);
     } elsif ($action eq 'passwords') {
         $output = &modify_passwords($r,$dom,$confname,$lastactref,%domconfig);
     } elsif ($action eq 'wafproxy') {
@@ -6782,22 +6782,6 @@ sub ltimenu_titles {
     );
 }
 
-sub check_switchserver {
-    my ($home) = @_;
-    my $switchserver;
-    if ($home ne '') {
-        my $allowed;
-        my @ids=&Apache::lonnet::current_machine_ids();
-        foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
-        if (!$allowed) {
-            $switchserver='<a href="/adm/switchserver?otherserver='.$home.'&amp;role='.
-                          &HTML::Entities::encode($env{'request.role'},'\'<>"&').
-                          '&amp;destinationurl=/adm/domainprefs">'.&mt('Switch Server').'</a>';
-        }
-    }
-    return $switchserver;
-}
-
 sub print_coursedefaults {
     my ($position,$dom,$settings,$rowtotal) = @_;
     my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles);
@@ -11715,7 +11699,6 @@ sub modifiable_userdata_row {
               '<td class="LC_left_item" colspan="2"><table>';
     my $rem;
     my %checks;
-    my %current;
     if (ref($settings) eq 'HASH') {
         my $hashref;
         if ($context eq 'lti') {
@@ -13492,7 +13475,9 @@ sub check_switchserver {
     my @ids=&Apache::lonnet::current_machine_ids();
     foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
     if (!$allowed) {
-	$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&amp;role=dc./'.$dom.'/&amp;destinationurl=/adm/domainprefs">'.&mt('Switch Server').'</a>';
+	$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&amp;role='.
+                      &HTML::Entities::encode($env{'request.role'},'\'<>"&').
+                      '&amp;destinationurl=/adm/domainprefs">'.&mt('Switch Server').'</a>';
     }
     return $switchserver;
 }
@@ -17111,7 +17096,7 @@ sub modify_contacts {
 }
 
 sub modify_privacy {
-    my ($dom,%domconfig) = @_;
+    my ($dom,$lastactref,%domconfig) = @_;
     my ($resulttext,%current,%changes);
     if (ref($domconfig{'privacy'}) eq 'HASH') {
         %current = %{$domconfig{'privacy'}};
@@ -17347,6 +17332,28 @@ sub modify_privacy {
                 }
             }
             $resulttext .= '</ul>';
+            if ($changes{'approval'}) {
+                my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+                delete($domdefaults{'userapprovals'});
+                if (ref($privacyhash{'approval'}) eq 'HASH') {
+                    foreach my $domtype ('instdom','extdom') {
+                        if (ref($privacyhash{'approval'}{$domtype}) eq 'HASH') {
+                            foreach my $roletype ('domain','author','course','community') {
+                                if ($privacyhash{'approval'}{$domtype}{$roletype} eq 'user') {
+                                    $domdefaults{'userapprovals'} = 1;
+                                    last;
+                                }
+                            }
+                        }
+                        last if ($domdefaults{'userapprovals'});               
+                    }
+                }
+                my $cachetime = 24*60*60;
+                &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+                if (ref($lastactref) eq 'HASH') {
+                    $lastactref->{'domdefaults'} = 1;
+                }
+            }
         } else {
             $resulttext = &mt('No changes made to user information settings');
         }