--- loncom/interface/domainprefs.pm 2022/11/11 02:30:19 1.416
+++ loncom/interface/domainprefs.pm 2022/11/17 13:12:40 1.417
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.416 2022/11/11 02:30:19 raeburn Exp $
+# $Id: domainprefs.pm,v 1.417 2022/11/17 13:12:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -7714,7 +7714,9 @@ sub print_privacy {
my ($position,$dom,$settings,$rowtotal) = @_;
my ($datatable,$css_class,$numinrow,@items,%names,$othertitle,$usertypes,$types);
my $itemcount = 0;
- unless ($position eq 'top') {
+ if ($position eq 'top') {
+ $numinrow = 2;
+ } else {
@items = ('domain','author','course','community');
%names = &Apache::lonlocal::texthash (
domain => 'Assigned domain role(s)',
@@ -7739,6 +7741,7 @@ sub print_privacy {
auto => 'Unrestricted',
instdom => 'Other domain shares institution/provider',
extdom => 'Other domain has different institution/provider',
+ notify => 'Receive notification of role requests requiring DC authorization',
);
my %names = &Apache::lonlocal::texthash (
domain => 'Domain role',
@@ -7790,6 +7793,28 @@ sub print_privacy {
$datatable .= '';
$itemcount ++;
}
+ $css_class = $itemcount%2?' class="LC_odd_row"':'';
+ $datatable .= '
'.$titles{'notify'}.' | '.
+ '';
+ if ((@instdoms > 1) || (keys(%by_location) > 0)) {
+ my %curr;
+ if (ref($settings) eq 'HASH') {
+ if ($settings->{'notify'} ne '') {
+ map {$curr{$_}=1;} split(/,/,$settings->{'notify'});
+ }
+ }
+ $css_class = $itemcount%2?' class="LC_odd_row"':'';
+ my ($numdc,$table,$rows) = &active_dc_picker($dom,$numinrow,'checkbox',
+ 'privacy_notify',%curr);
+ if ($numdc > 0) {
+ $datatable .= $table;
+ } else {
+ $datatable .= &mt('There are no active Domain Coordinators');
+ }
+ } else {
+ $datatable .= &mt('Nothing to set here, as there are no other domains');
+ }
+ $datatable .=' |
';
} elsif ($position eq 'middle') {
if ((@instdoms > 1) || (keys(%by_location) > 0)) {
if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
@@ -17969,6 +17994,7 @@ sub modify_privacy {
user => 'User authorizes',
domain => 'Domain Coordinator authorizes',
auto => 'Unrestricted',
+ notify => 'Receive notification of role requests requiring DC authorization',
);
my %fieldnames = &Apache::lonlocal::texthash (
id => 'Student/Employee ID',
@@ -18086,6 +18112,18 @@ sub modify_privacy {
}
}
}
+ my %domcoords = &Apache::lonnet::get_active_domroles($dom,['dc']);
+ my %notify;
+ foreach my $possdc (&Apache::loncommon::get_env_multiple('form.privacy_notify')) {
+ if (exists($domcoords{$possdc})) {
+ $notify{$possdc} = 1;
+ }
+ }
+ my $notify = join(',',sort(keys(%notify)));
+ if ($current{'notify'} ne $notify) {
+ $changes{'notify'} = 1;
+ }
+ $privacyhash{'notify'} = $notify;
}
my %confighash = (
privacy => \%privacyhash,
@@ -18094,7 +18132,7 @@ sub modify_privacy {
if ($putresult eq 'ok') {
if (keys(%changes) > 0) {
$resulttext = &mt('Changes made: ').'';
- foreach my $key ('approval','othdom','priv','unpriv') {
+ foreach my $key ('approval','notify','othdom','priv','unpriv') {
if ($changes{$key}) {
$resulttext .= '- '.$titles{$key}.':
';
if ($key eq 'approval') {
@@ -18112,6 +18150,15 @@ sub modify_privacy {
}
$resulttext .= '
';
}
+ } elsif ($key eq 'notify') {
+ if ($privacyhash{$key}) {
+ foreach my $dc (split(/,/,$privacyhash{$key})) {
+ my ($dcname,$dcdom) = split(/:/,$dc);
+ $resulttext .= '- '.&Apache::loncommon::plainname($dcname,$dcdom).'
';
+ }
+ } else {
+ $resulttext .= '- '.&mt('No DCs to notify').'
';
+ }
} elsif ($key eq 'othdom') {
my @statuses;
if (ref($types) eq 'ARRAY') {