--- loncom/interface/domainprefs.pm	2022/08/24 20:58:50	1.412
+++ loncom/interface/domainprefs.pm	2023/03/08 15:06:45	1.420
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.412 2022/08/24 20:58:50 raeburn Exp $
+# $Id: domainprefs.pm,v 1.420 2023/03/08 15:06:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -167,6 +167,7 @@ use Apache::lonmsg();
 use Apache::lonconfigsettings;
 use Apache::lonuserutils();
 use Apache::loncoursequeueadmin();
+use Apache::courseprefs();
 use LONCAPA qw(:DEFAULT :match);
 use LONCAPA::Enrollment;
 use LONCAPA::lonauthcgi();
@@ -359,7 +360,7 @@ sub handler {
                       modify => \&modify_passwords,
                     },
         'quotas' => 
-                    { text => 'Blogs, personal web pages, webDAV/quotas, portfolios',
+                    { text => 'Blogs, personal pages/timezones, webDAV/quotas, portfolio',
                       help => 'Domain_Configuration_Quotas',
                       header => [{col1 => 'User affiliation',
                                   col2 => 'Available tools',
@@ -2383,7 +2384,7 @@ sub print_quotas {
         @options = ('norequest','approval','automatic');
         %titles = &authorrequest_titles();
     } else {
-        @usertools = ('aboutme','blog','webdav','portfolio');
+        @usertools = ('aboutme','blog','webdav','portfolio','timezone');
         %titles = &tool_titles();
     }
     if (ref($types) eq 'ARRAY') {
@@ -2487,9 +2488,12 @@ sub print_quotas {
                         }
                     } else {
                         my $checked = 'checked="checked" ';
+                        if ($item eq 'timezone') {
+                            $checked = '';
+                        }
                         if (ref($settings) eq 'HASH') {
                             if (ref($settings->{$item}) eq 'HASH') {
-                                if ($settings->{$item}->{$type} == 0) {
+                                if (!$settings->{$item}->{$type}) {
                                     $checked = '';
                                 } elsif ($settings->{$item}->{$type} == 1) {
                                     $checked =  'checked="checked" ';
@@ -3428,8 +3432,17 @@ ENDSCRIPT
 sub lti_javascript {
     my ($dom,$settings) = @_;
     my $togglejs = &lti_toggle_js($dom);
+    my $linkprot_js = &Apache::courseprefs::linkprot_javascript();
     unless (ref($settings) eq 'HASH') {
-        return $togglejs;
+        return $togglejs.'
+<script type="text/javascript">
+// <![CDATA[
+
+'.$linkprot_js.'
+
+// ]]>
+</script>
+';
     }
     my (%ordered,$total,%jstext);
     $total = scalar(keys(%{$settings}));
@@ -3447,7 +3460,6 @@ sub lti_javascript {
         push(@jsarray,$ordered{$item});
     }
     my $jstext = '    var lti = Array('."'".join("','",@jsarray)."'".');'."\n";
-    my $linkprot_js = &Apache::courseprefs::linkprot_javascript();
     return <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
@@ -6580,12 +6592,12 @@ sub print_lti {
                           '<label><input type="radio" value="1" name="ltisec_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$hostid'".');" />'.&mt('Yes').
                           '</label>&nbsp;&nbsp;</span><div id="ltisec_divchgprivkey_'.$hostid.'" style="display:none" />'.
                           '<span class="LC_nobreak">'.&mt('New Key').':'.
-                          '<input type="password" size="20" name="ltisec_privkey_'.$hostid.'" value="" autocomplete="off" />'.
+                          '<input type="password" size="20" name="ltisec_privkey_'.$hostid.'" value="" autocomplete="new-password" />'.
                           '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltisec_privkey_'.$hostid.'.type='."'text'".' } else { this.form.ltisec_privkey_'.$hostid.'.type='."'password'".' }" />'.&mt('Visible input').'</label>'.
                           '</span></div>';
             } else {
                 $extra .= '<span class="LC_nobreak">'.&mt('Encryption Key').':'.
-                          '<input type="password" size="20" name="ltisec_privkey_'.$hostid.'" value="" autocomplete="off" />'.
+                          '<input type="password" size="20" name="ltisec_privkey_'.$hostid.'" value="" autocomplete="new-password" />'.
                           '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltisec_privkey_'.$hostid.'.type='."'text'".' } else { this.form.ltisec_privkey_'.$hostid.'.type='."'password'".' }" />'.&mt('Visible input').'</label>';
             }
             $extra .= '</fieldset>';
@@ -7711,13 +7723,15 @@ 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)',
                      author => 'Assigned co-author role(s)',
                      course => 'Assigned course role(s)',
-                     community => 'Assigned community role',
+                     community => 'Assigned community role(s)',
                  );
         $numinrow = 4;
         ($othertitle,$usertypes,$types) =
@@ -7736,6 +7750,7 @@ sub print_privacy {
                 auto   => 'Unrestricted',
                 instdom => 'Other domain shares institution/provider',
                 extdom => 'Other domain has different institution/provider',
+                notify => 'Notify when role needs authorization',
             );
             my %names = &Apache::lonlocal::texthash (
                 domain => 'Domain role',
@@ -7787,6 +7802,28 @@ sub print_privacy {
                 $datatable .= '</td></tr>';
                 $itemcount ++;
             }
+            $css_class = $itemcount%2?' class="LC_odd_row"':'';
+            $datatable .= '<tr'.$css_class.'><td>'.$titles{'notify'}.'</td>'.
+                          '<td class="LC_left_item">';
+            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 .='</td></tr>';
         } elsif ($position eq 'middle') {
             if ((@instdoms > 1) || (keys(%by_location) > 0)) {
                 if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
@@ -9701,6 +9738,7 @@ sub tool_titles {
                      blog       => 'Blog',
                      webdav     => 'WebDAV',
                      portfolio  => 'Portfolio',
+                     timezone   => 'Can set time zone',
                      official   => 'Official courses (with institutional codes)',
                      unofficial => 'Unofficial courses',
                      community  => 'Communities',
@@ -10671,13 +10709,29 @@ sub print_defaults {
             } elsif ($item eq 'lang_def') {
                 my $includeempty = 1;
                 $datatable .= &Apache::loncommon::select_language($item,$defaults{$item},$includeempty);
-            } else {
-                my $size;
-                if ($item eq 'portal_def') {
-                    $size = ' size="25"';
-                }
+            } elsif ($item eq 'portal_def') {
                 $datatable .= '<input type="text" name="'.$item.'" value="'.
-                              $defaults{$item}.'"'.$size.' />';
+                              $defaults{$item}.'" size="25" onkeyup="portalExtras(this);" />';
+                my $portalsty = 'none';
+                if ($defaults{$item}) {
+                    $portalsty = 'block';
+                }
+                foreach my $field ('email','web') {
+                    my $checkedoff = ' checked="checked"';
+                    my $checkedon;
+                    if ($defaults{$item.'_'.$field}) {
+                        $checkedon = $checkedoff;
+                        $checkedoff = '';
+                    } 
+                    $datatable .= '<div id="'.$item.'_'.$field.'_div" style="display:'.$portalsty.'">'.
+                              '<span class="LC_nobreak">'.$titles->{$field}.'&nbsp;'.
+                              '<label><input type="radio" name="'.$item.'_'.$field.'" value="1"'.$checkedon.'/>'.&mt('Yes').'</label>'.
+                              ('&nbsp;'x2).
+                              '<label><input type="radio" name="'.$item.'_'.$field.'" value="0"'.$checkedoff.'/>'.&mt('No').'</label>'.
+                              '</div>';
+                }
+            } else {
+                $datatable .= '<input type="text" name="'.$item.'" value="'.$defaults{$item}.'" />';
             }
             $datatable .= '</td></tr>';
             $rownum ++;
@@ -10773,6 +10827,8 @@ sub defaults_titles {
                    'timezone_def'  => 'Default timezone',
                    'datelocale_def' => 'Default locale for dates',
                    'portal_def'     => 'Portal/Default URL',
+                   'email'          => 'Email links use portal URL',
+                   'web'            => 'Public web links use portal URL',
                    'intauth_cost'   => 'Encryption cost for bcrypt (positive integer)',
                    'intauth_check'  => 'Check bcrypt cost if authenticated',
                    'intauth_switch' => 'Existing crypt-based switched to bcrypt on authentication',
@@ -11487,6 +11543,23 @@ sub serverstatus_pages {
 sub defaults_javascript {
     my ($settings) = @_;
     return unless (ref($settings) eq 'HASH');
+    my $portal_js = <<"ENDPORTAL";
+
+function portalExtras(caller) {
+    var x = caller.value;
+    var y = new Array('email','web');
+    for (var i=0; i<y.length; i++) { 
+        if (document.getElementById('portal_def_'+y[i]+'_div')) {
+            var z = document.getElementById('portal_def_'+y[i]+'_div');
+            if (x.length > 0) {
+                z.style.display = 'block';
+            } else {
+                z.style.display = 'none';
+            }
+        }
+    }
+}
+ENDPORTAL
     if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) {
         my $maxnum = scalar(@{$settings->{'inststatusorder'}});
         if ($maxnum eq '') {
@@ -11540,6 +11613,17 @@ $jstext
     return;
 }
 
+$portal_js
+
+// ]]>
+</script>
+
+ENDSCRIPT
+    } else {
+return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+$portal_js
 // ]]>
 </script>
 
@@ -13963,7 +14047,7 @@ sub modify_quotas {
         @usertools = ('author');
         %titles = &authorrequest_titles();
     } else {
-        @usertools = ('aboutme','blog','webdav','portfolio');
+        @usertools = ('aboutme','blog','webdav','portfolio','timezone');
         %titles = &tool_titles();
     }
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
@@ -17900,7 +17984,7 @@ sub modify_privacy {
                    domain => 'Assigned domain role(s)',
                    author => 'Assigned co-author role(s)',
                    course => 'Assigned course role(s)',
-                   community => 'Assigned community role',
+                   community => 'Assigned community role(s)',
                 );
     my %roles = &Apache::lonlocal::texthash (
                    domain => 'Domain role',
@@ -17919,6 +18003,7 @@ sub modify_privacy {
                   user     => 'User authorizes',
                   domain   => 'Domain Coordinator authorizes',
                   auto     => 'Unrestricted',
+                  notify   => 'Notify when role needs authorization',
     );
     my %fieldnames = &Apache::lonlocal::texthash (
                         id => 'Student/Employee ID',
@@ -17944,7 +18029,7 @@ sub modify_privacy {
                       );
     foreach my $item (@items) {
         if (@instdoms > 1) {
-            if ($env{'form.privacy_approval_instdom'.$item} =~ /^(none|user|domain|auto)$/) {
+            if ($env{'form.privacy_approval_instdom_'.$item} =~ /^(none|user|domain|auto)$/) {
                 $privacyhash{'approval'}{'instdom'}{$item} = $env{'form.privacy_approval_instdom_'.$item};
             }
             if (ref($current{'approval'}) eq 'HASH') {
@@ -18036,6 +18121,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,
@@ -18044,7 +18141,7 @@ sub modify_privacy {
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made: ').'<ul>';
-            foreach my $key ('approval','othdom','priv','unpriv') {
+            foreach my $key ('approval','notify','othdom','priv','unpriv') {
                 if ($changes{$key}) {
                     $resulttext .= '<li>'.$titles{$key}.':<ul>';
                     if ($key eq 'approval') {
@@ -18062,6 +18159,15 @@ sub modify_privacy {
                             }
                             $resulttext .= '</ul></li>';
                         }
+                    } elsif ($key eq 'notify') {
+                        if ($privacyhash{$key}) {
+                            foreach my $dc (split(/,/,$privacyhash{$key})) {
+                                my ($dcname,$dcdom) = split(/:/,$dc);
+                                $resulttext .= '<li>'.&Apache::loncommon::plainname($dcname,$dcdom).'</li>';
+                            }
+                        } else {
+                            $resulttext .= '<li>'.&mt('No DCs to notify').'</li>';
+                        }
                     } elsif ($key eq 'othdom') {
                         my @statuses;
                         if (ref($types) eq 'ARRAY') {
@@ -18102,6 +18208,7 @@ sub modify_privacy {
                     $resulttext .= '</ul></li>';
                 }
             }
+            $resulttext .= '</ul>'; 
         } else {
             $resulttext = &mt('No changes made to user information settings');
         }
@@ -19989,16 +20096,58 @@ sub modify_defaults {
             }
         } elsif ($item eq 'portal_def') {
             if ($newvalues{$item} ne '') {
-                unless ($newvalues{$item} =~ /^https?\:\/\/(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])\/?$/) {
+                if ($newvalues{$item} =~ /^https?\:\/\/(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])\/?$/) {
+                    foreach my $field ('email','web') {
+                        if ($env{'form.'.$item.'_'.$field}) {
+                            $newvalues{$item.'_'.$field} = $env{'form.'.$item.'_'.$field};
+                        }
+                    }
+                } else {
                     push(@errors,$item);
                 }
             }
         }
         if (grep(/^\Q$item\E$/,@errors)) {
             $newvalues{$item} = $domdefaults{$item};
+            if ($item eq 'portal_def') {
+                if ($domdefaults{$item}) {
+                    foreach my $field ('email','web') {
+                        if (exists($domdefaults{$item.'_'.$field})) {
+                            $newvalues{$item.'_'.$field} = $domdefaults{$item.'_'.$field};
+                        }
+                    }
+                }
+            }
         } elsif ($domdefaults{$item} ne $newvalues{$item}) {
             $changes{$item} = 1;
         }
+        if ($item eq 'portal_def') {
+            unless (grep(/^\Q$item\E$/,@errors)) {
+                if ($newvalues{$item} eq '') { 
+                    foreach my $field ('email','web') {
+                        if (exists($domdefaults{$item.'_'.$field})) {
+                            delete($domdefaults{$item.'_'.$field});
+                        }
+                    }
+                } else {
+                    unless ($changes{$item}) {
+                        foreach my $field ('email','web') {
+                            if ($domdefaults{$item.'_'.$field} ne $newvalues{$item.'_'.$field}) {
+                                $changes{$item} = 1;
+                                last;
+                            }
+                        }
+                    }
+                    foreach my $field ('email','web') {
+                        if ($newvalues{$item.'_'.$field}) {
+                            $domdefaults{$item.'_'.$field} = $newvalues{$item.'_'.$field};
+                        } elsif (exists($domdefaults{$item.'_'.$field})) {
+                            delete($domdefaults{$item.'_'.$field});
+                        }
+                    }
+                }
+            }
+        }
         $domdefaults{$item} = $newvalues{$item};
     }
     my %staticdefaults = (
@@ -20198,7 +20347,20 @@ sub modify_defaults {
                         $value = $authnames{$shortauth{$value}};
                     }
                     $resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>';
-                    $mailmsgtext .= "$title->{$item} set to $value\n";  
+                    $mailmsgtext .= "$title->{$item} set to $value\n";
+                    if ($item eq 'portal_def') {
+                        if ($env{'form.'.$item} ne '') {
+                            foreach my $field ('email','web') {
+                                $value = $env{'form.'.$item.'_'.$field};
+                                if ($value) {
+                                    $value = &mt('Yes');
+                                } else {
+                                    $value = &mt('No');
+                                }
+                                $resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$field},$value).'</li>';
+                            }
+                        }
+                    }
                 }
             }
             $resulttext .= '</ul>';
@@ -22125,6 +22287,7 @@ sub modify_wafproxy {
                     }
                 }
             }
+            $output .= '</ul>';
         } else {
             $output = '<span class="LC_error">'.
                       &mt('An error occurred: [_1]',$putresult).'</span>';