--- loncom/interface/domainprefs.pm	2021/11/03 13:49:57	1.389
+++ loncom/interface/domainprefs.pm	2023/06/03 19:26:31	1.426
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.389 2021/11/03 13:49:57 raeburn Exp $
+# $Id: domainprefs.pm,v 1.426 2023/06/03 19:26:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -105,7 +105,7 @@ $datatable  - HTML containing form eleme
 In the case of course requests, radio buttons are displayed for each institutional
 affiliate type (and also default, and _LC_adv) for each of the course types 
 (official, unofficial, community, textbook, placement, and lti).  
-In each case the radio buttons allow the selection of one of four values:  
+In each case the radio buttons allow the selection of one of four values:
 
 0, approval, validate, autolimit=N (where N is blank, or a positive integer).
 which have the following effects:
@@ -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();
@@ -177,6 +178,7 @@ use DateTime::TimeZone;
 use DateTime::Locale;
 use Time::HiRes qw( sleep );
 use Net::CIDR;
+use Crypt::CBC;
 
 my $registered_cleanup;
 my $modified_urls;
@@ -220,17 +222,27 @@ sub handler {
                 'serverstatuses','requestcourses','helpsettings',
                 'coursedefaults','usersessions','loadbalancing',
                 'requestauthor','selfenrollment','inststatus',
-                'ltitools','ssl','trust','lti','privacy','passwords',
-                'proctoring','wafproxy'],$dom);
+                'ltitools','toolsec','ssl','trust','lti','ltisec',
+                'privacy','passwords','proctoring','wafproxy','ipaccess'],$dom);
     my %encconfig =
