--- loncom/interface/domainprefs.pm	2022/02/21 05:31:41	1.160.6.118.2.5
+++ loncom/interface/domainprefs.pm	2021/01/05 04:23:45	1.376
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.118.2.5 2022/02/21 05:31:41 raeburn Exp $
+# $Id: domainprefs.pm,v 1.376 2021/01/05 04:23:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,7 +27,7 @@
 #
 #
 ###############################################################
-##############################################################
+###############################################################
 
 =pod
 
@@ -104,8 +104,8 @@ $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, and textbook).  In each case the radio buttons 
-allow the selection of one of four values:
+(official, unofficial, community, textbook, placement, and lti).  
+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:
@@ -170,10 +170,12 @@ use Apache::loncoursequeueadmin();
 use LONCAPA qw(:DEFAULT :match);
 use LONCAPA::Enrollment;
 use LONCAPA::lonauthcgi();
+use LONCAPA::SSL;
 use File::Copy;
 use Locale::Language;
 use DateTime::TimeZone;
 use DateTime::Locale;
+use Time::HiRes qw( sleep );
 use Net::CIDR;
 
 my $registered_cleanup;
@@ -218,13 +220,15 @@ sub handler {
                 'serverstatuses','requestcourses','helpsettings',
                 'coursedefaults','usersessions','loadbalancing',
                 'requestauthor','selfenrollment','inststatus',
-                'passwords','ltitools','ltisec','wafproxy','ipaccess'],$dom);
+                'ltitools','ssl','trust','lti','privacy','passwords',
+                'proctoring','wafproxy'],$dom);
+    my %encconfig =
+        &Apache::lonnet::get_dom('encconfig',['ltitools','lti','proctoring'],$dom);
     if (ref($domconfig{'ltitools'}) eq 'HASH') {
-        my %encconfig =
-            &Apache::lonnet::get_dom('encconfig',['ltitools','linkprot'],$dom,undef,1);
         if (ref($encconfig{'ltitools'}) eq 'HASH') {
             foreach my $id (keys(%{$domconfig{'ltitools'}})) {
-                if (ref($domconfig{'ltitools'}{$id}) eq 'HASH') {
+                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};
                     }
@@ -232,29 +236,37 @@ sub handler {
             }
         }
     }
-    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{'lti'}) eq 'HASH') {
+        if (ref($encconfig{'lti'}) eq 'HASH') {
+            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};
                     }
-                    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};
-                        }
+                }
+            }
+        }
+    }
+    if (ref($domconfig{'proctoring'}) eq 'HASH') {
+        if (ref($encconfig{'proctoring'}) eq 'HASH') {
+            foreach my $provider (keys(%{$domconfig{'proctoring'}})) {
+                if ((ref($domconfig{'proctoring'}{$provider}) eq 'HASH') &&
+                    (ref($encconfig{'proctoring'}{$provider}) eq 'HASH')) {
+                    foreach my $item ('key','secret') {
+                        $domconfig{'proctoring'}{$provider}{$item} = $encconfig{'proctoring'}{$provider}{$item};
                     }
                 }
             }
         }
     }
-    my @prefs_order = ('rolecolors','login','ipaccess','defaults','wafproxy','passwords',
-                       'quotas','autoenroll','autoupdate','autocreate','directorysrch',
-                       'contacts','usercreation','selfcreation','usermodification',
-                       'scantron','requestcourses','requestauthor','coursecategories',
-                       'serverstatuses','helpsettings','coursedefaults',
-                       'ltitools','selfenrollment','usersessions','lti');
+    my @prefs_order = ('rolecolors','login','defaults','wafproxy','passwords','quotas',
+                       'autoenroll','autoupdate','autocreate','directorysrch',
+                       'contacts','privacy','usercreation','selfcreation',
+                       'usermodification','scantron','requestcourses','requestauthor',
+                       'coursecategories','serverstatuses','helpsettings','coursedefaults',
+                       'ltitools','proctoring','selfenrollment','usersessions','ssl',
+                       'trust','lti');
     my %existing;
     if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
         %existing = %{$domconfig{'loadbalancing'}};
@@ -285,10 +297,7 @@ sub handler {
                                  {col1 => 'Log-in Help',
                                   col2 => 'Value'},
                                  {col1 => 'Custom HTML in document head',
-                                  col2 => 'Value'},
-                                 {col1 => 'SSO',
-                                  col2 => 'Dual login: SSO and non-SSO options'},
-                                ],
+                                  col2 => 'Value'}],
                       print => \&print_login,
                       modify => \&modify_login,
                     },
@@ -302,16 +311,16 @@ sub handler {
                       print => \&print_defaults,
                       modify => \&modify_defaults,
                     },
