--- loncom/interface/domainprefs.pm	2022/02/14 02:48:46	1.405
+++ 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.405 2022/02/14 02:48:46 raeburn Exp $
+# $Id: domainprefs.pm,v 1.417 2022/11/17 13:12:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -249,13 +249,16 @@ sub handler {
         }
     }
     if (ref($domconfig{'ltisec'}) eq 'HASH') {
-        if (ref($domconfig{'ltisec'}{'prot'}) eq 'HASH') {
+        if (ref($domconfig{'ltisec'}{'linkprot'}) eq 'HASH') {
             if (ref($encconfig{'linkprot'}) eq 'HASH') {
-                foreach my $id (keys(%{$domconfig{'ltisec'}{'prot'}})) {
-                    if ((ref($domconfig{'ltisec'}{'prot'}{$id}) eq 'HASH') &&
+                foreach my $id (keys(%{$domconfig{'ltisec'}{'linkprot'}})) {
+                    unless ($id =~ /^\d+$/) {
+                        delete($domconfig{'ltisec'}{'linkprot'}{$id});
+                    }
+                    if ((ref($domconfig{'ltisec'}{'linkprot'}{$id}) eq 'HASH') &&
                         (ref($encconfig{'linkprot'}{$id}) eq 'HASH')) {
                         foreach my $item ('key','secret') {
-                            $domconfig{'ltisec'}{'prot'}{$id}{$item} = $encconfig{'linkprot'}{$id}{$item};
+                            $domconfig{'ltisec'}{'linkprot'}{$id}{$item} = $encconfig{'linkprot'}{$id}{$item};
                         }
                     }
                 }
@@ -324,7 +327,9 @@ sub handler {
                       header => [{col1 => 'Setting',
                                   col2 => 'Value'},
                                  {col1 => 'Institutional user types',
-                                  col2 => 'Name displayed'}],
+                                  col2 => 'Name displayed'},
+                                 {col1 => 'Mapping for missing usernames via standard log-in',
+                                  col2 => 'Rules in use'}],
                       print => \&print_defaults,
                       modify => \&modify_defaults,
                     },
@@ -354,7 +359,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',
@@ -637,7 +642,7 @@ sub handler {
                               col2 => 'Settings'},
                              {col1 => 'Rules for shared secrets', 
                               col2 => 'Settings'},
-                             {col1 => 'Link Protectors (domain)',
+                             {col1 => 'Link Protectors',
                               col2 => 'Settings'},
                              {col1 => 'Consumers',
                               col2 => 'Settings'},],
@@ -980,7 +985,7 @@ sub print_config_box {
         if (($action eq 'autoupdate') || ($action eq 'usercreation') ||
             ($action eq 'selfcreation') || ($action eq 'selfenrollment') ||
             ($action eq 'usersessions') || ($action eq 'coursecategories') || 
-            ($action eq 'trust') || ($action eq 'contacts') ||
+            ($action eq 'trust') || ($action eq 'contacts') || ($action eq 'defaults') ||
             ($action eq 'privacy') || ($action eq 'passwords') || ($action eq 'lti')) {
             if ($action eq 'coursecategories') {
                 $output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal);
@@ -1068,8 +1073,8 @@ sub print_config_box {
             }
             $rowtotal ++;
         } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') ||
-                 ($action eq 'defaults') || ($action eq 'directorysrch') ||
-                 ($action eq 'helpsettings') || ($action eq 'wafproxy')) {
+                 ($action eq 'directorysrch') || ($action eq 'helpsettings') ||
+                 ($action eq 'wafproxy')) {
             $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'scantron') {
             $output .= $item->{'print'}->($r,'bottom',$dom,$confname,$settings,\$rowtotal);
@@ -1623,13 +1628,13 @@ sub print_login {
                       '<table><tr><th>'.$choices{'hostid'}.'</th>'.
                       '<th>'.$choices{'samllanding'}.'</th>'.
                       '<th>'.$choices{'samloptions'}.'</th></tr>'."\n";
-        my (%saml,%samltext,%samlimg,%samlalt,%samlurl,%samltitle,%samlnotsso,%styleon,%styleoff);
+        my (%saml,%samltext,%samlimg,%samlalt,%samlurl,%samltitle,%samlwindow,%samlnotsso,%styleon,%styleoff);
         foreach my $lonhost (keys(%domservers)) {
             $samlurl{$lonhost} = '/adm/sso';
             $styleon{$lonhost} = 'display:none';
             $styleoff{$lonhost} = '';
         }
-        if (ref($settings->{'saml'}) eq 'HASH') {
+        if ((ref($settings) eq 'HASH') && (ref($settings->{'saml'}) eq 'HASH')) {
             foreach my $lonhost (keys(%{$settings->{'saml'}})) {
                 if (ref($settings->{'saml'}{$lonhost}) eq 'HASH') {
                     $saml{$lonhost} = 1;
@@ -1638,6 +1643,7 @@ sub print_login {
                     $samlalt{$lonhost} = $settings->{'saml'}{$lonhost}{'alt'};
                     $samlurl{$lonhost} = $settings->{'saml'}{$lonhost}{'url'};
                     $samltitle{$lonhost} = $settings->{'saml'}{$lonhost}{'title'};
+                    $samlwindow{$lonhost} = $settings->{'saml'}{$lonhost}{'window'};
                     $samlnotsso{$lonhost} = $settings->{'saml'}{$lonhost}{'notsso'};
                     $styleon{$lonhost} = '';
                     $styleoff{$lonhost} = 'display:none';
@@ -1655,6 +1661,12 @@ sub print_login {
                 $samlon = $samloff;
                 $samloff = ' ';
             }
+            my $samlwinon = '';
+            my $samlwinoff = ' checked="checked"';
+            if ($samlwindow{$lonhost}) {
+                $samlwinon = $samlwinoff;
+                $samlwinoff = '';
+            }
             my $css_class = $itemcount%2?' class="LC_odd_row"':'';
             $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.$domservers{$lonhost}.'</span></td>'.
                           '<td><span class="LC_nobreak"><label><input type="radio" name="saml_'.$lonhost.'"'.$samloff.
@@ -1664,12 +1676,10 @@ sub print_login {
                           'onclick="toggleSamlOptions(this.form,'."'$lonhost'".');" value="1" />'.
                           &mt('Yes').'</label></span></td>'.
                           '<td id="samloptionson_'.$lonhost.'" style="'.$styleon{$lonhost}.'" width="100%">'.
-                          '<table><tr><th colspan="5" align="center">'.&mt('SSO').'</th><th align="center">'.
-                          '<span class="LC_nobreak">'.&mt('Non-SSO').'</span></th></tr>'.
+                          '<table width="100%"><tr><th colspan="3" align="center">'.&mt('SSO').'</th></tr>'.
                           '<tr><th>'.&mt('Text').'</th><th>'.&mt('Image').'</th>'.
-                          '<th>'.&mt('Alt Text').'</th><th>'.&mt('URL').'</th>'.
-                          '<th>'.&mt('Tool Tip').'</th><th>'.&mt('Text').'</th></tr>'.
-                          '<tr'.$css_class.'><td><input type="text" name="saml_text_'.$lonhost.'" size="8" value="'.
+                          '<th>'.&mt('Alt Text').'</th></tr>'.
+                          '<tr'.$css_class.'><td><input type="text" name="saml_text_'.$lonhost.'" size="20" value="'.
                           $samltext{$lonhost}.'" /></td><td>';
             if ($samlimg{$lonhost}) {
                 $datatable .= '<img src="'.$samlimg{$lonhost}.'" /><br />'.
@@ -1686,13 +1696,21 @@ sub print_login {
                 $datatable .= '<input type="file" name="saml_img_'.$lonhost.'" />';
             }
             $datatable .= '</td>'.
-                          '<td><input type="text" name="saml_alt_'.$lonhost.'" size="20" '.
-                          'value="'.$samlalt{$lonhost}.'" /></td>'.
-                          '<td><input type="text" name="saml_url_'.$lonhost.'" size="8" '.
+                          '<td><input type="text" name="saml_alt_'.$lonhost.'" size="25" '.
+                          'value="'.$samlalt{$lonhost}.'" /></td></tr></table><br />'.
+                          '<table width="100%"><tr><th colspan="3" align="center">'.&mt('SSO').'</th><th align="center">'.
+                          '<span class="LC_nobreak">'.&mt('Non-SSO').'</span></th></tr>'.
+                          '<tr><th>'.&mt('URL').'</th><th>'.&mt('Tool Tip').'</th>'.
+                          '<th>'.&mt('Pop-up if iframe').'</th><th>'.&mt('Text').'</th></tr>'.
+                          '<tr'.$css_class.'>'.
+                          '<td><input type="text" name="saml_url_'.$lonhost.'" size="30" '.
                           'value="'.$samlurl{$lonhost}.'" /></td>'.
-                          '<td><textarea name="saml_title_'.$lonhost.'" rows="3" cols="15">'.
+                          '<td><textarea name="saml_title_'.$lonhost.'" rows="3" cols="20">'.
                           $samltitle{$lonhost}.'</textarea></td>'.
-                          '<td><input type="text" name="saml_notsso_'.$lonhost.'" size="8" '.
+                          '<td><label><input type="radio" name="saml_window_'.$lonhost.'" value=""'.$samlwinoff.'>'.
+                          &mt('No').'</label>'.('&nbsp;'x2).'<label><input type="radio" '.
+                          'name="saml_window_'.$lonhost.'" value="1"'.$samlwinon.'>'.&mt('Yes').'</label></td>'.
+                          '<td><input type="text" name="saml_notsso_'.$lonhost.'" size="12" '.
                           'value="'.$samlnotsso{$lonhost}.'" /></td></tr>'.
                           '</table></td>'.
                           '<td id="samloptionsoff_'.$lonhost.'" style="'.$styleoff{$lonhost}.'" width="100%">&nbsp;</td></tr>';
@@ -2365,7 +2383,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') {
@@ -2469,9 +2487,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" ';
@@ -3429,6 +3450,7 @@ 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[
@@ -3473,6 +3495,9 @@ $jstext
     }
     return;
 }
+
+$linkprot_js
+
 // ]]>
 </script>
 
@@ -6490,6 +6515,9 @@ sub print_lti {
             if (exists($settings->{'linkprot'})) {
                 if (ref($settings->{'linkprot'}) eq 'HASH') {
                     %linkprot = %{$settings->{'linkprot'}};
+                    if ($linkprot{'lock'}) {
+                        delete($linkprot{'lock'});
+                    }
                 }
             }
         } else {
@@ -6555,12 +6583,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>';
@@ -6595,8 +6623,9 @@ sub print_lti {
         $$rowtotal += $itemcount;
     } elsif ($position eq 'middle') {
         $datatable = &password_rules('secrets',\$itemcount,\%rules);
+        $$rowtotal += $itemcount;
     } elsif ($position eq 'lower') {
-        $datatable .= '<tr><td>Not set yet</td><td>To be done</td></tr>';
+         $datatable .= &Apache::courseprefs::print_linkprotection($dom,'',$settings,$rowtotal,'','','domain');
     } else {
         my $maxnum = 0;
         my %ordered;
@@ -7685,13 +7714,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) =
@@ -7710,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',
@@ -7761,6 +7793,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')) {
@@ -9675,6 +9729,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',
@@ -10456,7 +10511,7 @@ sub user_formats_row {
                    'username' => 'new usernames',
                    'id'       => 'IDs',
                );
-    unless ($type eq 'email') {
+    unless (($type eq 'email') || ($type eq 'unamemap')) {
         my $css_class = $rowcount%2?' class="LC_odd_row"':'';
         $output = '<tr '.$css_class.'>'.
                   '<td><span class="LC_nobreak">'.
@@ -10511,9 +10566,9 @@ sub user_formats_row {
     } elsif ($colsleft == 1) {
         $output .= '<td class="LC_left_item">&nbsp;</td>';
     }
-    $output .= '</tr></table>';
-    unless ($type eq 'email') {
-        $output .= '</td></tr>';
+    $output .= '</tr>';
+    unless (($type eq 'email') || ($type eq 'unamemap')) {
+        $output .= '</table></td></tr>';
     }
     return $output;
 }
@@ -10645,18 +10700,34 @@ 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 ++;
         }
-    } else {
+    } elsif ($position eq 'middle') {
         my %defaults;
         if (ref($settings) eq 'HASH') {
             if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) {
@@ -10706,6 +10777,22 @@ sub print_defaults {
                 $rownum ++;
             }
         }
+    } else {
+        my ($unamemaprules,$ruleorder) =
+            &Apache::lonnet::inst_userrules($dom,'unamemap');
+        $css_class = $rownum%2?' class="LC_odd_row"':'';
+        if ((ref($unamemaprules) eq 'HASH') && (ref($ruleorder) eq 'ARRAY')) {
+            my $numinrow = 2;
+            $datatable .= '<tr'.$css_class.'><td>'.&mt('Available conversions').'</td><td><table>'.
+                          &user_formats_row('unamemap',$settings,$unamemaprules,
+                                            $ruleorder,$numinrow).
+                          '</table></td></tr>';
+        }
+        if ($datatable eq '') {
+            $datatable .= '<tr'.$css_class.'><td colspan="2">'.
+                          &mt('No rules set for domain in customized localenroll.pm').
+                          '</td></tr>';
+        }
     }
     $$rowtotal += $rownum;
     return $datatable;
@@ -10731,6 +10818,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',
@@ -11445,6 +11534,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 '') {
@@ -11498,6 +11604,17 @@ $jstext
     return;
 }
 
+$portal_js
+
+// ]]>
+</script>
+
+ENDSCRIPT
+    } else {
+return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+$portal_js
 // ]]>
 </script>
 
@@ -11557,7 +11674,7 @@ function warnInt$prefix(field) {
     field.value.replace(/^\s+/,'');
     field.value.replace(/\s+\$/,'');
     var regexdigit=/^\\d+\$/;
-    if (field.name == '$prefix\_min') {
+    if (field.name == '${prefix}_min') {
         if (field.value == '') {
             alert('$intalert{passmin}');
             field.value = '$defmin';
@@ -11577,7 +11694,7 @@ function warnInt$prefix(field) {
             field.value = '';
         }
         if (field.value != '') {
-            if (field.name == '$prefix\_expire') {
+            if (field.name == '${prefix}_expire') {
                 var regexpposnum=/^\\d+(|\\.\\d*)\$/; 
                 if (!regexpposnum.test(field.value)) {
                     alert('$intalert{passexp}');
@@ -11591,10 +11708,10 @@ function warnInt$prefix(field) {
                 }
             } else {
                 if (!regexdigit.test(field.value)) {
-                    if (field.name == '$prefix\_max') {
+                    if (field.name == '${prefix}_max') {
                         alert('$intalert{passmax}');
                     } else {
-                        if (field.name == '$prefix\_numsaved') {
+                        if (field.name == '${prefix}_numsaved') {
                             alert('$intalert{passnum}');
                         }
                     }
@@ -12225,7 +12342,7 @@ sub modify_login {
     my ($r,$dom,$confname,$lastactref,%domconfig) = @_;
     my ($resulttext,$errors,$colchgtext,%changes,%colchanges,%newfile,%newurl,
         %curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon,
-        %currsaml,%saml,%samltext,%samlimg,%samlalt,%samlurl,%samltitle,%samlnotsso);
+        %currsaml,%saml,%samltext,%samlimg,%samlalt,%samlurl,%samltitle,%samlwindow,%samlnotsso);
     %title = ( coursecatalog => 'Display course catalog',
                adminmail => 'Display administrator E-mail address',
                helpdesk  => 'Display "Contact Helpdesk" link',
@@ -12249,6 +12366,7 @@ sub modify_login {
                     $samlalt{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'alt'};
                     $samlimg{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'img'};
                     $samltitle{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'title'};
+                    $samlwindow{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'window'};
                     $samlnotsso{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'notsso'};
                 }
             }
@@ -12506,10 +12624,13 @@ sub modify_login {
             if ($env{'form.saml_img_'.$lonhost.'.filename'}) {
                 push(@newsamlimgs,$lonhost);
             }
-            foreach my $item ('text','alt','url','title','notsso') {
+            foreach my $item ('text','alt','url','title','window','notsso') {
                 $env{'form.saml_'.$item.'_'.$lonhost} =~ s/^\s+|\s+$//g;
             }
             if ($saml{$lonhost}) {
+                if ($env{'form.saml_window_'.$lonhost} ne '1') {
+                    $env{'form.saml_window_'.$lonhost} = '';
+                }
                 if (grep(/^\Q$lonhost\E$/,@delsamlimg)) {
 #FIXME Need to obsolete published image
                     delete($currsaml{$lonhost}{'img'});
@@ -12527,13 +12648,16 @@ sub modify_login {
                 if ($env{'form.saml_title_'.$lonhost} ne $samltitle{$lonhost}) {
                     $changes{'saml'}{$lonhost} = 1;
                 }
+                if ($env{'form.saml_window_'.$lonhost} ne $samlwindow{$lonhost}) {
+                    $changes{'saml'}{$lonhost} = 1;
+                }
                 if ($env{'form.saml_notsso_'.$lonhost} ne $samlnotsso{$lonhost}) {
                     $changes{'saml'}{$lonhost} = 1;
                 }
             } else {
                 $changes{'saml'}{$lonhost} = 1;
             }
-            foreach my $item ('text','alt','url','title','notsso') {
+            foreach my $item ('text','alt','url','title','window','notsso') {
                 $currsaml{$lonhost}{$item} = $env{'form.saml_'.$item.'_'.$lonhost};
             }
         } else {
@@ -12734,19 +12858,22 @@ sub modify_login {
                                        alt    => 'Alt text for button image',
                                        url    => 'SSO URL',
                                        title  => 'Tooltip for SSO link',
+                                       window => 'Pop-up window if iframe',
                                        notsso => 'Text for non-SSO log-in',
                                     );
                         foreach my $lonhost (sort(keys(%{$changes{$item}}))) {
                             if (ref($currsaml{$lonhost}) eq 'HASH') {
                                 $resulttext .= '<li>'.&mt("$title{$item} in use for [_1]","<b>$lonhost</b>").
                                                '<ul>';
-                                foreach my $key ('text','img','alt','url','title','notsso') {
+                                foreach my $key ('text','img','alt','url','title','window','notsso') {
                                     if ($currsaml{$lonhost}{$key} eq '') {
                                         $resulttext .= '<li>'.&mt("$notlt{$key} not in use").'</li>';
                                     } else {
                                         my $value = "'$currsaml{$lonhost}{$key}'";
                                         if ($key eq 'img') {
                                             $value = '<img src="'.$currsaml{$lonhost}{$key}.'" />';
+                                        } elsif ($key eq 'window') {
+                                            $value = 'On';
                                         }
                                         $resulttext .= '<li>'.&mt("$notlt{$key} set to: [_1]",
                                                                   $value).'</li>';
@@ -13911,7 +14038,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);
@@ -15828,12 +15955,20 @@ sub modify_lti {
 
     my %menutitles = &ltimenu_titles();
 
-    my (%currltisec,%secchanges,%newltisec,%keyset,%newkeyset);
+    my (%currltisec,%secchanges,%newltisec,%newltienc,%keyset,%newkeyset);
     $newltisec{'private'}{'keys'} = [];
     $newltisec{'encrypt'} = {};
     $newltisec{'rules'} = {};
+    $newltisec{'linkprot'} = {};
     if (ref($domconfig{'ltisec'}) eq 'HASH') {
         %currltisec = %{$domconfig{'ltisec'}};
+        if (ref($currltisec{'linkprot'}) eq 'HASH') {
+            foreach my $id (keys(%{$currltisec{'linkprot'}})) {
+                unless ($id =~ /^\d+$/) {
+                    delete($currltisec{'linkprot'}{$id});
+                }
+            }
+        }
         if (ref($currltisec{'private'}) eq 'HASH') {
             if (ref($currltisec{'private'}{'keys'}) eq 'ARRAY') {
                 $newltisec{'private'}{'keys'} = $currltisec{'private'}{'keys'};
@@ -15895,6 +16030,62 @@ sub modify_lti {
         }
     }
 
+    my (%linkprotchg,$linkprotoutput,$is_home);
+    my $proterror = &Apache::courseprefs::process_linkprot($dom,'',$currltisec{'linkprot'},
+                                                           \%linkprotchg,'domain');
+    my $home = &Apache::lonnet::domain($dom,'primary');
+    unless (($home eq 'no_host') || ($home eq '')) {
+        my @ids=&Apache::lonnet::current_machine_ids();
+        foreach my $id (@ids) { if ($id eq $home) { $is_home=1; } }
+    }
+
+    if (keys(%linkprotchg)) {
+        $secchanges{'linkprot'} = 1;
+        my %oldlinkprot;
+        if (ref($currltisec{'linkprot'}) eq 'HASH') {
+            %oldlinkprot = %{$currltisec{'linkprot'}};
+        }
+        foreach my $id (keys(%linkprotchg)) {
+            if (ref($linkprotchg{$id}) eq 'HASH') {
+                foreach my $inner (keys(%{$linkprotchg{$id}})) {
+                    if (($inner eq 'secret') || ($inner eq 'key')) {
+                        if ($is_home) {
+                            $newltienc{$id}{$inner} = $linkprotchg{$id}{$inner};
+                        }
+                    }
+                }
+            } else {
+                $newltisec{'linkprot'}{$id} = $linkprotchg{$id};
+            }
+        }
+        $linkprotoutput = &Apache::courseprefs::store_linkprot($dom,'','domain',\%linkprotchg,\%oldlinkprot);
+        if (keys(%linkprotchg)) {
+            %{$newltisec{'linkprot'}} = %linkprotchg;
+        }
+    }
+    if (ref($currltisec{'linkprot'}) eq 'HASH') {
+        foreach my $id (%{$currltisec{'linkprot'}}) {
+            next if ($id !~ /^\d+$/);
+            unless (exists($linkprotchg{$id})) {
+                if (ref($currltisec{'linkprot'}{$id}) eq 'HASH') {
+                    foreach my $inner (keys(%{$currltisec{'linkprot'}{$id}})) {
+                        if (($inner eq 'secret') || ($inner eq 'key')) {
+                            if ($is_home) {
+                                $newltienc{$id}{$inner} = $currltisec{'linkprot'}{$id}{$inner};
+                            }
+                        } else {
+                            $newltisec{'linkprot'}{$id}{$inner} = $currltisec{'linkprot'}{$id}{$inner};
+                        }
+                    }
+                } else {
+                    $newltisec{'linkprot'}{$id} = $currltisec{'linkprot'}{$id};
+                }
+            }
+        }
+    }
+    if ($proterror) {
+        $errors .= '<li>'.$proterror.'</li>';
+    }
     my (@items,%deletions,%itemids);
     if ($env{'form.lti_add'}) {
         my $consumer = $env{'form.lti_consumer_add'};
@@ -16200,8 +16391,16 @@ sub modify_lti {
     my %ltihash = (
                       $action => { %confhash }
                   );
+    my %ltienchash = (
+                         $action => { %encconfig }
+                     );
     if (keys(%secchanges)) {
         $ltihash{'ltisec'} = \%newltisec;
+        if ($secchanges{'linkprot'}) {
+            if ($is_home) {
+                $ltienchash{'linkprot'} = \%newltienc;
+            }
+        }
     }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%ltihash,$dom);
     if ($putresult eq 'ok') {
@@ -16218,10 +16417,12 @@ sub modify_lti {
                                                                     $dom,$hostid);
                 }
             }
+            if (ref($lastactref) eq 'HASH') {
+                if (($secchanges{'encrypt'}) || ($secchanges{'private'})) {
+                    $lastactref->{'domdefaults'} = 1;
+                }
+            }
         }
-        my %ltienchash = (
-                             $action => { %encconfig }
-                         );
         &Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom,undef,1);
         if ((keys(%changes) == 0) && (keys(%secchanges) == 0)) {
             return &mt('No changes made.');
@@ -16298,6 +16499,8 @@ sub modify_lti {
                             }
                         }
                     }
+                } elsif ($item eq 'linkprot') {
+                    $resulttext .= $linkprotoutput;
                 }
             }
         }
@@ -17772,7 +17975,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',
@@ -17791,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',
@@ -17816,7 +18020,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') {
@@ -17908,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,
@@ -17916,7 +18132,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') {
@@ -17934,6 +18150,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') {
@@ -19861,16 +20086,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 = (
@@ -19885,6 +20152,41 @@ sub modify_defaults {
             $newvalues{$item} = $staticdefaults{$item};
         }
     }
+    my ($unamemaprules,$ruleorder);
+    my @possunamemaprules = &Apache::loncommon::get_env_multiple('form.unamemap_rule');
+    if (@possunamemaprules) {
+        ($unamemaprules,$ruleorder) =
+            &Apache::lonnet::inst_userrules($dom,'unamemap');
+        if ((ref($unamemaprules) eq 'HASH') && (ref($ruleorder) eq 'ARRAY')) {
+            if (@{$ruleorder} > 0) {
+                my %possrules;
+                map { $possrules{$_} = 1; } @possunamemaprules;
+                foreach my $rule (@{$ruleorder}) {
+                    if ($possrules{$rule}) {
+                        push(@{$newvalues{'unamemap_rule'}},$rule);
+                    }
+                }
+            }
+        }
+    }
+    if (ref($domdefaults{'unamemap_rule'}) eq 'ARRAY') {
+        if (ref($newvalues{'unamemap_rule'}) eq 'ARRAY') {
+            my @rulediffs = &Apache::loncommon::compare_arrays($domdefaults{'unamemap_rule'},
+                                                               $newvalues{'unamemap_rule'});
+            if (@rulediffs) {
+                $changes{'unamemap_rule'} = 1;
+                $domdefaults{'unamemap_rule'} = $newvalues{'unamemap_rule'};
+            }
+        } elsif (@{$domdefaults{'unamemap_rule'}} > 0) {
+            $changes{'unamemap_rule'} = 1;
+            delete($domdefaults{'unamemap_rule'});
+        }
+    } elsif (ref($newvalues{'unamemap_rule'}) eq 'ARRAY') {
+        if (@{$newvalues{'unamemap_rule'}} > 0) {
+            $changes{'unamemap_rule'} = 1;
+            $domdefaults{'unamemap_rule'} = $newvalues{'unamemap_rule'};
+        }
+    }
     my %defaults_hash = (
                          defaults => \%newvalues,
                         );
@@ -19999,6 +20301,26 @@ sub modify_defaults {
                             $resulttext .= '<li>'.&mt('Institutional user status types deleted').'</li>'; 
                         }
                     }
+                } elsif ($item eq 'unamemap_rule') {
+                    if (ref($newvalues{'unamemap_rule'}) eq 'ARRAY') {
+                        my @rulenames;
+                        if (ref($unamemaprules) eq 'HASH') {
+                            foreach my $rule (@{$newvalues{'unamemap_rule'}}) {
+                                if (ref($unamemaprules->{$rule}) eq 'HASH') {
+                                    push(@rulenames,$unamemaprules->{$rule}->{'name'});
+                                }
+                            }
+                        }
+                        if (@rulenames) {
+                            $resulttext .= '<li>'.&mt('Mapping for missing usernames includes: [_1]',
+                                                     '<ul><li>'.join('</li><li>',@rulenames).'</li></ul>').
+                                           '</li>';
+                        } else {
+                            $resulttext .= '<li>'.&mt('No mapping for missing usernames via standard log-in').'</li>';
+                        }
+                    } else {
+                        $resulttext .= '<li>'.&mt('Mapping for missing usernames via standard log-in deleted').'</li>';
+                    }
                 } else {
                     my $value = $env{'form.'.$item};
                     if ($value eq '') {
@@ -20015,7 +20337,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>';
@@ -22624,8 +22959,10 @@ sub modify_trust {
             }
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+            &Apache::lonnet::do_cache_new('trust',$dom,$defaultshash{'trust'},3600);
             if (ref($lastactref) eq 'HASH') {
                 $lastactref->{'domdefaults'} = 1;
+                $lastactref->{'trust'} = 1;
             }
             if (keys(%changes) > 0) {
                 my %lt = &trust_titles();
@@ -23694,7 +24031,7 @@ sub devalidate_remote_domconfs {
     map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
     my @posscached = ('domainconfig','domdefaults','ltitools','usersessions',
                       'directorysrch','passwdconf','cats','proxyalias','proxysaml',
-                      'ipaccess');
+                      'ipaccess','trust');
     my %cache_by_lonhost;
     if (exists($cachekeys->{'samllanding'})) {
         if (ref($cachekeys->{'samllanding'}) eq 'HASH') {