-        &Apache::lonnet::get_dom('encconfig',['ltitools','lti','proctoring'],$dom,undef,1);
+        &Apache::lonnet::get_dom('encconfig',['ltitools','lti','proctoring','linkprot'],$dom,undef,1);
+    my ($checked_is_home,$is_home);
     if (ref($domconfig{'ltitools'}) eq 'HASH') {
         if (ref($encconfig{'ltitools'}) eq 'HASH') {
+            my $home = &Apache::lonnet::domain($dom,'primary');
+            unless (($home eq 'no_host') || ($home eq '')) {
+                my @ids=&Apache::lonnet::current_machine_ids();
+                if (grep(/^\Q$home\E$/,@ids)) {
+                    $is_home = 1;
+                }
+            }
+            $checked_is_home = 1;
             foreach my $id (keys(%{$domconfig{'ltitools'}})) {
                 if ((ref($domconfig{'ltitools'}{$id}) eq 'HASH') &&
                     (ref($encconfig{'ltitools'}{$id}) eq 'HASH')) {
-                    foreach my $item ('key','secret') {
-                        $domconfig{'ltitools'}{$id}{$item} = $encconfig{'ltitools'}{$id}{$item};
+                    $domconfig{'ltitools'}{$id}{'key'} = $encconfig{'ltitools'}{$id}{'key'};
+                    if (($is_home) && ($phase eq 'process')) {
+                        $domconfig{'ltitools'}{$id}{'secret'} = $encconfig{'ltitools'}{$id}{'secret'};
                     }
                 }
             }
@@ -238,11 +250,39 @@ sub handler {
     }
     if (ref($domconfig{'lti'}) eq 'HASH') {
         if (ref($encconfig{'lti'}) eq 'HASH') {
+            unless ($checked_is_home) {
+                my $home = &Apache::lonnet::domain($dom,'primary');
+                unless (($home eq 'no_host') || ($home eq '')) {
+                    my @ids=&Apache::lonnet::current_machine_ids();
+                    if (grep(/^\Q$home\E$/,@ids)) {
+                        $is_home = 1;
+                    }
+                }
+                $checked_is_home = 1;
+            }
             foreach my $id (keys(%{$domconfig{'lti'}})) {
                 if ((ref($domconfig{'lti'}{$id}) eq 'HASH') &&
                     (ref($encconfig{'lti'}{$id}) eq 'HASH')) {
-                    foreach my $item ('key','secret') {
-                        $domconfig{'lti'}{$id}{$item} = $encconfig{'lti'}{$id}{$item};
+                    $domconfig{'lti'}{$id}{'key'} = $encconfig{'lti'}{$id}{'key'};
+                    if (($is_home) && ($phase eq 'process')) {
+                        $domconfig{'lti'}{$id}{'secret'} = $encconfig{'lti'}{$id}{'secret'};
+                    }
+                }
+            }
+        }
+    }
+    if (ref($domconfig{'ltisec'}) eq 'HASH') {
+        if (ref($domconfig{'ltisec'}{'linkprot'}) eq 'HASH') {
+            if (ref($encconfig{'linkprot'}) 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'}{'linkprot'}{$id}{$item} = $encconfig{'linkprot'}{$id}{$item};
+                        }
                     }
                 }
             }
@@ -260,8 +300,8 @@ sub handler {
             }
         }
     }
-    my @prefs_order = ('rolecolors','login','defaults','wafproxy','passwords','quotas',
-                       'autoenroll','autoupdate','autocreate','directorysrch',
+    my @prefs_order = ('rolecolors','login','ipaccess','defaults','wafproxy','passwords',
+                       'quotas','autoenroll','autoupdate','autocreate','directorysrch',
                        'contacts','privacy','usercreation','selfcreation',
                        'usermodification','scantron','requestcourses','requestauthor',
                        'coursecategories','serverstatuses','helpsettings','coursedefaults',
@@ -310,7 +350,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,
                     },
@@ -340,7 +382,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',
@@ -562,11 +604,15 @@ sub handler {
                   print => \&print_loadbalancing,
                   modify => \&modify_loadbalancing,
                  },
-        'ltitools' => 
+        'ltitools' =>
                  {text => 'External Tools (LTI)',
                   help => 'Domain_Configuration_LTI_Tools',
-                  header => [{col1 => 'Setting',
-                              col2 => 'Value',}],
+                  header => [{col1 => 'Encryption of shared secrets',
+                              col2 => 'Settings'},
+                             {col1 => 'Rules for shared secrets',
+                              col2 => 'Settings'},
+                             {col1 => 'Providers',
+                              col2 => 'Settings',}],
                   print => \&print_ltitools,
                   modify => \&modify_ltitools,
                  },
@@ -616,14 +662,28 @@ sub handler {
                   print => \&print_trust,
                   modify => \&modify_trust,
                  },
-          'lti' =>
-                 {text => 'LTI Provider',
+        'lti' =>
+                 {text => 'LTI Link Protection and LTI Consumers',
                   help => 'Domain_Configuration_LTI_Provider',
-                  header => [{col1 => 'Setting',
-                              col2 => 'Value',}],
+                  header => [{col1 => 'Encryption of shared secrets',
+                              col2 => 'Settings'},
+                             {col1 => 'Rules for shared secrets',
+                              col2 => 'Settings'},
+                             {col1 => 'Link Protectors',
+                              col2 => 'Settings'},
+                             {col1 => 'Consumers',
+                              col2 => 'Settings'},],
                   print => \&print_lti,
                   modify => \&modify_lti,
                  },
+        'ipaccess' =>
+                       {text => 'IP-based access control',
+                        help => 'Domain_Configuration_IP_Access',
+                        header => [{col1 => 'Setting',
+                                    col2 => 'Value'},],
+                        print  => \&print_ipaccess,
+                        modify => \&modify_ipaccess,
+                       },
     );
     if (keys(%servers) > 1) {
         $prefs{'login'}  = { text   => 'Log-in page options',
@@ -631,7 +691,7 @@ sub handler {
                             header => [{col1 => 'Log-in Service',
                                         col2 => 'Server Setting',},
                                        {col1 => 'Log-in Page Items',
-                                        col2 => ''},
+                                        col2 => 'Settings'},
                                        {col1 => 'Log-in Help',
                                         col2 => 'Value'},
                                        {col1 => 'Custom HTML in document head',
@@ -679,6 +739,8 @@ $javascript_validations
 </script>
 $coursebrowserjs
 END
+        } elsif (grep(/^ipaccess$/,@actions)) {
+            $js .= &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'});
         }
         if (grep(/^selfcreation$/,@actions)) {
             $js .= &selfcreate_javascript();
@@ -825,6 +887,8 @@ sub process_changes {
         $output = &modify_passwords($r,$dom,$confname,$lastactref,%domconfig);
     } elsif ($action eq 'wafproxy') {
         $output = &modify_wafproxy($dom,$action,$lastactref,%domconfig);
+    } elsif ($action eq 'ipaccess') {
+        $output = &modify_ipaccess($dom,$lastactref,%domconfig);
     }
     return $output;
 }
@@ -838,7 +902,7 @@ sub print_config_box {
     } elsif ($action eq 'defaults') {
         $output = &defaults_javascript($settings); 
     } elsif ($action eq 'passwords') {
-        $output = &passwords_javascript();
+        $output = &passwords_javascript($action);
     } elsif ($action eq 'helpsettings') {
         my (%privs,%levelscurrent);
         my %full=();
@@ -853,20 +917,25 @@ sub print_config_box {
         &Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent);
         my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);
         $output =
-            &Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname,\%full, 
+            &Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname,\%full,
                                                       \@templateroles);
     } elsif ($action eq 'ltitools') {
-        $output .= &ltitools_javascript($settings);
+        $output .= &Apache::lonconfigsettings::ltitools_javascript($settings);
     } elsif ($action eq 'lti') {
-        $output .= &lti_javascript($settings);
+        $output .= &passwords_javascript('ltisecrets')."\n".
+                   &lti_javascript($dom,$settings);
     } elsif ($action eq 'proctoring') {
         $output .= &proctoring_javascript($settings);
     } elsif ($action eq 'wafproxy') {
         $output .= &wafproxy_javascript($dom);
     } elsif ($action eq 'autoupdate') {
         $output .= &autoupdate_javascript();
+    } elsif ($action eq 'autoenroll') {
+        $output .= &autoenroll_javascript();
     } elsif ($action eq 'login') {
         $output .= &saml_javascript();
+    } elsif ($action eq 'ipaccess') {
+        $output .= &ipaccess_javascript($settings);
     }
     $output .=
          '<table class="LC_nested_outer">
@@ -908,7 +977,8 @@ sub print_config_box {
             ($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') ||
             ($action eq 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'ssl') ||
             ($action eq 'directorysrch') || ($action eq 'trust') || ($action eq 'helpsettings') ||
-            ($action eq 'contacts') || ($action eq 'privacy') || ($action eq 'wafproxy')) {
+            ($action eq 'contacts') || ($action eq 'privacy') || ($action eq 'wafproxy') ||
+            ($action eq 'lti') || ($action eq 'ltitools')) {
             $output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'passwords') {
             $output .= $item->{'print'}->('top',$dom,$confname,$settings,\$rowtotal);
@@ -943,8 +1013,9 @@ 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 'privacy') || ($action eq 'passwords')) {
+            ($action eq 'trust') || ($action eq 'contacts') || ($action eq 'defaults') ||
+            ($action eq 'privacy') || ($action eq 'passwords') || ($action eq 'lti') ||
+            ($action eq 'ltitools')) {
             if ($action eq 'coursecategories') {
                 $output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal);
                 $colspan = ' colspan="2"';
@@ -997,7 +1068,8 @@ sub print_config_box {
              </tr>'."\n";
                 if ($action eq 'coursecategories') {
                     $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
-                } elsif (($action eq 'contacts') || ($action eq 'privacy') || ($action eq 'passwords')) {
+                } elsif (($action eq 'contacts') || ($action eq 'privacy') || 
+                         ($action eq 'passwords') || ($action eq 'lti')) {
                     if ($action eq 'passwords') {
                         $output .= $item->{'print'}->('lower',$dom,$confname,$settings,\$rowtotal);
                     } else {
@@ -1030,8 +1102,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);
@@ -1234,8 +1306,7 @@ sub print_config_box {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
         } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || 
                  ($action eq 'serverstatuses') || ($action eq 'loadbalancing') || 
-                 ($action eq 'ltitools') || ($action eq 'lti') ||
-                 ($action eq 'proctoring')) {
+                 ($action eq 'proctoring') || ($action eq 'ipaccess')) {
             $output .= $item->{'print'}->($dom,$settings,\$rowtotal);
         }
     }
@@ -1341,6 +1412,7 @@ sub print_login {
             }
         }
         my @images = ('img','logo','domlogo','login');
+        my @alttext = ('img','logo','domlogo');
         my @logintext = ('textcol','bgcol');
         my @bgs = ('pgbg','mainbg','sidebg');
         my @links = ('link','alink','vlink');
@@ -1382,6 +1454,13 @@ sub print_login {
                     $designs{'showlogo'}{$item} = $settings->{'showlogo'}{$item};
                 }
             }
+            foreach my $item (@alttext) {
+                if (ref($settings->{'alttext'}) eq 'HASH') {
+                    if ($settings->{'alttext'}->{$item} ne '') {
+                        $designs{'alttext'}{$item} = $settings->{'alttext'}{$item};
+                    }
+                }
+            }
             foreach my $item (@logintext) {
                 if ($settings->{$item} ne '') {
                     $designs{'logintext'}{$item} = $settings->{$item};
@@ -1577,13 +1656,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;
@@ -1592,6 +1671,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';
@@ -1609,6 +1689,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.
@@ -1618,12 +1704,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 />'.
@@ -1640,13 +1724,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>';
@@ -1691,6 +1783,7 @@ sub login_choices {
             current       => "Current",
             samllanding   => "Dual login?",
             samloptions   => "Options",
+            alttext       => "Alt text",
         );
     return %choices;
 }
@@ -1707,6 +1800,186 @@ sub login_file_options {
       );
 }
 
+sub print_ipaccess {
+    my ($dom,$settings,$rowtotal) = @_;
+    my $css_class;
+    my $itemcount = 0;
+    my $datatable;
+    my %ordered;
+    if (ref($settings) eq 'HASH') {
+        foreach my $item (keys(%{$settings})) {
+            if (ref($settings->{$item}) eq 'HASH') {
+                my $num = $settings->{$item}{'order'};
+                if ($num eq '') {
+                    $num = scalar(keys(%{$settings}));
+                }
+                $ordered{$num} = $item;
+            }
+        }
+    }
+    my $maxnum = scalar(keys(%ordered));
+    if (keys(%ordered)) {
+        my @items = sort { $a <=> $b } keys(%ordered);
+        for (my $i=0; $i<@items; $i++) {
+            $css_class = $itemcount%2?' class="LC_odd_row"':'';
+            my $item = $ordered{$items[$i]};
+            my ($name,$ipranges,%commblocks,%courses);
+            if (ref($settings->{$item}) eq 'HASH') {
+                $name = $settings->{$item}->{'name'};
+                $ipranges = $settings->{$item}->{'ip'};
+                if (ref($settings->{$item}->{'commblocks'}) eq 'HASH') {
+                    %commblocks = %{$settings->{$item}->{'commblocks'}};
+                }
+                if (ref($settings->{$item}->{'courses'}) eq 'HASH') {
+                    %courses = %{$settings->{$item}->{'courses'}};
+                }
+            }
+            my $chgstr = ' onchange="javascript:reorderIPaccess(this.form,'."'ipaccess_pos_".$item."'".');"';
+            $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
+                         .'<select name="ipaccess_pos_'.$item.'"'.$chgstr.'>';
+            for (my $k=0; $k<=$maxnum; $k++) {
+                my $vpos = $k+1;
+                my $selstr;
+                if ($k == $i) {
+                    $selstr = ' selected="selected" ';
+                }
+                $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+            }
+            $datatable .= '</select>'.('&nbsp;'x2).
+                '<label><input type="checkbox" name="ipaccess_del" value="'.$item.'" />'.
+                &mt('Delete?').'</label></span></td>'.
+                '<td colspan="2"><input type="hidden" name="ipaccess_id_'.$i.'" value="'.$item.'" />'.
+                &ipaccess_options($i,$itemcount,$dom,$name,$ipranges,\%commblocks,\%courses).
+                '</td></tr>';
+            $itemcount ++;
+        }
+    }
+    $css_class = $itemcount%2?' class="LC_odd_row"':'';
+    my $chgstr = ' onchange="javascript:reorderIPaccess(this.form,'."'ipaccess_pos_add'".');"';
+    $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n".
+                  '<input type="hidden" name="ipaccess_maxnum" value="'.$maxnum.'" />'."\n".
+                  '<select name="ipaccess_pos_add"'.$chgstr.'>';
+    for (my $k=0; $k<$maxnum+1; $k++) {
+        my $vpos = $k+1;
+        my $selstr;
+        if ($k == $maxnum) {
+            $selstr = ' selected="selected" ';
+        }
+        $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+    }
+    $datatable .= '</select>&nbsp;'."\n".
+                  '<input type="checkbox" name="ipaccess_add" value="1" />'.&mt('Add').'</span></td>'."\n".
+                  '<td colspan="2">'.
+                  &ipaccess_options('add',$itemcount,$dom).
+                  '</td>'."\n".
+                  '</tr>'."\n";
+    $$rowtotal ++;
+    return $datatable;
+}
+
+sub ipaccess_options {
+    my ($num,$itemcount,$dom,$name,$ipranges,$blocksref,$coursesref) = @_;
+    my (%currblocks,%currcourses,$output);
+    if (ref($blocksref) eq 'HASH') {
+        %currblocks = %{$blocksref};
+    }
+    if (ref($coursesref) eq 'HASH') {
+        %currcourses = %{$coursesref};
+    }
+    $output = '<fieldset><legend>'.&mt('Location(s)').'</legend>'.
+              '<span class="LC_nobreak">'.&mt('Name').':&nbsp;'.
+              '<input type="text" name="ipaccess_name_'.$num.'" value="'.$name.'" />'.
+              '</span></fieldset>'.
+              '<fieldset><legend>'.&mt('IP Range(s)').'</legend>'.
+              &mt('Format for each IP range').': '.&mt('A.B.C.D/N or A.B.C.D-E.F.G.H').'<br />'.
+              &mt('Range(s) will be stored as IP netblock(s) in CIDR notation (comma separated)').'<br />'.
+              '<textarea name="ipaccess_range_'.$num.'" rows="3" cols="80">'.
+              $ipranges.'</textarea></fieldset>'.
+              '<fieldset><legend>'.&mt('Functionality Blocked?').'</legend>'.
+              &blocker_checkboxes($num,$blocksref).'</fieldset>'.
+              '<fieldset><legend>'.&mt('Courses/Communities allowed').'</legend>'.
+              '<table>';
+    foreach my $cid (sort(keys(%currcourses))) {
+        my %courseinfo = &Apache::lonnet::coursedescription($cid,{'one_time' => 1});
+        $output .= '<tr><td><span class="LC_nobreak">'.
+                   '<label><input type="checkbox" name="ipaccess_course_delete_'.$num.'" value="'.$cid.'" />'.
+                   &mt('Delete?').'&nbsp;<span class="LC_cusr_emph">'.$courseinfo{'description'}.'</span></label></span>'.
+                   ' <span class="LC_fontsize_medium">('.$cid.')</span></td></tr>';
+    }
+    $output .= '<tr><td><span class="LC_nobreak">'.&mt('Add').':&nbsp;'.
+               '<input type="text" name="ipaccess_cdesc_'.$num.'" value="" onfocus="this.blur();opencrsbrowser('."'display','ipaccess_cnum_$num','ipaccess_cdom_$num','ipaccess_cdesc_$num'".');" />'.
+                &Apache::loncommon::selectcourse_link('display','ipaccess_cnum_'.$num,'ipaccess_cdom_'.$num,'ipaccess_cdesc_'.$num,$dom,undef,'Course/Community').
+               '<input type="hidden" name="ipaccess_cnum_'.$num.'" value="" />'.
+               '<input type="hidden" name="ipaccess_cdom_'.$num.'" value="" />'.
+               '</span></td></tr></table>'."\n".
+               '</fieldset>';
+    return $output;
+}
+
+sub blocker_checkboxes {
+    my ($num,$blocks) = @_;
+    my ($typeorder,$types) = &commblocktype_text();
+    my $numinrow = 6;
+    my $output = '<table>';
+    for (my $i=0; $i<@{$typeorder}; $i++) {
+        my $block = $typeorder->[$i];
+        my $blockstatus;
+        if (ref($blocks) eq 'HASH') {
+            if ($blocks->{$block} eq 'on') {
+                $blockstatus = 'checked="checked"';
+            }
+        }
+        my $rem = $i%($numinrow);
+        if ($rem == 0) {
+            if ($i > 0) {
+                $output .= '</tr>';
+            }
+            $output .= '<tr>';
+        }
+        if ($i == scalar(@{$typeorder})-1) {
+            my $colsleft = $numinrow-$rem;
+            if ($colsleft > 1) {
+                $output .= '<td colspan="'.$colsleft.'">';
+            } else {
+                $output .= '<td>';
+            }
+        } else {
+            $output .= '<td>';
+        }
+        my $item = 'ipaccess_block_'.$num;
+        if ($blockstatus) {
+            $blockstatus = ' '.$blockstatus;
+        }
+        $output .= '<span class="LC_nobreak"><label>'."\n".
+                   '<input type="checkbox" name="'.$item.'"'.
+                   $blockstatus.' value="'.$block.'"'.' />'.
+                   $types->{$block}.'</label></span>'."\n".
+                   '<br /></td>';
+    }
+    $output .= '</tr></table>';
+    return $output;
+}
+
+sub commblocktype_text {
+    my %types = &Apache::lonlocal::texthash(
+        'com' => 'Messaging',
+        'chat' => 'Chat Room',
+        'boards' => 'Discussion',
+        'port' => 'Portfolio',
+        'groups' => 'Groups',
+        'blogs' => 'Blogs',
+        'about' => 'User Information',
+        'printout' => 'Printouts',
+        'passwd' => 'Change Password',
+        'grades' => 'Gradebook',
+        'search' => 'Course search',
+        'wishlist' => 'Stored links',
+        'annotate' => 'Annotations',
+    );
+    my $typeorder = ['com','chat','boards','port','groups','blogs','about','wishlist','printout','grades','search','annotate','passwd'];
+    return ($typeorder,\%types);
+}
+
 sub print_rolecolors {
     my ($phase,$role,$dom,$confname,$settings,$rowtotal) = @_;
     my %choices = &color_font_choices();
@@ -1856,7 +2129,7 @@ sub display_color_options {
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'>'.
                       '<td>'.$choices->{$img};
-        my ($imgfile,$img_import,$login_hdr_pick,$logincolors);
+        my ($imgfile,$img_import,$login_hdr_pick,$logincolors,$alttext);
         if ($role eq 'login') {
             if ($img eq 'login') {
                 $login_hdr_pick =
@@ -1864,8 +2137,13 @@ sub display_color_options {
                 $logincolors =
                     &login_text_colors($img,$role,$logintext,$phase,$choices,
                                        $designs,$defaults);
-            } elsif ($img ne 'domlogo') {
-                $datatable.= &logo_display_options($img,$defaults,$designs);
+            } else {
+                if ($img ne 'domlogo') {
+                    $datatable.= &logo_display_options($img,$defaults,$designs);
+                }
+                if (ref($designs->{'alttext'}) eq 'HASH') {
+                    $alttext = $designs->{'alttext'}{$img};
+                }
             }
         }
         $datatable .= '</td>';
@@ -1957,6 +2235,11 @@ sub display_color_options {
                 $datatable .='&nbsp;<input type="file" name="'.$role.'_'.$img.'" />';
             }
         }
+        if (($role eq 'login') && ($img ne 'login')) {
+            $datatable .= ('&nbsp;' x2).' <span class="LC_nobreak"><label>'.$choices->{'alttext'}.':'.
+                          '<input type="text" name="'.$role.'_alt_'.$img.'" size="10" value="'.$alttext.'" />'.
+                          '</label></span>';
+        }
         $datatable .= '</td></tr>';
     }
     $itemcount ++;
@@ -2128,7 +2411,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') {
@@ -2232,9 +2515,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" ';
@@ -3171,20 +3457,31 @@ ENDSCRIPT
 
 
 sub lti_javascript {
-    my ($settings) = @_;
-    my $togglejs = &lti_toggle_js();
+    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 = 0;
+    $total = scalar(keys(%{$settings}));
     foreach my $item (keys(%{$settings})) {
         if (ref($settings->{$item}) eq 'HASH') {
             my $num = $settings->{$item}{'order'};
+            if ($num eq '') {
+                $num = $total - 1;
+            }
             $ordered{$num} = $item;
         }
     }
-    $total = scalar(keys(%{$settings}));
     my @jsarray = ();
     foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
         push(@jsarray,$ordered{$item});
@@ -3234,6 +3531,9 @@ $jstext
     }
     return;
 }
+
+$linkprot_js
+
 // ]]>
 </script>
 
@@ -3243,36 +3543,73 @@ ENDSCRIPT
 }
 
 sub lti_toggle_js {
+    my ($dom) = @_;
     my %lcauthparmtext = &Apache::lonlocal::texthash (
                             localauth => 'Local auth argument',
                             krb       => 'Kerberos domain',
                          );
+    my $crsincalert = &mt('"User\'s identity sent" needs to be set to "Yes" first,[_1] before setting "Course\'s identity sent" to "Yes"',"\n");
+    &js_escape(\$crsincalert);
+    my %servers = &Apache::lonnet::get_servers($dom,'library');
+    my $primary = &Apache::lonnet::domain($dom,'primary');
+    my $course_servers = "'".join("','",keys(%servers))."'";
     return <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
 
 function toggleLTI(form,setting,item) {
-    if (setting == 'requser') {
-        var fieldsets = document.getElementsByClassName('ltioption_'+item);
-        if (fieldsets.length) {
-            var radioname = 'lti_'+setting+'_'+item;
+    if ((setting == 'requser') || (setting == 'crsinc')) {
+        var usrfieldsets = document.getElementsByClassName('ltioption_usr_'+item);
+        var setvis = '';
+        var radioname = 'lti_requser_'+item;
+        var num = form.elements[radioname].length;
+        if (num) {
+            for (var i=0; i<num; i++) {
+                if (form.elements[radioname][i].checked) {
+                    if (form.elements[radioname][i].value == '1') {
+                        setvis = 1;
+                        break;
+                    }
+                }
+            }
+        }
+        if (usrfieldsets.length) {
+            for (var j=0; j<usrfieldsets.length; j++) {
+                if (setvis) {
+                    usrfieldsets[j].style.display = 'block';
+                } else {
+                    usrfieldsets[j].style.display = 'none';
+                }
+            }
+        }
+        var crsfieldsets = document.getElementsByClassName('ltioption_crs_'+item);
+        if (crsfieldsets.length) {
+            radioname = 'lti_crsinc_'+item;
             var num = form.elements[radioname].length;
             if (num) {
-                var setvis = '';
+                var crsvis = '';
                 for (var i=0; i<num; i++) {
                     if (form.elements[radioname][i].checked) {
                         if (form.elements[radioname][i].value == '1') {
-                           setvis = 1;
-                           break;
+                            if (setvis == '') {
+                                if (setting == 'crsinc'){
+                                    alert("$crsincalert");
+                                    form.elements[radioname][0].checked = true;
+                                }
+                            } else {
+                                crsvis = 1;
+                            }
+                            break;
                         }
                     }
                 }
-                for (var j=0; j<fieldsets.length; j++) {
-                    if (setvis) {
-                        fieldsets[j].style.display = 'block';
-                    } else {
-                        fieldsets[j].style.display = 'none';
-                    }
+                setvis = crsvis;
+            }
+            for (var j=0; j<crsfieldsets.length; j++) {
+                if (setvis) {
+                    crsfieldsets[j].style.display = 'block';
+                } else {
+                    crsfieldsets[j].style.display = 'none';
                 }
             }
         }
@@ -3314,7 +3651,7 @@ function toggleLTI(form,setting,item) {
                            break;
                        }
                    }
-               } 
+               }
             }
             if (!setvis) {
                 if (document.getElementById(divid)) {
@@ -3391,7 +3728,7 @@ function toggleLTI(form,setting,item) {
         var divid = 'lti_menufield_'+item;
         var setvis = '';
         for (var i=0; i<menus.length; i++) {
-            var radioname = menus[i];  
+            var radioname = menus[i];
             var num = form.elements[radioname].length;
             if (num) {
                 for (var j=0; j<num; j++) {
@@ -3418,6 +3755,7 @@ function toggleLTI(form,setting,item) {
     }
     return;
 }
+
 // ]]>
 </script>
 
@@ -3459,20 +3797,55 @@ function toggleLastActiveDays(form) {
 ENDSCRIPT
 }
 
+sub autoenroll_javascript {
+    return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function toggleFailsafe(form) {
+    var radioname = 'autoenroll_failsafe';
+    var divid = 'autoenroll_failsafe_div';
+    var num = form.elements[radioname].length;
+    if (num) {
+        var setvis = '';
+        for (var i=0; i<num; i++) {
+            if (form.elements[radioname][i].checked) {
+                if ((form.elements[radioname][i].value == 'zero') || (form.elements[radioname][i].value == 'any')) {
+                    if (document.getElementById(divid)) {
+                        document.getElementById(divid).style.display = 'inline-block';
+                    }
+                    setvis = 1;
+                }
+                break;
+            }
+        }
+        if (!setvis) {
+            if (document.getElementById(divid)) {
+                document.getElementById(divid).style.display = 'none';
+            }
+        }
+    }
+    return;
+}
+// ]]>
+</script>
+
+ENDSCRIPT
+}
+
 sub saml_javascript {
     return <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
-function toggleSamlOptions(form,hostid) { 
+function toggleSamlOptions(form,hostid) {
     var radioname = 'saml_'+hostid;
     var tablecellon = 'samloptionson_'+hostid;
     var tablecelloff = 'samloptionsoff_'+hostid;
     var num = form.elements[radioname].length;
     if (num) {
-        var setvis = ''; 
+        var setvis = '';
         for (var i=0; i<num; i++) {
             if (form.elements[radioname][i].checked) {
-                if (form.elements[radioname][i].value == '1') { 
+                if (form.elements[radioname][i].value == '1') {
                     if (document.getElementById(tablecellon)) {
                         document.getElementById(tablecellon).style.display='';
                     }
@@ -3501,10 +3874,83 @@ function toggleSamlOptions(form,hostid)
 ENDSCRIPT
 }
 
+sub ipaccess_javascript {
+    my ($settings) = @_;
+    my (%ordered,$total,%jstext);
+    $total = 0;
+    if (ref($settings) eq 'HASH') {
+        foreach my $item (keys(%{$settings})) {
+            if (ref($settings->{$item}) eq 'HASH') {
+                my $num = $settings->{$item}{'order'};
+                $ordered{$num} = $item;
+            }
+        }
+        $total = scalar(keys(%{$settings}));
+    }
+    my @jsarray = ();
+    foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
+        push(@jsarray,$ordered{$item});
+    }
+    my $jstext = '    var ipaccess = Array('."'".join("','",@jsarray)."'".');'."\n";
+    return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function reorderIPaccess(form,item) {
+    var changedVal;
+$jstext
+    var newpos = 'ipaccess_pos_add';
+    var maxh = 1 + $total;
+    var current = new Array;
+    var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value;
+    if (item == newpos) {
+        changedVal = newitemVal;
+    } else {
+        changedVal = form.elements[item].options[form.elements[item].selectedIndex].value;
+        current[newitemVal] = newpos;
+    }
+    for (var i=0; i<ipaccess.length; i++) {
+        var elementName = 'ipaccess_pos_'+ipaccess[i];
+        if (elementName != item) {
+            if (form.elements[elementName]) {
+                var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value;
+                current[currVal] = elementName;
+            }
+        }
+    }
+    var oldVal;
+    for (var j=0; j<maxh; j++) {
+        if (current[j] == undefined) {
+            oldVal = j;
+        }
+    }
+    if (oldVal < changedVal) {
+        for (var k=oldVal+1; k<=changedVal ; k++) {
+           var elementName = current[k];
+           form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex - 1;
+        }
+    } else {
+        for (var k=changedVal; k<oldVal; k++) {
+            var elementName = current[k];
+            form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex + 1;
+        }
+    }
+    return;
+}
+// ]]>
+</script>
+
+ENDSCRIPT
+}
+
 sub print_autoenroll {
     my ($dom,$settings,$rowtotal) = @_;
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
-    my ($defdom,$runon,$runoff,$coownerson,$coownersoff,$failsafe);
+    my ($defdom,$runon,$runoff,$coownerson,$coownersoff,
+        $failsafe,$autofailsafe,$failsafesty,%failsafechecked);
+    $failsafesty = 'none';
+    %failsafechecked = (
+        off => ' checked="checked"',
+    );
     if (ref($settings) eq 'HASH') {
         if (exists($settings->{'run'})) {
             if ($settings->{'run'} eq '0') {
@@ -3538,8 +3984,24 @@ sub print_autoenroll {
         if (exists($settings->{'sender_domain'})) {
             $defdom = $settings->{'sender_domain'};
         }
-        if (exists($settings->{'autofailsafe'})) {
-            $failsafe = $settings->{'autofailsafe'};
+        if (exists($settings->{'failsafe'})) {
+            $failsafe = $settings->{'failsafe'};
+            if ($failsafe eq 'zero') {
+                $failsafechecked{'zero'} = ' checked="checked"';
+                $failsafechecked{'off'} = '';
+                $failsafesty = 'inline-block';
+            } elsif ($failsafe eq 'any') {
+                $failsafechecked{'any'} = ' checked="checked"';
+                $failsafechecked{'off'} = '';
+            }
+            $autofailsafe = $settings->{'autofailsafe'};
+        } elsif (exists($settings->{'autofailsafe'})) {
+            $autofailsafe = $settings->{'autofailsafe'};
+            if ($autofailsafe ne '') {
+                $failsafechecked{'zero'} = ' checked="checked"';
+                $failsafe = 'zero';
+                $failsafechecked{'off'} = '';
+            }
         }
     } else {
         if ($autorun) {
@@ -3578,9 +4040,15 @@ sub print_autoenroll {
                   $coownersoff.' value="0" />'.&mt('No').'</label></span></td>'.
                   '</tr><tr>'.
                   '<td>'.&mt('Failsafe for no drops when institutional data missing').'</td>'.
-                  '<td class="LC_right_item"><span class="LC_nobreak">'.
-                  '<input type="text" name="autoenroll_failsafe"'.
-                  ' value="'.$failsafe.'" size="4" /></span></td></tr>';
+                  '<td class="LC_left_item"><span class="LC_nobreak">'.
+                  '<span class="LC_nobreak"><label><input type="radio" name="autoenroll_failsafe" value="off" onclick="toggleFailsafe(this.form)"'.$failsafechecked{'off'}.' />'.&mt('Not in use').'</label></span>&nbsp;&nbsp;&nbsp; '.
+                  '<span class="LC_nobreak"><label><input type="radio" name="autoenroll_failsafe" value="zero" onclick="toggleFailsafe(this.form)"'.$failsafechecked{'zero'}.' />'.&mt('Retrieved section enrollment is zero').'</label></span><br />'.
+                  '<span class="LC_nobreak"><label><input type="radio" name="autoenroll_failsafe" value="any" onclick="toggleFailsafe(this.form)"'.$failsafechecked{'any'}.' />'.&mt('Retrieved section enrollment is zero or greater').'</label></span>'.
+                  '<div class="LC_floatleft" style="display:'.$failsafesty.';" id="autoenroll_failsafe_div">'.
+                  '<span class="LC_nobreak">'.
+                  &mt('Threshold for number of students in section to drop: [_1]',
+                      '<input type="text" name="autoenroll_autofailsafe" value="'.$autofailsafe.'" size="4" />').
+                  '</span></div></td></tr>';
     $$rowtotal += 4;
     return $datatable;
 }
@@ -3608,7 +4076,7 @@ sub print_autoupdate {
                   '<td>'.$choices{'run'}.'</td>'.
                   '<td class="LC_left_item"><span class="LC_nobreak"><label>'.
                   '<input type="radio" name="autoupdate_run"'.
-                  $updateoff.' value="0" />'.&mt('No').'</label>&nbsp;'.
+                  $updateoff.'value="0" />'.&mt('No').'</label>&nbsp;'.
                   '<label><input type="radio" name="autoupdate_run"'.
                   $updateon.'value="1" />'.&mt('Yes').'</label></span></td>'.
                   '</tr>';
@@ -4145,7 +4613,7 @@ sub print_contacts {
                 map {$excluded{$_} = 1; } @{$lonstatus{'excluded'}};
             }
         }
-        foreach my $item ('errorthreshold','errorsysmail') { 
+        foreach my $item ('errorthreshold','errorsysmail') {
             $css_class = $rownum%2?' class="LC_odd_row"':'';
             $datatable .= '<tr'.$css_class.'>'.
                           '<td class="LC_left_item"><span class="LC_nobreak">'.
@@ -4227,7 +4695,7 @@ sub print_contacts {
                             $includeloc{'override_'.$key} = '';
                             $includestr{'override_'.$key} = '';
                             if ($settings->{'overrides'}{$key}{'include'} ne '') {
-                                ($includeloc{'override_'.$key},$includestr{'override_'.$key}) = 
+                                ($includeloc{'override_'.$key},$includestr{'override_'.$key}) =
                                     split(/:/,$settings->{'overrides'}{$key}{'include'},2);
                                 $includestr{'override_'.$key} = &unescape($includestr{'override_'.$key});
                             }
@@ -4239,7 +4707,6 @@ sub print_contacts {
             my $optionsprefix = 'LC_options_helpdesk_';
 
             my $onclicktypes = "toggleHelpdeskRow(this.form,'overrides','$customclass','$optionsprefix');";
- 
             $datatable .= &insttypes_row($settings,$types,$usertypes,$dom,
                                          $numinrow,$othertitle,'overrides',
                                          \$rownum,$onclicktypes,$customclass);
@@ -4306,7 +4773,7 @@ sub overridden_helpdesk {
             }
             my $title;
             if (ref($short_titles) eq 'HASH') {
-                $title = $short_titles->{$item}; 
+                $title = $short_titles->{$item};
             }
             $output .= '<label>'.
                        '<input type="checkbox" name="override_'.$type.'"'.$check.
@@ -4385,7 +4852,6 @@ function toggleHelpdeskRow(form,checkbox
     return;
 }
 
-
 // ]]>
 </script>
 
@@ -4839,421 +5305,50 @@ sub radiobutton_prefs {
 }
 
 sub print_ltitools {
-    my ($dom,$settings,$rowtotal) = @_;
-    my $rownum = 0;
-    my $css_class;
-    my $itemcount = 1;
-    my $maxnum = 0;
-    my %ordered;
+    my ($position,$dom,$settings,$rowtotal) = @_;
+    my (%rules,%encrypt,%privkeys,%linkprot);
     if (ref($settings) eq 'HASH') {
-        foreach my $item (keys(%{$settings})) {
-            if (ref($settings->{$item}) eq 'HASH') {
-                my $num = $settings->{$item}{'order'};
-                $ordered{$num} = $item;
-            }
-        }
-    }
-    my $confname = $dom.'-domainconfig';
-    my $switchserver = &check_switchserver($dom,$confname);
-    my $maxnum = scalar(keys(%ordered));
-    my $datatable;
-    my %lt = &ltitools_names();
-    my @courseroles = ('cc','in','ta','ep','st');
-    my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner);
-    my @fields = ('fullname','firstname','lastname','email','roles','user');
-    if (keys(%ordered)) {
-        my @items = sort { $a <=> $b } keys(%ordered);
-        for (my $i=0; $i<@items; $i++) {
-            $css_class = $itemcount%2?' class="LC_odd_row"':'';
-            my $item = $ordered{$items[$i]};
-            my ($title,$key,$secret,$url,$lifetime,$imgsrc,%sigsel);
-            if (ref($settings->{$item}) eq 'HASH') {
-                $title = $settings->{$item}->{'title'};
-                $url = $settings->{$item}->{'url'};
-                $key = $settings->{$item}->{'key'};
-                $secret = $settings->{$item}->{'secret'};
-                $lifetime = $settings->{$item}->{'lifetime'};
-                my $image = $settings->{$item}->{'image'};
-                if ($image ne '') {
-                    $imgsrc = '<img src="'.$image.'" alt="'.&mt('Tool Provider icon').'" />';
-                }
-                if ($settings->{$item}->{'sigmethod'} eq 'HMAC-256') {
-                    $sigsel{'HMAC-256'} = ' selected="selected"';
-                } else {
-                    $sigsel{'HMAC-SHA1'} = ' selected="selected"';
-                }
-            }
-            my $chgstr = ' onchange="javascript:reorderLTITools(this.form,'."'ltitools_".$item."'".');"';
-            $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
-                         .'<select name="ltitools_'.$item.'"'.$chgstr.'>';
-            for (my $k=0; $k<=$maxnum; $k++) {
-                my $vpos = $k+1;
-                my $selstr;
-                if ($k == $i) {
-                    $selstr = ' selected="selected" ';
-                }
-                $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
-            }
-            $datatable .= '</select>'.('&nbsp;'x2).
-                '<label><input type="checkbox" name="ltitools_del" value="'.$item.'" />'.
-                &mt('Delete?').'</label></span></td>'.
-                '<td colspan="2">'.
-                '<fieldset><legend>'.&mt('Required settings').'</legend>'.
-                '<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="20" name="ltitools_title_'.$i.'" value="'.$title.'" /></span> '.
-                ('&nbsp;'x2).
-                '<span class="LC_nobreak">'.$lt{'version'}.':<select name="ltitools_version_'.$i.'">'.
-                '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '.
-                ('&nbsp;'x2).
-                '<span class="LC_nobreak">'.$lt{'msgtype'}.':<select name="ltitools_msgtype_'.$i.'">'.
-                '<option value="basic-lti-launch-request" selected="selected">Launch</option></select></span> '.
-                ('&nbsp;'x2).
-                '<span class="LC_nobreak">'.$lt{'sigmethod'}.':<select name="ltitools_sigmethod_'.$i.'">'.
-                '<option value="HMAC-SHA1"'.$sigsel{'HMAC-SHA1'}.'>HMAC-SHA1</option>'.
-                '<option value="HMAC-SHA256"'.$sigsel{'HMAC-SHA256'}.'>HMAC-SHA256</option></select></span>'.
-                '<br /><br />'.
-                '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="40" name="ltitools_url_'.$i.'"'.
-                ' value="'.$url.'" /></span>'.
-                ('&nbsp;'x2).
-                '<span class="LC_nobreak">'.$lt{'key'}.':'.
-                '<input type="text" size="25" name="ltitools_key_'.$i.'" value="'.$key.'" /></span> '.
-                ('&nbsp;'x2).
-                '<span class="LC_nobreak">'.$lt{'lifetime'}.':'.
-                '<input type="text" size="5" name="ltitools_lifetime_'.$i.'" value="'.$lifetime.'" /></span> '.
-                ('&nbsp;'x2).
-                '<span class="LC_nobreak">'.$lt{'secret'}.':'.
-                '<input type="password" size="20" name="ltitools_secret_'.$i.'" value="'.$secret.'" />'.
-                '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltitools_secret_'.$i.'.type='."'text'".' } else { this.form.ltitools_secret_'.$i.'.type='."'password'".' }" />'.&mt('Visible input').'</label>'.
-                '<input type="hidden" name="ltitools_id_'.$i.'" value="'.$item.'" /></span>'.
-                '</fieldset>'.
-                '<fieldset><legend>'.&mt('Optional settings').'</legend>'.
-                '<span class="LC_nobreak">'.&mt('Display target:');
-            my %currdisp;
-            if (ref($settings->{$item}->{'display'}) eq 'HASH') {
-                if ($settings->{$item}->{'display'}->{'target'} eq 'window') {
-                    $currdisp{'window'} = ' checked="checked"';
-                } elsif ($settings->{$item}->{'display'}->{'target'} eq 'tab') {
-                    $currdisp{'tab'} = ' checked="checked"';
-                } else {
-                    $currdisp{'iframe'} = ' checked="checked"';
-                }
-                if ($settings->{$item}->{'display'}->{'width'} =~ /^(\d+)$/) {
-                    $currdisp{'width'} = $1;
-                }
-                if ($settings->{$item}->{'display'}->{'height'} =~ /^(\d+)$/) {
-                     $currdisp{'height'} = $1;
-                }
-                $currdisp{'linktext'} = $settings->{$item}->{'display'}->{'linktext'};
-                $currdisp{'explanation'} = $settings->{$item}->{'display'}->{'explanation'};
-            } else {
-                $currdisp{'iframe'} = ' checked="checked"';
-            }
-            foreach my $disp ('iframe','tab','window') {
-                $datatable .= '<label><input type="radio" name="ltitools_target_'.$i.'" value="'.$disp.'"'.$currdisp{$disp}.' />'.
-                              $lt{$disp}.'</label>'.('&nbsp;'x2);
-            }
-            $datatable .= ('&nbsp;'x4);
-            foreach my $dimen ('width','height') {
-                $datatable .= '<label>'.$lt{$dimen}.'&nbsp;'.
-                              '<input type="text" name="ltitools_'.$dimen.'_'.$i.'" size="5" value="'.$currdisp{$dimen}.'" /></label>'.
-                              ('&nbsp;'x2);
-            }
-            $datatable .= '</span><br />'.
-                          '<div class="LC_left_float">'.$lt{'linktext'}.'<br />'.
-                          '<input type="text" name="ltitools_linktext_'.$i.'" size="25" value="'.$currdisp{'linktext'}.'" /></div>'.
-                          '<div class="LC_left_float">'.$lt{'explanation'}.'<br />'.
-                          '<textarea name="ltitools_explanation_'.$i.'" rows="5" cols="40">'.$currdisp{'explanation'}.
-                          '</textarea></div><div style=""></div><br />';
-            my %units = (
-                          'passback' => 'days',
-                          'roster'   => 'seconds',
-                        );
-            foreach my $extra ('passback','roster') {
-                my $validsty = 'none';
-                my $currvalid;
-                my $checkedon = '';
-                my $checkedoff = ' checked="checked"';
-                if ($settings->{$item}->{$extra}) {
-                    $checkedon = $checkedoff;
-                    $checkedoff = '';
-                    $validsty = 'inline-block';
-                    if ($settings->{$item}->{$extra.'valid'} =~ /^\d+\.?\d*$/) {
-                        $currvalid = $settings->{$item}->{$extra.'valid'};
-                    }
-                }
-                my $onclick = ' onclick="toggleLTITools(this.form,'."'$extra','$i'".');"';
-                $datatable .= '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{$extra}.'&nbsp;'.
-                              '<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="0"'.$checkedoff.$onclick.' />'.
-                              &mt('No').'</label>'.('&nbsp;'x2).
-                              '<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="1"'.$checkedon.$onclick.' />'.
-                              &mt('Yes').'</label></span></div>'.
-                              '<div class="LC_floatleft" style="display:'.$validsty.';" id="ltitools_'.$extra.'time_'.$i.'">'.
-                              '<span class="LC_nobreak">'.
-                              &mt("at least [_1] $units{$extra} after launch",
-                                  '<input type="text" name="ltitools_'.$extra.'valid_'.$i.'" value="'.$currvalid.'" />').
-                              '</span></div><div style="padding:0;clear:both;margin:0;border:0"></div>';
-            }
-            $datatable .= '<span class="LC_nobreak">'.$lt{'icon'}.':&nbsp;';
-            if ($imgsrc) {
-                $datatable .= $imgsrc.
-                              '<label><input type="checkbox" name="ltitools_image_del"'.
-                              ' value="'.$item.'" />'.&mt('Delete?').'</label></span> '.
-                              '<span class="LC_nobreak">&nbsp;'.&mt('Replace:').'&nbsp;';
-            } else {
-                $datatable .= '('.&mt('if larger than 21x21 pixels, image will be scaled').')&nbsp;';
-            }
-            if ($switchserver) {
-                $datatable .= &mt('Upload to library server: [_1]',$switchserver);
-            } else {
-                $datatable .= '<input type="file" name="ltitools_image_'.$i.'" value="" />';
-            }
-            $datatable .= '</span></fieldset>';
-            my (%checkedfields,%rolemaps,$userincdom);
-            if (ref($settings->{$item}) eq 'HASH') {
-                if (ref($settings->{$item}->{'fields'}) eq 'HASH') {
-                    %checkedfields = %{$settings->{$item}->{'fields'}};
-                }
-                $userincdom = $settings->{$item}->{'incdom'};
-                if (ref($settings->{$item}->{'roles'}) eq 'HASH') {
-                    %rolemaps = %{$settings->{$item}->{'roles'}};
-                    $checkedfields{'roles'} = 1;
-                }
-            }
-            $datatable .= '<fieldset><legend>'.&mt('User data sent on launch').'</legend>'.
-                          '<span class="LC_nobreak">';
-            my $userfieldstyle = 'display:none;';
-            my $seluserdom = '';
-            my $unseluserdom = ' selected="selected"';
-            foreach my $field (@fields) {
-                my ($checked,$onclick,$id,$spacer);
-                if ($checkedfields{$field}) {
-                    $checked = ' checked="checked"';
-                }
-                if ($field eq 'user') {
-                    $id = ' id="ltitools_user_field_'.$i.'"';
-                    $onclick = ' onclick="toggleLTITools(this.form,'."'$field','$i'".')"';
-                    if ($checked) {
-                        $userfieldstyle = 'display:inline-block';
-                        if ($userincdom) {
-                            $seluserdom = $unseluserdom;
-                            $unseluserdom = '';
-                        }
+        if ($position eq 'top') {
+            if (exists($settings->{'encrypt'})) {
+                if (ref($settings->{'encrypt'}) eq 'HASH') {
+                    foreach my $key (keys(%{$settings->{'encrypt'}})) {
+                        $encrypt{'toolsec_'.$key} = $settings->{'encrypt'}{$key};
                     }
-                } else {
-                    $spacer = ('&nbsp;' x2);
                 }
-                $datatable .= '<label>'.
-                              '<input type="checkbox" name="ltitools_fields_'.$i.'" value="'.$field.'"'.$id.$checked.$onclick.' />'.
-                              $lt{$field}.'</label>'.$spacer;
             }
-            $datatable .= '</span>';
-            $datatable .= '<div style="'.$userfieldstyle.'" id="ltitools_user_div_'.$i.'">'.
-                          '<span class="LC_nobreak"> : '.
-                          '<select name="ltitools_userincdom_'.$i.'">'.
-                          '<option value="">'.&mt('Select').'</option>'.
-                          '<option value="0"'.$unseluserdom.'>'.&mt('username').'</option>'.
-                          '<option value="1"'.$seluserdom.'>'.&mt('username:domain').'</option>'.
-                          '</select></span></div>';
-            $datatable .= '</fieldset>'.
-                          '<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>';
-            foreach my $role (@courseroles) {
-                my ($selected,$selectnone);
-                if (!$rolemaps{$role}) {
-                    $selectnone = ' selected="selected"';
-                }
-                $datatable .= '<td style="text-align: center">'. 
-                              &Apache::lonnet::plaintext($role,'Course').'<br />'.
-                              '<select name="ltitools_roles_'.$role.'_'.$i.'">'.
-                              '<option value=""'.$selectnone.'>'.&mt('Select').'</option>';
-                foreach my $ltirole (@ltiroles) {
-                    unless ($selectnone) {
-                        if ($rolemaps{$role} eq $ltirole) {
-                            $selected = ' selected="selected"';
-                        } else {
-                            $selected = '';
+            if (exists($settings->{'private'})) {
+                if (ref($settings->{'private'}) eq 'HASH') {
+                    if (ref($settings->{'private'}) eq 'HASH') {
+                        if (ref($settings->{'private'}{'keys'}) eq 'ARRAY') {
+                            map { $privkeys{$_} = 1; } (@{$settings->{'private'}{'keys'}});
                         }
                     }
-                    $datatable .= '<option value="'.$ltirole.'"'.$selected.'>'.$ltirole.'</option>';
                 }
-                $datatable .= '</select></td>';
             }
-            $datatable .= '</tr></table></fieldset>';
-            my %courseconfig;
-            if (ref($settings->{$item}) eq 'HASH') {
-                if (ref($settings->{$item}->{'crsconf'}) eq 'HASH') {
-                    %courseconfig = %{$settings->{$item}->{'crsconf'}};
-                }
-            }
-            $datatable .= '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">';
-            foreach my $item ('label','title','target','linktext','explanation','append') {
-                my $checked;
-                if ($courseconfig{$item}) {
-                    $checked = ' checked="checked"';
+        } elsif ($position eq 'middle') {
+            if (exists($settings->{'rules'})) {
+                if (ref($settings->{'rules'}) eq 'HASH') {
+                    %rules = %{$settings->{'rules'}};
                 }
-                $datatable .= '<label>'.
-                       '<input type="checkbox" name="ltitools_courseconfig_'.$i.'" value="'.$item.'"'.$checked.' />'.
-                       $lt{'crs'.$item}.'</label>&nbsp; '."\n";
             }
-            $datatable .= '</span></fieldset>'.
-                          '<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'.
-                          '<table><tr><th>'.&mt('Action').'</th><th>'.&mt('Name').'</th><th>'.&mt('Value').'</th></tr>';
-            if (ref($settings->{$item}->{'custom'}) eq 'HASH') {
-                my %custom = %{$settings->{$item}->{'custom'}};
-                if (keys(%custom) > 0) {
-                    foreach my $key (sort(keys(%custom))) {
-                        $datatable .= '<tr><td><span class="LC_nobreak">'.
-                                      '<label><input type="checkbox" name="ltitools_customdel_'.$i.'" value="'.
-                                      $key.'" />'.&mt('Delete').'</label></span></td><td>'.$key.'</td>'.
-                                      '<td><input type="text" name="ltitools_customval_'.$key.'_'.$i.'"'.
-                                      ' value="'.$custom{$key}.'" /></td></tr>';
-                    }
+        } else {
+            foreach my $key ('encrypt','private','rules') {
+                if (exists($settings->{$key})) {
+                    delete($settings->{$key});
                 }
             }
-            $datatable .= '<tr><td><span class="LC_nobreak">'.
-                          '<label><input type="checkbox" name="ltitools_customadd" value="'.$i.'" />'.
-                          &mt('Add').'</label></span></td><td><input type="text" name="ltitools_custom_name_'.$i.'" />'.
-                          '</td><td><input type="text" name="ltitools_custom_value_'.$i.'" /></td></tr>';
-            $datatable .= '</table></fieldset></td></tr>'."\n";
-            $itemcount ++;
         }
     }
-    $css_class = $itemcount%2?' class="LC_odd_row"':'';
-    my $chgstr = ' onchange="javascript:reorderLTITools(this.form,'."'ltitools_add_pos'".');"';
-    $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n".
-                  '<input type="hidden" name="ltitools_maxnum" value="'.$maxnum.'" />'."\n".
-                  '<select name="ltitools_add_pos"'.$chgstr.'>';
-    for (my $k=0; $k<$maxnum+1; $k++) {
-        my $vpos = $k+1;
-        my $selstr;
-        if ($k == $maxnum) {
-            $selstr = ' selected="selected" ';
-        }
-        $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+    my $datatable;
+    my $itemcount = 1;
+    if ($position eq 'top') {
+        $datatable = &secrets_form($dom,'toolsec',\%encrypt,\%privkeys,$rowtotal);
+    } elsif ($position eq 'middle') {
+        $datatable = &password_rules('toolsecrets',\$itemcount,\%rules);
+        $$rowtotal += $itemcount;
+    } else {
+        $datatable = &Apache::courseprefs::print_ltitools($dom,'',$settings,\$rowtotal,'','','domain');
     }
-    $datatable .= '</select>&nbsp;'."\n".
-                  '<input type="checkbox" name="ltitools_add" value="1" />'.&mt('Add').'</span></td>'."\n".
-                  '<td colspan="2">'.
-                  '<fieldset><legend>'.&mt('Required settings').'</legend>'.
-                  '<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="20" name="ltitools_add_title" value="" /></span> '."\n".
-                  ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.$lt{'version'}.':<select name="ltitools_add_version">'.
-                  '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '."\n".
-                  ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.$lt{'msgtype'}.':<select name="ltitools_add_msgtype">'.
-                  '<option value="basic-lti-launch-request" selected="selected">Launch</option></select></span> '.
-                  '<span class="LC_nobreak">'.$lt{'sigmethod'}.':<select name="ltitools_add_sigmethod">'.
-                  '<option value="HMAC-SHA1" selected="selected">HMAC-SHA1</option>'.
-                  '<option value="HMAC-SHA256">HMAC-SHA256</option></select></span>'.
-                  '<br />'.
-                  '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="40" name="ltitools_add_url" value="" /></span> '."\n".
-                  ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="ltitools_add_key" value="" /></span> '."\n".
-                  ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" size="5" name="ltitools_add_lifetime" value="300" /></span> '."\n".
-                  ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="ltitools_add_secret" value="" />'.
-                  '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltitools_add_secret.type='."'text'".' } else { this.form.ltitools_add_secret.type='."'password'".' }" />'.&mt('Visible input').'</label></span> '."\n".
-                  '</fieldset>'.
-                  '<fieldset><legend>'.&mt('Optional settings').'</legend>'.
-                  '<span class="LC_nobreak">'.&mt('Display target:');
-    my %defaultdisp;
-    $defaultdisp{'iframe'} = ' checked="checked"';
-    foreach my $disp ('iframe','tab','window') {
-        $datatable .= '<label><input type="radio" name="ltitools_add_target" value="'.$disp.'"'.$defaultdisp{$disp}.' />'.
-                      $lt{$disp}.'</label>'.('&nbsp;'x2);
-    }
-    $datatable .= ('&nbsp;'x4);
-    foreach my $dimen ('width','height') {
-        $datatable .= '<label>'.$lt{$dimen}.'&nbsp;'.
-                      '<input type="text" name="ltitools_add_'.$dimen.'" size="5" /></label>'.
-                      ('&nbsp;'x2);
-    }
-    $datatable .= '</span><br />'.
-                  '<div class="LC_left_float">'.$lt{'linktext'}.'<br />'.
-                  '<input type="text" name="ltitools_add_linktext" size="5" /></div>'.
-                  '<div class="LC_left_float">'.$lt{'explanation'}.'<br />'.
-                  '<textarea name="ltitools_add_explanation" rows="5" cols="40"></textarea>'.
-                  '</div><div style=""></div><br />';
-    my %units = (
-                  'passback' => 'days',
-                  'roster'   => 'seconds',
-                );
-    my %defaulttimes = (
-                     'passback' => '7',
-                     'roster'   => '300',
-                   );
-    foreach my $extra ('passback','roster') {
-        my $onclick = ' onclick="toggleLTITools(this.form,'."'$extra','add'".');"';
-        $datatable .= '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{$extra}.'&nbsp;'.
-                      '<label><input type="radio" name="ltitools_'.$extra.'_add" value="0" checked="checked"'.$onclick.' />'.
-                      &mt('No').'</label></span>'.('&nbsp;'x2).'<span class="LC_nobreak">'.
-                      '<label><input type="radio" name="ltitools_'.$extra.'_add" value="1"'.$onclick.' />'.
-                      &mt('Yes').'</label></span></div>'.
-                      '<div class="LC_floatleft" style="display:none;" id="ltitools_'.$extra.'time_add">'.
-                      '<span class="LC_nobreak">'.
-                      &mt("at least [_1] $units{$extra} after launch",
-                          '<input type="text" name="ltitools_'.$extra.'valid_add" value="'.$defaulttimes{$extra}.'" />').
-                      '</span></div><div style="padding:0;clear:both;margin:0;border:0"></div>';
-    }
-    $datatable .= '<span class="LC_nobreak">'.$lt{'icon'}.':&nbsp;'.
-                  '('.&mt('if larger than 21x21 pixels, image will be scaled').')&nbsp;';
-    if ($switchserver) {
-        $datatable .= &mt('Upload to library server: [_1]',$switchserver);
-    } else {
-        $datatable .= '<input type="file" name="ltitools_add_image" value="" />';
-    }
-    $datatable .= '</span></fieldset>'.
-                  '<fieldset><legend>'.&mt('User data sent on launch').'</legend>'.
-                  '<span class="LC_nobreak">';
-    foreach my $field (@fields) {
-        my ($id,$onclick,$spacer);
-        if ($field eq 'user') {
-            $id = ' id="ltitools_user_field_add"';
-            $onclick = ' onclick="toggleLTITools(this.form,'."'$field','add'".')"';
-        } else {
-            $spacer = ('&nbsp;' x2);
-        }
-        $datatable .= '<label>'.
-                      '<input type="checkbox" name="ltitools_add_fields" value="'.$field.'"'.$id.$onclick.' />'.
-                      $lt{$field}.'</label>'.$spacer;
-    }
-    $datatable .= '</span>'.
-                  '<div style="display:none;" id="ltitools_user_div_add">'.
-                  '<span class="LC_nobreak"> : '.
-                  '<select name="ltitools_userincdom_add">'.
-                  '<option value="" selected="selected">'.&mt('Select').'</option>'.
-                  '<option value="0">'.&mt('username').'</option>'.
-                  '<option value="1">'.&mt('username:domain').'</option>'.
-                  '</select></span></div></fieldset>';
-    $datatable .= '<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>';
-    foreach my $role (@courseroles) {
-        my ($checked,$checkednone);
-        $datatable .= '<td style="text-align: center">'.
-                      &Apache::lonnet::plaintext($role,'Course').'<br />'.
-                      '<select name="ltitools_add_roles_'.$role.'">'.
-                      '<option value="" selected="selected">'.&mt('Select').'</option>';
-        foreach my $ltirole (@ltiroles) {
-            $datatable .= '<option value="'.$ltirole.'">'.$ltirole.'</option>';
-        }
-        $datatable .= '</select></td>';
-    }
-    $datatable .= '</tr></table></fieldset>'.
-                  '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">';
-    foreach my $item ('label','title','target','linktext','explanation','append') {
-        $datatable .= '<label>'.
-                      '<input type="checkbox" name="ltitools_courseconfig" value="'.$item.'" checked="checked" />'.
-                      $lt{'crs'.$item}.'</label>'.('&nbsp;' x2)."\n";
-    }
-    $datatable .= '</span></fieldset>'.
-                  '<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'.
-                  '<table><tr><th>'.&mt('Action').'</th><th>'.&mt('Name').'</th><th>'.&mt('Value').'</th></tr>'.
-                  '<tr><td><span class="LC_nobreak">'.
-                  '<label><input type="checkbox" name="ltitools_add_custom" value="1" />'.
-                  &mt('Add').'</label></span></td><td><input type="text" name="ltitools_add_custom_name" />'.
-                  '</td><td><input type="text" name="ltitools_add_custom_value" /></td></tr>'.
-                  '</table></fieldset>'."\n".
-                  '</td>'."\n".
-                  '</tr>'."\n";
-    $itemcount ++;
     return $datatable;
 }
 
@@ -5267,7 +5362,7 @@ sub ltitools_names {
                                           'key'            => 'Key',
                                           'lifetime'       => 'Nonce lifetime (s)',
                                           'secret'         => 'Secret',
-                                          'icon'           => 'Icon',   
+                                          'icon'           => 'Icon',
                                           'user'           => 'User',
                                           'fullname'       => 'Full Name',
                                           'firstname'      => 'First Name',
@@ -5285,7 +5380,7 @@ sub ltitools_names {
                                           'roster'         => 'Tool can retrieve roster:',
                                           'crstarget'      => 'Display target',
                                           'crslabel'       => 'Course label',
-                                          'crstitle'       => 'Course title', 
+                                          'crstitle'       => 'Course title',
                                           'crslinktext'    => 'Link Text',
                                           'crsexplanation' => 'Explanation',
                                           'crsappend'      => 'Provider URL',
@@ -5293,6 +5388,123 @@ sub ltitools_names {
     return %lt;
 }
 
+sub secrets_form {
+    my ($dom,$context,$encrypt,$privkeys,$rowtotal) = @_;
+    my @ids=&Apache::lonnet::current_machine_ids();
+    my %servers = &Apache::lonnet::get_servers($dom,'library');
+    my $primary = &Apache::lonnet::domain($dom,'primary');
+    my ($css_class,$extra,$numshown,$itemcount,$output);
+    $itemcount = 0;
+    foreach my $hostid (sort(keys(%servers))) {
+        my ($showextra,$divsty,$switch);
+        if ($hostid eq $primary) {
+            if ($context eq 'ltisec') {
+                if (($encrypt->{'ltisec_consumers'}) || ($encrypt->{'ltisec_domlinkprot'})) {
+                    $showextra = 1;
+                }
+                if ($encrypt->{'ltisec_crslinkprot'}) {
+                    $showextra = 1;
+                }
+            } else {
+                if (($encrypt->{'toolsec_crs'}) || ($encrypt->{'toolsec_dom'})) {
+                    $showextra = 1;
+                }
+            }
+            unless (grep(/^\Q$hostid\E$/,@ids)) {
+                $switch = 1;
+            }
+            if ($showextra) {
+                $numshown ++;
+                $divsty = 'display:inline-block';
+            } else {
+                $divsty = 'display:none';
+            }
+            $extra .= '<fieldset id="'.$context.'_info_'.$hostid.'" style="'.$divsty.'">'.
+                      '<legend>'.$hostid.'</legend>';
+            if ($switch) {
+                my $switchserver = '<a href="/adm/switchserver?otherserver='.$hostid.'&amp;role='.
+                                   &HTML::Entities::encode($env{'request.role'},'\'<>"&').
+                                   '&amp;destinationurl=/adm/domainprefs">'.&mt('Switch Server').'</a>';
+                if (exists($privkeys->{$hostid})) {
+                    $extra .= '<div id="'.$context.'_divcurrprivkey_'.$hostid.'" style="display:inline-block" />'.
+                              '<span class="LC_nobreak">'.
+                              &mt('Encryption Key').': ['.&mt('not shown').'] '.('&nbsp;'x2).'</span></div>'.
+                              '<span class="LC_nobreak">'.&mt('Change?').
+                              '<label><input type="radio" value="0" name="'.$context.'_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$context','$hostid'".');" checked="checked" />'.&mt('No').'</label>'.
+                              ('&nbsp;'x2).
+                              '<label><input type="radio" value="1" name="'.$context.'_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$context','$hostid'".');" />'.&mt('Yes').
+                              '</label>&nbsp;&nbsp;</span><div id="'.$context.'_divchgprivkey_'.$hostid.'" style="display:none" />'.
+                              '<span class="LC_nobreak"> - '.&mt('submit from server ([_1]): [_2].',$hostid,$switchserver).
+                              '</span></div>';
+                } else {
+                    $extra .= '<span class="LC_nobreak">'.
+                              &mt('Key required').' - '.&mt('submit from server ([_1]): [_2].',$hostid,$switchserver).
+                              '</span>'."\n";
+                }
+            } elsif (exists($privkeys->{$hostid})) {
+                $extra .= '<div id="'.$context.'_divcurrprivkey_'.$hostid.'" style="display:inline-block" /><span class="LC_nobreak">'.
+                          &mt('Encryption Key').': ['.&mt('not shown').'] '.('&nbsp;'x2).'</span></div>'.
+                          '<span class="LC_nobreak">'.&mt('Change?').
+                          '<label><input type="radio" value="0" name="'.$context.'_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$context','$hostid'".');" checked="checked" />'.&mt('No').'</label>'.
+                          ('&nbsp;'x2).
+                          '<label><input type="radio" value="1" name="'.$context.'_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$context','$hostid'".');" />'.&mt('Yes').
+                          '</label>&nbsp;&nbsp;</span><div id="'.$context.'_divchgprivkey_'.$hostid.'" style="display:none" />'.
+                          '<span class="LC_nobreak">'.&mt('New Key').':'.
+                          '<input type="password" size="20" name="'.$context.'_privkey_'.$hostid.'" value="" autocomplete="new-password" />'.
+                          '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.'.$context.'_privkey_'.$hostid.'.type='."'text'".' } else { this.form.'.$context.'_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="'.$context.'_privkey_'.$hostid.'" value="" autocomplete="new-password" />'.
+                          '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.'.$context.'_privkey_'.$hostid.'.type='."'text'".' } else { this.form.'.$context.'_privkey_'.$hostid.'.type='."'password'".' }" />'.&mt('Visible input').'</label>';
+            }
+            $extra .= '</fieldset>';
+        }
+    }
+    my (%choices,@toggles,%defaultchecked);
+    if ($context eq 'ltisec') {
+        %choices = &Apache::lonlocal::texthash (
+                                                  ltisec_crslinkprot => 'Encrypt stored link protection secrets defined in courses',
+                                                  ltisec_domlinkprot => 'Encrypt stored link protection secrets defined in domain',
+                                                  ltisec_consumers   => 'Encrypt stored consumer secrets defined in domain',
+                                               );
+        @toggles = qw(ltisec_crslinkprot ltisec_domlinkprot ltisec_consumers);
+        %defaultchecked = (
+                           'ltisec_crslinkprot' => 'off',
+                           'ltisec_domlinkprot' => 'off',
+                           'ltisec_consumers'   => 'off',
+                          );
+    } else {
+        %choices = &Apache::lonlocal::texthash (
+                                                  toolsec_crs => 'Encrypt stored external tool secrets defined in courses',
+                                                  toolsec_dom => 'Encrypt stored external tool secrets defined in domain',
+                                               );
+        @toggles = qw(toolsec_crs toolsec_dom);
+        %defaultchecked = (
+                           'toolsec_crs' => 'off',
+                           'toolsec_dom' => 'off',
+                          );
+    }
+    my ($onclick,$itemcount);
+    $onclick = 'javascript:toggleLTIEncKey(this.form,'."'$context'".');';
+    ($output,$itemcount) = &radiobutton_prefs($encrypt,\@toggles,\%defaultchecked,
+                                              \%choices,$itemcount,$onclick,'','left','no');
+
+    $css_class = $itemcount%2?' class="LC_odd_row"':'';
+    my $noprivkeysty = 'display:inline-block';
+    if ($numshown) {
+        $noprivkeysty = 'display:none';
+    }
+    $output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.&mt('Encryption Key(s)').'</td>'.
+               '<td><div id="'.$context.'_noprivkey" style="'.$noprivkeysty.'" >'.
+               '<span class="LC_nobreak">'.&mt('Not in use').'</span></div>'.
+               $extra.
+               '</td></tr>';
+    $itemcount ++;
+    $$rowtotal += $itemcount;
+    return $output;
+}
+
 sub print_proctoring {
     my ($dom,$settings,$rowtotal) = @_;
     my $itemcount = 1;
@@ -5928,123 +6140,247 @@ sub proctoring_providernames {
 }
 
 sub print_lti {
-    my ($dom,$settings,$rowtotal) = @_;
+    my ($position,$dom,$settings,$rowtotal) = @_;
     my $itemcount = 1;
-    my $maxnum = 0;
-    my $css_class;
-    my %ordered;
+    my ($datatable,$css_class);
+    my (%rules,%encrypt,%privkeys,%linkprot);
     if (ref($settings) eq 'HASH') {
-        foreach my $item (keys(%{$settings})) {
-            if (ref($settings->{$item}) eq 'HASH') {
-                my $num = $settings->{$item}{'order'};
-                $ordered{$num} = $item;
+        if ($position eq 'top') {
+            if (exists($settings->{'encrypt'})) {
+                if (ref($settings->{'encrypt'}) eq 'HASH') {
+                    foreach my $key (keys(%{$settings->{'encrypt'}})) {
+                        if ($key eq 'consumers') {
+                            $encrypt{'ltisec_'.$key} = $settings->{'encrypt'}{$key};
+                        } else {
+                            $encrypt{'ltisec_'.$key.'linkprot'} = $settings->{'encrypt'}{$key};
+                        }
+                    }
+                }
+            }
+            if (exists($settings->{'private'})) {
+                if (ref($settings->{'private'}) eq 'HASH') {
+                    if (ref($settings->{'private'}) eq 'HASH') {
+                        if (ref($settings->{'private'}{'keys'}) eq 'ARRAY') {
+                            map { $privkeys{$_} = 1; } (@{$settings->{'private'}{'keys'}});
+                        }
+                    }
+                }
+            }
+        } elsif ($position eq 'middle') {
+            if (exists($settings->{'rules'})) {
+                if (ref($settings->{'rules'}) eq 'HASH') {
+                    %rules = %{$settings->{'rules'}};
+                }
+            }
+        } elsif ($position eq 'lower') {
+            if (exists($settings->{'linkprot'})) {
+                if (ref($settings->{'linkprot'}) eq 'HASH') {
+                    %linkprot = %{$settings->{'linkprot'}};
+                    if ($linkprot{'lock'}) {
+                        delete($linkprot{'lock'});
+                    }
+                }
+            }
+        } else {
+            foreach my $key ('encrypt','private','rules','linkprot') {
+                if (exists($settings->{$key})) {
+                    delete($settings->{$key});
+                }
             }
         }
     }
-    my $maxnum = scalar(keys(%ordered));
-    my $datatable;
-    my %lt = &lti_names();
-    if (keys(%ordered)) {
-        my @items = sort { $a <=> $b } keys(%ordered);
-        for (my $i=0; $i<@items; $i++) {
-            $css_class = $itemcount%2?' class="LC_odd_row"':'';
-            my $item = $ordered{$items[$i]};
-            my ($key,$secret,$lifetime,$consumer,$requser,$current);
-            if (ref($settings->{$item}) eq 'HASH') {
-                $key = $settings->{$item}->{'key'};
-                $secret = $settings->{$item}->{'secret'};
-                $lifetime = $settings->{$item}->{'lifetime'};
-                $consumer = $settings->{$item}->{'consumer'};
-                $requser = $settings->{$item}->{'requser'};
-                $current = $settings->{$item};
-            }
-            my $onclickrequser = ' onclick="toggleLTI(this.form,'."'requser','$i'".');"';
-            my %checkedrequser = (
-                                   yes => ' checked="checked"',
-                                   no  => '',
-                                 );
-            if (!$requser) {
-                $checkedrequser{'no'} = $checkedrequser{'yes'};
-                $checkedrequser{'yes'} = '';
+    if ($position eq 'top') {
+        $datatable = &secrets_form($dom,'ltisec',\%encrypt,\%privkeys,$rowtotal);
+    } elsif ($position eq 'middle') {
+        $datatable = &password_rules('ltisecrets',\$itemcount,\%rules);
+        $$rowtotal += $itemcount;
+    } elsif ($position eq 'lower') {
+         $datatable .= &Apache::courseprefs::print_linkprotection($dom,'',$settings,$rowtotal,'','','domain');
+    } else {
+        my ($switchserver,$switchmessage);
+        $switchserver = &check_switchserver($dom);
+        $switchmessage = &mt("submit from domain's primary library server: [_1].",$switchserver);
+        my $maxnum = 0;
+        my %ordered;
+        if (ref($settings) eq 'HASH') {
+            foreach my $item (keys(%{$settings})) {
+                if (ref($settings->{$item}) eq 'HASH') {
+                    my $num = $settings->{$item}{'order'};
+                    if ($num eq '') {
+                        $num = scalar(keys(%{$settings}));
+                    }
+                    $ordered{$num} = $item;
+                }
             }
-            my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'lti_pos_".$item."'".');"';
-            $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
-                         .'<select name="lti_pos_'.$item.'"'.$chgstr.'>';
-            for (my $k=0; $k<=$maxnum; $k++) {
-                my $vpos = $k+1;
-                my $selstr;
-                if ($k == $i) {
-                    $selstr = ' selected="selected" ';
+        }
+        $maxnum = scalar(keys(%ordered));
+        my %lt = &lti_names();
+        if (keys(%ordered)) {
+            my @items = sort { $a <=> $b } keys(%ordered);
+            for (my $i=0; $i<@items; $i++) {
+                $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                my $item = $ordered{$items[$i]};
+                my ($key,$secret,$usable,$lifetime,$consumer,$requser,$crsinc,$current);
+                if (ref($settings->{$item}) eq 'HASH') {
+                    $key = $settings->{$item}->{'key'};
+                    $usable = $settings->{$item}->{'usable'};
+                    $lifetime = $settings->{$item}->{'lifetime'};
+                    $consumer = $settings->{$item}->{'consumer'};
+                    $requser = $settings->{$item}->{'requser'};
+                    $crsinc = $settings->{$item}->{'crsinc'};
+                    $current = $settings->{$item};
+                }
+                my $onclickrequser = ' onclick="toggleLTI(this.form,'."'requser','$i'".');"';
+                my %checkedrequser = (
+                                       yes => ' checked="checked"',
+                                       no  => '',
+                                     );
+                if (!$requser) {
+                    $checkedrequser{'no'} = $checkedrequser{'yes'};
+                    $checkedrequser{'yes'} = '';
+                }
+                my $onclickcrsinc = ' onclick="toggleLTI(this.form,'."'crsinc','$i'".');"';
+                my %checkedcrsinc = (
+                                      yes => ' checked="checked"',
+                                      no  => '',
+                                    );
+                if (!$crsinc) {
+                    $checkedcrsinc{'no'} = $checkedcrsinc{'yes'};
+                    $checkedcrsinc{'yes'} = '';
+                }
+                my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'lti_pos_".$item."'".');"';
+                $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
+                             .'<select name="lti_pos_'.$item.'"'.$chgstr.'>';
+                for (my $k=0; $k<=$maxnum; $k++) {
+                    my $vpos = $k+1;
+                    my $selstr;
+                    if ($k == $i) {
+                        $selstr = ' selected="selected" ';
+                    }
+                    $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
                 }
-                $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+                $datatable .= '</select>'.('&nbsp;'x2).
+                    '<label><input type="checkbox" name="lti_del" value="'.$item.'" />'.
+                    &mt('Delete?').'</label></span></td>'.
+                    '<td colspan="2">'.
+                    '<fieldset><legend>'.&mt('Required settings').'</legend>'.
+                    '<span class="LC_nobreak">'.$lt{'consumer'}.
+                    ':<input type="text" size="15" name="lti_consumer_'.$i.'" value="'.$consumer.'" /></span> '.
+                    ('&nbsp;'x2).
+                    '<span class="LC_nobreak">'.$lt{'version'}.':<select name="lti_version_'.$i.'">'.
+                    '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '.
+                    ('&nbsp;'x2).
+                    '<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" name="lti_lifetime_'.$i.'"'.
+                    'value="'.$lifetime.'" size="3" /></span><br /><br />';
+                if ($key ne '') {
+                    $datatable .= '<span class="LC_nobreak">'.$lt{'key'};
+                    if ($switchserver) {
+                        $datatable .= ': ['.&mt('[_1] to view/edit',$switchserver).']';
+                    } else {
+                        $datatable .= ':<input type="text" size="25" name="lti_key_'.$i.'" value="'.$key.'" autocomplete="off" />';
+                    }
+                    $datatable .= '</span> '.('&nbsp;'x2);
+                } elsif (!$switchserver) {
+                    $datatable .= '<span class="LC_nobreak">'.$lt{'key'}.':'.
+                                  '<input type="text" size="25" name="lti_key_'.$i.'" value="'.$key.'" autocomplete="off" />'.
+                                  '</span> '.('&nbsp;'x2);
+                }
+                if ($switchserver) {
+                    if ($usable ne '') {
+                        $datatable .= '<div id="lti_divcurrsecret_'.$i.'" style="display:inline-block" /><span class="LC_nobreak">'.
+                                      $lt{'secret'}.': ['.&mt('not shown').'] '.('&nbsp;'x2).'</span></div>'.
+                                      '<span class="LC_nobreak">'.&mt('Change secret?').
+                                      '<label><input type="radio" value="0" name="lti_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','lti'".');" checked="checked" />'.&mt('No').'</label>'.
+                                      ('&nbsp;'x2).
+                                     '<label><input type="radio" value="1" name="lti_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','lti'".');" />'.&mt('Yes').'</label>'.('&nbsp;'x2).
+                                      '</span><div id="lti_divchgsecret_'.$i.'" style="display:none" />'.
+                                      '<span class="LC_nobreak"> - '.$switchmessage.'</span>'.
+                                      '</div>';
+                    } elsif ($key eq '') {
+                        $datatable .= '<span class="LC_nobreak">'.&mt('Key and Secret are required').' - '.$switchmessage.'</span>'."\n";
+                    } else {
+                        $datatable .= '<span class="LC_nobreak">'.&mt('Secret required').' - '.$switchmessage.'</span>'."\n";
+                    }
+                } else {
+                    if ($usable ne '') {
+                        $datatable .= '<div id="lti_divcurrsecret_'.$i.'" style="display:inline-block" /><span class="LC_nobreak">'.
+                                      $lt{'secret'}.': ['.&mt('not shown').'] '.('&nbsp;'x2).'</span></div>'.
+                                      '<span class="LC_nobreak">'.&mt('Change?').
+                                      '<label><input type="radio" value="0" name="lti_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','lti'".');" checked="checked" />'.&mt('No').'</label>'.
+                                      ('&nbsp;'x2).
+                                      '<label><input type="radio" value="1" name="lti_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','lti'".');" />'.&mt('Yes').
+                                      '</label>&nbsp;&nbsp;</span><div id="lti_divchgsecret_'.$i.'" style="display:none" />'.
+                                      '<span class="LC_nobreak">'.&mt('New Secret').':'.
+                                      '<input type="password" size="20" name="lti_secret_'.$i.'" value="" autocomplete="new-password" />'.
+                                      '<label><input type="checkbox" name="lti_visible_'.$i.'" id="lti_visible_'.$i.'" onclick="if (this.checked) { this.form.lti_secret_'.$i.'.type='."'text'".' } else { this.form.lti_secret_'.$i.'.type='."'password'".' }" />'.&mt('Visible input').'</label></span></div>';
+                    } else {
+                        $datatable .=
+                            '<span class="LC_nobreak">'.$lt{'secret'}.':'.
+                            '<input type="password" size="20" name="lti_secret_'.$i.'" value="" autocomplete="new-password" />'.
+                            '<label><input type="checkbox" name="lti_visible_'.$i.'" id="lti_visible_'.$i.'" onclick="if (this.checked) { this.form.lti_secret_'.$i.'.type='."'text'".' } else { this.form.lti_secret_'.$i.'.type='."'password'".' }" />'.&mt('Visible input').'</label>';
+                    }
+                }
+                $datatable .= '<br /><br />'.
+                    '<span class="LC_nobreak">'.$lt{'requser'}.':'.
+                    '<label><input type="radio" name="lti_requser_'.$i.'" value="1"'.$onclickrequser.$checkedrequser{yes}.' />'.&mt('Yes').'</label>&nbsp;'."\n".
+                    '<label><input type="radio" name="lti_requser_'.$i.'" value="0"'.$onclickrequser.$checkedrequser{no}.' />'.&mt('No').'</label></span>'."\n".
+                    '<br /><br />'.
+                    '<span class="LC_nobreak">'.$lt{'crsinc'}.':'.
+                    '<label><input type="radio" name="lti_crsinc_'.$i.'" value="1"'.$onclickcrsinc.$checkedcrsinc{yes}.' />'.&mt('Yes').'</label>&nbsp;'."\n".
+                    '<label><input type="radio" name="lti_crsinc_'.$i.'" value="0"'.$onclickcrsinc.$checkedcrsinc{no}.' />'.&mt('No').'</label></span>'."\n".
+                    ('&nbsp;'x4).
+                    '<input type="hidden" name="lti_id_'.$i.'" value="'.$item.'" /></span>'.
+                    '</fieldset>'.&lti_options($i,$current,$itemcount,%lt).'</td></tr>';
+                $itemcount ++;
             }
-            $datatable .= '</select>'.('&nbsp;'x2).
-                '<label><input type="checkbox" name="lti_del" value="'.$item.'" />'.
-                &mt('Delete?').'</label></span></td>'.
-                '<td colspan="2">'.
-                '<fieldset><legend>'.&mt('Required settings').'</legend>'.
-                '<span class="LC_nobreak">'.$lt{'consumer'}.
-                ':<input type="text" size="15" name="lti_consumer_'.$i.'" value="'.$consumer.'" /></span> '.
-                ('&nbsp;'x2).
-                '<span class="LC_nobreak">'.$lt{'version'}.':<select name="lti_version_'.$i.'">'.
-                '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '.
-                ('&nbsp;'x2).
-                '<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" name="lti_lifetime_'.$i.'"'.
-                'value="'.$lifetime.'" size="3" /></span>'.
-                ('&nbsp;'x2).
-                 '<span class="LC_nobreak">'.$lt{'requser'}.':'.
-                 '<label><input type="radio" name="lti_requser_'.$i.'" value="1"'.$onclickrequser.$checkedrequser{yes}.' />'.&mt('Yes').'</label>&nbsp;'."\n".
-                 '<label><input type="radio" name="lti_requser_'.$i.'" value="0"'.$onclickrequser.$checkedrequser{no}.' />'.&mt('No').'</label></span>'."\n".
-                '<br /><br />'.
-                '<span class="LC_nobreak">'.$lt{'key'}.
-                ':<input type="text" size="25" name="lti_key_'.$i.'" value="'.$key.'" /></span> '.
-                ('&nbsp;'x2).
-                '<span class="LC_nobreak">'.$lt{'secret'}.':'.
-                '<input type="password" size="20" name="lti_secret_'.$i.'" value="'.$secret.'" />'.
-                '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.lti_secret_'.$i.'.type='."'text'".' } else { this.form.lti_secret_'.$i.'.type='."'password'".' }" />'.&mt('Visible input').'</label>'.
-                '<input type="hidden" name="lti_id_'.$i.'" value="'.$item.'" /></span>'.
-                '</fieldset>'.&lti_options($i,$current,$itemcount,%lt).'</td></tr>';
-            $itemcount ++;
         }
-    }
-    $css_class = $itemcount%2?' class="LC_odd_row"':'';
-    my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'lti_pos_add'".');"';
-    $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n".
-                  '<input type="hidden" name="lti_maxnum" value="'.$maxnum.'" />'."\n".
-                  '<select name="lti_pos_add"'.$chgstr.'>';
-    for (my $k=0; $k<$maxnum+1; $k++) {
-        my $vpos = $k+1;
-        my $selstr;
-        if ($k == $maxnum) {
-            $selstr = ' selected="selected" ';
+        $css_class = $itemcount%2?' class="LC_odd_row"':'';
+        my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'lti_pos_add'".');"';
+        $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n".
+                      '<input type="hidden" name="lti_maxnum" value="'.$maxnum.'" />'."\n".
+                      '<select name="lti_pos_add"'.$chgstr.'>';
+        for (my $k=0; $k<$maxnum+1; $k++) {
+            my $vpos = $k+1;
+            my $selstr;
+            if ($k == $maxnum) {
+                $selstr = ' selected="selected" ';
+            }
+            $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
         }
-        $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+        $datatable .= '</select>&nbsp;'."\n".
+                      '<input type="checkbox" name="lti_add" value="1" />'.&mt('Add').'</span></td>'."\n".
+                      '<td colspan="2">'.
+                      '<fieldset><legend>'.&mt('Required settings').'</legend>'.
+                      '<span class="LC_nobreak">'.$lt{'consumer'}.
+                      ':<input type="text" size="15" name="lti_consumer_add" value="" /></span> '."\n".
+                      ('&nbsp;'x2).
+                      '<span class="LC_nobreak">'.$lt{'version'}.':<select name="lti_version_add">'.
+                      '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '."\n".
+                      ('&nbsp;'x2).
+                      '<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" size="3" name="lti_lifetime_add" value="300" /></span><br /><br />'."\n";
+        if ($switchserver) {
+            $datatable .= '<span class="LC_nobreak">'.&mt('Key and Secret are required').' - '.$switchmessage.'</span>'."\n";
+        } else {
+            $datatable .= '<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="lti_key_add" value="" autocomplete="off" /></span> '."\n".
+                          ('&nbsp;'x2).
+                          '<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="lti_secret_add" value="" autocomplete="new-password" />'.
+                          '<label><input type="checkbox" name="lti_add_visible" id="lti_add_visible" onclick="if (this.checked) { this.form.lti_secret_add.type='."'text'".' } else { this.form.lti_secret_add.type='."'password'".' }" />'.&mt('Visible input').'</label></span> '."\n";
+        }
+        $datatable .= '<br /><br />'.
+                      '<span class="LC_nobreak">'.$lt{'requser'}.':'.
+                      '<label><input type="radio" name="lti_requser_add" value="1" onclick="toggleLTI(this.form,'."'requser','add'".');" checked="checked" />'.&mt('Yes').'</label>&nbsp;'."\n".
+                      '<label><input type="radio" name="lti_requser_add" value="0" onclick="toggleLTI(this.form,'."'requser','add'".');" />'.&mt('No').'</label></span>'."\n".
+                      '<br /><br />'.
+                      '<span class="LC_nobreak">'.$lt{'crsinc'}.':'.
+                      '<label><input type="radio" name="lti_crsinc_add" value="1" onclick="toggleLTI(this.form,'."'crsinc','add'".');" checked="checked" />'.&mt('Yes').'</label>&nbsp;'."\n".
+                      '<label><input type="radio" name="lti_crsinc_add" value="0" onclick="toggleLTI(this.form,'."'crsinc','add'".');" />'.&mt('No').'</label></span>'."\n".
+                      '</fieldset>'.&lti_options('add',undef,$itemcount,%lt).
+                      '</td>'."\n".
+                      '</tr>'."\n";
+        $itemcount ++;
     }
-    $datatable .= '</select>&nbsp;'."\n".
-                  '<input type="checkbox" name="lti_add" value="1" />'.&mt('Add').'</span></td>'."\n".
-                  '<td colspan="2">'.
-                  '<fieldset><legend>'.&mt('Required settings').'</legend>'.
-                  '<span class="LC_nobreak">'.$lt{'consumer'}.
-                  ':<input type="text" size="15" name="lti_consumer_add" value="" /></span> '."\n".
-                  ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.$lt{'version'}.':<select name="lti_version_add">'.
-                  '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '."\n".
-                  ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" size="3" name="lti_lifetime_add" value="300" /></span> '."\n".
-                  ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.$lt{'requser'}.':'.
-                  '<label><input type="radio" name="lti_requser_add" value="1" onclick="toggleLTI(this.form,'."'requser','add'".');" checked="checked" />'.&mt('Yes').'</label>&nbsp;'."\n".
-                  '<label><input type="radio" name="lti_requser_add" value="0" onclick="toggleLTI(this.form,'."'requser','add'".');" />'.&mt('No').'</label></span>'."\n".
-                  '<br /><br />'.
-                  '<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="lti_key_add" value="" /></span> '."\n".
-                  ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="lti_secret_add" value="" />'.
-                  '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.lti_secret_add.type='."'text'".' } else { this.form.lti_secret_add.type='."'password'".' }" />'.&mt('Visible input').'</label></span> '."\n".
-                  '</fieldset>'.&lti_options('add',undef,$itemcount,%lt).
-                  '</td>'."\n".
-                  '</tr>'."\n";
-    $$rowtotal ++;
-    return $datatable;;
+    $$rowtotal += $itemcount;
+    return $datatable;
 }
 
 sub lti_names {
@@ -6056,6 +6392,7 @@ sub lti_names {
                                           'consumer'  => 'Consumer',
                                           'secret'    => 'Secret',
                                           'requser'   => "User's identity sent",
+                                          'crsinc'    => "Course's identity sent",
                                           'email'     => 'Email address',
                                           'sourcedid' => 'User ID',
                                           'other'     => 'Other',
@@ -6072,7 +6409,8 @@ sub lti_options {
     my (%checked,%rolemaps,$crssecsrc,$userfield,$cidfield,$callback);
     $checked{'mapuser'}{'sourcedid'} = ' checked="checked"';
     $checked{'mapcrs'}{'course_offering_sourcedid'} = ' checked="checked"';
-    $checked{'makecrs'}{'N'} = '  checked="checked"';
+    $checked{'storecrs'}{'Y'} = ' checked="checked"';
+    $checked{'makecrs'}{'N'} = ' checked="checked"';
     $checked{'mapcrstype'} = {};
     $checked{'makeuser'} = {};
     $checked{'selfenroll'} = {};
@@ -6090,6 +6428,7 @@ sub lti_options {
     my $callbacksty = 'none';
     my $passbacksty = 'none';
     my $optionsty = 'block';
+    my $crssty = 'block';
     my $lcauthparm;
     my $lcauthparmstyle = 'display:none';
     my $lcauthparmtext;
@@ -6100,11 +6439,14 @@ sub lti_options {
     if (ref($current) eq 'HASH') {
         if (!$current->{'requser'}) {
             $optionsty = 'none';
+            $crssty = 'none';
+        } elsif (!$current->{'crsinc'}) {
+            $crssty = 'none';
         }
         if (($current->{'mapuser'} ne '') && ($current->{'mapuser'} ne 'lis_person_sourcedid')) {
             $checked{'mapuser'}{'sourcedid'} = '';
             if ($current->{'mapuser'} eq 'lis_person_contact_email_primary') {
-                $checked{'mapuser'}{'email'} = ' checked="checked"'; 
+                $checked{'mapuser'}{'email'} = ' checked="checked"';
             } else {
                 $checked{'mapuser'}{'other'} = ' checked="checked"';
                 $userfield = $current->{'mapuser'};
@@ -6114,7 +6456,7 @@ sub lti_options {
         if (($current->{'mapcrs'} ne '') && ($current->{'mapcrs'} ne 'course_offering_sourcedid')) {
             $checked{'mapcrs'}{'course_offering_sourcedid'} = '';
             if ($current->{'mapcrs'} eq 'context_id') {
-                $checked{'mapcrs'}{'context_id'} = ' checked="checked"'; 
+                $checked{'mapcrs'}{'context_id'} = ' checked="checked"';
             } else {
                 $checked{'mapcrs'}{'other'} = ' checked="checked"';
                 $cidfield = $current->{'mapcrs'};
@@ -6126,6 +6468,10 @@ sub lti_options {
                 $checked{'mapcrstype'}{$type} = ' checked="checked"';
             }
         }
+        if (!$current->{'storecrs'}) {
+            $checked{'storecrs'}{'N'} = $checked{'storecrs'}{'Y'};
+            $checked{'storecrs'}{'Y'} = '';
+        }
         if ($current->{'makecrs'}) {
             $checked{'makecrs'}{'Y'} = '  checked="checked"';
         }
@@ -6138,7 +6484,7 @@ sub lti_options {
             $checked{'lcauth'}{$1} = ' checked="checked"';
             unless (($current->{'lcauth'} eq 'lti') || ($current->{'lcauth'} eq 'internal')) {
                 $lcauthparm = $current->{'lcauthparm'};
-                $lcauthparmstyle = 'display:table-row'; 
+                $lcauthparmstyle = 'display:table-row';
                 if ($current->{'lcauth'} eq 'localauth') {
                     $lcauthparmtext = &mt('Local auth argument');
                 } else {
@@ -6155,7 +6501,7 @@ sub lti_options {
             %rolemaps = %{$current->{'maproles'}};
         }
         if ($current->{'section'} ne '') {
-            $checked{'crssec'}{'Y'} = '  checked="checked"'; 
+            $checked{'crssec'}{'Y'} = '  checked="checked"';
             $crssecfieldsty = 'inline-block';
             if ($current->{'section'} eq 'course_section_sourcedid') {
                 $checked{'crssecsrc'}{'sourcedid'} = ' checked="checked"';
@@ -6201,9 +6547,9 @@ sub lti_options {
         $checked{'crssec'}{'N'} = ' checked="checked"';
         $checked{'callback'}{'N'} = ' checked="checked"';
         $checked{'topmenu'}{'N'} = ' checked="checked"';
-        $checked{'inlinemenu'}{'Y'} = ' checked="checked"'; 
+        $checked{'inlinemenu'}{'Y'} = ' checked="checked"';
         $checked{'menuitem'}{'grades'} = ' checked="checked"';
-        $menusty = 'inline-block'; 
+        $menusty = 'inline-block';
     }
     my @coursetypes = ('official','unofficial','community','textbook','placement','lti');
     my %coursetypetitles = &Apache::lonlocal::texthash (
@@ -6232,7 +6578,17 @@ sub lti_options {
     my $onclicksecsrc = ' onclick="toggleLTI(this.form,'."'secsrc','$num'".')"';
     my $onclicklcauth = ' onclick="toggleLTI(this.form,'."'lcauth','$num'".')"';
     my $onclickmenu = ' onclick="toggleLTI(this.form,'."'lcmenu','$num'".');"';
-    my $output = '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping users').'</legend>'.
+    my $output = '<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Logout options').'</legend>'.
+                 '<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('Callback to logout LON-CAPA on log out from Consumer').':&nbsp;'.
+                 '<label><input type="radio" name="lti_callback_'.$num.'" value="0"'.
+                 $checked{'callback'}{'N'}.$onclickcallback.' />'.&mt('No').'</label>'.('&nbsp;'x2).
+                 '<label><input type="radio" name="lti_callback_'.$num.'" value="1"'.
+                 $checked{'callback'}{'Y'}.$onclickcallback.' />'.&mt('Yes').'</label></span></div>'.
+                 '<div class="LC_floatleft" style="display:'.$callbacksty.';" id="lti_callbackfield_'.$num.'">'.
+                 '<span class="LC_nobreak">'.&mt('Parameter').': '.
+                 '<input type="text" name="lti_callbackparam_'.$num.'" value="'.$callback.'" /></span>'.
+                 '</div><div style="padding:0;clear:both;margin:0;border:0"></div></fieldset>'.
+                 '<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping users').'</legend>'.
                  '<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('LON-CAPA username').':&nbsp;';
     foreach my $option ('sourcedid','email','other') {
         $output .= '<label><input type="radio" name="lti_mapuser_'.$num.'" value="'.$option.'"'.
@@ -6243,37 +6599,13 @@ sub lti_options {
                '<div class="LC_floatleft" style="display:'.$userfieldsty.';" id="lti_userfield_'.$num.'">'.
                '<input type="text" name="lti_customuser_'.$num.'" '.
                'value="'.$userfield.'" /></div></fieldset>'.
-               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping course roles').'</legend><table><tr>';
-    foreach my $ltirole (@lticourseroles) {
-        my ($selected,$selectnone);
-        if ($rolemaps{$ltirole} eq '') {
-            $selectnone = ' selected="selected"';
-        }
-        $output .= '<td style="text-align: center">'.$ltirole.'<br />'.
-                   '<select name="lti_maprole_'.$ltirole.'_'.$num.'">'.
-                   '<option value=""'.$selectnone.'>'.&mt('Select').'</option>';
-        foreach my $role (@courseroles) {
-            unless ($selectnone) {
-                if ($rolemaps{$ltirole} eq $role) {
-                    $selected = ' selected="selected"';
-                } else {
-                    $selected = '';
-                }
-            }
-            $output .= '<option value="'.$role.'"'.$selected.'>'.
-                       &Apache::lonnet::plaintext($role,'Course').
-                       '</option>';
-        }
-        $output .= '</select></td>';
-    }
-    $output .= '</tr></table></fieldset>'.
-               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Roles which may create user accounts').'</legend>';
+               '<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Roles which may create user accounts').'</legend>';
     foreach my $ltirole (@ltiroles) {
         $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="lti_makeuser_'.$num.'" value="'.$ltirole.'"'.
-                   $checked{'makeuser'}{$ltirole}.' />'.$ltirole.'</label>&nbsp;</span> ';     
+                   $checked{'makeuser'}{$ltirole}.' />'.$ltirole.'</label>&nbsp;</span> ';
     }
     $output .= '</fieldset>'.
-               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('New user accounts created for LTI users').'</legend>'.
+               '<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('New user accounts created for LTI users').'</legend>'.
                '<table>'.
                &modifiable_userdata_row('lti','instdata_'.$num,$current,$numinrow,$itemcount).
                '</table>'.
@@ -6296,7 +6628,29 @@ sub lti_options {
                '<span id="lti_lcauth_parmtext_'.$num.'">'.$lcauthparmtext.'</span>'.
                '<input type="text" name="lti_lcauthparm_'.$num.'" value="" /></span></td></tr>'.
                '</table></fieldset>'.
-               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping courses').'</legend>'.
+               '<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.
+               &mt('LON-CAPA menu items (Course Coordinator can override)').'</legend>'.
+               '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'topmenu'}.':&nbsp;'.
+               '<label><input type="radio" name="lti_topmenu_'.$num.'" value="0"'.
+               $checked{'topmenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.('&nbsp;'x2).
+               '<label><input type="radio" name="lti_topmenu_'.$num.'" value="1"'.
+               $checked{'topmenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>'.
+               '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
+               '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'inlinemenu'}.':&nbsp;'.
+               '<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="0"'.
+               $checked{'inlinemenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.('&nbsp;'x2).
+               '<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="1"'.
+               $checked{'inlinemenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>';
+     $output .='<div style="padding:0;clear:both;margin:0;border:0"></div>'.
+               '<div class="LC_floatleft" style="display:'.$menusty.';" id="lti_menufield_'.$num.'">'.
+               '<span class="LC_nobreak">'.&mt('Menu items').':&nbsp;';
+    foreach my $type ('fullname','coursetitle','role','logout','grades') {
+        $output .= '<label><input type="checkbox" name="lti_menuitem_'.$num.'" value="'.$type.'"'.
+                   $checked{'menuitem'}{$type}.' />'.$menutitles{$type}.'</label>'.
+                   ('&nbsp;'x2);
+    }
+    $output .= '</span></div></fieldset>'.
+               '<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Mapping courses').'</legend>'.
                '<div class="LC_floatleft"><span class="LC_nobreak">'.
                &mt('Unique course identifier').':&nbsp;';
     foreach my $option ('course_offering_sourcedid','context_id','other') {
@@ -6313,21 +6667,51 @@ sub lti_options {
                    $checked{'mapcrstype'}{$type}.' />'.$coursetypetitles{$type}.'</label>'.
                    ('&nbsp;'x2);
     }
-    $output .= '</span></fieldset>'.
-               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Creating courses').'</legend>'.
+    $output .= '</span><br /><br />'.
+               '<span class="LC_nobreak">'.&mt('Store mapping of course identifier to LON-CAPA CourseID').':&nbsp;'.
+               '<label><input type="radio" name="lti_storecrs_'.$num.'" value="0"'.
+               $checked{'storecrs'}{'N'}.' />'.&mt('No').'</label>'.('&nbsp;'x2).
+               '<label><input type="radio" name="lti_storecrs_'.$num.'" value="1"'.
+               $checked{'storecrs'}{'Y'}.' />'.&mt('Yes').'</label></span>'.
+               '</fieldset>'.
+               '<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Mapping course roles').'</legend><table><tr>';
+    foreach my $ltirole (@lticourseroles) {
+        my ($selected,$selectnone);
+        if ($rolemaps{$ltirole} eq '') {
+            $selectnone = ' selected="selected"';
+        }
+        $output .= '<td style="text-align: center">'.$ltirole.'<br />'.
+                   '<select name="lti_maprole_'.$ltirole.'_'.$num.'">'.
+                   '<option value=""'.$selectnone.'>'.&mt('Select').'</option>';
+        foreach my $role (@courseroles) {
+            unless ($selectnone) {
+                if ($rolemaps{$ltirole} eq $role) {
+                    $selected = ' selected="selected"';
+                } else {
+                    $selected = '';
+                }
+            }
+            $output .= '<option value="'.$role.'"'.$selected.'>'.
+                       &Apache::lonnet::plaintext($role,'Course').
+                       '</option>';
+        }
+        $output .= '</select></td>';
+    }
+    $output .= '</tr></table></fieldset>'.
+               '<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Creating courses').'</legend>'.
                '<span class="LC_nobreak">'.&mt('Course created (if absent) on Instructor access').':&nbsp;'.
                '<label><input type="radio" name="lti_makecrs_'.$num.'" value="0"'.
                $checked{'makecrs'}{'N'}.' />'.&mt('No').'</label>'.('&nbsp;'x2).
                '<label><input type="radio" name="lti_makecrs_'.$num.'" value="1"'.
                $checked{'makecrs'}{'Y'}.' />'.&mt('Yes').'</label></span>'.
                '</fieldset>'.
-               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Roles which may self-enroll').'</legend>';
+               '<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Roles which may self-enroll').'</legend>';
     foreach my $lticrsrole (@lticourseroles) {
         $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="lti_selfenroll_'.$num.'" value="'.$lticrsrole.'"'.
                    $checked{'selfenroll'}{$lticrsrole}.' />'.$lticrsrole.'</label>&nbsp;</span> ';
     }
     $output .= '</fieldset>'.
-               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Course options').'</legend>'.
+               '<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Course options').'</legend>'.
                '<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('Assign users to sections').':&nbsp;'.
                '<label><input type="radio" name="lti_crssec_'.$num.'" value="0"'.
                $checked{'crssec'}{'N'}.$onclicksec.' />'.&mt('No').'</label>'.('&nbsp;'x2).
@@ -6350,9 +6734,9 @@ sub lti_options {
         if ($extra eq 'passback') {
             $pb1p1chk = ' checked="checked"';
             $pb1p0chk = '';
-            $onclickpb = ' onclick="toggleLTI(this.form,'."'passback','$num'".');"'; 
+            $onclickpb = ' onclick="toggleLTI(this.form,'."'passback','$num'".');"';
         } else {
-            $onclickpb = ''; 
+            $onclickpb = '';
         }
         if (ref($current) eq 'HASH') {
             if (($current->{$extra})) {
@@ -6379,36 +6763,7 @@ sub lti_options {
                &mt('Outcomes Service (1.1)').'</label>'.('&nbsp;'x2).
                '<label><input type="radio" name="lti_passbackformat_'.$num.'" value="1.0"'.$pb1p0chk.'/>'.
                &mt('Outcomes Extension (1.0)').'</label></span></div>'.
-               '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
-               '<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('Callback on logout').':&nbsp;'.
-               '<label><input type="radio" name="lti_callback_'.$num.'" value="0"'.
-               $checked{'callback'}{'N'}.$onclickcallback.' />'.&mt('No').'</label>'.('&nbsp;'x2).
-               '<label><input type="radio" name="lti_callback_'.$num.'" value="1"'.
-               $checked{'callback'}{'Y'}.$onclickcallback.' />'.&mt('Yes').'</label></span></div>'.
-               '<div class="LC_floatleft" style="display:'.$callbacksty.';" id="lti_callbackfield_'.$num.'">'.
-               '<span class="LC_nobreak">'.&mt('Parameter').': '.
-               '<input type="text" name="lti_callbackparam_'.$num.'" value="'.$callback.'" /></span>'.
-               '</div><div style="padding:0;clear:both;margin:0;border:0"></div></fieldset>'.
-               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Course defaults (Course Coordinator can override)').'</legend>'.
-               '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'topmenu'}.':&nbsp;'.
-               '<label><input type="radio" name="lti_topmenu_'.$num.'" value="0"'.
-               $checked{'topmenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.('&nbsp;'x2).
-               '<label><input type="radio" name="lti_topmenu_'.$num.'" value="1"'.
-               $checked{'topmenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>'.
-               '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
-               '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'inlinemenu'}.':&nbsp;'.
-               '<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="0"'.
-               $checked{'inlinemenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.('&nbsp;'x2).
-               '<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="1"'.
-               $checked{'inlinemenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>';
-     $output .='<div style="padding:0;clear:both;margin:0;border:0"></div>'. 
-               '<div class="LC_floatleft" style="display:'.$menusty.';" id="lti_menufield_'.$num.'">'.
-               '<span class="LC_nobreak">'.&mt('Menu items').':&nbsp;';
-    foreach my $type ('fullname','coursetitle','role','logout','grades') {
-        $output .= '<label><input type="checkbox" name="lti_menuitem_'.$num.'" value="'.$type.'"'.
-                   $checked{'menuitem'}{$type}.' />'.$menutitles{$type}.'</label>'.
-                   ('&nbsp;'x2);
-    }
+               '<div style="padding:0;clear:both;margin:0;border:0"></div></fieldset>';
     $output .= '</span></div></fieldset>';
 #        '<fieldset><legend>'.&mt('Assigning author roles').'</legend>';
 #
@@ -6438,25 +6793,32 @@ sub print_coursedefaults {
         coursecredits        => 'Credits can be specified for courses',
         uselcmath            => 'Math preview uses LON-CAPA previewer (javascript) in place of DragMath (Java)',
         usejsme              => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',
+        inline_chem          => 'Use inline previewer for chemical reaction response in place of pop-up',
         texengine            => 'Default method to display mathematics',
         postsubmit           => 'Disable submit button/keypress following student submission',
         canclone             => "People who may clone a course (besides course's owner and coordinators)",
         mysqltables          => 'Lifetime (s) of "Temporary" MySQL tables (student performance data) on homeserver',
+        ltiauth              => 'Student username in LTI launch of deep-linked URL can be accepted without re-authentication',
+        domexttool           => 'External Tools defined in the domain may be used in courses/communities (by type)',
+        exttool              => 'External Tools can be defined and configured in courses/communities (by type)',
     );
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
                            postsubmit           => 60,
                            mysqltables          => 172800,
+                           domexttool           => 1,
+                           exttool              => 0,
                          );
     if ($position eq 'top') {
         %defaultchecked = (
                             'canuse_pdfforms' => 'off',
                             'uselcmath'       => 'on',
                             'usejsme'         => 'on',
+                            'inline_chem'     => 'on',
                             'canclone'        => 'none',
                           );
-        @toggles = ('canuse_pdfforms','uselcmath','usejsme');
+        @toggles = ('canuse_pdfforms','uselcmath','usejsme','inline_chem');
         my $deftex = $Apache::lonnet::deftex;
         if (ref($settings) eq 'HASH') {
             if ($settings->{'texengine'}) {
@@ -6563,8 +6925,34 @@ sub print_coursedefaults {
         my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout,%currmysql);
         my $currusecredits = 0;
         my $postsubmitclient = 1;
+        my $ltiauth = 0;
+        my %domexttool;
+        my %exttool;
         my @types = ('official','unofficial','community','textbook','placement');
         if (ref($settings) eq 'HASH') {
+            if ($settings->{'ltiauth'}) {
+                $ltiauth = 1;
+            }
+            if (ref($settings->{'domexttool'}) eq 'HASH') {
+                foreach my $type (@types) {
+                    if ($settings->{'domexttool'}->{$type}) {
+                        $domexttool{$type} = ' checked="checked"';
+                    }
+                }
+            } else {
+                foreach my $type (@types) {
+                    if ($staticdefaults{'domexttool'}) {
+                        $domexttool{$type} = ' checked="checked"';
+                    }
+                }
+            }
+            if (ref($settings->{'exttool'}) eq 'HASH') {
+                foreach my $type (@types) {
+                    if ($settings->{'exttool'}->{$type}) {
+                        $exttool{$type} = ' checked="checked"';
+                    }
+                }
+            }
             $currdefresponder = $settings->{'anonsurvey_threshold'};
             if (ref($settings->{'uploadquota'}) eq 'HASH') {
                 foreach my $type (keys(%{$settings->{'uploadquota'}})) {
@@ -6616,6 +7004,9 @@ sub print_coursedefaults {
         } else {
             foreach my $type (@types) {
                 $deftimeout{$type} = $staticdefaults{'postsubmit'};
+                if ($staticdefaults{'domexttool'}) {
+                    $domexttool{$type} = ' checked="checked"';
+                }
             }
         }
         if (!$currdefresponder) {
@@ -6710,7 +7101,44 @@ sub print_coursedefaults {
         }
         $datatable .= '</tr></table></td></tr>'."\n";
         $itemcount ++;
-
+        %defaultchecked = ('ltiauth' => 'off');
+        @toggles = ('ltiauth');
+        $current = {
+                       'ltiauth' => $ltiauth,
+                   };
+        ($table,$itemcount) =
+            &radiobutton_prefs($current,\@toggles,\%defaultchecked,
+                               \%choices,$itemcount,undef,undef,'left');
+        $datatable .= $table;
+        $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+        $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
+                      $choices{'domexttool'}.
+                      '</span></td>'.
+                      '<td style="text-align: right" class="LC_right_item">'.
+                      '<table><tr>';
+        foreach my $type (@types) {
+            $datatable .= '<td style="text-align: left">'.
+                          '<span class="LC_nobreak">'.
+                          '<input type="checkbox" name="domexttool"'.
+                          ' value="'.$type.'"'.$domexttool{$type}.' />'.
+                          &mt($type).'</span></td>'."\n";
+        }
+        $datatable .= '</tr></table></td></tr>'."\n";
+        $itemcount ++;
+        $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+        $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
+                      $choices{'exttool'}.
+                      '</span></td>'.
+                      '<td style="text-align: right" class="LC_right_item">'.
+                      '<table><tr>';
+        foreach my $type (@types) {
+            $datatable .= '<td style="text-align: left">'.
+                          '<span class="LC_nobreak">'.
+                          '<input type="checkbox" name="exttool"'.
+                          ' value="'.$type.'"'.$exttool{$type}.' />'.
+                          &mt($type).'</span></td>'."\n";
+        }
+        $datatable .= '</tr></table></td></tr>'."\n";
     }
     $$rowtotal += $itemcount;
     return $datatable;
@@ -6945,13 +7373,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) =
@@ -6970,6 +7400,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',
@@ -7021,6 +7452,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')) {
@@ -7364,95 +7817,7 @@ sub print_passwords {
             $itemcount ++;
         }
     } elsif ($position eq 'lower') {
-        my ($min,$max,%chars,$expire,$numsaved);
-        $min = $Apache::lonnet::passwdmin;
-        if (ref($settings) eq 'HASH') {
-            if ($settings->{min}) {
-                $min = $settings->{min};
-            }
-            if ($settings->{max}) {
-                $max = $settings->{max};
-            }
-            if (ref($settings->{chars}) eq 'ARRAY') {
-                map { $chars{$_} = 1; } (@{$settings->{chars}});
-            }
-            if ($settings->{expire}) {
-                $expire = $settings->{expire};
-            }
-            if ($settings->{numsaved}) {
-                $numsaved = $settings->{numsaved};
-            }
-        }
-        my %rulenames = &Apache::lonlocal::texthash(
-                                                     uc => 'At least one upper case letter',
-                                                     lc => 'At least one lower case letter',
-                                                     num => 'At least one number',
-                                                     spec => 'At least one non-alphanumeric',
-                                                   );
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'><td>'.$titles{'min'}.'</td>'.
-                      '<td class="LC_left_item"><span class="LC_nobreak">'.
-                      '<input type="text" name="passwords_min" value="'.$min.'" size="3" '.
-                      'onblur="javascript:warnIntPass(this);" />'.
-                      '<span class="LC_fontsize_small"> '.&mt('(Enter an integer: 7 or larger)').'</span>'.
-                      '</span></td></tr>';
-        $itemcount ++;
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'><td>'.$titles{'max'}.'</td>'.
-                      '<td class="LC_left_item"><span class="LC_nobreak">'.
-                      '<input type="text" name="passwords_max" value="'.$max.'" size="3" '.
-                      'onblur="javascript:warnIntPass(this);" />'.
-                      '<span class="LC_fontsize_small"> '.&mt('(Leave blank for no maximum)').'</span>'.
-                      '</span></td></tr>';
-        $itemcount ++;
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'><td>'.$titles{'chars'}.'<br />'.
-                      '<span class="LC_nobreak LC_fontsize_small">'.&mt('(Leave unchecked if not required)').
-                      '</span></td>';
-        my $numinrow = 2;
-        my @possrules = ('uc','lc','num','spec');
-        $datatable .= '<td class="LC_left_item"><table>';
-        for (my $i=0; $i<@possrules; $i++) {
-            my ($rem,$checked);
-            if ($chars{$possrules[$i]}) {
-                $checked = ' checked="checked"';
-            }
-            $rem = $i%($numinrow);
-            if ($rem == 0) {
-                if ($i > 0) {
-                    $datatable .= '</tr>';
-                }
-                $datatable .= '<tr>';
-            }
-            $datatable .= '<td><span class="LC_nobreak"><label>'.
-                          '<input type="checkbox" name="passwords_chars" value="'.$possrules[$i].'"'.$checked.' />'.
-                          $rulenames{$possrules[$i]}.'</label></span></td>';
-        }
-        my $rem = @possrules%($numinrow);
-        my $colsleft = $numinrow - $rem;
-        if ($colsleft > 1 ) {
-            $datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
-                          '&nbsp;</td>';
-        } elsif ($colsleft == 1) {
-            $datatable .= '<td class="LC_left_item">&nbsp;</td>';
-        }
-        $datatable .='</table></td></tr>';
-        $itemcount ++;
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'><td>'.$titles{'expire'}.'</td>'.
-                      '<td class="LC_left_item"><span class="LC_nobreak">'.
-                      '<input type="text" name="passwords_expire" value="'.$expire.'" size="4" '.
-                      'onblur="javascript:warnIntPass(this);" />'.
-                      '<span class="LC_fontsize_small"> '.&mt('(Leave blank for no expiration)').'</span>'.
-                      '</span></td></tr>';
-        $itemcount ++;
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'><td>'.$titles{'numsaved'}.'</td>'.
-                      '<td class="LC_left_item"><span class="LC_nobreak">'.
-                      '<input type="text" name="passwords_numsaved" value="'.$numsaved.'" size="3" '.
-                      'onblur="javascript:warnIntPass(this);" />'. 
-                      '<span class="LC_fontsize_small"> '.&mt('(Leave blank to not save previous passwords)').'</span>'.
-                      '</span></td></tr>';
+        $datatable .= &password_rules('passwords',\$itemcount,$settings);
     } else {
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
         my %ownerchg = (
@@ -7512,6 +7877,129 @@ sub print_passwords {
     return $datatable;
 }
 
+sub password_rules {
+    my ($prefix,$itemcountref,$settings) = @_;
+    my ($min,$max,%chars,$expire,$numsaved,$numinrow);
+    my %titles;
+    if ($prefix eq 'passwords') {
+        %titles = &Apache::lonlocal::texthash (
+            min            => 'Minimum password length',
+            max            => 'Maximum password length',
+            chars          => 'Required characters',
+        );
+    } elsif (($prefix eq 'ltisecrets') || ($prefix eq 'toolsecrets')) {
+        %titles = &Apache::lonlocal::texthash (
+            min            => 'Minimum secret length',
+            max            => 'Maximum secret length',
+            chars          => 'Required characters',
+        );
+    }
+    $min = $Apache::lonnet::passwdmin;
+    my $datatable;
+    my $itemcount;
+    if (ref($itemcountref)) {
+        $itemcount = $$itemcountref;
+    }
+    if (ref($settings) eq 'HASH') {
+        if ($settings->{min}) {
+            $min = $settings->{min};
+        }
+        if ($settings->{max}) {
+            $max = $settings->{max};
+        }
+        if (ref($settings->{chars}) eq 'ARRAY') {
+            map { $chars{$_} = 1; } (@{$settings->{chars}});
+        }
+        if ($prefix eq 'passwords') {
+            if ($settings->{expire}) {
+                $expire = $settings->{expire};
+            }
+            if ($settings->{numsaved}) {
+                $numsaved = $settings->{numsaved};
+            }
+        }
+    }
+    my %rulenames = &Apache::lonlocal::texthash(
+                                                 uc => 'At least one upper case letter',
+                                                 lc => 'At least one lower case letter',
+                                                 num => 'At least one number',
+                                                 spec => 'At least one non-alphanumeric',
+                                               );
+    my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+    $datatable .= '<tr'.$css_class.'><td>'.$titles{'min'}.'</td>'.
+                  '<td class="LC_left_item"><span class="LC_nobreak">'.
+                  '<input type="text" name="'.$prefix.'_min" value="'.$min.'" size="3" '.
+                  'onblur="javascript:warnInt'.$prefix.'(this);" />'.
+                  '<span class="LC_fontsize_small"> '.&mt('(Enter an integer: 7 or larger)').'</span>'.
+                  '</span></td></tr>';
+    $itemcount ++;
+    $css_class = $itemcount%2?' class="LC_odd_row"':'';
+    $datatable .= '<tr'.$css_class.'><td>'.$titles{'max'}.'</td>'.
+                  '<td class="LC_left_item"><span class="LC_nobreak">'.
+                  '<input type="text" name="'.$prefix.'_max" value="'.$max.'" size="3" '.
+                  'onblur="javascript:warnInt'.$prefix.'(this);" />'.
+                  '<span class="LC_fontsize_small"> '.&mt('(Leave blank for no maximum)').'</span>'.
+                  '</span></td></tr>';
+    $itemcount ++;
+    $css_class = $itemcount%2?' class="LC_odd_row"':'';
+    $datatable .= '<tr'.$css_class.'><td>'.$titles{'chars'}.'<br />'.
+                  '<span class="LC_nobreak LC_fontsize_small">'.&mt('(Leave unchecked if not required)').
+                  '</span></td>';
+    my $numinrow = 2;
+    my @possrules = ('uc','lc','num','spec');
+    $datatable .= '<td class="LC_left_item"><table>';
+    for (my $i=0; $i<@possrules; $i++) {
+        my ($rem,$checked);
+        if ($chars{$possrules[$i]}) {
+            $checked = ' checked="checked"';
+        }
+        $rem = $i%($numinrow);
+        if ($rem == 0) {
+            if ($i > 0) {
+                $datatable .= '</tr>';
+            }
+            $datatable .= '<tr>';
+        }
+        $datatable .= '<td><span class="LC_nobreak"><label>'.
+                      '<input type="checkbox" name="'.$prefix.'_chars" value="'.$possrules[$i].'"'.$checked.' />'.
+                      $rulenames{$possrules[$i]}.'</label></span></td>';
+    }
+    my $rem = @possrules%($numinrow);
+    my $colsleft = $numinrow - $rem;
+    if ($colsleft > 1 ) {
+        $datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
+                      '&nbsp;</td>';
+    } elsif ($colsleft == 1) {
+        $datatable .= '<td class="LC_left_item">&nbsp;</td>';
+    }
+    $datatable .='</table></td></tr>';
+    $itemcount ++;
+    if ($prefix eq 'passwords') {
+        $titles{'expire'} = &mt('Password expiration (days)');
+        $titles{'numsaved'} = &mt('Number of previous passwords to save and disallow reuse');
+        $css_class = $itemcount%2?' class="LC_odd_row"':'';
+        $datatable .= '<tr'.$css_class.'><td>'.$titles{'expire'}.'</td>'.
+                      '<td class="LC_left_item"><span class="LC_nobreak">'.
+                      '<input type="text" name="'.$prefix.'_expire" value="'.$expire.'" size="4" '.
+                      'onblur="javascript:warnInt'.$prefix.'(this);" />'.
+                      '<span class="LC_fontsize_small"> '.&mt('(Leave blank for no expiration)').'</span>'.
+                      '</span></td></tr>';
+        $itemcount ++;
+        $css_class = $itemcount%2?' class="LC_odd_row"':'';
+        $datatable .= '<tr'.$css_class.'><td>'.$titles{'numsaved'}.'</td>'.
+                      '<td class="LC_left_item"><span class="LC_nobreak">'.
+                      '<input type="text" name="'.$prefix.'_numsaved" value="'.$numsaved.'" size="3" '.
+                      'onblur="javascript:warnInt'.$prefix.'(this);" />'.
+                      '<span class="LC_fontsize_small"> '.&mt('(Leave blank to not save previous passwords)').'</span>'.
+                      '</span></td></tr>';
+        $itemcount ++;
+    }
+    if (ref($itemcountref)) {
+        $$itemcountref += $itemcount;
+    }
+    return $datatable;
+}
+
 sub print_wafproxy {
     my ($position,$dom,$settings,$rowtotal) = @_;
     my $css_class;
@@ -7565,7 +8053,7 @@ sub print_wafproxy {
             my %config = &Apache::lonnet::get_dom('configuration',['wafproxy'],$domain);
             if (ref($config{'wafproxy'}) eq 'HASH') {
                 $aliases{$domain} = $config{'wafproxy'}{'alias'};
-                if (exists($config{'wafproxy'}{'saml'})) { 
+                if (exists($config{'wafproxy'}{'saml'})) {
                     $saml{$domain} = $config{'wafproxy'}{'saml'};
                 }
                 foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') {
@@ -7600,7 +8088,7 @@ sub print_wafproxy {
                 if ($current) {
                     $aliasrows .= $current;
                     if ($forsaml) {
-                         $aliasrows .= '&nbsp;('.&mt('also for Shibboleth').')';
+                         $aliasrows .= '&nbsp;('.&mt('also for SSO Auth').')';
                     }
                 } else {
                     $aliasrows .= &mt('None');
@@ -7628,12 +8116,12 @@ sub print_wafproxy {
                               '<input type="text" name="wafproxy_alias_'.$server.'" '.
                               'value="'.$current.'" size="30" />'.
                               ('&nbsp;'x2).'<span class="LC_nobreak">'.
-                              &mt('Alias used for Shibboleth').':&nbsp;<label>'.
+                              &mt('Alias used for SSO Auth').':&nbsp;<label>'.
                               '<input type="radio" value="0"'.$samloff.' name="wafproxy_alias_saml_'.$server.'" />'.
-                              &mt('No').'</label>&nbsp;<label>'. 
+                              &mt('No').'</label>&nbsp;<label>'.
                               '<input type="radio" value="1"'.$samlon.' name="wafproxy_alias_saml_'.$server.'" />'.
                               &mt('Yes').'</label></span>'.
-                              '</td>'; 
+                              '</td>';
             }
             $aliasrows .= '</tr>';
             $aliasinfo{$dom_in_effect} .= $aliasrows;
@@ -7716,7 +8204,8 @@ sub print_wafproxy {
                           '<tr'.$css_class.' id="wafproxyrow_'.$dom.'"'.$wafstyle.'>'.
                           '<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$dom.'</b>').'<br /><br />'.
                           '<div id="wafproxyranges_'.$dom.'">'.&mt('Format for comma separated IP ranges').':<br />'.
-                          &mt('A.B.C.D/N or A.B.C.D-E.F.G.H').'</div></td>'.
+                          &mt('A.B.C.D/N or A.B.C.D-E.F.G.H').'<br />'.
+                          &mt('Range(s) stored in CIDR notation').'</div></td>'.
                           '<td class="LC_left_item"><table>'.
                           '<tr>'.
                           '<td valign="top">'.$lt{'remoteip'}.':&nbsp;'.
@@ -8542,7 +9031,7 @@ sub print_loadbalancing {
                                   no => ' checked="checked"',
                               );
         my %balcookiechecked = (
-                                  no => ' checked="checked"', 
+                                  no => ' checked="checked"',
                                );
         foreach my $sparetype (@sparestypes) {
             my $targettable;
@@ -8899,6 +9388,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',
@@ -9128,7 +9618,7 @@ sub print_selfcreation {
         ($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
                                                      \%choices,$itemcount,$onclick);
         $$rowtotal += $itemcount;
-        
+
         if (ref($usertypes) eq 'HASH') {
             if (keys(%{$usertypes}) > 0) {
                 $datatable .= &insttypes_row($createsettings,$types,$usertypes,
@@ -9265,7 +9755,7 @@ sub print_selfcreation {
                 my $currstyle = 'display:none';
                 if (grep(/^\Q$status\E$/,@ordered)) {
                     $currstyle = $rowstyle;
-                    $hidden = 0; 
+                    $hidden = 0;
                 }
                 $datatable .= &noninst_users($processing,$emailverified,$emailoptions,$emaildomain,
                                              $emailrules,$emailruleorder,$settings,$status,$rowid,
@@ -9292,8 +9782,8 @@ sub print_selfcreation {
             foreach my $status (@posstypes) {
                 my $rowid = $classprefix.$status;
                 my $datarowstyle = 'display:none';
-                if (grep(/^\Q$status\E$/,@ordered)) { 
-                    $datarowstyle = $rowstyle; 
+                if (grep(/^\Q$status\E$/,@ordered)) {
+                    $datarowstyle = $rowstyle;
                 }
                 $datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings,
                                                        $numinrow,$$rowtotal,\%usertypeshash,$infofields,
@@ -9395,7 +9885,7 @@ function toggleEmailOptions(form,radio,p
                     document.getElementById(altprefix+'_inst_'+status).style.display = 'none';
                     document.getElementById(altprefix+'_noninst_'+status).style.display = 'none';
                     if (curr == 'custom') {
-                        if (prefix) { 
+                        if (prefix) {
                             document.getElementById(prefix+'_'+status).style.display = 'inline';
                         }
                     } else if (curr == 'inst') {
@@ -9418,10 +9908,10 @@ ENDSCRIPT
 
 sub noninst_users {
     my ($processing,$emailverified,$emailoptions,$emaildomain,$emailrules,
-        $emailruleorder,$settings,$type,$rowid,$typetitle,$css_class,$rowstyle,$intdom) = @_; 
+        $emailruleorder,$settings,$type,$rowid,$typetitle,$css_class,$rowstyle,$intdom) = @_;
     my $class = 'LC_left_item';
     if ($css_class) {
-        $css_class = ' class="'.$css_class.'"'; 
+        $css_class = ' class="'.$css_class.'"';
     }
     if ($rowid) {
         $rowid = ' id="'.$rowid.'"';
@@ -9436,10 +9926,10 @@ sub noninst_users {
         $description = &mt('Requests for: [_1] (status self-reported)',$typetitle);
     }
     $output = '<tr'.$css_class.$rowid.$rowstyle.'>'.
-              "<td>$description</td>\n".           
+              "<td>$description</td>\n".
               '<td class="'.$class.'" colspan="2">'.
               '<table><tr>';
-    my %headers = &Apache::lonlocal::texthash( 
+    my %headers = &Apache::lonlocal::texthash(
               approve  => 'Processing',
               email    => 'E-mail',
               username => 'Username',
@@ -9564,7 +10054,7 @@ sub noninst_users {
                     my $value;
                     if (ref($emaildomain) eq 'HASH') {
                         if (ref($emaildomain->{$type}) eq 'HASH') {
-                            $value = $emaildomain->{$type}->{$option}; 
+                            $value = $emaildomain->{$type}->{$option};
                         }
                     }
                     if ($value eq '') {
@@ -9680,7 +10170,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">'.
@@ -9735,9 +10225,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;
 }
@@ -9869,18 +10359,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')) {
@@ -9930,6 +10436,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;
@@ -9955,6 +10477,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',
@@ -10187,10 +10711,13 @@ sub legacy_scantronformat {
     my ($url,$error);
     my @statinfo = &Apache::lonnet::stat_file($newurl);
     if ((!@statinfo) || ($statinfo[0] eq 'no_such_dir')) {
+        my $modified = [];
         (my $result,$url) =
-            &publishlogo($r,'copy',$legacyfile,$dom,$confname,'scantron',
-                         '','',$newfile);
-        if ($result ne 'ok') {
+            &Apache::lonconfigsettings::publishlogo($r,'copy',$legacyfile,$dom,$confname,
+                                                    'scantron','','',$newfile,$modified);
+        if ($result eq 'ok') {
+            &update_modify_urls($r,$modified);
+        } else {
             $error = &mt("An error occurred publishing the [_1] bubblesheet format file in RES space. Error was: [_2].",$newfile,$result);
         }
     }
@@ -10669,6 +11196,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 '') {
@@ -10722,6 +11266,17 @@ $jstext
     return;
 }
 
+$portal_js
+
+// ]]>
+</script>
+
+ENDSCRIPT
+    } else {
+return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+$portal_js
 // ]]>
 </script>
 
@@ -10731,17 +11286,27 @@ ENDSCRIPT
 }
 
 sub passwords_javascript {
-    my %intalert = &Apache::lonlocal::texthash (
-        authcheck => 'Warning: disallowing login for an authenticated user if the stored cost is less than the default will require a password reset by/for the user.',
-        authcost => 'Warning: bcrypt encryption cost for internal authentication must be an integer.',
-        passmin => 'Warning: minimum password length must be a positive integer greater than 6.',
-        passmax => 'Warning: maximum password length must be a positive integer (or blank).',
-        passexp => 'Warning: days before password expiration must be a positive integer (or blank).',
-        passnum => 'Warning: number of previous passwords to save must be a positive integer (or blank).',
-    );
+    my ($prefix) = @_;
+    my %intalert;
+    if ($prefix eq 'passwords') {
+        %intalert = &Apache::lonlocal::texthash (
+            authcheck => 'Warning: disallowing login for an authenticated user if the stored cost is less than the default will require a password reset by/for the user.',
+            authcost => 'Warning: bcrypt encryption cost for internal authentication must be an integer.',
+            passmin => 'Warning: minimum password length must be a positive integer greater than 6.',
+            passmax => 'Warning: maximum password length must be a positive integer (or blank).',
+            passexp => 'Warning: days before password expiration must be a positive integer (or blank).',
+            passnum => 'Warning: number of previous passwords to save must be a positive integer (or blank).',
+        );
+    } elsif (($prefix eq 'ltisecrets') || ($prefix eq 'toolsecrets')) {
+        %intalert = &Apache::lonlocal::texthash (
+            passmin => 'Warning: minimum secret length must be a positive integer greater than 6.',
+            passmax => 'Warning: maximum secret length must be a positive integer (or blank).',
+        );
+    }
     &js_escape(\%intalert);
     my $defmin = $Apache::lonnet::passwdmin;
-    my $intauthjs = <<"ENDSCRIPT";
+    my $intauthjs;
+    if ($prefix eq 'passwords') { $intauthjs = <<"ENDSCRIPT";
 
 function warnIntAuth(field) {
     if (field.name == 'intauth_check') {
@@ -10761,11 +11326,17 @@ function warnIntAuth(field) {
     return;
 }
 
-function warnIntPass(field) {
+ENDSCRIPT
+
+     }
+
+     $intauthjs .= <<"ENDSCRIPT";
+
+function warnInt$prefix(field) {
     field.value.replace(/^\s+/,'');
     field.value.replace(/\s+\$/,'');
     var regexdigit=/^\\d+\$/;
-    if (field.name == 'passwords_min') {
+    if (field.name == '${prefix}_min') {
         if (field.value == '') {
             alert('$intalert{passmin}');
             field.value = '$defmin';
@@ -10785,7 +11356,7 @@ function warnIntPass(field) {
             field.value = '';
         }
         if (field.value != '') {
-            if (field.name == 'passwords_expire') {
+            if (field.name == '${prefix}_expire') {
                 var regexpposnum=/^\\d+(|\\.\\d*)\$/; 
                 if (!regexpposnum.test(field.value)) {
                     alert('$intalert{passexp}');
@@ -10799,10 +11370,10 @@ function warnIntPass(field) {
                 }
             } else {
                 if (!regexdigit.test(field.value)) {
-                    if (field.name == 'passwords_max') {
+                    if (field.name == '${prefix}_max') {
                         alert('$intalert{passmax}');
                     } else {
-                        if (field.name == 'passwords_numsaved') {
+                        if (field.name == '${prefix}_numsaved') {
                             alert('$intalert{passnum}');
                         }
                     }
@@ -11128,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') {
@@ -11154,7 +11724,7 @@ sub modifiable_userdata_row {
                 }
             }
         }
-        if (ref($hashref) eq 'HASH') { 
+        if (ref($hashref) eq 'HASH') {
             foreach my $field (@fields) {
                 if ($hashref->{$field}) {
                     if ($role eq 'emailusername') {
@@ -11166,7 +11736,6 @@ sub modifiable_userdata_row {
             }
         }
     }
- 
     my $total = scalar(@fields);
     for (my $i=0; $i<$total; $i++) {
         $rem = $i%($numinrow);
@@ -11330,7 +11899,7 @@ sub insttypes_row {
         } else {
             $output .= '<td class="LC_left_item">';
         }
-        $output .= '&nbsp;';  
+        $output .= '&nbsp;';
     } else {
         if ($rem == 0) {
             $output .= '<tr>';
@@ -11433,7 +12002,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',
@@ -11457,6 +12026,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'};
                 }
             }
@@ -11599,13 +12169,16 @@ sub modify_login {
                 if ($addedfile ne '') {
                     push(@allnew,$addedfile);
                 }
+                my $modified = [];
                 foreach my $lang (@allnew) {
                     my $formelem = 'loginhelpurl_'.$lang;
                     if ($lang eq $env{'form.loginhelpurl_add_lang'}) {
                         $formelem = 'loginhelpurl_add_file';
                     }
-                    (my $result,$newurl{$lang}) = &publishlogo($r,'upload',$formelem,$dom,$confname,
-                                                               "help/$lang",'','',$newfile{$lang});
+                    (my $result,$newurl{$lang}) =
+                        &Apache::lonconfigsettings::publishlogo($r,'upload',$formelem,$dom,$confname,
+                                                                "help/$lang",'','',$newfile{$lang},
+                                                                $modified);
                     if ($result eq 'ok') {
                         $loginhash{'login'}{'helpurl'}{$lang} = $newurl{$lang};
                         $changes{'helpurl'}{$lang} = 1;
@@ -11618,6 +12191,7 @@ sub modify_login {
                         }
                     }
                 }
+                &update_modify_urls($r,$modified);
             } else {
                 $error = &mt("Upload of custom log-in help file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2].  Error was: [_3].",$confname,$dom,$author_ok);
             }
@@ -11675,11 +12249,14 @@ sub modify_login {
             if ($switchserver) {
                 $error = &mt("Upload of custom markup is not permitted to this server: [_1]",$switchserver);
             } elsif ($author_ok eq 'ok') {
+                my $modified = [];
                 foreach my $lonhost (@newhosts) {
                     my $formelem = 'loginheadtag_'.$lonhost;
-                    (my $result,$newheadtagurls{$lonhost}) = &publishlogo($r,'upload',$formelem,$dom,$confname,
-                                                                          "login/headtag/$lonhost",'','',
-                                                                          $env{'form.loginheadtag_'.$lonhost.'.filename'});
+                    (my $result,$newheadtagurls{$lonhost}) =
+                        &Apache::lonconfigsettings::publishlogo($r,'upload',$formelem,$dom,$confname,
+                                                                "login/headtag/$lonhost",'','',
+                                                                $env{'form.loginheadtag_'.$lonhost.'.filename'},
+                                                                $modified);
                     if ($result eq 'ok') {
                         $loginhash{'login'}{'headtag'}{$lonhost}{'url'} = $newheadtagurls{$lonhost};
                         $changes{'headtag'}{$lonhost} = 1;
@@ -11696,6 +12273,7 @@ sub modify_login {
                         }
                     }
                 }
+                &update_modify_urls($r,$modified);
             } else {
                 $error = &mt("Upload of custom markup file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2].  Error was: [_3].",$confname,$dom,$author_ok);
             }
@@ -11714,10 +12292,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'});
@@ -11735,25 +12316,28 @@ 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 {
-            if ($saml{$lonhost}) {  
+            if ($saml{$lonhost}) {
                 $changes{'saml'}{$lonhost} = 1;
                 delete($currsaml{$lonhost});
             }
         }
     }
     foreach my $posshost (keys(%currsaml)) {
-        unless (exists($domservers{$posshost})) { 
-            delete($currsaml{$posshost}); 
+        unless (exists($domservers{$posshost})) {
+            delete($currsaml{$posshost});
         }
     }
     %{$loginhash{'login'}{'saml'}} = %currsaml;
@@ -11764,11 +12348,14 @@ sub modify_login {
             if ($switchserver) {
                 $error = &mt("Upload of SSO Button Image is not permitted to this server: [_1].",$switchserver);
             } elsif ($author_ok eq 'ok') {
+                my $modified = [];
                 foreach my $lonhost (@newsamlimgs) {
                     my $formelem = 'saml_img_'.$lonhost;
-                    my ($result,$imgurl) = &publishlogo($r,'upload',$formelem,$dom,$confname,
-                                                        "login/saml/$lonhost",'','',
-                                                        $env{'form.saml_img_'.$lonhost.'.filename'});
+                    my ($result,$imgurl) =
+                        &Apache::lonconfigsettings::publishlogo($r,'upload',$formelem,$dom,$confname,
+                                                                "login/saml/$lonhost",'','',
+                                                                $env{'form.saml_img_'.$lonhost.'.filename'},
+                                                                $modified);
                     if ($result eq 'ok') {
                         $currsaml{$lonhost}{'img'} = $imgurl;
                         $loginhash{'login'}{'saml'}{$lonhost}{'img'} = $imgurl;
@@ -11779,6 +12366,7 @@ sub modify_login {
                         $errors .= '<li><span class="LC_error">'.$puberror.'</span></li>';
                     }
                 }
+                &update_modify_urls($r,$modified);
             } else {
                 $error = &mt("Upload of SSO button image file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2].  Error was: [_3].",$confname,$dom,$author_ok);
             }
@@ -11942,19 +12530,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>';
@@ -12068,6 +12659,283 @@ sub color_font_choices {
     return %choices;
 }
 
+sub modify_ipaccess {
+    my ($dom,$lastactref,%domconfig) = @_;
+    my (@allpos,%changes,%confhash,$errors,$resulttext);
+    my (@items,%deletions,%itemids,@warnings);
+    my ($typeorder,$types) = &commblocktype_text();
+    if ($env{'form.ipaccess_add'}) {
+        my $name = $env{'form.ipaccess_name_add'};
+        my ($newid,$error) = &get_ipaccess_id($dom,$name);
+        if ($newid) {
+            $itemids{'add'} = $newid;
+            push(@items,'add');
+            $changes{$newid} = 1;
+        } else {
+            $error = &mt('Failed to acquire unique ID for new IP access control item');
+            $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+        }
+    }
+    if (ref($domconfig{'ipaccess'}) eq 'HASH') {
+        my @todelete = &Apache::loncommon::get_env_multiple('form.ipaccess_del');
+        if (@todelete) {
+            map { $deletions{$_} = 1; } @todelete;
+        }
+        my $maxnum = $env{'form.ipaccess_maxnum'};
+        for (my $i=0; $i<$maxnum; $i++) {
+            my $itemid = $env{'form.ipaccess_id_'.$i};
+            $itemid =~ s/\D+//g;
+            if (ref($domconfig{'ipaccess'}{$itemid}) eq 'HASH') {
+                if ($deletions{$itemid}) {
+                    $changes{$itemid} = $domconfig{'ipaccess'}{$itemid}{'name'};
+                } else {
+                    push(@items,$i);
+                    $itemids{$i} = $itemid;
+                }
+            }
+        }
+    }
+    foreach my $idx (@items) {
+        my $itemid = $itemids{$idx};
+        next unless ($itemid);
+        my %current;
+        unless ($idx eq 'add') {
+            if (ref($domconfig{'ipaccess'}{$itemid}) eq 'HASH') {
+                %current = %{$domconfig{'ipaccess'}{$itemid}};
+            }
+        }
+        my $position = $env{'form.ipaccess_pos_'.$itemid};
+        $position =~ s/\D+//g;
+        if ($position ne '') {
+            $allpos[$position] = $itemid;
+        }
+        my $name = $env{'form.ipaccess_name_'.$idx};
+        $name =~ s/^\s+|\s+$//g;
+        $confhash{$itemid}{'name'} = $name;
+        my $possrange = $env{'form.ipaccess_range_'.$idx};
+        $possrange =~ s/^\s+|\s+$//g;
+        unless ($possrange eq '') {
+            $possrange =~ s/[\r\n]+/\s/g;
+            $possrange =~ s/\s*-\s*/-/g;
+            $possrange =~ s/\s+/,/g;
+            $possrange =~ s/,+/,/g;
+            if ($possrange ne '') {
+                my (@ok,$count);
+                $count = 0;
+                foreach my $poss (split(/\,/,$possrange)) {
+                    $count ++;
+                    $poss = &validate_ip_pattern($poss);
+                    if ($poss ne '') {
+                        push(@ok,$poss);
+                    }
+                }
+                my $diff = $count - scalar(@ok);
+                if ($diff) {
+                    $errors .= '<li><span class="LC_error">'.
+                               &mt('[quant,_1,IP] invalid and excluded from saved value for IP range(s) for [_2]',
+                                   $diff,$name).
+                               '</span></li>';
+                }
+                if (@ok) {
+                    my @cidr_list;
+                    foreach my $item (@ok) {
+                        @cidr_list = &Net::CIDR::cidradd($item,@cidr_list);
+                    }
+                    $confhash{$itemid}{'ip'} = join(',',@cidr_list);
+                }
+            }
+        }
+        foreach my $field ('name','ip') {
+            unless (($idx eq 'add') || ($changes{$itemid})) {
+                if ($current{$field} ne $confhash{$itemid}{$field}) {
+                    $changes{$itemid} = 1;
+                    last;
+                }
+            }
+        }
+        $confhash{$itemid}{'commblocks'} = {};
+
+        my %commblocks;
+        map { $commblocks{$_} = 1; } &Apache::loncommon::get_env_multiple('form.ipaccess_block_'.$idx);
+        foreach my $type (@{$typeorder}) {
+            if ($commblocks{$type}) {
+                $confhash{$itemid}{'commblocks'}{$type} = 'on';
+            }
+            unless (($idx eq 'add') || ($changes{$itemid})) {
+                if (ref($current{'commblocks'}) eq 'HASH') {
+                    if ($confhash{$itemid}{'commblocks'}{$type} ne $current{'commblocks'}{$type}) {
+                        $changes{$itemid} = 1;
+                    }
+                } elsif ($confhash{$itemid}{'commblocks'}{$type}) {
+                    $changes{$itemid} = 1;
+                }
+            }
+        }
+        $confhash{$itemid}{'courses'} = {};
+        my %crsdeletions;
+        my @delcrs = &Apache::loncommon::get_env_multiple('form.ipaccess_course_delete_'.$idx);
+        if (@delcrs) {
+            map { $crsdeletions{$_} = 1; } @delcrs;
+        }
+        if (ref($current{'courses'}) eq 'HASH') {
+            foreach my $cid (sort(keys(%{$current{'courses'}}))) {
+                if ($crsdeletions{$cid}) {
+                    $changes{$itemid} = 1;
+                } else {
+                    $confhash{$itemid}{'courses'}{$cid} = 1;
+                }
+            }
+        }
+        $env{'form.ipaccess_cnum_'.$idx} =~ s/^\s+|\s+$//g;
+        $env{'form.ipaccess_cdom_'.$idx} =~ s/^\s+|\s+$//g;
+        if (($env{'form.ipaccess_cnum_'.$idx} =~ /^$match_courseid$/) &&
+            ($env{'form.ipaccess_cdom_'.$idx} =~ /^$match_domain$/)) {
+            if (&Apache::lonnet::homeserver($env{'form.ipaccess_cnum_'.$idx},
+                                            $env{'form.ipaccess_cdom_'.$idx}) eq 'no_host') {
+                $errors .= '<li><span class="LC_error">'.
+                           &mt('Invalid courseID [_1] omitted from list of allowed courses',
+                               $env{'form.ipaccess_cdom_'.$idx}.'_'.$env{'form.ipaccess_cnum_'.$idx}).
+                           '</span></li>';
+            } else {
+                $confhash{$itemid}{'courses'}{$env{'form.ipaccess_cdom_'.$idx}.'_'.$env{'form.ipaccess_cnum_'.$idx}} = 1;
+                $changes{$itemid} = 1;
+            }
+        }
+    }
+    if (@allpos > 0) {
+        my $idx = 0;
+        foreach my $itemid (@allpos) {
+            if ($itemid ne '') {
+                $confhash{$itemid}{'order'} = $idx;
+                unless ($changes{$itemid}) {
+                    if (ref($domconfig{'ipaccess'}) eq 'HASH') {
+                        if (ref($domconfig{'ipaccess'}{$itemid}) eq 'HASH') {
+                            if ($domconfig{'ipaccess'}{$itemid}{'order'} ne $idx) {
+                                $changes{$itemid} = 1;
+                            }
+                        }
+                    }
+                }
+                $idx ++;
+            }
+        }
+    }
+    if (keys(%changes)) {
+        my %defaultshash = (
+                              ipaccess => \%confhash,
+                           );
+        my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
+                                                 $dom);
+        if ($putresult eq 'ok') {
+            my $cachetime = 1800;
+            &Apache::lonnet::do_cache_new('ipaccess',$dom,\%confhash,$cachetime);
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'ipaccess'} = 1;
+            }
+            $resulttext = &mt('Changes made:').'<ul>';
+            my %bynum;
+            foreach my $itemid (sort(keys(%changes))) {
+                if (ref($confhash{$itemid}) eq 'HASH') {
+                    my $position = $confhash{$itemid}{'order'};
+                    if ($position =~ /^\d+$/) {
+                        $bynum{$position} = $itemid;
+                    }
+                }
+            }
+            if (keys(%deletions)) {
+                foreach my $itemid (sort { $a <=> $b } keys(%deletions)) {
+                    $resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>';
+                }
+            }
+            foreach my $pos (sort { $a <=> $b } keys(%bynum)) {
+                my $itemid = $bynum{$pos};
+                if (ref($confhash{$itemid}) eq 'HASH') {
+                    $resulttext .= '<li><b>'.$confhash{$itemid}{'name'}.'</b><ul>';
+                    my $position = $pos + 1;
+                    $resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>';
+                    if ($confhash{$itemid}{'ip'} eq '') {
+                        $resulttext .= '<li>'.&mt('No IP Range(s) set').'</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('IP Range(s): [_1]',$confhash{$itemid}{'ip'}).'</li>';
+                    }
+                    if (keys(%{$confhash{$itemid}{'commblocks'}})) {
+                        $resulttext .= '<li>'.&mt('Functionality Blocked: [_1]',
+                                                  join(', ', map { $types->{$_}; } sort(keys(%{$confhash{$itemid}{'commblocks'}})))).
+                                       '</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('No functionality blocked').'</li>';
+                    }
+                    if (keys(%{$confhash{$itemid}{'courses'}})) {
+                        my @courses;
+                        foreach my $cid (sort(keys(%{$confhash{$itemid}{'courses'}}))) {
+                            my %courseinfo = &Apache::lonnet::coursedescription($cid,{'one_time' => 1});
+                            push(@courses,$courseinfo{'description'}.' ('.$cid.')');
+                        }
+                        $resulttext .= '<li>'.&mt('Courses/Communities allowed').':<ul><li>'.
+                                             join('</li><li>',@courses).'</li></ul>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('No courses allowed').'</li>';
+                    }
+                    $resulttext .= '</ul></li>';
+                }
+            }
+            $resulttext .= '</ul>';
+        } else {
+            $errors .= '<li><span class="LC_error">'.&mt('Failed to save changes').'</span></li>';
+        }
+    } else {
+        $resulttext = &mt('No changes made');
+    }
+    if ($errors) {
+        $resulttext .= '<p>'.&mt('The following errors occurred: ').'<ul>'.
+                       $errors.'</ul></p>';
+    }
+    return $resulttext;
+}
+
+sub get_ipaccess_id {
+    my ($domain,$location) = @_;
+    # get lock on ipaccess db
+    my $lockhash = {
+                      lock => $env{'user.name'}.
+                              ':'.$env{'user.domain'},
+                   };
+    my $tries = 0;
+    my $gotlock = &Apache::lonnet::newput_dom('ipaccess',$lockhash,$domain);
+    my ($id,$error);
+
+    while (($gotlock ne 'ok') && ($tries<10)) {
+        $tries ++;
+        sleep (0.1);
+        $gotlock = &Apache::lonnet::newput_dom('ipaccess',$lockhash,$domain);
+    }
+    if ($gotlock eq 'ok') {
+        my %currids = &Apache::lonnet::dump_dom('ipaccess',$domain);
+        if ($currids{'lock'}) {
+            delete($currids{'lock'});
+            if (keys(%currids)) {
+                my @curr = sort { $a <=> $b } keys(%currids);
+                if ($curr[-1] =~ /^\d+$/) {
+                    $id = 1 + $curr[-1];
+                }
+            } else {
+                $id = 1;
+            }
+            if ($id) {
+                unless (&Apache::lonnet::newput_dom('ipaccess',{ $id => $location },$domain) eq 'ok') {
+                    $error = 'nostore';
+                }
+            } else {
+                $error = 'nonumber';
+            }
+        }
+        my $dellockoutcome = &Apache::lonnet::del_dom('ipaccess',['lock'],$domain);
+    } else {
+        $error = 'nolock';
+    }
+    return ($id,$error);
+}
+
 sub modify_rolecolors {
     my ($r,$dom,$confname,$roles,$lastactref,%domconfig) = @_;
     my ($resulttext,%rolehash);
@@ -12175,13 +13043,18 @@ sub modify_colors {
             $domconfig->{$role} = {};
         }
         foreach my $img (@images) {
-            if (($role eq 'login') && (($img eq 'img') || ($img eq 'logo'))) {  
-                if (defined($env{'form.login_showlogo_'.$img})) {
-                    $confhash->{$role}{'showlogo'}{$img} = 1;
-                } else { 
-                    $confhash->{$role}{'showlogo'}{$img} = 0;
+            if ($role eq 'login') {
+                if (($img eq 'img') || ($img eq 'logo')) {  
+                    if (defined($env{'form.login_showlogo_'.$img})) {
+                        $confhash->{$role}{'showlogo'}{$img} = 1;
+                    } else { 
+                        $confhash->{$role}{'showlogo'}{$img} = 0;
+                    }
                 }
-            } 
+                if ($env{'form.login_alt_'.$img} ne '') {
+                    $confhash->{$role}{'alttext'}{$img} = $env{'form.login_alt_'.$img};
+                }
+            }
 	    if ( ! $env{'form.'.$role.'_'.$img.'.filename'} 
 		 && !defined($domconfig->{$role}{$img})
 		 && !$env{'form.'.$role.'_del_'.$img}
@@ -12198,12 +13071,15 @@ sub modify_colors {
                         $error = &mt("Upload of [_1] image for $role page(s) is not permitted to this server: [_2]",$choices{$img},$switchserver);
                     } else {
                         if ($author_ok eq 'ok') {
+                            my $modified = [];
                             my ($result,$logourl) = 
-                                &publishlogo($r,'upload',$role.'_'.$img,
-                                           $dom,$confname,$img,$width,$height);
+                                &Apache::lonconfigsettings::publishlogo($r,'upload',$role.'_'.$img,
+                                                                        $dom,$confname,$img,$width,$height,
+                                                                        '',$modified);
                             if ($result eq 'ok') {
                                 $confhash->{$role}{$img} = $logourl;
                                 $changes{$role}{'images'}{$img} = 1;
+                                &update_modify_urls($r,$modified);
                             } else {
                                 $error = &mt("Upload of [_1] image for $role page(s) failed because an error occurred publishing the file in RES space. Error was: [_2].",$choices{img},$result);
                             }
@@ -12225,12 +13101,15 @@ sub modify_colors {
 # is confname an author?
                         if ($switchserver eq '') {
                             if ($author_ok eq 'ok') {
+                                my $modified = [];
                                 my ($result,$logourl) = 
-                               &publishlogo($r,'copy',$domconfig->{$role}{$img},
-                                            $dom,$confname,$img,$width,$height);
+                                    &Apache::lonconfigsettings::publishlogo($r,'copy',$domconfig->{$role}{$img},
+                                                                            $dom,$confname,$img,$width,$height,
+                                                                            '',$modified);
                                 if ($result eq 'ok') {
                                     $confhash->{$role}{$img} = $logourl;
 				    $changes{$role}{'images'}{$img} = 1;
+                                    &update_modify_urls($r,$modified);
                                 }
                             }
                         }
@@ -12256,15 +13135,29 @@ sub modify_colors {
                             $changes{$role}{'images'}{$img} = 1;
                         } 
                     }
-                    if (($role eq 'login') && (($img eq 'logo') || ($img eq 'img'))) {
-                        if (ref($domconfig->{'login'}{'showlogo'}) eq 'HASH') {
-                            if ($confhash->{$role}{'showlogo'}{$img} ne 
-                                $domconfig->{$role}{'showlogo'}{$img}) {
-                                $changes{$role}{'showlogo'}{$img} = 1; 
+                    if ($role eq 'login') {
+                        if (($img eq 'logo') || ($img eq 'img')) {
+                            if (ref($domconfig->{'login'}{'showlogo'}) eq 'HASH') {
+                                if ($confhash->{$role}{'showlogo'}{$img} ne 
+                                    $domconfig->{$role}{'showlogo'}{$img}) {
+                                    $changes{$role}{'showlogo'}{$img} = 1; 
+                                }
+                            } else {
+                                if ($confhash->{$role}{'showlogo'}{$img} == 0) {
+                                    $changes{$role}{'showlogo'}{$img} = 1;
+                                }
                             }
-                        } else {
-                            if ($confhash->{$role}{'showlogo'}{$img} == 0) {
-                                $changes{$role}{'showlogo'}{$img} = 1;
+                        }
+                        if ($img ne 'login') {
+                            if (ref($domconfig->{$role}{'alttext'}) eq 'HASH') {
+                                if ($confhash->{$role}{'alttext'}{$img} ne
+                                    $domconfig->{$role}{'alttext'}{$img}) {
+                                    $changes{$role}{'alttext'}{$img} = 1;
+                                }
+                            } else {
+                                if ($confhash->{$role}{'alttext'}{$img} ne '') {
+                                    $changes{$role}{'alttext'}{$img} = 1;
+                                }
                             }
                         }
                     }
@@ -12375,6 +13268,11 @@ sub default_change_checker {
             if ($confhash->{$role}{'showlogo'}{$img} == 0) {
                 $changes->{$role}{'showlogo'}{$img} = 1;
             }
+            if (ref($confhash->{$role}{'alttext'}) eq 'HASH') {
+                if ($confhash->{$role}{'alttext'}{$img} ne '') {
+                    $changes->{$role}{'alttext'}{$img} = 1;
+                }
+            }
         }
     }
     if ($confhash->{$role}{'font'}) {
@@ -12413,6 +13311,13 @@ sub display_colorchgs {
                             } else {
                                 $resulttext .= '<li>'.&mt("$choices{$item} set to not be displayed").'</li>';
                             }
+                        } elsif (($role eq 'login') && ($key eq 'alttext')) {
+                            if ($confhash->{$role}{$key}{$item} ne '') {
+                                $resulttext .= '<li>'.&mt("$choices{$key} for $choices{$item} set to [_1].",
+                                               $confhash->{$role}{$key}{$item}).'</li>';
+                            } else {
+                                $resulttext .= '<li>'.&mt("$choices{$key} for $choices{$item} deleted.").'</li>';
+                            }
                         } elsif ($confhash->{$role}{$item} eq '') {
                             $resulttext .= '<li>'.&mt("$choices{$item} set to default").'</li>';
                         } else {
@@ -12498,229 +13403,16 @@ sub check_authorstatus {
     return $author_ok;
 }
 
-sub publishlogo {
-    my ($r,$action,$formname,$dom,$confname,$subdir,$thumbwidth,$thumbheight,$savefileas) = @_;
-    my ($output,$fname,$logourl,$madethumb);
-    if ($action eq 'upload') {
-        $fname=$env{'form.'.$formname.'.filename'};
-        chop($env{'form.'.$formname});
-    } else {
-        ($fname) = ($formname =~ /([^\/]+)$/);
-    }
-    if ($savefileas ne '') {
-        $fname = $savefileas;
-    }
-    $fname=&Apache::lonnet::clean_filename($fname);
-# See if there is anything left
-    unless ($fname) { return ('error: no uploaded file'); }
-    $fname="$subdir/$fname";
-    my $docroot=$r->dir_config('lonDocRoot');
-    my $filepath="$docroot/priv";
-    my $relpath = "$dom/$confname";
-    my ($fnamepath,$file,$fetchthumb);
-    $file=$fname;
-    if ($fname=~m|/|) {
-        ($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|);
-    }
-    my @parts=split(/\//,"$filepath/$relpath/$fnamepath");
-    my $count;
-    for ($count=5;$count<=$#parts;$count++) {
-        $filepath.="/$parts[$count]";
-        if ((-e $filepath)!=1) {
-            mkdir($filepath,02770);
-        }
-    }
-    # Check for bad extension and disallow upload
-    if ($file=~/\.(\w+)$/ &&
-        (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
-        $output = 
-            &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);
-    } elsif ($file=~/\.(\d+)\.(\w+)$/) {
-        $output = &mt('Filename not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2);
-    } elsif (-d "$filepath/$file") {
-        $output = &mt('Filename is a directory name - rename the file and re-upload');
-    } else {
-        my $source = $filepath.'/'.$file;
-        my $logfile;
-        if (!open($logfile,">>",$source.'.log')) {
-            return (&mt('No write permission to Authoring Space'));
-        }
-        print $logfile
-"\n================= Publish ".localtime()." ================\n".
-$env{'user.name'}.':'.$env{'user.domain'}."\n";
-# Save the file
-        if (!open(FH,">",$source)) {
-            &Apache::lonnet::logthis('Failed to create '.$source);
-            return (&mt('Failed to create file'));
-        }
-        if ($action eq 'upload') {
-            if (!print FH ($env{'form.'.$formname})) {
-                &Apache::lonnet::logthis('Failed to write to '.$source);
-                return (&mt('Failed to write file'));
-            }
-        } else {
-            my $original = &Apache::lonnet::filelocation('',$formname);
-            if(!copy($original,$source)) {
-                &Apache::lonnet::logthis('Failed to copy '.$original.' to '.$source);
-                return (&mt('Failed to write file'));
-            }
-        }
-        close(FH);
-        chmod(0660, $source); # Permissions to rw-rw---.
-
-        my $targetdir=$docroot.'/res/'.$dom.'/'.$confname .'/'.$fnamepath;
-        my $copyfile=$targetdir.'/'.$file;
-
-        my @parts=split(/\//,$targetdir);
-        my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]";
-        for (my $count=5;$count<=$#parts;$count++) {
-            $path.="/$parts[$count]";
-            if (!-e $path) {
-                print $logfile "\nCreating directory ".$path;
-                mkdir($path,02770);
-            }
-        }
-        my $versionresult;
-        if (-e $copyfile) {
-            $versionresult = &logo_versioning($targetdir,$file,$logfile);
-        } else {
-            $versionresult = 'ok';
-        }
-        if ($versionresult eq 'ok') {
-            if (copy($source,$copyfile)) {
-                print $logfile "\nCopied original source to ".$copyfile."\n";
-                $output = 'ok';
-                $logourl = '/res/'.$dom.'/'.$confname.'/'.$fname;
-                push(@{$modified_urls},[$copyfile,$source]);
-                my $metaoutput = 
-                    &write_metadata($dom,$confname,$formname,$targetdir,$file,$logfile);
-                unless ($registered_cleanup) {
-                    my $handlers = $r->get_handlers('PerlCleanupHandler');
-                    $r->set_handlers('PerlCleanupHandler' => [\&notifysubscribed,@{$handlers}]);
-                    $registered_cleanup=1;
-                }
-            } else {
-                print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
-                $output = &mt('Failed to copy file to RES space').", $!";
-            }
-            if (($thumbwidth =~ /^\d+$/) && ($thumbheight =~ /^\d+$/)) {
-                my $inputfile = $filepath.'/'.$file;
-                my $outfile = $filepath.'/'.'tn-'.$file;
-                my ($fullwidth,$fullheight) = &check_dimensions($inputfile);
-                if ($fullwidth ne '' && $fullheight ne '') { 
-                    if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) {
-                        my $thumbsize = $thumbwidth.'x'.$thumbheight;
-                        my @args = ('convert','-sample',$thumbsize,$inputfile,$outfile);
-                        system({$args[0]} @args);
-                        chmod(0660, $filepath.'/tn-'.$file);
-                        if (-e $outfile) {
-                            my $copyfile=$targetdir.'/tn-'.$file;
-                            if (copy($outfile,$copyfile)) {
-                                print $logfile "\nCopied source to ".$copyfile."\n";
-                                my $thumb_metaoutput = 
-                                    &write_metadata($dom,$confname,$formname,
-                                                    $targetdir,'tn-'.$file,$logfile);
-                                push(@{$modified_urls},[$copyfile,$outfile]);
-                                unless ($registered_cleanup) {
-                                    my $handlers = $r->get_handlers('PerlCleanupHandler');
-                                    $r->set_handlers('PerlCleanupHandler' => [\&notifysubscribed,@{$handlers}]);
-                                    $registered_cleanup=1;
-                                }
-                                $madethumb = 1;
-                            } else {
-                                print $logfile "\nUnable to write ".$copyfile.
-                                               ':'.$!."\n";
-                            }
-                        }
-                    }
-                }
-            }
-        } else {
-            $output = $versionresult;
+sub update_modify_urls {
+    my ($r,$modified) = @_;
+    if ((ref($modified) eq 'ARRAY') && (@{$modified})) {
+        push(@{$modified_urls},$modified);
+        unless ($registered_cleanup) {
+            my $handlers = $r->get_handlers('PerlCleanupHandler');
+            $r->set_handlers('PerlCleanupHandler' => [\&notifysubscribed,@{$handlers}]);
+            $registered_cleanup=1;
         }
     }
-    return ($output,$logourl,$madethumb);
-}
-
-sub logo_versioning {
-    my ($targetdir,$file,$logfile) = @_;
-    my $target = $targetdir.'/'.$file;
-    my ($maxversion,$fn,$extn,$output);
-    $maxversion = 0;
-    if ($file =~ /^(.+)\.(\w+)$/) {
-        $fn=$1;
-        $extn=$2;
-    }
-    opendir(DIR,$targetdir);
-    while (my $filename=readdir(DIR)) {
-        if ($filename=~/\Q$fn\E\.(\d+)\.\Q$extn\E$/) {
-            $maxversion=($1>$maxversion)?$1:$maxversion;
-        }
-    }
-    $maxversion++;
-    print $logfile "\nCreating old version ".$maxversion."\n";
-    my $copyfile=$targetdir.'/'.$fn.'.'.$maxversion.'.'.$extn;
-    if (copy($target,$copyfile)) {
-        print $logfile "Copied old target to ".$copyfile."\n";
-        $copyfile=$copyfile.'.meta';
-        if (copy($target.'.meta',$copyfile)) {
-            print $logfile "Copied old target metadata to ".$copyfile."\n";
-            $output = 'ok';
-        } else {
-            print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
-            $output = &mt('Failed to copy old meta').", $!, ";
-        }
-    } else {
-        print $logfile "Unable to write ".$copyfile.':'.$!."\n";
-        $output = &mt('Failed to copy old target').", $!, ";
-    }
-    return $output;
-}
-
-sub write_metadata {
-    my ($dom,$confname,$formname,$targetdir,$file,$logfile) = @_;
-    my (%metadatafields,%metadatakeys,$output);
-    $metadatafields{'title'}=$formname;
-    $metadatafields{'creationdate'}=time;
-    $metadatafields{'lastrevisiondate'}=time;
-    $metadatafields{'copyright'}='public';
-    $metadatafields{'modifyinguser'}=$env{'user.name'}.':'.
-                                         $env{'user.domain'};
-    $metadatafields{'authorspace'}=$confname.':'.$dom;
-    $metadatafields{'domain'}=$dom;
-    {
-        print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file;
-        my $mfh;
-        if (open($mfh,">",$targetdir.'/'.$file.'.meta')) {
-            foreach (sort(keys(%metadatafields))) {
-                unless ($_=~/\./) {
-                    my $unikey=$_;
-                    $unikey=~/^([A-Za-z]+)/;
-                    my $tag=$1;
-                    $tag=~tr/A-Z/a-z/;
-                    print $mfh "\n\<$tag";
-                    foreach (split(/\,/,$metadatakeys{$unikey})) {
-                        my $value=$metadatafields{$unikey.'.'.$_};
-                        $value=~s/\"/\'\'/g;
-                        print $mfh ' '.$_.'="'.$value.'"';
-                    }
-                    print $mfh '>'.
-                        &HTML::Entities::encode($metadatafields{$unikey},'<>&"')
-                            .'</'.$tag.'>';
-                }
-            }
-            $output = 'ok';
-            print $logfile "\nWrote metadata";
-            close($mfh);
-        } else {
-            print $logfile "\nFailed to open metadata file";
-            $output = &mt('Could not write metadata');
-        }
-    }
-    return $output;
 }
 
 sub notifysubscribed {
@@ -12771,15 +13463,21 @@ sub subscribed_hosts {
 
 sub check_switchserver {
     my ($dom,$confname) = @_;
-    my ($allowed,$switchserver);
-    my $home = &Apache::lonnet::homeserver($confname,$dom);
-    if ($home eq 'no_host') {
+    my ($allowed,$switchserver,$home);
+    if ($confname eq '') {
         $home = &Apache::lonnet::domain($dom,'primary');
+    } else {
+        $home = &Apache::lonnet::homeserver($confname,$dom);
+        if ($home eq 'no_host') {
+            $home = &Apache::lonnet::domain($dom,'primary');
+        }
     }
     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;
 }
@@ -12811,7 +13509,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);
@@ -13502,11 +14200,14 @@ sub process_textbook_image {
             $error = &mt('Upload of textbook image is not permitted to this server: [_1]',
                          $switchserver);
         } elsif ($author_ok eq 'ok') {
+            my $modified = [];
             my ($result,$imageurl) =
-                &publishlogo($r,'upload',$caller,$dom,$confname,
-                             "$type/$cdom/$cnum/cover",$width,$height);
+                &Apache::lonconfigsettings::publishlogo($r,'upload',$caller,$dom,$confname,
+                                                        "$type/$cdom/$cnum/cover",$width,$height,
+                                                        '',$modified);
             if ($result eq 'ok') {
                 $url = $imageurl;
+                &update_modify_urls($r,$modified);
             } else {
                 $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result);
             }
@@ -13521,656 +14222,361 @@ sub process_textbook_image {
 
 sub modify_ltitools {
     my ($r,$dom,$action,$lastactref,%domconfig) = @_;
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-    my ($newid,@allpos,%changes,%confhash,%encconfig,$errors,$resulttext);
+    my (%currtoolsec,%secchanges,%newtoolsec,%newkeyset);
+    &fetch_secrets($dom,'toolsec',\%domconfig,\%currtoolsec,\%secchanges,\%newtoolsec,\%newkeyset);
+
     my $confname = $dom.'-domainconfig';
     my $servadm = $r->dir_config('lonAdmEMail');
     my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm);
-    my (%posslti,%possfield);
-    my @courseroles = ('cc','in','ta','ep','st');
-    my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner);
-    map { $posslti{$_} = 1; } @ltiroles;
-    my @allfields = ('fullname','firstname','lastname','email','user','roles');
-    map { $possfield{$_} = 1; } @allfields;
-    my %lt = &ltitools_names(); 
-    if ($env{'form.ltitools_add'}) {
-        my $title = $env{'form.ltitools_add_title'};
-        $title =~ s/(`)/'/g;
-        ($newid,my $error) = &get_ltitools_id($dom,$title);
-        if ($newid) {
-            my $position = $env{'form.ltitools_add_pos'};
-            $position =~ s/\D+//g;
-            if ($position ne '') {
-                $allpos[$position] = $newid;
-            }
-            $changes{$newid} = 1;
-            foreach my $item ('title','url','key','secret','lifetime') {
-                $env{'form.ltitools_add_'.$item} =~ s/(`)/'/g;
-                if ($item eq 'lifetime') {
-                    $env{'form.ltitools_add_'.$item} =~ s/[^\d.]//g;
-                }
-                if ($env{'form.ltitools_add_'.$item}) {
-                    if (($item eq 'key') || ($item eq 'secret')) {
-                        $encconfig{$newid}{$item} = $env{'form.ltitools_add_'.$item};
-                    } else {
-                        $confhash{$newid}{$item} = $env{'form.ltitools_add_'.$item};
-                    }
-                }
-            }
-            if ($env{'form.ltitools_add_version'} eq 'LTI-1p0') {
-                $confhash{$newid}{'version'} = $env{'form.ltitools_add_version'};
-            }
-            if ($env{'form.ltitools_add_msgtype'} eq 'basic-lti-launch-request') {
-                $confhash{$newid}{'msgtype'} = $env{'form.ltitools_add_msgtype'};
-            }
-            if ($env{'form.ltitools_add_sigmethod'} eq 'HMAC-SHA256') {
-                $confhash{$newid}{'sigmethod'} = $env{'form.ltitools_add_sigmethod'};
-            } else {
-                $confhash{$newid}{'sigmethod'} = 'HMAC-SHA1';
-            }
-            foreach my $item ('width','height','linktext','explanation') {
-                $env{'form.ltitools_add_'.$item} =~ s/^\s+//;
-                $env{'form.ltitools_add_'.$item} =~ s/\s+$//;
-                if (($item eq 'width') || ($item eq 'height')) {
-                    if ($env{'form.ltitools_add_'.$item} =~ /^\d+$/) {
-                        $confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item};
-                    }
-                } else {
-                    if ($env{'form.ltitools_add_'.$item} ne '') {
-                        $confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item}; 
-                    }
-                }
-            }
-            if ($env{'form.ltitools_add_target'} eq 'window') {
-                $confhash{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'};
-            } elsif ($env{'form.ltitools_add_target'} eq 'tab') {
-                $confhash{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'};
-            } else {
-                $confhash{$newid}{'display'}{'target'} = 'iframe';
-            }
-            foreach my $item ('passback','roster') {
-                if ($env{'form.ltitools_'.$item.'_add'}) {
-                    $confhash{$newid}{$item} = 1;
-                    if ($env{'form.ltitools_'.$item.'valid_add'} ne '') {
-                        my $lifetime = $env{'form.ltitools_'.$item.'valid_add'};
-                        $lifetime =~ s/^\s+|\s+$//g;
-                        if ($lifetime =~ /^\d+\.?\d*$/) {
-                            $confhash{$newid}{$item.'valid'} = $lifetime;
-                        }
-                    }
-                }
-            }
-            if ($env{'form.ltitools_add_image.filename'} ne '') {
-                my ($imageurl,$error) =
-                    &process_ltitools_image($r,$dom,$confname,'ltitools_add_image',$newid,
-                                            $configuserok,$switchserver,$author_ok);
-                if ($imageurl) {
-                    $confhash{$newid}{'image'} = $imageurl;
-                }
-                if ($error) {
-                    &Apache::lonnet::logthis($error);
-                    $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
-                }
-            }
-            my @fields = &Apache::loncommon::get_env_multiple('form.ltitools_add_fields');
-            foreach my $field (@fields) {
-                if ($possfield{$field}) {
-                    if ($field eq 'roles') {
-                        foreach my $role (@courseroles) {
-                            my $choice = $env{'form.ltitools_add_roles_'.$role};
-                            if (($choice ne '') && ($posslti{$choice})) {
-                                $confhash{$newid}{'roles'}{$role} = $choice;
-                                if ($role eq 'cc') {
-                                    $confhash{$newid}{'roles'}{'co'} = $choice; 
-                                }
-                            }
+
+    my ($resulttext,$ltitoolsoutput,$is_home,$errors,%ltitoolschg,%newtoolsenc,%newltitools);
+    my $toolserror =
+        &Apache::courseprefs::process_ltitools($r,$dom,$confname,$domconfig{'ltitools'},\%ltitoolschg,'domain',
+                                               $lastactref,$configuserok,$switchserver,$author_ok);
+
+    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; last; } }
+    }
+
+    if (keys(%ltitoolschg)) {
+        foreach my $id (keys(%ltitoolschg)) {
+            if (ref($ltitoolschg{$id}) eq 'HASH') {
+                foreach my $inner (keys(%{$ltitoolschg{$id}})) {
+                    if (($inner eq 'secret') || ($inner eq 'key')) {
+                        if ($is_home) {
+                            $newtoolsenc{$id}{$inner} = $ltitoolschg{$id}{$inner};
                         }
-                    } else {
-                        $confhash{$newid}{'fields'}{$field} = 1;
-                    }
-                }
-            }
-            if (ref($confhash{$newid}{'fields'}) eq 'HASH') {
-                if ($confhash{$newid}{'fields'}{'user'}) {
-                    if ($env{'form.ltitools_userincdom_add'}) {
-                        $confhash{$newid}{'incdom'} = 1;
                     }
                 }
             }
-            my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig');
-            foreach my $item (@courseconfig) {
-                $confhash{$newid}{'crsconf'}{$item} = 1;
-            }
-            if ($env{'form.ltitools_add_custom'}) {
-                my $name = $env{'form.ltitools_add_custom_name'};
-                my $value = $env{'form.ltitools_add_custom_value'};
-                $value =~ s/(`)/'/g;
-                $name =~ s/(`)/'/g;
-                $confhash{$newid}{'custom'}{$name} = $value;
-            }
-        } else {
-            my $error = &mt('Failed to acquire unique ID for new external tool');   
-            $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
         }
-    }
-    if (ref($domconfig{$action}) eq 'HASH') {
-        my %deletions;
-        my @todelete = &Apache::loncommon::get_env_multiple('form.ltitools_del');
-        if (@todelete) {
-            map { $deletions{$_} = 1; } @todelete;
+        $ltitoolsoutput = &Apache::courseprefs::store_ltitools($dom,'','domain',\%ltitoolschg,$domconfig{'ltitools'});
+        if (keys(%ltitoolschg)) {
+            %newltitools = %ltitoolschg;
         }
-        my %customadds;
-        my @newcustom = &Apache::loncommon::get_env_multiple('form.ltitools_customadd');
-        if (@newcustom) {
-            map { $customadds{$_} = 1; } @newcustom;
-        } 
-        my %imgdeletions;
-        my @todeleteimages = &Apache::loncommon::get_env_multiple('form.ltitools_image_del');
-        if (@todeleteimages) {
-            map { $imgdeletions{$_} = 1; } @todeleteimages;
-        }
-        my $maxnum = $env{'form.ltitools_maxnum'};
-        for (my $i=0; $i<=$maxnum; $i++) {
-            my $itemid = $env{'form.ltitools_id_'.$i};
-            $itemid =~ s/\D+//g;
-            if (ref($domconfig{$action}{$itemid}) eq 'HASH') {
-                if ($deletions{$itemid}) {
-                    if ($domconfig{$action}{$itemid}{'image'}) {
-                        #FIXME need to obsolete item in RES space
-                    }
-                    $changes{$itemid} = $domconfig{$action}{$itemid}{'title'};
-                    next;
-                } else {
-                    my $newpos = $env{'form.ltitools_'.$itemid};
-                    $newpos =~ s/\D+//g;
-                    foreach my $item ('title','url','lifetime') {
-                        $confhash{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i};
-                        if ($domconfig{$action}{$itemid}{$item} ne $confhash{$itemid}{$item}) {
-                            $changes{$itemid} = 1;
-                        }
-                    }
-                    foreach my $item ('key','secret') {
-                        $encconfig{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i};
-                        if ($domconfig{$action}{$itemid}{$item} ne $encconfig{$itemid}{$item}) {
-                            $changes{$itemid} = 1;
-                        }
-                    }
-                    if ($env{'form.ltitools_version_'.$i} eq 'LTI-1p0') {
-                        $confhash{$itemid}{'version'} = $env{'form.ltitools_version_'.$i};
-                    }
-                    if ($env{'form.ltitools_msgtype_'.$i} eq 'basic-lti-launch-request') {
-                        $confhash{$itemid}{'msgtype'} = $env{'form.ltitools_msgtype_'.$i};
-                    }
-                    if ($env{'form.ltitools_sigmethod_'.$i} eq 'HMAC-SHA256') {
-                        $confhash{$itemid}{'sigmethod'} = $env{'form.ltitools_sigmethod_'.$i};
-                    } else {
-                        $confhash{$itemid}{'sigmethod'} = 'HMAC-SHA1'; 
-                    }
-                    if ($domconfig{$action}{$itemid}{'sigmethod'} eq '') {
-                        if ($confhash{$itemid}{'sigmethod'} ne 'HMAC-SHA1') {
-                            $changes{$itemid} = 1;
-                        }
-                    } elsif ($domconfig{$action}{$itemid}{'sigmethod'} ne $confhash{$itemid}{'sigmethod'}) {
-                        $changes{$itemid} = 1;
-                    }
-                    foreach my $size ('width','height') {
-                        $env{'form.ltitools_'.$size.'_'.$i} =~ s/^\s+//;
-                        $env{'form.ltitools_'.$size.'_'.$i} =~ s/\s+$//;
-                        if ($env{'form.ltitools_'.$size.'_'.$i} =~ /^\d+$/) {
-                            $confhash{$itemid}{'display'}{$size} = $env{'form.ltitools_'.$size.'_'.$i};
-                            if (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') {
-                                if ($domconfig{$action}{$itemid}{'display'}{$size} ne $confhash{$itemid}{'display'}{$size}) {
-                                    $changes{$itemid} = 1;
-                                }
-                            } else {
-                                $changes{$itemid} = 1;
-                            }
-                        } elsif (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') {
-                            if ($domconfig{$action}{$itemid}{'display'}{$size} ne '') {
-                                $changes{$itemid} = 1;
-                            }
-                        }
-                    }
-                    foreach my $item ('linktext','explanation') {
-                        $env{'form.ltitools_'.$item.'_'.$i} =~ s/^\s+//;
-                        $env{'form.ltitools_'.$item.'_'.$i} =~ s/\s+$//;
-                        if ($env{'form.ltitools_'.$item.'_'.$i} ne '') {
-                            $confhash{$itemid}{'display'}{$item} = $env{'form.ltitools_'.$item.'_'.$i};
-                            if (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') {
-                                if ($domconfig{$action}{$itemid}{'display'}{$item} ne $confhash{$itemid}{'display'}{$item}) {
-                                    $changes{$itemid} = 1;
-                                }
-                            } else {
-                                $changes{$itemid} = 1;
-                            }
-                        } elsif (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') {
-                            if ($domconfig{$action}{$itemid}{'display'}{$item} ne '') {
-                                $changes{$itemid} = 1;
-                            }
-                        }
-                    }
-                    if ($env{'form.ltitools_target_'.$i} eq 'window') {
-                        $confhash{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i};
-                    } elsif ($env{'form.ltitools_target_'.$i} eq 'tab') {
-                        $confhash{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i};
-                    } else {
-                        $confhash{$itemid}{'display'}{'target'} = 'iframe';
-                    }
-                    if (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') {
-                        if ($domconfig{$action}{$itemid}{'display'}{'target'} ne $confhash{$itemid}{'display'}{'target'}) {
-                            $changes{$itemid} = 1;
-                        }
-                    } else {
-                        $changes{$itemid} = 1;
-                    }
-                    foreach my $extra ('passback','roster') {
-                        if ($env{'form.ltitools_'.$extra.'_'.$i}) {
-                            $confhash{$itemid}{$extra} = 1;
-                            if ($env{'form.ltitools_'.$extra.'valid_'.$i} ne '') {
-                                my $lifetime = $env{'form.ltitools_'.$extra.'valid_'.$i};
-                                $lifetime =~ s/^\s+|\s+$//g;
-                                if ($lifetime =~ /^\d+\.?\d*$/) {
-                                    $confhash{$itemid}{$extra.'valid'} = $lifetime;
-                                }
-                            }
-                        }
-                        if ($domconfig{$action}{$itemid}{$extra} ne $confhash{$itemid}{$extra}) {
-                            $changes{$itemid} = 1;
-                        }
-                        if ($domconfig{$action}{$itemid}{$extra.'valid'} ne $confhash{$itemid}{$extra.'valid'}) {
-                            $changes{$itemid} = 1;
-                        }
-                    }
-                    my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig_'.$i);
-                    foreach my $item ('label','title','target','linktext','explanation','append') {
-                        if (grep(/^\Q$item\E$/,@courseconfig)) {
-                            $confhash{$itemid}{'crsconf'}{$item} = 1;
-                            if (ref($domconfig{$action}{$itemid}{'crsconf'}) eq 'HASH') {
-                                if ($domconfig{$action}{$itemid}{'crsconf'}{$item} ne $confhash{$itemid}{'crsconf'}{$item}) {
-                                    $changes{$itemid} = 1;
-                                }
-                            } else {
-                                $changes{$itemid} = 1;
-                            }
-                        }
-                    }
-                    my @fields = &Apache::loncommon::get_env_multiple('form.ltitools_fields_'.$i);
-                    foreach my $field (@fields) {
-                        if ($possfield{$field}) {
-                            if ($field eq 'roles') {
-                                foreach my $role (@courseroles) {
-                                    my $choice = $env{'form.ltitools_roles_'.$role.'_'.$i};
-                                    if (($choice ne '') && ($posslti{$choice})) {
-                                        $confhash{$itemid}{'roles'}{$role} = $choice;
-                                        if ($role eq 'cc') {
-                                            $confhash{$itemid}{'roles'}{'co'} = $choice;
-                                        }
-                                    }
-                                    if (ref($domconfig{$action}{$itemid}{'roles'}) eq 'HASH') {
-                                        if ($domconfig{$action}{$itemid}{'roles'}{$role} ne $confhash{$itemid}{'roles'}{$role}) {
-                                            $changes{$itemid} = 1;
-                                        }
-                                    } elsif ($confhash{$itemid}{'roles'}{$role}) {
-                                        $changes{$itemid} = 1;
-                                    }
-                                }
-                            } else {
-                                $confhash{$itemid}{'fields'}{$field} = 1;
-                                if (ref($domconfig{$action}{$itemid}{'fields'}) eq 'HASH') {
-                                    if ($domconfig{$action}{$itemid}{'fields'}{$field} ne $confhash{$itemid}{'fields'}{$field}) {
-                                        $changes{$itemid} = 1;
-                                    }
-                                } else {
-                                    $changes{$itemid} = 1;
-                                }
-                            }
-                        }
-                    }
-                    if (ref($confhash{$itemid}{'fields'}) eq 'HASH') {
-                        if ($confhash{$itemid}{'fields'}{'user'}) {
-                            if ($env{'form.ltitools_userincdom_'.$i}) {
-                                $confhash{$itemid}{'incdom'} = 1;
-                            }
-                            if ($domconfig{$action}{$itemid}{'incdom'} ne $confhash{$itemid}{'incdom'}) {
-                                $changes{$itemid} = 1;
-                            }
-                        }
-                    }
-                    $allpos[$newpos] = $itemid;
-                }
-                if ($imgdeletions{$itemid}) {
-                    $changes{$itemid} = 1;
-                    #FIXME need to obsolete item in RES space
-                } elsif ($env{'form.ltitools_image_'.$i.'.filename'}) {
-                    my ($imgurl,$error) = &process_ltitools_image($r,$dom,$confname,'ltitools_image_'.$i,
-                                                                 $itemid,$configuserok,$switchserver,
-                                                                 $author_ok);
-                    if ($imgurl) {
-                        $confhash{$itemid}{'image'} = $imgurl;
-                        $changes{$itemid} = 1;
-                    }
-                    if ($error) {
-                        &Apache::lonnet::logthis($error);
-                        $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
-                    }
-                } elsif ($domconfig{$action}{$itemid}{'image'}) {
-                    $confhash{$itemid}{'image'} =
-                       $domconfig{$action}{$itemid}{'image'};
-                }
-                if ($customadds{$i}) {
-                    my $name = $env{'form.ltitools_custom_name_'.$i};
-                    $name =~ s/(`)/'/g;
-                    $name =~ s/^\s+//;
-                    $name =~ s/\s+$//;
-                    my $value = $env{'form.ltitools_custom_value_'.$i};
-                    $value =~ s/(`)/'/g;
-                    $value =~ s/^\s+//;
-                    $value =~ s/\s+$//;
-                    if ($name ne '') {
-                        $confhash{$itemid}{'custom'}{$name} = $value;
-                        $changes{$itemid} = 1;
-                    }
-                }
-                my %customdels;
-                my @customdeletions = &Apache::loncommon::get_env_multiple('form.ltitools_customdel_'.$i); 
-                if (@customdeletions) {
-                    $changes{$itemid} = 1;
-                }
-                map { $customdels{$_} = 1; } @customdeletions;
-                if (ref($domconfig{$action}{$itemid}{'custom'}) eq 'HASH') {
-                    foreach my $key (keys(%{$domconfig{$action}{$itemid}{'custom'}})) {
-                        unless ($customdels{$key}) {
-                            if ($env{'form.ltitools_customval_'.$key.'_'.$i} ne '') {
-                                $confhash{$itemid}{'custom'}{$key} = $env{'form.ltitools_customval_'.$key.'_'.$i}; 
-                            }
-                            if ($domconfig{$action}{$itemid}{'custom'}{$key} ne $env{'form.ltitools_customval_'.$key.'_'.$i}) {
-                                $changes{$itemid} = 1;
-                            }
-                        }
-                    }
-                }
-                unless ($changes{$itemid}) {
-                    foreach my $key (keys(%{$domconfig{$action}{$itemid}})) {
-                        if (ref($domconfig{$action}{$itemid}{$key}) eq 'HASH') {
-                            if (ref($confhash{$itemid}{$key}) eq 'HASH') {
-                                foreach my $innerkey (keys(%{$domconfig{$action}{$itemid}{$key}})) {
-                                    unless (exists($confhash{$itemid}{$key}{$innerkey})) {
-                                        $changes{$itemid} = 1;
-                                        last;
-                                    }
-                                }
-                            } elsif (keys(%{$domconfig{$action}{$itemid}{$key}}) > 0) {
-                                $changes{$itemid} = 1;
+    }
+    if (ref($domconfig{'ltitools'}) eq 'HASH') {
+        foreach my $id (%{$domconfig{'ltitools'}}) {
+            next if ($id !~ /^\d+$/);
+            unless (exists($ltitoolschg{$id})) {
+                if (ref($domconfig{'ltitools'}{$id}) eq 'HASH') {
+                    foreach my $inner (keys(%{$domconfig{'ltitools'}{$id}})) {
+                        if (($inner eq 'secret') || ($inner eq 'key')) {
+                            if ($is_home) {
+                                $newtoolsenc{$id}{$inner} = $domconfig{'ltitools'}{$id}{$inner};
                             }
+                        } else {
+                            $newltitools{$id}{$inner} = $domconfig{'ltitools'}{$id}{$inner};
                         }
-                        last if ($changes{$itemid});
                     }
+                } else {
+                    $newltitools{$id} = $domconfig{'ltitools'}{$id};
                 }
             }
         }
     }
-    if (@allpos > 0) {
-        my $idx = 0;
-        foreach my $itemid (@allpos) {
-            if ($itemid ne '') {
-                $confhash{$itemid}{'order'} = $idx;
-                if (ref($domconfig{$action}) eq 'HASH') {
-                    if (ref($domconfig{$action}{$itemid}) eq 'HASH') {
-                        if ($domconfig{$action}{$itemid}{'order'} ne $idx) {
-                            $changes{$itemid} = 1;
-                        }
-                    }
-                }
-                $idx ++;
-            }
+    if ($toolserror) {
+        $errors = '<li>'.$toolserror.'</li>';
+    }
+    if ((keys(%ltitoolschg) == 0) && (keys(%secchanges) == 0)) {
+        $resulttext = &mt('No changes made.');
+        if ($errors) {
+            $resulttext .= '<br />'.&mt('The following errors occurred: ').'<ul>'.
+                                 $errors.'</ul>';
         }
+        return $resulttext;
     }
     my %ltitoolshash = (
-                          $action => { %confhash }
+                          $action => { %newltitools }
                        );
-    my $putresult = &Apache::lonnet::put_dom('configuration',\%ltitoolshash,
-                                             $dom);
+    if (keys(%secchanges)) {
+        $ltitoolshash{'toolsec'} = \%newtoolsec;
+    }
+    my $putresult = &Apache::lonnet::put_dom('configuration',\%ltitoolshash,$dom);
     if ($putresult eq 'ok') {
-        my %ltienchash = (
-                             $action => { %encconfig }
-                         );
-        &Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom,undef,1);
-        if (keys(%changes) > 0) {
+        my %keystore;
+        if ($is_home) {
+            my %toolsenchash = (
+                                   $action => { %newtoolsenc }
+                               );
+            &Apache::lonnet::put_dom('encconfig',\%toolsenchash,$dom,undef,1);
             my $cachetime = 24*60*60;
-            my %ltiall = %confhash;
-            foreach my $id (keys(%ltiall)) {
-                if (ref($encconfig{$id}) eq 'HASH') {
-                    foreach my $item ('key','secret') {
-                        $ltiall{$id}{$item} = $encconfig{$id}{$item};
+            &Apache::lonnet::do_cache_new('ltitoolsenc',$dom,\%newtoolsenc,$cachetime);
+            &store_security($dom,'ltitools',\%secchanges,\%newkeyset,\%keystore,$lastactref);
+        }
+        $resulttext = &mt('Changes made:').'<ul>';
+        if (keys(%secchanges) > 0) {
+            $resulttext .= &lti_security_results($dom,'ltitools',\%secchanges,\%newtoolsec,\%newkeyset,\%keystore);
+        }
+        if (keys(%ltitoolschg) > 0) {
+            $resulttext .= $ltitoolsoutput;
+        }
+        my $cachetime = 24*60*60;
+        &Apache::lonnet::do_cache_new('ltitools',$dom,\%newltitools,$cachetime);
+        if (ref($lastactref) eq 'HASH') {
+            $lastactref->{'ltitools'} = 1;
+        }
+    } else {
+        $errors .= '<li><span class="LC_error">'.&mt('Failed to save changes').'</span></li>';
+    }
+    if ($errors) {
+        $resulttext .= '<p>'.&mt('The following errors occurred: ').'<ul>'.
+                       $errors.'</ul></p>';
+    }
+    return $resulttext;
+}
+
+sub fetch_secrets {
+    my ($dom,$context,$domconfig,$currsec,$secchanges,$newsec,$newkeyset) = @_;
+    my %keyset;
+    %{$currsec} = ();
+    $newsec->{'private'}{'keys'} = [];
+    $newsec->{'encrypt'} = {};
+    $newsec->{'rules'} = {};
+    if ($context eq 'ltisec') {
+        $newsec->{'linkprot'} = {};
+    }
+    if (ref($domconfig->{$context}) eq 'HASH') {
+        %{$currsec} = %{$domconfig->{$context}};
+        if ($context eq 'ltisec') {
+            if (ref($currsec->{'linkprot'}) eq 'HASH') {
+                foreach my $id (keys(%{$currsec->{'linkprot'}})) {
+                    unless ($id =~ /^\d+$/) {
+                        delete($currsec->{'linkprot'}{$id});
                     }
                 }
             }
-            &Apache::lonnet::do_cache_new('ltitools',$dom,\%ltiall,$cachetime);
-            if (ref($lastactref) eq 'HASH') {
-                $lastactref->{'ltitools'} = 1;
+        }
+        if (ref($currsec->{'private'}) eq 'HASH') {
+            if (ref($currsec->{'private'}{'keys'}) eq 'ARRAY') {
+                $newsec->{'private'}{'keys'} = $currsec->{'private'}{'keys'};
+                map { $keyset{$_} = 1; } @{$currsec->{'private'}{'keys'}};
             }
-            $resulttext = &mt('Changes made:').'<ul>';
-            my %bynum;
-            foreach my $itemid (sort(keys(%changes))) {
-                my $position = $confhash{$itemid}{'order'};
-                $bynum{$position} = $itemid;
+        }
+    }
+    my @items= ('crs','dom');
+    if ($context eq 'ltisec') {
+        push(@items,'consumers');
+    }
+    foreach my $item (@items) {
+        my $formelement;
+        if (($context eq 'toolsec') || ($item eq 'consumers')) {
+            $formelement = 'form.'.$context.'_'.$item;
+        } else {
+            $formelement = 'form.'.$context.'_'.$item.'linkprot';
+        }
+        if ($env{$formelement}) {
+            $newsec->{'encrypt'}{$item} = 1;
+            if (ref($currsec->{'encrypt'}) eq 'HASH') {
+                unless ($currsec->{'encrypt'}{$item}) {
+                    $secchanges->{'encrypt'} = 1;
+                }
+            } else {
+                $secchanges->{'encrypt'} = 1;
             }
-            foreach my $pos (sort { $a <=> $b } keys(%bynum)) {
-                my $itemid = $bynum{$pos}; 
-                if (ref($confhash{$itemid}) ne 'HASH') {
-                    $resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>';
-                } else {
-                    $resulttext .= '<li><b>'.$confhash{$itemid}{'title'}.'</b>';
-                    if ($confhash{$itemid}{'image'}) {
-                        $resulttext .= '&nbsp;'.
-                                       '<img src="'.$confhash{$itemid}{'image'}.'"'.
-                                       ' alt="'.&mt('Tool Provider icon').'" />';
-                    }
-                    $resulttext .= '</li><ul>';
-                    my $position = $pos + 1;
-                    $resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>';
-                    foreach my $item ('version','msgtype','sigmethod','url','lifetime') {
-                        if ($confhash{$itemid}{$item} ne '') {
-                            $resulttext .= '<li>'.$lt{$item}.':&nbsp;'.$confhash{$itemid}{$item}.'</li>';
-                        }
-                    }
-                    if ($encconfig{$itemid}{'key'} ne '') {
-                        $resulttext .= '<li>'.$lt{'key'}.':&nbsp;'.$encconfig{$itemid}{'key'}.'</li>';
-                    }
-                    if ($encconfig{$itemid}{'secret'} ne '') {
-                        $resulttext .= '<li>'.$lt{'secret'}.':&nbsp;';
-                        my $num = length($encconfig{$itemid}{'secret'});
-                        $resulttext .= ('*'x$num).'</li>';
-                    }
-                    $resulttext .= '<li>'.&mt('Configurable in course:');
-                    my @possconfig = ('label','title','target','linktext','explanation','append');
-                    my $numconfig = 0; 
-                    if (ref($confhash{$itemid}{'crsconf'}) eq 'HASH') { 
-                        foreach my $item (@possconfig) {
-                            if ($confhash{$itemid}{'crsconf'}{$item}) {
-                                $numconfig ++;
-                                $resulttext .= ' "'.$lt{'crs'.$item}.'"';
-                            }
-                        }
-                    }
-                    if (!$numconfig) {
-                        $resulttext .= '&nbsp;'.&mt('None');
-                    }
-                    $resulttext .= '</li>';
-                    foreach my $item ('passback','roster') {
-                        $resulttext .= '<li>'.$lt{$item}.'&nbsp;';
-                        if ($confhash{$itemid}{$item}) {
-                            $resulttext .= &mt('Yes');
-                            if ($confhash{$itemid}{$item.'valid'}) {
-                                if ($item eq 'passback') {
-                                    $resulttext .= ' '.&mt('valid for at least [quant,_1,day] after launch',
-                                                           $confhash{$itemid}{$item.'valid'});
-                                } else {
-                                    $resulttext .= ' '.&mt('valid for at least [quant,_1,second] after launch',
-                                                           $confhash{$itemid}{$item.'valid'});
-                                }
-                            }
-                        } else {
-                            $resulttext .= &mt('No');
-                        }
-                        $resulttext .= '</li>';
-                    }
-                    if (ref($confhash{$itemid}{'display'}) eq 'HASH') {
-                        my $displaylist;
-                        if ($confhash{$itemid}{'display'}{'target'}) {
-                            $displaylist = &mt('Display target').':&nbsp;'.
-                                           $confhash{$itemid}{'display'}{'target'}.',';
-                        }
-                        foreach my $size ('width','height') { 
-                            if ($confhash{$itemid}{'display'}{$size}) {
-                                $displaylist .= ('&nbsp;'x2).$lt{$size}.':&nbsp;'.
-                                                $confhash{$itemid}{'display'}{$size}.',';
-                            }
-                        }
-                        if ($displaylist) {
-                            $displaylist =~ s/,$//;
-                            $resulttext .= '<li>'.$displaylist.'</li>';
-                        }
-                        foreach my $item ('linktext','explanation') {
-                            if ($confhash{$itemid}{'display'}{$item}) {
-                                $resulttext .= '<li>'.$lt{$item}.':&nbsp;'.$confhash{$itemid}{'display'}{$item}.'</li>';
-                            }
-                        }
-                    }
-                    if (ref($confhash{$itemid}{'fields'}) eq 'HASH') {
-                        my $fieldlist;
-                        foreach my $field (@allfields) {
-                            if ($confhash{$itemid}{'fields'}{$field}) {
-                                $fieldlist .= ('&nbsp;'x2).$lt{$field}.',';
-                            }
-                        }
-                        if ($fieldlist) {
-                            $fieldlist =~ s/,$//;
-                            if ($confhash{$itemid}{'fields'}{'user'}) {
-                                if ($confhash{$itemid}{'incdom'}) {
-                                    $fieldlist .= ' ('.&mt('username:domain').')';
-                                } else {
-                                    $fieldlist .= ' ('.&mt('username').')';
-                                }
-                            }
-                            $resulttext .= '<li>'.&mt('Data sent').':'.$fieldlist.'</li>';
+        } elsif (ref($currsec->{'encrypt'}) eq 'HASH') {
+            if ($currsec->{'encrypt'}{$item}) {
+                $secchanges->{'encrypt'} = 1;
+            }
+        }
+    }
+    my $secrets;
+    if ($context eq 'ltisec') {
+        $secrets = 'ltisecrets';
+    } else {
+        $secrets = 'toolsecrets';
+    }
+    unless (exists($currsec->{'rules'})) {
+        $currsec->{'rules'} = {};
+    }
+    &password_rule_changes($secrets,$newsec->{'rules'},$currsec->{'rules'},$secchanges);
+
+    my @ids=&Apache::lonnet::current_machine_ids();
+    my %servers = &Apache::lonnet::get_servers($dom,'library');
+
+    foreach my $hostid (keys(%servers)) {
+        if (($hostid ne '') && (grep(/^\Q$hostid\E$/,@ids))) {
+            my $keyitem = 'form.'.$context.'_privkey_'.$hostid;
+            if (exists($env{$keyitem})) {
+                $env{$keyitem} =~ s/(`)/'/g;
+                if ($keyset{$hostid}) {
+                    if ($env{'form.'.$context.'_changeprivkey_'.$hostid}) {
+                        if ($env{$keyitem} ne '') {
+                            $secchanges->{'private'} = 1;
+                            $newkeyset->{$hostid} = $env{$keyitem};
                         }
                     }
-                    if (ref($confhash{$itemid}{'roles'}) eq 'HASH') {
-                        my $rolemaps;
-                        foreach my $role (@courseroles) {
-                            if ($confhash{$itemid}{'roles'}{$role}) {
-                                $rolemaps .= ('&nbsp;'x2).&Apache::lonnet::plaintext($role,'Course').'='.
-                                             $confhash{$itemid}{'roles'}{$role}.',';
-                            }
-                        }
-                        if ($rolemaps) {
-                            $rolemaps =~ s/,$//; 
-                            $resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>';
-                        }
+                } elsif ($env{$keyitem} ne '') {
+                    unless (grep(/^\Q$hostid\E$/,@{$newsec->{'private'}{'keys'}})) {
+                        push(@{$newsec->{'private'}{'keys'}},$hostid);
                     }
-                    if (ref($confhash{$itemid}{'custom'}) eq 'HASH') {
-                        my $customlist;
-                        if (keys(%{$confhash{$itemid}{'custom'}})) {
-                            foreach my $key (sort(keys(%{$confhash{$itemid}{'custom'}}))) {
-                                $customlist .= $key.':'.$confhash{$itemid}{'custom'}{$key}.('&nbsp;'x2);
-                            } 
-                        }
-                        if ($customlist) {
-                            $resulttext .= '<li>'.&mt('Custom items').': '.$customlist.'</li>';
-                        }
-                    } 
-                    $resulttext .= '</ul></li>';
+                    $secchanges->{'private'} = 1;
+                    $newkeyset->{$hostid} = $env{$keyitem};
                 }
             }
-            $resulttext .= '</ul>';
-        } else {
-            $resulttext = &mt('No changes made.');
         }
-    } else {
-        $errors .= '<li><span class="LC_error">'.&mt('Failed to save changes').'</span></li>';
     }
-    if ($errors) {
-        $resulttext .= &mt('The following errors occurred: ').'<ul>'.
-                       $errors.'</ul>';
-    }
-    return $resulttext;
 }
 
-sub process_ltitools_image {
-    my ($r,$dom,$confname,$caller,$itemid,$configuserok,$switchserver,$author_ok) = @_;
-    my $filename = $env{'form.'.$caller.'.filename'};
-    my ($error,$url);
-    my ($width,$height) = (21,21);
-    if ($configuserok eq 'ok') {
-        if ($switchserver) {
-            $error = &mt('Upload of Tool Provider (LTI) icon is not permitted to this server: [_1]',
-                         $switchserver);
-        } elsif ($author_ok eq 'ok') {
-            my ($result,$imageurl,$madethumb) =
-                &publishlogo($r,'upload',$caller,$dom,$confname,
-                             "ltitools/$itemid/icon",$width,$height);
-            if ($result eq 'ok') {
-                if ($madethumb) {
-                    my ($path,$imagefile) = ($imageurl =~ m{^(.+)/([^/]+)$});
-                    my $imagethumb = "$path/tn-".$imagefile;
-                    $url = $imagethumb;
-                } else {
-                    $url = $imageurl;
-                }
-            } else {
-                $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result);
+sub store_security {
+    my ($dom,$context,$secchanges,$newkeyset,$keystore) = @_;
+    return unless ((ref($secchanges) eq 'HASH') && (ref($newkeyset) eq 'HASH') &&
+                   (ref($keystore) eq 'HASH'));
+    if (keys(%{$secchanges})) {
+        if ($secchanges->{'private'}) {
+            my $who = &escape($env{'user.name'}.':'.$env{'user.domain'});
+            foreach my $hostid (keys(%{$newkeyset})) {
+                my $storehash = {
+                                   key => $newkeyset->{$hostid},
+                                   who => $env{'user.name'}.':'.$env{'user.domain'},
+                                };
+                $keystore->{$hostid} = &Apache::lonnet::store_dom($storehash,$context,'private',
+                                                                  $dom,$hostid);
             }
-        } else {
-            $error = &mt("Upload of [_1] failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3].  Error was: [_4].",$filename,$confname,$dom,$author_ok);
         }
-    } else {
-        $error = &mt("Upload of [_1] failed because a Domain Configuration user ([_2]) could not be created in domain: [_3].  Error was: [_4].",$filename,$confname,$dom,$configuserok);
     }
-    return ($url,$error);
 }
 
-sub get_ltitools_id {
-    my ($cdom,$title) = @_;
-    # get lock on ltitools db
-    my $lockhash = {
-                      lock => $env{'user.name'}.
-                              ':'.$env{'user.domain'},
-                   };
-    my $tries = 0;
-    my $gotlock = &Apache::lonnet::newput_dom('ltitools',$lockhash,$cdom);
-    my ($id,$error);
- 
-    while (($gotlock ne 'ok') && ($tries<10)) {
-        $tries ++;
-        sleep (0.1);
-        $gotlock = &Apache::lonnet::newput_dom('ltitools',$lockhash,$cdom);
-    }
-    if ($gotlock eq 'ok') {
-        my %currids = &Apache::lonnet::dump_dom('ltitools',$cdom);
-        if ($currids{'lock'}) {
-            delete($currids{'lock'});
-            if (keys(%currids)) {
-                my @curr = sort { $a <=> $b } keys(%currids);
-                if ($curr[-1] =~ /^\d+$/) {
-                    $id = 1 + $curr[-1];
-                }
+sub lti_security_results {
+    my ($dom,$context,$secchanges,$newsec,$newkeyset,$keystore) = @_;
+    my $output;
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+    my $needs_update;
+    foreach my $item (keys(%{$secchanges})) {
+        if ($item eq 'encrypt') {
+            $needs_update = 1;
+            my %encrypted;
+            if ($context eq 'lti') {
+                %encrypted = (
+                              crs  => {
+                                        on => &mt('Encryption of stored link protection secrets defined in courses enabled'),
+                                        off => &mt('Encryption of stored link protection secrets defined in courses disabled'),
+                                      },
+                              dom => {
+                                       on => &mt('Encryption of stored link protection secrets defined in domain enabled'),
+                                       off => &mt('Encryption of stored link protection secrets defined in domain disabled'),
+                                     },
+                              consumers => {
+                                             on => &mt('Encryption of stored consumer secrets defined in domain enabled'),
+                                             off => &mt('Encryption of stored consumer secrets defined in domain disabled'),
+                                           },
+                             );
             } else {
-                $id = 1;
+                %encrypted = (
+                              crs  => {
+                                        on => &mt('Encryption of stored external tool secrets defined in courses enabled'),
+                                        off => &mt('Encryption of stored external tool secrets defined in courses disabled'),
+                                      },
+                              dom => {
+                                       on => &mt('Encryption of stored external tool secrets defined in domain enabled'),
+                                       off => &mt('Encryption of stored external tool secrets defined in domain disabled'),
+                                     },
+                             );
+
             }
-            if ($id) {
-                unless (&Apache::lonnet::newput_dom('ltitools',{ $id => $title },$cdom) eq 'ok') {
-                    $error = 'nostore';
+            my @types= ('crs','dom');
+            if ($context eq 'lti') {
+                foreach my $type (@types) {
+                    undef($domdefaults{'linkprotenc_'.$type});
+                }
+                push(@types,'consumers');
+                undef($domdefaults{'ltienc_consumers'});
+            } elsif ($context eq 'ltitools') {
+                foreach my $type (@types) {
+                    undef($domdefaults{'toolenc_'.$type});
+                }
+            }
+            foreach my $type (@types) {
+                my $shown = $encrypted{$type}{'off'};
+                if (ref($newsec->{$item}) eq 'HASH') {
+                    if ($newsec->{$item}{$type}) {
+                        if ($context eq 'lti') {
+                            if ($type eq 'consumers') {
+                                $domdefaults{'ltienc_consumers'} = 1;
+                            } else {
+                                $domdefaults{'linkprotenc_'.$type} = 1;
+                            }
+                        } elsif ($context eq 'ltitools') {
+                            $domdefaults{'toolenc_'.$type} = 1;
+                        }
+                        $shown = $encrypted{$type}{'on'};
+                    }
+                }
+                $output .= '<li>'.$shown.'</li>';
+            }
+        } elsif ($item eq 'rules') {
+            my %titles = &Apache::lonlocal::texthash(
+                                      min   => 'Minimum password length',
+                                      max   => 'Maximum password length',
+                                      chars => 'Required characters',
+                         );
+            foreach my $rule ('min','max') {
+                if ($newsec->{rules}{$rule} eq '') {
+                    if ($rule eq 'min') {
+                        $output .= '<li>'.&mt('[_1] not set.',$titles{$rule});
+                                   ' '.&mt('Default of [_1] will be used',
+                                           $Apache::lonnet::passwdmin).'</li>';
+                    } else {
+                        $output .= '<li>'.&mt('[_1] set to none',$titles{$rule}).'</li>';
+                    }
+                } else {
+                    $output .= '<li>'.&mt('[_1] set to [_2]',$titles{$rule},$newsec->{rules}{$rule}).'</li>';
+                }
+            }
+            if (ref($newsec->{'rules'}{'chars'}) eq 'ARRAY') {
+                if (@{$newsec->{'rules'}{'chars'}} > 0) {
+                    my %rulenames = &Apache::lonlocal::texthash(
+                                             uc => 'At least one upper case letter',
+                                             lc => 'At least one lower case letter',
+                                             num => 'At least one number',
+                                             spec => 'At least one non-alphanumeric',
+                                    );
+                    my $needed = '<ul><li>'.
+                                 join('</li><li>',map {$rulenames{$_} } @{$newsec->{'rules'}{'chars'}}).
+                                 '</li></ul>';
+                    $output .= '<li>'.&mt('[_1] set to: [_2]',$titles{'chars'},$needed).'</li>';
+                } else {
+                    $output .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>';
                 }
             } else {
-                $error = 'nonumber';
+                $output .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>';
+            }
+        } elsif ($item eq 'private') {
+            $needs_update = 1;
+            if ($context eq 'lti') {
+                undef($domdefaults{'ltiprivhosts'});
+            } elsif ($context eq 'ltitools') {
+                undef($domdefaults{'toolprivhosts'});
             }
+            if (keys(%{$newkeyset})) {
+                my @privhosts;
+                foreach my $hostid (sort(keys(%{$newkeyset}))) {
+                    if ($keystore->{$hostid} eq 'ok') {
+                        $output .= '<li>'.&mt('Encryption key for storage of shared secrets saved for [_1]',$hostid).'</li>';
+                        unless (grep(/^\Q$hostid\E$/,@privhosts)) {
+                            push(@privhosts,$hostid);
+                        }
+                    }
+                }
+                if (@privhosts) {
+                    if ($context eq 'lti') {
+                        $domdefaults{'ltiprivhosts'} = \@privhosts;
+                    } elsif ($context eq 'ltitools') {
+                        $domdefaults{'toolprivhosts'} = \@privhosts;
+                    }
+                }
+            }
+        } elsif ($item eq 'linkprot') {
+            next;
         }
-        my $dellockoutcome = &Apache::lonnet::del_dom('ltitools',['lock'],$cdom);
-    } else {
-        $error = 'nolock';
     }
-    return ($id,$error);
+    if ($needs_update) {
+        my $cachetime = 24*60*60;
+        &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+    }
+    return $output;
 }
 
 sub modify_proctoring {
@@ -14680,9 +15086,11 @@ sub process_proctoring_image {
             $error = &mt('Upload of Remote Proctoring Provider icon is not permitted to this server: [_1]',
                          $switchserver);
         } elsif ($author_ok eq 'ok') {
+            my $modified = [];
             my ($result,$imageurl,$madethumb) =
-                &publishlogo($r,'upload',$caller,$dom,$confname,
-                             "proctoring/$provider/icon",$width,$height);
+                &Apache::lonconfigsettings::publishlogo($r,'upload',$caller,$dom,$confname,
+                                                        "proctoring/$provider/icon",$width,$height,
+                                                        '',$modified);
             if ($result eq 'ok') {
                 if ($madethumb) {
                     my ($path,$imagefile) = ($imageurl =~ m{^(.+)/([^/]+)$});
@@ -14691,6 +15099,7 @@ sub process_proctoring_image {
                 } else {
                     $url = $imageurl;
                 }
+                &update_modify_urls($r,$modified);
             } else {
                 $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result);
             }
@@ -14706,18 +15115,19 @@ sub process_proctoring_image {
 sub modify_lti {
     my ($r,$dom,$action,$lastactref,%domconfig) = @_;
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-    my ($newid,@allpos,%changes,%confhash,%encconfig,$errors,$resulttext);
+    my ($newid,@allpos,%changes,%confhash,%ltienc,$errors,$resulttext);
     my (%posslti,%posslticrs,%posscrstype);
     my @courseroles = ('cc','in','ta','ep','st');
     my @ltiroles = qw(Learner Instructor ContentDeveloper TeachingAssistant Mentor Member Manager Administrator);
     my @lticourseroles = qw(Instructor TeachingAssistant Mentor Learner);
-    my @coursetypes = ('official','unofficial','community','textbook','placement');
+    my @coursetypes = ('official','unofficial','community','textbook','placement','lti');
     my %coursetypetitles = &Apache::lonlocal::texthash (
                                official   => 'Official',
                                unofficial => 'Unofficial',
                                community  => 'Community',
                                textbook   => 'Textbook',
                                placement  => 'Placement Test',
+                               lti        => 'LTI Provider',
     );
     my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
     my %lt = &lti_names();
@@ -14726,7 +15136,66 @@ sub modify_lti {
     map { $posscrstype{$_} = 1; } @coursetypes;
 
     my %menutitles = &ltimenu_titles();
+    my (%currltisec,%secchanges,%newltisec,%newltienc,%newkeyset);
+
+    &fetch_secrets($dom,'ltisec',\%domconfig,\%currltisec,\%secchanges,\%newltisec,\%newkeyset);
+
+    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'};
@@ -14747,42 +15216,56 @@ sub modify_lti {
             map { $deletions{$_} = 1; } @todelete;
         }
         my $maxnum = $env{'form.lti_maxnum'};
-        for (my $i=0; $i<=$maxnum; $i++) {
+        for (my $i=0; $i<$maxnum; $i++) {
             my $itemid = $env{'form.lti_id_'.$i};
             $itemid =~ s/\D+//g;
             if (ref($domconfig{$action}{$itemid}) eq 'HASH') {
                 if ($deletions{$itemid}) {
                     $changes{$itemid} = $domconfig{$action}{$itemid}{'consumer'};
                 } else {
-                   push(@items,$i);
-                   $itemids{$i} = $itemid;
+                    push(@items,$i);
+                    $itemids{$i} = $itemid;
                 }
             }
         }
     }
+    my (%keystore,$secstored);
+    if ($is_home) {
+        &store_security($dom,'lti',\%secchanges,\%newkeyset,\%keystore);
+    }
+
+    my ($cipher,$privnum);
+    if ((@items > 0) && ($is_home)) {
+        ($cipher,$privnum) = &get_priv_creds($dom,$home,$secchanges{'encrypt'},
+                                             $newltisec{'encrypt'},$keystore{$home});
+    }
     foreach my $idx (@items) {
         my $itemid = $itemids{$idx};
         next unless ($itemid);
-        my $position = $env{'form.lti_pos_'.$idx};
+        my %currlti;
+        unless ($idx eq 'add') {
+            if (ref($domconfig{$action}) eq 'HASH') {
+                if (ref($domconfig{$action}{$itemid}) eq 'HASH') {
+                    %currlti = %{$domconfig{$action}{$itemid}};
+                }
+            }
+        }
+        my $position = $env{'form.lti_pos_'.$itemid};
         $position =~ s/\D+//g;
         if ($position ne '') {
             $allpos[$position] = $itemid;
         }
-        foreach my $item ('consumer','key','secret','lifetime','requser') {
+        foreach my $item ('consumer','lifetime','requser','crsinc') {
             my $formitem = 'form.lti_'.$item.'_'.$idx;
             $env{$formitem} =~ s/(`)/'/g;
             if ($item eq 'lifetime') {
                 $env{$formitem} =~ s/[^\d.]//g;
             }
             if ($env{$formitem} ne '') {
-                if (($item eq 'key') || ($item eq 'secret')) {
-                    $encconfig{$itemid}{$item} = $env{$formitem};
-                } else {
-                    $confhash{$itemid}{$item} = $env{$formitem};
-                    unless (($idx eq 'add') || ($changes{$itemid})) {
-                        if ($domconfig{$action}{$itemid}{$item} ne $confhash{$itemid}{$item}) {
-                            $changes{$itemid} = 1;
-                        }
+                $confhash{$itemid}{$item} = $env{$formitem};
+                unless (($idx eq 'add') || ($changes{$itemid})) {
+                    if ($currlti{$item} ne $confhash{$itemid}{$item}) {
+                        $changes{$itemid} = 1;
                     }
                 }
             }
@@ -14792,20 +15275,14 @@ sub modify_lti {
         }
         if ($confhash{$itemid}{'requser'}) {
             if ($env{'form.lti_mapuser_'.$idx} eq 'sourcedid') {
-                $confhash{$itemid}{'mapuser'} = 'lis_person_sourcedid'; 
+                $confhash{$itemid}{'mapuser'} = 'lis_person_sourcedid';
             } elsif ($env{'form.lti_mapuser_'.$idx} eq 'email') {
                 $confhash{$itemid}{'mapuser'} = 'lis_person_contact_email_primary';
             } elsif ($env{'form.lti_mapuser_'.$idx} eq 'other') {
                 my $mapuser = $env{'form.lti_customuser_'.$idx};
                 $mapuser =~ s/(`)/'/g;
-                $mapuser =~ s/^\s+|\s+$//g; 
-                $confhash{$itemid}{'mapuser'} = $mapuser; 
-            }
-            foreach my $ltirole (@lticourseroles) {
-                my $possrole = $env{'form.lti_maprole_'.$ltirole.'_'.$idx};
-                if (grep(/^\Q$possrole\E$/,@courseroles)) {
-                    $confhash{$itemid}{'maproles'}{$ltirole} = $possrole;
-                }
+                $mapuser =~ s/^\s+|\s+$//g;
+                $confhash{$itemid}{'mapuser'} = $mapuser;
             }
             my @possmakeuser = &Apache::loncommon::get_env_multiple('form.lti_makeuser_'.$idx);
             my @makeuser;
@@ -14839,46 +15316,6 @@ sub modify_lti {
                     }
                 }
             }
-            if (($env{'form.lti_mapcrs_'.$idx} eq 'course_offering_sourcedid') ||
-                ($env{'form.lti_mapcrs_'.$idx} eq 'context_id'))  {
-                $confhash{$itemid}{'mapcrs'} = $env{'form.lti_mapcrs_'.$idx};
-            } elsif ($env{'form.lti_mapcrs_'.$idx} eq 'other') {
-                my $mapcrs = $env{'form.lti_mapcrsfield_'.$idx}; 
-                $mapcrs =~ s/(`)/'/g;
-                $mapcrs =~ s/^\s+|\s+$//g;
-                $confhash{$itemid}{'mapcrs'} = $mapcrs;
-            }
-            my @posstypes = &Apache::loncommon::get_env_multiple('form.lti_mapcrstype_'.$idx);
-            my @crstypes;
-            foreach my $type (sort(@posstypes)) {
-                if ($posscrstype{$type}) {
-                    push(@crstypes,$type);
-                }
-            }
-            $confhash{$itemid}{'mapcrstype'} = \@crstypes;
-            if ($env{'form.lti_makecrs_'.$idx}) {
-                $confhash{$itemid}{'makecrs'} = 1;
-            }
-            my @possenroll = &Apache::loncommon::get_env_multiple('form.lti_selfenroll_'.$idx);
-            my @selfenroll;
-            foreach my $type (sort(@possenroll)) {
-                if ($posslticrs{$type}) {
-                    push(@selfenroll,$type);
-                }
-            }
-            $confhash{$itemid}{'selfenroll'} = \@selfenroll;
-            if ($env{'form.lti_crssec_'.$idx}) {
-                if ($env{'form.lti_crssecsrc_'.$idx} eq 'course_section_sourcedid') {
-                    $confhash{$itemid}{'section'} = $env{'form.lti_crssecsrc_'.$idx};
-                } elsif ($env{'form.lti_crssecsrc_'.$idx} eq 'other') {
-                    my $section = $env{'form.lti_customsection_'.$idx};
-                    $section =~ s/(`)/'/g;
-                    $section =~ s/^\s+|\s+$//g;
-                    if ($section ne '') {
-                        $confhash{$itemid}{'section'} = $section;
-                    }
-                }
-            }
             if ($env{'form.lti_callback_'.$idx}) {
                 if ($env{'form.lti_callbackparam_'.$idx}) {
                     my $callback = $env{'form.lti_callbackparam_'.$idx};
@@ -14886,18 +15323,11 @@ sub modify_lti {
                     $confhash{$itemid}{'callback'} = $callback;
                 }
             }
-            foreach my $field ('passback','roster','topmenu','inlinemenu') {
+            foreach my $field ('topmenu','inlinemenu') {
                 if ($env{'form.lti_'.$field.'_'.$idx}) {
                     $confhash{$itemid}{$field} = 1;
                 }
             }
-            if ($env{'form.lti_passback_'.$idx}) {
-                if ($env{'form.lti_passbackformat_'.$idx} eq '1.0') {
-                    $confhash{$itemid}{'passbackformat'} = '1.0';
-                } else {
-                    $confhash{$itemid}{'passbackformat'} = '1.1';
-                }
-            }
             if ($env{'form.lti_topmenu_'.$idx} || $env{'form.lti_inlinemenu_'.$idx}) {
                 $confhash{$itemid}{lcmenu} = [];
                 my @possmenu = &Apache::loncommon::get_env_multiple('form.lti_menuitem_'.$idx);
@@ -14910,68 +15340,224 @@ sub modify_lti {
                     }
                 }
             }
-            unless (($idx eq 'add') || ($changes{$itemid})) {
-                foreach my $field ('mapuser','mapcrs','makecrs','section','passback','roster','lcauth','lcauthparm','topmenu','inlinemenu','callback') {
-                    if ($domconfig{$action}{$itemid}{$field} ne $confhash{$itemid}{$field}) {
-                        $changes{$itemid} = 1;
+            if ($confhash{$itemid}{'crsinc'}) {
+                if (($env{'form.lti_mapcrs_'.$idx} eq 'course_offering_sourcedid') ||
+                    ($env{'form.lti_mapcrs_'.$idx} eq 'context_id'))  {
+                    $confhash{$itemid}{'mapcrs'} = $env{'form.lti_mapcrs_'.$idx};
+                } elsif ($env{'form.lti_mapcrs_'.$idx} eq 'other') {
+                    my $mapcrs = $env{'form.lti_mapcrsfield_'.$idx}; 
+                    $mapcrs =~ s/(`)/'/g;
+                    $mapcrs =~ s/^\s+|\s+$//g;
+                    $confhash{$itemid}{'mapcrs'} = $mapcrs;
+                }
+                my @posstypes = &Apache::loncommon::get_env_multiple('form.lti_mapcrstype_'.$idx);
+                my @crstypes;
+                foreach my $type (sort(@posstypes)) {
+                    if ($posscrstype{$type}) {
+                        push(@crstypes,$type);
+                    }
+                }
+                $confhash{$itemid}{'mapcrstype'} = \@crstypes;
+                if ($env{'form.lti_storecrs_'.$idx}) {
+                    $confhash{$itemid}{'storecrs'} = 1;
+                }       
+                if ($env{'form.lti_makecrs_'.$idx}) {
+                    $confhash{$itemid}{'makecrs'} = 1;
+                }
+                foreach my $ltirole (@lticourseroles) {
+                    my $possrole = $env{'form.lti_maprole_'.$ltirole.'_'.$idx};
+                    if (grep(/^\Q$possrole\E$/,@courseroles)) {
+                        $confhash{$itemid}{'maproles'}{$ltirole} = $possrole;
+                    }
+                }
+                my @possenroll = &Apache::loncommon::get_env_multiple('form.lti_selfenroll_'.$idx);
+                my @selfenroll;
+                foreach my $type (sort(@possenroll)) {
+                    if ($posslticrs{$type}) {
+                        push(@selfenroll,$type);
+                    }
+                }
+                $confhash{$itemid}{'selfenroll'} = \@selfenroll;
+                if ($env{'form.lti_crssec_'.$idx}) {
+                    if ($env{'form.lti_crssecsrc_'.$idx} eq 'course_section_sourcedid') {
+                        $confhash{$itemid}{'section'} = $env{'form.lti_crssecsrc_'.$idx};
+                    } elsif ($env{'form.lti_crssecsrc_'.$idx} eq 'other') {
+                        my $section = $env{'form.lti_customsection_'.$idx};
+                        $section =~ s/(`)/'/g;
+                        $section =~ s/^\s+|\s+$//g;
+                        if ($section ne '') {
+                            $confhash{$itemid}{'section'} = $section;
+                        }
                     }
                 }
-                unless ($changes{$itemid}) {
-                    if ($domconfig{$action}{$itemid}{'passback'} eq $confhash{$itemid}{'passback'}) {
-                        if ($domconfig{$action}{$itemid}{'passbackformat'} ne $confhash{$itemid}{'passbackformat'}) {
+                foreach my $field ('passback','roster') {
+                    if ($env{'form.lti_'.$field.'_'.$idx}) {
+                        $confhash{$itemid}{$field} = 1;
+                    }
+                }
+                if ($env{'form.lti_passback_'.$idx}) {
+                    if ($env{'form.lti_passbackformat_'.$idx} eq '1.0') {
+                        $confhash{$itemid}{'passbackformat'} = '1.0';
+                    } else {
+                        $confhash{$itemid}{'passbackformat'} = '1.1';
+                    }
+                }
+            }
+            unless (($idx eq 'add') || ($changes{$itemid})) {
+                if ($confhash{$itemid}{'crsinc'}) {
+                    foreach my $field ('mapcrs','storecrs','makecrs','section','passback','roster') {
+                        if ($currlti{$field} ne $confhash{$itemid}{$field}) {
                             $changes{$itemid} = 1;
                         }
                     }
-                }
-                foreach my $field ('makeuser','mapcrstype','selfenroll','instdata','lcmenu') {
                     unless ($changes{$itemid}) {
-                        if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') {
-                            if (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
-                                my @diffs = &Apache::loncommon::compare_arrays($domconfig{$action}{$itemid}{$field},
-                                                                               $confhash{$itemid}{$field});
-                                if (@diffs) {
-                                    $changes{$itemid} = 1;
-                                }
-                            } elsif (@{$domconfig{$action}{$itemid}{$field}} > 0) {
-                                $changes{$itemid} = 1;
-                            }
-                        } elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
-                            if (@{$confhash{$itemid}{$field}} > 0) {
+                        if ($currlti{'passback'} eq $confhash{$itemid}{'passback'}) {
+                            if ($currlti{'passbackformat'} ne $confhash{$itemid}{'passbackformat'}) {
                                 $changes{$itemid} = 1;
                             }
                         }
                     }
-                }
-                unless ($changes{$itemid}) {
-                    if (ref($domconfig{$action}{$itemid}{'maproles'}) eq 'HASH') {
-                        if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') {
-                            foreach my $ltirole (keys(%{$domconfig{$action}{$itemid}{'maproles'}})) {
-                                if ($domconfig{$action}{$itemid}{'maproles'}{$ltirole} ne 
-                                    $confhash{$itemid}{'maproles'}{$ltirole}) {
+                    foreach my $field ('mapcrstype','selfenroll') {
+                        unless ($changes{$itemid}) {
+                            if (ref($currlti{$field}) eq 'ARRAY') {
+                                if (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
+                                    my @diffs = &Apache::loncommon::compare_arrays($currlti{$field},
+                                                                                   $confhash{$itemid}{$field});
+                                    if (@diffs) {
+                                        $changes{$itemid} = 1;
+                                    }
+                                } elsif (@{$currlti{$field}} > 0) {
+                                    $changes{$itemid} = 1;
+                                }
+                            } elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
+                                if (@{$confhash{$itemid}{$field}} > 0) {
                                     $changes{$itemid} = 1;
-                                    last;
                                 }
                             }
-                            unless ($changes{$itemid}) {
-                                foreach my $ltirole (keys(%{$confhash{$itemid}{'maproles'}})) {
-                                    if ($confhash{$itemid}{'maproles'}{$ltirole} ne 
-                                        $domconfig{$action}{$itemid}{'maproles'}{$ltirole}) {
+                        }
+                    }
+                    unless ($changes{$itemid}) {
+                        if (ref($currlti{'maproles'}) eq 'HASH') {
+                            if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') {
+                                foreach my $ltirole (keys(%{$currlti{'maproles'}})) {
+                                    if ($currlti{'maproles'}{$ltirole} ne 
+                                        $confhash{$itemid}{'maproles'}{$ltirole}) {
                                         $changes{$itemid} = 1;
                                         last;
                                     }
                                 }
+                                unless ($changes{$itemid}) {
+                                    foreach my $ltirole (keys(%{$confhash{$itemid}{'maproles'}})) {
+                                        if ($confhash{$itemid}{'maproles'}{$ltirole} ne 
+                                            $currlti{'maproles'}{$ltirole}) {
+                                            $changes{$itemid} = 1;
+                                            last;
+                                        }
+                                    }
+                                }
+                            } elsif (keys(%{$currlti{'maproles'}}) > 0) {
+                                $changes{$itemid} = 1;
+                            }
+                        } elsif (ref($confhash{$itemid}{'maproles'}) eq 'HASH') {
+                            unless ($changes{$itemid}) {
+                                if (keys(%{$confhash{$itemid}{'maproles'}}) > 0) {
+                                    $changes{$itemid} = 1;
+                                }
                             }
-                        } elsif (keys(%{$domconfig{$action}{$itemid}{'maproles'}}) > 0) {
+                        }
+                    }
+                }
+                unless ($changes{$itemid}) {
+                    foreach my $field ('mapuser','lcauth','lcauthparm','topmenu','inlinemenu','callback') {
+                        if ($currlti{$field} ne $confhash{$itemid}{$field}) {
                             $changes{$itemid} = 1;
                         }
-                    } elsif (ref($confhash{$itemid}{'maproles'}) eq 'HASH') {
-                        unless ($changes{$itemid}) {
-                            if (keys(%{$confhash{$itemid}{'maproles'}}) > 0) {
+                    }
+                    unless ($changes{$itemid}) {
+                        foreach my $field ('makeuser','lcmenu') {
+                            if (ref($currlti{$field}) eq 'ARRAY') {
+                                if (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
+                                    my @diffs = &Apache::loncommon::compare_arrays($currlti{$field},
+                                                                                   $confhash{$itemid}{$field});
+                                    if (@diffs) {
+                                        $changes{$itemid} = 1;
+                                    }
+                                } elsif (@{$currlti{$field}} > 0) {
+                                    $changes{$itemid} = 1;
+                                }
+                            } elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
+                                if (@{$confhash{$itemid}{$field}} > 0) {
+                                    $changes{$itemid} = 1;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if ($is_home) {
+            my $keyitem = 'form.lti_key_'.$idx;
+            $env{$keyitem} =~ s/(`)/'/g;
+            if ($env{$keyitem} ne '') {
+                $ltienc{$itemid}{'key'} = $env{$keyitem};
+                unless ($changes{$itemid}) {
+                    if ($currlti{'key'} ne $env{$keyitem}) {
+                        $changes{$itemid} = 1;
+                    }
+                }
+            }
+            my $secretitem = 'form.lti_secret_'.$idx;
+            $env{$secretitem} =~ s/(`)/'/g;
+            if ($currlti{'usable'}) {
+                if ($env{'form.lti_changesecret_'.$idx}) {
+                    if ($env{$secretitem} ne '') {
+                        if ($privnum && $cipher) {
+                            $ltienc{$itemid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
+                            $confhash{$itemid}{'cipher'} = $privnum;
+                        } else {
+                            $ltienc{$itemid}{'secret'} = $env{$secretitem};
+                        }
+                        $changes{$itemid} = 1;
+                    }
+                } else {
+                    $ltienc{$itemid}{'secret'} = $currlti{'secret'};
+                    $confhash{$itemid}{'cipher'} = $currlti{'cipher'};
+                }
+                if (ref($ltienc{$itemid}) eq 'HASH') {
+                    if (($ltienc{$itemid}{'key'} ne '') && ($ltienc{$itemid}{'secret'} ne '')) {
+                        $confhash{$itemid}{'usable'} = 1;
+                    }
+                }
+            } elsif ($env{$secretitem} ne '') {
+                if ($privnum && $cipher) {
+                    $ltienc{$itemid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
+                    $confhash{$itemid}{'cipher'} = $privnum;
+                } else {
+                    $ltienc{$itemid}{'secret'} = $env{$secretitem};
+                }
+                if (ref($ltienc{$itemid}) eq 'HASH') {
+                    if (($ltienc{$itemid}{'key'} ne '') && ($ltienc{$itemid}{'key'} ne '')) {
+                        $confhash{$itemid}{'usable'} = 1;
+                    }
+                }
+                $changes{$itemid} = 1;
+            }
+        }
+        unless ($changes{$itemid}) {
+            foreach my $key (keys(%currlti)) {
+                if (ref($currlti{$key}) eq 'HASH') {
+                    if (ref($confhash{$itemid}{$key}) eq 'HASH') {
+                        foreach my $innerkey (keys(%{$currlti{$key}})) {
+                            unless (exists($confhash{$itemid}{$key}{$innerkey})) {
                                 $changes{$itemid} = 1;
+                                last;
                             }
                         }
+                    } elsif (keys(%{$currlti{$key}}) > 0) {
+                        $changes{$itemid} = 1;
                     }
                 }
+                last if ($changes{$itemid});
             }
         }
     }
@@ -14991,42 +15577,58 @@ sub modify_lti {
             }
         }
     }
+
+    if ((keys(%changes) == 0) && (keys(%secchanges) == 0)) {
+        return &mt('No changes made.');
+    }
+
     my %ltihash = (
-                          $action => { %confhash }
-                       );
-    my $putresult = &Apache::lonnet::put_dom('configuration',\%ltihash,
-                                             $dom);
+                      $action => { %confhash }
+                  );
+    my %ltienchash;
+
+    if ($is_home) {
+        %ltienchash = (
+                         $action => { %ltienc }
+                      );
+    }
+    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') {
-        my %ltienchash = (
-                             $action => { %encconfig }
-                         );
-        &Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom,undef,1);
+        if (keys(%ltienchash)) {
+            &Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom,undef,1);
+        }
+        $resulttext = &mt('Changes made:').'<ul>';
+        if (keys(%secchanges) > 0) {
+            $resulttext .= &lti_security_results($dom,'lti',\%secchanges,\%newltisec,\%newkeyset,\%keystore);
+            if (exists($secchanges{'linkprot'})) {
+                $resulttext .= $linkprotoutput;
+            }
+        }
         if (keys(%changes) > 0) {
             my $cachetime = 24*60*60;
-            my %ltiall = %confhash;
-            foreach my $id (keys(%ltiall)) {
-                if (ref($encconfig{$id}) eq 'HASH') {
-                    foreach my $item ('key','secret') {
-                        $ltiall{$id}{$item} = $encconfig{$id}{$item};
-                    }
-                }
-            }
-            &Apache::lonnet::do_cache_new('lti',$dom,\%ltiall,$cachetime);
+            &Apache::lonnet::do_cache_new('lti',$dom,\%confhash,$cachetime);
             if (ref($lastactref) eq 'HASH') {
                 $lastactref->{'lti'} = 1;
             }
-            $resulttext = &mt('Changes made:').'<ul>';
             my %bynum;
             foreach my $itemid (sort(keys(%changes))) {
-                my $position = $confhash{$itemid}{'order'};
-                $bynum{$position} = $itemid;
+                if (ref($confhash{$itemid}) eq 'HASH') {
+                    my $position = $confhash{$itemid}{'order'};
+                    $bynum{$position} = $itemid;
+                }
             }
             foreach my $pos (sort { $a <=> $b } keys(%bynum)) {
                 my $itemid = $bynum{$pos};
-                if (ref($confhash{$itemid}) ne 'HASH') {
-                    $resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>';
-                } else {
-                    $resulttext .= '<li><b>'.$confhash{$itemid}{'consumer'}.'</b></li><ul>';
+                if (ref($confhash{$itemid}) eq 'HASH') {
+                    $resulttext .= '<li><b>'.$confhash{$itemid}{'consumer'}.'</b><ul>';
                     my $position = $pos + 1;
                     $resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>';
                     foreach my $item ('version','lifetime') {
@@ -15034,15 +15636,18 @@ sub modify_lti {
                             $resulttext .= '<li>'.$lt{$item}.':&nbsp;'.$confhash{$itemid}{$item}.'</li>';
                         }
                     }
-                    if ($encconfig{$itemid}{'key'} ne '') {
-                        $resulttext .= '<li>'.$lt{'key'}.':&nbsp;'.$encconfig{$itemid}{'key'}.'</li>';
+                    if ($ltienc{$itemid}{'key'} ne '') {
+                        $resulttext .= '<li>'.$lt{'key'}.':&nbsp;'.$ltienc{$itemid}{'key'}.'</li>';
                     }
-                    if ($encconfig{$itemid}{'secret'} ne '') {
-                        $resulttext .= '<li>'.$lt{'secret'}.':&nbsp;';
-                        my $num = length($encconfig{$itemid}{'secret'});
-                        $resulttext .= ('*'x$num).'</li>';
+                    if ($ltienc{$itemid}{'secret'} ne '') {
+                        $resulttext .= '<li>'.$lt{'secret'}.':&nbsp;['.&mt('not shown').']</li>';
                     }
                     if ($confhash{$itemid}{'requser'}) {
+                        if ($confhash{$itemid}{'callback'}) {
+                            $resulttext .= '<li>'.&mt('Callback setting').': '.$confhash{$itemid}{'callback'}.'</li>';
+                        } else {
+                            $resulttext .= '<li>'.&mt('Callback to logout LON-CAPA on log out from Consumer').'</li>';
+                        }
                         if ($confhash{$itemid}{'mapuser'}) {
                             my $shownmapuser;
                             if ($confhash{$itemid}{'mapuser'} eq 'lis_person_sourcedid') {
@@ -15054,20 +15659,6 @@ sub modify_lti {
                             }
                             $resulttext .= '<li>'.&mt('LON-CAPA username').': '.$shownmapuser.'</li>';
                         }
-                        if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') {
-                            my $rolemaps;
-                            foreach my $role (@ltiroles) {
-                                if ($confhash{$itemid}{'maproles'}{$role}) {
-                                    $rolemaps .= ('&nbsp;'x2).$role.'='.
-                                                 &Apache::lonnet::plaintext($confhash{$itemid}{'maproles'}{$role},
-                                                                            'Course').',';
-                                }
-                            }
-                            if ($rolemaps) {
-                                $rolemaps =~ s/,$//;
-                                $resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>';
-                            }
-                        }
                         if (ref($confhash{$itemid}{'makeuser'}) eq 'ARRAY') {
                             if (@{$confhash{$itemid}{'makeuser'}} > 0) { 
                                 $resulttext .= '<li>'.&mt('Following roles may create user accounts: [_1]',
@@ -15100,59 +15691,10 @@ sub modify_lti {
                                 $resulttext .= '<li>'.&mt('No institutional data used when creating a new user.').'</li>';
                             }
                         }
-                        if ($confhash{$itemid}{'mapcrs'}) {
-                            $resulttext .= '<li>'.&mt('Unique course identifier').': '.$confhash{$itemid}{'mapcrs'}.'</li>';
-                        }
-                        if (ref($confhash{$itemid}{'mapcrstype'}) eq 'ARRAY') {
-                            if (@{$confhash{$itemid}{'mapcrstype'}} > 0) {
-                                $resulttext .= '<li>'.&mt('Mapping for the following LON-CAPA course types: [_1]',
-                                               join(', ',map { $coursetypetitles{$_}; } @coursetypes)).
-                                               '</li>';
-                            } else {
-                                $resulttext .= '<li>'.&mt('No mapping to LON-CAPA courses').'</li>';
-                            }
-                        }
-                        if ($confhash{$itemid}{'makecrs'}) {
-                            $resulttext .= '<li>'.&mt('Instructor may create course (if absent).').'</li>';
-                        } else {
-                            $resulttext .= '<li>'.&mt('Instructor may not create course (if absent).').'</li>';
-                        }
-                        if (ref($confhash{$itemid}{'selfenroll'}) eq 'ARRAY') {
-                            if (@{$confhash{$itemid}{'selfenroll'}} > 0) {
-                                $resulttext .= '<li>'.&mt('Self-enrollment for following roles: [_1]',
-                                                          join(', ',@{$confhash{$itemid}{'selfenroll'}})).
-                                               '</li>';
-                            } else {
-                                $resulttext .= '<li>'.&mt('Self-enrollment not permitted').'</li>';
-                            }
-                        }
-                        if ($confhash{$itemid}{'section'}) {
-                            if ($confhash{$itemid}{'section'} eq 'course_section_sourcedid') {
-                                $resulttext .= '<li>'.&mt('User section from standard field:').
-                                                     ' (course_section_sourcedid)'.'</li>';  
-                            } else {
-                                $resulttext .= '<li>'.&mt('User section from:').' '.
-                                                      $confhash{$itemid}{'section'}.'</li>';
-                            }
-                        } else {
-                            $resulttext .= '<li>'.&mt('No section assignment').'</li>';
-                        }
-                        if ($confhash{$itemid}{'callback'}) {
-                            $resulttext .= '<li>'.&mt('Callback setting').': '.$confhash{$itemid}{'callback'}.'</li>';
-                        } else {
-                            $resulttext .= '<li>'.&mt('No callback to logout LON-CAPA session when user logs out of Comsumer');
-                        }
-                        foreach my $item ('passback','roster','topmenu','inlinemenu') {
+                        foreach my $item ('topmenu','inlinemenu') {
                             $resulttext .= '<li>'.$lt{$item}.':&nbsp;';
                             if ($confhash{$itemid}{$item}) {
                                 $resulttext .= &mt('Yes');
-                                if ($item eq 'passback') {
-                                    if ($confhash{$itemid}{'passbackformat'} eq '1.0') {
-                                        $resulttext .= '&nbsp;('.&mt('Outcomes Extension (1.0)').')';
-                                    } elsif ($confhash{$itemid}{'passbackformat'} eq '1.1') {
-                                        $resulttext .= '&nbsp;('.&mt('Outcomes Service (1.1)').')';
-                                    }
-                                }
                             } else {
                                 $resulttext .= &mt('No');
                             }
@@ -15161,18 +15703,106 @@ sub modify_lti {
                         if (ref($confhash{$itemid}{'lcmenu'}) eq 'ARRAY') {
                             if (@{$confhash{$itemid}{'lcmenu'}} > 0) {
                                 $resulttext .= '<li>'.&mt('Menu items:').' '.
-                                               join(', ', map { $menutitles{$_}; } (@{$confhash{$itemid}{'lcmenu'}})).'</li>'; 
+                                               join(', ', map { $menutitles{$_}; } (@{$confhash{$itemid}{'lcmenu'}})).'</li>';
+                            } else {
+                                $resulttext .= '<li>'.&mt('No menu items displayed in header or online menu').'</li>';
+                            }
+                        }
+                        if ($confhash{$itemid}{'crsinc'}) {
+                            if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') {
+                                my $rolemaps;
+                                foreach my $role (@ltiroles) {
+                                    if ($confhash{$itemid}{'maproles'}{$role}) {
+                                        $rolemaps .= ('&nbsp;'x2).$role.'='.
+                                                     &Apache::lonnet::plaintext($confhash{$itemid}{'maproles'}{$role},
+                                                                                'Course').',';
+                                    }
+                                }
+                                if ($rolemaps) {
+                                    $rolemaps =~ s/,$//;
+                                    $resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>';
+                                }
+                            }
+                            if ($confhash{$itemid}{'mapcrs'}) {
+                                $resulttext .= '<li>'.&mt('Unique course identifier').': '.$confhash{$itemid}{'mapcrs'}.'</li>';
+                            }
+                            if (ref($confhash{$itemid}{'mapcrstype'}) eq 'ARRAY') {
+                                if (@{$confhash{$itemid}{'mapcrstype'}} > 0) {
+                                    $resulttext .= '<li>'.&mt('Mapping for the following LON-CAPA course types: [_1]',
+                                                   join(', ',map { $coursetypetitles{$_}; } @coursetypes)).
+                                                   '</li>';
+                                } else {
+                                    $resulttext .= '<li>'.&mt('No mapping to LON-CAPA courses').'</li>';
+                                }
+                            }
+                            if ($confhash{$itemid}{'storecrs'}) {
+                                $resulttext .= '<li>'.&mt('Store mapping of course identifier to LON-CAPA CourseID').': '.$confhash{$itemid}{'storecrs'}.'</li>';
+                            }
+                            if ($confhash{$itemid}{'makecrs'}) {
+                                $resulttext .= '<li>'.&mt('Instructor may create course (if absent).').'</li>';
+                            } else {
+                                $resulttext .= '<li>'.&mt('Instructor may not create course (if absent).').'</li>';
+                            }
+                            if (ref($confhash{$itemid}{'selfenroll'}) eq 'ARRAY') {
+                                if (@{$confhash{$itemid}{'selfenroll'}} > 0) {
+                                    $resulttext .= '<li>'.&mt('Self-enrollment for following roles: [_1]',
+                                                              join(', ',@{$confhash{$itemid}{'selfenroll'}})).
+                                                   '</li>';
+                                } else {
+                                    $resulttext .= '<li>'.&mt('Self-enrollment not permitted').'</li>';
+                                }
+                            }
+                            if ($confhash{$itemid}{'section'}) {
+                                if ($confhash{$itemid}{'section'} eq 'course_section_sourcedid') {
+                                    $resulttext .= '<li>'.&mt('User section from standard field:').
+                                                         ' (course_section_sourcedid)'.'</li>';  
+                                } else {
+                                    $resulttext .= '<li>'.&mt('User section from:').' '.
+                                                          $confhash{$itemid}{'section'}.'</li>';
+                                }
                             } else {
-                                $resulttext .= '<li>'.&mt('No menu items displayed in header or online menu').'</li>'; 
+                                $resulttext .= '<li>'.&mt('No section assignment').'</li>';
+                            }
+                            foreach my $item ('passback','roster','topmenu','inlinemenu') {
+                                $resulttext .= '<li>'.$lt{$item}.':&nbsp;';
+                                if ($confhash{$itemid}{$item}) {
+                                    $resulttext .= &mt('Yes');
+                                    if ($item eq 'passback') {
+                                        if ($confhash{$itemid}{'passbackformat'} eq '1.0') {
+                                            $resulttext .= '&nbsp;('.&mt('Outcomes Extension (1.0)').')';
+                                        } elsif ($confhash{$itemid}{'passbackformat'} eq '1.1') {
+                                            $resulttext .= '&nbsp;('.&mt('Outcomes Service (1.1)').')';
+                                        }
+                                    }
+                                } else {
+                                    $resulttext .= &mt('No');
+                                }
+                                $resulttext .= '</li>';
+                            }
+                            if (ref($confhash{$itemid}{'lcmenu'}) eq 'ARRAY') {
+                                if (@{$confhash{$itemid}{'lcmenu'}} > 0) {
+                                    $resulttext .= '<li>'.&mt('Menu items:').' '.
+                                                   join(', ', map { $menutitles{$_}; } (@{$confhash{$itemid}{'lcmenu'}})).'</li>'; 
+                                } else {
+                                    $resulttext .= '<li>'.&mt('No menu items displayed in header or online menu').'</li>'; 
+                                }
                             }
                         }
                     }
                     $resulttext .= '</ul></li>';
                 }
             }
-            $resulttext .= '</ul>';
-        } else {
-            $resulttext = &mt('No changes made.');
+            if (keys(%deletions)) {
+                foreach my $itemid (sort { $a <=> $b } keys(%deletions)) {
+                    $resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>';
+                }
+            }
+        }
+        $resulttext .= '</ul>';
+        if (ref($lastactref) eq 'HASH') {
+            if (($secchanges{'encrypt'}) || ($secchanges{'private'})) {
+                $lastactref->{'domdefaults'} = 1;
+            }
         }
     } else {
         $errors .= '<li><span class="LC_error">'.&mt('Failed to save changes').'</span></li>';
@@ -15184,6 +15814,30 @@ sub modify_lti {
     return $resulttext;
 }
 
+sub get_priv_creds {
+    my ($dom,$home,$encchg,$encrypt,$storedsec) = @_;
+    my ($needenc,$cipher,$privnum);
+    my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
+    if (($encchg) && (ref($encrypt) eq 'HASH')) {
+        $needenc = $encrypt->{'consumers'} 
+    } else {
+        $needenc = $domdefs{'ltienc_consumers'};
+    }
+    if ($needenc) {
+        if (($storedsec eq 'ok') || ((ref($domdefs{'ltiprivhosts'}) eq 'ARRAY') &&
+                                     (grep(/^\Q$home\E$/,@{$domdefs{'ltiprivhosts'}})))) {
+                        my %privhash  = &Apache::lonnet::restore_dom('lti','private',$dom,$home,1);
+            my $privkey = $privhash{'key'};
+            $privnum = $privhash{'version'};
+            if (($privnum) && ($privkey ne '')) {
+                $cipher = Crypt::CBC->new({'key'     => $privkey,
+                                          'cipher'  => 'DES'});
+            }
+        }
+    }
+    return ($cipher,$privnum);
+}
+
 sub get_lti_id {
     my ($domain,$consumer) = @_;
     # get lock on lti db
@@ -15240,7 +15894,7 @@ sub modify_autoenroll {
     my %title = ( run => 'Auto-enrollment active',
                   sender => 'Sender for notification messages',
                   coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)',
-                  failsafe => 'Failsafe for no drops if institutional data missing for a section');
+                  autofailsafe => 'Failsafe for no drops if institutional data missing for a section');
     my @offon = ('off','on');
     my $sender_uname = $env{'form.sender_uname'};
     my $sender_domain = $env{'form.sender_domain'};
@@ -15250,17 +15904,23 @@ sub modify_autoenroll {
         $sender_domain = '';
     }
     my $coowners = $env{'form.autoassign_coowners'};
+    my $autofailsafe = $env{'form.autoenroll_autofailsafe'};
+    $autofailsafe =~ s{^\s+|\s+$}{}g;
+    if ($autofailsafe =~ /\D/) {
+        undef($autofailsafe);
+    }
     my $failsafe = $env{'form.autoenroll_failsafe'};
-    $failsafe =~ s{^\s+|\s+$}{}g;
-    if ($failsafe =~ /\D/) {
-        undef($failsafe);
+    unless (($failsafe eq 'zero') || ($failsafe eq 'any')) {
+        $failsafe = 'off';
+        undef($autofailsafe);
     }
     my %autoenrollhash =  (
                        autoenroll => { 'run' => $env{'form.autoenroll_run'},
                                        'sender_uname' => $sender_uname,
                                        'sender_domain' => $sender_domain,
                                        'co-owners' => $coowners,
-                                       'autofailsafe' => $failsafe,
+                                       'autofailsafe' => $autofailsafe,
+                                       'failsafe' => $failsafe,
                                 }
                      );
     my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash,
@@ -15288,9 +15948,12 @@ sub modify_autoenroll {
         } elsif ($coowners) {
             $changes{'coowners'} = 1;
         }
-        if ($currautoenroll{'autofailsafe'} ne $failsafe) {
+        if ($currautoenroll{'autofailsafe'} ne $autofailsafe) {
             $changes{'autofailsafe'} = 1;
         }
+        if ($currautoenroll{'failsafe'} ne $failsafe) {
+            $changes{'failsafe'} = 1;
+        }
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'run'}) {
@@ -15311,11 +15974,24 @@ sub modify_autoenroll {
                 }
             }
             if ($changes{'autofailsafe'}) {
-                if ($failsafe ne '') {
-                    $resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section set to: [_1]',$failsafe).'</li>';
+                if ($autofailsafe ne '') {
+                    $resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section set to: [_1]',$autofailsafe).'</li>';
                 } else {
-                    $resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section: deleted');
+                    $resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section not in use').'</li>';
                 }
+            }
+            if ($changes{'failsafe'}) {
+                if ($failsafe eq 'off') {
+                    unless ($changes{'autofailsafe'}) {
+                        $resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section not in use').'</li>';
+                    }
+                } elsif ($failsafe eq 'zero') {
+                    $resulttext .= '<li>'.&mt('Failsafe applies if retrieved section enrollment is zero').'</li>';
+                } else {
+                    $resulttext .= '<li>'.&mt('Failsafe applies if retrieved section enrollment is zero or greater').'</li>';
+                }
+            }
+            if (($changes{'autofailsafe'}) || ($changes{'failsafe'})) {
                 &Apache::lonnet::get_domain_defaults($dom,1);
                 if (ref($lastactref) eq 'HASH') {
                     $lastactref->{'domdefaults'} = 1;
@@ -15964,7 +16640,7 @@ sub modify_contacts {
                     $contacts_hash{'contacts'}{'overrides'}{$type}{'include'} = $includeloc{$type}.':'.&escape($includestr{$type});
                     $newsetting{'override_'.$type}{'include'} = $contacts_hash{'contacts'}{'overrides'}{$type}{'include'};
                 }
-            }     
+            }
         }
     }
     if (keys(%currsetting) > 0) {
@@ -16022,12 +16698,12 @@ sub modify_contacts {
             }
         }
         if (@statuses) {
-            if (ref($currsetting{'overrides'}) eq 'HASH') { 
+            if (ref($currsetting{'overrides'}) eq 'HASH') {
                 foreach my $key (keys(%{$currsetting{'overrides'}})) {
                     if (ref($currsetting{'overrides'}{$key}) eq 'HASH') {
                         if (ref($newsetting{'override_'.$key}) eq 'HASH') {
                             foreach my $item (@contacts,'bcc','others','include') {
-                                if ($currsetting{'overrides'}{$key}{$item} ne $newsetting{'override_'.$key}{$item}) { 
+                                if ($currsetting{'overrides'}{$key}{$item} ne $newsetting{'override_'.$key}{$item}) {
                                     push(@{$changes{'overrides'}},$key);
                                     last;
                                 }
@@ -16044,7 +16720,7 @@ sub modify_contacts {
                 }
             } else {
                 foreach my $key (@overrides) {
-                    push(@{$changes{'overrides'}},$key); 
+                    push(@{$changes{'overrides'}},$key);
                 }
             }
         }
@@ -16226,7 +16902,7 @@ sub modify_contacts {
                             $resulttext .= $bcctext.': <span class="LC_cusr_emph">'.$bcc{$type}.'</span>';
                         } elsif (!@text) {
                             $resulttext .= &mt('No one');
-                        }   
+                        }
                         if ($includestr{$type} ne '') {
                             if ($includeloc{$type} eq 'b') {
                                 $resulttext .= '<br />'.&mt('Text automatically added to e-mail body:').' '.$includestr{$type};
@@ -16250,14 +16926,14 @@ sub modify_contacts {
                             if (ref($newsetting{'override_'.$type}) eq 'HASH') {
                                 my @text;
                                 foreach my $item (@contacts) {
-                                    if ($newsetting{'override_'.$type}{$item}) { 
+                                    if ($newsetting{'override_'.$type}{$item}) {
                                         push(@text,$short_titles->{$item});
                                     }
                                 }
                                 if ($newsetting{'override_'.$type}{'others'} ne '') {
                                     push(@text,$newsetting{'override_'.$type}{'others'});
                                 }
-  
+
                                 if (@text) {
                                     $resulttext .= &mt('Helpdesk e-mail sent to: [_1]',
                                                        '<span class="LC_cusr_emph">'.join(', ',@text).'</span>');
@@ -16431,7 +17107,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',
@@ -16450,6 +17126,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',
@@ -16475,7 +17152,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') {
@@ -16567,6 +17244,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,
@@ -16575,7 +17264,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') {
@@ -16593,6 +17282,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') {
@@ -16633,6 +17331,7 @@ sub modify_privacy {
                     $resulttext .= '</ul></li>';
                 }
             }
+            $resulttext .= '</ul>';
         } else {
             $resulttext = &mt('No changes made to user information settings');
         }
@@ -16819,12 +17518,15 @@ sub modify_passwords {
                 $error = &mt("Upload of file containing domain-specific text is not permitted to this server: [_1]",$switchserver);
             } else {
                 if ($author_ok eq 'ok') {
+                    my $modified = [];
                     my ($result,$customurl) =
-                        &publishlogo($r,'upload','passwords_customfile',$dom,
-                                     $confname,'customtext/resetpw','','',$customfn);
+                        &Apache::lonconfigsettings::publishlogo($r,'upload','passwords_customfile',$dom,
+                                                                $confname,'customtext/resetpw','','',$customfn,
+                                                                $modified);
                     if ($result eq 'ok') {
                         $newvalues{'resetcustom'} = $customurl;
                         $changes{'reset'} = 1;
+                        &update_modify_urls($r,$modified);
                     } else {
                         $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$customfn,$result);
                     }
@@ -16877,61 +17579,7 @@ sub modify_passwords {
             $updatedefaults = 1;
         }
     }
-    foreach my $rule ('min','max','expire','numsaved') {
-        $env{'form.passwords_'.$rule} =~ s/^\s+|\s+$//g;
-        my $ruleok;
-        if ($rule eq 'expire') {
-            if (($env{'form.passwords_'.$rule} =~ /^\d+(|\.\d*)$/) &&
-                ($env{'form.passwords_'.$rule} ne '0')) {
-                $ruleok = 1;
-            }
-        } elsif ($rule eq 'min') {
-            if ($env{'form.passwords_'.$rule} =~ /^\d+$/) {
-                if ($env{'form.passwords_'.$rule} >= $Apache::lonnet::passwdmin) {
-                    $ruleok = 1;
-                }
-            }
-        } elsif (($env{'form.passwords_'.$rule} =~ /^\d+$/) &&
-                 ($env{'form.passwords_'.$rule} ne '0')) {
-            $ruleok = 1;
-        }
-        if ($ruleok) {
-            $newvalues{$rule} = $env{'form.passwords_'.$rule};
-            if (exists($current{$rule})) {
-                if ($newvalues{$rule} ne $current{$rule}) {
-                    $changes{'rules'} = 1;
-                }
-            } elsif ($rule eq 'min') {
-                if ($staticdefaults{$rule} ne $newvalues{$rule}) {
-                    $changes{'rules'} = 1;
-                }
-            } else {
-                $changes{'rules'} = 1;
-            }
-        } elsif (exists($current{$rule})) {
-            $changes{'rules'} = 1;
-        }
-    }
-    my @posschars = &Apache::loncommon::get_env_multiple('form.passwords_chars');
-    my @chars;
-    foreach my $item (sort(@posschars)) {
-        if ($item =~ /^(uc|lc|num|spec)$/) {
-            push(@chars,$item);
-        }
-    }
-    $newvalues{'chars'} = \@chars;
-    unless ($changes{'rules'}) {
-        if (ref($current{'chars'}) eq 'ARRAY') {
-            my @diffs = &Apache::loncommon::compare_arrays($current{'chars'},\@chars);
-            if (@diffs > 0) {
-                $changes{'rules'} = 1;
-            }
-        } else {
-            if (@chars > 0) {
-                $changes{'rules'} = 1;
-            }
-        }
-    }
+    &password_rule_changes('passwords',\%newvalues,\%current,\%changes);
     my %crsownerchg = (
                         by => [],
                         for => [],
@@ -17126,7 +17774,7 @@ sub modify_passwords {
                                                    );
                                 my $needed = '<ul><li>'.
                                              join('</li><li>',map {$rulenames{$_} } @{$confighash{'passwords'}{'chars'}}).
-                                             '</li></ul>'; 
+                                             '</li></ul>';
                                 $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{'chars'},$needed).'</li>';
                             } else {
                                 $resulttext .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>';
@@ -17191,6 +17839,76 @@ sub modify_passwords {
     return $resulttext;
 }
 
+sub password_rule_changes {
+    my ($prefix,$newvalues,$current,$changes) = @_;
+    return unless ((ref($newvalues) eq 'HASH') &&
+                   (ref($current) eq 'HASH') &&
+                   (ref($changes) eq 'HASH'));
+    my (@rules,%staticdefaults);
+    if ($prefix eq 'passwords') {
+        @rules = ('min','max','expire','numsaved');
+    } elsif (($prefix eq 'ltisecrets') || ($prefix eq 'toolsecrets')) {
+        @rules = ('min','max');
+    }
+    $staticdefaults{'min'} = $Apache::lonnet::passwdmin;
+    foreach my $rule (@rules) {
+        $env{'form.'.$prefix.'_'.$rule} =~ s/^\s+|\s+$//g;
+        my $ruleok;
+        if ($rule eq 'expire') {
+            if (($env{'form.'.$prefix.'_'.$rule} =~ /^\d+(|\.\d*)$/) &&
+                ($env{'form.'.$prefix.'_'.$rule} ne '0')) {
+                $ruleok = 1;
+            }
+        } elsif ($rule eq 'min') {
+            if ($env{'form.'.$prefix.'_'.$rule} =~ /^\d+$/) {
+                if ($env{'form.'.$prefix.'_'.$rule} >= $staticdefaults{$rule}) {
+                    $ruleok = 1;
+                }
+            }
+        } elsif (($env{'form.'.$prefix.'_'.$rule} =~ /^\d+$/) &&
+                 ($env{'form.'.$prefix.'_'.$rule} ne '0')) {
+            $ruleok = 1;
+        }
+        if ($ruleok) {
+            $newvalues->{$rule} = $env{'form.'.$prefix.'_'.$rule};
+            if (exists($current->{$rule})) {
+                if ($newvalues->{$rule} ne $current->{$rule}) {
+                    $changes->{'rules'} = 1;
+                }
+            } elsif ($rule eq 'min') {
+                if ($staticdefaults{$rule} ne $newvalues->{$rule}) {
+                    $changes->{'rules'} = 1;
+                }
+            } else {
+                $changes->{'rules'} = 1;
+            }
+        } elsif (exists($current->{$rule})) {
+            $changes->{'rules'} = 1;
+        }
+    }
+    my @posschars = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_chars');
+    my @chars;
+    foreach my $item (sort(@posschars)) {
+        if ($item =~ /^(uc|lc|num|spec)$/) {
+            push(@chars,$item);
+        }
+    }
+    $newvalues->{'chars'} = \@chars;
+    unless ($changes->{'rules'}) {
+        if (ref($current->{'chars'}) eq 'ARRAY') {
+            my @diffs = &Apache::loncommon::compare_arrays($current->{'chars'},\@chars);
+            if (@diffs > 0) {
+                $changes->{'rules'} = 1;
+            }
+        } else {
+            if (@chars > 0) {
+                $changes->{'rules'} = 1;
+            }
+        }
+    }
+    return;
+}
+
 sub modify_usercreation {
     my ($dom,%domconfig) = @_;
     my ($resulttext,%curr_usercreation,%changes,%authallowed,%cancreate,%save_usercreate);
@@ -17539,7 +18257,7 @@ sub modify_selfcreation {
                             if (($chosen eq 'inst') || ($chosen eq 'noninst')) {
                                 my $emaildom;
                                 if ($env{'form.cancreate_emaildomain_'.$chosen.'_'.$type} =~ /^\@[^\@]+$/) {
-                                    $emaildom = $env{'form.cancreate_emaildomain_'.$chosen.'_'.$type}; 
+                                    $emaildom = $env{'form.cancreate_emaildomain_'.$chosen.'_'.$type};
                                     $cancreate{'emaildomain'}{$type}{$chosen} = $emaildom;
                                     if (ref($curremaildom{$type}) eq 'HASH') {
                                         if (exists($curremaildom{$type}{$chosen})) {
@@ -17551,7 +18269,7 @@ sub modify_selfcreation {
                                         }
                                     } elsif ($emaildom ne '') {
                                         push(@{$changes{'cancreate'}},'emaildomain');
-                                    } 
+                                    }
                                 }
                                 $cancreate{'emailoptions'}{$type} = $env{'form.cancreate_emailoptions_'.$type};
                             } elsif ($chosen eq 'custom') {
@@ -17978,7 +18696,7 @@ sub modify_selfcreation {
                                                                   );
                         if (@types) {
                             if (@statuses) {
-                                $chgtext .= &mt('Processing of requests to create account with e-mail verification set as follows:'). 
+                                $chgtext .= &mt('Processing of requests to create account with e-mail verification set as follows:').
                                             '<ul>';
                                 foreach my $status (@statuses) {
                                     if ($status eq 'default') {
@@ -18064,7 +18782,7 @@ sub modify_selfcreation {
                                                 $output = '<li>'.$usertypes{$type}.' -- '.&mt('No restriction on e-mail domain').'</li>';
                                             } else {
                                                 $output = '<li>'.$usertypes{$type}.' -- '.&mt("User's e-mail address needs to end: [_1]",
-                                                                                              $cancreate{'emaildomain'}{$type}{'inst'}).'</li>'; 
+                                                                                              $cancreate{'emaildomain'}{$type}{'inst'}).'</li>';
                                             }
                                         }
                                     } elsif ($cancreate{'emailoptions'}{$type} eq 'noninst') {
@@ -18082,7 +18800,7 @@ sub modify_selfcreation {
                                                 $output = '<li>'.$usertypes{$type}.' -- '.&mt('No restriction on e-mail domain').'</li>';
                                             } else {
                                                 $output = '<li>'.$usertypes{$type}.' -- '.&mt("User's e-mail address must not end: [_1]",
-                                                                                                $cancreate{'emaildomain'}{$type}{'noninst'}).'</li>';   
+                                                                                                $cancreate{'emaildomain'}{$type}{'noninst'}).'</li>';
                                             }
                                         }
                                     }
@@ -18186,7 +18904,7 @@ sub modify_selfcreation {
                                 $typename = $othertitle;
                             } else {
                                 $typename = $usertypes{$type};
-                            } 
+                            }
                             $chgtext .= &mt('(Affiliation: [_1])',$typename);
                         }
                         if (@{$email_rule{$type}} > 0) {
@@ -18504,16 +19222,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 = (
@@ -18528,6 +19288,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,
                         );
@@ -18639,9 +19434,29 @@ sub modify_defaults {
                             $resulttext =~ s/, $//;
                             $resulttext .= '</li>';
                         } else {
-                            $resulttext .= '<li>'.&mt('Institutional user status types deleted').'</li>'; 
+                            $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 '') {
@@ -18658,7 +19473,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>';
@@ -18713,12 +19541,15 @@ sub modify_scantron {
                 $error = &mt("Upload of bubblesheet format file is not permitted to this server: [_1]",$switchserver);
             } else {
                 if ($author_ok eq 'ok') {
+                    my $modified = [];
                     my ($result,$scantronurl) =
-                        &publishlogo($r,'upload','scantronformat',$dom,
-                                     $confname,'scantron','','',$custom);
+                        &Apache::lonconfigsettings::publishlogo($r,'upload','scantronformat',$dom,
+                                                                $confname,'scantron','','',$custom,
+                                                                $modified);
                     if ($result eq 'ok') {
                         $confhash{'scantron'}{'scantronformat'} = $scantronurl;
                         $changes{'scantronformat'} = 1;
+                        &update_modify_urls($r,$modified);
                     } else {
                         $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$custom,$result);
                     }
@@ -19631,9 +20462,11 @@ sub modify_coursedefaults {
     my %defaultchecked = (
                            'canuse_pdfforms' => 'off',
                            'uselcmath'       => 'on',
-                           'usejsme'         => 'on'
+                           'usejsme'         => 'on',
+                           'inline_chem'     => 'on',
+                           'ltiauth'         => 'off',
                          );
-    my @toggles = ('canuse_pdfforms','uselcmath','usejsme');
+    my @toggles = ('canuse_pdfforms','uselcmath','usejsme','inline_chem','ltiauth');
     my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial',
                    'uploadquota_community','uploadquota_textbook','uploadquota_placement',
                    'mysqltables_official','mysqltables_unofficial','mysqltables_community',
@@ -19644,6 +20477,7 @@ sub modify_coursedefaults {
                            uploadquota          => 500,
                            postsubmit           => 60,
                            mysqltables          => 172800,
+                           domexttool           => 1,
                          );
     my %texoptions = (
                         MathJax  => 'MathJax',
@@ -19835,6 +20669,47 @@ sub modify_coursedefaults {
                 $changes{'postsubmit'} = 1;
             }
         }
+        my (%newdomexttool,%newexttool,%olddomexttool,%oldexttool);
+        map { $newdomexttool{$_} = 1; } &Apache::loncommon::get_env_multiple('form.domexttool');
+        map { $newexttool{$_} = 1; } &Apache::loncommon::get_env_multiple('form.exttool');
+        if (ref($domconfig{'coursedefaults'}{'domexttool'}) eq 'HASH') {
+            %olddomexttool = %{$domconfig{'coursedefaults'}{'domexttool'}};
+        } else {
+           foreach my $type (@types) {
+               if ($staticdefaults{'domexttool'}) {
+                   $olddomexttool{$type} = 1;
+               } else {
+                   $olddomexttool{$type} = 0;
+               }
+            }
+        }
+        if (ref($domconfig{'coursedefaults'}{'exttool'}) eq 'HASH') {
+            %oldexttool = %{$domconfig{'coursedefaults'}{'exttool'}};
+        } else {
+            foreach my $type (@types) {
+               if ($staticdefaults{'exttool'}) {
+                   $oldexttool{$type} = 1;
+               } else {
+                   $oldexttool{$type} = 0;
+               }
+            }
+        }
+        foreach my $type (@types) {
+            unless ($newdomexttool{$type}) {
+                $newdomexttool{$type} = 0;
+            }
+            unless ($newexttool{$type}) {
+                $newexttool{$type} = 0;
+            }
+            if ($newdomexttool{$type} != $olddomexttool{$type}) {
+                $changes{'domexttool'} = 1;
+            }
+            if ($newexttool{$type} != $oldexttool{$type}) {
+                $changes{'exttool'} = 1;
+            }
+        }
+        $defaultshash{'coursedefaults'}{'domexttool'} = \%newdomexttool;
+        $defaultshash{'coursedefaults'}{'exttool'} = \%newexttool;
     }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
                                              $dom);
@@ -19843,8 +20718,11 @@ sub modify_coursedefaults {
             my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
             if (($changes{'canuse_pdfforms'}) || ($changes{'uploadquota'}) || ($changes{'postsubmit'}) ||
                 ($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) ||
-                ($changes{'canclone'}) || ($changes{'mysqltables'}) || ($changes{'texengine'})) {
-                foreach my $item ('canuse_pdfforms','uselcmath','usejsme','texengine') {
+                ($changes{'canclone'}) || ($changes{'mysqltables'}) || ($changes{'texengine'}) ||
+                ($changes{'inline_chem'}) || ($changes{'ltiauth'}) || ($changes{'domexttool'}) ||
+                ($changes{'exttool'}) ) {
+                foreach my $item ('canuse_pdfforms','uselcmath','usejsme','inline_chem','texengine',
+                                  'ltiauth') {
                     if ($changes{$item}) {
                         $domdefaults{$item}=$defaultshash{'coursedefaults'}{$item};
                     }
@@ -19887,6 +20765,20 @@ sub modify_coursedefaults {
                         $domdefaults{'canclone'}=$defaultshash{'coursedefaults'}{'canclone'};
                     }
                 }
+                if ($changes{'domexttool'}) {
+                    if (ref($defaultshash{'coursedefaults'}{'domexttool'}) eq 'HASH') {
+                        foreach my $type (@types) {
+                            $domdefaults{$type.'domexttool'}=$defaultshash{'coursedefaults'}{'domexttool'}{$type};
+                        }
+                    }
+                }
+                if ($changes{'exttool'}) {
+                    if (ref($defaultshash{'coursedefaults'}{'exttool'}) eq 'HASH') {
+                        foreach my $type (@types) {
+                            $domdefaults{$type.'exttool'}=$defaultshash{'coursedefaults'}{'exttool'}{$type};
+                        }
+                    }
+                }
                 my $cachetime = 24*60*60;
                 &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
                 if (ref($lastactref) eq 'HASH') {
@@ -19913,6 +20805,12 @@ sub modify_coursedefaults {
                     } else {
                         $resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</li>';
                     }
+                } elsif ($item eq 'inline_chem') {
+                    if ($env{'form.'.$item} eq '1') {
+                        $resulttext .= '<li>'.&mt('Chemical Reaction Response uses inline previewer').'</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('Chemical Reaction Response uses pop-up previewer').'</li>';
+                    }
                 } elsif ($item eq 'texengine') {
                     if ($defaultshash{'coursedefaults'}{'texengine'} ne '') {
                         $resulttext .= '<li>'.&mt('Default method to display mathematics set to: "[_1]"',
@@ -20012,6 +20910,40 @@ sub modify_coursedefaults {
                     } else {
                         $resulttext .= '<li>'.&mt('By default, only course owner and coordinators may clone a course.').'</li>';
                     }
+                } elsif ($item eq 'ltiauth') {
+                    if ($env{'form.'.$item} eq '1') {
+                        $resulttext .= '<li>'.&mt('LTI launch of deep-linked URL need not require re-authentication').'</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('LTI launch of deep-linked URL will require re-authentication').'</li>';
+                    }
+                } elsif ($item eq 'domexttool') {
+                    my @noyes = (&mt('no'),&mt('yes'));
+                    if (ref($defaultshash{'coursedefaults'}{'domexttool'}) eq 'HASH') {
+                        $resulttext .= '<li>'.&mt('External Tools defined in the domain may be used as follows:').'<ul>'.
+                                       '<li>'.&mt('Official courses: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'domexttool'}{'official'}].'</b>').'</li>'.
+                                       '<li>'.&mt('Unofficial courses: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'domexttool'}{'unofficial'}].'</b>').'</li>'.
+                                       '<li>'.&mt('Textbook courses: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'domexttool'}{'textbook'}].'</b>').'</li>'.
+                                       '<li>'.&mt('Placement tests: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'domexttool'}{'placement'}].'</b>').'</li>'.
+                                       '<li>'.&mt('Communities: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'domexttool'}{'community'}].'</b>').'</li>'.
+                                       '</ul>'.
+                                       '</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('External Tools defined in the domain may be used in all course types, by default').'</li>';
+                    }
+                } elsif ($item eq 'exttool') {
+                    my @noyes = (&mt('no'),&mt('yes'));
+                    if (ref($defaultshash{'coursedefaults'}{'exttool'}) eq 'HASH') {
+                        $resulttext .= '<li>'.&mt('External Tools can be defined and configured in course containers as follows:').'<ul>'.
+                                       '<li>'.&mt('Official courses: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'exttool'}{'official'}].'</b>').'</li>'.
+                                       '<li>'.&mt('Unofficial courses: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'exttool'}{'unofficial'}].'</b>').'</li>'.
+                                       '<li>'.&mt('Textbook courses: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'exttool'}{'textbook'}].'</b>').'</li>'.
+                                       '<li>'.&mt('Placement tests: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'exttool'}{'placement'}].'</b>').'</li>'.
+                                       '<li>'.&mt('Communities: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'exttool'}{'community'}].'</b>').'</li>'.
+                                       '</ul>'.
+                                       '</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('External Tools can not be defined in any course types, by default').'</li>';
+                    }
                 }
             }
             $resulttext .= '</ul>';
@@ -20373,18 +21305,17 @@ sub modify_wafproxy {
                         $possible =~ s/[\r\n]+/\s/g;
                         $possible =~ s/\s*-\s*/-/g;
                         $possible =~ s/\s+/,/g;
+                        $possible =~ s/,+/,/g;
                     }
                     $count = 0;
                     if ($possible ne '') {
                         foreach my $poss (split(/\,/,$possible)) {
                             $count ++;
-                            if (&validate_ip_pattern($poss)) {
+                            $poss = &validate_ip_pattern($poss);
+                            if ($poss ne '') {
                                 push(@ok,$poss);
                             }
                         }
-                        if (@ok) {
-                            $wafproxy{$item} = join(',',@ok);
-                        }
                         my $diff = $count - scalar(@ok);
                         if ($diff) {
                             push(@warnings,'<li>'.
@@ -20392,6 +21323,13 @@ sub modify_wafproxy {
                                      $diff,$warn{$item}).
                                  '</li>');
                         }
+                        if (@ok) {
+                            my @cidr_list;
+                            foreach my $item (@ok) {
+                                @cidr_list = &Net::CIDR::cidradd($item,@cidr_list);
+                            }
+                            $wafproxy{$item} = join(',',@cidr_list);
+                        }
                     }
                 }
                 if ($wafproxy{$item} ne $currvalue{$item}) {
@@ -20399,7 +21337,7 @@ sub modify_wafproxy {
                 }
             } elsif ($currvalue{$item}) {
                 $changes{$item} = 1;
-            } 
+            }
         }
     } else {
         if (keys(%curralias)) {
@@ -20407,7 +21345,7 @@ sub modify_wafproxy {
         }
         if (keys(%currsaml)) {
             $changes{'saml'} = 1;
-        } 
+        }
         if (keys(%currvalue)) {
             foreach my $key (keys(%currvalue)) {
                 $changes{$key} = 1;
@@ -20417,7 +21355,7 @@ sub modify_wafproxy {
     if (keys(%changes)) {
         my %defaultshash = (
                               wafproxy => \%wafproxy,
-                           ); 
+                           );
         my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
                                                  $dom);
         if ($putresult eq 'ok') {
@@ -20433,7 +21371,7 @@ sub modify_wafproxy {
                         $domdefaults{'waf_'.$item} = $wafproxy{$item};
                     } elsif (exists($domdefaults{'waf_'.$item})) {
                         delete($domdefaults{'waf_'.$item});
-                    } 
+                    }
                 }
             }
             if ($updatedomdefs) {
@@ -20477,7 +21415,7 @@ sub modify_wafproxy {
                 }
             }
             $output = &mt('Changes were made to Web Application Firewall/Reverse Proxy').'<ul>';
-            foreach my $item ('alias','remoteip','ipheader','trusted','vpnint','vpnext','sslopt') {
+            foreach my $item ('alias','saml','remoteip','ipheader','trusted','vpnint','vpnext','sslopt') {
                 if ($changes{$item}) {
                     if ($item eq 'alias') {
                         my $numaliased = 0;
@@ -20500,17 +21438,17 @@ sub modify_wafproxy {
                             $output .= '<li>'.&mt('Aliases deleted for hostnames').'</li>';
                         }
                     } elsif ($item eq 'saml') {
-                        my $shown; 
+                        my $shown;
                         if (ref($wafproxy{'saml'}) eq 'HASH') {
                             if (keys(%{$wafproxy{'saml'}})) {
                                 $shown = join(', ',sort(keys(%{$wafproxy{'saml'}})));
                             }
                         }
                         if ($shown) {
-                            $output .= '<li>'.&mt('Alias used by Shibboleth for: [_1]',
+                            $output .= '<li>'.&mt('Alias used by SSO Auth for: [_1]',
                                                   $shown).'</li>';
                         } else {
-                            $output .= '<li>'.&mt('No alias used for Shibboleth').'</li>';
+                            $output .= '<li>'.&mt('No alias used for SSO Auth').'</li>';
                         }
                     } else {
                         if ($item eq 'remoteip') {
@@ -20564,6 +21502,7 @@ sub modify_wafproxy {
                     }
                 }
             }
+            $output .= '</ul>';
         } else {
             $output = '<span class="LC_error">'.
                       &mt('An error occurred: [_1]',$putresult).'</span>';
@@ -20583,12 +21522,17 @@ sub validate_ip_pattern {
     if ($pattern =~ /^([^-]+)\-([^-]+)$/) {
         my ($start,$end) = ($1,$2);
         if ((&Net::CIDR::cidrvalidate($start)) && (&Net::CIDR::cidrvalidate($end))) {
-            return 1;
+            if (($start !~ m{/}) && ($end !~ m{/})) {
+                return $start.'-'.$end;
+            }
+        }
+    } elsif ($pattern ne '') {
+        $pattern = &Net::CIDR::cidrvalidate($pattern);
+        if ($pattern ne '') {
+            return $pattern;
         }
-    } elsif (&Net::CIDR::cidrvalidate($pattern)) {
-        return 1;
     }
-    return
+    return;
 }
 
 sub modify_usersessions {
@@ -20824,7 +21768,7 @@ sub modify_usersessions {
                 if (($offload eq 'offloadoth') && (@okoffloadoth)) {
                     $changes{'offloadoth'} = 1;
                 }
-            } 
+            }
         }
     } else {
         if (@okoffload) {
@@ -21241,8 +22185,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();
@@ -21360,7 +22306,7 @@ sub modify_loadbalancing {
         }
         if ($env{'form.loadbalancing_cookie_'.$i}) {
             $defaultshash{'loadbalancing'}{$balancer}{'cookie'} = 1;
-            if (exists($currbalancer{$balancer})) { 
+            if (exists($currbalancer{$balancer})) {
                 unless ($currcookies{$balancer}) {
                     $changes{'curr'}{$balancer}{'cookie'} = 1;
                 }
@@ -22046,7 +22992,6 @@ function balancerChange(balnum,baltotal,
 END
 }
 
-
 sub new_spares_js {
     my @sparestypes = ('primary','default');
     my $types = join("','",@sparestypes);
@@ -22310,7 +23255,8 @@ sub devalidate_remote_domconfs {
     my %thismachine;
     map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
     my @posscached = ('domainconfig','domdefaults','ltitools','usersessions',
-                      'directorysrch','passwdconf','cats','proxyalias','proxysaml');
+                      'directorysrch','passwdconf','cats','proxyalias','proxysaml',
+                      'ipaccess','trust');
     my %cache_by_lonhost;
     if (exists($cachekeys->{'samllanding'})) {
         if (ref($cachekeys->{'samllanding'}) eq 'HASH') {