-        'wafproxy' =>
-                    { text => 'Web Application Firewall/Reverse Proxy',
+        'wafproxy' =>  
+                    { text => 'Web Application Firewall/Reverse Proxy',  
                       help => 'Domain_Configuration_WAF_Proxy',
-                      header => [{col1 => 'Domain(s)',
-                                  col2 => 'Servers and WAF/Reverse Proxy alias(es)',
+                      header => [{col1 => 'Domain server',
+                                  col2 => 'Alias for WAF/Reverse Proxy',
                                  },
-                                 {col1 => 'Domain(s)',
-                                  col2 => 'WAF Configuration',}],
+                                 {col1 => 'Setting',
+                                  col2 => 'Value',}],
                       print => \&print_wafproxy,
-                      modify => \&modify_wafproxy,
+                      modify => \&modify_wafproxy, 
                     },
         'passwords' =>
                     { text => 'Passwords (Internal authentication)',
@@ -513,6 +522,20 @@ sub handler {
                   print => \&print_selfenrollment,
                   modify => \&modify_selfenrollment,
                  },
+        'privacy' => 
+                 {text   => 'Availability of User Information',
+                  help   => 'Domain_Configuration_User_Privacy',
+                  header => [{col1 => 'Role assigned in different domain',
+                              col2 => 'Approval options'},
+                             {col1 => 'Role assigned in different domain to user of type',
+                              col2 => 'User information available in that domain'},
+                             {col1 => "Role assigned in user's domain",
+                              col2 => 'Information viewable by privileged user'},
+                             {col1 => "Role assigned in user's domain",
+                              col2 => 'Information viewable by unprivileged user'}],
+                  print => \&print_privacy,
+                  modify => \&modify_privacy,
+                 },
         'usersessions' =>
                  {text  => 'User session hosting/offloading',
                   help  => 'Domain_Configuration_User_Sessions',
@@ -536,7 +559,7 @@ sub handler {
                   print => \&print_loadbalancing,
                   modify => \&modify_loadbalancing,
                  },
-        'ltitools' =>
+        'ltitools' => 
                  {text => 'External Tools (LTI)',
                   help => 'Domain_Configuration_LTI_Tools',
                   header => [{col1 => 'Setting',
@@ -544,26 +567,60 @@ sub handler {
                   print => \&print_ltitools,
                   modify => \&modify_ltitools,
                  },
+        'proctoring' =>
+                 {text => 'Remote Proctoring Integration',
+                  help => 'Domain_Configuration_Proctoring',
+                  header => [{col1 => 'Name',
+                              col2 => 'Configuration'}],
+                  print => \&print_proctoring,
+                  modify => \&modify_proctoring,
+                 },
+        'ssl' =>
+                 {text  => 'LON-CAPA Network (SSL)',
+                  help  => 'Domain_Configuration_Network_SSL',
+                  header => [{col1 => 'Server',
+                              col2 => 'Certificate Status'},
+                             {col1 => 'Connections to other servers',
+                              col2 => 'Rules'},
+                             {col1 => 'Connections from other servers',
+                              col2 => 'Rules'},
+                             {col1 => "Replicating domain's published content",
+                              col2 => 'Rules'}],
+                  print => \&print_ssl,
+                  modify => \&modify_ssl,
+                 },
+        'trust' =>
+                 {text   => 'Trust Settings',
+                  help   => 'Domain_Configuration_Trust',
+                  header => [{col1 => "Access to this domain's content by others",
+                              col2 => 'Rules'},
+                             {col1 => "Access to other domain's content by this domain",
+                              col2 => 'Rules'},
+                             {col1 => "Enrollment in this domain's courses by others",
+                              col2 => 'Rules',},
+                             {col1 => "Co-author roles in this domain for others",
+                              col2 => 'Rules',},
+                             {col1 => "Co-author roles for this domain's users elsewhere",
+                              col2 => 'Rules',},
+                             {col1 => "Domain roles in this domain assignable to others",
+                              col2 => 'Rules'},
+                             {col1 => "Course catalog for this domain displayed elsewhere",
+                              col2 => 'Rules'},
+                             {col1 => "Requests for creation of courses in this domain by others",
+                              col2 => 'Rules'},
+                             {col1 => "Users in other domains can send messages to this domain",
+                              col2 => 'Rules'},],
+                  print => \&print_trust,
+                  modify => \&modify_trust,
+                 },
           'lti' =>
-                 {text => 'LTI Link Protection and LTI Consumers',
+                 {text => 'LTI Provider',
                   help => 'Domain_Configuration_LTI_Provider',
-                  header => [{col1 => 'Encryption of shared secrets',
-                              col2 => 'Settings'},
-                             {col1 => 'Rules for shared secrets',
-                              col2 => 'Settings'},
-                             {col1 => 'Link Protectors',
-                              col2 => 'Settings'},],
+                  header => [{col1 => 'Setting',
+                              col2 => 'Value',}],
                   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',
@@ -571,14 +628,11 @@ sub handler {
                             header => [{col1 => 'Log-in Service',
                                         col2 => 'Server Setting',},
                                        {col1 => 'Log-in Page Items',
-                                        col2 => 'Settings'},
+                                        col2 => ''},
                                        {col1 => 'Log-in Help',
                                         col2 => 'Value'},
                                        {col1 => 'Custom HTML in document head',
-                                        col2 => 'Value'},
-                                       {col1 => 'SSO',
-                                        col2 => 'Dual login: SSO and non-SSO options'},
-                                      ],
+                                        col2 => 'Value'}],
                             print => \&print_login,
                             modify => \&modify_login,
                            };
@@ -619,8 +673,6 @@ $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();
@@ -751,16 +803,22 @@ sub process_changes {
         $output = &modify_usersessions($dom,$lastactref,%domconfig);
     } elsif ($action eq 'loadbalancing') {
         $output = &modify_loadbalancing($dom,%domconfig);
+    } elsif ($action eq 'ltitools') {
+        $output = &modify_ltitools($r,$dom,$action,$lastactref,%domconfig);
+    } elsif ($action eq 'proctoring') {
+        $output = &modify_proctoring($r,$dom,$action,$lastactref,%domconfig);
+    } elsif ($action eq 'ssl') {
+        $output = &modify_ssl($dom,$lastactref,%domconfig);
+    } elsif ($action eq 'trust') {
+        $output = &modify_trust($dom,$lastactref,%domconfig);
     } elsif ($action eq 'lti') {
         $output = &modify_lti($r,$dom,$action,$lastactref,%domconfig);
+    } elsif ($action eq 'privacy') {
+        $output = &modify_privacy($dom,%domconfig);
     } elsif ($action eq 'passwords') {
         $output = &modify_passwords($r,$dom,$confname,$lastactref,%domconfig);
-    } elsif ($action eq 'ltitools') {
-        $output = &modify_ltitools($r,$dom,$action,$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;
 }
@@ -774,7 +832,7 @@ sub print_config_box {
     } elsif ($action eq 'defaults') {
         $output = &defaults_javascript($settings); 
     } elsif ($action eq 'passwords') {
-        $output = &passwords_javascript($action);
+        $output = &passwords_javascript();
     } elsif ($action eq 'helpsettings') {
         my (%privs,%levelscurrent);
         my %full=();
@@ -789,23 +847,14 @@ 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);
     } elsif ($action eq 'lti') {
-        $output .= &passwords_javascript('secrets')."\n".
-                   &lti_javascript($dom,$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 .= &lti_javascript($settings);
+    } elsif ($action eq 'proctoring') {
+        $output .= &proctoring_javascript($settings);
     }
     $output .=
          '<table class="LC_nested_outer">
@@ -822,10 +871,10 @@ sub print_config_box {
     if ($numheaders > 1) {
         my $colspan = '';
         my $rightcolspan = '';
-        my $leftnobr = '';  
+        my $leftnobr = '';
         if (($action eq 'rolecolors') || ($action eq 'defaults') ||
             ($action eq 'directorysrch') ||
-            (($action eq 'login') && ($numheaders < 5))) {
+            (($action eq 'login') && ($numheaders < 4))) {
             $colspan = ' colspan="2"';
         }
         if ($action eq 'usersessions') {
@@ -845,8 +894,9 @@ sub print_config_box {
         $rowtotal ++;
         if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') ||
             ($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') ||
-            ($action eq 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'directorysrch') ||
-            ($action eq 'helpsettings') || ($action eq 'contacts') || ($action eq 'wafproxy') || ($action eq 'lti')) {
+            ($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')) {
             $output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'passwords') {
             $output .= $item->{'print'}->('top',$dom,$confname,$settings,\$rowtotal);
@@ -855,7 +905,7 @@ sub print_config_box {
         } elsif ($action eq 'scantron') {
             $output .= $item->{'print'}->($r,'top',$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
-            if ($numheaders == 5) {
+            if ($numheaders == 4) {
                 $colspan = ' colspan="2"';
                 $output .= &print_login('service',$dom,$confname,$phase,$settings,\$rowtotal);
             } else {
@@ -880,17 +930,49 @@ sub print_config_box {
             $rowtotal ++;
         if (($action eq 'autoupdate') || ($action eq 'usercreation') ||
             ($action eq 'selfcreation') || ($action eq 'selfenrollment') ||
-            ($action eq 'usersessions') || ($action eq 'coursecategories') ||
-            ($action eq 'contacts') || ($action eq 'passwords') || ($action eq 'lti')) {
+            ($action eq 'usersessions') || ($action eq 'coursecategories') || 
+            ($action eq 'trust') || ($action eq 'contacts') ||
+            ($action eq 'privacy') || ($action eq 'passwords')) {
             if ($action eq 'coursecategories') {
                 $output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal);
                 $colspan = ' colspan="2"';
+            } elsif ($action eq 'trust') {
+                $output .= $item->{'print'}->('shared',$dom,$settings,\$rowtotal);
             } elsif ($action eq 'passwords') {
                 $output .= $item->{'print'}->('middle',$dom,$confname,$settings,\$rowtotal);
             } else {
                 $output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal);
             }
-            $output .= '
+            if ($action eq 'trust') {
+                $output .= '
+            </table>
+          </td>
+         </tr>';
+                my @trusthdrs = qw(2 3 4 5 6 7);
+                my @prefixes = qw(enroll othcoau coaurem domroles catalog reqcrs);
+                for (my $i=0; $i<@trusthdrs; $i++) {
+                    $output .= '
+         <tr>
+           <td>
+            <table class="LC_nested">
+             <tr class="LC_info_row">
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[$trusthdrs[$i]]->{'col1'}).'</td>
+              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[$trusthdrs[$i]]->{'col2'}).'</td></tr>'.
+                           $item->{'print'}->($prefixes[$i],$dom,$settings,\$rowtotal).'
+            </table>
+          </td>
+         </tr>';
+                }
+                $output .= '
+         <tr>
+           <td>
+            <table class="LC_nested">
+             <tr class="LC_info_row">
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[8]->{'col1'}).'</td>
+              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[8]->{'col2'}).'</td></tr>'.
+                           $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
+            } else {
+                $output .= '
            </table>
           </td>
          </tr>
@@ -901,15 +983,15 @@ sub print_config_box {
               <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
               <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>
              </tr>'."\n";
-            if ($action eq 'coursecategories') {
-                $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
-            } elsif (($action eq 'contacts') || ($action eq 'passwords')) {
-                if ($action eq 'passwords') {
-                    $output .= $item->{'print'}->('lower',$dom,$confname,$settings,\$rowtotal);
-                } else {
-                    $output .= $item->{'print'}->('lower',$dom,$settings,\$rowtotal);
-                }
-                $output .= '
+                if ($action eq 'coursecategories') {
+                    $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
+                } elsif (($action eq 'contacts') || ($action eq 'privacy') || ($action eq 'passwords')) {
+                    if ($action eq 'passwords') {
+                        $output .= $item->{'print'}->('lower',$dom,$confname,$settings,\$rowtotal);
+                    } else {
+                        $output .= $item->{'print'}->('lower',$dom,$settings,\$rowtotal);
+                    }
+                    $output .= '
              </tr>
             </table>
            </td>
@@ -920,18 +1002,19 @@ sub print_config_box {
              <tr class="LC_info_row">
               <td class="LC_left_item'.$leftnobr.'"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
               <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'."\n";
-                if ($action eq 'passwords') {
-                    $output .= $item->{'print'}->('bottom',$dom,$confname,$settings,\$rowtotal);
-                } else {
-                    $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
-                }
-                $output .= '
+                    if ($action eq 'passwords') {
+                        $output .= $item->{'print'}->('bottom',$dom,$confname,$settings,\$rowtotal);
+                    } else {
+                        $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
+                    }
+                    $output .= '
             </table>
           </td>
          </tr>
          <tr>';
-            } else {
-                $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
+                } else {
+                    $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
+                }
             }
             $rowtotal ++;
         } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') ||
@@ -940,8 +1023,30 @@ sub print_config_box {
             $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'scantron') {
             $output .= $item->{'print'}->($r,'bottom',$dom,$confname,$settings,\$rowtotal);
+        } elsif ($action eq 'ssl') {
+            $output .= $item->{'print'}->('connto',$dom,$settings,\$rowtotal).'
+            </table>
+          </td>
+         </tr>
+         <tr>
+           <td>
+            <table class="LC_nested">
+             <tr class="LC_info_row">
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
+              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col2'}).'</td></tr>'.
+                           $item->{'print'}->('connfrom',$dom,$settings,\$rowtotal).'
+            </table>
+          </td>
+         </tr>
+         <tr>
+           <td>
+            <table class="LC_nested">
+             <tr class="LC_info_row">
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
+              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'.
+                           $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
-            if ($numheaders == 5) {
+            if ($numheaders == 4) {
                 $output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).'
            </table>
           </td>
@@ -965,7 +1070,7 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">';
-            if ($numheaders == 5) {
+            if ($numheaders == 4) {
                 $output .= '
               <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
               <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td>
@@ -977,27 +1082,7 @@ sub print_config_box {
              </tr>';
             }
             $rowtotal ++;
-            $output .= &print_login('headtag',$dom,$confname,$phase,$settings,\$rowtotal).'
-           </table>
-          </td>
-         </tr>
-         <tr>
-           <td>
-            <table class="LC_nested">
-             <tr class="LC_info_row">';
-            if ($numheaders == 5) {
-                $output .= '
-              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[4]->{'col1'}).'</td>
-              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[4]->{'col2'}).'</td>
-             </tr>';
-            } else {
-                $output .= '
-              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
-              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td>
-             </tr>';
-            }
-            $rowtotal ++;
-            $output .= &print_login('saml',$dom,$confname,$phase,$settings,\$rowtotal);
+            $output .= &print_login('headtag',$dom,$confname,$phase,$settings,\$rowtotal);
         } elsif ($action eq 'requestcourses') {
             $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
             $rowtotal ++;
@@ -1030,8 +1115,8 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.' valign="top">'.&mt($item->{'header'}->[4]->{'col1'}).'</td>
-              <td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[4]->{'col2'}).'</td>
+              <td class="LC_left_item"'.$colspan.' style="vertical-align: top">'.&mt($item->{'header'}->[4]->{'col1'}).'</td>
+              <td class="LC_right_item" style="vertical-align: top">'.&mt($item->{'header'}->[4]->{'col2'}).'</td>
              </tr>'.
             &print_validation_rows('requestcourses',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'requestauthor') {
@@ -1046,9 +1131,9 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.' valign="top">'.
+              <td class="LC_left_item"'.$colspan.' style="vertical-align: top">'.
                &mt($item->{'header'}->[2]->{'col1'}).'</td>
-              <td class="LC_right_item" valign="top">'.
+              <td class="LC_right_item" style="vertical-align: top">'.
                &mt($item->{'header'}->[2]->{'col2'}).'</td>
              </tr>'.
             &print_rolecolors($phase,'author',$dom,$confname,$settings,\$rowtotal).'
@@ -1076,30 +1161,30 @@ sub print_config_box {
               <td class="LC_left_item" colspan="2">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
         } elsif ($action eq 'serverstatuses') {
             $output .= '
-              <td class="LC_left_item" valign="top">'.&mt($item->{'header'}->[0]->{'col1'}).
+              <td class="LC_left_item" style="vertical-align: top">'.&mt($item->{'header'}->[0]->{'col1'}).
               '<br />('.&mt('Automatic access for Dom. Coords.').')</td>';
 
         } else {
             $output .= '
-              <td class="LC_left_item" valign="top">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
+              <td class="LC_left_item" style="vertical-align: top">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
         }
         if (defined($item->{'header'}->[0]->{'col3'})) {
-            $output .= '<td class="LC_left_item" valign="top">'.
+            $output .= '<td class="LC_left_item" style="vertical-align: top">'.
                        &mt($item->{'header'}->[0]->{'col2'});
             if ($action eq 'serverstatuses') {
                 $output .= '<br />(<tt>'.&mt('user1:domain1,user2:domain2 etc.').'</tt>)';
             } 
         } else {
-            $output .= '<td class="LC_right_item" valign="top">'.
+            $output .= '<td class="LC_right_item" style="vertical-align: top">'.
                        &mt($item->{'header'}->[0]->{'col2'});
         }
         $output .= '</td>';
         if ($item->{'header'}->[0]->{'col3'}) {
             if (defined($item->{'header'}->[0]->{'col4'})) {
-                $output .= '<td class="LC_left_item" valign="top">'.
+                $output .= '<td class="LC_left_item" style="vertical-align: top">'.
                             &mt($item->{'header'}->[0]->{'col3'});
             } else {
-                $output .= '<td class="LC_right_item" valign="top">'.
+                $output .= '<td class="LC_right_item" style="vertical-align: top">'.
                            &mt($item->{'header'}->[0]->{'col3'});
             }
             if ($action eq 'serverstatuses') {
@@ -1108,7 +1193,7 @@ sub print_config_box {
             $output .= '</td>';
         }
         if ($item->{'header'}->[0]->{'col4'}) {
-            $output .= '<td class="LC_right_item" valign="top">'.
+            $output .= '<td class="LC_right_item" style="vertical-align: top">'.
                        &mt($item->{'header'}->[0]->{'col4'});
         }
         $output .= '</tr>';
@@ -1116,8 +1201,9 @@ sub print_config_box {
         if ($action eq 'quotas') {
             $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 'ipaccess')) {
+                 ($action eq 'serverstatuses') || ($action eq 'loadbalancing') || 
+                 ($action eq 'ltitools') || ($action eq 'lti') ||
+                 ($action eq 'proctoring')) {
             $output .= $item->{'print'}->($dom,$settings,\$rowtotal);
         }
     }
@@ -1131,19 +1217,15 @@ sub print_config_box {
 
 sub print_login {
     my ($caller,$dom,$confname,$phase,$settings,$rowtotal) = @_;
-    my ($css_class,$datatable,$switchserver,%lt);
+    my ($css_class,$datatable);
     my %choices = &login_choices();
-    if (($caller eq 'help') || ($caller eq 'headtag') || ($caller eq 'saml')) {
-        %lt = &login_file_options();
-        $switchserver = &check_switchserver($dom,$confname);
-    }
 
     if ($caller eq 'service') {
         my %servers = &Apache::lonnet::internet_dom_servers($dom);
         my $choice = $choices{'disallowlogin'};
         $css_class = ' class="LC_odd_row"';
         $datatable .= '<tr'.$css_class.'><td>'.$choice.'</td>'.
-                      '<td align="right"><table><tr><th>'.$choices{'hostid'}.'</th>'.
+                      '<td style="text-align: right"><table><tr><th>'.$choices{'hostid'}.'</th>'.
                       '<th>'.$choices{'server'}.'</th>'.
                       '<th>'.$choices{'serverpath'}.'</th>'.
                       '<th>'.$choices{'custompath'}.'</th>'.
@@ -1224,7 +1306,6 @@ 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');
@@ -1266,13 +1347,6 @@ 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};
@@ -1339,10 +1413,18 @@ sub print_login {
         $datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext);
         $datatable .= '</tr></table></td></tr>';
     } elsif ($caller eq 'help') {
-        my ($defaulturl,$defaulttype,%url,%type,%langchoices);
+        my ($defaulturl,$defaulttype,%url,%type,%lt,%langchoices);
+        my $switchserver = &check_switchserver($dom,$confname);
         my $itemcount = 1;
         $defaulturl = '/adm/loginproblems.html';
         $defaulttype = 'default';
+        %lt = &Apache::lonlocal::texthash (
+                     del     => 'Delete?',
+                     rep     => 'Replace:',
+                     upl     => 'Upload:',
+                     default => 'Default',
+                     custom  => 'Custom',
+                                             );
         %langchoices = &Apache::lonlocal::texthash(&get_languages_hash());
         my @currlangs;
         if (ref($settings) eq 'HASH') {
@@ -1424,7 +1506,7 @@ sub print_login {
         my $choice = $choices{'headtag'};
         $css_class = ' class="LC_odd_row"';
         $datatable .= '<tr'.$css_class.'><td colspan="2">'.$choice.'</td>'.
-                      '<td align="left"><table><tr><th>'.$choices{'hostid'}.'</th>'.
+                      '<td style="text-align: left"><table><tr><th>'.$choices{'hostid'}.'</th>'.
                       '<th>'.$choices{'current'}.'</th>'.
                       '<th>'.$choices{'action'}.'</th>'.
                       '<th>'.$choices{'exempt'}.'</th></tr>'."\n";
@@ -1439,6 +1521,14 @@ sub print_login {
                 }
             }
         }
+        my %lt = &Apache::lonlocal::texthash(
+                                               del  => 'Delete?',
+                                               rep  => 'Replace:',
+                                               upl  => 'Upload:',
+                                               curr => 'View contents',
+                                               none => 'None',
+        );
+        my $switchserver = &check_switchserver($dom,$confname);
         foreach my $lonhost (sort(keys(%domservers))) {
             my $exempt = &check_exempt_addresses($currexempt{$lonhost});
             $datatable .= '<tr><td>'.$domservers{$lonhost}.'</td>';
@@ -1462,88 +1552,6 @@ sub print_login {
             $datatable .= '</td><td><input type="text" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>';
         }
         $datatable .= '</table></td></tr>';
-    } elsif ($caller eq 'saml') {
-        my %domservers = &Apache::lonnet::get_servers($dom);
-        $datatable .= '<tr><td colspan="3" style="text-align: left">'.
-                      '<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);
-        foreach my $lonhost (keys(%domservers)) {
-            $samlurl{$lonhost} = '/adm/sso';
-            $styleon{$lonhost} = 'display:none';
-            $styleoff{$lonhost} = '';
-        }
-        if (ref($settings->{'saml'}) eq 'HASH') {
-            foreach my $lonhost (keys(%{$settings->{'saml'}})) {
-                if (ref($settings->{'saml'}{$lonhost}) eq 'HASH') {
-                    $saml{$lonhost} = 1;
-                    $samltext{$lonhost} = $settings->{'saml'}{$lonhost}{'text'};
-                    $samlimg{$lonhost} = $settings->{'saml'}{$lonhost}{'img'};
-                    $samlalt{$lonhost} = $settings->{'saml'}{$lonhost}{'alt'};
-                    $samlurl{$lonhost} = $settings->{'saml'}{$lonhost}{'url'};
-                    $samltitle{$lonhost} = $settings->{'saml'}{$lonhost}{'title'};
-                    $samlnotsso{$lonhost} = $settings->{'saml'}{$lonhost}{'notsso'};
-                    $styleon{$lonhost} = '';
-                    $styleoff{$lonhost} = 'display:none';
-                } else {
-                    $styleon{$lonhost} = 'display:none';
-                    $styleoff{$lonhost} = '';
-                }
-            }
-        }
-        my $itemcount = 1;
-        foreach my $lonhost (sort(keys(%domservers))) {
-            my $samlon = ' ';
-            my $samloff = ' checked="checked" ';
-            if ($saml{$lonhost}) {
-                $samlon = $samloff;
-                $samloff = ' ';
-            }
-            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.
-                          'onclick="toggleSamlOptions(this.form,'."'$lonhost'".');" value="0" />'.
-                          &mt('No').'</label>'.('&nbsp;'x2).
-                          '<label><input type="radio" name="saml_'.$lonhost.'"'.$samlon.
-                          '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>'.
-                          '<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="'.
-                          $samltext{$lonhost}.'" /></td><td>';
-            if ($samlimg{$lonhost}) {
-                $datatable .= '<img src="'.$samlimg{$lonhost}.'" /><br />'.
-                              '<span class="LC_nobreak"><label>'.
-                              '<input type="checkbox" name="saml_img_del" value="'.$lonhost.'" />'.
-                              $lt{'del'}.'</label>&nbsp;'.$lt{'rep'}.'</span>';
-            } else {
-                $datatable .= $lt{'upl'};
-            }
-            $datatable .='<br />';
-            if ($switchserver) {
-                $datatable .= &mt('Upload to library server: [_1]',$switchserver);
-            } else {
-                $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" '.
-                          'value="'.$samlurl{$lonhost}.'" /></td>'.
-                          '<td><textarea name="saml_title_'.$lonhost.'" rows="3" cols="15">'.
-                          $samltitle{$lonhost}.'</textarea></td>'.
-                          '<td><input type="text" name="saml_notsso_'.$lonhost.'" size="8" '.
-                          'value="'.$samlnotsso{$lonhost}.'" /></td></tr>'.
-                          '</table></td>'.
-                          '<td id="samloptionsoff_'.$lonhost.'" style="'.$styleoff{$lonhost}.'" width="100%">&nbsp;</td></tr>';
-           $itemcount ++;
-        }
-        $datatable .= '</table></td></tr>';
     }
     return $datatable;
 }
@@ -1580,205 +1588,10 @@ sub login_choices {
             headtag       => "Custom markup",
             action        => "Action",
             current       => "Current",
-            samllanding   => "Dual login?",
-            samloptions   => "Options",
-            alttext       => "Alt text",
         );
     return %choices;
 }
 
-sub login_file_options {
-      return &Apache::lonlocal::texthash(
-                                           del     => 'Delete?',
-                                           rep     => 'Replace:',
-                                           upl     => 'Upload:',
-                                           curr    => 'View contents',
-                                           default => 'Default',
-                                           custom  => 'Custom',
-                                           none    => 'None',
-      );
-}
-
-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();
@@ -1928,7 +1741,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,$alttext);
+        my ($imgfile,$img_import,$login_hdr_pick,$logincolors);
         if ($role eq 'login') {
             if ($img eq 'login') {
                 $login_hdr_pick =
@@ -1936,13 +1749,8 @@ sub display_color_options {
                 $logincolors =
                     &login_text_colors($img,$role,$logintext,$phase,$choices,
                                        $designs,$defaults);
-            } else {
-                if ($img ne 'domlogo') {
-                    $datatable.= &logo_display_options($img,$defaults,$designs);
-                }
-                if (ref($designs->{'alttext'}) eq 'HASH') {
-                    $alttext = $designs->{'alttext'}{$img};
-                }
+            } elsif ($img ne 'domlogo') {
+                $datatable.= &logo_display_options($img,$defaults,$designs);
             }
         }
         $datatable .= '</td>';
@@ -2034,11 +1842,6 @@ 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 ++;
@@ -2060,7 +1863,7 @@ sub display_color_options {
                   '<table border="0"><tr>';
 
     foreach my $item (@{$bgs}) {
-        $datatable .= '<td align="center">'.$choices->{$item};
+        $datatable .= '<td style="text-align: center">'.$choices->{$item};
 	my $color = $designs->{'bgs'}{$item} ? $designs->{'bgs'}{$item} : $defaults->{'bgs'}{$item};
         if ($designs->{'bgs'}{$item}) {
             $datatable .= '&nbsp;';
@@ -2088,7 +1891,7 @@ sub display_color_options {
                   '<table border="0"><tr>';
     foreach my $item (@{$links}) {
 	my $color = $designs->{'links'}{$item} ? $designs->{'links'}{$item} : $defaults->{'links'}{$item};
-        $datatable .= '<td align="center">'.$choices->{$item}."\n";
+        $datatable .= '<td style="text-align: center">'.$choices->{$item}."\n";
         if ($designs->{'links'}{$item}) {
             $datatable.='&nbsp;';
         }
@@ -2149,7 +1952,7 @@ sub login_text_colors {
     my ($img,$role,$logintext,$phase,$choices,$designs,$defaults) = @_;
     my $color_menu = '<table border="0"><tr>';
     foreach my $item (@{$logintext}) {
-        $color_menu .= '<td align="center">'.$choices->{$item};
+        $color_menu .= '<td style="text-align: center">'.$choices->{$item};
         my $color = $designs->{'logintext'}{$item} ? $designs->{'logintext'}{$item} : $defaults->{'logintext'}{$item};
         $color_menu .= '<br /><input type="text" class="colorchooser" size="8" name="'.$role.'_'.$item.'" value="'.$color.
                       '" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>';
@@ -2182,7 +1985,7 @@ sub image_changes {
                        $role.'_del_'.$img.'" value="1" />'.&mt('Delete?').
                        '</label>&nbsp;'.&mt('Replace:').'</span><br />';
         } else {
-            $output .= '<td valign="middle">'.$logincolors.&mt('Upload:').'<br />';
+            $output .= '<td class="LC_middle">'.$logincolors.&mt('Upload:').'<br />';
         }
     }
     return $output;
@@ -2201,7 +2004,7 @@ sub print_quotas {
     my $typecount = 0;
     my ($css_class,%titles);
     if ($context eq 'requestcourses') {
-        @usertools = ('official','unofficial','community','textbook');
+        @usertools = ('official','unofficial','community','textbook','placement','lti');
         @options =('norequest','approval','validate','autolimit');
         %validations = &Apache::lonnet::auto_courserequest_checks($dom);
         %titles = &courserequest_titles();
@@ -2665,7 +2468,7 @@ sub print_studentcode {
     my ($settings,$rowtotal) = @_;
     my $rownum = 0; 
     my ($output,%current);
-    my @crstypes = ('official','unofficial','community','textbook');
+    my @crstypes = ('official','unofficial','community','textbook','placement','lti');
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{'uniquecode'}) eq 'HASH') {
             foreach my $type (@crstypes) {
@@ -2996,6 +2799,30 @@ sub ltitools_toggle_js {
 function toggleLTITools(form,setting,item) {
     var radioname = '';
     var divid = '';
+    if ((setting == 'passback') || (setting == 'roster')) {
+        radioname = 'ltitools_'+setting+'_'+item;
+        divid = 'ltitools_'+setting+'time_'+item;
+        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 == '1') {
+                        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';
+            }
+        }
+    }
     if (setting == 'user') {
         divid = 'ltitools_'+setting+'_div_'+item;
         var checkid = 'ltitools_'+setting+'_field_'+item;
@@ -3017,389 +2844,129 @@ function toggleLTITools(form,setting,ite
 ENDSCRIPT
 }
 
-sub wafproxy_javascript {
-    my ($dom) = @_;
-    return <<"ENDSCRIPT";
-<script type="text/javascript">
-// <![CDATA[
-function updateWAF() {
-    if (document.getElementById('wafproxy_remoteip')) {
-        var wafremote = 0;
-        if (document.display.wafproxy_remoteip.options[document.display.wafproxy_remoteip.selectedIndex].value == 'h') {
-            wafremote = 1;
-        }
-        var fields = new Array('header','trust');
-        for (var i=0; i<fields.length; i++) {
-            if (document.getElementById('wafproxy_'+fields[i])) {
-                if (wafremote == 1) {
-                    document.getElementById('wafproxy_'+fields[i]).style.display = 'table-row';
-                }
-                else {
-                    document.getElementById('wafproxy_'+fields[i]).style.display = 'none';
-                }
-            }
-        }
-        if (document.getElementById('wafproxyranges_$dom')) {
-            if (wafremote == 1) {
-                document.getElementById('wafproxyranges_$dom').style.display = 'inline-block';
-            } else {
-                for (var i=0; i<document.display.wafproxy_vpnaccess.length; i++) {
-                    if (document.display.wafproxy_vpnaccess[i].checked) {
-                        if (document.display.wafproxy_vpnaccess[i].value == 0) {
-                            document.getElementById('wafproxyranges_$dom').style.display = 'none';
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return;
-}
-
-function checkWAF() {
-    if (document.getElementById('wafproxy_remoteip')) {
-        var wafvpn = 0;
-        for (var i=0; i<document.display.wafproxy_vpnaccess.length; i++) {
-            if (document.display.wafproxy_vpnaccess[i].checked) {
-                if (document.display.wafproxy_vpnaccess[i].value == 1) {
-                    wafvpn = 1;
-                }
-                break;
-            }
-        }
-        var vpn = new Array('vpnint','vpnext');
-        for (var i=0; i<vpn.length; i++) {
-            if (document.getElementById('wafproxy_show_'+vpn[i])) {
-                if (wafvpn == 1) {
-                    document.getElementById('wafproxy_show_'+vpn[i]).style.display = 'table-row';
-                }
-                else {
-                    document.getElementById('wafproxy_show_'+vpn[i]).style.display = 'none';
-                }
-            }
-        }
-        if (document.getElementById('wafproxyranges_$dom')) {
-            if (wafvpn == 1) {
-                document.getElementById('wafproxyranges_$dom').style.display = 'inline-block';
-            }
-            else if (document.display.wafproxy_remoteip.options[document.display.wafproxy_remoteip.selectedIndex].value != 'h') {
-                document.getElementById('wafproxyranges_$dom').style.display = 'none';
+sub proctoring_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}));
+    } else {
+        %ordered = (
+                       0 => 'proctorio',
+                       1 => 'examity',
+                   );
+        $total = 2; 
     }
-    return;
-}
-
-function toggleWAF() {
-    if (document.getElementById('wafproxy_table')) {
-        var wafproxy = 0;
-        for (var i=0; i<document.display.wafproxy_${dom}.length; i++) {
-             if (document.display.wafproxy_${dom}[i].checked) {
-                 if (document.display.wafproxy_${dom}[i].value == 1) {
-                     wafproxy = 1;
-                     break;
-                }
-            }
-        }
-        if (wafproxy == 1) {
-            document.getElementById('wafproxy_table').style.display='inline';
-        }
-        else {
-           document.getElementById('wafproxy_table').style.display='none';
-        }
-        if (document.getElementById('wafproxyrow_${dom}')) {
-            if (wafproxy == 1) {
-                document.getElementById('wafproxyrow_${dom}').style.display = 'table-row';
-            }
-            else {
-                document.getElementById('wafproxyrow_${dom}').style.display = 'none';
-            }
-        }
-        if (document.getElementById('nowafproxyrow_$dom')) {
-            if (wafproxy == 1) {
-                document.getElementById('nowafproxyrow_${dom}').style.display = 'none';
-            }
-            else {
-                document.getElementById('nowafproxyrow_${dom}').style.display = 'table-row';
-            }
-        }
+    my @jsarray = ();
+    foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
+        push(@jsarray,$ordered{$item});
     }
-    return;
-}
-// ]]>
-</script>
-
-ENDSCRIPT
-}
-
-sub lti_javascript {
-    my ($dom,$settings) = @_;
-    my $togglejs = &lti_toggle_js($dom);
-    my $linkprot_js = &Apache::courseprefs::linkprot_javascript();
+    my $jstext = '    var proctors = Array('."'".join("','",@jsarray)."'".');'."\n";
     return <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
-
-$linkprot_js
-
-// ]]>
-</script>
-
-$togglejs
-
-ENDSCRIPT
-}
-
-sub lti_toggle_js {
-    my ($dom) = @_;
-    my %servers = &Apache::lonnet::get_servers($dom,'library');
-    my $primary = &Apache::lonnet::domain($dom,'primary');
-    my $course_servers = "'".join("','",keys(%servers))."'";
-function toggleLTIEncKey(form) {
-    var shownhosts = new Array();
-    var hiddenhosts = new Array();
-    var forcourse = new Array($course_servers);
-    var fromdomain = '$primary';
-    var crsradio = form.elements['ltisec_crslinkprot'];
-    if (crsradio.length) {
-        for (var i=0; i<crsradio.length; i++) {
-            if (crsradio[i].checked) {
-                if (crsradio[i].value == 1) {
-                    if (forcourse.length > 0) {
-                        for (var j=0; j<forcourse.length; j++) {
-                            if (!shownhosts.includes(forcourse[j])) {
-                                shownhosts.push(forcourse[j]);
-                            }
-                        }
-                    }
-                } else {
-                    if (forcourse.length > 0) {
-                        for (var j=0; j<forcourse.length; j++) {
-                            if (!hiddenhosts.includes(forcourse[j])) {
-                                hiddenhosts.push(forcourse[j]);
-                            }
-                        }
-                    }
-                }
+function reorderProctoring(form,item) {
+    var changedVal;
+$jstext
+    var maxh = $total;
+    var current = new Array;
+    var changedVal = form.elements[item].options[form.elements[item].selectedIndex].value;
+    for (var i=0; i<proctors.length; i++) {
+        var elementName = 'proctoring_pos_'+proctors[i];
+        if (elementName != item) {
+            if (form.elements[elementName]) {
+                var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value;
+                current[currVal] = elementName;
             }
         }
     }
-    var domradio = form.elements['ltisec_domlinkprot'];
-    if (domradio.length) {
-        for (var i=0; i<domradio.length; i++) {
-            if (domradio[i].checked) {
-                if (domradio[i].value == 1) {
-                    if (!shownhosts.includes(fromdomain)) {
-                        shownhosts.push(fromdomain);
-                    }
-                } else {
-                    if (!hiddenhosts.includes(fromdomain)) {
-                        hiddenhosts.push(fromdomain);
-                    }
-                }
-            }
+    var oldVal;
+    for (var j=0; j<maxh; j++) {
+        if (current[j] == undefined) {
+            oldVal = j;
         }
     }
-    if (shownhosts.length > 0) {
-        for (var i=0; i<shownhosts.length; i++) {
-            if (document.getElementById('ltisec_info_'+shownhosts[i])) {
-                document.getElementById('ltisec_info_'+shownhosts[i]).style.display = 'block';
-            }
-        }
-        if (document.getElementById('ltisec_noprivkey')) {
-            document.getElementById('ltisec_noprivkey').style.display = 'none';
+    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 {
-        if (document.getElementById('ltisec_noprivkey')) {
-            document.getElementById('ltisec_noprivkey').style.display = 'inline-block';
-        }
-    }
-    if (hiddenhosts.length > 0) {
-        for (var i=0; i<hiddenhosts.length; i++) {
-            if (!shownhosts.includes(hiddenhosts[i])) {
-                if (document.getElementById('ltisec_info_'+hiddenhosts[i])) {
-                    document.getElementById('ltisec_info_'+hiddenhosts[i]).style.display = 'none';
-                }
-            }
+        for (var k=changedVal; k<oldVal; k++) {
+            var elementName = current[k];
+            form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex + 1;
         }
     }
     return;
 }
 
-function togglePrivKey(form,hostid) {
-    var radioname = '';
-    var currdivid = '';
-    var newdivid = '';
-    if ((document.getElementById('ltisec_divcurrprivkey_'+hostid)) &&
-        (document.getElementById('ltisec_divchgprivkey_'+hostid))) {
-        currdivid = document.getElementById('ltisec_divcurrprivkey_'+hostid);
-        newdivid = document.getElementById('ltisec_divchgprivkey_'+hostid);
-        radioname = form.elements['ltisec_changeprivkey_'+hostid];
-        if (radioname) {
-            if (radioname.length > 0) {
-                var setvis;
-                for (var i=0; i<radioname.length; i++) {
-                    if (radioname[i].checked == true) {
-                        if (radioname[i].value == 1) {
-                            newdivid.style.display = 'inline-block';
-                            currdivid.style.display = 'none';
-                            setvis = 1;
-                        }
-                        break;
+function toggleProctoring(form,item) {
+    var fieldsets = document.getElementsByClassName('proctoring_'+item);
+    if (fieldsets.length) {
+        var radioname = 'proctoring_available_'+item;
+        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 == '1') {
+                       setvis = 1;
+                       break;
                     }
                 }
-                if (!setvis) {
-                    newdivid.style.display = 'none';
-                    currdivid.style.display = 'inline-block';
-                }
             }
-        }
-    }
-}
-
-// ]]>
-</script>
-
-ENDSCRIPT
-}
-
-sub autoupdate_javascript {
-    return <<"ENDSCRIPT";
-<script type="text/javascript">
-// <![CDATA[
-function toggleLastActiveDays(form) {
-    var radioname = 'lastactive';
-    var divid = 'lastactive_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 == '1') {
-                    if (document.getElementById(divid)) {
-                        document.getElementById(divid).style.display = 'inline-block';
-                    }
-                    setvis = 1;
+            for (var j=0; j<fieldsets.length; j++) {
+                if (setvis) {
+                    fieldsets[j].style.display = 'block';
+                } else {
+                    fieldsets[j].style.display = 'none';
                 }
-                break;
-            }
-        }
-        if (!setvis) {
-            if (document.getElementById(divid)) {
-                document.getElementById(divid).style.display = 'none';
             }
         }
     }
     return;
 }
-// ]]>
-</script>
-
-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) {
-    var radioname = 'saml_'+hostid;
-    var tablecellon = 'samloptionson_'+hostid;
-    var tablecelloff = 'samloptionsoff_'+hostid;
-    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 == '1') {
-                    if (document.getElementById(tablecellon)) {
-                        document.getElementById(tablecellon).style.display='';
-                    }
-                    if (document.getElementById(tablecelloff)) {
-                        document.getElementById(tablecelloff).style.display='none';
-                    }
-                    setvis = 1;
-                }
-                break;
-            }
-        }
-        if (!setvis) {
-            if (document.getElementById(tablecellon)) {
-                document.getElementById(tablecellon).style.display='none';
-            }
-            if (document.getElementById(tablecelloff)) {
-                document.getElementById(tablecelloff).style.display='';
-            }
-        }
-    }
-    return;
-}
-// ]]>
-</script>
 
-ENDSCRIPT
-}
-
-sub ipaccess_javascript {
+sub lti_javascript {
     my ($settings) = @_;
+    my $togglejs = &lti_toggle_js();
+    unless (ref($settings) eq 'HASH') {
+        return $togglejs;
+    }
     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;
-            }
+    foreach my $item (keys(%{$settings})) {
+        if (ref($settings->{$item}) eq 'HASH') {
+            my $num = $settings->{$item}{'order'};
+            $ordered{$num} = $item;
         }
-        $total = scalar(keys(%{$settings}));
     }
+    $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";
+    my $jstext = '    var lti = Array('."'".join("','",@jsarray)."'".');'."\n";
     return <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
-function reorderIPaccess(form,item) {
+function reorderLTI(form,item) {
     var changedVal;
 $jstext
-    var newpos = 'ipaccess_pos_add';
+    var newpos = 'lti_pos_add';
     var maxh = 1 + $total;
     var current = new Array;
     var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value;
@@ -3409,8 +2976,8 @@ $jstext
         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];
+    for (var i=0; i<lti.length; i++) {
+        var elementName = 'lti_pos_'+lti[i];
         if (elementName != item) {
             if (form.elements[elementName]) {
                 var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value;
@@ -3440,18 +3007,197 @@ $jstext
 // ]]>
 </script>
 
+$togglejs
+
+ENDSCRIPT
+}
+
+sub lti_toggle_js {
+    my %lcauthparmtext = &Apache::lonlocal::texthash (
+                            localauth => 'Local auth argument',
+                            krb       => 'Kerberos domain',
+                         );
+    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;
+            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 == '1') {
+                           setvis = 1;
+                           break;
+                        }
+                    }
+                }
+                for (var j=0; j<fieldsets.length; j++) {
+                    if (setvis) {
+                        fieldsets[j].style.display = 'block';
+                    } else {
+                        fieldsets[j].style.display = 'none';
+                    }
+                }
+            }
+        }
+    } else if ((setting == 'user') || (setting == 'crs') || (setting == 'passback') || (setting == 'callback')) {
+        var radioname = '';
+        var divid = '';
+        if (setting == 'user') {
+            radioname = 'lti_mapuser_'+item;
+            divid = 'lti_userfield_'+item;
+        } else if (setting == 'crs') {
+            radioname = 'lti_mapcrs_'+item;
+            divid = 'lti_crsfield_'+item;
+        } else if (setting == 'callback') {
+            radioname = 'lti_callback_'+item;
+            divid = 'lti_callbackfield_'+item;
+        } else {
+            radioname = 'lti_passback_'+item;
+            divid =  'lti_passback_'+item;
+        }
+        var num = form.elements[radioname].length;
+        if (num) {
+            var setvis = '';
+            for (var i=0; i<num; i++) {
+               if (form.elements[radioname][i].checked) {
+                   if ((setting == 'passback') || (setting == 'callback')) {
+                       if (form.elements[radioname][i].value == '1') {
+                           if (document.getElementById(divid)) {
+                               document.getElementById(divid).style.display = 'inline-block';
+                           }
+                           setvis = 1;
+                           break;
+                       }
+                   } else {
+                       if (form.elements[radioname][i].value == 'other') {
+                           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';
+                }
+            }
+        }
+    } else if ((setting == 'sec') || (setting == 'secsrc')) {
+        var numsec = form.elements['lti_crssec_'+item].length;
+        if (numsec) {
+            var setvis = '';
+            for (var i=0; i<numsec; i++) {
+                if (form.elements['lti_crssec_'+item][i].checked) {
+                    if (form.elements['lti_crssec_'+item][i].value == '1') {
+                        if (document.getElementById('lti_crssecfield_'+item)) {
+                            document.getElementById('lti_crssecfield_'+item).style.display = 'inline-block';
+                            setvis = 1;
+                            var numsrcsec = form.elements['lti_crssecsrc_'+item].length;
+                            if (numsrcsec) {
+                                var setsrcvis = '';
+                                for (var j=0; j<numsrcsec; j++) {
+                                    if (form.elements['lti_crssecsrc_'+item][j].checked) {
+                                        if (form.elements['lti_crssecsrc_'+item][j].value == 'other') {
+                                            if (document.getElementById('lti_secsrcfield_'+item)) {
+                                                document.getElementById('lti_secsrcfield_'+item).style.display = 'inline-block';
+                                                setsrcvis = 1;
+                                            }
+                                        }
+                                    }
+                                }
+                                if (!setsrcvis) {
+                                    if (document.getElementById('lti_secsrcfield_'+item)) {
+                                        document.getElementById('lti_secsrcfield_'+item).style.display = 'none';
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            if (!setvis) {
+                if (document.getElementById('lti_crssecfield_'+item)) {
+                    document.getElementById('lti_crssecfield_'+item).style.display = 'none';
+                }
+                if (document.getElementById('lti_secsrcfield_'+item)) {
+                    document.getElementById('lti_secsrcfield_'+item).style.display = 'none';
+                }
+            }
+        }
+    } else if (setting == 'lcauth') {
+        var numauth = form.elements['lti_lcauth_'+item].length;
+        if (numauth) {
+            for (var i=0; i<numauth; i++) {
+                if (form.elements['lti_lcauth_'+item][i].checked) {
+                    if (document.getElementById('lti_'+setting+'_parmrow_'+item)) {
+                        if ((form.elements['lti_'+setting+'_'+item][i].value == 'internal') || (form.elements['lti_'+setting+'_'+item][i].value == 'lti')) {
+                            document.getElementById('lti_'+setting+'_parmrow_'+item).style.display = 'none';
+                        } else {
+                            document.getElementById('lti_'+setting+'_parmrow_'+item).style.display = 'table-row';
+                            if (document.getElementById('lti_'+setting+'_parmtext_'+item)) {
+                                if (form.elements['lti_'+setting+'_'+item][i].value == 'localauth') {
+                                    document.getElementById('lti_'+setting+'_parmtext_'+item).innerHTML = "$lcauthparmtext{'localauth'}";
+                                } else {
+                                    document.getElementById('lti_'+setting+'_parmtext_'+item).innerHTML = "$lcauthparmtext{'krb'}";
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    } else if (setting == 'lcmenu') {
+        var menus = new Array('lti_topmenu_'+item,'lti_inlinemenu_'+item);
+        var divid = 'lti_menufield_'+item;
+        var setvis = '';
+        for (var i=0; i<menus.length; i++) {
+            var radioname = menus[i];  
+            var num = form.elements[radioname].length;
+            if (num) {
+                for (var j=0; j<num; j++) {
+                    if (form.elements[radioname][j].checked) {
+                        if (form.elements[radioname][j].value == '1') {
+                            if (document.getElementById(divid)) {
+                                document.getElementById(divid).style.display = 'inline-block';
+                            }
+                            setvis = 1;
+                            break;
+                        }
+                    }
+                }
+            }
+            if (setvis == 1) {
+                break;
+            }
+        }
+        if (!setvis) {
+            if (document.getElementById(divid)) {
+                document.getElementById(divid).style.display = 'none';
+            }
+        }
+    }
+    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,$autofailsafe,$failsafesty,%failsafechecked);
-    $failsafesty = 'none';
-    %failsafechecked = (
-        off => ' checked="checked"',
-    );
+    my ($defdom,$runon,$runoff,$coownerson,$coownersoff,$failsafe);
     if (ref($settings) eq 'HASH') {
         if (exists($settings->{'run'})) {
             if ($settings->{'run'} eq '0') {
@@ -3485,24 +3231,8 @@ sub print_autoenroll {
         if (exists($settings->{'sender_domain'})) {
             $defdom = $settings->{'sender_domain'};
         }
-        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'} = '';
-            }
+        if (exists($settings->{'autofailsafe'})) {
+            $failsafe = $settings->{'autofailsafe'};
         }
     } else {
         if ($autorun) {
@@ -3541,84 +3271,51 @@ 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_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>';
+                  '<td class="LC_right_item"><span class="LC_nobreak">'.
+                  '<input type="text" name="autoenroll_failsafe"'.
+                  ' value="'.$failsafe.'" size="4" /></span></td></tr>';
     $$rowtotal += 4;
     return $datatable;
 }
 
 sub print_autoupdate {
     my ($position,$dom,$settings,$rowtotal) = @_;
-    my ($enable,$datatable);
+    my $datatable;
     if ($position eq 'top') {
-        my %choices = &Apache::lonlocal::texthash (
-                          run        => 'Auto-update active?',
-                          classlists => 'Update information in classlists?',
-                          unexpired  => 'Skip updates for users without active or future roles?',
-                          lastactive => 'Skip updates for inactive users?',
-        );
-        my $itemcount = 0;
         my $updateon = ' ';
         my $updateoff = ' checked="checked" ';
+        my $classlistson = ' ';
+        my $classlistsoff = ' checked="checked" ';
         if (ref($settings) eq 'HASH') {
             if ($settings->{'run'} eq '1') {
                 $updateon = $updateoff;
                 $updateoff = ' ';
             }
+            if ($settings->{'classlists'} eq '1') {
+                $classlistson = $classlistsoff;
+                $classlistsoff = ' ';
+            }
         }
-        $enable = '<tr class="LC_odd_row">'. 
-                  '<td>'.&mt($choices{'run'}).'</td>'.
-                  '<td class="LC_left_item"><span class="LC_nobreak"><label>'.
+        my %title = (
+                   run => 'Auto-update active?',
+                   classlists => 'Update information in classlists?',
+                    );
+        $datatable = '<tr class="LC_odd_row">'. 
+                  '<td>'.&mt($title{'run'}).'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
                   '<input type="radio" name="autoupdate_run"'.
-                  $updateoff.'value="0" />'.&mt('No').'</label>&nbsp;'.
+                  $updateon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
                   '<label><input type="radio" name="autoupdate_run"'.
-                  $updateon.'value="1" />'.&mt('Yes').'</label></span></td>'.
+                  $updateoff.'value="0" />'.&mt('No').'</label></span></td>'.
+                  '</tr><tr>'.
+                  '<td>'.&mt($title{'classlists'}).'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak">'.
+                  '<label><input type="radio" name="classlists"'.
+                  $classlistson.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="classlists"'.
+                  $classlistsoff.'value="0" />'.&mt('No').'</label></span></td>'.
                   '</tr>';
-        my @toggles = ('classlists','unexpired');
-        my %defaultchecked = ('classlists' => 'off',
-                              'unexpired'  => 'off'
-                              );
-        $$rowtotal ++;
-        ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
-                                                     \%choices,$itemcount,'','','left','no');
-        $datatable = $enable.$datatable;
-        $$rowtotal += $itemcount;
-        my $lastactiveon = ' ';
-        my $lastactiveoff = ' checked="checked" ';
-        my $lastactivestyle = 'none';
-        my $lastactivedays;
-        my $onclick = ' onclick="javascript:toggleLastActiveDays(this.form);"';
-        if (ref($settings) eq 'HASH') {
-            if ($settings->{'lastactive'} =~ /^\d+$/) {
-                $lastactiveon = $lastactiveoff;
-                $lastactiveoff = ' ';
-                $lastactivestyle = 'inline-block';
-                $lastactivedays = $settings->{'lastactive'};
-            }
-        }
-        my $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'>'.
-                      '<td>'.$choices{'lastactive'}.'</td>'.
-                      '<td class="LC_left_item"><span class="LC_nobreak"><label>'.
-                      '<input type="radio" name="lastactive"'.
-                      $lastactiveoff.'value="0"'.$onclick.' />'.&mt('No').'</label>'.
-                      '&nbsp;<label>'.
-                      '<input type="radio" name="lastactive"'.
-                      $lastactiveon.' value="1"'.$onclick.' />'.&mt('Yes').'</label>'.
-                      '<div id="lastactive_div" style="display:'.$lastactivestyle.';">'.
-                      ':&nbsp;'.&mt('inactive = no activity in last [_1] days',
-                          '<input type="text" size="5" name="lastactivedays" value="'.
-                          $lastactivedays.'" />').
-                      '</span></td>'.
-                      '</tr>';
-        $$rowtotal ++;
+        $$rowtotal += 2;
     } elsif ($position eq 'middle') {
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
         my $numinrow = 3;
@@ -4084,17 +3781,18 @@ sub print_contacts {
                                                    \%choices,$rownum);
         $datatable .= $reports;
     } elsif ($position eq 'lower') {
-        my (%current,%excluded,%weights);
+        $css_class = $rownum%2?' class="LC_odd_row"':'';
+        my ($threshold,$sysmail,%excluded,%weights);
         my ($defaults,$names) = &Apache::loncommon::lon_status_items();
         if ($lonstatus{'threshold'} =~ /^\d+$/) {
-            $current{'errorthreshold'} = $lonstatus{'threshold'};
+            $threshold = $lonstatus{'threshold'};
         } else {
-            $current{'errorthreshold'} = $defaults->{'threshold'};
+            $threshold = $defaults->{'threshold'};
         }
         if ($lonstatus{'sysmail'} =~ /^\d+$/) {
-            $current{'errorsysmail'} = $lonstatus{'sysmail'};
+            $sysmail = $lonstatus{'sysmail'};
         } else {
-            $current{'errorsysmail'} = $defaults->{'sysmail'};
+            $sysmail = $defaults->{'sysmail'};
         }
         if (ref($lonstatus{'weights'}) eq 'HASH') {
             foreach my $type ('E','W','N','U') {
@@ -4114,16 +3812,13 @@ sub print_contacts {
                 map {$excluded{$_} = 1; } @{$lonstatus{'excluded'}};
             }
         }
-        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">'.
-                          $titles->{$item}.
-                          '</span></td><td class="LC_left_item">'.
-                          '<input type="text" name="'.$item.'" value="'.
-                          $current{$item}.'" size="5" /></td></tr>';
-            $rownum ++;
-        }
+        $datatable .= '<tr'.$css_class.'>'.
+                      '<td class="LC_left_item"><span class="LC_nobreak">'.
+                      $titles->{'errorthreshold'}.
+                      '</span></td><td class="LC_left_item">'.
+                      '<input type="text" name="errorthreshold" value="'.
+                      $threshold.'" size="5" /></td></tr>';
+        $rownum ++;
         $css_class = $rownum%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'>'.
                       '<td class="LC_left_item">'.
@@ -4169,6 +3864,14 @@ sub print_contacts {
         }
         $datatable .= '</tr></table></td></tr>';
         $rownum ++;
+        $css_class = $rownum%2?' class="LC_odd_row"':'';
+        $datatable .= '<tr'.$css_class.'>'.
+                      '<td class="LC_left_item"><span class="LC_nobreak">'.
+                      $titles->{'errorsysmail'}.
+                      '</span></td><td class="LC_left_item">'.
+                      '<input type="text" name="errorsysmail" value="'.
+                      $sysmail.'" size="5" /></td></tr>';
+        $rownum ++;
     } elsif ($position eq 'bottom') {
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
         my (@posstypes,%usertypeshash);
@@ -4196,7 +3899,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});
                             }
@@ -4208,7 +3911,7 @@ 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);
@@ -4275,7 +3978,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.
@@ -4354,6 +4057,7 @@ function toggleHelpdeskRow(form,checkbox
     return;
 }
 
+
 // ]]>
 </script>
 
@@ -4425,7 +4129,6 @@ sub print_helpsettings {
             push(@jsarray,('notinc','notexc'));
         }
         my $hiddenstr = join("','",@jsarray);
-        $datatable .= &helpsettings_javascript(\@roles_by_num,$maxnum,$hiddenstr,$formname);
         my $context = 'domprefs';
         my $crstype = 'Course';
         my $prefix = 'helproles_';
@@ -4459,7 +4162,7 @@ sub print_helpsettings {
             my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);
             $css_class = $itemcount%2?' class="LC_odd_row"':'';
             my $chgstr = ' onchange="javascript:reorderHelpRoles(this.form,'."'helproles_".$num."_pos'".');"';
-            $datatable .= '<tr '.$css_class.'><td valign="top"><b>'.$role.'</b><br />'.
+            $datatable .= '<tr '.$css_class.'><td style="vertical-align: top"><b>'.$role.'</b><br />'.
                           '<select name="helproles_'.$num.'_pos"'.$chgstr.'>';
             for (my $k=0; $k<=$maxnum; $k++) {
                 my $vpos = $k+1;
@@ -4498,7 +4201,7 @@ sub print_helpsettings {
         &Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent);
         my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);
         my $chgstr = ' onchange="javascript:reorderHelpRoles(this.form,'."'helproles_".$count."_pos'".');"';
-        $datatable .= '<tr '.$css_class.'><td valign="top"><span class="LC_nobreak"><label>'.
+        $datatable .= '<tr '.$css_class.'><td style="vertical-align: top"><span class="LC_nobreak"><label>'.
                       '<input type="hidden" name="helproles_maxnum" value="'.$maxnum.'" />'."\n".
                       '<select name="helproles_'.$count.'_pos"'.$chgstr.'>';
         for (my $k=0; $k<$maxnum+1; $k++) {
@@ -4747,7 +4450,7 @@ sub helpdeskroles_access {
 
 sub radiobutton_prefs {
     my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick,
-        $additional,$align,$firstval) = @_;
+        $additional,$align) = @_;
     return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') &&
                    (ref($choices) eq 'HASH'));
 
@@ -4779,7 +4482,7 @@ sub radiobutton_prefs {
     foreach my $item (@{$toggles}) {
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
         $datatable .=
-            '<tr'.$css_class.'><td valign="top">'.
+            '<tr'.$css_class.'><td style="vertical-align: top">'.
             '<span class="LC_nobreak">'.$choices->{$item}.
             '</span></td>';
         if ($align eq 'left') {
@@ -4787,21 +4490,15 @@ sub radiobutton_prefs {
         } else {
             $datatable .= '<td class="LC_right_item">';
         }
-        $datatable .= '<span class="LC_nobreak">';
-        if ($firstval eq 'no') {
-            $datatable .=
-                '<label><input type="radio" name="'.
-                $item.'" '.$checkedoff{$item}.' value="0"'.$onclick.' />'.&mt('No').
-                '</label>&nbsp;<label><input type="radio" name="'.$item.'" '.
-                $checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes').'</label>';
-        } else {
-            $datatable .=
+        $datatable .=
+            '<span class="LC_nobreak">'.
             '<label><input type="radio" name="'.
             $item.'" '.$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes').
             '</label>&nbsp;<label><input type="radio" name="'.$item.'" '.
-            $checkedoff{$item}.' value="0"'.$onclick.' />'.&mt('No').'</label>';
-        }
-        $datatable .= '</span>'.$additional.'</td></tr>';
+            $checkedoff{$item}.' value="0"'.$onclick.' />'.&mt('No').'</label>'.
+            '</span>'.$additional.
+            '</td>'.
+            '</tr>';
         $itemcount ++;
     }
     return ($datatable,$itemcount);
@@ -4931,8 +4628,36 @@ sub print_ltitools {
                           '<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>'.
-                          '<div style="padding:0;clear:both;margin:0;border:0"></div>';
+                          '</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.
@@ -5001,7 +4726,7 @@ sub print_ltitools {
                 if (!$rolemaps{$role}) {
                     $selectnone = ' selected="selected"';
                 }
-                $datatable .= '<td align="center">'.
+                $datatable .= '<td style="text-align: center">'. 
                               &Apache::lonnet::plaintext($role,'Course').'<br />'.
                               '<select name="ltitools_roles_'.$role.'_'.$i.'">'.
                               '<option value=""'.$selectnone.'>'.&mt('Select').'</option>';
@@ -5032,7 +4757,7 @@ sub print_ltitools {
                 }
                 $datatable .= '<label>'.
                        '<input type="checkbox" name="ltitools_courseconfig_'.$i.'" value="'.$item.'"'.$checked.' />'.
-                       $lt{'crs'.$item}.'</label>'.('&nbsp;' x2)."\n";
+                       $lt{'crs'.$item}.'</label>&nbsp; '."\n";
             }
             $datatable .= '</span></fieldset>'.
                           '<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'.
@@ -5113,8 +4838,28 @@ sub print_ltitools {
                   '<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>'.
-                  '<div style="padding:0;clear:both;margin:0;border:0"></div>';
+                  '</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) {
@@ -5148,7 +4893,7 @@ sub print_ltitools {
     $datatable .= '<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>';
     foreach my $role (@courseroles) {
         my ($checked,$checkednone);
-        $datatable .= '<td align="center">'.
+        $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>';
@@ -5188,7 +4933,7 @@ sub ltitools_names {
                                           'key'            => 'Key',
                                           'lifetime'       => 'Nonce lifetime (s)',
                                           'secret'         => 'Secret',
-                                          'icon'           => 'Icon',
+                                          'icon'           => 'Icon',   
                                           'user'           => 'User',
                                           'fullname'       => 'Full Name',
                                           'firstname'      => 'First Name',
@@ -5202,155 +4947,1150 @@ sub ltitools_names {
                                           'width'          => 'Width',
                                           'linktext'       => 'Default Link Text',
                                           'explanation'    => 'Default Explanation',
+                                          'passback'       => 'Tool can return grades:',
+                                          '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',
                                         );
-
     return %lt;
 }
 
-sub print_lti {
-    my ($position,$dom,$settings,$rowtotal) = @_;
+sub print_proctoring {
+    my ($dom,$settings,$rowtotal) = @_;
     my $itemcount = 1;
-    my ($datatable,$css_class);
-    my (%rules,%encrypt,%privkeys,%linkprot);
+    my (%ordered,%providernames,%current,%currentdef);
+    my $confname = $dom.'-domainconfig';
+    my $switchserver = &check_switchserver($dom,$confname);
     if (ref($settings) eq 'HASH') {
-        if ($position eq 'top') {
-            if (exists($settings->{'encrypt'})) {
-                if (ref($settings->{'encrypt'}) eq 'HASH') {
-                    foreach my $key (keys(%{$settings->{'encrypt'}})) {
-                        $encrypt{'ltisec_'.$key.'linkprot'} = $settings->{'encrypt'}{$key};
+        foreach my $item (keys(%{$settings})) {
+            if (ref($settings->{$item}) eq 'HASH') {
+                my $num = $settings->{$item}{'order'};
+                $ordered{$num} = $item;
+            }
+        }
+    } else {
+        %ordered = (
+                     1 => 'proctorio',
+                     2 => 'examity',
+                   );
+    }
+    %providernames = &proctoring_providernames();
+    my $maxnum = scalar(keys(%ordered));
+    my (%requserfields,%optuserfields,%defaults,%extended,%crsconf,@courseroles,@ltiroles);
+    my ($requref,$opturef,$defref,$extref,$crsref,$rolesref,$ltiref) = &proctoring_data();
+    if (ref($requref) eq 'HASH') {
+        %requserfields = %{$requref};
+    }
+    if (ref($opturef) eq 'HASH') {
+        %optuserfields = %{$opturef};
+    }
+    if (ref($defref) eq 'HASH') {
+        %defaults = %{$defref};
+    }
+    if (ref($extref) eq 'HASH') {
+        %extended = %{$extref};
+    }
+    if (ref($crsref) eq 'HASH') {
+        %crsconf = %{$crsref};
+    }
+    if (ref($rolesref) eq 'ARRAY') {
+        @courseroles = @{$rolesref};
+    }
+    if (ref($ltiref) eq 'ARRAY') {
+        @ltiroles = @{$ltiref};
+    }
+    my $datatable;
+    my $css_class;
+    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 $provider = $ordered{$items[$i]};
+            my $optionsty = 'none';
+            my ($available,$version,$lifetime,$imgsrc,$userincdom,$showroles,
+                %checkedfields,%rolemaps,%inuse,%crsconfig,%current);
+            if (ref($settings) eq 'HASH') {
+                if (ref($settings->{$provider}) eq 'HASH') {
+                    %current = %{$settings->{$provider}};
+                    if ($current{'available'}) {
+                        $optionsty = 'block';
+                        $available = 1;
+                    }
+                    if ($current{'lifetime'} =~ /^\d+$/) {
+                        $lifetime = $current{'lifetime'};
+                    }
+                    if ($current{'version'} =~ /^\d+\.\d+$/) {
+                        $version = $current{'version'};
+                    }
+                    if ($current{'image'} ne '') {
+                        $imgsrc = '<img src="'.$current{'image'}.'" alt="'.&mt('Proctoring service icon').'" />';
+                    }
+                    if (ref($current{'fields'}) eq 'ARRAY') {
+                        map { $checkedfields{$_} = 1; } @{$current{'fields'}};
+                    }
+                    $userincdom = $current{'incdom'};
+                    if (ref($current{'roles'}) eq 'HASH') {
+                        %rolemaps = %{$current{'roles'}};
+                        $checkedfields{'roles'} = 1;
+                    }
+                    if (ref($current{'defaults'}) eq 'ARRAY') {
+                        foreach my $val (@{$current{'defaults'}}) {
+                            if (grep(/^\Q$val\E$/,@{$defaults{$provider}})) {
+                                $inuse{$val} = 1;
+                            } else {
+                                foreach my $poss (keys(%{$extended{$provider}})) {
+                                    if (ref($extended{$provider}{$poss}) eq 'ARRAY') {
+                                        if (grep(/^\Q$val\E$/,@{$extended{$provider}{$poss}})) {
+                                            $inuse{$poss} = $val;
+                                            last;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    } elsif (ref($current{'defaults'}) eq 'HASH') {
+                        foreach my $key (keys(%{$current{'defaults'}})) {
+                            my $currval = $current{'defaults'}{$key}; 
+                            if (grep(/^\Q$key\E$/,@{$defaults{$provider}})) {
+                                $inuse{$key} = 1;
+                            } else {
+                                my $match;
+                                foreach my $poss (keys(%{$extended{$provider}})) {
+                                    if (ref($extended{$provider}{$poss}) eq 'ARRAY') {
+                                        if (grep(/^\Q$key\E$/,@{$extended{$provider}{$poss}})) {
+                                            $inuse{$poss} = $key;
+                                            last;
+                                        }
+                                    } elsif (ref($extended{$provider}{$poss}) eq 'HASH') {
+                                        foreach my $inner (sort(keys(%{$extended{$provider}{$poss}}))) {
+                                            if (ref($extended{$provider}{$poss}{$inner}) eq 'ARRAY') {
+                                                if (grep(/^\Q$currval\E$/,@{$extended{$provider}{$poss}{$inner}})) {
+                                                    $currentdef{$inner} = $currval;
+                                                    $match = 1;
+                                                    last;
+                                                }
+                                            } elsif ($inner eq $key) {
+                                                $currentdef{$key} = $currval;
+                                                $match = 1;
+                                                last;
+                                            }
+                                        }
+                                    }
+                                    last if ($match);
+                                }
+                            }
+                        }
+                    }
+                    if (ref($current{'crsconf'}) eq 'ARRAY') {
+                        map { $crsconfig{$_} = 1; } @{$current{'crsconf'}};
                     }
                 }
             }
-            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'}});
+            my %lt = &proctoring_titles($provider);
+            my %fieldtitles = &proctoring_fieldtitles($provider);
+            my $onclickavailable = ' onclick="toggleProctoring(this.form,'."'$provider'".');"';
+            my %checkedavailable = (
+                                   yes => '',
+                                   no  => ' checked="checked"',
+                                 );
+            if ($available) {
+                $checkedavailable{'yes'} = $checkedavailable{'no'};
+                $checkedavailable{'no'} = '';
+            }
+            my $chgstr = ' onchange="javascript:reorderProctoring(this.form,'."'proctoring_pos_".$provider."'".');"';
+            $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
+                         .'<select name="proctoring_pos_'.$provider.'"'.$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>';
+            }
+            if ($version eq '') {
+                if ($provider eq 'proctorio') {
+                    $version = '1.0';
+                } elsif ($provider eq 'examity') {
+                    $version = '1.1';
+                }
+            }
+            if ($lifetime eq '') {
+                $lifetime = '300';
+            }
+            $datatable .=
+                '</select>'.('&nbsp;'x2).'<b>'.$providernames{$provider}.'</b></span><br />'.
+                '<span class="LC_nobreak">'.$lt{'avai'}.'&nbsp;'.
+                '<label><input type="radio" name="proctoring_available_'.$provider.'" value="1"'.$onclickavailable.$checkedavailable{yes}.' />'.&mt('Yes').'</label>&nbsp;'."\n".
+                '<label><input type="radio" name="proctoring_available_'.$provider.'" value="0"'.$onclickavailable.$checkedavailable{no}.' />'.&mt('No').'</label></span>'."\n".
+                '</td>'.
+                '<td colspan="2">'.
+                '<fieldset class="proctoring_'.$provider.'" style="display:'.$optionsty.'"><legend>'.$lt{'base'}.'</legend>'.
+                '<span class="LC_nobreak">'.$lt{'version'}.':<select name="proctoring_'.$provider.'_version">'.
+                '<option value="'.$version.'" selected="selected">'.$version.'</option></select></span> '."\n".
+                ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'sigmethod'}.':<select name="proctoring_'.$provider.'_sigmethod">'.
+                '<option value="HMAC-SHA1" selected="selected">HMAC-SHA1</option>'.
+                '<option value="HMAC-SHA256">HMAC-SHA256</option></select></span>'.
+                ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" size="5" name="proctoring_'.$provider.'_lifetime" value="'.$lifetime.'" /></span> '."\n".
+                '<br />'.
+                '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="40" name="proctoring_'.$provider.'_url" value="'.$current{'url'}.'" /></span> '."\n".
+                '<br />'.
+                '<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="proctoring_'.$provider.'_key" value="'.$current{'key'}.'" /></span> '."\n".
+                ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="proctoring_'.$provider.'_secret" value="'.$current{'secret'}.'" />'.
+                '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.proctoring_'.$provider.'_secret.type='."'text'".' } else { this.form.proctoring_'.$provider.'_secret.type='."'password'".' }" />'.$lt{'visible'}.'</label></span><br />'."\n";
+            $datatable .= '<span class="LC_nobreak">'.$lt{'icon'}.':&nbsp;';
+            if ($imgsrc) {
+                $datatable .= $imgsrc.
+                              '<label><input type="checkbox" name="proctoring_image_del"'.
+                              ' value="'.$provider.'" />'.&mt('Delete?').'</label></span> '.
+                              '<span class="LC_nobreak">&nbsp;'.&mt('Replace:');
+            }
+            $datatable .= '&nbsp;';
+            if ($switchserver) {
+                $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+            } else {
+                $datatable .= '<input type="file" name="proctoring_image_'.$provider.'" value="" />';
+            }
+            unless ($imgsrc) {
+                $datatable .= '<br />('.&mt('if larger than 21x21 pixels, image will be scaled').')';
+            }
+            $datatable .= '</fieldset>'."\n";
+            if (ref($requserfields{$provider}) eq 'ARRAY') {
+                if (@{$requserfields{$provider}} > 0) {
+                    $datatable .= '<fieldset class="proctoring_'.$provider.'" style="display:'.$optionsty.'"><legend>'.$lt{'requ'}.'</legend>';
+                    foreach my $field (@{$requserfields{$provider}}) {
+                        $datatable .= '<span class="LC_nobreak">'.
+                                      '<label><input type="checkbox" name="proctoring_reqd_'.$provider.'" value="'.$field.'" checked="checked" disabled="disabled" />'.
+                                      $lt{$field}.'</label>';
+                        if ($field eq 'user') {
+                            my $seluserdom = '';
+                            my $unseluserdom = ' selected="selected"';
+                            if ($userincdom) {
+                                $seluserdom = $unseluserdom;
+                                $unseluserdom = '';
+                            }
+                            $datatable .= ':&nbsp;'.
+                                '<select name="proctoring_userincdom_'.$provider.'">'.
+                                '<option value="0"'.$unseluserdom.'>'.$lt{'username'}.'</option>'.
+                                '<option value="1"'.$seluserdom.'>'.$lt{'uname:dom'}.'</option>'.
+                                '</select>&nbsp;';
+                        } else {
+                            $datatable .= '&nbsp;';
+                            if ($field eq 'roles') {
+                                $showroles = 1; 
+                            } 
                         }
+                        $datatable .= '</span> ';
                     }
                 }
+                $datatable .= '</fieldset>'."\n";
             }
-        } elsif ($position eq 'middle') {
-            if (exists($settings->{'rules'})) {
-                if (ref($settings->{'rules'}) eq 'HASH') {
-                    %rules = %{$settings->{'rules'}};
+            if (ref($optuserfields{$provider}) eq 'ARRAY') {
+                if (@{$optuserfields{$provider}} > 0) {
+                    $datatable .= '<fieldset class="proctoring_'.$provider.'" style="display:'.$optionsty.'"><legend>'.$lt{'optu'}.'</legend>'; 
+                    foreach my $field (@{$optuserfields{$provider}}) {
+                        my $checked;
+                        if ($checkedfields{$field}) {
+                            $checked = ' checked="checked"';
+                        }
+                        $datatable .= '<span class="LC_nobreak">'.
+                                      '<label><input type="checkbox" name="proctoring_optional_'.$provider.'" value="'.$field.'"'.$checked.' />'.$lt{$field}.'</label></span>&nbsp; ';
+                    }
+                    $datatable .= '</fieldset>'."\n";
                 }
             }
-        } elsif ($position eq 'bottom') {
-            if (exists($settings->{'linkprot'})) {
-                if (ref($settings->{'linkprot'}) eq 'HASH') {
-                    %linkprot = %{$settings->{'linkprot'}};
-                    if ($linkprot{'lock'}) {
-                        delete($linkprot{'lock'});
+            if (ref($defaults{$provider}) eq 'ARRAY') {
+                if (@{$defaults{$provider}}) {
+                    my (%options,@selectboxes);
+                    if (ref($extended{$provider}) eq 'HASH') {
+                        %options = %{$extended{$provider}};
+                    }
+                    $datatable .= '<fieldset class="proctoring_'.$provider.'" style="display:'.$optionsty.'"><legend>'.$lt{'defa'}.'</legend>';
+                    my ($rem,$numinrow,$dropdowns);
+                    if ($provider eq 'proctorio') { 
+                        $datatable .= '<table>';
+                        $numinrow = 4;
                     }
+                    my $i = 0;
+                    foreach my $field (@{$defaults{$provider}}) {
+                        my $checked;
+                        if ($inuse{$field}) {
+                            $checked = ' checked="checked"';
+                        }
+                        if ($provider eq 'examity') {
+                            if ($field eq 'display') {
+                                $datatable .= '<span class="LC_nobreak">'.&mt('Display target:');
+                                foreach my $option ('iframe','tab','window') {
+                                    my $checkdisp;
+                                    if ($currentdef{'target'} eq $option) {
+                                        $checkdisp = ' checked="checked"';
+                                    }
+                                    $datatable .= '<label><input type="radio" name="proctoring_target_'.$provider.'" value="'.$option.'"'.$checkdisp.' />'.
+                                    $fieldtitles{$option}.'</label>'.('&nbsp;'x2);
+                                }
+                                $datatable .= ('&nbsp;'x4);
+                                foreach my $dimen ('width','height') {
+                                    $datatable .= '<label>'.$fieldtitles{$dimen}.'&nbsp;'.
+                                                  '<input type="text" name="proctoring_'.$dimen.'_'.$provider.'" size="5" '.
+                                                  'value="'.$currentdef{$dimen}.'" /></label>'.
+                                                  ('&nbsp;'x2);
+                                }
+                                $datatable .= '</span><br />'.
+                                              '<div class="LC_left_float">'.$fieldtitles{'linktext'}.'<br />'.
+                                              '<input type="text" name="proctoring_linktext_'.$provider.'" '.
+                                              'size="25" value="'.$currentdef{'linktext'}.'" /></div>'.
+                                              '<div class="LC_left_float">'.$fieldtitles{'explanation'}.'<br />'.
+                                              '<textarea name="proctoring_explanation_'.$provider.'" rows="5" cols="40">'.
+                                              $currentdef{'explanation'}.
+                                              '</textarea></div><div style=""></div><br />';
+                            }
+                        } else {
+                            if ((exists($options{$field})) && (ref($options{$field}) eq 'ARRAY')) {
+                                my ($output,$selnone);
+                                unless ($checked) {
+                                    $selnone = ' selected="selected"';
+                                }
+                                $output .= '<span class="LC_nobreak">'.$fieldtitles{$field}.': '.
+                                           '<select name="proctoring_defaults_'.$field.'_'.$provider.'">'.
+                                           '<option value=""'.$selnone.'>'.&mt('Not in use').'</option>'; 
+                                foreach my $option (@{$options{$field}}) {
+                                    my $sel; 
+                                    if ($inuse{$field} eq $option) {
+                                        $sel = ' selected="selected"';
+                                    }
+                                    $output .= '<option value="'.$option.'"'.$sel.'>'.$fieldtitles{$option}.'</option>';
+                                }
+                                $output .= '</select></span>';
+                                push(@selectboxes,$output);
+                            } else {
+                                $rem = $i%($numinrow);
+                                if ($rem == 0) {
+                                    if ($i > 0) {
+                                        $datatable .= '</tr>';
+                                    }
+                                    $datatable .= '<tr>';
+                                }
+                                $datatable .= '<td class="LC_left_item">'.
+                                              '<span class="LC_nobreak">'.
+                                              '<label><input type="checkbox" name="proctoring_defaults_'.$provider.'" value="'.$field.'"'.$checked.' />'.
+                                              $fieldtitles{$field}.'</label></span></td>';
+                                $i++;
+                            }
+                        }
+                    }
+                    if ($provider eq 'proctorio') {
+                        if ($numinrow) {
+                            $rem = $i%$numinrow;
+                        }
+                        my $colsleft = $numinrow - $rem;
+                        if ($colsleft > 1) {
+                            $datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">';
+                        } else {
+                            $datatable .= '<td class="LC_left_item">';
+                        }
+                        $datatable .= '&nbsp;'.
+                                      '</td></tr></table>';
+                        if (@selectboxes) {
+                            $datatable .= '<hr /><table>';
+                            $numinrow = 2;
+                            for (my $i=0; $i<@selectboxes; $i++) {
+                                $rem = $i%($numinrow);
+                                if ($rem == 0) {
+                                    if ($i > 0) {
+                                        $datatable .= '</tr>';
+                                    }
+                                    $datatable .= '<tr>';
+                                }
+                                $datatable .= '<td class="LC_left_item">'.
+                                              $selectboxes[$i].'</td>';
+                            }
+                            if ($numinrow) {
+                                $rem = $i%$numinrow;
+                            }
+                            $colsleft = $numinrow - $rem;
+                            if ($colsleft > 1) {
+                                $datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">';
+                            } else {
+                                $datatable .= '<td class="LC_left_item">';
+                            }
+                            $datatable .= '&nbsp;'.
+                                          '</td></tr></table>';
+                        }
+                    }
+                    $datatable .= '</fieldset>';
                 }
+                if (ref($crsconf{$provider}) eq 'ARRAY') {
+                    $datatable .= '<fieldset class="proctoring_'.$provider.'" style="display:'.$optionsty.'">'.
+                                  '<legend>'.&mt('Configurable in course').'</legend>';
+                    my ($rem,$numinrow);
+                    if ($provider eq 'proctorio') {
+                        $datatable .= '<table>';
+                        $numinrow = 4;
+                    }
+                    my $i = 0;
+                    foreach my $item (@{$crsconf{$provider}}) {
+                        my $name;
+                        if ($provider eq 'examity') {
+                            $name = $lt{'crs'.$item};
+                        } elsif ($provider eq 'proctorio') {
+                            $name = $fieldtitles{$item};
+                            $rem = $i%($numinrow);
+                            if ($rem == 0) {
+                                if ($i > 0) {
+                                    $datatable .= '</tr>';
+                                }
+                                $datatable .= '<tr>';
+                            }
+                            $datatable .= '<td class="LC_left_item>';
+                        }
+                        my $checked;
+                        if ($crsconfig{$item}) {
+                            $checked = ' checked="checked"';
+                        }
+                        $datatable .= '<span class="LC_nobreak"><label>'.
+                                      '<input type="checkbox" name="proctoring_crsconf_'.$provider.'" value="'.$item.'"'.$checked.' />'.
+                                      $name.'</label></span>';
+                        if ($provider eq 'examity') {
+                            $datatable .= '&nbsp; ';
+                        }
+                        $datatable .= "\n";
+                        $i++;
+                    }
+                    if ($provider eq 'proctorio') {
+                        if ($numinrow) {
+                            $rem = $i%$numinrow;
+                        }
+                        my $colsleft = $numinrow - $rem;
+                        if ($colsleft > 1) {
+                            $datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">';
+                        } else {
+                            $datatable .= '<td class="LC_left_item">';
+                        }
+                        $datatable .= '&nbsp;'.
+                                      '</td></tr></table>';
+                    }
+                    $datatable .= '</fieldset>';
+                }
+                if ($showroles) {
+                    $datatable .= '<fieldset class="proctoring_'.$provider.'" style="display:'.$optionsty.'">'.
+                                  '<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="proctoring_roles_'.$role.'_'.$provider.'">'.
+                                      '<option value=""'.$selectnone.'>'.&mt('Select').'</option>';
+                        foreach my $ltirole (@ltiroles) {
+                            unless ($selectnone) {
+                                if ($rolemaps{$role} eq $ltirole) {
+                                    $selected = ' selected="selected"';
+                                } else {
+                                    $selected = '';
+                                }
+                            }
+                            $datatable .= '<option value="'.$ltirole.'"'.$selected.'>'.$ltirole.'</option>';
+                        }
+                        $datatable .= '</select></td>';
+                    }
+                    $datatable .= '</tr></table></fieldset>'.
+                                  '<fieldset class="proctoring_'.$provider.'" style="display:'.$optionsty.'">'.
+                                  '<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></td><td>lms</td>'.
+                                  '<td><input type="text" name="proctoring_customval_lms_'.$provider.'"'.
+                                  ' value="Loncapa" disabled="disabled"/></td></tr>';
+                    if ((ref($settings) eq 'HASH') && (ref($settings->{$provider}) eq 'HASH') &&
+                        (ref($settings->{$provider}->{'custom'}) eq 'HASH')) {
+                        my %custom = %{$settings->{$provider}->{'custom'}};
+                        if (keys(%custom) > 0) {
+                            foreach my $key (sort(keys(%custom))) {
+                                next if ($key eq 'lms');
+                                $datatable .= '<tr><td><span class="LC_nobreak">'.
+                                              '<label><input type="checkbox" name="proctoring_customdel_'.$provider.'" value="'.
+                                              $key.'" />'.&mt('Delete').'</label></span></td><td>'.$key.'</td>'.
+                                              '<td><input type="text" name="proctoring_customval_'.$key.'_'.$provider.'"'.
+                                              ' value="'.$custom{$key}.'" /></td></tr>';
+                            }
+                        }
+                    }
+                    $datatable .= '<tr><td><span class="LC_nobreak">'.
+                                  '<label><input type="checkbox" name="proctoring_customadd" value="'.$provider.'" />'.
+                                  &mt('Add more').'</label></span></td><td><input type="text" name="proctoring_custom_name_'.$provider.'" />'.
+                                  '</td><td><input type="text" name="proctoring_custom_value_'.$provider.'" /></td></tr>'.
+                                  '</table></fieldset></td></tr>'."\n";
+                }
+                $datatable .= '</td></tr>';
             }
+            $itemcount ++;
         }
     }
-    if ($position eq 'top') {
-        my @ids=&Apache::lonnet::current_machine_ids();
-        my %servers = &Apache::lonnet::get_servers($dom,'library');
-        my $primary = &Apache::lonnet::domain($dom,'primary');
-        my ($extra,$numshown);
-        foreach my $hostid (sort(keys(%servers))) {
-            my ($showextra,$divsty,$switch);
-            if ($hostid eq $primary) {
-                if ($encrypt{'ltisec_domlinkprot'}) {
-                    $showextra = 1;
-                }
-            }
-            if ($encrypt{'ltisec_crslinkprot'}) {
-                $showextra = 1;
-            }
-            unless (grep(/^\Q$hostid\E$/,@ids)) {
-                $switch = 1;
-            }
-            if ($showextra) {
-                $numshown ++;
-                $divsty = 'display:inline-block';
-            } else {
-                $divsty = 'display:none';
-            }
-            $extra .= '<fieldset id="ltisec_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="ltisec_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="ltisec_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$hostid'".');" checked="checked" />'.&mt('No').'</label>'.
-                              ('&nbsp;'x2).
-                              '<label><input type="radio" value="1" name="ltisec_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$hostid'".');" />'.&mt('Yes').
-                              '</label>&nbsp;&nbsp;</span><div id="ltisec_divchgprivkey_'.$hostid.'" style="display:none" />'.
-                              '<span class="LC_nobreak"> - '.&mt('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="ltisec_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="ltisec_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$hostid'".');" checked="checked" />'.&mt('No').'</label>'.
-                          ('&nbsp;'x2).
-                          '<label><input type="radio" value="1" name="ltisec_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$hostid'".');" />'.&mt('Yes').
-                          '</label>&nbsp;&nbsp;</span><div id="ltisec_divchgprivkey_'.$hostid.'" style="display:none" />'.
-                          '<span class="LC_nobreak">'.&mt('New Key').':'.
-                          '<input type="password" size="20" name="ltisec_privkey_'.$hostid.'" value="" autocomplete="off" />'.
-                          '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltisec_privkey_'.$hostid.'.type='."'text'".' } else { this.form.ltisec_privkey_'.$hostid.'.type='."'password'".' }" />'.&mt('Visible input').'</label>'.
-                          '</span></div>';
-            } else {
-                $extra .= '<span class="LC_nobreak">'.&mt('Encryption Key').':'.
-                          '<input type="password" size="20" name="ltisec_privkey_'.$hostid.'" value="" autocomplete="off" />'.
-                          '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltisec_privkey_'.$hostid.'.type='."'text'".' } else { this.form.ltisec_privkey_'.$hostid.'.type='."'password'".' }" />'.&mt('Visible input').'</label>';
+    return $datatable;
+}
+
+sub proctoring_data {
+    my $requserfields = {
+                      proctorio => ['user'],
+                      examity   => ['roles','user'],
+                     };
+    my $optuserfields = {
+                        proctorio => ['fullname'],
+                        examity   => ['fullname','firstname','lastname','email'],
+                     };
+    my $defaults = {
+                  proctorio => ['recordvideo','recordaudio','recordscreen','recordwebtraffic',
+                                'recordroomstart','verifyvideo','verifyaudio','verifydesktop',
+                                'verifyid','verifysignature','fullscreen','clipboard','tabslinks',
+                                'closetabs','onescreen','print','downloads','cache','rightclick',
+                                'reentry','calculator','whiteboard'],
+                  examity   => ['display'],
+                };
+    my $extended = { 
+                  proctorio => {
+                                 verifyid => ['verifyidauto','verifyidlive'],
+                                 fullscreen => ['fullscreenlenient','fullscreenmoderate','fullscreensever'],
+                                 tabslinks => ['notabs','linksonly'],
+                                 reentry => ['noreentry','agentreentry'],
+                                 calculator => ['calculatorbasic','calculatorsci'],
+                               },
+                  examity => {
+                               display => {
+                                           target      => ['iframe','tab','window'],
+                                           width       => '',
+                                           height      => '',
+                                           linktext    => '',
+                                           explanation => '',
+                                          },
+                             },
+                };
+    my $crsconf = {
+                 proctorio => ['recordvideo','recordaudio','recordscreen','recordwebtraffic',
+                               'recordroomstart','verifyvideo','verifyaudio','verifydesktop',
+                               'verifyid','verifysignature','fullscreen','clipboard','tabslinks',
+                               'closetabs','onescreen','print','downloads','cache','rightclick',
+                               'reentry','calculator','whiteboard'],
+                 examity => ['label','title','target','linktext','explanation','append'],
+               };
+    my $courseroles = ['cc','in','ta','ep','st'];
+    my $ltiroles = ['Instructor','ContentDeveloper','TeachingAssistant','Learner'];
+    return ($requserfields,$optuserfields,$defaults,$extended,$crsconf,$courseroles,$ltiroles);
+}
+
+sub proctoring_titles {
+    my ($item) = @_;
+    my (%common_lt,%custom_lt);
+    %common_lt = &Apache::lonlocal::texthash (
+                     'avai'      => 'Available?',
+                     'base'      => 'Basic Settings',
+                     'requ'      => 'User data required to be sent on launch',
+                     'optu'      => 'User data optionally sent on launch',
+                     'udsl'      => 'User data sent on launch',
+                     'defa'      => 'Defaults for items configurable in course',
+                     'sigmethod' => 'Signature Method',
+                     'key'       => 'Key',
+                     'lifetime'  => 'Nonce lifetime (s)',
+                     'secret'    => 'Secret',
+                     'icon'      => 'Icon',
+                     'fullname'  => 'Full Name',
+                     'visible'   => 'Visible input',
+                     'username'  => 'username',
+                     'user'      => 'User',
+                 );
+    if ($item eq 'proctorio') {
+        %custom_lt = &Apache::lonlocal::texthash (
+                         'version'        => 'OAuth version',
+                         'url'            => 'API URL',
+                         'uname:dom'      => 'username-domain',
+        );
+    } elsif ($item eq 'examity') {
+        %custom_lt = &Apache::lonlocal::texthash (
+                         'version'        => 'LTI Version',
+                         'url'            => 'URL',
+                         'uname:dom'      => 'username:domain',
+                         'msgtype'        => 'Message Type',
+                         'firstname'      => 'First Name',
+                         'lastname'       => 'Last Name',
+                         'email'          => 'E-mail',
+                         'roles'          => 'Role',
+                         'crstarget'      => 'Display target',
+                         'crslabel'       => 'Course label',
+                         'crstitle'       => 'Course title', 
+                         'crslinktext'    => 'Link Text',
+                         'crsexplanation' => 'Explanation',
+                         'crsappend'      => 'Provider URL',
+        );
+    }
+    my %lt = (%common_lt,%custom_lt);
+    return %lt;
+}
+
+sub proctoring_fieldtitles {
+    my ($item) = @_;
+    if ($item eq 'proctorio') {
+        return &Apache::lonlocal::texthash (
+                  'recordvideo' => 'Record video',
+                  'recordaudio' => 'Record audio',
+                  'recordscreen' => 'Record screen',
+                  'recordwebtraffic' => 'Record web traffic',
+                  'recordroomstart' => 'Record room scan',
+                  'verifyvideo' => 'Verify webcam',
+                  'verifyaudio' => 'Verify microphone',
+                  'verifydesktop' => 'Verify desktop recording',
+                  'verifyid' => 'Photo ID verification',
+                  'verifysignature' => 'Require signature',
+                  'fullscreen' => 'Fullscreen',
+                  'clipboard' => 'Disable copy/paste',
+                  'tabslinks' => 'New tabs/windows',
+                  'closetabs' => 'Close other tabs',
+                  'onescreen' => 'Limit to single screen',
+                  'print' => 'Disable Printing',
+                  'downloads' => 'Disable Downloads',
+                  'cache' => 'Empty cache after exam',
+                  'rightclick' => 'Disable right click',
+                  'reentry' => 'Re-entry to exam',
+                  'calculator' => 'Onscreen calculator',
+                  'whiteboard' => 'Onscreen whiteboard',
+                  'verifyidauto' => 'Automated verification',
+                  'verifyidlive' => 'Live agent verification',
+                  'fullscreenlenient' => 'Forced, but can navigate away for up to 30s',
+                  'fullscreenmoderate' => 'Forced, but can navigate away for up to 15s',
+                  'fullscreensever' => 'Forced, navigation away ends exam',
+                  'notabs' => 'Disaallowed',
+                  'linksonly' => 'Allowed from links in exam',
+                  'noreentry' => 'Disallowed',
+                  'agentreentry' => 'Agent required for re-entry',
+                  'calculatorbasic' => 'Basic',
+                  'calculatorsci' => 'Scientific',
+        );
+    } elsif ($item eq 'examity') {
+        return &Apache::lonlocal::texthash (
+                'target'         => 'Display target',   
+                'window'         => 'Window',
+                'tab'            => 'Tab',
+                'iframe'         => 'iFrame',
+                'height'         => 'Height (pixels)',
+                'width'          => 'Width (pixels)',
+                'linktext'       => 'Default Link Text',
+                'explanation'    => 'Default Explanation',
+                'append'         => 'Provider URL',
+        );
+    }
+}
+
+sub proctoring_providernames {
+    return (
+             proctorio => 'Proctorio',
+             examity   => 'Examity',
+           );
+}
+
+sub print_lti {
+    my ($dom,$settings,$rowtotal) = @_;
+    my $itemcount = 1;
+    my $maxnum = 0;
+    my $css_class;
+    my %ordered;
+    if (ref($settings) eq 'HASH') {
+        foreach my $item (keys(%{$settings})) {
+            if (ref($settings->{$item}) eq 'HASH') {
+                my $num = $settings->{$item}{'order'};
+                $ordered{$num} = $item;
             }
-            $extra .= '</fieldset>';
         }
-        my %choices = &Apache::lonlocal::texthash (
-                                                      ltisec_crslinkprot => 'Encrypt stored link protection secrets defined in courses',
-                                                      ltisec_domlinkprot => 'Encrypt stored link protection secrets defined in domain',
-                                                  );
-        my @toggles = qw(ltisec_crslinkprot ltisec_domlinkprot);
-        my %defaultchecked = (
-                               'ltisec_crslinkprot' => 'off',
-                               'ltisec_domlinkprot' => 'off',
-                             );
-        my ($onclick,$itemcount);
-        $onclick = 'javascript:toggleLTIEncKey(this.form);';
-        ($datatable,$itemcount) = &radiobutton_prefs(\%encrypt,\@toggles,\%defaultchecked,
-                                                     \%choices,$itemcount,$onclick,'','left','no');
+    }
+    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'} = '';
+            }
+            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 .= '</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" ';
+        }
+        $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> '."\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;;
+}
 
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        my $noprivkeysty = 'display:inline-block';
-        if ($numshown) {
-            $noprivkeysty = 'display:none';
-        }
-        $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.&mt('Encryption Key(s)').'</td>'.
-                      '<td><div id="ltisec_noprivkey" style="'.$noprivkeysty.'" >'.
-                      '<span class="LC_nobreak">'.&mt('Not in use').'</span></div>'.
-                      $extra.
-                      '</td></tr>';
-        $itemcount ++;
-        $$rowtotal += $itemcount;
-    } elsif ($position eq 'middle') {
-        $datatable = &password_rules('secrets',\$itemcount,\%rules);
-        $$rowtotal += $itemcount;
-    } elsif ($position eq 'bottom') {
-         $datatable .= &Apache::courseprefs::print_linkprotection($dom,'',$settings,$rowtotal,'','','domain');
+sub lti_names {
+    my %lt = &Apache::lonlocal::texthash(
+                                          'version'   => 'LTI Version',
+                                          'url'       => 'URL',
+                                          'key'       => 'Key',
+                                          'lifetime'  => 'Nonce lifetime (s)',
+                                          'consumer'  => 'Consumer',
+                                          'secret'    => 'Secret',
+                                          'requser'   => "User's identity sent",
+                                          'email'     => 'Email address',
+                                          'sourcedid' => 'User ID',
+                                          'other'     => 'Other',
+                                          'passback'  => 'Can return grades to Consumer:',
+                                          'roster'    => 'Can retrieve roster from Consumer:',
+                                          'topmenu'   => 'Display LON-CAPA page header',
+                                          'inlinemenu'=> 'Display LON-CAPA inline menu',
+                                        );
+    return %lt;
+}
+
+sub lti_options {
+    my ($num,$current,$itemcount,%lt) = @_;
+    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{'mapcrstype'} = {};
+    $checked{'makeuser'} = {};
+    $checked{'selfenroll'} = {};
+    $checked{'crssec'} = {};
+    $checked{'crssecsrc'} = {};
+    $checked{'lcauth'} = {};
+    $checked{'menuitem'} = {};
+    if ($num eq 'add') {
+        $checked{'lcauth'}{'lti'} = ' checked="checked"';
+    }
+    my $userfieldsty = 'none';
+    my $crsfieldsty = 'none';
+    my $crssecfieldsty = 'none';
+    my $secsrcfieldsty = 'none';
+    my $callbacksty = 'none';
+    my $passbacksty = 'none';
+    my $optionsty = 'block';
+    my $lcauthparm;
+    my $lcauthparmstyle = 'display:none';
+    my $lcauthparmtext;
+    my $menusty;
+    my $numinrow = 4;
+    my %menutitles = &ltimenu_titles();
+
+    if (ref($current) eq 'HASH') {
+        if (!$current->{'requser'}) {
+            $optionsty = '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"'; 
+            } else {
+                $checked{'mapuser'}{'other'} = ' checked="checked"';
+                $userfield = $current->{'mapuser'};
+                $userfieldsty = 'inline-block';
+            }
+        }
+        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"'; 
+            } else {
+                $checked{'mapcrs'}{'other'} = ' checked="checked"';
+                $cidfield = $current->{'mapcrs'};
+                $crsfieldsty = 'inline-block';
+            }
+        }
+        if (ref($current->{'mapcrstype'}) eq 'ARRAY') {
+            foreach my $type (@{$current->{'mapcrstype'}}) {
+                $checked{'mapcrstype'}{$type} = ' checked="checked"';
+            }
+        }
+        if ($current->{'makecrs'}) {
+            $checked{'makecrs'}{'Y'} = '  checked="checked"';
+        }
+        if (ref($current->{'makeuser'}) eq 'ARRAY') {
+            foreach my $role (@{$current->{'makeuser'}}) {
+                $checked{'makeuser'}{$role} = ' checked="checked"';
+            }
+        }
+        if ($current->{'lcauth'} =~ /^(internal|localauth|krb4|krb5|lti)$/) {
+            $checked{'lcauth'}{$1} = ' checked="checked"';
+            unless (($current->{'lcauth'} eq 'lti') || ($current->{'lcauth'} eq 'internal')) {
+                $lcauthparm = $current->{'lcauthparm'};
+                $lcauthparmstyle = 'display:table-row'; 
+                if ($current->{'lcauth'} eq 'localauth') {
+                    $lcauthparmtext = &mt('Local auth argument');
+                } else {
+                    $lcauthparmtext = &mt('Kerberos domain');
+                }
+            }
+        }
+        if (ref($current->{'selfenroll'}) eq 'ARRAY') {
+            foreach my $role (@{$current->{'selfenroll'}}) {
+                $checked{'selfenroll'}{$role} = ' checked="checked"';
+            }
+        }
+        if (ref($current->{'maproles'}) eq 'HASH') {
+            %rolemaps = %{$current->{'maproles'}};
+        }
+        if ($current->{'section'} ne '') {
+            $checked{'crssec'}{'Y'} = '  checked="checked"'; 
+            $crssecfieldsty = 'inline-block';
+            if ($current->{'section'} eq 'course_section_sourcedid') {
+                $checked{'crssecsrc'}{'sourcedid'} = ' checked="checked"';
+            } else {
+                $checked{'crssecsrc'}{'other'} = ' checked="checked"';
+                $crssecsrc = $current->{'section'};
+                $secsrcfieldsty = 'inline-block';
+            }
+        } else {
+            $checked{'crssec'}{'N'} = ' checked="checked"';
+        }
+        if ($current->{'callback'} ne '') {
+            $callback = $current->{'callback'};
+            $checked{'callback'}{'Y'} = ' checked="checked"';
+            $callbacksty = 'inline-block';
+        } else {
+            $checked{'callback'}{'N'} = ' checked="checked"';
+        }
+        if ($current->{'topmenu'}) {
+            $checked{'topmenu'}{'Y'} = ' checked="checked"';
+        } else {
+            $checked{'topmenu'}{'N'} = ' checked="checked"';
+        }
+        if ($current->{'inlinemenu'}) {
+            $checked{'inlinemenu'}{'Y'} = ' checked="checked"';
+        } else {
+            $checked{'inlinemenu'}{'N'} = ' checked="checked"';
+        }
+        if (($current->{'topmenu'}) || ($current->{'inlinemenu'})) {
+            $menusty = 'inline-block';
+            if (ref($current->{'lcmenu'}) eq 'ARRAY') {
+                foreach my $item (@{$current->{'lcmenu'}}) {
+                    if (exists($menutitles{$item})) {
+                        $checked{'menuitem'}{$item} = ' checked="checked"';
+                    }
+                }
+            }
+        } else {
+            $menusty = 'none';
+        }
+    } else {
+        $checked{'makecrs'}{'N'} = ' checked="checked"';
+        $checked{'crssec'}{'N'} = ' checked="checked"';
+        $checked{'callback'}{'N'} = ' checked="checked"';
+        $checked{'topmenu'}{'N'} = ' checked="checked"';
+        $checked{'inlinemenu'}{'Y'} = ' checked="checked"'; 
+        $checked{'menuitem'}{'grades'} = ' checked="checked"';
+        $menusty = 'inline-block'; 
     }
-    return $datatable;
+    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 @authtypes = ('internal','krb4','krb5','localauth');
+    my %shortauth = (
+                     internal => 'int',
+                     krb4 => 'krb4',
+                     krb5 => 'krb5',
+                     localauth  => 'loc'
+                    );
+    my %authnames = &authtype_names();
+    my @ltiroles = qw(Learner Instructor ContentDeveloper TeachingAssistant Mentor Member Manager Administrator);
+    my @lticourseroles = qw(Learner Instructor TeachingAssistant Mentor);
+    my @courseroles = ('cc','in','ta','ep','st');
+    my $onclickuser = ' onclick="toggleLTI(this.form,'."'user','$num'".');"';
+    my $onclickcrs = ' onclick="toggleLTI(this.form,'."'crs','$num'".');"';
+    my $onclicksec = ' onclick="toggleLTI(this.form,'."'sec','$num'".');"';
+    my $onclickcallback = ' onclick="toggleLTI(this.form,'."'callback','$num'".');"';
+    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>'.
+                 '<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.'"'.
+                   $checked{'mapuser'}{$option}.$onclickuser.' />'.$lt{$option}.'</label>'.
+                   ($option eq 'other' ? '' : ('&nbsp;'x2) );
+    }
+    $output .= '</span></div>'.
+               '<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>';
+    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> ';     
+    }
+    $output .= '</fieldset>'.
+               '<fieldset class="ltioption_'.$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>'.
+               '<table class="LC_nested"><tr><td class="LC_left_item">LON-CAPA Authentication</td>'.
+               '<td class="LC_left_item">';
+    foreach my $auth ('lti',@authtypes) {
+        my $authtext;
+        if ($auth eq 'lti') {
+            $authtext = &mt('None');
+        } else {
+            $authtext = $authnames{$shortauth{$auth}};
+        }
+        $output .= '<span class="LC_nobreak"><label><input type="radio" name="lti_lcauth_'.$num.
+                   '" value="'.$auth.'"'.$checked{'lcauth'}{$auth}.$onclicklcauth.' />'.
+                   $authtext.'</label></span> &nbsp;';
+    }
+    $output .= '</td></tr>'.
+               '<tr id="lti_lcauth_parmrow_'.$num.'" style="'.$lcauthparmstyle.'">'.
+               '<td class="LC_right_item" colspan="2"><span class="LC_nobreak">'.
+               '<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>'.
+               '<div class="LC_floatleft"><span class="LC_nobreak">'.
+               &mt('Unique course identifier').':&nbsp;';
+    foreach my $option ('course_offering_sourcedid','context_id','other') {
+        $output .= '<label><input type="radio" name="lti_mapcrs_'.$num.'" value="'.$option.'"'.
+                   $checked{'mapcrs'}{$option}.$onclickcrs.' />'.$option.'</label>'.
+                   ($option eq 'other' ? '' : ('&nbsp;'x2) );
+    }
+    $output .= '</span></div><div class="LC_floatleft" style="display:'.$crsfieldsty.';" id="lti_crsfield_'.$num.'">'.
+               '<input type="text" name="lti_mapcrsfield_'.$num.'" value="'.$cidfield.'" />'.
+               '</div><div style="padding:0;clear:both;margin:0;border:0"></div>'.
+               '<span class="LC_nobreak">'.&mt('LON-CAPA course type(s)').':&nbsp;';
+    foreach my $type (@coursetypes) {
+        $output .= '<label><input type="checkbox" name="lti_mapcrstype_'.$num.'" value="'.$type.'"'.
+                   $checked{'mapcrstype'}{$type}.' />'.$coursetypetitles{$type}.'</label>'.
+                   ('&nbsp;'x2);
+    }
+    $output .= '</span></fieldset>'.
+               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><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>';
+    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>'.
+               '<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).
+               '<label><input type="radio" name="lti_crssec_'.$num.'" value="1"'.
+               $checked{'crssec'}{'Y'}.$onclicksec.' />'.&mt('Yes').'</label></span></div>'.
+               '<div class="LC_floatleft" style="display:'.$crssecfieldsty.';" id="lti_crssecfield_'.$num.'">'.
+               '<span class="LC_nobreak">'.&mt('From').':<label>'.
+               '<input type="radio" name="lti_crssecsrc_'.$num.'" value="course_section_sourcedid"'.
+               $checked{'crssecsrc'}{'sourcedid'}.$onclicksecsrc.' />'.
+               &mt('Standard field').'</label>'.('&nbsp;'x2).
+               '<label><input type="radio" name="lti_crssecsrc_'.$num.'" value="other"'.
+               $checked{'crssecsrc'}{'other'}.$onclicksecsrc.' />'.&mt('Other').
+               '</label></span></div><div class="LC_floatleft" style="display:'.$secsrcfieldsty.';" id="lti_secsrcfield_'.$num.'">'.
+               '<input type="text" name="lti_customsection_'.$num.'" value="'.$crssecsrc.'" />'.
+               '</div><div style="padding:0;clear:both;margin:0;border:0"></div>';
+    my ($pb1p1chk,$pb1p0chk,$onclickpb);
+    foreach my $extra ('roster','passback') {
+        my $checkedon = '';
+        my $checkedoff = ' checked="checked"';
+        if ($extra eq 'passback') {
+            $pb1p1chk = ' checked="checked"';
+            $pb1p0chk = '';
+            $onclickpb = ' onclick="toggleLTI(this.form,'."'passback','$num'".');"'; 
+        } else {
+            $onclickpb = ''; 
+        }
+        if (ref($current) eq 'HASH') {
+            if (($current->{$extra})) {
+                $checkedon = $checkedoff;
+                $checkedoff = '';
+                if ($extra eq 'passback') {
+                    $passbacksty = 'inline-block';
+                }
+                if ($current->{'passbackformat'} eq '1.0') {
+                    $pb1p0chk =  ' checked="checked"';
+                    $pb1p1chk = '';
+                }
+            }
+        }
+        $output .= $lt{$extra}.'&nbsp;'.
+                   '<label><input type="radio" name="lti_'.$extra.'_'.$num.'" value="0"'.$checkedoff.$onclickpb.' />'.
+                   &mt('No').'</label>'.('&nbsp;'x2).
+                   '<label><input type="radio" name="lti_'.$extra.'_'.$num.'" value="1"'.$checkedon.$onclickpb.' />'.
+                   &mt('Yes').'</label><br />';
+    }
+    $output .= '<div class="LC_floatleft" style="display:'.$passbacksty.';" id="lti_passback_'.$num.'">'.
+               '<span class="LC_nobreak">'.&mt('Grade format').
+               '<label><input type="radio" name="lti_passbackformat_'.$num.'" value="1.1"'.$pb1p1chk.' />'.
+               &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);
+    }
+    $output .= '</span></div></fieldset>';
+#        '<fieldset><legend>'.&mt('Assigning author roles').'</legend>';
+#
+#    $output .= '</fieldset>'.
+#        '<fieldset><legend>'.&mt('Assigning domain roles').'</legend>';
+    return $output;
+}
+
+sub ltimenu_titles {
+    return &Apache::lonlocal::texthash(
+                                        fullname    => 'Full name',
+                                        coursetitle => 'Course title',
+                                        role        => 'Role',
+                                        logout      => 'Logout',
+                                        grades      => 'Grades',
+    );
 }
 
 sub print_coursedefaults {
@@ -5358,18 +6098,17 @@ sub print_coursedefaults {
     my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles);
     my $itemcount = 1;
     my %choices =  &Apache::lonlocal::texthash (
+        canuse_pdfforms      => 'Course/Community users can create/upload PDF forms',
         uploadquota          => 'Default quota for files uploaded directly to course/community using Course Editor (MB)',
         anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys',
         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',
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
@@ -5378,12 +6117,12 @@ sub print_coursedefaults {
                          );
     if ($position eq 'top') {
         %defaultchecked = (
+                            'canuse_pdfforms' => 'off',
                             'uselcmath'       => 'on',
                             'usejsme'         => 'on',
-                            'inline_chem'     => 'on',
                             'canclone'        => 'none',
                           );
-        @toggles = ('uselcmath','usejsme','inline_chem');
+        @toggles = ('canuse_pdfforms','uselcmath','usejsme');
         my $deftex = $Apache::lonnet::deftex;
         if (ref($settings) eq 'HASH') {
             if ($settings->{'texengine'}) {
@@ -5416,13 +6155,13 @@ sub print_coursedefaults {
         $datatable = $mathdisp.$datatable;
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
         $datatable .=
-            '<tr'.$css_class.'><td valign="top">'.
+            '<tr'.$css_class.'><td style="vertical-align: top">'.
             '<span class="LC_nobreak">'.$choices{'canclone'}.
             '</span></td><td class="LC_left_item">';
         my $currcanclone = 'none';
         my $onclick;
         my @cloneoptions = ('none','domain');
-        my %clonetitles = &Apache::lonlocal::texthash (
+        my %clonetitles = (
                              none     => 'No additional course requesters',
                              domain   => "Any course requester in course's domain",
                              instcode => 'Course requests for official courses ...',
@@ -5460,7 +6199,7 @@ sub print_coursedefaults {
                     if ($checked) {
                         $show = 'block';
                     }
-                    $additional = '<div id="cloneinstcode" style="display:'.$show.'" />'.
+                    $additional = '<div id="cloneinstcode" style="display:'.$show.';" />'.
                                   &mt('Institutional codes for new and cloned course have identical:').
                                   '<br />';
                     foreach my $item (@code_order) {
@@ -5490,12 +6229,8 @@ sub print_coursedefaults {
         my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout,%currmysql);
         my $currusecredits = 0;
         my $postsubmitclient = 1;
-        my $ltiauth = 0;
-        my @types = ('official','unofficial','community','textbook');
+        my @types = ('official','unofficial','community','textbook','placement');
         if (ref($settings) eq 'HASH') {
-            if ($settings->{'ltiauth'}) {
-                $ltiauth = 1;
-            }
             $currdefresponder = $settings->{'anonsurvey_threshold'};
             if (ref($settings->{'uploadquota'}) eq 'HASH') {
                 foreach my $type (keys(%{$settings->{'uploadquota'}})) {
@@ -5572,10 +6307,10 @@ sub print_coursedefaults {
         $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
                       $choices{'uploadquota'}.
                       '</span></td>'.
-                      '<td align="right" class="LC_right_item">'.
+                      '<td style="text-align: right" class="LC_right_item">'.
                       '<table><tr>';
         foreach my $type (@types) {
-            $datatable .= '<td align="center">'.&mt($type).'<br />'.
+            $datatable .= '<td style="text-align: center">'.&mt($type).'<br />'.
                            '<input type="text" name="uploadquota_'.$type.'"'.
                            ' value="'.$curruploadquota{$type}.'" size="5" /></td>';
         }
@@ -5590,7 +6325,7 @@ sub print_coursedefaults {
                          '<i>'.&mt('Default credits').'</i><br /><table><tr>';
         foreach my $type (@types) {
             next if ($type eq 'community');
-            $additional .= '<td align="center">'.&mt($type).'<br />'.
+            $additional .= '<td style="text-align: center">'.&mt($type).'<br />'.
                            '<input type="text" name="'.$type.'_credits"'.
                            ' value="'.$defcredits{$type}.'" size="3" /></td>';
         }
@@ -5614,7 +6349,7 @@ sub print_coursedefaults {
                       '<i>'.&mt('Enter 0 to remain disabled until page reload.').'</i><br />'.
                       '<table><tr>';
         foreach my $type (@types) {
-            $additional .= '<td align="center">'.&mt($type).'<br />'.
+            $additional .= '<td style="text-align: center">'.&mt($type).'<br />'.
                            '<input type="text" name="'.$type.'_timeout" value="'.
                            $deftimeout{$type}.'" size="5" /></td>';
         }
@@ -5632,25 +6367,16 @@ sub print_coursedefaults {
         $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
                       $choices{'mysqltables'}.
                       '</span></td>'.
-                      '<td align="right" class="LC_right_item">'.
+                      '<td style="text-align: right" class="LC_right_item">'.
                       '<table><tr>';
         foreach my $type (@types) {
-            $datatable .= '<td align="center">'.&mt($type).'<br />'.
+            $datatable .= '<td style="text-align: center">'.&mt($type).'<br />'.
                            '<input type="text" name="mysqltables_'.$type.'"'.
                            ' value="'.$currmysql{$type}.'" size="8" /></td>';
         }
         $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;
-        $itemcount ++;
+
     }
     $$rowtotal += $itemcount;
     return $datatable;
@@ -5660,7 +6386,7 @@ sub print_selfenrollment {
     my ($position,$dom,$settings,$rowtotal) = @_;
     my ($css_class,$datatable);
     my $itemcount = 1;
-    my @types = ('official','unofficial','community','textbook');
+    my @types = ('official','unofficial','community','textbook','placement');
     if (($position eq 'top') || ($position eq 'middle')) {
         my ($rowsref,$titlesref) = &Apache::lonuserutils::get_selfenroll_titles();
         my %descs = &Apache::lonuserutils::selfenroll_default_descs();
@@ -5881,6 +6607,143 @@ sub print_validation_rows {
     return $datatable;
 }
 
+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') {
+        @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',
+                 );
+        $numinrow = 4;
+        ($othertitle,$usertypes,$types) =
+            &Apache::loncommon::sorted_inst_types($dom);
+    }
+    if (($position eq 'top') || ($position eq 'middle')) {
+        my (%by_ip,%by_location,@intdoms,@instdoms);
+        &build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms);
+        if ($position eq 'top') {
+            my %curr;
+            my @options = ('none','user','domain','auto');
+            my %titles = &Apache::lonlocal::texthash (
+                none   => 'Not allowed',
+                user   => 'User authorizes',
+                domain => 'DC authorizes',
+                auto   => 'Unrestricted',
+                instdom => 'Other domain shares institution/provider',
+                extdom => 'Other domain has different institution/provider',
+            );
+            my %names = &Apache::lonlocal::texthash (
+                domain => 'Domain role',
+                author => 'Co-author role',
+                course => 'Course role',
+                community => 'Community role',
+            );
+            my $primary_id = &Apache::lonnet::domain($dom,'primary');
+            my $intdom = &Apache::lonnet::internet_dom($primary_id);
+            foreach my $domtype ('instdom','extdom') {
+                my (%checked,$skip);
+                $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                $datatable .= '<tr'.$css_class.'><td>'.$titles{$domtype}.'</td>'.
+                              '<td class="LC_left_item">';
+                if ($domtype eq 'instdom') {
+                    unless (@instdoms > 1) {
+                        $datatable .= &mt('Nothing to set, as no domains besides [_1] are hosted by [_2]',$dom,$intdom);
+                        $skip = 1;
+                    }
+                } elsif ($domtype eq 'extdom') {
+                    if (keys(%by_location) == 0) {
+                        $datatable .= &mt('Nothing to set, as no other hosts besides [_1]',$intdom);
+                        $skip = 1;
+                    }
+                }
+                unless ($skip) {
+                    foreach my $roletype ('domain','author','course','community') {
+                        $checked{'auto'} = ' checked="checked"';
+                        if (ref($settings) eq 'HASH') {
+                            if (ref($settings->{approval}) eq 'HASH') {
+                                if (ref($settings->{approval}->{$domtype}) eq 'HASH') {
+                                    if ($settings->{approval}->{$domtype}->{$roletype}=~ /^(none|user|domain)$/) {
+                                        $checked{$1} = ' checked="checked"';
+                                        $checked{'auto'} = '';
+                                    }
+                                }
+                            }
+                        }
+                        $datatable .= '<fieldset><legend>'.$names{$roletype}.'</legend>';
+                        foreach my $option (@options) {
+                            $datatable .= '<span class="LC_nobreak"><label>'.
+                                          '<input type="radio" name="privacy_approval_'.$domtype.'_'.$roletype.'" '.
+                                          'value="'.$option.'"'.$checked{$option}.' />'.$titles{$option}.
+                                          '</label></span>&nbsp; ';
+                        }
+                        $datatable .= '</fieldset>';
+                    }
+                }
+                $datatable .= '</td></tr>';
+                $itemcount ++;
+            }
+        } elsif ($position eq 'middle') {
+            if ((@instdoms > 1) || (keys(%by_location) > 0)) {
+                if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
+                    foreach my $item (@{$types}) {
+                        $datatable .= &modifiable_userdata_row('privacy','othdom_'.$item,$settings,
+                                                               $numinrow,$itemcount,'','','','','',
+                                                               '',$usertypes->{$item});
+                        $itemcount ++;
+                    }
+                }
+                $datatable .= &modifiable_userdata_row('privacy','othdom_default',$settings,
+                                                       $numinrow,$itemcount,'','','','','',
+                                                       '',$othertitle);
+                $itemcount ++;
+            } else {
+                my (@insttypes,%insttitles);
+                if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
+                    @insttypes = @{$types};
+                    %insttitles = %{$usertypes};
+                }
+                foreach my $item (@insttypes,'default') {
+                    my $title;
+                    if ($item eq 'default') {
+                        $title = $othertitle;
+                    } else {
+                        $title = $insttitles{$item};
+                    }
+                    $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                    $datatable .= '<tr'.$css_class.'>'.
+                                  '<td class="LC_left_item">'.$title.'</td>'.
+                                  '<td class="LC_left_item">'.
+                                  &mt('Nothing to set here, as there are no other domains').
+                                  '</td></tr>';
+                    $itemcount ++;
+                }
+            }
+        }
+    } else {
+        my $prefix;
+        if ($position eq 'lower') {
+            $prefix = 'priv';
+        } else {
+            $prefix = 'unpriv';
+        }
+        foreach my $item (@items) {
+            $datatable .= &modifiable_userdata_row('privacy',$prefix.'_'.$item,$settings,
+                                                   $numinrow,$itemcount,'','','','','',
+                                                   '',$names{$item});
+            $itemcount ++;
+        }
+    }
+    if (ref($rowtotal)) {
+        $$rowtotal += $itemcount;
+    }
+    return $datatable;
+}
+
 sub print_passwords {
     my ($position,$dom,$confname,$settings,$rowtotal) = @_;
     my ($datatable,$css_class);
@@ -5902,6 +6765,7 @@ sub print_passwords {
         min            => 'Minimum password length',
         max            => 'Maximum password length',
         chars          => 'Required characters',
+        expire         => 'Password expiration (days)',
         numsaved       => 'Number of previous passwords to save and disallow reuse',
     );
     if ($position eq 'top') {
@@ -6166,7 +7030,95 @@ sub print_passwords {
             $itemcount ++;
         }
     } elsif ($position eq 'lower') {
-        $datatable .= &password_rules('passwords',\$itemcount,$settings);
+        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>';
     } else {
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
         my %ownerchg = (
@@ -6191,7 +7143,7 @@ sub print_passwords {
         $datatable .= '<tr '.$css_class.'>'.
                       '<td>'.
                       &mt('Requirements').'<ul>'.
-                      '<li>'.&mt("Course 'type' is not a Community").'</li>'.
+                      '<li>'.&mt("Course 'type' is not a Community or Placement Test").'</li>'.
                       '<li>'.&mt('User is Course Coordinator and also course owner').'</li>'.
                       '<li>'.&mt("Student's only active roles are student role(s) in course(s) owned by this user").'</li>'.
                       '<li>'.&mt('User, course, and student share same domain').'</li>'.
@@ -6226,393 +7178,127 @@ sub print_passwords {
     return $datatable;
 }
 
-sub password_rules {
-    my ($prefix,$itemcountref,$settings) = @_;
-    my ($min,$max,%chars,$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 'secrets') {
-        %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->{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{'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{'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;
     my $itemcount = 0;
     my $datatable;
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
-    my (%othercontrol,%otherdoms,%aliases,%saml,%values,$setdom,$showdom);
+    my (%othercontrol,%otherdoms,%aliases,%values,$setdom);
     my %lt = &wafproxy_titles();
     foreach my $server (sort(keys(%servers))) {
         my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server});
-        next if ($serverhome eq '');
         my $serverdom;
         if ($serverhome ne $server) {
             $serverdom = &Apache::lonnet::host_domain($serverhome);
-            if (($serverdom ne '') && (&Apache::lonnet::domain($serverdom) ne '')) {
-                $othercontrol{$server} = $serverdom;
-            }
+            $othercontrol{$server} = $serverdom;
         } else {
             $serverdom = &Apache::lonnet::host_domain($server);
-            next if (($serverdom eq '') || (&Apache::lonnet::domain($serverdom) eq ''));
             if ($serverdom ne $dom) {
                 $othercontrol{$server} = $serverdom;
             } else {
                 $setdom = 1;
                 if (ref($settings) eq 'HASH') {
+                    %{$values{$dom}} = ();
                     if (ref($settings->{'alias'}) eq 'HASH') {
                         $aliases{$dom} = $settings->{'alias'};
-                        if ($aliases{$dom} ne '') {
-                            $showdom = 1;
-                        }
                     }
-                    if (ref($settings->{'saml'}) eq 'HASH') {
-                        $saml{$dom} = $settings->{'saml'};
+                    foreach my $item ('ipheader','trusted','vpnint','vpnext') {
+                        $values{$dom}{$item} = $settings->{$item};
                     }
                 }
             }
         }
     }
-    if ($setdom) {
-        %{$values{$dom}} = ();
-        if (ref($settings) eq 'HASH') {
-            foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') {
-                $values{$dom}{$item} = $settings->{$item};
-            }
-        }
-    }
     if (keys(%othercontrol)) {
         %otherdoms = reverse(%othercontrol);
         foreach my $domain (keys(%otherdoms)) {
             %{$values{$domain}} = ();
             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'})) {
-                    $saml{$domain} = $config{'wafproxy'}{'saml'};
-                }
-                foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') {
-                    $values{$domain}{$item} = $config{'wafproxy'}{$item};
+            if (ref($config{$domain}) eq 'HASH') {
+                if (ref($config{$domain}{'wafproxy'}) eq 'HASH') {
+                    $aliases{$domain} = $config{$domain}{'wafproxy'}{'alias'};
+                    foreach my $item ('ipheader','trusted','vpnint','vpnext') {
+                        $values{$domain}{$item} = $config{$domain}{'wafproxy'}{$item};
+                    }
                 }
             }
         }
     }
     if ($position eq 'top') {
         my %servers = &Apache::lonnet::internet_dom_servers($dom);
-        my %aliasinfo;
         foreach my $server (sort(keys(%servers))) {
-            $itemcount ++;
-            my $dom_in_effect;
-            my $aliasrows = '<tr>'.
-                            '<td class="LC_left_item" style="vertical-align: baseline;">'.
-                            &mt('Hostname').':&nbsp;'.
-                            '<i>'.&Apache::lonnet::hostname($server).'</i></td><td>&nbsp;</td>';
+            $itemcount ++; 
+            $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+            $datatable .= '<tr'.$css_class.'>'.
+                          '<td>'.&mt('Hostname').':&nbsp;'.
+                                &Apache::lonnet::hostname($server).'</td>'.
+                          '<td class="LC_right_item">';
             if ($othercontrol{$server}) {
-                $dom_in_effect = $othercontrol{$server};
-                my ($current,$forsaml);
-                if (ref($aliases{$dom_in_effect}) eq 'HASH') {
-                    $current = $aliases{$dom_in_effect}{$server};
-                }
-                if (ref($saml{$dom_in_effect}) eq 'HASH') {
-                    if ($saml{$dom_in_effect}{$server}) {
-                        $forsaml = 1;
-                    }
+                my $current;
+                if (ref($aliases{$othercontrol{$server}}) eq 'HASH') {
+                    $current = $aliases{$othercontrol{$server}{$server}};
                 }
-                $aliasrows .= '<td class="LC_left_item" style="vertical-align: baseline;">'.
-                              &mt('Alias').':&nbsp';
                 if ($current) {
-                    $aliasrows .= $current;
-                    if ($forsaml) {
-                         $aliasrows .= '&nbsp;('.&mt('also for SSO Auth').')';
-                    }
+                    $datatable .= $current;
                 } else {
-                    $aliasrows .= &mt('None');
+                    $datatable .= &mt('None in effect');
                 }
-                $aliasrows .= '&nbsp;<span class="LC_small">('.
-                              &mt('controlled by domain: [_1]',
-                                  '<b>'.$dom_in_effect.'</b>').')</span></td>';
+                $datatable .= '<br /><span class="LC_small">('.
+                              &mt('WAF/Reverse Proxy controlled by domain: [_1]',
+                                  '<b>'.$othercontrol{$server}.'</b>').'</span>';
             } else {
-                $dom_in_effect = $dom;
-                my ($current,$samlon,$samloff);
-                $samloff = ' checked="checked"';
+                my $current;
                 if (ref($aliases{$dom}) eq 'HASH') {
                     if ($aliases{$dom}{$server}) {
                         $current = $aliases{$dom}{$server};
                     }
                 }
-                if (ref($saml{$dom}) eq 'HASH') {
-                    if ($saml{$dom}{$server}) {
-                        $samlon = $samloff;
-                        undef($samloff);
-                    }
-                }
-                $aliasrows .= '<td class="LC_left_item" style="vertical-align: baseline;">'.
-                              &mt('Alias').':&nbsp;'.
-                              '<input type="text" name="wafproxy_alias_'.$server.'" '.
-                              'value="'.$current.'" size="30" />'.
-                              ('&nbsp;'x2).'<span class="LC_nobreak">'.
-                              &mt('Alias used for SSO Auth').':&nbsp;<label>'.
-                              '<input type="radio" value="0"'.$samloff.' name="wafproxy_alias_saml_'.$server.'" />'.
-                              &mt('No').'</label>&nbsp;<label>'.
-                              '<input type="radio" value="1"'.$samlon.' name="wafproxy_alias_saml_'.$server.'" />'.
-                              &mt('Yes').'</label></span>'.
-                              '</td>';
-            }
-            $aliasrows .= '</tr>';
-            $aliasinfo{$dom_in_effect} .= $aliasrows;
-        }
-        if ($aliasinfo{$dom}) {
-            my ($onclick,$wafon,$wafoff,$showtable);
-            $onclick = ' onclick="javascript:toggleWAF();"';
-            $wafoff = ' checked="checked"';
-            $showtable = ' style="display:none";';
-            if ($showdom) {
-                $wafon = $wafoff;
-                $wafoff = '';
-                $showtable = ' style="display:inline;"';
-            }
-            $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-            $datatable = '<tr'.$css_class.'>'.
-                         '<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$dom.'</b>').'<br />'.
-                         '<span class="LC_nobreak">'.&mt('WAF in use?').'&nbsp;<label>'.
-                         '<input type="radio" name="wafproxy_'.$dom.'" value="1"'.$wafon.$onclick.' />'.
-                         &mt('Yes').'</label>'.('&nbsp;'x2).'<label>'.
-                         '<input type="radio" name="wafproxy_'.$dom.'" value="0"'.$wafoff.$onclick.' />'.
-                         &mt('No').'</label></span></td>'.
-                         '<td class="LC_left_item">'.
-                         '<table id="wafproxy_table"'.$showtable.'>'.$aliasinfo{$dom}.
-                         '</table></td></tr>';
-            $itemcount++;
-        }
-        if (keys(%otherdoms)) {
-            foreach my $key (sort(keys(%otherdoms))) {
-                $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-                $datatable .= '<tr'.$css_class.'>'.
-                              '<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$key.'</b>').'</td>'.
-                              '<td class="LC_left_item"><table>'.$aliasinfo{$key}.
-                              '</table></td></tr>';
-                $itemcount++;
+                $datatable .= '<input type="text" name="wafproxy_alias_'.$server.'" '.
+                              'value="'.$current.'" size="30" />';
             }
+            $datatable .= '</td></tr>';
         }
     } else {
-        my %ip_methods = &remoteip_methods();
         if ($setdom) {
             $itemcount ++;
             $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-            my ($nowafstyle,$wafstyle,$curr_remotip,$currwafdisplay,$vpndircheck,$vpnaliascheck,
-                $currwafvpn,$wafrangestyle,$alltossl,$ssltossl);
-            $wafstyle = ' style="display:none;"';
-            $nowafstyle = ' style="display:table-row;"';
-            $currwafdisplay = ' style="display: none"';
-            $wafrangestyle = ' style="display: none"';
-            $curr_remotip = 'n';
-            $ssltossl = ' checked="checked"';
-            if ($showdom) {
-                $wafstyle = ' style="display:table-row;"';
-                $nowafstyle =  ' style="display:none;"';
-                if (keys(%{$values{$dom}})) {
-                    if ($values{$dom}{remoteip} =~ /^[nmh]$/) {
-                        $curr_remotip = $values{$dom}{remoteip};
-                    }
-                    if ($curr_remotip eq 'h') {
-                        $currwafdisplay = ' style="display:table-row"';
-                        $wafrangestyle = ' style="display:inline-block;"';
-                    }
-                    if ($values{$dom}{'sslopt'}) {
-                        $alltossl = ' checked="checked"';
-                        $ssltossl = '';
-                    }
-                }
-                if (($values{$dom}{'vpnint'} ne '') || ($values{$dom}{'vpnext'} ne '')) {
-                    $vpndircheck = ' checked="checked"';
-                    $currwafvpn = ' style="display:table-row;"';
-                    $wafrangestyle = ' style="display:inline-block;"';
-                } else {
-                    $vpnaliascheck = ' checked="checked"';
-                    $currwafvpn = ' style="display:none;"';
-                }
-            }
-            $datatable .= '<tr'.$css_class.' id="nowafproxyrow_'.$dom.'"'.$wafstyle.'>'.
-                          '<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$dom.'</b>').'</td>'.
-                          '<td class="LC_right_item">'.&mt('WAF not in use, nothing to set').'</td>'.
-                          '</tr>'.
-                          '<tr'.$css_class.' id="wafproxyrow_'.$dom.'"'.$wafstyle.'>'.
+            $datatable .= '<tr'.$css_class.'>'.
                           '<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').'<br />'.
-                          &mt('Range(s) stored in CIDR notation').'</div></td>'.
-                          '<td class="LC_left_item"><table>'.
-                          '<tr>'.
-                          '<td valign="top">'.$lt{'remoteip'}.':&nbsp;'.
-                          '<select name="wafproxy_remoteip" id="wafproxy_remoteip" onchange="javascript:updateWAF();">';
-            foreach my $option ('m','h','n') {
-                my $sel;
-                if ($option eq $curr_remotip) {
-                   $sel = ' selected="selected"';
-                }
-                $datatable .= '<option value="'.$option.'"'.$sel.'>'.
-                              $ip_methods{$option}.'</option>';
-            }
-            $datatable .= '</select></td></tr>'."\n".
-                          '<tr id="wafproxy_header"'.$currwafdisplay.'><td>'.
-                          $lt{'ipheader'}.':&nbsp;'.
-                          '<input type="text" value="'.$values{$dom}{'ipheader'}.'" '.
-                          'name="wafproxy_ipheader" />'.
-                          '</td></tr>'."\n".
-                          '<tr id="wafproxy_trust"'.$currwafdisplay.'><td>'.
-                          $lt{'trusted'}.':<br />'.
-                          '<textarea name="wafproxy_trusted" rows="3" cols="80">'.
-                          $values{$dom}{'trusted'}.'</textarea>'.
-                          '</td></tr>'."\n".
-                          '<tr><td><hr /></td></tr>'."\n".
-                          '<tr>'.
-                          '<td valign="top">'.$lt{'vpnaccess'}.':<br /><span class="LC_nobreak">'.
-                          '<label><input type="radio" name="wafproxy_vpnaccess"'.$vpndircheck.' value="1" onclick="javascript:checkWAF();" />'.
-                          $lt{'vpndirect'}.'</label>'.('&nbsp;'x2).
-                          '<label><input type="radio" name="wafproxy_vpnaccess"'.$vpnaliascheck.' value="0" onclick="javascript:checkWAF();" />'.
-                          $lt{'vpnaliased'}.'</label></span></td></tr>';
-            foreach my $item ('vpnint','vpnext') {
-                $datatable .= '<tr id="wafproxy_show_'.$item.'"'.$currwafvpn.'>'.
-                              '<td valign="top">'.$lt{$item}.':<br />'.
-                              '<textarea name="wafproxy_'.$item.'" rows="3" cols="80">'.
-                              $values{$dom}{$item}.'</textarea>'.
-                              '</td></tr>'."\n";
-            }
-            $datatable .= '<tr><td><hr /></td></tr>'."\n".
-                          '<tr>'.
-                          '<td valign="top">'.$lt{'sslopt'}.':<br /><span class="LC_nobreak">'.
-                          '<label><input type="radio" name="wafproxy_sslopt"'.$alltossl.' value="1" />'.
-                          $lt{'alltossl'}.'</label>'.('&nbsp;'x2).
-                          '<label><input type="radio" name="wafproxy_sslopt"'.$ssltossl.' value="0" />'.
-                          $lt{'ssltossl'}.'</label></span></td></tr>'."\n".
-                          '</table></td></tr>';
+                          &mt('Format for comma separated IP blocks').':<br />'.
+                          &mt('A.B.C.D/N or A.B.C.D - E.F.G.H').'</td>'.
+                          '<td class="LC_left_item"><table>';
+            foreach my $item ('ipheader','trusted','vpnint','vpnext') {
+                $datatable .= '<tr>'.
+                              '<td valign="top">'.$lt{$item}.':&nbsp;';
+                if ($item eq 'ipheader') {
+                    $datatable .= '<input type="text" value="'.$values{$dom}{$item}.'" '.
+                                  'name="wafproxy_'.$item.'" />';
+ 
+                } else {
+                    $datatable .= '<textarea name="wafproxy_'.$item.'" rows="3" cols="80">'.
+                                  $values{$dom}{$item}.'</textarea>';
+                }
+                $datatable .= '</td></tr>';
+            }
+            $datatable .= '</table></td></tr>';
         }
         if (keys(%otherdoms)) {
             foreach my $domain (sort(keys(%otherdoms))) {
                 $itemcount ++;
                 $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
                 $datatable .= '<tr'.$css_class.'>'.
-                              '<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$domain.'</b>').'</td>'.
+                              '<td class="LC_left_item">'.&mt('Domain: [_1]',$domain).'</td>'.
                               '<td class="LC_left_item"><table>';
-                foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') {
+                foreach my $item ('ipheader','trusted','vpnint','vpnext') {
                     my $showval = &mt('None');
-                    if ($item eq 'ssl') {
-                        $showval = $lt{'ssltossl'};
-                    }
                     if ($values{$domain}{$item}) {
-                        $showval = $values{$domain}{$item};
-                        if ($item eq 'ssl') {
-                            $showval = $lt{'alltossl'};
-                        } elsif ($item eq 'remoteip') {
-                            $showval = $ip_methods{$values{$domain}{$item}};
-                        }
+                        $showval = $values{$domain}{$item}; 
                     }
                     $datatable .= '<tr>'.
                                   '<td>'.$lt{$item}.':&nbsp;'.$showval.'</td></tr>';
                 }
-                $datatable .= '</table></td></tr>';
+                $datatable .= '</table></td></tr>'; 
             }
         }
     }
@@ -6622,39 +7308,23 @@ sub print_wafproxy {
 
 sub wafproxy_titles {
     return &Apache::lonlocal::texthash(
-               remoteip   => "Method for determining user's IP",
-               ipheader   => 'Request header containing remote IP',
-               trusted    => 'Trusted IP range(s)',
-               vpnaccess  => 'Access from institutional VPN',
-               vpndirect  => 'via regular hostname (no WAF)',
-               vpnaliased => 'via aliased hostname (WAF)',
-               vpnint     => 'Internal IP Range(s) for VPN sessions',
-               vpnext     => 'IP Range(s) for backend WAF connections',
-               sslopt     => 'Forwarding http/https',
-               alltossl   => 'WAF forwards both http and https requests to https',
-               ssltossl   => 'WAF forwards http requests to http and https to https',
-           );
-}
-
-sub remoteip_methods {
-    return &Apache::lonlocal::texthash(
-              m => 'Use Apache mod_remoteip',
-              h => 'Use headers parsed by LON-CAPA',
-              n => 'Not in use',
+               vpnint => 'Internal IP Range(s) for VPN sessions',
+               vpnext => 'IP Range for backend WAF connections',
+               trusted => 'Trusted IP range(s)',
+               ipheader => 'Custom request header',
            );
 }
 
 sub print_usersessions {
     my ($position,$dom,$settings,$rowtotal) = @_;
-    my ($css_class,$datatable,%checked,%choices);
-    my (%by_ip,%by_location,@intdoms);
-    &build_location_hashes(\@intdoms,\%by_ip,\%by_location);
+    my ($css_class,$datatable,$itemcount,%checked,%choices);
+    my (%by_ip,%by_location,@intdoms,@instdoms);
+    &build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms);
 
     my @alldoms = &Apache::lonnet::all_domains();
     my %serverhomes = %Apache::lonnet::serverhomeIDs;
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
     my %altids = &id_for_thisdom(%servers);
-    my $itemcount = 1;
     if ($position eq 'top') {
         if (keys(%serverhomes) > 1) {
             my %spareid = &current_offloads_to($dom,$settings,\%servers);
@@ -6672,118 +7342,256 @@ sub print_usersessions {
                                       $other_insts,$curroffloadnow,$curroffloadoth,$rowtotal);
         } else {
             $datatable .= '<tr'.$css_class.'><td colspan="2">'.
-                          &mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.');
+                          &mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.').
+                          '</td></tr>';
         }
     } else {
-        if (keys(%by_location) == 0) {
-            $datatable .= '<tr'.$css_class.'><td colspan="2">'.
-                          &mt('Nothing to set here, as the cluster to which this domain belongs only contains one institution.');
+        my %titles = &usersession_titles();
+        my ($prefix,@types);
+        if ($position eq 'bottom') {
+            $prefix = 'remote';
+            @types = ('version','excludedomain','includedomain');
         } else {
-            my %lt = &usersession_titles();
-            my $numinrow = 5;
-            my $prefix;
-            my @types;
-            if ($position eq 'bottom') {
-                $prefix = 'remote';
-                @types = ('version','excludedomain','includedomain');
-            } else {
-                $prefix = 'hosted';
-                @types = ('excludedomain','includedomain');
-            }
-            my (%current,%checkedon,%checkedoff);
-            my @lcversions = &Apache::lonnet::all_loncaparevs();
-            my @locations = sort(keys(%by_location));
-            foreach my $type (@types) {
-                $checkedon{$type} = '';
-                $checkedoff{$type} = ' checked="checked"';
-            }
-            if (ref($settings) eq 'HASH') {
-                if (ref($settings->{$prefix}) eq 'HASH') {
-                    foreach my $key (keys(%{$settings->{$prefix}})) {
-                        $current{$key} = $settings->{$prefix}{$key};
-                        if ($key eq 'version') {
-                            if ($current{$key} ne '') {
-                                $checkedon{$key} = ' checked="checked"';
-                                $checkedoff{$key} = '';
-                            }
-                        } elsif (ref($current{$key}) eq 'ARRAY') {
+            $prefix = 'hosted';
+            @types = ('excludedomain','includedomain');
+        }
+        ($datatable,$itemcount) = &rules_by_location($settings,$prefix,\%by_location,\%by_ip,\@types,\%titles);
+    }
+    $$rowtotal += $itemcount;
+    return $datatable;
+}
+
+sub rules_by_location {
+    my ($settings,$prefix,$by_location,$by_ip,$types,$titles) = @_; 
+    my ($datatable,$itemcount,$css_class);
+    if (keys(%{$by_location}) == 0) {
+        $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+        $datatable = '<tr'.$css_class.'><td colspan="2">'.
+                     &mt('Nothing to set here, as the cluster to which this domain belongs only contains one institution.').
+                     '</td></tr>';
+        $itemcount = 1;
+    } else {
+        $itemcount = 0;
+        my $numinrow = 5;
+        my (%current,%checkedon,%checkedoff);
+        my @locations = sort(keys(%{$by_location}));
+        foreach my $type (@{$types}) {
+            $checkedon{$type} = '';
+            $checkedoff{$type} = ' checked="checked"';
+        }
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{$prefix}) eq 'HASH') {
+                foreach my $key (keys(%{$settings->{$prefix}})) {
+                    $current{$key} = $settings->{$prefix}{$key};
+                    if ($key eq 'version') {
+                        if ($current{$key} ne '') {
                             $checkedon{$key} = ' checked="checked"';
                             $checkedoff{$key} = '';
                         }
+                    } elsif (ref($current{$key}) eq 'ARRAY') {
+                        $checkedon{$key} = ' checked="checked"';
+                        $checkedoff{$key} = '';
                     }
                 }
             }
-            foreach my $type (@types) {
-                next if ($type ne 'version' && !@locations);
-                $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-                $datatable .= '<tr'.$css_class.'>
-                               <td><span class="LC_nobreak">'.$lt{$type}.'</span><br />
-                               <span class="LC_nobreak">&nbsp;
-                               <label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedoff{$type}.' value="0" />'.&mt('Not in use').'</label>&nbsp;
-                               <label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedon{$type}.' value="1" />'.&mt('In use').'</label></span></td><td>';
-                if ($type eq 'version') {
-                    my $selector = '<select name="'.$prefix.'_version">';
-                    foreach my $version (@lcversions) {
-                        my $selected = '';
-                        if ($current{'version'} eq $version) {
-                            $selected = ' selected="selected"';
-                        }
-                        $selector .= ' <option value="'.$version.'"'.
-                                     $selected.'>'.$version.'</option>';
+        }
+        foreach my $type (@{$types}) {
+            next if ($type ne 'version' && !@locations);
+            $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+            $datatable .= '<tr'.$css_class.'>
+                           <td><span class="LC_nobreak">'.$titles->{$type}.'</span><br />
+                           <span class="LC_nobreak">&nbsp;
+                           <label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedoff{$type}.' value="0" />'.&mt('Not in use').'</label>&nbsp;
+                           <label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedon{$type}.' value="1" />'.&mt('In use').'</label></span></td><td>';
+            if ($type eq 'version') {
+                my @lcversions = &Apache::lonnet::all_loncaparevs();
+                my $selector = '<select name="'.$prefix.'_version">';
+                foreach my $version (@lcversions) {
+                    my $selected = '';
+                    if ($current{'version'} eq $version) {
+                        $selected = ' selected="selected"';
                     }
-                    $selector .= '</select> ';
-                    $datatable .= &mt('remote server must be version: [_1] or later',$selector);
-                } else {
-                    $datatable.= '<div><input type="button" value="'.&mt('check all').'" '.
-                                 'onclick="javascript:checkAll(document.display.'.$prefix.'_'.$type.')"'.
-                                 ' />'.('&nbsp;'x2).
-                                 '<input type="button" value="'.&mt('uncheck all').'" '.
-                                 'onclick="javascript:uncheckAll(document.display.'.$prefix.'_'.$type.')" />'.
-                                 "\n".
-                                 '</div><div><table>';
-                    my $rem;
-                    for (my $i=0; $i<@locations; $i++) {
-                        my ($showloc,$value,$checkedtype);
-                        if (ref($by_location{$locations[$i]}) eq 'ARRAY') {
-                            my $ip = $by_location{$locations[$i]}->[0];
-                            if (ref($by_ip{$ip}) eq 'ARRAY') {
-                                 $value = join(':',@{$by_ip{$ip}});
-                                $showloc = join(', ',@{$by_ip{$ip}});
-                                if (ref($current{$type}) eq 'ARRAY') {
-                                    foreach my $loc (@{$by_ip{$ip}}) {  
-                                        if (grep(/^\Q$loc\E$/,@{$current{$type}})) {
-                                            $checkedtype = ' checked="checked"';
-                                            last;
-                                        }
+                    $selector .= ' <option value="'.$version.'"'.
+                                 $selected.'>'.$version.'</option>';
+                }
+                $selector .= '</select> ';
+                $datatable .= &mt('remote server must be version: [_1] or later',$selector);
+            } else {
+                $datatable.= '<div><input type="button" value="'.&mt('check all').'" '.
+                             'onclick="javascript:checkAll(document.display.'.$prefix.'_'.$type.')"'.
+                             ' />'.('&nbsp;'x2).
+                             '<input type="button" value="'.&mt('uncheck all').'" '.
+                             'onclick="javascript:uncheckAll(document.display.'.$prefix.'_'.$type.')" />'.
+                             "\n".
+                             '</div><div><table>';
+                my $rem;
+                for (my $i=0; $i<@locations; $i++) {
+                    my ($showloc,$value,$checkedtype);
+                    if (ref($by_location->{$locations[$i]}) eq 'ARRAY') {
+                        my $ip = $by_location->{$locations[$i]}->[0];
+                        if (ref($by_ip->{$ip}) eq 'ARRAY') {
+                            $value = join(':',@{$by_ip->{$ip}});
+                            $showloc = join(', ',@{$by_ip->{$ip}});
+                            if (ref($current{$type}) eq 'ARRAY') {
+                                foreach my $loc (@{$by_ip->{$ip}}) {
+                                    if (grep(/^\Q$loc\E$/,@{$current{$type}})) {
+                                        $checkedtype = ' checked="checked"';
+                                        last;
                                     }
                                 }
                             }
                         }
-                        $rem = $i%($numinrow);
-                        if ($rem == 0) {
-                            if ($i > 0) {
-                                $datatable .= '</tr>';
-                            }
-                            $datatable .= '<tr>';
-                        }
-                        $datatable .= '<td class="LC_left_item">'.
-                                      '<span class="LC_nobreak"><label>'.
-                                      '<input type="checkbox" name="'.$prefix.'_'.$type.
-                                      '" value="'.$value.'"'.$checkedtype.' />'.$showloc.
-                                      '</label></span></td>';
                     }
-                    $rem = @locations%($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>';
+                    $rem = $i%($numinrow);
+                    if ($rem == 0) {
+                        if ($i > 0) {
+                            $datatable .= '</tr>';
+                        }
+                        $datatable .= '<tr>';
+                    }
+                    $datatable .= '<td class="LC_left_item">'.
+                                  '<span class="LC_nobreak"><label>'.
+                                  '<input type="checkbox" name="'.$prefix.'_'.$type.
+                                  '" value="'.$value.'"'.$checkedtype.' />'.$showloc.
+                                  '</label></span></td>';
+                }
+                $rem = @locations%($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 .= '</tr></table>';
+            }
+            $datatable .= '</td></tr>';
+            $itemcount ++;
+        }
+    }
+    return ($datatable,$itemcount);
+}
+
+sub print_ssl {
+    my ($position,$dom,$settings,$rowtotal) = @_;
+    my ($css_class,$datatable);
+    my $itemcount = 1;
+    if ($position eq 'top') {
+        my $primary_id = &Apache::lonnet::domain($dom,'primary');
+        my $intdom = &Apache::lonnet::internet_dom($primary_id);
+        my $same_institution;
+        if ($intdom ne '') {
+            my $internet_names = &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'});
+            if (ref($internet_names) eq 'ARRAY') {
+                if (grep(/^\Q$intdom\E$/,@{$internet_names})) {
+                    $same_institution = 1;
+                }
+            }
+        }
+        $css_class = $itemcount%2?' class="LC_odd_row"':'';
+        $datatable = '<tr'.$css_class.'><td colspan="2">';
+        if ($same_institution) {
+            my %domservers = &Apache::lonnet::get_servers($dom);
+            $datatable .= &LONCAPA::SSL::print_certstatus(\%domservers,'web','domprefs');
+        } else {
+            $datatable .= &mt("You need to be logged into one of your own domain's servers to display information about the status of LON-CAPA SSL certificates.");
+        }
+        $datatable .= '</td></tr>';
+        $itemcount ++;
+    } else {
+        my %titles = &ssl_titles();
+        my (%by_ip,%by_location,@intdoms,@instdoms);
+        &build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms);
+        my @alldoms = &Apache::lonnet::all_domains();
+        my %serverhomes = %Apache::lonnet::serverhomeIDs;
+        my @domservers = &Apache::lonnet::get_servers($dom);
+        my %servers = &Apache::lonnet::internet_dom_servers($dom);
+        my %altids = &id_for_thisdom(%servers);
+        if (($position eq 'connto') || ($position eq 'connfrom')) {
+            my $legacy;
+            unless (ref($settings) eq 'HASH') {
+                my $name;
+                if ($position eq 'connto') {
+                    $name = 'loncAllowInsecure';
+                } else {
+                    $name = 'londAllowInsecure';
+                }
+                my $primarylibserv = &Apache::lonnet::domain($dom,'primary');
+                my @ids=&Apache::lonnet::current_machine_ids();
+                if (($primarylibserv ne '') && (!grep(/^\Q$primarylibserv\E$/,@ids))) {
+                    my %what = (
+                                   $name => 1,
+                               );
+                    my ($result,$returnhash) =
+                        &Apache::lonnet::get_remote_globals($primarylibserv,\%what);
+                    if ($result eq 'ok') {
+                        if (ref($returnhash) eq 'HASH') {
+                            $legacy = $returnhash->{$name};
+                        }
+                    }
+                } else {
+                    $legacy = $Apache::lonnet::perlvar{$name};
+                }
+            }
+            foreach my $type ('dom','intdom','other') {
+                my %checked;
+                $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                $datatable .= '<tr'.$css_class.'><td>'.$titles{$type}.'</td>'.
+                              '<td class="LC_right_item">';
+                my $skip; 
+                if ($type eq 'dom') {
+                    unless (keys(%servers) > 1) {
+                        $datatable .= &mt('Nothing to set here, as there are no other servers/VMs');    
+                        $skip = 1;
+                    }
+                }
+                if ($type eq 'intdom') {
+                    unless (@instdoms > 1) {
+                        $datatable .= &mt('Nothing to set here, as there are no other domains for this institution');
+                        $skip = 1;
+                    } 
+                } elsif ($type eq 'other') {
+                    if (keys(%by_location) == 0) {
+                        $datatable .= &mt('Nothing to set here, as there are no other institutions');
+                        $skip = 1;
+                    }
+                }
+                unless ($skip) {
+                    $checked{'yes'} = ' checked="checked"'; 
+                    if (ref($settings) eq 'HASH') {
+                        if (ref($settings->{$position}) eq 'HASH') {
+                            if ($settings->{$position}->{$type} =~ /^(no|req)$/) {
+                                $checked{$1} = $checked{'yes'};
+                                delete($checked{'yes'}); 
+                            }
+                        }
+                    } else {
+                        if ($legacy == 0) {
+                            $checked{'req'} = $checked{'yes'};
+                            delete($checked{'yes'});    
+                        }
+                    }
+                    foreach my $option ('no','yes','req') {
+                        $datatable .= '<span class="LC_nobreak"><label>'.
+                                      '<input type="radio" name="'.$position.'_'.$type.'" '.
+                                      'value="'.$option.'"'.$checked{$option}.' />'.$titles{$option}.
+                                      '</label></span>'.('&nbsp;'x2);
                     }
-                    $datatable .= '</tr></table>';
                 }
                 $datatable .= '</td></tr>';
+                $itemcount ++; 
+            }
+        } else {
+            my $prefix = 'replication';
+            my @types = ('certreq','nocertreq');
+            if (keys(%by_location) == 0) {
+                $datatable .= '<tr'.$css_class.'><td>'.
+                              &mt('Nothing to set here, as there are no other institutions').
+                              '</td></tr>';
                 $itemcount ++;
+            } else {
+                ($datatable,$itemcount) = 
+                    &rules_by_location($settings,$prefix,\%by_location,\%by_ip,\@types,\%titles);
             }
         }
     }
@@ -6791,10 +7599,60 @@ sub print_usersessions {
     return $datatable;
 }
 
+sub ssl_titles {
+    return &Apache::lonlocal::texthash (
+               dom           => 'LON-CAPA servers/VMs from same domain',
+               intdom        => 'LON-CAPA servers/VMs from same "internet" domain',
+               other         => 'External LON-CAPA servers/VMs',
+               connto        => 'Connections to other servers',
+               connfrom      => 'Connections from other servers',
+               replication   => 'Replicating content to other institutions',
+               certreq       => 'Client certificate required, but specific domains exempt',
+               nocertreq     => 'No client certificate required, except for specific domains',
+               no            => 'SSL not used',
+               yes           => 'SSL Optional (used if available)',
+               req           => 'SSL Required',
+    );
+}
+
+sub print_trust {
+    my ($prefix,$dom,$settings,$rowtotal) = @_;
+    my ($css_class,$datatable,%checked,%choices);
+    my (%by_ip,%by_location,@intdoms,@instdoms);
+    &build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms);
+    my $itemcount = 1;
+    my %titles = &trust_titles();
+    my @types = ('exc','inc');
+    if ($prefix eq 'top') {
+        $prefix = 'content';
+    } elsif ($prefix eq 'bottom') {
+        $prefix = 'msg';
+    }
+    ($datatable,$itemcount) = &rules_by_location($settings,$prefix,\%by_location,\%by_ip,\@types,\%titles);
+    $$rowtotal += $itemcount;
+    return $datatable;
+}
+
+sub trust_titles {
+    return &Apache::lonlocal::texthash(
+               content  => "Access to this domain's content by others",
+               shared   => "Access to other domain's content by this domain",
+               enroll   => "Enrollment in this domain's courses by others", 
+               othcoau  => "Co-author roles in this domain for others",
+               coaurem  => "Co-author roles for this domain's users elsewhere", 
+               domroles => "Domain roles in this domain assignable to others",
+               catalog  => "Course Catalog for this domain displayed elsewhere",
+               reqcrs   => "Requests for creation of courses in this domain by others",
+               msg      => "Users in other domains can send messages to this domain",
+               exc      => "Allow all, but exclude specific domains",
+               inc      => "Deny all, but include specific domains",
+           );
+} 
+
 sub build_location_hashes {
-    my ($intdoms,$by_ip,$by_location) = @_;
+    my ($intdoms,$by_ip,$by_location,$instdoms) = @_;
     return unless((ref($intdoms) eq 'ARRAY') && (ref($by_ip) eq 'HASH') &&
-                  (ref($by_location) eq 'HASH')); 
+                  (ref($by_location) eq 'HASH') && (ref($instdoms) eq 'ARRAY'));
     my %iphost = &Apache::lonnet::get_iphost();
     my $primary_id = &Apache::lonnet::domain($env{'request.role.domain'},'primary');
     my $primary_ip = &Apache::lonnet::get_host_ip($primary_id);
@@ -6811,7 +7669,13 @@ sub build_location_hashes {
             foreach my $id (@{$iphost{$ip}}) {
                 my $location = &Apache::lonnet::internet_dom($id);
                 if ($location) {
-                    next if (grep(/^\Q$location\E$/,@{$intdoms}));
+                    if (grep(/^\Q$location\E$/,@{$intdoms})) {
+                        my $dom = &Apache::lonnet::host_domain($id);
+                        unless (grep(/^\Q$dom\E/,@{$instdoms})) {
+                            push(@{$instdoms},$dom);
+                        }
+                        next;
+                    }
                     if (ref($by_ip->{$ip}) eq 'ARRAY') {
                         unless(grep(/^\Q$location\E$/,@{$by_ip->{$ip}})) {
                             push(@{$by_ip->{$ip}},$location);
@@ -7131,7 +7995,7 @@ sub print_loadbalancing {
         my $disabled_div_style = 'display: block';
         my $homedom_div_style = 'display: none';
         $datatable .= '<tr class="'.$css_class[$cssidx].'">'.
-                      '<td rowspan="'.$rownum.'" valign="top">'.
+                      '<td rowspan="'.$rownum.'" style="vertical-align: top">'.
                       '<p>';
         if ($lonhost eq '') {
             $datatable .= '<span class="LC_nobreak">';
@@ -7164,7 +8028,7 @@ sub print_loadbalancing {
                 $homedom_div_style = 'display: block';
             }
         }
-        $datatable .= '</p></td><td rowspan="'.$rownum.'" valign="top">'.
+        $datatable .= '</p></td><td rowspan="'.$rownum.'" style="vertical-align: top">'.
                   '<div id="loadbalancing_disabled_'.$balnum.'" style="'.
                   $disabled_div_style.'">'.$disabledtext.'</div>'."\n".
                   '<div id="loadbalancing_targets_'.$balnum.'" style="'.$targets_div_style.'">'.&mt('Offloads to:').'<br />';
@@ -7175,7 +8039,7 @@ sub print_loadbalancing {
                                   no => ' checked="checked"',
                               );
         my %balcookiechecked = (
-                                  no => ' checked="checked"',
+                                  no => ' checked="checked"', 
                                );
         foreach my $sparetype (@sparestypes) {
             my $targettable;
@@ -7393,10 +8257,10 @@ sub loadbalance_rule_row {
     }
     my $space;
     if ($islast && $num == 1) {
-        $space = '<div display="inline-block">&nbsp;</div>';
+        $space = '<div style="display:inline-block;">&nbsp;</div>';
     }
     my $output =
-        '<tr class="'.$css_class.'" id="balanceruletr_'.$balnum.'_'.$num.'"><td valign="top">'.$space.
+        '<tr class="'.$css_class.'" id="balanceruletr_'.$balnum.'_'.$num.'"><td style="vertical-align: top">'.$space.
         '<div id="balanceruletitle_'.$balnum.'_'.$type.'" style="'.$style.'">'.$title.'</div></td>'."\n".
         '<td valaign="top">'.$space.
         '<div id="balancerule_'.$balnum.'_'.$type.'" style="'.$style.'">'."\n";
@@ -7486,8 +8350,8 @@ sub contact_titles {
                    'updatesmail'     => 'E-mail from nightly check of LON-CAPA module integrity/updates',
                    'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID',
                    'hostipmail'      => 'E-mail from nightly check of hostname/IP network changes',
-                   'errorthreshold'  => 'Error count threshold for status e-mail to admin(s)',
-                   'errorsysmail'    => 'Error count threshold for e-mail to developer group',
+                   'errorthreshold'  => 'Error/warning threshold for status e-mail',
+                   'errorsysmail'    => 'Error threshold for e-mail to core group',
                    'errorweights'    => 'Weights used to compute error count',
                    'errorexcluded'   => 'Servers with unsent updates excluded from count',
                  );
@@ -7536,6 +8400,7 @@ sub tool_titles {
                      unofficial => 'Unofficial courses',
                      community  => 'Communities',
                      textbook   => 'Textbook courses',
+                     placement  => 'Placement tests',
                  );
     return %titles;
 }
@@ -7546,8 +8411,10 @@ sub courserequest_titles {
                                    unofficial => 'Unofficial',
                                    community  => 'Communities',
                                    textbook   => 'Textbook',
+                                   placement  => 'Placement tests',
+                                   lti        => 'LTI Provider',
                                    norequest  => 'Not allowed',
-                                   approval   => 'Approval by Dom. Coord.',
+                                   approval   => 'Approval by DC',
                                    validate   => 'With validation',
                                    autolimit  => 'Numerical limit',
                                    unlimited  => '(blank for unlimited)',
@@ -7636,7 +8503,7 @@ sub print_usercreation {
             }
             $datatable .= '<tr'.$css_class.'>'.
                          '<td><span class="LC_nobreak">'.$lt{$item}.
-                         '</span></td><td align="right">';
+                         '</span></td><td style="text-align: right">';
             my @options = ('any');
             if (ref($rules) eq 'HASH') {
                 if (keys(%{$rules}) > 0) {
@@ -7659,7 +8526,7 @@ sub print_usercreation {
         }
     } else {
         my @contexts = ('author','course','domain');
-        my @authtypes = ('int','krb4','krb5','loc');
+        my @authtypes = ('int','krb4','krb5','loc','lti');
         my %checked;
         if (ref($settings) eq 'HASH') {
             if (ref($settings->{'authtypes'}) eq 'HASH') {
@@ -7758,7 +8625,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,
@@ -7895,7 +8762,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,
@@ -7922,8 +8789,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,
@@ -8025,7 +8892,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') {
@@ -8048,10 +8915,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.'"';
@@ -8066,10 +8933,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',
@@ -8079,7 +8946,7 @@ sub noninst_users {
     }
     $output .= '</tr><tr>';
     foreach my $item ('approve','email','username') {
-        $output .= '<td valign="top">';
+        $output .= '<td style="vertical-align: top">';
         my (%choices,@options,$hashref,$defoption,$name,$onclick,$hascustom);
         if ($item eq 'approve') {
             %choices = &Apache::lonlocal::texthash (
@@ -8194,7 +9061,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 '') {
@@ -8221,7 +9088,7 @@ sub noninst_users {
 sub captcha_choice {
     my ($context,$settings,$itemcount,$customcss,$rowstyle) = @_;
     my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext,
-        $vertext,$currver); 
+        $vertext,$currver);
     my %lt = &captcha_phrases();
     $keyentry = 'hidden';
     my $colspan=2;
@@ -8403,6 +9270,7 @@ sub authtype_names {
                       krb4   => 'Kerberos 4',
                       krb5   => 'Kerberos 5',
                       loc    => 'Local',
+                      lti    => 'LTI',
                   );
     return %lt;
 }
@@ -8471,12 +9339,13 @@ sub print_defaults {
                           '<td><span class="LC_nobreak">'.$titles->{$item}.
                           '</span></td><td class="LC_right_item" colspan="3">';
             if ($item eq 'auth_def') {
-                my @authtypes = ('internal','krb4','krb5','localauth');
+                my @authtypes = ('internal','krb4','krb5','localauth','lti');
                 my %shortauth = (
                                  internal => 'int',
                                  krb4 => 'krb4',
                                  krb5 => 'krb5',
-                                 localauth  => 'loc'
+                                 localauth  => 'loc',
+                                 lti => 'lti',
                                 );
                 my %authnames = &authtype_names();
                 foreach my $auth (@authtypes) {
@@ -8532,7 +9401,7 @@ sub print_defaults {
                     $datatable .= '</select>&nbsp;'.&mt('Internal ID:').'&nbsp;<b>'.$item.'</b>&nbsp;'.
                                   '<input type="checkbox" name="inststatus_delete" value="'.$item.'" />'.
                                   &mt('delete').'</span></td>'.
-                                  '<td class="LC_left_item"><span class="LC_nobreak">'.&mt('Name displayed').':'.
+                                  '<td class="LC_left_item" colspan="2"><span class="LC_nobreak">'.&mt('Name displayed:').
                                   '<input type="text" size="20" name="inststatus_title_'.$item.'" value="'.$title.'" />'.
                                   '</span></td></tr>';
                 }
@@ -8551,8 +9420,8 @@ sub print_defaults {
                 $datatable .= '</select>&nbsp;'.&mt('Internal ID:').
                               '<input type="text" size="10" name="addinststatus" value="" />'.
                               '&nbsp;'.&mt('(new)').
-                              '</span></td><td class="LC_left_item"><span class="LC_nobreak">'.
-                              &mt('Name displayed').':'.
+                              '</span></td><td class="LC_left_item" colspan="2"><span class="LC_nobreak">'.
+                              &mt('Name displayed:').
                               '<input type="text" size="20" name="addinststatus_title" value="" /></span></td>'.
                               '</tr>'."\n";
                 $rownum ++;
@@ -8768,7 +9637,7 @@ sub print_scantronformat {
         }
         $datatable .= '</span></td>';
         if (keys(%error) == 0) { 
-            $datatable .= '<td valign="bottom">';
+            $datatable .= '<td style="vertical-align: bottom">';
             if (!$switchserver) {
                 $datatable .= &mt('Upload:').'<br />';
             }
@@ -9003,6 +9872,10 @@ sub print_coursecategories {
         my $toggle_catscomm_dom = ' checked="checked" ';
         my $can_catcomm_comm = ' ';
         my $can_catcomm_dom = ' checked="checked" ';
+        my $toggle_catsplace_place = ' ';
+        my $toggle_catsplace_dom = ' checked="checked" ';
+        my $can_catplace_place = ' ';
+        my $can_catplace_dom = ' checked="checked" ';
 
         if (ref($settings) eq 'HASH') {
             if ($settings->{'togglecats'} eq 'crs') {
@@ -9021,17 +9894,28 @@ sub print_coursecategories {
                 $can_catcomm_comm = $can_catcomm_dom;
                 $can_catcomm_dom = ' ';
             }
+            if ($settings->{'togglecatsplace'} eq 'place') {
+                $toggle_catsplace_place = $toggle_catsplace_dom;
+                $toggle_catsplace_dom = ' ';
+            }
+            if ($settings->{'categorizeplace'} eq 'place') {
+                $can_catplace_place = $can_catplace_dom;
+                $can_catplace_dom = ' ';
+            }
         }
         my %title = &Apache::lonlocal::texthash (
-                     togglecats     => 'Show/Hide a course in catalog',
-                     togglecatscomm => 'Show/Hide a community in catalog',
-                     categorize     => 'Assign a category to a course',
-                     categorizecomm => 'Assign a category to a community',
+                     togglecats      => 'Show/Hide a course in catalog',
+                     togglecatscomm  => 'Show/Hide a community in catalog',
+                     togglecatsplace => 'Show/Hide a placement test in catalog',
+                     categorize      => 'Assign a category to a course',
+                     categorizecomm  => 'Assign a category to a community',
+                     categorizeplace => 'Assign a category to a placement test',
                     );
         my %level = &Apache::lonlocal::texthash (
-                     dom  => 'Set in Domain',
-                     crs  => 'Set in Course',
-                     comm => 'Set in Community',
+                     dom   => 'Set in Domain',
+                     crs   => 'Set in Course',
+                     comm  => 'Set in Community',
+                     place => 'Set in Placement Test',
                     );
         $datatable = '<tr class="LC_odd_row">'.
                   '<td>'.$title{'togglecats'}.'</td>'.
@@ -9061,8 +9945,22 @@ sub print_coursecategories {
                   $can_catcomm_dom.' value="dom" />'.$level{'dom'}.'</label>&nbsp;'.
                   '<label><input type="radio" name="categorizecomm"'.
                   $can_catcomm_comm.'value="comm" />'.$level{'comm'}.'</label></span></td>'.
+                  '</tr><tr class="LC_odd_row">'.
+                  '<td>'.$title{'togglecatsplace'}.'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                  '<input type="radio" name="togglecatsplace"'.
+                  $toggle_catsplace_dom.' value="dom" />'.$level{'dom'}.'</label>&nbsp;'.
+                  '<label><input type="radio" name="togglecatscomm"'.
+                  $toggle_catsplace_place.' value="comm" />'.$level{'place'}.'</label></span></td>'.
+                  '</tr><tr>'.
+                  '<td>'.$title{'categorizeplace'}.'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak">'.
+                  '<label><input type="radio" name="categorizeplace"'.
+                  $can_catplace_dom.' value="dom" />'.$level{'dom'}.'</label>&nbsp;'.
+                  '<label><input type="radio" name="categorizeplace"'.
+                  $can_catplace_place.'value="place" />'.$level{'place'}.'</label></span></td>'.
                   '</tr>';
-        $$rowtotal += 4;
+        $$rowtotal += 6;
     } else {
         my $css_class;
         my $itemcount = 1;
@@ -9087,12 +9985,15 @@ sub print_coursecategories {
                     my %default_names = (
                           instcode    => &mt('Official courses'),
                           communities => &mt('Communities'),
+                          placement   => &mt('Placement Tests'),
                     );
 
                     if ((!grep(/^instcode$/,@{$cats[0]})) || 
                         ($cathash->{'instcode::0'} eq '') ||
                         (!grep(/^communities$/,@{$cats[0]})) || 
-                        ($cathash->{'communities::0'} eq '')) {
+                        ($cathash->{'communities::0'} eq '') ||
+                        (!grep(/^placement$/,@{$cats[0]})) ||
+                        ($cathash->{'placement::0'} eq '')) {
                         $maxnum ++;
                     }
                     my $lastidx;
@@ -9113,7 +10014,7 @@ sub print_coursecategories {
                             $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
                         }
                         $datatable .= '</select></span></td><td>';
-                        if ($parent eq 'instcode' || $parent eq 'communities') {
+                        if ($parent eq 'instcode' || $parent eq 'communities' || $parent eq 'placement') {
                             $datatable .=  '<span class="LC_nobreak">'
                                            .$default_names{$parent}.'</span>';
                             if ($parent eq 'instcode') {
@@ -9136,7 +10037,7 @@ sub print_coursecategories {
                             $datatable .= '<label><input type="radio" name="'
                                           .$parent.'" value="0" />'
                                           .&mt('Do not display').'</label></span>';
-                            if ($parent eq 'communities') {
+                            if (($parent eq 'communities') || ($parent eq 'placement')) {
                                 $datatable .= '</td></tr></table>';
                             }
                             $datatable .= '</td>';
@@ -9168,7 +10069,7 @@ sub print_coursecategories {
                                   .'<input type="text" size="20" name="addcategory_name" value="" /></td>'
                                   .'</tr>'."\n";
                     $itemcount ++;
-                    foreach my $default ('instcode','communities') {
+                    foreach my $default ('instcode','communities','placement') {
                         if ((!grep(/^\Q$default\E$/,@{$cats[0]})) || ($cathash->{$default.'::0'} eq '')) {
                             $css_class = $itemcount%2?' class="LC_odd_row"':'';
                             my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','$lastidx'".');"';
@@ -9257,9 +10158,9 @@ sub print_serverstatuses {
 
 sub serverstatus_pages {
     return ('userstatus','lonstatus','loncron','server-status','codeversions',
-            'checksums','clusterstatus','metadata_keywords','metadata_harvest',
-            'takeoffline','takeonline','showenv','toggledebug','ping','domconf',
-            'uniquecodes','diskusage','coursecatalog');
+            'checksums','clusterstatus','certstatus','metadata_keywords',
+            'metadata_harvest','takeoffline','takeonline','showenv','toggledebug',
+            'ping','domconf','uniquecodes','diskusage','coursecatalog');
 }
 
 sub defaults_javascript {
@@ -9323,29 +10224,21 @@ $jstext
 
 ENDSCRIPT
     }
+    return;
 }
 
 sub passwords_javascript {
-    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).',
-            passnum => 'Warning: number of previous passwords to save must be a positive integer (or blank).',
-        );
-    } elsif ($prefix eq 'secrets') {
-        %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).',
-        );
-    }
+    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).',
+    );
     &js_escape(\%intalert);
     my $defmin = $Apache::lonnet::passwdmin;
-    my $intauthjs;
-    if ($prefix eq 'passwords') { $intauthjs = <<"ENDSCRIPT";
+    my $intauthjs = <<"ENDSCRIPT";
 
 function warnIntAuth(field) {
     if (field.name == 'intauth_check') {
@@ -9365,17 +10258,11 @@ function warnIntAuth(field) {
     return;
 }
 
-ENDSCRIPT
-
-     }
-
-     $intauthjs .= <<"ENDSCRIPT";
-
-function warnInt$prefix(field) {
+function warnIntPass(field) {
     field.value.replace(/^\s+/,'');
     field.value.replace(/\s+\$/,'');
     var regexdigit=/^\\d+\$/;
-    if (field.name == '${prefix}_min') {
+    if (field.name == 'passwords_min') {
         if (field.value == '') {
             alert('$intalert{passmin}');
             field.value = '$defmin';
@@ -9395,15 +10282,29 @@ function warnInt$prefix(field) {
             field.value = '';
         }
         if (field.value != '') {
-            if (!regexdigit.test(field.value)) {
-                if (field.name == '${prefix}_max') {
-                    alert('$intalert{passmax}');
+            if (field.name == 'passwords_expire') {
+                var regexpposnum=/^\\d+(|\\.\\d*)\$/; 
+                if (!regexpposnum.test(field.value)) {
+                    alert('$intalert{passexp}');
+                    field.value = '';
                 } else {
-                    if (field.name == '${prefix}_numsaved') {
-                        alert('$intalert{passnum}');
+                    var expval = parseFloat(field.value);
+                    if (expval == 0) {
+                        alert('$intalert{passexp}');
+                        field.value = '';
+                    }
+                }
+            } else {
+                if (!regexdigit.test(field.value)) {
+                    if (field.name == 'passwords_max') {
+                        alert('$intalert{passmax}');
+                    } else {
+                        if (field.name == 'passwords_numsaved') {
+                            alert('$intalert{passnum}');
+                        }
                     }
+                    field.value = '';
                 }
-                field.value = '';
             }
         }
     }
@@ -9438,9 +10339,11 @@ sub coursecategories_javascript {
     }
     my $instcode_reserved = &mt('The name: [_1] is a reserved category.','"instcode"');
     my $communities_reserved = &mt('The name: [_1] is a reserved category.','"communities"');
+    my $placement_reserved = &mt('The name: [_1] is a reserved category.','"placement"');
     my $choose_again = "\n".&mt('Please use a different name for the new top level category.'); 
     &js_escape(\$instcode_reserved);
     &js_escape(\$communities_reserved);
+    &js_escape(\$placement_reserved);
     &js_escape(\$choose_again);
     $output = <<"ENDSCRIPT";
 <script type="text/javascript">
@@ -9510,6 +10413,10 @@ function categoryCheck(form) {
         alert('$communities_reserved\\n$choose_again');
         return false;
     }
+    if (form.elements['addcategory_name'].value == 'placement') {
+        alert('$placement_reserved\\n$choose_again');
+        return false;
+    }
     return true;
 }
 
@@ -9523,24 +10430,28 @@ ENDSCRIPT
 sub initialize_categories {
     my ($itemcount) = @_;
     my ($datatable,$css_class,$chgstr);
-    my %default_names = &Apache::lonlocal::texthash (
+    my %default_names = (
                       instcode    => 'Official courses (with institutional codes)',
                       communities => 'Communities',
+                      placement   => 'Placement Tests',
                         );
-    my $select0 = ' selected="selected"';
-    my $select1 = '';
-    foreach my $default ('instcode','communities') {
+    my %selnum = (
+                   instcode    => '0',
+                   communities => '1',
+                   placement   => '2',
+                 );
+    my %selected;
+    foreach my $default ('instcode','communities','placement') {
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
         $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','0'".');"';
-        if ($default eq 'communities') {
-            $select1 = $select0;
-            $select0 = '';
-        }
+        map { $selected{$selnum{$_}} = '' } keys(%selnum);
+        $selected{$selnum{$default}} = ' selected="selected"';
         $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
-                     .'<select name="'.$default.'_pos">'
-                     .'<option value="0"'.$select0.'>1</option>'
-                     .'<option value="1"'.$select1.'>2</option>'
-                     .'<option value="2">3</option></select>&nbsp;'
+                     .'<select name="'.$default.'_pos"'.$chgstr.'>'
+                     .'<option value="0"'.$selected{'0'}.'>1</option>'
+                     .'<option value="1"'.$selected{'1'}.'>2</option>'
+                     .'<option value="2"'.$selected{'2'}.'>3</option>'
+                     .'<option value="3">4</option></select>&nbsp;'
                      .$default_names{$default}
                      .'</span></td><td><span class="LC_nobreak">'
                      .'<label><input type="radio" name="'.$default.'" value="1" checked="checked" />'
@@ -9555,7 +10466,8 @@ sub initialize_categories {
                   .'<select name="addcategory_pos"'.$chgstr.'>'
                   .'<option value="0">1</option>'
                   .'<option value="1">2</option>'
-                  .'<option value="2" selected="selected">3</option></select>&nbsp;'
+                  .'<option value="2">3</option>'
+                  .'<option value="3" selected="selected">4</option></select>&nbsp;'
                   .&mt('Add category').'</span></td><td><span class="LC_nobreak">'.&mt('Name:')
                   .'&nbsp;<input type="text" size="20" name="addcategory_name" value="" /></span>'
                   .'</td></tr>';
@@ -9646,7 +10558,7 @@ sub build_category_rows {
 
 sub modifiable_userdata_row {
     my ($context,$item,$settings,$numinrow,$rowcount,$usertypes,$fieldsref,$titlesref,
-        $rowid,$customcss,$rowstyle) = @_;
+        $rowid,$customcss,$rowstyle,$itemdesc) = @_;
     my ($role,$rolename,$statustype);
     $role = $item;
     if ($context eq 'cancreate') {
@@ -9667,6 +10579,10 @@ sub modifiable_userdata_row {
         } else {
             $rolename = $role;
         }
+    } elsif ($context eq 'lti') {
+        $rolename = &mt('Institutional data used (if available)');
+    } elsif ($context eq 'privacy') {
+        $rolename = $itemdesc;
     } else {
         if ($role eq 'cr') {
             $rolename = &mt('Custom role');
@@ -9704,42 +10620,50 @@ sub modifiable_userdata_row {
     if ($rowid) {
         $rowid = ' id="'.$rowid.'"';
     }
-
     $output = '<tr '.$css_class.$rowid.'>'.
               '<td><span class="LC_nobreak">'.$rolename.'</span></td>'.
               '<td class="LC_left_item" colspan="2"><table>';
     my $rem;
     my %checks;
+    my %current;
     if (ref($settings) eq 'HASH') {
-        if (ref($settings->{$context}) eq 'HASH') {
+        my $hashref;
+        if ($context eq 'lti') {
+            if (ref($settings) eq 'HASH') {
+                $hashref = $settings->{'instdata'};
+            }
+        } elsif ($context eq 'privacy') {
+            my ($key,$inner) = split(/_/,$role);
+            if (ref($settings) eq 'HASH') {
+                if (ref($settings->{$key}) eq 'HASH') {
+                    $hashref = $settings->{$key}->{$inner};
+                }
+            }
+        } elsif (ref($settings->{$context}) eq 'HASH') {
             if (ref($settings->{$context}->{$role}) eq 'HASH') {
-                my $hashref = $settings->{$context}->{$role};
-                if ($role eq 'emailusername') {
-                    if ($statustype) {
-                        if (ref($settings->{$context}->{$role}->{$statustype}) eq 'HASH') {
-                            $hashref = $settings->{$context}->{$role}->{$statustype};
-                            if (ref($hashref) eq 'HASH') { 
-                                foreach my $field (@fields) {
-                                    if ($hashref->{$field}) {
-                                        $checks{$field} = $hashref->{$field};
-                                    }
-                                }
-                            }
-                        }
+                $hashref = $settings->{'lti_instdata'};
+            }
+            if ($role eq 'emailusername') {
+                if ($statustype) {
+                    if (ref($settings->{$context}->{$role}->{$statustype}) eq 'HASH') {
+                        $hashref = $settings->{$context}->{$role}->{$statustype};
                     }
-                } else {
-                    if (ref($hashref) eq 'HASH') {
-                        foreach my $field (@fields) {
-                            if ($hashref->{$field}) {
-                                $checks{$field} = ' checked="checked" ';
-                            }
-                        }
+                }
+            }
+        }
+        if (ref($hashref) eq 'HASH') { 
+            foreach my $field (@fields) {
+                if ($hashref->{$field}) {
+                    if ($role eq 'emailusername') {
+                        $checks{$field} = $hashref->{$field};
+                    } else {
+                        $checks{$field} = ' checked="checked" ';
                     }
                 }
             }
         }
     }
-
+ 
     my $total = scalar(@fields);
     for (my $i=0; $i<$total; $i++) {
         $rem = $i%($numinrow);
@@ -9753,7 +10677,25 @@ sub modifiable_userdata_row {
         unless ($role eq 'emailusername') {
             if (exists($checks{$fields[$i]})) {
                 $check = $checks{$fields[$i]};
-            } else {
+            } elsif ($context eq 'privacy') {
+                if ($role =~ /^priv_(domain|course)$/) {
+                    if (ref($settings) ne 'HASH') {
+                        $check = ' checked="checked" ';
+                    }
+                } elsif ($role =~ /^priv_(author|community)$/) {
+                    if (ref($settings) ne 'HASH') {
+                        unless ($fields[$i] eq 'id') {
+                            $check = ' checked="checked" ';
+                        }
+                    }
+                } elsif ($role =~ /^(unpriv|othdom)_/) {
+                    if (ref($settings) ne 'HASH') {
+                        if (($fields[$i] eq 'lastname') || ($fields[$i] eq 'firstname')) {
+                            $check = ' checked="checked" ';
+                        }
+                    }
+                }
+            } elsif ($context ne 'lti') {
                 if ($role eq 'st') {
                     if (ref($settings) ne 'HASH') {
                         $check = ' checked="checked" '; 
@@ -9763,6 +10705,7 @@ sub modifiable_userdata_row {
         }
         $output .= '<td class="LC_left_item">'.
                    '<span class="LC_nobreak">';
+        my $prefix = 'canmodify';
         if ($role eq 'emailusername') {
             unless ($checks{$fields[$i]} =~ /^(required|optional)$/) {
                 $checks{$fields[$i]} = 'omit';
@@ -9773,13 +10716,18 @@ sub modifiable_userdata_row {
                     $checked='checked="checked" ';
                 }
                 $output .= '<label>'.
-                           '<input type="radio" name="canmodify_'.$item.'_'.$fields[$i].'" value="'.$option.'" '.$checked.'/>'.
+                           '<input type="radio" name="'.$prefix.'_'.$item.'_'.$fields[$i].'" value="'.$option.'" '.$checked.'/>'.
                            &mt($option).'</label>'.('&nbsp;' x2);
             }
             $output .= '<i>'.$fieldtitles{$fields[$i]}.'</i>';
         } else {
+            if ($context eq 'lti') {
+                $prefix = 'lti';
+            } elsif ($context eq 'privacy') {
+                $prefix = 'privacy';
+            }
             $output .= '<label>'.
-                       '<input type="checkbox" name="canmodify_'.$role.'" '.
+                       '<input type="checkbox" name="'.$prefix.'_'.$role.'" '.
                        'value="'.$fields[$i].'"'.$check.'/>'.$fieldtitles{$fields[$i]}.
                        '</label>';
         }
@@ -9866,7 +10814,7 @@ sub insttypes_row {
                 $output .= '<td class="LC_left_item">'.
                            '<span class="LC_nobreak"><label>'.
                            '<input type="checkbox" name="'.$context.'" '.
-                           'value="'.$types->[$i].'"'.$check.$onclick.'/>'.
+                           'value="'.$types->[$i].'"'.$check.$onclick.' />'.
                            $usertypes->{$types->[$i]}.'</label></span></td>';
             }
         }
@@ -9879,7 +10827,7 @@ sub insttypes_row {
         } else {
             $output .= '<td class="LC_left_item">';
         }
-        $output .= '&nbsp;';
+        $output .= '&nbsp;';  
     } else {
         if ($rem == 0) {
             $output .= '<tr>';
@@ -9981,14 +10929,12 @@ sub usertype_update_row {
 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);
+        %curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon);
     %title = ( coursecatalog => 'Display course catalog',
                adminmail => 'Display administrator E-mail address',
                helpdesk  => 'Display "Contact Helpdesk" link',
                newuser => 'Link for visitors to create a user account',
-               loginheader => 'Log-in box header',
-               saml => 'Dual SSO and non-SSO login');
+               loginheader => 'Log-in box header');
     @offon = ('off','on');
     if (ref($domconfig{login}) eq 'HASH') {
         if (ref($domconfig{login}{loginvia}) eq 'HASH') {
@@ -9996,20 +10942,6 @@ sub modify_login {
                 $curr_loginvia{$lonhost} = $domconfig{login}{loginvia}{$lonhost};
             }
         }
-        if (ref($domconfig{login}{'saml'}) eq 'HASH') {
-            foreach my $lonhost (keys(%{$domconfig{login}{'saml'}})) {
-                if (ref($domconfig{login}{'saml'}{$lonhost}) eq 'HASH') {
-                    $currsaml{$lonhost} = $domconfig{login}{'saml'}{$lonhost};
-                    $saml{$lonhost} = 1;
-                    $samltext{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'text'};
-                    $samlurl{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'url'};
-                    $samlalt{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'alt'};
-                    $samlimg{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'img'};
-                    $samltitle{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'title'};
-                    $samlnotsso{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'notsso'};
-                }
-            }
-        }
     }
     ($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'],
                                            \%domconfig,\%loginhash);
@@ -10256,89 +11188,6 @@ sub modify_login {
             $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
         }
     }
-    my @delsamlimg = &Apache::loncommon::get_env_multiple('form.saml_img_del');
-    my @newsamlimgs;
-    foreach my $lonhost (keys(%domservers)) {
-        if ($env{'form.saml_'.$lonhost}) {
-            if ($env{'form.saml_img_'.$lonhost.'.filename'}) {
-                push(@newsamlimgs,$lonhost);
-            }
-            foreach my $item ('text','alt','url','title','notsso') {
-                $env{'form.saml_'.$item.'_'.$lonhost} =~ s/^\s+|\s+$//g;
-            }
-            if ($saml{$lonhost}) {
-                if (grep(/^\Q$lonhost\E$/,@delsamlimg)) {
-#FIXME Need to obsolete published image
-                    delete($currsaml{$lonhost}{'img'});
-                    $changes{'saml'}{$lonhost} = 1;
-                }
-                if ($env{'form.saml_alt_'.$lonhost} ne $samlalt{$lonhost}) {
-                    $changes{'saml'}{$lonhost} = 1;
-                }
-                if ($env{'form.saml_text_'.$lonhost} ne $samltext{$lonhost}) {
-                    $changes{'saml'}{$lonhost} = 1;
-                }
-                if ($env{'form.saml_url_'.$lonhost} ne $samlurl{$lonhost}) {
-                    $changes{'saml'}{$lonhost} = 1;
-                }
-                if ($env{'form.saml_title_'.$lonhost} ne $samltitle{$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') {
-                $currsaml{$lonhost}{$item} = $env{'form.saml_'.$item.'_'.$lonhost};
-            }
-        } else {
-            if ($saml{$lonhost}) {
-                $changes{'saml'}{$lonhost} = 1;
-                delete($currsaml{$lonhost});
-            }
-        }
-    }
-    foreach my $posshost (keys(%currsaml)) {
-        unless (exists($domservers{$posshost})) {
-            delete($currsaml{$posshost});
-        }
-    }
-    %{$loginhash{'login'}{'saml'}} = %currsaml;
-    if (@newsamlimgs) {
-        my $error;
-        my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm);
-        if ($configuserok eq 'ok') {
-            if ($switchserver) {
-                $error = &mt("Upload of SSO Button Image is not permitted to this server: [_1].",$switchserver);
-            } elsif ($author_ok eq 'ok') {
-                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'});
-                    if ($result eq 'ok') {
-                        $currsaml{$lonhost}{'img'} = $imgurl;
-                        $loginhash{'login'}{'saml'}{$lonhost}{'img'} = $imgurl;
-                        $changes{'saml'}{$lonhost} = 1;
-                    } else {
-                        my $puberror = &mt("Upload of SSO button image failed for [_1] because an error occurred publishing the file in RES space. Error was: [_2].",
-                                           $lonhost,$result);
-                        $errors .= '<li><span class="LC_error">'.$puberror.'</span></li>';
-                    }
-                }
-            } 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);
-            }
-        } else {
-            $error = &mt("Upload of SSO button image file(s) failed because a Domain Configuration user ([_1]) could not be created in domain: [_2].  Error was: [_3].",$confname,$dom,$configuserok);
-        }
-        if ($error) {
-            &Apache::lonnet::logthis($error);
-            $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
-        }
-    }
     &process_captcha('login',\%changes,$loginhash{'login'},$domconfig{'login'});
 
     my $defaulthelpfile = '/adm/loginproblems.html';
@@ -10379,31 +11228,6 @@ sub modify_login {
         }
         if (keys(%changes) > 0 || $colchgtext) {
             &Apache::loncommon::devalidate_domconfig_cache($dom);
-            if (exists($changes{'saml'})) {
-                my $hostid_in_use;
-                my @hosts = &Apache::lonnet::current_machine_ids();
-                if (@hosts > 1) {
-                    foreach my $hostid (@hosts) {
-                        if (&Apache::lonnet::host_domain($hostid) eq $dom) {
-                            $hostid_in_use = $hostid;
-                            last;
-                        }
-                    }
-                } else {
-                    $hostid_in_use = $r->dir_config('lonHostID');
-                }
-                if (($hostid_in_use) &&
-                    (&Apache::lonnet::host_domain($hostid_in_use) eq $dom)) {
-                    &Apache::lonnet::devalidate_cache_new('samllanding',$hostid_in_use);
-                }
-                if (ref($lastactref) eq 'HASH') {
-                    if (ref($changes{'saml'}) eq 'HASH') {
-                        my %updates;
-                        map { $updates{$_} = 1; } keys(%{$changes{'saml'}});
-                        $lastactref->{'samllanding'} = \%updates;
-                    }
-                }
-            }
             if (ref($lastactref) eq 'HASH') {
                 $lastactref->{'domainconfig'} = 1;
             }
@@ -10483,38 +11307,6 @@ sub modify_login {
                             }
                         }
                     }
-                } elsif ($item eq 'saml') {
-                    if (ref($changes{$item}) eq 'HASH') {
-                        my %notlt = (
-                                       text   => 'Text for log-in by SSO',
-                                       img    => 'SSO button image',
-                                       alt    => 'Alt text for button image',
-                                       url    => 'SSO URL',
-                                       title  => 'Tooltip for SSO link',
-                                       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') {
-                                    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}.'" />';
-                                        }
-                                        $resulttext .= '<li>'.&mt("$notlt{$key} set to: [_1]",
-                                                                  $value).'</li>';
-                                    }
-                                }
-                                $resulttext .= '</ul></li>';
-                            } else {
-                                $resulttext .= '<li>'.&mt("$title{$item} not in use for [_1]",$lonhost).'</li>';
-                            }
-                        }
-                    }
                 } elsif ($item eq 'captcha') {
                     if (ref($loginhash{'login'}) eq 'HASH') {
                         my $chgtxt;
@@ -10617,283 +11409,6 @@ 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);
@@ -11001,18 +11516,13 @@ sub modify_colors {
             $domconfig->{$role} = {};
         }
         foreach my $img (@images) {
-            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 (($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 ( ! $env{'form.'.$role.'_'.$img.'.filename'} 
 		 && !defined($domconfig->{$role}{$img})
 		 && !$env{'form.'.$role.'_del_'.$img}
@@ -11087,29 +11597,15 @@ sub modify_colors {
                             $changes{$role}{'images'}{$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;
-                                }
+                    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 ($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;
-                                }
+                        } else {
+                            if ($confhash->{$role}{'showlogo'}{$img} == 0) {
+                                $changes{$role}{'showlogo'}{$img} = 1;
                             }
                         }
                     }
@@ -11220,11 +11716,6 @@ 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'}) {
@@ -11263,19 +11754,12 @@ 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 {
                             my $newitem = $confhash->{$role}{$item};
                             if ($key eq 'images') {
-                                $newitem = '<img src="'.$confhash->{$role}{$item}.'" alt="'.$choices{$item}.'" valign="bottom" />';
+                                $newitem = '<img src="'.$confhash->{$role}{$item}.'" alt="'.$choices{$item}.'" style="vertical-align: bottom" />';
                             }
                             $resulttext .= '<li>'.&mt("$choices{$item} set to [_1]",$newitem).'</li>';
                         }
@@ -11357,7 +11841,7 @@ sub check_authorstatus {
 
 sub publishlogo {
     my ($r,$action,$formname,$dom,$confname,$subdir,$thumbwidth,$thumbheight,$savefileas) = @_;
-    my ($output,$fname,$logourl);
+    my ($output,$fname,$logourl,$madethumb);
     if ($action eq 'upload') {
         $fname=$env{'form.'.$formname.'.filename'};
         chop($env{'form.'.$formname});
@@ -11486,6 +11970,7 @@ $env{'user.name'}.':'.$env{'user.domain'
                                     $r->set_handlers('PerlCleanupHandler' => [\&notifysubscribed,@{$handlers}]);
                                     $registered_cleanup=1;
                                 }
+                                $madethumb = 1;
                             } else {
                                 print $logfile "\nUnable to write ".$copyfile.
                                                ':'.$!."\n";
@@ -11498,7 +11983,7 @@ $env{'user.name'}.':'.$env{'user.domain'
             $output = $versionresult;
         }
     }
-    return ($output,$logourl);
+    return ($output,$logourl,$madethumb);
 }
 
 sub logo_versioning {
@@ -11652,7 +12137,7 @@ sub modify_quotas {
         $context = $action;
     }
     if ($context eq 'requestcourses') {
-        @usertools = ('official','unofficial','community','textbook');
+        @usertools = ('official','unofficial','community','textbook','placement','lti');
         @options =('norequest','approval','validate','autolimit');
         %validations = &Apache::lonnet::auto_courserequest_checks($dom);
         %titles = &courserequest_titles();
@@ -11701,7 +12186,7 @@ sub modify_quotas {
         my @approvalnotify = &Apache::loncommon::get_env_multiple('form.'.$context.'notifyapproval');
         @approvalnotify = sort(@approvalnotify);
         $confhash{'notify'}{'approval'} = join(',',@approvalnotify);
-        my @crstypes = ('official','unofficial','community','textbook');
+        my @crstypes = ('official','unofficial','community','textbook','placement','lti');
         my @hasuniquecode = &Apache::loncommon::get_env_multiple('form.uniquecode');
         foreach my $type (@hasuniquecode) {
             if (grep(/^\Q$type\E$/,@crstypes)) {
@@ -11823,7 +12308,7 @@ sub modify_quotas {
                                             &Apache::lonnet::logthis($error);
                                             $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
                                         }
-                                    } 
+                                    }
                                 } elsif ($domconfig{$action}{$type}{$key}{'image'}) {
                                     $confhash{$type}{$key}{'image'} = 
                                         $domconfig{$action}{$type}{$key}{'image'};
@@ -12388,7 +12873,7 @@ sub modify_ltitools {
     map { $posslti{$_} = 1; } @ltiroles;
     my @allfields = ('fullname','firstname','lastname','email','user','roles');
     map { $possfield{$_} = 1; } @allfields;
-    my %lt = &ltitools_names();
+    my %lt = &ltitools_names(); 
     if ($env{'form.ltitools_add'}) {
         my $title = $env{'form.ltitools_add_title'};
         $title =~ s/(`)/'/g;
@@ -12433,7 +12918,7 @@ sub modify_ltitools {
                     }
                 } else {
                     if ($env{'form.ltitools_add_'.$item} ne '') {
-                        $confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item};
+                        $confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item}; 
                     }
                 }
             }
@@ -12444,6 +12929,18 @@ sub modify_ltitools {
             } 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,
@@ -12465,7 +12962,7 @@ sub modify_ltitools {
                             if (($choice ne '') && ($posslti{$choice})) {
                                 $confhash{$newid}{'roles'}{$role} = $choice;
                                 if ($role eq 'cc') {
-                                    $confhash{$newid}{'roles'}{'co'} = $choice;
+                                    $confhash{$newid}{'roles'}{'co'} = $choice; 
                                 }
                             }
                         }
@@ -12493,7 +12990,7 @@ sub modify_ltitools {
                 $confhash{$newid}{'custom'}{$name} = $value;
             }
         } else {
-            my $error = &mt('Failed to acquire unique ID for new external tool');
+            my $error = &mt('Failed to acquire unique ID for new external tool');   
             $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
         }
     }
@@ -12507,7 +13004,7 @@ sub modify_ltitools {
         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) {
@@ -12548,7 +13045,7 @@ sub modify_ltitools {
                     if ($env{'form.ltitools_sigmethod_'.$i} eq 'HMAC-SHA256') {
                         $confhash{$itemid}{'sigmethod'} = $env{'form.ltitools_sigmethod_'.$i};
                     } else {
-                        $confhash{$itemid}{'sigmethod'} = 'HMAC-SHA1';
+                        $confhash{$itemid}{'sigmethod'} = 'HMAC-SHA1'; 
                     }
                     if ($domconfig{$action}{$itemid}{'sigmethod'} eq '') {
                         if ($confhash{$itemid}{'sigmethod'} ne 'HMAC-SHA1') {
@@ -12607,6 +13104,24 @@ sub modify_ltitools {
                     } 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)) {
@@ -12698,7 +13213,7 @@ sub modify_ltitools {
                     }
                 }
                 my %customdels;
-                my @customdeletions = &Apache::loncommon::get_env_multiple('form.ltitools_customdel_'.$i);
+                my @customdeletions = &Apache::loncommon::get_env_multiple('form.ltitools_customdel_'.$i); 
                 if (@customdeletions) {
                     $changes{$itemid} = 1;
                 }
@@ -12707,7 +13222,7 @@ sub modify_ltitools {
                     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};
+                                $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;
@@ -12760,7 +13275,7 @@ sub modify_ltitools {
         my %ltienchash = (
                              $action => { %encconfig }
                          );
-        &Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom,undef,1);
+        &Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom);
         if (keys(%changes) > 0) {
             my $cachetime = 24*60*60;
             my %ltiall = %confhash;
@@ -12782,7 +13297,7 @@ sub modify_ltitools {
                 $bynum{$position} = $itemid;
             }
             foreach my $pos (sort { $a <=> $b } keys(%bynum)) {
-                my $itemid = $bynum{$pos};
+                my $itemid = $bynum{$pos}; 
                 if (ref($confhash{$itemid}) ne 'HASH') {
                     $resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>';
                 } else {
@@ -12810,8 +13325,8 @@ sub modify_ltitools {
                     }
                     $resulttext .= '<li>'.&mt('Configurable in course:');
                     my @possconfig = ('label','title','target','linktext','explanation','append');
-                    my $numconfig = 0;
-                    if (ref($confhash{$itemid}{'crsconf'}) eq 'HASH') {
+                    my $numconfig = 0; 
+                    if (ref($confhash{$itemid}{'crsconf'}) eq 'HASH') { 
                         foreach my $item (@possconfig) {
                             if ($confhash{$itemid}{'crsconf'}{$item}) {
                                 $numconfig ++;
@@ -12820,16 +13335,34 @@ sub modify_ltitools {
                         }
                     }
                     if (!$numconfig) {
-                        $resulttext .= &mt('None');
+                        $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') {
+                        foreach my $size ('width','height') { 
                             if ($confhash{$itemid}{'display'}{$size}) {
                                 $displaylist .= ('&nbsp;'x2).$lt{$size}.':&nbsp;'.
                                                 $confhash{$itemid}{'display'}{$size}.',';
@@ -12873,7 +13406,7 @@ sub modify_ltitools {
                             }
                         }
                         if ($rolemaps) {
-                            $rolemaps =~ s/,$//;
+                            $rolemaps =~ s/,$//; 
                             $resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>';
                         }
                     }
@@ -12882,12 +13415,12 @@ sub modify_ltitools {
                         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>';
                 }
             }
@@ -12948,7 +13481,7 @@ sub get_ltitools_id {
     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);
@@ -12981,246 +13514,1007 @@ sub get_ltitools_id {
     return ($id,$error);
 }
 
-sub modify_lti {
+sub modify_proctoring {
     my ($r,$dom,$action,$lastactref,%domconfig) = @_;
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-    my (%encconfig,$errors,$resulttext);
+    my (@allpos,%changes,%confhash,%encconfhash,$errors,$resulttext,%imgdeletions);
+    my $confname = $dom.'-domainconfig';
+    my $servadm = $r->dir_config('lonAdmEMail');
+    my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm);
+    my %providernames = &proctoring_providernames();
+    my $maxnum = scalar(keys(%providernames));
 
-    my (%currltisec,%secchanges,%newltisec,%newltienc,%keyset,%newkeyset);
-    $newltisec{'private'}{'keys'} = [];
-    $newltisec{'encrypt'} = {};
-    $newltisec{'rules'} = {};
-    $newltisec{'linkprot'} = {};
-    if (ref($domconfig{'ltisec'}) eq 'HASH') {
-        %currltisec = %{$domconfig{'ltisec'}};
-        if (ref($currltisec{'linkprot'}) eq 'HASH') {
-            foreach my $id (keys(%{$currltisec{'linkprot'}})) {
-                unless ($id =~ /^\d+$/) {
-                    delete($currltisec{'linkprot'}{$id});
+    my (%requserfields,%optuserfields,%defaults,%extended,%crsconf,@courseroles,@ltiroles);
+    my ($requref,$opturef,$defref,$extref,$crsref,$rolesref,$ltiref) = &proctoring_data();
+    if (ref($requref) eq 'HASH') {
+        %requserfields = %{$requref};
+    }
+    if (ref($opturef) eq 'HASH') {
+        %optuserfields = %{$opturef};
+    }
+    if (ref($defref) eq 'HASH') {
+        %defaults = %{$defref};
+    }
+    if (ref($extref) eq 'HASH') {
+        %extended = %{$extref};
+    }
+    if (ref($crsref) eq 'HASH') {
+        %crsconf = %{$crsref};
+    }
+    if (ref($rolesref) eq 'ARRAY') {
+        @courseroles = @{$rolesref};
+    }
+    if (ref($ltiref) eq 'ARRAY') {
+        @ltiroles = @{$ltiref};
+    }
+
+    if (ref($domconfig{$action}) eq 'HASH') {
+        my @todeleteimages = &Apache::loncommon::get_env_multiple('form.proctoring_image_del');
+        if (@todeleteimages) {
+            map { $imgdeletions{$_} = 1; } @todeleteimages;
+        }
+    }
+    my %customadds;
+    my @newcustom = &Apache::loncommon::get_env_multiple('form.proctoring_customadd');
+    if (@newcustom) {
+        map { $customadds{$_} = 1; } @newcustom;
+    }
+    foreach my $provider (sort(keys(%providernames))) {
+        $confhash{$provider} = {};
+        my $pos = $env{'form.proctoring_pos_'.$provider};
+        $pos =~ s/\D+//g;
+        $allpos[$pos] = $provider;
+        my (%current,%currentenc);
+        my $showroles = 0;
+        if (ref($domconfig{$action}) eq 'HASH') {
+            if (ref($domconfig{$action}{$provider}) eq 'HASH') {
+                %current = %{$domconfig{$action}{$provider}};
+                foreach my $item ('key','secret') { 
+                    $currentenc{$item} = $current{$item};
+                    delete($current{$item});
                 }
             }
         }
-        if (ref($currltisec{'private'}) eq 'HASH') {
-            if (ref($currltisec{'private'}{'keys'}) eq 'ARRAY') {
-                $newltisec{'private'}{'keys'} = $currltisec{'private'}{'keys'};
-                map { $keyset{$_} = 1; } @{$currltisec{'private'}{'keys'}};
+        if ($env{'form.proctoring_available_'.$provider}) {
+            $confhash{$provider}{'available'} = 1;
+            unless ($current{'available'}) {
+                $changes{$provider} = 1;
+            }
+        } else {
+            %{$confhash{$provider}} = %current;
+            %{$encconfhash{$provider}} = %currentenc;
+            $confhash{$provider}{'available'} = 0;
+            if ($current{'available'}) {
+                $changes{$provider} = 1;
             }
         }
-    }
-    foreach my $item ('crs','dom') {
-        my $formelement = 'form.ltisec_'.$item.'linkprot';
-        if ($env{$formelement}) {
-            $newltisec{'encrypt'}{$item} = 1;
-            if (ref($currltisec{'encrypt'}) eq 'HASH') {
-                unless ($currltisec{'encrypt'}{$item}) {
-                    $secchanges{'encrypt'} = 1;
+        if ($confhash{$provider}{'available'}) {
+            foreach my $field ('lifetime','version','sigmethod','url','key','secret') {
+                my $possval = $env{'form.proctoring_'.$provider.'_'.$field};
+                if ($field eq 'lifetime') {
+                    if ($possval =~ /^\d+$/) {
+                        $confhash{$provider}{$field} = $possval;
+                    }
+                } elsif ($field eq 'version') {
+                    if ($possval =~ /^\d+\.\d+$/) {
+                        $confhash{$provider}{$field} = $possval;
+                    }
+                } elsif ($field eq 'sigmethod') {
+                    if ($possval =~ /^\QHMAC-SHA\E(1|256)$/) {
+                        $confhash{$provider}{$field} = $possval;
+                    }
+                } elsif ($field eq 'url') {
+                    $confhash{$provider}{$field} = $possval;
+                } elsif (($field eq 'key') || ($field eq 'secret')) {
+                    $encconfhash{$provider}{$field} = $possval;
+                    unless ($currentenc{$field} eq $possval) {
+                        $changes{$provider} = 1;
+                    }
+                }
+                unless (($field eq 'key') || ($field eq 'secret')) {
+                    unless ($current{$field} eq $confhash{$provider}{$field}) {
+                        $changes{$provider} = 1;
+                    }
                 }
-            } else {
-                $secchanges{'encrypt'} = 1;
             }
-        } elsif (ref($currltisec{'encrypt'}) eq 'HASH') {
-            if ($currltisec{'encrypt'}{$item}) {
-                $secchanges{'encrypt'} = 1;
+            if ($imgdeletions{$provider}) {
+                $changes{$provider} = 1;
+            } elsif ($env{'form.proctoring_image_'.$provider.'.filename'} ne '') {
+                my ($imageurl,$error) =
+                    &process_proctoring_image($r,$dom,$confname,'proctoring_image_'.$provider,$provider,
+                                              $configuserok,$switchserver,$author_ok);
+                if ($imageurl) {
+                    $confhash{$provider}{'image'} = $imageurl;
+                    $changes{$provider} = 1; 
+                }
+                if ($error) {
+                    &Apache::lonnet::logthis($error);
+                    $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+                }
+            } elsif (exists($current{'image'})) {
+                $confhash{$provider}{'image'} = $current{'image'};
+            }
+            if (ref($requserfields{$provider}) eq 'ARRAY') {
+                if (@{$requserfields{$provider}} > 0) {
+                    if (grep(/^user$/,@{$requserfields{$provider}})) {
+                        if ($env{'form.proctoring_userincdom_'.$provider}) {
+                            $confhash{$provider}{'incdom'} = 1;
+                        }
+                        unless ($current{'incdom'} eq $confhash{$provider}{'incdom'}) {
+                            $changes{$provider} = 1;
+                        }
+                    }
+                    if (grep(/^roles$/,@{$requserfields{$provider}})) {
+                        $showroles = 1;
+                    }
+                }
+            }
+            $confhash{$provider}{'fields'} = [];
+            if (ref($optuserfields{$provider}) eq 'ARRAY') {
+                if (@{$optuserfields{$provider}} > 0) {
+                    my @optfields = &Apache::loncommon::get_env_multiple('form.proctoring_optional_'.$provider);
+                    foreach my $field (@{$optuserfields{$provider}}) {
+                        if (grep(/^\Q$field\E$/,@optfields)) {
+                            push(@{$confhash{$provider}{'fields'}},$field);
+                        }
+                    }
+                }
+                if (ref($current{'fields'}) eq 'ARRAY') {
+                    unless ($changes{$provider}) {
+                        my @new = sort(@{$confhash{$provider}{'fields'}});
+                        my @old = sort(@{$current{'fields'}}); 
+                        my @diffs = &Apache::loncommon::compare_arrays(\@new,\@old);
+                        if (@diffs) {
+                            $changes{$provider} = 1;
+                        }
+                    }
+                } elsif (@{$confhash{$provider}{'fields'}}) {
+                    $changes{$provider} = 1;
+                }
+            }
+            if (ref($defaults{$provider}) eq 'ARRAY') {  
+                if (@{$defaults{$provider}} > 0) {
+                    my %options;
+                    if (ref($extended{$provider}) eq 'HASH') {
+                        %options = %{$extended{$provider}};
+                    }
+                    my @checked = &Apache::loncommon::get_env_multiple('form.proctoring_defaults_'.$provider);
+                    foreach my $field (@{$defaults{$provider}}) {
+                        if ((exists($options{$field})) && (ref($options{$field}) eq 'ARRAY')) {
+                            my $poss = $env{'form.proctoring_defaults_'.$field.'_'.$provider};
+                            if (grep(/^\Q$poss\E$/,@{$options{$field}})) {
+                                push(@{$confhash{$provider}{'defaults'}},$poss); 
+                            }
+                        } elsif ((exists($options{$field})) && (ref($options{$field}) eq 'HASH')) {
+                            foreach my $inner (keys(%{$options{$field}})) {
+                                if (ref($options{$field}{$inner}) eq 'ARRAY') {
+                                    my $poss = $env{'form.proctoring_'.$inner.'_'.$provider};
+                                    if (grep(/^\Q$poss\E$/,@{$options{$field}{$inner}})) {
+                                        $confhash{$provider}{'defaults'}{$inner} = $poss;
+                                    }
+                                } else {
+                                    $confhash{$provider}{'defaults'}{$inner} = $env{'form.proctoring_'.$inner.'_'.$provider};
+                                }
+                            }
+                        } else {
+                            if (grep(/^\Q$field\E$/,@checked)) {
+                                push(@{$confhash{$provider}{'defaults'}},$field);
+                            }
+                        }
+                    }
+                    if (ref($confhash{$provider}{'defaults'}) eq 'ARRAY') {
+                        if (ref($current{'defaults'}) eq 'ARRAY') {
+                            unless ($changes{$provider}) {
+                                my @new = sort(@{$confhash{$provider}{'defaults'}});
+                                my @old = sort(@{$current{'defaults'}});
+                                my @diffs = &Apache::loncommon::compare_arrays(\@new,\@old);
+                                if (@diffs) {
+                                    $changes{$provider} = 1; 
+                                }
+                            }
+                        } elsif (ref($current{'defaults'}) eq 'ARRAY') {
+                            if (@{$current{'defaults'}}) {
+                                $changes{$provider} = 1;
+                            }
+                        }
+                    } elsif (ref($confhash{$provider}{'defaults'}) eq 'HASH') {
+                        if (ref($current{'defaults'}) eq 'HASH') {
+                            unless ($changes{$provider}) {
+                                foreach my $key (keys(%{$confhash{$provider}{'defaults'}})) {
+                                    unless ($confhash{$provider}{'defaults'}{$key} eq $current{'defaults'}{$key}) {
+                                        $changes{$provider} = 1;
+                                        last;
+                                    }
+                                }
+                            }
+                            unless ($changes{$provider}) {
+                                foreach my $key (keys(%{$current{'defaults'}})) {
+                                    unless ($current{'defaults'}{$key} eq $confhash{$provider}{'defaults'}{$key}) {
+                                        $changes{$provider} = 1;
+                                        last;
+                                    }
+                                }
+                            }
+                        } elsif (keys(%{$confhash{$provider}{'defaults'}})) {
+                            $changes{$provider} = 1;
+                        }
+                    }
+                }
+            }
+            if (ref($crsconf{$provider}) eq 'ARRAY') {
+                if (@{$crsconf{$provider}} > 0) {
+                    $confhash{$provider}{'crsconf'} = [];
+                    my @checked = &Apache::loncommon::get_env_multiple('form.proctoring_crsconf_'.$provider);
+                    foreach my $crsfield (@{$crsconf{$provider}}) {
+                        if (grep(/^\Q$crsfield\E$/,@checked)) {
+                            push(@{$confhash{$provider}{'crsconf'}},$crsfield);
+                        }
+                    }
+                    if (ref($current{'crsconf'}) eq 'ARRAY') {
+                        unless ($changes{$provider}) {  
+                            my @new = sort(@{$confhash{$provider}{'crsconf'}});
+                            my @old = sort(@{$current{'crsconf'}});
+                            my @diffs = &Apache::loncommon::compare_arrays(\@new,\@old);
+                            if (@diffs) {
+                                $changes{$provider} = 1;
+                            }
+                        }
+                    } elsif (@{$confhash{$provider}{'crsconf'}}) {
+                        $changes{$provider} = 1;
+                    }
+                }
+            }
+            if ($showroles) {
+                $confhash{$provider}{'roles'} = {};
+                foreach my $role (@courseroles) {
+                    my $poss = $env{'form.proctoring_roles_'.$role.'_'.$provider};
+                    if (grep(/^\Q$poss\E$/,@ltiroles)) {
+                        $confhash{$provider}{'roles'}{$role} = $poss;
+                    }
+                }
+                unless ($changes{$provider}) {
+                    if (ref($current{'roles'}) eq 'HASH') {
+                        foreach my $role (keys(%{$current{'roles'}})) {
+                            unless ($current{'roles'}{$role} eq $confhash{$provider}{'roles'}{$role}) {
+                                $changes{$provider} = 1;
+                                last
+                            }
+                        }
+                        unless ($changes{$provider}) {
+                            foreach my $role (keys(%{$confhash{$provider}{'roles'}})) {
+                                unless ($confhash{$provider}{'roles'}{$role} eq $current{'roles'}{$role}) {
+                                    $changes{$provider} = 1;
+                                    last;
+                                }
+                            }
+                        }
+                    } elsif (keys(%{$confhash{$provider}{'roles'}})) {
+                        $changes{$provider} = 1;
+                    }
+                }
+            }
+            if (ref($current{'custom'}) eq 'HASH') {
+                my @customdels = &Apache::loncommon::get_env_multiple('form.proctoring_customdel_'.$provider);
+                foreach my $key (keys(%{$current{'custom'}})) {
+                    if (grep(/^\Q$key\E$/,@customdels)) {
+                        $changes{$provider} = 1;
+                    } else {
+                        $confhash{$provider}{'custom'}{$key} = $env{'form.proctoring_customval_'.$key.'_'.$provider};
+                        if ($confhash{$provider}{'custom'}{$key} ne $current{'custom'}{$key}) {
+                            $changes{$provider} = 1;
+                        }
+                    }
+                }
+            }
+            if ($customadds{$provider}) {
+                my $name = $env{'form.proctoring_custom_name_'.$provider};
+                $name =~ s/(`)/'/g;
+                $name =~ s/^\s+//;
+                $name =~ s/\s+$//;
+                my $value = $env{'form.proctoring_custom_value_'.$provider};
+                $value =~ s/(`)/'/g;
+                $value =~ s/^\s+//;
+                $value =~ s/\s+$//;
+                if ($name ne '') {
+                    $confhash{$provider}{'custom'}{$name} = $value;
+                    $changes{$provider} = 1;
+                }
             }
         }
     }
-    unless (exists($currltisec{'rules'})) {
-        $currltisec{'rules'} = {};
+    if (@allpos > 0) {
+        my $idx = 0;
+        foreach my $provider (@allpos) {
+            if ($provider ne '') {
+                $confhash{$provider}{'order'} = $idx;
+                unless ($changes{$provider}) {
+                    if (ref($domconfig{$action}) eq 'HASH') {
+                        if (ref($domconfig{$action}{$provider}) eq 'HASH') {
+                            if ($domconfig{$action}{$provider}{'order'} ne $idx) {
+                                $changes{$provider} = 1;
+                            }
+                        }
+                    }
+                }
+                $idx ++;
+            }
+        }
     }
-    &password_rule_changes('secrets',$newltisec{'rules'},$currltisec{'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 $newkey;
-            my $keyitem = 'form.ltisec_privkey_'.$hostid;
-            if (exists($env{$keyitem})) {
-                $env{$keyitem} =~ s/(`)/'/g;
-                if ($keyset{$hostid}) {
-                    if ($env{'form.ltisec_changeprivkey_'.$hostid}) {
-                        if ($env{$keyitem} ne '') {
-                            $secchanges{'private'} = 1;
-                            $newkeyset{$hostid} = $env{$keyitem};
+    my %proc_hash = (
+                          $action => { %confhash }
+                       );
+    my $putresult = &Apache::lonnet::put_dom('configuration',\%proc_hash,
+                                             $dom);
+    if ($putresult eq 'ok') {
+        my %proc_enchash = (
+                             $action => { %encconfhash }
+                         );
+        &Apache::lonnet::put_dom('encconfig',\%proc_enchash,$dom);
+        if (keys(%changes) > 0) {
+            my $cachetime = 24*60*60;
+            my %procall = %confhash;
+            foreach my $provider (keys(%procall)) {
+                if (ref($encconfhash{$provider}) eq 'HASH') {
+                    foreach my $key ('key','secret') {
+                        $procall{$provider}{$key} = $encconfhash{$provider}{$key};
+                    }
+                }
+            }
+            &Apache::lonnet::do_cache_new('proctoring',$dom,\%procall,$cachetime);
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'proctoring'} = 1;
+            }
+            $resulttext = &mt('Configuration for Provider(s) with changes:').'<ul>';
+            my %bynum;
+            foreach my $provider (sort(keys(%changes))) {
+                my $position = $confhash{$provider}{'order'};
+                $bynum{$position} = $provider;
+            }
+            foreach my $pos (sort { $a <=> $b } keys(%bynum)) {
+                my $provider = $bynum{$pos};
+                my %lt = &proctoring_titles($provider);
+                my %fieldtitles = &proctoring_fieldtitles($provider);
+                if (!$confhash{$provider}{'available'}) {
+                    $resulttext .= '<li>'.&mt('Proctoring integration unavailable for: [_1]','<b>'.$providernames{$provider}.'</b>').'</li>';
+                } else {
+                    $resulttext .= '<li>'.&mt('Proctoring integration available for: [_1]','<b>'.$providernames{$provider}.'</b>');
+                    if ($confhash{$provider}{'image'}) {
+                        $resulttext .= '&nbsp;'.
+                                       '<img src="'.$confhash{$provider}{'image'}.'"'.
+                                       ' alt="'.&mt('Proctoring icon').'" />';
+                    }
+                    $resulttext .= '<ul>';
+                    my $position = $pos + 1;
+                    $resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>';
+                    foreach my $key ('version','sigmethod','url','lifetime') {
+                        if ($confhash{$provider}{$key} ne '') {
+                            $resulttext .= '<li>'.$lt{$key}.':&nbsp;'.$confhash{$provider}{$key}.'</li>';
+                        }
+                    }
+                    if ($encconfhash{$provider}{'key'} ne '') {
+                        $resulttext .= '<li>'.$lt{'key'}.':&nbsp;'.$encconfhash{$provider}{'key'}.'</li>';
+                    }
+                    if ($encconfhash{$provider}{'secret'} ne '') {
+                        $resulttext .= '<li>'.$lt{'secret'}.':&nbsp;';
+                        my $num = length($encconfhash{$provider}{'secret'});
+                        $resulttext .= ('*'x$num).'</li>';
+                    }
+                    my (@fields,$showroles);
+                    if (ref($requserfields{$provider}) eq 'ARRAY') {
+                        push(@fields,@{$requserfields{$provider}});
+                    }
+                    if (ref($confhash{$provider}{'fields'}) eq 'ARRAY') {
+                        push(@fields,@{$confhash{$provider}{'fields'}});
+                    } elsif (ref($confhash{$provider}{'fields'}) eq 'HASH') {
+                        push(@fields,(keys(%{$confhash{$provider}{'fields'}})));
+                    }
+                    if (@fields) {
+                        if (grep(/^roles$/,@fields)) {
+                            $showroles = 1;
+                        }
+                        $resulttext .= '<li>'.$lt{'udsl'}.':&nbsp;"'.
+                                       join('", "', map { $lt{$_}; } @fields).'"</li>';
+                    }
+                    if (ref($requserfields{$provider}) eq 'ARRAY') {
+                        if (grep(/^user$/,@{$requserfields{$provider}})) {
+                            if ($confhash{$provider}{'incdom'}) {
+                                $resulttext .= '<li>'.&mt('[_1] sent as [_2]',$lt{'user'},$lt{'uname:dom'}).'</li>';
+                            } else { 
+                                $resulttext .= '<li>'.&mt('[_1] sent as [_2]',$lt{'user'},$lt{'username'}).'</li>';
+                            }
+                        }
+                    }
+                    if (ref($confhash{$provider}{'defaults'}) eq 'ARRAY') {
+                        if (@{$confhash{$provider}{'defaults'}} > 0) {
+                            $resulttext .= '<li>'.$lt{'defa'};
+                            foreach my $field (@{$confhash{$provider}{'defaults'}}) {
+                                $resulttext .= ' "'.$fieldtitles{$field}.'",';
+                            }
+                            $resulttext =~ s/,$//;
+                            $resulttext .= '</li>';
+                        }
+                    } elsif (ref($confhash{$provider}{'defaults'}) eq 'HASH') {
+                        if (keys(%{$confhash{$provider}{'defaults'}})) {
+                            $resulttext .= '<li>'.$lt{'defa'}.':&nbsp;<ul>';
+                            foreach my $key (sort(keys(%{$confhash{$provider}{'defaults'}}))) {
+                                if ($confhash{$provider}{'defaults'}{$key} ne '') {
+                                    $resulttext .= '<li>'.$fieldtitles{$key}.' = '.$confhash{$provider}{'defaults'}{$key}.'</li>';
+                                }
+                            }
+                            $resulttext .= '</ul></li>';
+                        }
+                    }
+                    if (ref($crsconf{$provider}) eq 'ARRAY') {
+                        if (@{$crsconf{$provider}} > 0) {
+                            $resulttext .= '<li>'.&mt('Configurable in course:');
+                            my $numconfig = 0;
+                            if (ref($confhash{$provider}{'crsconf'}) eq 'ARRAY') {
+                                if (@{$confhash{$provider}{'crsconf'}} > 0) {
+                                    foreach my $field (@{$confhash{$provider}{'crsconf'}}) {
+                                        $numconfig ++;
+                                        if ($provider eq 'examity') {
+                                            $resulttext .= ' "'.$lt{'crs'.$field}.'",';
+                                        } else {
+                                            $resulttext .= ' "'.$fieldtitles{$field}.'",';
+                                        }
+                                    }
+                                    $resulttext =~ s/,$//;
+                                }
+                            }
+                            if (!$numconfig) {
+                                $resulttext .= '&nbsp;'.&mt('None');
+                            }
+                            $resulttext .= '</li>';
                         }
                     }
-                } elsif ($env{$keyitem} ne '') {
-                    unless (grep(/^\Q$hostid\E$/,@{$newltisec{'private'}{'keys'}})) {
-                        push(@{$newltisec{'private'}{'keys'}},$hostid);
+                    if ($showroles) {
+                        if (ref($confhash{$provider}{'roles'}) eq 'HASH') {
+                            my $rolemaps;
+                            foreach my $role (@courseroles) {
+                                if ($confhash{$provider}{'roles'}{$role}) {
+                                    $rolemaps .= ('&nbsp;'x2).&Apache::lonnet::plaintext($role,'Course').'='.
+                                                 $confhash{$provider}{'roles'}{$role}.',';
+                                }
+                            }
+                            if ($rolemaps) {
+                                $rolemaps =~ s/,$//;
+                                $resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>';
+                            }
+                        }
                     }
-                    $secchanges{'private'} = 1;
-                    $newkeyset{$hostid} = $env{$keyitem};
+                    if (ref($confhash{$provider}{'custom'}) eq 'HASH') {
+                        my $customlist;
+                        if (keys(%{$confhash{$provider}{'custom'}})) {
+                            foreach my $key (sort(keys(%{$confhash{$provider}{'custom'}}))) {
+                                $customlist .= $key.'='.$confhash{$provider}{'custom'}{$key}.', ';
+                            }
+                            $customlist =~ s/,$//;
+                        }
+                        if ($customlist) {
+                            $resulttext .= '<li>'.&mt('Custom items').': '.$customlist.'</li>';
+                        }
+                    } 
+                    $resulttext .= '</ul></li>';
                 }
             }
+            $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;
+}
 
-    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; } }
+sub process_proctoring_image {
+    my ($r,$dom,$confname,$caller,$provider,$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 Remote Proctoring Provider icon is not permitted to this server: [_1]',
+                         $switchserver);
+        } elsif ($author_ok eq 'ok') {
+            my ($result,$imageurl,$madethumb) =
+                &publishlogo($r,'upload',$caller,$dom,$confname,
+                             "proctoring/$provider/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);
+            }
+        } 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 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 (%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 %coursetypetitles = &Apache::lonlocal::texthash (
+                               official   => 'Official',
+                               unofficial => 'Unofficial',
+                               community  => 'Community',
+                               textbook   => 'Textbook',
+                               placement  => 'Placement Test',
+    );
+    my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
+    my %lt = &lti_names();
+    map { $posslti{$_} = 1; } @ltiroles;
+    map { $posslticrs{$_} = 1; } @lticourseroles;
+    map { $posscrstype{$_} = 1; } @coursetypes;
+
+    my %menutitles = &ltimenu_titles();
 
-    if (keys(%linkprotchg)) {
-        $secchanges{'linkprot'} = 1;
-        my %oldlinkprot;
-        if (ref($currltisec{'linkprot'}) eq 'HASH') {
-            %oldlinkprot = %{$currltisec{'linkprot'}};
+    my (@items,%deletions,%itemids);
+    if ($env{'form.lti_add'}) {
+        my $consumer = $env{'form.lti_consumer_add'};
+        $consumer =~ s/(`)/'/g;
+        ($newid,my $error) = &get_lti_id($dom,$consumer);
+        if ($newid) {
+            $itemids{'add'} = $newid;
+            push(@items,'add');
+            $changes{$newid} = 1;
+        } else {
+            my $error = &mt('Failed to acquire unique ID for new LTI configuration');
+            $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+        }
+    }
+    if (ref($domconfig{$action}) eq 'HASH') {
+        my @todelete = &Apache::loncommon::get_env_multiple('form.lti_del');
+        if (@todelete) {
+            map { $deletions{$_} = 1; } @todelete;
         }
-        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};
+        my $maxnum = $env{'form.lti_maxnum'};
+        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;
+                }
+            }
+        }
+    }
+    foreach my $idx (@items) {
+        my $itemid = $itemids{$idx};
+        next unless ($itemid);
+        my $position = $env{'form.lti_pos_'.$idx};
+        $position =~ s/\D+//g;
+        if ($position ne '') {
+            $allpos[$position] = $itemid;
+        }
+        foreach my $item ('consumer','key','secret','lifetime','requser') {
+            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;
                         }
                     }
                 }
-            } else {
-                $newltisec{'linkprot'}{$id} = $linkprotchg{$id};
             }
         }
-        $linkprotoutput = &Apache::courseprefs::store_linkprot($dom,'','domain',\%linkprotchg,\%oldlinkprot);
-        if (keys(%linkprotchg)) {
-            %{$newltisec{'linkprot'}} = %linkprotchg;
+        if ($env{'form.lti_version_'.$idx} eq 'LTI-1p0') {
+            $confhash{$itemid}{'version'} = $env{'form.lti_version_'.$idx};
         }
-    }
-    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};
+        if ($confhash{$itemid}{'requser'}) {
+            if ($env{'form.lti_mapuser_'.$idx} eq '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;
+                }
+            }
+            my @possmakeuser = &Apache::loncommon::get_env_multiple('form.lti_makeuser_'.$idx);
+            my @makeuser;
+            foreach my $ltirole (sort(@possmakeuser)) {
+                if ($posslti{$ltirole}) {
+                    push(@makeuser,$ltirole);
+                }
+            }
+            $confhash{$itemid}{'makeuser'} = \@makeuser;
+            if (@makeuser) {
+                my $lcauth = $env{'form.lti_lcauth_'.$idx};
+                if ($lcauth =~ /^(internal|krb4|krb5|localauth)$/) {
+                    $confhash{$itemid}{'lcauth'} = $lcauth;
+                    if ($lcauth ne 'internal') {
+                        my $lcauthparm = $env{'form.lti_lcauthparm_'.$idx};
+                        $lcauthparm =~ s/^(\s+|\s+)$//g;
+                        $lcauthparm =~ s/`//g;
+                        if ($lcauthparm ne '') {
+                            $confhash{$itemid}{'lcauthparm'} = $lcauthparm;
                         }
                     }
                 } else {
-                    $newltisec{'linkprot'}{$id} = $currltisec{'linkprot'}{$id};
+                    $confhash{$itemid}{'lcauth'} = 'lti';
                 }
             }
-        }
-    }
-    if ($proterror) {
-        $errors .= '<li>'.$proterror.'</li>';
-    }
-
-    my $putresult;
-    if (keys(%secchanges)) {
-        my %ltienchash;
-        my %ltihash = (
-                          'ltisec' => { %newltisec }
-                      );
-        $putresult = &Apache::lonnet::put_dom('configuration',\%ltihash,$dom);
-        if ($putresult eq 'ok') {
-            my %keystore;
-            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,'lti','private',
-                                                                    $dom,$hostid);
+            my @possinstdata =  &Apache::loncommon::get_env_multiple('form.lti_instdata_'.$idx);
+            if (@possinstdata) {
+                foreach my $field (@possinstdata) {
+                    if (exists($fieldtitles{$field})) {
+                        push(@{$confhash{$itemid}{'instdata'}});
+                    }
                 }
             }
-            if (ref($lastactref) eq 'HASH') {
-                if (($secchanges{'encrypt'}) || ($secchanges{'private'})) {
-                    $lastactref->{'domdefaults'} = 1;
+            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);
                 }
             }
-            if (($secchanges{'linkprot'}) && ($is_home)) {
-                my %ltienchash = (
-                                     'linkprot' =>  { %newltienc }
-                                 );
-                &Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom,undef,1);
+            $confhash{$itemid}{'mapcrstype'} = \@crstypes;
+            if ($env{'form.lti_makecrs_'.$idx}) {
+                $confhash{$itemid}{'makecrs'} = 1;
             }
-        }
-    } else {
-        return &mt('No changes made.');
-    }
-    if ($putresult eq 'ok') {
-        $resulttext = &mt('Changes made:').'<ul>';
-        foreach my $item (keys(%secchanges)) {
-            if ($item eq 'encrypt') {
-                my %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'),
-                                 },
-                );
-                foreach my $type ('crs','dom') {
-                    my $shown = $encrypted{$type}{'off'};
-                    if (ref($newltisec{$item}) eq 'HASH') {
-                        if ($newltisec{$item}{$type}) {
-                            $shown = $encrypted{$type}{'on'};
+            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};
+                    $callback =~ s/^\s+|\s+$//g;
+                    $confhash{$itemid}{'callback'} = $callback;
+                }
+            }
+            foreach my $field ('passback','roster','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);
+                foreach my $field (@possmenu) {
+                    if (exists($menutitles{$field})) {
+                        if ($field eq 'grades') {
+                            next unless ($env{'form.lti_inlinemenu_'.$idx});
                         }
+                        push(@{$confhash{$itemid}{lcmenu}},$field);
                     }
-                    $resulttext .= '<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 ($newltisec{rules}{$rule} eq '') {
-                        if ($rule eq 'min') {
-                            $resulttext .= '<li>'.&mt('[_1] not set.',$titles{$rule});
-                                           ' '.&mt('Default of [_1] will be used',
-                                                       $Apache::lonnet::passwdmin).'</li>';
-                        } else {
-                            $resulttext .= '<li>'.&mt('[_1] set to none',$titles{$rule}).'</li>';
+                }
+            }
+            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;
+                    }
+                }
+                unless ($changes{$itemid}) {
+                    if ($domconfig{$action}{$itemid}{'passback'} eq $confhash{$itemid}{'passback'}) {
+                        if ($domconfig{$action}{$itemid}{'passbackformat'} ne $confhash{$itemid}{'passbackformat'}) {
+                            $changes{$itemid} = 1;
                         }
-                    } else {
-                        $resulttext .= '<li>'.&mt('[_1] set to [_2]',$titles{$rule},$newltisec{rules}{$rule}).'</li>';
                     }
                 }
-                if (ref($newltisec{'rules'}{'chars'}) eq 'ARRAY') {
-                    if (@{$newltisec{'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{$_} } @{$newltisec{'rules'}{'chars'}}).
-                                     '</li></ul>';
-                        $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{'chars'},$needed).'</li>';
-                    } else {
-                        $resulttext .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>';
+                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) {
+                                $changes{$itemid} = 1;
+                            }
+                        }
                     }
-                } else {
-                    $resulttext .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>';
                 }
-            } elsif ($item eq 'private') {
-                if (keys(%newkeyset)) {
-                    foreach my $hostid (sort(keys(%newkeyset))) {
-                        if ($keystore{$hostid} eq 'ok') {
-                            $resulttext .= '<li>'.&mt('Encryption key for storage of shared secrets saved for [_1]',$hostid).'</li>';
+                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}) {
+                                    $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}) {
+                                        $changes{$itemid} = 1;
+                                        last;
+                                    }
+                                }
+                            }
+                        } elsif (keys(%{$domconfig{$action}{$itemid}{'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 ($item eq 'linkprot') {
-                $resulttext .= $linkprotoutput;
             }
         }
-        $resulttext .= '</ul>';
+    }
+    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 ++;
+            }
+        }
+    }
+    my %ltihash = (
+                          $action => { %confhash }
+                       );
+    my $putresult = &Apache::lonnet::put_dom('configuration',\%ltihash,
+                                             $dom);
+    if ($putresult eq 'ok') {
+        my %ltienchash = (
+                             $action => { %encconfig }
+                         );
+        &Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom);
+        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);
+            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;
+            }
+            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>';
+                    my $position = $pos + 1;
+                    $resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>';
+                    foreach my $item ('version','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>';
+                    }
+                    if ($confhash{$itemid}{'requser'}) {
+                        if ($confhash{$itemid}{'mapuser'}) {
+                            my $shownmapuser;
+                            if ($confhash{$itemid}{'mapuser'} eq 'lis_person_sourcedid') {
+                                $shownmapuser = $lt{'sourcedid'}.' (lis_person_sourcedid)';
+                            } elsif ($confhash{$itemid}{'mapuser'} eq 'lis_person_contact_email_primary') {
+                                $shownmapuser = $lt{'email'}.' (lis_person_contact_email_primary)';
+                            } else {
+                                $shownmapuser = &mt('Other').' ('.$confhash{$itemid}{'mapuser'}.')';
+                            }
+                            $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]',
+                                                          join(', ',@{$confhash{$itemid}{'makeuser'}})).'<br />';
+                                if ($confhash{$itemid}{'lcauth'} eq 'lti') {
+                                    $resulttext .= &mt('New users will only be able to authenticate via LTI').'</li>';
+                                } else {
+                                    $resulttext .= &mt('New users will be assigned LON-CAPA authentication: [_1]',
+                                                       $confhash{$itemid}{'lcauth'});
+                                    if ($confhash{$itemid}{'lcauth'} eq 'internal') {
+                                        $resulttext .= '; '.&mt('a randomly generated password will be created');
+                                    } elsif ($confhash{$itemid}{'lcauth'} eq 'localauth') {
+                                        if ($confhash{$itemid}{'lcauthparm'} ne '') {
+                                            $resulttext .= ' '.&mt('with argument: [_1]',$confhash{$itemid}{'lcauthparm'});
+                                        }
+                                    } else {
+                                        $resulttext .= '; '.&mt('Kerberos domain: [_1]',$confhash{$itemid}{'lcauthparm'});
+                                    }
+                                }
+                                $resulttext .= '</li>';
+                            } else {
+                                $resulttext .= '<li>'.&mt('User account creation not permitted.').'</li>';
+                            }
+                        }
+                        if (ref($confhash{$itemid}{'instdata'}) eq 'ARRAY') {
+                            if (@{$confhash{$itemid}{'instdata'}} > 0) {
+                                $resulttext .= '<li>'.&mt('Institutional data will be used when creating a new user for: [_1]',
+                                                          join(', ',map { $fieldtitles{$_}; } @{$confhash{$itemid}{'instdata'}})).'</li>';
+                            } else {
+                                $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') {
+                            $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.');
+        }
     } else {
         $errors .= '<li><span class="LC_error">'.&mt('Failed to save changes').'</span></li>';
     }
@@ -13231,6 +14525,49 @@ sub modify_lti {
     return $resulttext;
 }
 
+sub get_lti_id {
+    my ($domain,$consumer) = @_;
+    # get lock on lti db
+    my $lockhash = {
+                      lock => $env{'user.name'}.
+                              ':'.$env{'user.domain'},
+                   };
+    my $tries = 0;
+    my $gotlock = &Apache::lonnet::newput_dom('lti',$lockhash,$domain);
+    my ($id,$error);
+
+    while (($gotlock ne 'ok') && ($tries<10)) {
+        $tries ++;
+        sleep (0.1);
+        $gotlock = &Apache::lonnet::newput_dom('lti',$lockhash,$domain);
+    }
+    if ($gotlock eq 'ok') {
+        my %currids = &Apache::lonnet::dump_dom('lti',$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('lti',{ $id => $consumer },$domain) eq 'ok') {
+                    $error = 'nostore';
+                }
+            } else {
+                $error = 'nonumber';
+            }
+        }
+        my $dellockoutcome = &Apache::lonnet::del_dom('lti',['lock'],$domain);
+    } else {
+        $error = 'nolock';
+    }
+    return ($id,$error);
+}
+
 sub modify_autoenroll {
     my ($dom,$lastactref,%domconfig) = @_;
     my ($resulttext,%changes);
@@ -13244,7 +14581,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)',
-                  autofailsafe => 'Failsafe for no drops if institutional data missing for a section');
+                  failsafe => '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'};
@@ -13254,23 +14591,17 @@ 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'};
-    unless (($failsafe eq 'zero') || ($failsafe eq 'any')) {
-        $failsafe = 'off';
-        undef($autofailsafe);
+    $failsafe =~ s{^\s+|\s+$}{}g;
+    if ($failsafe =~ /\D/) {
+        undef($failsafe);
     }
     my %autoenrollhash =  (
                        autoenroll => { 'run' => $env{'form.autoenroll_run'},
                                        'sender_uname' => $sender_uname,
                                        'sender_domain' => $sender_domain,
                                        'co-owners' => $coowners,
-                                       'autofailsafe' => $autofailsafe,
-                                       'failsafe' => $failsafe,
+                                       'autofailsafe' => $failsafe,
                                 }
                      );
     my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash,
@@ -13298,12 +14629,9 @@ sub modify_autoenroll {
         } elsif ($coowners) {
             $changes{'coowners'} = 1;
         }
-        if ($currautoenroll{'autofailsafe'} ne $autofailsafe) {
+        if ($currautoenroll{'autofailsafe'} ne $failsafe) {
             $changes{'autofailsafe'} = 1;
         }
-        if ($currautoenroll{'failsafe'} ne $failsafe) {
-            $changes{'failsafe'} = 1;
-        }
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'run'}) {
@@ -13324,24 +14652,11 @@ sub modify_autoenroll {
                 }
             }
             if ($changes{'autofailsafe'}) {
-                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 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>';
+                if ($failsafe ne '') {
+                    $resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section set to: [_1]',$failsafe).'</li>';
                 } else {
-                    $resulttext .= '<li>'.&mt('Failsafe applies if retrieved section enrollment is zero or greater').'</li>';
+                    $resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section: deleted');
                 }
-            }
-            if (($changes{'autofailsafe'}) || ($changes{'failsafe'})) {
                 &Apache::lonnet::get_domain_defaults($dom,1);
                 if (ref($lastactref) eq 'HASH') {
                     $lastactref->{'domdefaults'} = 1;
@@ -13368,10 +14683,8 @@ sub modify_autoupdate {
     }
     my @offon = ('off','on');
     my %title = &Apache::lonlocal::texthash (
-                    run        => 'Auto-update:',
-                    classlists => 'Updates to user information in classlists?',
-                    unexpired  => 'Skip updates for users without active or future roles?',
-                    lastactive => 'Skip updates for inactive users?',
+                   run => 'Auto-update:',
+                   classlists => 'Updates to user information in classlists?'
                 );
     my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
     my %fieldtitles = &Apache::lonlocal::texthash (
@@ -13415,23 +14728,12 @@ sub modify_autoupdate {
     my %updatehash = (
                       autoupdate => { run => $env{'form.autoupdate_run'},
                                       classlists => $env{'form.classlists'},
-                                      unexpired  => $env{'form.unexpired'},
                                       fields => {%fields},
                                       lockablenames => \@lockablenames,
                                     }
                      );
-    my $lastactivedays;
-    if ($env{'form.lastactive'}) {
-        $lastactivedays = $env{'form.lastactivedays'};
-        $lastactivedays =~ s/^\s+|\s+$//g;
-        unless ($lastactivedays =~ /^\d+$/) {
-            undef($lastactivedays);
-            $env{'form.lastactive'} = 0;
-        }
-    }
-    $updatehash{'autoupdate'}{'lastactive'} = $lastactivedays;
     foreach my $key (keys(%currautoupdate)) {
-        if (($key eq 'run') || ($key eq 'classlists') || ($key eq 'unexpired') || ($key eq 'lastactive')) {
+        if (($key eq 'run') || ($key eq 'classlists')) {
             if (exists($updatehash{autoupdate}{$key})) {
                 if ($currautoupdate{$key} ne $updatehash{autoupdate}{$key}) {
                     $changes{$key} = 1;
@@ -13477,16 +14779,6 @@ sub modify_autoupdate {
             $changes{'lockablenames'} = 1;
         }
     }
-    unless (grep(/^unexpired$/,keys(%currautoupdate))) {
-        if ($updatehash{'autoupdate'}{'unexpired'}) {
-            $changes{'unexpired'} = 1;
-        }
-    }
-    unless (grep(/^lastactive$/,keys(%currautoupdate))) {
-        if ($updatehash{'autoupdate'}{'lastactive'} ne '') {
-            $changes{'lastactive'} = 1;
-        }
-    }
     foreach my $item (@{$types},'default') {
         if (defined($fields{$item})) {
             if (ref($currautoupdate{'fields'}) eq 'HASH') {
@@ -13549,11 +14841,6 @@ sub modify_autoupdate {
                     my $newvalue;
                     if ($key eq 'run') {
                         $newvalue = $offon[$env{'form.autoupdate_run'}];
-                    } elsif ($key eq 'lastactive') {
-                        $newvalue = $offon[$env{'form.lastactive'}];
-                        unless ($lastactivedays eq '') {
-                            $newvalue .= '; '.&mt('inactive = no activity in last [quant,_1,day]',$lastactivedays);
-                        }
                     } else {
                         $newvalue = $offon[$env{'form.'.$key}];
                     }
@@ -13918,7 +15205,7 @@ sub modify_contacts {
                 $contacts_hash{'contacts'}{'lonstatus'}{$item} = \@excluded;
             }
         } elsif ($item eq 'weights') {
-            foreach my $type ('E','W','N','U') {
+            foreach my $type ('E','W','N') {
                 $env{'form.error'.$item.'_'.$type} =~ s/^\s+|\s+$//g;
                 if ($env{'form.error'.$item.'_'.$type} =~ /^\d+$/) {
                     unless ($env{'form.error'.$item.'_'.$type} == $lonstatus_defs->{$type}) {
@@ -13990,7 +15277,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) {
@@ -14048,12 +15335,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;
                                 }
@@ -14070,7 +15357,7 @@ sub modify_contacts {
                 }
             } else {
                 foreach my $key (@overrides) {
-                    push(@{$changes{'overrides'}},$key);
+                    push(@{$changes{'overrides'}},$key); 
                 }
             }
         }
@@ -14252,7 +15539,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};
@@ -14276,14 +15563,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>');
@@ -14445,6 +15732,230 @@ sub modify_contacts {
     return $resulttext;
 }
 
+sub modify_privacy {
+    my ($dom,%domconfig) = @_;
+    my ($resulttext,%current,%changes);
+    if (ref($domconfig{'privacy'}) eq 'HASH') {
+        %current = %{$domconfig{'privacy'}};
+    }
+    my @fields = ('lastname','firstname','middlename','generation','permanentemail','id');
+    my @items = ('domain','author','course','community');
+    my %names = &Apache::lonlocal::texthash (
+                   domain => 'Assigned domain role(s)',
+                   author => 'Assigned co-author role(s)',
+                   course => 'Assigned course role(s)',
+                   community => 'Assigned community role',
+                );
+    my %roles = &Apache::lonlocal::texthash (
+                   domain => 'Domain role',
+                   author => 'Co-author role',
+                   course => 'Course role',
+                   community => 'Community role',
+                );
+    my %titles = &Apache::lonlocal::texthash (
+                  approval => 'Approval for role in different domain',
+                  othdom   => 'User information available in other domain',
+                  priv     => 'Information viewable by privileged user in same domain',
+                  unpriv   => 'Information viewable by unprivileged user in same domain',
+                  instdom  => 'Other domain shares institution/provider',
+                  extdom   => 'Other domain has different institution/provider',
+                  none     => 'Not allowed',
+                  user     => 'User authorizes',
+                  domain   => 'Domain Coordinator authorizes',
+                  auto     => 'Unrestricted',
+    );
+    my %fieldnames = &Apache::lonlocal::texthash (
+                        id => 'Student/Employee ID',
+                        permanentemail => 'E-mail address',
+                        lastname => 'Last Name',
+                        firstname => 'First Name',
+                        middlename => 'Middle Name',
+                        generation => 'Generation',
+    );
+    my ($othertitle,$usertypes,$types) =
+        &Apache::loncommon::sorted_inst_types($dom);
+    my (%by_ip,%by_location,@intdoms,@instdoms);
+    &build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms);
+
+    my %privacyhash = (
+                       'approval' => {
+                                       instdom => {},
+                                       extdom  => {},
+                                     },
+                       'othdom'   => {},
+                       'priv'     => {},
+                       'unpriv'   => {},
+                      );
+    foreach my $item (@items) {
+        if (@instdoms > 1) {
+            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') {
+                if (ref($current{'approval'}{'instdom'}) eq 'HASH') {
+                    unless ($privacyhash{'approval'}{'instdom'}{$item} eq $current{'approval'}{'instdom'}{$item}) {
+                        $changes{'approval'} = 1;
+                    }
+                }
+            } elsif ($privacyhash{'approval'}{'instdom'}{$item} ne 'auto') {
+                $changes{'approval'} = 1;
+            }
+        }
+        if (keys(%by_location) > 0) {
+            if ($env{'form.privacy_approval_extdom_'.$item} =~ /^(none|user|domain|auto)$/) {
+                $privacyhash{'approval'}{'extdom'}{$item} = $env{'form.privacy_approval_extdom_'.$item};
+            }
+            if (ref($current{'approval'}) eq 'HASH') {
+                if (ref($current{'approval'}{'extdom'}) eq 'HASH') {
+                    unless ($privacyhash{'approval'}{'extdom'}{$item} eq $current{'approval'}{'extdom'}{$item}) {
+                        $changes{'approval'} = 1;
+                    }
+                }
+            } elsif ($privacyhash{'approval'}{'extdom'}{$item} ne 'auto') {
+                $changes{'approval'} = 1;
+            }
+        }
+        foreach my $status ('priv','unpriv') {
+            my @possibles = sort(&Apache::loncommon::get_env_multiple('form.privacy_'.$status.'_'.$item));
+            my @newvalues;
+            foreach my $field (@possibles) {
+                if (grep(/^\Q$field\E$/,@fields)) {
+                    $privacyhash{$status}{$item}{$field} = 1;
+                    push(@newvalues,$field);
+                }
+            }
+            @newvalues = sort(@newvalues);
+            if (ref($current{$status}) eq 'HASH') {
+                if (ref($current{$status}{$item}) eq 'HASH') {
+                    my @currvalues = sort(keys(%{$current{$status}{$item}}));
+                    my @diffs = &Apache::loncommon::compare_arrays(\@currvalues,\@newvalues);
+                    if (@diffs > 0) {
+                        $changes{$status} = 1;
+                    }
+                }
+            } else {
+                my @stdfields;
+                foreach my $field (@fields) {
+                    if ($field eq 'id') {
+                        next if ($status eq 'unpriv');
+                        next if (($status eq 'priv') && ($item eq 'community'));
+                    }
+                    push(@stdfields,$field);
+                }
+                my @diffs = &Apache::loncommon::compare_arrays(\@stdfields,\@newvalues);
+                if (@diffs > 0) {
+                    $changes{$status} = 1;
+                }
+            }
+        }
+    }
+    if ((@instdoms > 1) || (keys(%by_location) > 0)) {
+        my @statuses;
+        if (ref($types) eq 'ARRAY') {
+            @statuses = @{$types};
+        }
+        foreach my $type (@statuses,'default') {
+            my @possfields = &Apache::loncommon::get_env_multiple('form.privacy_othdom_'.$type);
+            my @newvalues;
+            foreach my $field (sort(@possfields)) {
+                if (grep(/^\Q$field\E$/,@fields)) {
+                    $privacyhash{'othdom'}{$type}{$field} = 1;
+                    push(@newvalues,$field);
+                }
+            }
+            @newvalues = sort(@newvalues);
+            if (ref($current{'othdom'}) eq 'HASH') {
+                if (ref($current{'othdom'}{$type}) eq 'HASH') {
+                    my @currvalues = sort(keys(%{$current{'othdom'}{$type}}));
+                    my @diffs = &Apache::loncommon::compare_arrays(\@currvalues,\@newvalues);
+                    if (@diffs > 0) {
+                        $changes{'othdom'} = 1;
+                    }
+                }
+            } else {
+                my @stdfields = ('lastname','firstname','middlename','generation','permanentemail');
+                my @diffs = &Apache::loncommon::compare_arrays(\@stdfields,\@newvalues);
+                if (@diffs > 0) {
+                    $changes{'othdom'} = 1;
+                }
+            }
+        }
+    }
+    my %confighash = (
+                        privacy => \%privacyhash,
+                     );
+    my $putresult = &Apache::lonnet::put_dom('configuration',\%confighash,$dom);
+    if ($putresult eq 'ok') {
+        if (keys(%changes) > 0) {
+            $resulttext = &mt('Changes made: ').'<ul>';
+            foreach my $key ('approval','othdom','priv','unpriv') {
+                if ($changes{$key}) {
+                    $resulttext .= '<li>'.$titles{$key}.':<ul>';
+                    if ($key eq 'approval') {
+                        if (keys(%{$privacyhash{$key}{instdom}})) {
+                            $resulttext .= '<li>'.$titles{'instdom'}.'<ul>';
+                            foreach my $item (@items) {
+                                $resulttext .=  '<li>'.$roles{$item}.': '.$titles{$privacyhash{$key}{instdom}{$item}}.'</li>';
+                            }
+                            $resulttext .= '</ul></li>';
+                        }
+                        if (keys(%{$privacyhash{$key}{extdom}})) {
+                            $resulttext .= '<li>'.$titles{'extdom'}.'<ul>';
+                            foreach my $item (@items) {
+                                $resulttext .=  '<li>'.$roles{$item}.': '.$titles{$privacyhash{$key}{extdom}{$item}}.'</li>';
+                            }
+                            $resulttext .= '</ul></li>';
+                        }
+                    } elsif ($key eq 'othdom') {
+                        my @statuses;
+                        if (ref($types) eq 'ARRAY') {
+                            @statuses = @{$types};
+                        }
+                        if (ref($privacyhash{$key}) eq 'HASH') {
+                            foreach my $status (@statuses,'default') {
+                                if ($status eq 'default') {
+                                    $resulttext .= '<li>'.$othertitle.': ';
+                                } elsif (ref($usertypes) eq 'HASH') {
+                                    $resulttext .= '<li>'.$usertypes->{$status}.': ';
+                                } else {
+                                    next;
+                                }
+                                if (ref($privacyhash{$key}{$status}) eq 'HASH') {
+                                    if (keys(%{$privacyhash{$key}{$status}})) {
+                                        $resulttext .= join(', ', map { $fieldnames{$_}; } (sort(keys(%{$privacyhash{$key}{$status}}))));
+                                    } else {
+                                        $resulttext .= &mt('none');
+                                    }
+                                }
+                                $resulttext .= '</li>';
+                            }
+                        }
+                    } else {
+                        foreach my $item (@items) {
+                            if (ref($privacyhash{$key}{$item}) eq 'HASH') {
+                                $resulttext .= '<li>'.$names{$item}.': ';
+                                if (keys(%{$privacyhash{$key}{$item}})) {
+                                    $resulttext .= join(', ', map { $fieldnames{$_}; } (sort(keys(%{$privacyhash{$key}{$item}}))));
+                                } else {
+                                    $resulttext .= &mt('none');
+                                }
+                                $resulttext .= '</li>';
+                            }
+                        }
+                    }
+                    $resulttext .= '</ul></li>';
+                }
+            }
+        } else {
+            $resulttext = &mt('No changes made to user information settings');
+        }
+    } else {
+        $resulttext = '<span class="LC_error">'.
+            &mt('An error occurred: [_1]',$putresult).'</span>';
+    }
+    return $resulttext;
+}
+
 sub modify_passwords {
     my ($r,$dom,$confname,$lastactref,%domconfig) = @_;
     my ($resulttext,%current,%changes,%newvalues,@oktypes,$errors,
@@ -14470,6 +15981,7 @@ sub modify_passwords {
         min            => 'Minimum password length',
         max            => 'Maximum password length',
         chars          => 'Required characters',
+        expire         => 'Password expiration (days)',
         numsaved       => 'Number of previous passwords to save',
         reset          => 'Resetting Forgotten Password',
         intauth        => 'Encryption of Stored Passwords (Internal Auth)',
@@ -14612,7 +16124,6 @@ sub modify_passwords {
     }
     if ($env{'form.passwords_customfile.filename'} ne '') {
         my $servadm = $r->dir_config('lonAdmEMail');
-        my $servadm = $r->dir_config('lonAdmEMail');
         my ($configuserok,$author_ok,$switchserver) =
             &config_check($dom,$confname,$servadm);
         my $error;
@@ -14679,7 +16190,61 @@ sub modify_passwords {
             $updatedefaults = 1;
         }
     }
-    &password_rule_changes('passwords',\%newvalues,\%current,\%changes);
+    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;
+            }
+        }
+    }
     my %crsownerchg = (
                         by => [],
                         for => [],
@@ -14807,7 +16372,7 @@ sub modify_passwords {
                                 $resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'</li>';
                             }
                         } else {
-                            $resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'</li>';
+                            $resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA usedfor verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'</li>';
                         }
                         if ($confighash{'passwords'}{'resetremove'}) {
                             $resulttext .= '<li>'.&mt('Preamble to "Forgot Password" web form not shown').'</li>';
@@ -14851,7 +16416,7 @@ sub modify_passwords {
                             $resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$titles{$key.'_'.$item},$value).'</li>';
                         }
                     } elsif ($key eq 'rules') {
-                        foreach my $rule ('min','max','numsaved') {
+                        foreach my $rule ('min','max','expire','numsaved') {
                             if ($confighash{'passwords'}{$rule} eq '') {
                                 if ($rule eq 'min') {
                                     $resulttext .= '<li>'.&mt('[_1] not set.',$titles{$rule});
@@ -14874,7 +16439,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>';
@@ -14939,71 +16504,6 @@ 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','numsaved');
-    } elsif ($prefix eq 'secrets') {
-        @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 '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);
@@ -15088,7 +16588,7 @@ sub modify_usercreation {
     }
 
     my @authen_contexts = ('author','course','domain');
-    my @authtypes = ('int','krb4','krb5','loc');
+    my @authtypes = ('int','krb4','krb5','loc','lti');
     my %authhash;
     foreach my $item (@authen_contexts) {
         my @authallowed =  &Apache::loncommon::get_env_multiple('form.'.$item.'_auth');
@@ -15303,7 +16803,6 @@ sub modify_selfcreation {
 # Populate $cancreate{'selfcreate'} array reference with types of user, for which self-creation of user accounts
 # is permitted.
 #
-
     my ($emailrules,$emailruleorder) = &Apache::lonnet::inst_userrules($dom,'email');
 
     my (@statuses,%email_rule);
@@ -15353,7 +16852,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})) {
@@ -15365,7 +16864,7 @@ sub modify_selfcreation {
                                         }
                                     } elsif ($emaildom ne '') {
                                         push(@{$changes{'cancreate'}},'emaildomain');
-                                    }
+                                    } 
                                 }
                                 $cancreate{'emailoptions'}{$type} = $env{'form.cancreate_emailoptions_'.$type};
                             } elsif ($chosen eq 'custom') {
@@ -15792,7 +17291,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') {
@@ -15878,7 +17377,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') {
@@ -15896,7 +17395,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>';   
                                             }
                                         }
                                     }
@@ -16000,7 +17499,7 @@ sub modify_selfcreation {
                                 $typename = $othertitle;
                             } else {
                                 $typename = $usertypes{$type};
-                            }
+                            } 
                             $chgtext .= &mt('(Affiliation: [_1])',$typename);
                         }
                         if (@{$email_rule{$type}} > 0) {
@@ -16281,7 +17780,7 @@ sub modify_defaults {
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
     my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def',
                  'portal_def');
-    my @authtypes = ('internal','krb4','krb5','localauth');
+    my @authtypes = ('internal','krb4','krb5','localauth','lti');
     foreach my $item (@items) {
         $newvalues{$item} = $env{'form.'.$item};
         if ($item eq 'auth_def') {
@@ -16362,12 +17861,10 @@ sub modify_defaults {
     my @allpos;
     my %alltypes;
     my @inststatusguest;
-    if (ref($currinststatus) eq 'HASH') {
-        if (ref($currinststatus->{'inststatusguest'}) eq 'ARRAY') {
-            foreach my $type (@{$currinststatus->{'inststatusguest'}}) {
-                unless (grep(/^\Q$type\E$/,@todelete)) {
-                    push(@inststatusguest,$type);
-                }
+    if (ref($currinststatus->{'inststatusguest'}) eq 'ARRAY') {
+        foreach my $type (@{$currinststatus->{'inststatusguest'}}) {
+            unless (grep(/^\Q$type\E$/,@todelete)) {
+                push(@inststatusguest,$type);
             }
         }
     }
@@ -16455,7 +17952,7 @@ 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>'; 
                         }
                     }
                 } else {
@@ -16469,6 +17966,7 @@ sub modify_defaults {
                                           krb4       => 'krb4',
                                           krb5       => 'krb5',
                                           localauth  => 'loc',
+                                          lti        => 'lti',
                         );
                         $value = $authnames{$shortauth{$value}};
                     }
@@ -16682,11 +18180,11 @@ sub modify_scantron {
                 &mt('An error occurred: [_1]',$putresult).'</span>';
         }
     } else {
-        $resulttext = &mt('No changes made to bubblesheet format settings');
+        $resulttext = &mt('No changes made to bubblesheet format file'); 
     }
     if ($errors) {
-        $resulttext .= &mt('The following errors occurred: ').'<ul>'.
-                       $errors.'</ul>';
+        $resulttext .= '<p>'.&mt('The following errors occurred: ').'<ul>'.
+                       $errors.'</ul></p>';
     }
     return $resulttext;
 }
@@ -16715,6 +18213,15 @@ sub modify_coursecategories {
         if ($domconfig{'coursecategories'}{'categorizecomm'} ne $env{'form.categorizecomm'}) {
             $changes{'categorizecomm'} = 1;
             $domconfig{'coursecategories'}{'categorizecomm'} = $env{'form.categorizecomm'};
+
+        }
+        if ($domconfig{'coursecategories'}{'togglecatsplace'} ne $env{'form.togglecatsplace'}) {
+            $changes{'togglecatsplace'} = 1;
+            $domconfig{'coursecategories'}{'togglecatsplace'} = $env{'form.togglecatsplace'};
+        }
+        if ($domconfig{'coursecategories'}{'categorizeplace'} ne $env{'form.categorizeplace'}) {
+            $changes{'categorizeplace'} = 1;
+            $domconfig{'coursecategories'}{'categorizeplace'} = $env{'form.categorizeplace'};
         }
         foreach my $item (@catitems) {
             if (grep(/^\Q$env{'form.coursecat_'.$item}\E$/,@cattypes)) {
@@ -16729,11 +18236,15 @@ sub modify_coursecategories {
         $changes{'categorize'} = 1;
         $changes{'togglecatscomm'} = 1;
         $changes{'categorizecomm'} = 1;
+        $changes{'togglecatsplace'} = 1;
+        $changes{'categorizeplace'} = 1;
         $domconfig{'coursecategories'} = {
                                              togglecats => $env{'form.togglecats'},
                                              categorize => $env{'form.categorize'},
                                              togglecatscomm => $env{'form.togglecatscomm'},
                                              categorizecomm => $env{'form.categorizecomm'},
+                                             togglecatsplace => $env{'form.togglecatsplace'},
+                                             categorizeplace => $env{'form.categorizeplace'},
                                          };
         foreach my $item (@catitems) {
             if ($env{'form.coursecat_'.$item} ne 'std') {
@@ -16751,6 +18262,9 @@ sub modify_coursecategories {
         if (($domconfig{'coursecategories'}{'cats'}{'communities::0'} ne '')  && ($env{'form.communities'} == 0)) {
             push(@deletecategory,'communities::0');
         }
+        if (($domconfig{'coursecategories'}{'cats'}{'placement::0'} ne '')  && ($env{'form.placement'} == 0)) {
+            push(@deletecategory,'placement::0');
+        }
     }
     my (@predelcats,@predeltrails,%predelallitems,%sort_by_deltrail);
     if (ref($cathash) eq 'HASH') {
@@ -16813,9 +18327,23 @@ sub modify_coursecategories {
             $adds{$newitem} = 1;
         }
     }
+    if ($env{'form.placement'} eq '1') {
+        if (ref($cathash) eq 'HASH') {
+            my $newitem = 'placement::0';
+            if ($cathash->{$newitem} eq '') {
+                $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.placement_pos'};
+                $adds{$newitem} = 1;
+            }
+        } else {
+            my $newitem = 'placement::0';
+            $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.placement_pos'};
+            $adds{$newitem} = 1;
+        }
+    }
     if ($env{'form.addcategory_name'} ne '') {
         if (($env{'form.addcategory_name'} ne 'instcode') &&
-            ($env{'form.addcategory_name'} ne 'communities')) {
+            ($env{'form.addcategory_name'} ne 'communities') &&
+            ($env{'form.addcategory_name'} ne 'placement')) {
             my $newitem = &escape($env{'form.addcategory_name'}).'::0';
             $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.addcategory_pos'};
             $adds{$newitem} = 1;
@@ -17414,16 +18942,16 @@ sub modify_coursedefaults {
     my ($dom,$lastactref,%domconfig) = @_;
     my ($resulttext,$errors,%changes,%defaultshash);
     my %defaultchecked = (
+                           'canuse_pdfforms' => 'off',
                            'uselcmath'       => 'on',
-                           'usejsme'         => 'on',
-                           'inline_chem'     => 'on',
-                           'ltiauth'         => 'off',
+                           'usejsme'         => 'on'
                          );
-    my @toggles = ('uselcmath','usejsme','inline_chem','ltiauth');
+    my @toggles = ('canuse_pdfforms','uselcmath','usejsme');
     my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial',
-                   'uploadquota_community','uploadquota_textbook','mysqltables_official',
-                   'mysqltables_unofficial','mysqltables_community','mysqltables_textbook');
-    my @types = ('official','unofficial','community','textbook');
+                   'uploadquota_community','uploadquota_textbook','uploadquota_placement',
+                   'mysqltables_official','mysqltables_unofficial','mysqltables_community',
+                   'mysqltables_textbook','mysqltables_placement');
+    my @types = ('official','unofficial','community','textbook','placement');
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
@@ -17626,11 +19154,10 @@ sub modify_coursedefaults {
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-            if (($changes{'uploadquota'}) || ($changes{'postsubmit'}) ||
+            if (($changes{'canuse_pdfforms'}) || ($changes{'uploadquota'}) || ($changes{'postsubmit'}) ||
                 ($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) ||
-                ($changes{'canclone'}) || ($changes{'mysqltables'}) || ($changes{'texengine'}) ||
-                ($changes{'inline_chem'}) || ($changes{'ltiauth'})) {
-                foreach my $item ('uselcmath','usejsme','inline_chem','texengine','ltiauth') {
+                ($changes{'canclone'}) || ($changes{'mysqltables'}) || ($changes{'texengine'})) {
+                foreach my $item ('canuse_pdfforms','uselcmath','usejsme','texengine') {
                     if ($changes{$item}) {
                         $domdefaults{$item}=$defaultshash{'coursedefaults'}{$item};
                     }
@@ -17681,7 +19208,13 @@ sub modify_coursedefaults {
             }
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (sort(keys(%changes))) {
-                if ($item eq 'uselcmath') {
+                if ($item eq 'canuse_pdfforms') {
+                    if ($env{'form.'.$item} eq '1') {
+                        $resulttext .= '<li>'.&mt("Course/Community users can create/upload PDF forms set to 'on'").'</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>';
+                    }
+                } elsif ($item eq 'uselcmath') {
                     if ($env{'form.'.$item} eq '1') {
                         $resulttext .= '<li>'.&mt('Math preview uses LON-CAPA previewer (javascript), if supported by browser.').'</li>';
                     } else {
@@ -17693,12 +19226,6 @@ 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]"',
@@ -17712,7 +19239,7 @@ sub modify_coursedefaults {
                                        '<li>'.&mt('Official courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'official'}.'</b>').'</li>'.
                                        '<li>'.&mt('Unofficial courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'unofficial'}.'</b>').'</li>'.
                                        '<li>'.&mt('Textbook courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'textbook'}.'</b>').'</li>'.
-
+                                       '<li>'.&mt('Placement tests: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'placement'}.'</b>').'</li>'. 
                                        '<li>'.&mt('Communities: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'community'}.'</b>').'</li>'.
                                        '</ul>'.
                                        '</li>';
@@ -17725,6 +19252,7 @@ sub modify_coursedefaults {
                                        '<li>'.&mt('Official courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'official'}.'</b>').'</li>'.
                                        '<li>'.&mt('Unofficial courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'unofficial'}.'</b>').'</li>'.
                                        '<li>'.&mt('Textbook courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'textbook'}.'</b>').'</li>'.
+                                       '<li>'.&mt('Placement tests: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'placement'}.'</b>').'</li>'.
                                        '<li>'.&mt('Communities: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'community'}.'</b>').'</li>'.
                                        '</ul>'.
                                        '</li>';
@@ -17760,6 +19288,8 @@ sub modify_coursedefaults {
                                     $resulttext .= &mt('Unofficial courses');
                                 } elsif ($type eq 'textbook') {
                                     $resulttext .= &mt('Textbook courses');
+                                } elsif ($type eq 'placement') {
+                                    $resulttext .= &mt('Placement tests');
                                 }
                                 $resulttext .= ' -- '.$display.'</li>';
                             }
@@ -17795,12 +19325,6 @@ 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>';
-                    }
                 }
             }
             $resulttext .= '</ul>';
@@ -17817,7 +19341,7 @@ sub modify_coursedefaults {
 sub modify_selfenrollment {
     my ($dom,$lastactref,%domconfig) = @_;
     my ($resulttext,$errors,%changes,%selfenrollhash,%ordered);
-    my @types = ('official','unofficial','community','textbook');
+    my @types = ('official','unofficial','community','textbook','placement');
     my %titles = &tool_titles();
     my %descs = &Apache::lonuserutils::selfenroll_default_descs();
     ($ordered{'admin'},my $titlesref) = &Apache::lonuserutils::get_selfenroll_titles();
@@ -18056,55 +19580,34 @@ sub modify_selfenrollment {
 sub modify_wafproxy {
     my ($dom,$action,$lastactref,%domconfig) = @_;
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
-    my (%othercontrol,%canset,%values,%curralias,%currsaml,%currvalue,@warnings,
-        %wafproxy,%changes,%expirecache,%expiresaml);
+    my (%othercontrol,%canset,%values,%curralias,%currvalue,@warnings,%wafproxy,
+        %changes,%expirecache);
     foreach my $server (sort(keys(%servers))) {
         my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server});
         if ($serverhome eq $server) {
             my $serverdom = &Apache::lonnet::host_domain($server);
             if ($serverdom eq $dom) {
                 $canset{$server} = 1;
+                if (ref($domconfig{'wafproxy'}) eq 'HASH') {
+                    %{$values{$dom}} = ();
+                    if (ref($domconfig{'wafproxy'}{'alias'}) eq 'HASH') {
+                        %curralias = %{$domconfig{'wafproxy'}{'alias'}};
+                    }
+                    foreach my $item ('ipheader','trusted','exempt') {
+                        $currvalue{$item} = $domconfig{'wafproxy'}{$item};
+                    }
+                }
             }
         }
     }
-    if (ref($domconfig{'wafproxy'}) eq 'HASH') {
-        %{$values{$dom}} = ();
-        if (ref($domconfig{'wafproxy'}{'alias'}) eq 'HASH') {
-            %curralias = %{$domconfig{'wafproxy'}{'alias'}};
-        }
-        if (ref($domconfig{'wafproxy'}{'saml'}) eq 'HASH') {
-            %currsaml = %{$domconfig{'wafproxy'}{'saml'}};
-        }
-        foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') {
-            $currvalue{$item} = $domconfig{'wafproxy'}{$item};
-        }
-    }
     my $output;
     if (keys(%canset)) {
         %{$wafproxy{'alias'}} = ();
-        %{$wafproxy{'saml'}} = ();
         foreach my $key (sort(keys(%canset))) {
-            if ($env{'form.wafproxy_'.$dom}) {
-                $wafproxy{'alias'}{$key} = $env{'form.wafproxy_alias_'.$key};
-                $wafproxy{'alias'}{$key} =~ s/^\s+|\s+$//g;
-                if ($wafproxy{'alias'}{$key} ne $curralias{$key}) {
-                    $changes{'alias'} = 1;
-                }
-                if ($env{'form.wafproxy_alias_saml_'.$key}) {
-                    $wafproxy{'saml'}{$key} = 1;
-                }
-                if ($wafproxy{'saml'}{$key} ne $currsaml{$key}) {
-                    $changes{'saml'} = 1;
-                }
-            } else {
-                $wafproxy{'alias'}{$key} = '';
-                $wafproxy{'saml'}{$key} = '';
-                if ($curralias{$key}) {
-                    $changes{'alias'} = 1;
-                }
-                if ($currsaml{$key}) {
-                    $changes{'saml'} = 1;
-                }
+            $wafproxy{'alias'}{$key} = $env{'form.wafproxy_alias_'.$key};
+            $wafproxy{'alias'}{$key} =~ s/^\s+|\s+$//g;
+            if ($wafproxy{'alias'}{$key} ne $curralias{$key}) {
+                $changes{'alias'} = 1;
             }
             if ($wafproxy{'alias'}{$key} eq '') {
                 if ($curralias{$key}) {
@@ -18112,67 +19615,37 @@ sub modify_wafproxy {
                 }
                 delete($wafproxy{'alias'}{$key});
             }
-            if ($wafproxy{'saml'}{$key} eq '') {
-                if ($currsaml{$key}) {
-                    $expiresaml{$key} = 1;
-                }
-                delete($wafproxy{'saml'}{$key});
-            }
         }
         unless (keys(%{$wafproxy{'alias'}})) {
             delete($wafproxy{'alias'});
         }
-        unless (keys(%{$wafproxy{'saml'}})) {
-            delete($wafproxy{'saml'});
-        }
-        # Localization for values in %warn occurs in &mt() calls separately.
+        # Localization for values in %warn occus in &mt() calls separately.
         my %warn = (
                      trusted => 'trusted IP range(s)',
-                     vpnint => 'internal IP range(s) for VPN sessions(s)',
-                     vpnext => 'IP range(s) for backend WAF connections',
+                     exempt => 'exempt IP range(s)', 
                    );
-        foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') {
+        foreach my $item ('ipheader','trusted','exempt') {
             my $possible = $env{'form.wafproxy_'.$item};
             $possible =~ s/^\s+|\s+$//g;
             if ($possible ne '') {
-                if ($item eq 'remoteip') {
-                    if ($possible =~ /^[mhn]$/) {
-                        $wafproxy{$item} = $possible;
-                    }
-                } elsif ($item eq 'ipheader') {
-                    if ($wafproxy{'remoteip'} eq 'h') {
-                        $wafproxy{$item} = $possible;
-                    }
-                } elsif ($item eq 'sslopt') {
-                    if ($possible =~ /^0|1$/) {
-                        $wafproxy{$item} = $possible;
-                    }
+                if ($item eq 'ipheader') {
+                    $wafproxy{$item} = $possible;
                 } else {
                     my (@ok,$count);
-                    if (($item eq 'vpnint') || ($item eq 'vpnext')) {
-                        unless ($env{'form.wafproxy_vpnaccess'}) {
-                            $possible = '';
-                        }
-                    } elsif ($item eq 'trusted') {
-                        unless ($wafproxy{'remoteip'} eq 'h') {
-                            $possible = '';
-                        }
-                    }
-                    unless ($possible eq '') {
-                        $possible =~ s/[\r\n]+/\s/g;
-                        $possible =~ s/\s*-\s*/-/g;
-                        $possible =~ s/\s+/,/g;
-                        $possible =~ s/,+/,/g;
-                    }
+                    $possible =~ s/[\r\n]+/\s/g;
+                    $possible =~ s/\s*-\s*/-/g;
+                    $possible =~ s/\s+/,/g;
                     $count = 0;
-                    if ($possible ne '') {
+                    if ($possible) {
                         foreach my $poss (split(/\,/,$possible)) {
                             $count ++;
-                            $poss = &validate_ip_pattern($poss);
-                            if ($poss ne '') {
+                            if (&validate_ip_pattern($poss)) {
                                 push(@ok,$poss);
                             }
                         }
+                        if (@ok) {
+                            $wafproxy{$item} = join(',',@ok);
+                        }
                         my $diff = $count - scalar(@ok);
                         if ($diff) {
                             push(@warnings,'<li>'.
@@ -18180,45 +19653,28 @@ 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}) {
+                            $changes{$item} = 1; 
                         }
                     }
                 }
-                if ($wafproxy{$item} ne $currvalue{$item}) {
+            } else {
+                if ($currvalue{$item}) {
                     $changes{$item} = 1;
                 }
-            } elsif ($currvalue{$item}) {
-                $changes{$item} = 1;
-            }
-        }
-    } else {
-        if (keys(%curralias)) {
-            $changes{'alias'} = 1;
-        }
-        if (keys(%currsaml)) {
-            $changes{'saml'} = 1;
-        }
-        if (keys(%currvalue)) {
-            foreach my $key (keys(%currvalue)) {
-                $changes{$key} = 1;
             }
         }
     }
     if (keys(%changes)) {
         my %defaultshash = (
                               wafproxy => \%wafproxy,
-                           );
+                           ); 
         my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
                                                  $dom);
         if ($putresult eq 'ok') {
             my $cachetime = 24*60*60;
             my (%domdefaults,$updatedomdefs);
-            foreach my $item ('ipheader','trusted','vpnint','vpnext','sslopt') {
+            foreach my $item ('ipheader','trusted','exempt') {
                 if ($changes{$item}) {
                     unless ($updatedomdefs) {
                         %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
@@ -18228,7 +19684,7 @@ sub modify_wafproxy {
                         $domdefaults{'waf_'.$item} = $wafproxy{$item};
                     } elsif (exists($domdefaults{'waf_'.$item})) {
                         delete($domdefaults{'waf_'.$item});
-                    }
+                    } 
                 }
             }
             if ($updatedomdefs) {
@@ -18254,25 +19710,8 @@ sub modify_wafproxy {
                     $lastactref->{'proxyalias'} = \%updates;
                 }
             }
-            if ((exists($wafproxy{'saml'})) || (keys(%expiresaml))) {
-                my %samlupdates = %expiresaml;
-                foreach my $key (keys(%expiresaml)) {
-                    &Apache::lonnet::devalidate_cache_new('proxysaml',$key);
-                }
-                if (ref($wafproxy{'saml'}) eq 'HASH') {
-                    my $cachetime = 24*60*60;
-                    foreach my $key (keys(%{$wafproxy{'saml'}})) {
-                        $samlupdates{$key} = 1;
-                        &Apache::lonnet::do_cache_new('proxysaml',$key,$wafproxy{'saml'}{$key},
-                                                      $cachetime);
-                    }
-                }
-                if (ref($lastactref) eq 'HASH') {
-                    $lastactref->{'proxysaml'} = \%samlupdates;
-                }
-            }
             $output = &mt('Changes were made to Web Application Firewall/Reverse Proxy').'<ul>';
-            foreach my $item ('alias','saml','remoteip','ipheader','trusted','vpnint','vpnext','sslopt') {
+            foreach my $item ('alias','ipheader','trusted','exempt') {
                 if ($changes{$item}) {
                     if ($item eq 'alias') {
                         my $numaliased = 0;
@@ -18294,66 +19733,27 @@ sub modify_wafproxy {
                         unless ($numaliased) {
                             $output .= '<li>'.&mt('Aliases deleted for hostnames').'</li>';
                         }
-                    } elsif ($item eq 'saml') {
-                        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 SSO Auth for: [_1]',
-                                                  $shown).'</li>';
-                        } else {
-                            $output .= '<li>'.&mt('No alias used for SSO Auth').'</li>';
-                        }
                     } else {
-                        if ($item eq 'remoteip') {
-                            my %ip_methods = &remoteip_methods();
-                            if ($wafproxy{$item} =~ /^[mh]$/) {
-                                $output .= '<li>'.&mt("Method for determining user's IP set to: [_1]",
-                                                      $ip_methods{$wafproxy{$item}}).'</li>';
-                            } else {
-                                if (($env{'form.wafproxy_'.$dom}) && (ref($wafproxy{'alias'}) eq 'HASH')) {
-                                    $output .= '<li>'.&mt("No method in use to get user's real IP (will report IP used by WAF).").
-                                               '</li>';
-                                } else {
-                                    $output .= '<li>'.&mt('WAF/Reverse Proxy not in use').'</li>';
-                                }
-                            }
-                        } elsif ($item eq 'ipheader') {
+                        if ($item eq 'ipheader') {
                             if ($wafproxy{$item}) {
-                                $output .= '<li>'.&mt('Request header with remote IP set to: [_1]',
+                                $output .= '<li>'.&mt('Custom request header set to [_1]',
                                                       $wafproxy{$item}).'</li>';
                             } else {
-                                $output .= '<li>'.&mt('Request header with remote IP deleted').'</li>';
+                                $output .= '<li>'.&mt('Custom request header deleted').'</li>';
                             }
                         } elsif ($item eq 'trusted') {
                             if ($wafproxy{$item}) {
-                                $output .= '<li>'.&mt('Trusted IP range(s) set to: [_1]',
+                                $output .= '<li>'.&mt('Trusted IP range(s) set to [_1]',
                                                       $wafproxy{$item}).'</li>';
                             } else {
                                 $output .= '<li>'.&mt('Trusted IP range(s) deleted').'</li>';
                             }
-                        } elsif ($item eq 'vpnint') {
+                        } elsif ($item eq 'exempt') {
                             if ($wafproxy{$item}) {
-                                $output .= '<li>'.&mt('Internal IP Range(s) for VPN sessions set to: [_1]',
+                                $output .= '<li>'.&mt('Exempt IP range(s) set to [_1]',
                                                        $wafproxy{$item}).'</li>';
                             } else {
-                                $output .= '<li>'.&mt('Internal IP Range(s) for VPN sessions deleted').'</li>';
-                            }
-                        } elsif ($item eq 'vpnext') {
-                            if ($wafproxy{$item}) {
-                                $output .= '<li>'.&mt('IP Range(s) for backend WAF connections set to: [_1]',
-                                                       $wafproxy{$item}).'</li>';
-                            } else {
-                                $output .= '<li>'.&mt('IP Range(s) for backend WAF connections deleted').'</li>';
-                            }
-                        } elsif ($item eq 'sslopt') {
-                            if ($wafproxy{$item}) {
-                                $output .= '<li>'.&mt('WAF/Reverse Proxy expected to forward requests to https on LON-CAPA node, regardless of original protocol in web browser (http or https).').'</li>';
-                            } else {
-                                $output .= '<li>'.&mt('WAF/Reverse Proxy expected to preserve original protocol in web browser (either http or https) when forwarding to LON-CAPA node.').'</li>';
+                                $output .= '<li>'.&mt('Exempt IP range(s) deleted').'</li>';
                             }
                         }
                     }
@@ -18378,17 +19778,12 @@ sub validate_ip_pattern {
     if ($pattern =~ /^([^-]+)\-([^-]+)$/) {
         my ($start,$end) = ($1,$2);
         if ((&Net::CIDR::cidrvalidate($start)) && (&Net::CIDR::cidrvalidate($end))) {
-            if (($start !~ m{/}) && ($end !~ m{/})) {
-                return $start.'-'.$end;
-            }
-        }
-    } elsif ($pattern ne '') {
-        $pattern = &Net::CIDR::cidrvalidate($pattern);
-        if ($pattern ne '') {
-            return $pattern;
+            return 1;
         }
+    } elsif (&Net::CIDR::cidrvalidate($pattern)) {
+        return 1;
     }
-    return;
+    return
 }
 
 sub modify_usersessions {
@@ -18402,8 +19797,8 @@ sub modify_usersessions {
                 );
     my @prefixes = ('remote','hosted','spares');
     my @lcversions = &Apache::lonnet::all_loncaparevs();
-    my (%by_ip,%by_location,@intdoms);
-    &build_location_hashes(\@intdoms,\%by_ip,\%by_location);
+    my (%by_ip,%by_location,@intdoms,@instdoms);
+    &build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms);
     my @locations = sort(keys(%by_location));
     my (%defaultshash,%changes);
     foreach my $prefix (@prefixes) {
@@ -18624,7 +20019,7 @@ sub modify_usersessions {
                 if (($offload eq 'offloadoth') && (@okoffloadoth)) {
                     $changes{'offloadoth'} = 1;
                 }
-            }
+            } 
         }
     } else {
         if (@okoffload) {
@@ -18692,14 +20087,18 @@ sub modify_usersessions {
                         } else {
                             foreach my $type (@{$types{$prefix}}) {
                                 if (defined($changes{$prefix}{$type})) {
-                                    my $newvalue;
+                                    my ($newvalue,$notinuse);
                                     if (ref($defaultshash{'usersessions'}) eq 'HASH') {
                                         if (ref($defaultshash{'usersessions'}{$prefix})) {
                                             if ($type eq 'version') {
                                                 $newvalue = $defaultshash{'usersessions'}{$prefix}{$type};
-                                            } elsif (ref($defaultshash{'usersessions'}{$prefix}{$type}) eq 'ARRAY') {
-                                                if (@{$defaultshash{'usersessions'}{$prefix}{$type}} > 0) {
-                                                    $newvalue = join(', ',@{$defaultshash{'usersessions'}{$prefix}{$type}});
+                                            } else {
+                                                if (ref($defaultshash{'usersessions'}{$prefix}{$type}) eq 'ARRAY') {
+                                                    if (@{$defaultshash{'usersessions'}{$prefix}{$type}} > 0) {
+                                                        $newvalue = join(', ',@{$defaultshash{'usersessions'}{$prefix}{$type}});
+                                                    }
+                                                } else {
+                                                    $notinuse = 1;
                                                 }
                                             }
                                         }
@@ -18707,12 +20106,14 @@ sub modify_usersessions {
                                     if ($newvalue eq '') {
                                         if ($type eq 'version') {
                                             $resulttext .= '<li>'.&mt('[_1] set to: off',$lt{$type}).'</li>';
+                                        } elsif ($notinuse) {
+                                            $resulttext .= '<li>'.&mt('[_1] set to: not in use',$lt{$type}).'</li>';
                                         } else {
                                             $resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>';
                                         }
                                     } else {
                                         if ($type eq 'version') {
-                                            $newvalue .= ' '.&mt('(or later)'); 
+                                            $newvalue .= ' '.&mt('(or later)');
                                         }
                                         $resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>';
                                     }
@@ -18766,6 +20167,324 @@ sub modify_usersessions {
     return $resulttext;
 }
 
+sub modify_ssl {
+    my ($dom,$lastactref,%domconfig) = @_;
+    my (%by_ip,%by_location,@intdoms,@instdoms);
+    &build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms);
+    my @locations = sort(keys(%by_location));
+    my %servers = &Apache::lonnet::internet_dom_servers($dom);
+    my (%defaultshash,%changes);
+    my $action = 'ssl';
+    my @prefixes = ('connto','connfrom','replication');
+    foreach my $prefix (@prefixes) {
+        $defaultshash{$action}{$prefix} = {};
+    }
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
+    my $resulttext;
+    my %iphost = &Apache::lonnet::get_iphost();
+    my @reptypes = ('certreq','nocertreq');
+    my @connecttypes = ('dom','intdom','other');
+    my %types = (
+                  connto      => \@connecttypes,
+                  connfrom    => \@connecttypes,
+                  replication => \@reptypes,
+                );
+    foreach my $prefix (sort(keys(%types))) {
+        foreach my $type (@{$types{$prefix}}) {
+            if (($prefix eq 'connto') || ($prefix eq 'connfrom')) {
+                my $value = 'yes';
+                if ($env{'form.'.$prefix.'_'.$type} =~ /^(no|req)$/) {
+                    $value = $env{'form.'.$prefix.'_'.$type};
+                }
+                if (ref($domconfig{$action}) eq 'HASH') {
+                    if (ref($domconfig{$action}{$prefix}) eq 'HASH') {
+                        if ($domconfig{$action}{$prefix}{$type} ne '') {
+                            if ($value ne $domconfig{$action}{$prefix}{$type}) {
+                                $changes{$prefix}{$type} = 1;
+                            }
+                            $defaultshash{$action}{$prefix}{$type} = $value;
+                        } else {
+                            $defaultshash{$action}{$prefix}{$type} = $value;
+                            $changes{$prefix}{$type} = 1;
+                        }
+                    } else {
+                        $defaultshash{$action}{$prefix}{$type} = $value;
+                        $changes{$prefix}{$type} = 1;
+                    }
+                } else {
+                    $defaultshash{$action}{$prefix}{$type} = $value;
+                    $changes{$prefix}{$type} = 1;
+                }
+                if (($type eq 'dom') && (keys(%servers) == 1)) {
+                    delete($changes{$prefix}{$type});
+                } elsif (($type eq 'intdom') && (@instdoms == 1)) {
+                    delete($changes{$prefix}{$type});
+                } elsif (($type eq 'other') && (keys(%by_location) == 0)) { 
+                    delete($changes{$prefix}{$type});
+                }
+            } elsif ($prefix eq 'replication') {
+                if (@locations > 0) {
+                    my $inuse = $env{'form.'.$prefix.'_'.$type.'_inuse'};
+                    my @vals = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_'.$type);
+                    my @okvals;
+                    foreach my $val (@vals) {
+                        if ($val =~ /:/) {
+                            my @items = split(/:/,$val);
+                            foreach my $item (@items) {
+                                if (ref($by_location{$item}) eq 'ARRAY') {
+                                    push(@okvals,$item);
+                                }
+                            }
+                        } else {
+                            if (ref($by_location{$val}) eq 'ARRAY') {
+                                push(@okvals,$val);
+                            }
+                        }
+                    }
+                    @okvals = sort(@okvals);
+                    if (ref($domconfig{$action}) eq 'HASH') {
+                        if (ref($domconfig{$action}{$prefix}) eq 'HASH') {
+                            if (ref($domconfig{$action}{$prefix}{$type}) eq 'ARRAY') {
+                                if ($inuse == 0) {
+                                    $changes{$prefix}{$type} = 1;
+                                } else {
+                                    $defaultshash{$action}{$prefix}{$type} = \@okvals;
+                                    my @changed = &Apache::loncommon::compare_arrays($domconfig{$action}{$prefix}{$type},$defaultshash{$action}{$prefix}{$type});
+                                    if (@changed > 0) {
+                                        $changes{$prefix}{$type} = 1;
+                                    }
+                                }
+                            } else {
+                                if ($inuse == 1) {
+                                    $defaultshash{$action}{$prefix}{$type} = \@okvals;
+                                    $changes{$prefix}{$type} = 1;
+                                }
+                            }
+                        } else {
+                            if ($inuse == 1) {
+                                $defaultshash{$action}{$prefix}{$type} = \@okvals;
+                                $changes{$prefix}{$type} = 1;
+                            }
+                        }
+                    } else {
+                        if ($inuse == 1) {
+                            $defaultshash{$action}{$prefix}{$type} = \@okvals;
+                            $changes{$prefix}{$type} = 1;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    if (keys(%changes)) {
+        foreach my $prefix (keys(%changes)) {
+            if (ref($changes{$prefix}) eq 'HASH') {
+                if (scalar(keys(%{$changes{$prefix}})) == 0) {
+                    delete($changes{$prefix});
+                }
+            } else {
+                delete($changes{$prefix});
+            }
+        }
+    }
+    my $nochgmsg = &mt('No changes made to LON-CAPA SSL settings');
+    if (keys(%changes) > 0) {
+        my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
+                                                 $dom);
+        if ($putresult eq 'ok') {
+            if (ref($defaultshash{$action}) eq 'HASH') {
+                if (ref($defaultshash{$action}{'replication'}) eq 'HASH') {
+                    $domdefaults{'replication'} = $defaultshash{$action}{'replication'};
+                }
+                if (ref($defaultshash{$action}{'connto'}) eq 'HASH') {
+                    $domdefaults{'connto'} = $defaultshash{$action}{'connto'};
+                }
+                if (ref($defaultshash{$action}{'connfrom'}) eq 'HASH') {
+                    $domdefaults{'connfrom'} = $defaultshash{$action}{'connfrom'};
+                }
+            }
+            my $cachetime = 24*60*60;
+            &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'domdefaults'} = 1;
+            }
+            if (keys(%changes) > 0) {
+                my %titles = &ssl_titles();
+                $resulttext = &mt('Changes made:').'<ul>';
+                foreach my $prefix (@prefixes) {
+                    if (ref($changes{$prefix}) eq 'HASH') {
+                        $resulttext .= '<li>'.$titles{$prefix}.'<ul>';
+                        foreach my $type (@{$types{$prefix}}) {
+                            if (defined($changes{$prefix}{$type})) {
+                                my ($newvalue,$notinuse);
+                                if (ref($defaultshash{$action}) eq 'HASH') {
+                                    if (ref($defaultshash{$action}{$prefix})) {
+                                        if (($prefix eq 'connto') || ($prefix eq 'connfrom')) {
+                                            $newvalue = $titles{$defaultshash{$action}{$prefix}{$type}};
+                                        } else {
+                                            if (ref($defaultshash{$action}{$prefix}{$type}) eq 'ARRAY') {
+                                                if (@{$defaultshash{$action}{$prefix}{$type}} > 0) {
+                                                    $newvalue = join(', ',@{$defaultshash{$action}{$prefix}{$type}});
+                                                }
+                                            } else {
+                                                $notinuse = 1;
+                                            }
+                                        }
+                                    }
+                                    if ($notinuse) {
+                                        $resulttext .= '<li>'.&mt('[_1] set to: not in use',$titles{$type}).'</li>';
+                                    } elsif ($newvalue eq '') {
+                                        $resulttext .= '<li>'.&mt('[_1] set to: none',$titles{$type}).'</li>';
+                                    } else {
+                                        $resulttext .= '<li>'.&mt('[_1] set to: [_2].',$titles{$type},$newvalue).'</li>';
+                                    }
+                                }
+                            }
+                        }
+                        $resulttext .= '</ul>';
+                    }
+                }
+            } else {
+                $resulttext = $nochgmsg;
+            }
+        } else {
+            $resulttext = '<span class="LC_error">'.
+                          &mt('An error occurred: [_1]',$putresult).'</span>';
+        }
+    } else {
+        $resulttext = $nochgmsg;
+    }
+    return $resulttext;
+}
+
+sub modify_trust {
+    my ($dom,$lastactref,%domconfig) = @_;
+    my (%by_ip,%by_location,@intdoms,@instdoms);
+    &build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms);
+    my @locations = sort(keys(%by_location));
+    my @prefixes = qw(content shared enroll othcoau coaurem domroles catalog reqcrs msg);
+    my @types = ('exc','inc');
+    my (%defaultshash,%changes);
+    foreach my $prefix (@prefixes) {
+        $defaultshash{'trust'}{$prefix} = {};
+    }
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
+    my $resulttext;
+    foreach my $prefix (@prefixes) {
+        foreach my $type (@types) {
+            my $inuse = $env{'form.'.$prefix.'_'.$type.'_inuse'};
+            my @vals = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_'.$type);
+            my @okvals;
+            foreach my $val (@vals) {
+                if ($val =~ /:/) {
+                    my @items = split(/:/,$val);
+                    foreach my $item (@items) {
+                        if (ref($by_location{$item}) eq 'ARRAY') {
+                            push(@okvals,$item);
+                        }
+                    }
+                } else {
+                    if (ref($by_location{$val}) eq 'ARRAY') {
+                        push(@okvals,$val);
+                    }
+                }
+            }
+            @okvals = sort(@okvals);
+            if (ref($domconfig{'trust'}) eq 'HASH') {
+                if (ref($domconfig{'trust'}{$prefix}) eq 'HASH') {
+                    if (ref($domconfig{'trust'}{$prefix}{$type}) eq 'ARRAY') {
+                        if ($inuse == 0) {
+                            $changes{$prefix}{$type} = 1;
+                        } else {
+                            $defaultshash{'trust'}{$prefix}{$type} = \@okvals;
+                            my @changed = &Apache::loncommon::compare_arrays($domconfig{'trust'}{$prefix}{$type},$defaultshash{'trust'}{$prefix}{$type});
+                            if (@changed > 0) {
+                                $changes{$prefix}{$type} = 1;
+                            }
+                        }
+                    } else {
+                        if ($inuse == 1) {
+                            $defaultshash{'trust'}{$prefix}{$type} = \@okvals;
+                            $changes{$prefix}{$type} = 1;
+                        }
+                    }
+                } else {
+                    if ($inuse == 1) {
+                        $defaultshash{'trust'}{$prefix}{$type} = \@okvals;
+                        $changes{$prefix}{$type} = 1;
+                    }
+                }
+            } else {
+                if ($inuse == 1) {
+                    $defaultshash{'trust'}{$prefix}{$type} = \@okvals;
+                    $changes{$prefix}{$type} = 1;
+                }
+            }
+        }
+    }
+    my $nochgmsg = &mt('No changes made to trust settings.');
+    if (keys(%changes) > 0) {
+        my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
+                                                 $dom);
+        if ($putresult eq 'ok') {
+            if (ref($defaultshash{'trust'}) eq 'HASH') {
+                foreach my $prefix (@prefixes) {
+                    if (ref($defaultshash{'trust'}{$prefix}) eq 'HASH') {
+                        $domdefaults{'trust'.$prefix} = $defaultshash{'trust'}{$prefix};
+                    }
+                }
+            }
+            my $cachetime = 24*60*60;
+            &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'domdefaults'} = 1;
+            }
+            if (keys(%changes) > 0) {
+                my %lt = &trust_titles();
+                $resulttext = &mt('Changes made:').'<ul>';
+                foreach my $prefix (@prefixes) {
+                    if (ref($changes{$prefix}) eq 'HASH') {
+                        $resulttext .= '<li>'.$lt{$prefix}.'<ul>';
+                        foreach my $type (@types) {
+                            if (defined($changes{$prefix}{$type})) {
+                                my ($newvalue,$notinuse);
+                                if (ref($defaultshash{'trust'}) eq 'HASH') {
+                                    if (ref($defaultshash{'trust'}{$prefix})) {
+                                        if (ref($defaultshash{'trust'}{$prefix}{$type}) eq 'ARRAY') {
+                                            if (@{$defaultshash{'trust'}{$prefix}{$type}} > 0) {
+                                                $newvalue = join(', ',@{$defaultshash{'trust'}{$prefix}{$type}});
+                                            }
+                                        } else {
+                                            $notinuse = 1;
+                                        }
+                                    }
+                                }
+                                if ($notinuse) {
+                                    $resulttext .= '<li>'.&mt('[_1] set to: not in use',$lt{$type}).'</li>';
+                                } elsif ($newvalue eq '') {
+                                    $resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>';
+                                } else {
+                                    $resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>';
+                                }
+                            }
+                        }
+                        $resulttext .= '</ul>';
+                    }
+                }
+                $resulttext .= '</ul>';
+            } else {
+                $resulttext = $nochgmsg;
+            }
+        } else {
+            $resulttext = '<span class="LC_error">'.
+                          &mt('An error occurred: [_1]',$putresult).'</span>';
+        }
+    } else {
+        $resulttext = $nochgmsg;
+    }
+    return $resulttext;
+}
+
 sub modify_loadbalancing {
     my ($dom,%domconfig) = @_;
     my $primary_id = &Apache::lonnet::domain($dom,'primary');
@@ -18836,7 +20555,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;
                 }
@@ -19000,13 +20719,8 @@ sub modify_loadbalancing {
                             }
                         }
                         if ($changes{'curr'}{$balancer}{'cookie'}) {
-                            if ($currcookies{$balancer}) {
-                                $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use disabled',
-                                                          $balancer).'</li>';
-                            } else {
-                                $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use enabled',
-                                                          $balancer).'</li>';
-                            }
+                            $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use enabled',
+                                                      $balancer).'</li>'; 
                         }
                     }
                 }
@@ -19522,6 +21236,7 @@ function balancerChange(balnum,baltotal,
 END
 }
 
+
 sub new_spares_js {
     my @sparestypes = ('primary','default');
     my $types = join("','",@sparestypes);
@@ -19595,7 +21310,7 @@ function updateNewSpares(formname,lonhos
 function checkNewSpares(lonhost,type) {
     var newSpare = document.getElementById('newspare_'+type+'_'+lonhost);
     var chosen =  newSpare.options[newSpare.selectedIndex].value;
-    if (chosen != '') { 
+    if (chosen != '') {
         var othertype;
         var othernewSpare;
         if (type == 'primary') {
@@ -19729,7 +21444,7 @@ function toggleDisplay(domForm,caller) {
         var dispval = 'block';
         var selfcreateRegExp = /^cancreate_emailverified/;
         if (caller == 'emailoptions') {
-            optionsElement = domForm.cancreate_email; 
+            optionsElement = domForm.cancreate_email;
         }
         if (caller == 'studentsubmission') {
             optionsElement = domForm.postsubmit;
@@ -19785,35 +21500,15 @@ 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',
-                      'ipaccess');
-    my %cache_by_lonhost;
-    if (exists($cachekeys->{'samllanding'})) {
-        if (ref($cachekeys->{'samllanding'}) eq 'HASH') {
-            my %landing = %{$cachekeys->{'samllanding'}};
-            my %domservers = &Apache::lonnet::get_servers($dom);
-            if (keys(%domservers)) {
-                foreach my $server (keys(%domservers)) {
-                    my @cached;
-                    next if ($thismachine{$server});
-                    if ($landing{$server}) {
-                        push(@cached,&escape('samllanding').':'.&escape($server));
-                    }
-                    if (@cached) {
-                        $cache_by_lonhost{$server} = \@cached;
-                    }
-                }
-            }
-        }
-    }
+                      'directorysrch','passwdconf','cats','proxyalias');
     if (keys(%servers)) {
         foreach my $server (keys(%servers)) {
             next if ($thismachine{$server});
             my @cached;
             foreach my $name (@posscached) {
                 if ($cachekeys->{$name}) {
-                    if (($name eq 'proxyalias') || ($name eq 'proxysaml')) {
-                        if (ref($cachekeys->{$name}) eq 'HASH') {
+                    if ($name eq 'proxyalias') {
+                        if (ref($cachekeys->{$name}) eq 'HASH') {  
                             foreach my $key (keys(%{$cachekeys->{$name}})) {
                                 push(@cached,&escape($name).':'.&escape($key));
                             }
@@ -19823,10 +21518,6 @@ sub devalidate_remote_domconfs {
                     }
                 }
             }
-            if ((exists($cache_by_lonhost{$server})) &&
-                (ref($cache_by_lonhost{$server}) eq 'ARRAY')) {
-                push(@cached,@{$cache_by_lonhost{$server}});
-            }
             if (@cached) {
                 &Apache::lonnet::remote_devalidate_cache($server,\@cached);
             }