--- loncom/interface/domainprefs.pm	2015/05/22 14:12:08	1.160.6.64
+++ loncom/interface/domainprefs.pm	2017/10/15 18:51:15	1.160.6.84.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.64 2015/05/22 14:12:08 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.84.2.4 2017/10/15 18:51:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -19,14 +19,15 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with LON-CAPA; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA#
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 # /home/httpd/html/adm/gpl.txt
 #
 # http://www.lon-capa.org/
 #
 #
 ###############################################################
-##############################################################
+###############################################################
 
 =pod
 
@@ -213,15 +214,29 @@ sub handler {
                 'quotas','autoenroll','autoupdate','autocreate',
                 'directorysrch','usercreation','usermodification',
                 'contacts','defaults','scantron','coursecategories',
-                'serverstatuses','requestcourses','coursedefaults',
-                'usersessions','loadbalancing','requestauthor',
-                'selfenrollment','inststatus'],$dom);
+                'serverstatuses','requestcourses','helpsettings',
+                'coursedefaults','usersessions','loadbalancing',
+                'requestauthor','selfenrollment','inststatus',
+                'ltitools'],$dom);
+    if (ref($domconfig{'ltitools'}) eq 'HASH') {
+        my %encconfig =
+            &Apache::lonnet::get_dom('encconfig',['ltitools'],$dom);
+        if (ref($encconfig{'ltitools'}) eq 'HASH') {
+            foreach my $id (keys(%{$domconfig{'ltitools'}})) {
+                if (ref($domconfig{'ltitools'}{$id}) eq 'HASH') {
+                    foreach my $item ('key','secret') {
+                        $domconfig{'ltitools'}{$id}{$item} = $encconfig{'ltitools'}{$id}{$item};
+                    }
+                }
+            }
+        }
+    }
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','autocreate','directorysrch','contacts',
                        'usercreation','selfcreation','usermodification','scantron',
                        'requestcourses','requestauthor','coursecategories',
-                       'serverstatuses','coursedefaults','selfenrollment',
-                       'usersessions');
+                       'serverstatuses','helpsettings','coursedefaults',
+                       'ltitools','selfenrollment','usersessions');
     my %existing;
     if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
         %existing = %{$domconfig{'loadbalancing'}};
@@ -261,6 +276,8 @@ sub handler {
                       help => 'Domain_Configuration_LangTZAuth',
                       header => [{col1 => 'Setting',
                                   col2 => 'Value'},
+                                 {col1 => 'Internal Authentication',
+                                  col2 => 'Value'},
                                  {col1 => 'Institutional user types',
                                   col2 => 'Assignable to e-mail usernames'}],
                       print => \&print_defaults,
@@ -304,18 +321,24 @@ sub handler {
                      modify => \&modify_autocreate,
                   },
         'directorysrch' => 
-                  { text => 'Institutional directory searches',
+                  { text => 'Directory searches',
                     help => 'Domain_Configuration_InstDirectory_Search',
-                    header => [{col1 => 'Setting',
+                    header => [{col1 => 'Institutional Directory Setting',
+                                col2 => 'Value',},
+                               {col1 => 'LON-CAPA Directory Setting',
                                 col2 => 'Value',}],
                     print => \&print_directorysrch,
                     modify => \&modify_directorysrch,
                   },
         'contacts' =>
-                  { text => 'Contact Information',
+                  { text => 'E-mail addresses and helpform',
                     help => 'Domain_Configuration_Contact_Info',
-                    header => [{col1 => 'Setting',
-                                col2 => 'Value',}],
+                    header => [{col1 => 'Default e-mail addresses',
+                                col2 => 'Value',},
+                               {col1 => 'Recipient(s) for notifications',
+                                col2 => 'Value',},
+                               {col1 => 'Ask helpdesk form settings',
+                                col2 => 'Value',},],
                     print => \&print_contacts,
                     modify => \&modify_contacts,
                   },
@@ -411,6 +434,16 @@ sub handler {
                   print => \&print_serverstatuses,
                   modify => \&modify_serverstatuses,
                  },
+        'helpsettings' =>
+                 {text   => 'Support settings',
+                  help   => 'Domain_Configuration_Help_Settings',
+                  header => [{col1 => 'Help Page Settings (logged-in users)',
+                              col2 => 'Value'},
+                             {col1 => 'Helpdesk Roles',
+                              col2 => 'Settings'},],
+                  print  => \&print_helpsettings,
+                  modify => \&modify_helpsettings,
+                 },
         'coursedefaults' => 
                  {text => 'Course/Community defaults',
                   help => 'Domain_Configuration_Course_Defaults',
@@ -445,7 +478,7 @@ sub handler {
                   print => \&print_usersessions,
                   modify => \&modify_usersessions,
                  },
-         'loadbalancing' =>
+        'loadbalancing' =>
                  {text  => 'Dedicated Load Balancer(s)',
                   help  => 'Domain_Configuration_Load_Balancing',
                   header => [{col1 => 'Balancers',
@@ -456,6 +489,14 @@ sub handler {
                   print => \&print_loadbalancing,
                   modify => \&modify_loadbalancing,
                  },
+        'ltitools' =>
+                 {text => 'External Tools (LTI)',
+                  help => 'Domain_Configuration_LTI_Tools',
+                  header => [{col1 => 'Setting',
+                              col2 => 'Value',}],
+                  print => \&print_ltitools,
+                  modify => \&modify_ltitools,
+                 },
     );
     if (keys(%servers) > 1) {
         $prefs{'login'}  = { text   => 'Log-in page options',
@@ -509,6 +550,9 @@ $javascript_validations
 $coursebrowserjs
 END
         }
+        if (grep(/^contacts$/,@actions)) {
+            $js .= &contacts_javascript();
+        }
         &Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js);
     } else {
 # check if domconfig user exists for the domain.
@@ -598,7 +642,7 @@ sub process_changes {
     } elsif ($action eq 'autocreate') {
         $output = &modify_autocreate($dom,%domconfig);
     } elsif ($action eq 'directorysrch') {
-        $output = &modify_directorysrch($dom,%domconfig);
+        $output = &modify_directorysrch($dom,$lastactref,%domconfig);
     } elsif ($action eq 'usercreation') {
         $output = &modify_usercreation($dom,%domconfig);
     } elsif ($action eq 'selfcreation') {
@@ -619,6 +663,8 @@ sub process_changes {
         $output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig);
     } elsif ($action eq 'requestauthor') {
         $output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig);
+    } elsif ($action eq 'helpsettings') {
+        $output = &modify_helpsettings($r,$dom,$confname,$lastactref,%domconfig);
     } elsif ($action eq 'coursedefaults') {
         $output = &modify_coursedefaults($dom,$lastactref,%domconfig);
     } elsif ($action eq 'selfenrollment') {
@@ -627,6 +673,8 @@ 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);
     }
     return $output;
 }
@@ -639,6 +687,22 @@ sub print_config_box {
         $output = &coursecategories_javascript($settings);
     } elsif ($action eq 'defaults') {
         $output = &defaults_javascript($settings); 
+    } elsif ($action eq 'helpsettings') {
+        my (%privs,%levelscurrent);
+        my %full=();
+        my %levels=(
+                     course => {},
+                     domain => {},
+                     system => {},
+                   );
+        my $context = 'domain';
+        my $crstype = 'Course';
+        my $formname = 'display';
+        &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,
+                                                      \@templateroles);
     }
     $output .=
          '<table class="LC_nested_outer">
@@ -656,6 +720,7 @@ sub print_config_box {
         my $colspan = '';
         my $rightcolspan = '';
         if (($action eq 'rolecolors') || ($action eq 'defaults') ||
+            ($action eq 'directorysrch') ||
             (($action eq 'login') && ($numheaders < 4))) {
             $colspan = ' colspan="2"';
         }
@@ -673,7 +738,8 @@ 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 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'directorysrch') ||
+            ($action eq 'helpsettings') || ($action eq 'contacts')) {
             $output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'coursecategories') {
             $output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal);
@@ -703,7 +769,8 @@ 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 'usersessions') || ($action eq 'coursecategories') ||
+            ($action eq 'contacts') || ($action eq 'defaults')) {
             if ($action eq 'coursecategories') {
                 $output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal);
                 $colspan = ' colspan="2"';
@@ -728,7 +795,8 @@ sub print_config_box {
             }
             $rowtotal ++;
         } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') ||
-                  ($action eq 'defaults')) {
+                 ($action eq 'defaults') || ($action eq 'directorysrch') ||
+                 ($action eq 'helpsettings')) {
             $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
             if ($numheaders == 4) {
@@ -841,7 +909,7 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">';
-        if (($action eq 'login') || ($action eq 'directorysrch')) {
+        if ($action eq 'login') {
             $output .= '  
               <td class="LC_left_item" colspan="2">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
         } elsif ($action eq 'serverstatuses') {
@@ -885,13 +953,12 @@ sub print_config_box {
         $rowtotal ++;
         if ($action eq 'quotas') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
-        } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || ($action eq 'directorysrch') ||
-                 ($action eq 'contacts') || ($action eq 'serverstatuses') || ($action eq 'loadbalancing')) {
+        } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || 
+                 ($action eq 'serverstatuses') || ($action eq 'loadbalancing') ||
+                 ($action eq 'ltitools')) {
             $output .= $item->{'print'}->($dom,$settings,\$rowtotal);
         } elsif ($action eq 'scantron') {
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
-        } elsif ($action eq 'helpsettings') {
-            $output .= &print_helpsettings($dom,$confname,$settings,\$rowtotal);
         }
     }
     $output .= '
@@ -2395,10 +2462,78 @@ $jstext{'templates'};
 ENDSCRIPT
 }
 
+sub ltitools_javascript {
+    my ($settings) = @_;
+    return unless(ref($settings) eq 'HASH');
+    my (%ordered,$total,%jstext);
+    $total = 0;
+    foreach my $item (keys(%{$settings})) {
+        if (ref($settings->{$item}) eq 'HASH') {
+            my $num = $settings->{$item}{'order'};
+            $ordered{$num} = $item;
+        }
+    }
+    $total = scalar(keys(%{$settings}));
+    my @jsarray = ();
+    foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
+        push(@jsarray,$ordered{$item});
+    }
+    my $jstext = '    var ltitools = Array('."'".join("','",@jsarray)."'".');'."\n";
+    return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function reorderLTI(form,item) {
+    var changedVal;
+$jstext
+    var newpos = 'ltitools_add_pos';
+    var maxh = 1 + $total;
+    var current = new Array;
+    var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value;
+    if (item == newpos) {
+        changedVal = newitemVal;
+    } else {
+        changedVal = form.elements[item].options[form.elements[item].selectedIndex].value;
+        current[newitemVal] = newpos;
+    }
+    for (var i=0; i<ltitools.length; i++) {
+        var elementName = 'ltitools_'+ltitools[i];
+        if (elementName != item) {
+            if (form.elements[elementName]) {
+                var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value;
+                current[currVal] = elementName;
+            }
+        }
+    }
+    var oldVal;
+    for (var j=0; j<maxh; j++) {
+        if (current[j] == undefined) {
+            oldVal = j;
+        }
+    }
+    if (oldVal < changedVal) {
+        for (var k=oldVal+1; k<=changedVal ; k++) {
+           var elementName = current[k];
+           form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex - 1;
+        }
+    } else {
+        for (var k=changedVal; k<oldVal; k++) {
+            var elementName = current[k];
+            form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex + 1;
+        }
+    }
+    return;
+}
+
+// ]]>
+</script>
+
+ENDSCRIPT
+}
+
 sub print_autoenroll {
     my ($dom,$settings,$rowtotal) = @_;
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
-    my ($defdom,$runon,$runoff,$coownerson,$coownersoff);
+    my ($defdom,$runon,$runoff,$coownerson,$coownersoff,$failsafe);
     if (ref($settings) eq 'HASH') {
         if (exists($settings->{'run'})) {
             if ($settings->{'run'} eq '0') {
@@ -2432,6 +2567,9 @@ sub print_autoenroll {
         if (exists($settings->{'sender_domain'})) {
             $defdom = $settings->{'sender_domain'};
         }
+        if (exists($settings->{'autofailsafe'})) {
+            $failsafe = $settings->{'autofailsafe'};
+        }
     } else {
         if ($autorun) {
             $runon = ' checked="checked" ';
@@ -2467,8 +2605,12 @@ sub print_autoenroll {
                   $coownerson.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
                   '<label><input type="radio" name="autoassign_coowners"'.
                   $coownersoff.' value="0" />'.&mt('No').'</label></span></td>'.
-                  '</tr>';
-    $$rowtotal += 3;
+                  '</tr><tr>'.
+                  '<td>'.&mt('Failsafe for no drops when institutional data missing').'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak">'.
+                  '<input type="text" name="autoenroll_failsafe"'.
+                  ' value="'.$failsafe.'" size="4" /></td></tr>';
+    $$rowtotal += 4;
     return $datatable;
 }
 
@@ -2516,7 +2658,7 @@ sub print_autoupdate {
         my $locknamesettings;
         $datatable .= &insttypes_row($settings,$types,$usertypes,
                                      $dom,$numinrow,$othertitle,
-                                    'lockablenames');
+                                    'lockablenames',$rowtotal);
         $$rowtotal ++;
     } else {
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
@@ -2597,233 +2739,946 @@ sub print_autocreate {
 }
 
 sub print_directorysrch {
-    my ($dom,$settings,$rowtotal) = @_;
-    my $srchon = ' ';
-    my $srchoff = ' checked="checked" ';
-    my ($exacton,$containson,$beginson);
-    my $localon = ' ';
-    my $localoff = ' checked="checked" ';
-    if (ref($settings) eq 'HASH') {
-        if ($settings->{'available'} eq '1') {
-            $srchon = $srchoff;
-            $srchoff = ' ';
-        }
-        if ($settings->{'localonly'} eq '1') {
-            $localon = $localoff;
-            $localoff = ' ';
-        }
-        if (ref($settings->{'searchtypes'}) eq 'ARRAY') {
-            foreach my $type (@{$settings->{'searchtypes'}}) {
-                if ($type eq 'exact') {
+    my ($position,$dom,$settings,$rowtotal) = @_;
+    my $datatable;
+    if ($position eq 'top') {
+        my $instsrchon = ' ';
+        my $instsrchoff = ' checked="checked" ';
+        my ($exacton,$containson,$beginson);
+        my $instlocalon = ' ';
+        my $instlocaloff = ' checked="checked" ';
+        if (ref($settings) eq 'HASH') {
+            if ($settings->{'available'} eq '1') {
+                $instsrchon = $instsrchoff;
+                $instsrchoff = ' ';
+            }
+            if ($settings->{'localonly'} eq '1') {
+                $instlocalon = $instlocaloff;
+                $instlocaloff = ' ';
+            }
+            if (ref($settings->{'searchtypes'}) eq 'ARRAY') {
+                foreach my $type (@{$settings->{'searchtypes'}}) {
+                    if ($type eq 'exact') {
+                        $exacton = ' checked="checked" ';
+                    } elsif ($type eq 'contains') {
+                        $containson = ' checked="checked" ';
+                    } elsif ($type eq 'begins') {
+                        $beginson = ' checked="checked" ';
+                    }
+                }
+            } else {
+                if ($settings->{'searchtypes'} eq 'exact') {
+                    $exacton = ' checked="checked" ';
+                } elsif ($settings->{'searchtypes'} eq 'contains') {
+                    $containson = ' checked="checked" ';
+                } elsif ($settings->{'searchtypes'} eq 'specify') {
                     $exacton = ' checked="checked" ';
-                } elsif ($type eq 'contains') {
                     $containson = ' checked="checked" ';
-                } elsif ($type eq 'begins') {
-                    $beginson = ' checked="checked" ';
                 }
             }
-        } else {
-            if ($settings->{'searchtypes'} eq 'exact') {
-                $exacton = ' checked="checked" ';
-            } elsif ($settings->{'searchtypes'} eq 'contains') {
-                $containson = ' checked="checked" ';
-            } elsif ($settings->{'searchtypes'} eq 'specify') {
-                $exacton = ' checked="checked" ';
-                $containson = ' checked="checked" ';
-            }
         }
-    }
-    my ($searchtitles,$titleorder) = &sorted_searchtitles();
-    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+        my ($searchtitles,$titleorder) = &sorted_searchtitles();
+        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
 
-    my $numinrow = 4;
-    my $cansrchrow = 0;
-    my $datatable='<tr class="LC_odd_row">'.
-                  '<td colspan="2"><span class ="LC_nobreak">'.&mt('Directory search available?').'</span></td>'.
-                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                  '<input type="radio" name="dirsrch_available"'.
-                  $srchon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
-                  '<label><input type="radio" name="dirsrch_available"'.
-                  $srchoff.' value="0" />'.&mt('No').'</label></span></td>'.
-                  '</tr><tr>'.
-                  '<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search?').'</span></td>'.
-                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                  '<input type="radio" name="dirsrch_localonly"'.
-                  $localoff.' value="0" />'.&mt('Yes').'</label>&nbsp;'.
-                  '<label><input type="radio" name="dirsrch_localonly"'.
-                  $localon.' value="1" />'.&mt('No').'</label></span></td>'.
-                  '</tr>';
-    $$rowtotal += 2;
-    if (ref($usertypes) eq 'HASH') {
-        if (keys(%{$usertypes}) > 0) {
-            $datatable .= &insttypes_row($settings,$types,$usertypes,$dom,
-                                         $numinrow,$othertitle,'cansearch');
-            $cansrchrow = 1;
+        my $numinrow = 4;
+        my $cansrchrow = 0;
+        $datatable='<tr class="LC_odd_row">'.
+                   '<td colspan="2"><span class ="LC_nobreak">'.&mt('Institutional directory search available?').'</span></td>'.
+                   '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                   '<input type="radio" name="dirsrch_available"'.
+                   $instsrchon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                   '<label><input type="radio" name="dirsrch_available"'.
+                   $instsrchoff.' value="0" />'.&mt('No').'</label></span></td>'.
+                   '</tr><tr>'.
+                   '<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search institution?').'</span></td>'.
+                   '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                   '<input type="radio" name="dirsrch_instlocalonly"'.
+                   $instlocaloff.' value="0" />'.&mt('Yes').'</label>&nbsp;'.
+                   '<label><input type="radio" name="dirsrch_instlocalonly"'.
+                   $instlocalon.' value="1" />'.&mt('No').'</label></span></td>'.
+                   '</tr>';
+        $$rowtotal += 2;
+        if (ref($usertypes) eq 'HASH') {
+            if (keys(%{$usertypes}) > 0) {
+                $datatable .= &insttypes_row($settings,$types,$usertypes,$dom,
+                                             $numinrow,$othertitle,'cansearch',
+                                             $rowtotal);
+                $cansrchrow = 1;
+            }
         }
-    }
-    if ($cansrchrow) {
-        $$rowtotal ++;
-        $datatable .= '<tr>';
-    } else {
-        $datatable .= '<tr class="LC_odd_row">';
-    }
-    $datatable .= '<td><span class ="LC_nobreak">'.&mt('Supported search methods').
-                  '</span></td><td class="LC_left_item" colspan="2"><table><tr>';
-    foreach my $title (@{$titleorder}) {
-        if (defined($searchtitles->{$title})) {
-            my $check = ' ';
-            if (ref($settings) eq 'HASH') {
-                if (ref($settings->{'searchby'}) eq 'ARRAY') {
-                    if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) {
-                        $check = ' checked="checked" ';
+        if ($cansrchrow) {
+            $$rowtotal ++;
+            $datatable .= '<tr>';
+        } else {
+            $datatable .= '<tr class="LC_odd_row">';
+        }
+        $datatable .= '<td><span class ="LC_nobreak">'.&mt('Supported search methods').
+                      '</span></td><td class="LC_left_item" colspan="2"><table><tr>';
+        foreach my $title (@{$titleorder}) {
+            if (defined($searchtitles->{$title})) {
+                my $check = ' ';
+                if (ref($settings) eq 'HASH') {
+                    if (ref($settings->{'searchby'}) eq 'ARRAY') {
+                        if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) {
+                            $check = ' checked="checked" ';
+                        }
                     }
                 }
+                $datatable .= '<td class="LC_left_item">'.
+                              '<span class="LC_nobreak"><label>'.
+                              '<input type="checkbox" name="searchby" '.
+                              'value="'.$title.'"'.$check.'/>'.
+                              $searchtitles->{$title}.'</label></span></td>';
             }
-            $datatable .= '<td class="LC_left_item">'.
-                          '<span class="LC_nobreak"><label>'.
-                          '<input type="checkbox" name="searchby" '.
-                          'value="'.$title.'"'.$check.'/>'.
-                          $searchtitles->{$title}.'</label></span></td>';
         }
-    }
-    $datatable .= '</tr></table></td></tr>';
-    $$rowtotal ++;
-    if ($cansrchrow) {
-        $datatable .= '<tr class="LC_odd_row">';
+        $datatable .= '</tr></table></td></tr>';
+        $$rowtotal ++;
+        if ($cansrchrow) {
+            $datatable .= '<tr class="LC_odd_row">';
+        } else {
+            $datatable .= '<tr>';
+        }
+        $datatable .= '<td><span class ="LC_nobreak">'.&mt('Search latitude').'</span></td>'.   
+                      '<td class="LC_left_item" colspan="2">'.
+                      '<span class="LC_nobreak"><label>'.
+                      '<input type="checkbox" name="searchtypes" '.
+                      $exacton.' value="exact" />'.&mt('Exact match').
+                      '</label>&nbsp;'.
+                      '<label><input type="checkbox" name="searchtypes" '.
+                      $beginson.' value="begins" />'.&mt('Begins with').
+                      '</label>&nbsp;'.
+                      '<label><input type="checkbox" name="searchtypes" '.
+                      $containson.' value="contains" />'.&mt('Contains').
+                      '</label></span></td></tr>';
+        $$rowtotal ++;
     } else {
-        $datatable .= '<tr>';
+        my $domsrchon = ' checked="checked" ';
+        my $domsrchoff = ' ';
+        my $domlocalon = ' ';
+        my $domlocaloff = ' checked="checked" ';
+        if (ref($settings) eq 'HASH') {
+            if ($settings->{'lclocalonly'} eq '1') {
+                $domlocalon = $domlocaloff;
+                $domlocaloff = ' ';
+            }
+            if ($settings->{'lcavailable'} eq '0') {
+                $domsrchoff = $domsrchon;
+                $domsrchon = ' ';
+            }
+        }
+        $datatable='<tr class="LC_odd_row">'.
+                      '<td colspan="2"><span class ="LC_nobreak">'.&mt('LON-CAPA directory search available?').'</span></td>'.
+                      '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                      '<input type="radio" name="dirsrch_domavailable"'.
+                      $domsrchon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                      '<label><input type="radio" name="dirsrch_domavailable"'.
+                      $domsrchoff.' value="0" />'.&mt('No').'</label></span></td>'.
+                      '</tr><tr>'.
+                      '<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search LON-CAPA domain?').'</span></td>'.
+                      '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                      '<input type="radio" name="dirsrch_domlocalonly"'.
+                      $domlocaloff.' value="0" />'.&mt('Yes').'</label>&nbsp;'.
+                      '<label><input type="radio" name="dirsrch_domlocalonly"'.
+                      $domlocalon.' value="1" />'.&mt('No').'</label></span></td>'.
+                      '</tr>';
+        $$rowtotal += 2;
     }
-    $datatable .= '<td><span class ="LC_nobreak">'.&mt('Search latitude').'</span></td>'.   
-                  '<td class="LC_left_item" colspan="2">'.
-                  '<span class="LC_nobreak"><label>'.
-                  '<input type="checkbox" name="searchtypes" '.
-                  $exacton.' value="exact" />'.&mt('Exact match').
-                  '</label>&nbsp;'.
-                  '<label><input type="checkbox" name="searchtypes" '.
-                  $beginson.' value="begins" />'.&mt('Begins with').
-                  '</label>&nbsp;'.
-                  '<label><input type="checkbox" name="searchtypes" '.
-                  $containson.' value="contains" />'.&mt('Contains').
-                  '</label></span></td></tr>';
-    $$rowtotal ++;
     return $datatable;
 }
 
 sub print_contacts {
-    my ($dom,$settings,$rowtotal) = @_;
+    my ($position,$dom,$settings,$rowtotal) = @_;
     my $datatable;
     my @contacts = ('adminemail','supportemail');
-    my (%checked,%to,%otheremails,%bccemails);
-    my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail',
-                    'requestsmail','updatesmail','idconflictsmail');
-    foreach my $type (@mailings) {
-        $otheremails{$type} = '';
-    }
-    $bccemails{'helpdeskmail'} = '';
-    if (ref($settings) eq 'HASH') {
-        foreach my $item (@contacts) {
-            if (exists($settings->{$item})) {
-                $to{$item} = $settings->{$item};
+    my (%checked,%to,%otheremails,%bccemails,%includestr,%includeloc,%currfield,
+        $maxsize,$fields,$fieldtitles,$fieldoptions,$possoptions,@mailings);
+    if ($position eq 'top') {
+        if (ref($settings) eq 'HASH') {
+            foreach my $item (@contacts) {
+                if (exists($settings->{$item})) {
+                    $to{$item} = $settings->{$item};
+                }
             }
         }
+    } elsif ($position eq 'middle') {
+        @mailings = ('errormail','packagesmail','lonstatusmail','requestsmail',
+                     'updatesmail','idconflictsmail');
         foreach my $type (@mailings) {
-            if (exists($settings->{$type})) {
-                if (ref($settings->{$type}) eq 'HASH') {
-                    foreach my $item (@contacts) {
-                        if ($settings->{$type}{$item}) {
-                            $checked{$type}{$item} = ' checked="checked" ';
+            $otheremails{$type} = '';
+        }
+    } else {
+        @mailings = ('helpdeskmail','otherdomsmail');
+        foreach my $type (@mailings) {
+            $otheremails{$type} = '';
+        }
+        $bccemails{'helpdeskmail'} = '';
+        $bccemails{'otherdomsmail'} = '';
+        $includestr{'helpdeskmail'} = '';
+        $includestr{'otherdomsmail'} = '';
+        ($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields();
+    }
+    if (ref($settings) eq 'HASH') {
+        unless ($position eq 'top') {
+            foreach my $type (@mailings) {
+                if (exists($settings->{$type})) {
+                    if (ref($settings->{$type}) eq 'HASH') {
+                        foreach my $item (@contacts) {
+                            if ($settings->{$type}{$item}) {
+                                $checked{$type}{$item} = ' checked="checked" ';
+                            }
+                        }
+                        $otheremails{$type} = $settings->{$type}{'others'};
+                        if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
+                            $bccemails{$type} = $settings->{$type}{'bcc'};
+                            if ($settings->{$type}{'include'} ne '') {
+                                ($includeloc{$type},$includestr{$type}) = split(/:/,$settings->{$type}{'include'},2);
+                                $includestr{$type} = &unescape($includestr{$type});
+                            }
                         }
                     }
-                    $otheremails{$type} = $settings->{$type}{'others'};
-                    if ($type eq 'helpdeskmail') {
-                        $bccemails{$type} = $settings->{$type}{'bcc'};
+                } elsif ($type eq 'lonstatusmail') {
+                    $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
+                }
+            }
+        }
+        if ($position eq 'bottom') {
+            foreach my $type (@mailings) {
+                $bccemails{$type} = $settings->{$type}{'bcc'};
+                if ($settings->{$type}{'include'} ne '') {
+                    ($includeloc{$type},$includestr{$type}) = split(/:/,$settings->{$type}{'include'},2);
+                    $includestr{$type} = &unescape($includestr{$type});
+                }
+            }
+            if (ref($settings->{'helpform'}) eq 'HASH') {
+                if (ref($fields) eq 'ARRAY') {
+                    foreach my $field (@{$fields}) {
+                        $currfield{$field} = $settings->{'helpform'}{$field};
+                    }
+                }
+                if (exists($settings->{'helpform'}{'maxsize'})) {
+                    $maxsize = $settings->{'helpform'}{'maxsize'};
+                } else {
+                    $maxsize = '1.0';
+                }
+            } else {
+                if (ref($fields) eq 'ARRAY') {
+                    foreach my $field (@{$fields}) {
+                        $currfield{$field} = 'yes';
                     }
                 }
-            } elsif ($type eq 'lonstatusmail') {
-                $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
+                $maxsize = '1.0';
             }
         }
     } else {
-        $to{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'};
-        $to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'};
-        $checked{'errormail'}{'adminemail'} = ' checked="checked" ';
-        $checked{'packagesmail'}{'adminemail'} = ' checked="checked" ';
-        $checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" ';
-        $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; 
-        $checked{'requestsmail'}{'adminemail'} = ' checked="checked" ';
-        $checked{'updatesmail'}{'adminemail'} = ' checked="checked" ';
-        $checked{'idconflictsmail'}{'adminemail'} = ' checked="checked" ';
+        if ($position eq 'top') {
+            $to{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'};
+            $to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'};
+            $checked{'errormail'}{'adminemail'} = ' checked="checked" ';
+            $checked{'packagesmail'}{'adminemail'} = ' checked="checked" ';
+            $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
+            $checked{'requestsmail'}{'adminemail'} = ' checked="checked" ';
+            $checked{'updatesmail'}{'adminemail'} = ' checked="checked" ';
+            $checked{'idconflictsmail'}{'adminemail'} = ' checked="checked" ';
+        } elsif ($position eq 'bottom') {
+            $checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" ';
+            $checked{'otherdomsmail'}{'supportemail'} = ' checked="checked" ';
+            if (ref($fields) eq 'ARRAY') {
+                foreach my $field (@{$fields}) {
+                    $currfield{$field} = 'yes';
+                }
+            }
+            $maxsize = '1.0';
+        }
     }
     my ($titles,$short_titles) = &contact_titles();
     my $rownum = 0;
     my $css_class;
-    foreach my $item (@contacts) {
-        $css_class = $rownum%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'>'. 
-                  '<td><span class="LC_nobreak">'.$titles->{$item}.
-                  '</span></td><td class="LC_right_item">'.
-                  '<input type="text" name="'.$item.'" value="'.
-                  $to{$item}.'" /></td></tr>';
-        $rownum ++;
-    }
-    foreach my $type (@mailings) {
+    if ($position eq 'top') {
+        foreach my $item (@contacts) {
+            $css_class = $rownum%2?' class="LC_odd_row"':'';
+            $datatable .= '<tr'.$css_class.'>'. 
+                          '<td><span class="LC_nobreak">'.$titles->{$item}.
+                          '</span></td><td class="LC_right_item">'.
+                          '<input type="text" name="'.$item.'" value="'.
+                          $to{$item}.'" /></td></tr>';
+            $rownum ++;
+        }
+    } elsif ($position eq 'bottom') {
         $css_class = $rownum%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'>'.
-                      '<td><span class="LC_nobreak">'.
-                      $titles->{$type}.': </span></td>'.
-                      '<td class="LC_left_item">'.
-                      '<span class="LC_nobreak">';
-        foreach my $item (@contacts) {
-            $datatable .= '<label>'.
-                          '<input type="checkbox" name="'.$type.'"'.
-                          $checked{$type}{$item}.
-                          ' value="'.$item.'" />'.$short_titles->{$item}.
-                          '</label>&nbsp;';
-        }
-        $datatable .= '</span><br />'.&mt('Others').':&nbsp;&nbsp;'.
-                      '<input type="text" name="'.$type.'_others" '.
-                      'value="'.$otheremails{$type}.'"  />';
-        if ($type eq 'helpdeskmail') {
-            $datatable .= '<br />'.&mt('Bcc:').('&nbsp;'x6).
-                          '<input type="text" name="'.$type.'_bcc" '.
-                          'value="'.$bccemails{$type}.'"  />';
+                      '<td>'.&mt('Extra helpdesk form fields:').'<br />'.
+                      &mt('(e-mail, subject, and description always shown)').
+                      '</td><td class="LC_left_item">';
+        if ((ref($fields) eq 'ARRAY') && (ref($fieldtitles) eq 'HASH') &&
+            (ref($fieldoptions) eq 'HASH') && (ref($possoptions) eq 'HASH')) {
+            $datatable .= '<table><tr><th>'.&mt('Field').'</th><th>'.&mt('Status').'</th></tr>';
+            foreach my $field (@{$fields}) {
+                $datatable .= '<tr><td>'.$fieldtitles->{$field};
+                if (($field eq 'screenshot') || ($field eq 'cc')) {
+                    $datatable .= ' '.&mt('(logged-in users)');
+                }
+                $datatable .='</td><td>';
+                my $clickaction;
+                if ($field eq 'screenshot') {
+                    $clickaction = ' onclick="screenshotSize(this);"';
+                }
+                if (ref($possoptions->{$field}) eq 'ARRAY') {
+                    foreach my $option (@{$possoptions->{$field}}) {
+                        my $checked;
+                        if ($currfield{$field} eq $option) {
+                            $checked = ' checked="checked"';
+                        }
+                        $datatable .= '<span class="LC_nobreak"><label>'.
+                                      '<input type="radio" name="helpform_'.$field.'" '.
+                                      'value="'.$option.'"'.$checked.$clickaction.' />'.$fieldoptions->{$option}.
+                                      '</label></span>'.('&nbsp;'x2);
+                    }
+                }
+                if ($field eq 'screenshot') {
+                    my $display;
+                    if ($currfield{$field} eq 'no') {
+                        $display = ' style="display:none"';
+                    }
+                    $datatable .= '</td></tr><tr id="help_screenshotsize"'.$display.' />'.
+                                  '<td>'.&mt('Maximum size for upload (MB)').'</td><td>'.
+                                  '<input type="text" size="5" name="helpform_maxsize" value="'.$maxsize.'" />';
+                }
+                $datatable .= '</td></tr>';
+            }
+            $datatable .= '</table>';
         }
         $datatable .= '</td></tr>'."\n";
         $rownum ++;
     }
-    my %choices;
-    $choices{'reporterrors'} = &mt('E-mail error reports to [_1]',
-                                   &Apache::loncommon::modal_link('http://loncapa.org/core.html',
-                                   &mt('LON-CAPA core group - MSU'),600,500));
-    $choices{'reportupdates'} = &mt('E-mail record of completed LON-CAPA updates to [_1]',
-                                    &Apache::loncommon::modal_link('http://loncapa.org/core.html',
-                                    &mt('LON-CAPA core group - MSU'),600,500));
-    my @toggles = ('reporterrors','reportupdates');
-    my %defaultchecked = ('reporterrors'  => 'on',
-                          'reportupdates' => 'on');
-    (my $reports,$rownum) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
-                                               \%choices,$rownum);
-    $datatable .= $reports;
+    unless ($position eq 'top') {
+        foreach my $type (@mailings) {
+            $css_class = $rownum%2?' class="LC_odd_row"':'';
+            $datatable .= '<tr'.$css_class.'>'.
+                          '<td><span class="LC_nobreak">'.
+                          $titles->{$type}.': </span></td>'.
+                          '<td class="LC_left_item">';
+            if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
+                $datatable .= '<fieldset><legend>'.&mt('E-mail recipient(s)').'</legend>';
+            }
+            $datatable .= '<span class="LC_nobreak">';
+            foreach my $item (@contacts) {
+                $datatable .= '<label>'.
+                              '<input type="checkbox" name="'.$type.'"'.
+                              $checked{$type}{$item}.
+                              ' value="'.$item.'" />'.$short_titles->{$item}.
+                              '</label>&nbsp;';
+            }
+            $datatable .= '</span><br />'.&mt('Others').':&nbsp;&nbsp;'.
+                          '<input type="text" name="'.$type.'_others" '.
+                          'value="'.$otheremails{$type}.'"  />';
+            my %locchecked;
+            if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
+                foreach my $loc ('s','b') {
+                    if ($includeloc{$type} eq $loc) {
+                        $locchecked{$loc} = ' checked="checked"';
+                        last;
+                    }
+                }
+                $datatable .= '<br />'.&mt('Bcc:').('&nbsp;'x6).
+                              '<input type="text" name="'.$type.'_bcc" '.
+                              'value="'.$bccemails{$type}.'"  /></fieldset>'.
+                              '<fieldset><legend>'.&mt('Optional added text').'</legend>'.
+                              &mt('Text automatically added to e-mail:').' '.
+                              '<input type="text" name="'.$type.'_includestr" value="'.$includestr{$type}.'" /><br >'.
+                              '<span class="LC_nobreak">'.&mt('Location:').'&nbsp;'.
+                              '<label><input type="radio" name="'.$type.'_includeloc" value="s"'.$locchecked{'s'}.' />'.&mt('in subject').'</label>'.
+                              ('&nbsp;'x2).
+                              '<label><input type="radio" name="'.$type.'_includeloc" value="b"'.$locchecked{'b'}.' />'.&mt('in body').'</label>'.
+                              '</span></fieldset>';
+            }
+            $datatable .= '</td></tr>'."\n";
+            $rownum ++;
+        }
+    }
+    if ($position eq 'middle') {
+        my %choices;
+        $choices{'reporterrors'} = &mt('E-mail error reports to [_1]',
+                                       &Apache::loncommon::modal_link('http://loncapa.org/core.html',
+                                       &mt('LON-CAPA core group - MSU'),600,500));
+        $choices{'reportupdates'} = &mt('E-mail record of completed LON-CAPA updates to [_1]',
+                                        &Apache::loncommon::modal_link('http://loncapa.org/core.html',
+                                        &mt('LON-CAPA core group - MSU'),600,500));
+        my @toggles = ('reporterrors','reportupdates');
+        my %defaultchecked = ('reporterrors'  => 'on',
+                              'reportupdates' => 'on');
+        (my $reports,$rownum) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
+                                                   \%choices,$rownum);
+        $datatable .= $reports;
+    } elsif ($position eq 'bottom') {
+        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+        my (@posstypes,%usertypeshash);
+        if (ref($types) eq 'ARRAY') {
+            @posstypes = @{$types};
+        }
+        if (@posstypes) {
+            if (ref($usertypes) eq 'HASH') {
+                %usertypeshash = %{$usertypes};
+            }
+            my @overridden;
+            my $numinrow = 4;
+            if (ref($settings) eq 'HASH') {
+                if (ref($settings->{'overrides'}) eq 'HASH') {
+                    foreach my $key (sort(keys(%{$settings->{'overrides'}}))) {
+                        if (ref($settings->{'overrides'}{$key}) eq 'HASH') {
+                            push(@overridden,$key);
+                            foreach my $item (@contacts) {
+                                if ($settings->{'overrides'}{$key}{$item}) {
+                                    $checked{'override_'.$key}{$item} = ' checked="checked" ';
+                                }
+                            }
+                            $otheremails{'override_'.$key} = $settings->{'overrides'}{$key}{'others'};
+                            $bccemails{'override_'.$key} = $settings->{'overrides'}{$key}{'bcc'};
+                            $includeloc{'override_'.$key} = '';
+                            $includestr{'override_'.$key} = '';
+                            if ($settings->{'overrides'}{$key}{'include'} ne '') {
+                                ($includeloc{'override_'.$key},$includestr{'override_'.$key}) =
+                                    split(/:/,$settings->{'overrides'}{$key}{'include'},2);
+                                $includestr{'override_'.$key} = &unescape($includestr{'override_'.$key});
+                            }
+                        }
+                    }
+                }
+            }
+            my $customclass = 'LC_helpdesk_override';
+            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);
+            $rownum ++;
+            $usertypeshash{'default'} = $othertitle;
+            foreach my $status (@posstypes) {
+                my $css_class;
+                if ($rownum%2) {
+                    $css_class = 'LC_odd_row ';
+                }
+                $css_class .= $customclass;
+                my $rowid = $optionsprefix.$status;
+                my $hidden = 1;
+                my $currstyle = 'display:none';
+                if (grep(/^\Q$status\E$/,@overridden)) {
+                    $currstyle = 'display:table-row';
+                    $hidden = 0;
+                }
+                my $key = 'override_'.$status;
+                $datatable .= &overridden_helpdesk($checked{$key},$otheremails{$key},$bccemails{$key},
+                                                  $includeloc{$key},$includestr{$key},$status,$rowid,
+                                                  $usertypeshash{$status},$css_class,$currstyle,
+                                                  \@contacts,$short_titles);
+                unless ($hidden) {
+                    $rownum ++;
+                }
+            }
+        }
+    }
     $$rowtotal += $rownum;
     return $datatable;
 }
 
+sub overridden_helpdesk {
+    my ($checked,$otheremails,$bccemails,$includeloc,$includestr,$type,$rowid,
+        $typetitle,$css_class,$rowstyle,$contacts,$short_titles) = @_;
+    my $class = 'LC_left_item';
+    if ($css_class) {
+        $css_class = ' class="'.$css_class.'"';
+    }
+    if ($rowid) {
+        $rowid = ' id="'.$rowid.'"';
+    }
+    if ($rowstyle) {
+        $rowstyle = ' style="'.$rowstyle.'"';
+    }
+    my ($output,$description);
+    $description = &mt('Helpdesk requests from: [_1] in this domain (overrides default)',"<b>$typetitle</b>");
+    $output = '<tr'.$css_class.$rowid.$rowstyle.'>'.
+              "<td>$description</td>\n".
+              '<td class="'.$class.'" colspan="2">'.
+              '<fieldset><legend>'.&mt('E-mail recipient(s)').'</legend>'.
+              '<span class="LC_nobreak">';
+    if (ref($contacts) eq 'ARRAY') {
+        foreach my $item (@{$contacts}) {
+            my $check;
+            if (ref($checked) eq 'HASH') {
+               $check = $checked->{$item};
+            }
+            my $title;
+            if (ref($short_titles) eq 'HASH') {
+                $title = $short_titles->{$item};
+            }
+            $output .= '<label>'.
+                       '<input type="checkbox" name="override_'.$type.'"'.$check.
+                       ' value="'.$item.'" />'.$title.'</label>&nbsp;';
+        }
+    }
+    $output .= '</span><br />'.&mt('Others').':&nbsp;&nbsp;'.
+               '<input type="text" name="override_'.$type.'_others" '.
+               'value="'.$otheremails.'"  />';
+    my %locchecked;
+    foreach my $loc ('s','b') {
+        if ($includeloc eq $loc) {
+            $locchecked{$loc} = ' checked="checked"';
+            last;
+        }
+    }
+    $output .= '<br />'.&mt('Bcc:').('&nbsp;'x6).
+               '<input type="text" name="override_'.$type.'_bcc" '.
+               'value="'.$bccemails.'"  /></fieldset>'.
+               '<fieldset><legend>'.&mt('Optional added text').'</legend>'.
+               &mt('Text automatically added to e-mail:').' '.
+               '<input type="text" name="override_'.$type.'_includestr" value="'.$includestr.'" /><br >'.
+               '<span class="LC_nobreak">'.&mt('Location:').'&nbsp;'.
+               '<label><input type="radio" name="override_'.$type.'_includeloc" value="s"'.$locchecked{'s'}.' />'.&mt('in subject').'</label>'.
+               ('&nbsp;'x2).
+               '<label><input type="radio" name="override_'.$type.'_includeloc" value="b"'.$locchecked{'b'}.' />'.&mt('in body').'</label>'.
+               '</span></fieldset>'.
+               '</td></tr>'."\n";
+    return $output;
+}
+
+sub contacts_javascript {
+    return <<"ENDSCRIPT";
+
+<script type="text/javascript">
+// <![CDATA[
+
+function screenshotSize(field) {
+    if (document.getElementById('help_screenshotsize')) {
+        if (field.value == 'no') {
+            document.getElementById('help_screenshotsize').style.display="none";
+        } else {
+            document.getElementById('help_screenshotsize').style.display="";
+        }
+    }
+    return;
+}
+
+function toggleHelpdeskRow(form,checkbox,target,prefix,docount) {
+    if (form.elements[checkbox].length != undefined) {
+        var count = 0;
+        if (docount) {
+            for (var i=0; i<form.elements[checkbox].length; i++) {
+                if (form.elements[checkbox][i].checked) {
+                    count ++;
+                }
+            }
+        }
+        for (var i=0; i<form.elements[checkbox].length; i++) {
+            var type = form.elements[checkbox][i].value;
+            if (document.getElementById(prefix+type)) {
+                if (form.elements[checkbox][i].checked) {
+                    document.getElementById(prefix+type).style.display = 'table-row';
+                    if (count % 2 == 1) {
+                        document.getElementById(prefix+type).className = target+' LC_odd_row';
+                    } else {
+                        document.getElementById(prefix+type).className = target;
+                    }
+                    count ++;
+                } else {
+                    document.getElementById(prefix+type).style.display = 'none';
+                }
+            }
+        }
+    }
+    return;
+}
+
+
+// ]]>
+</script>
+
+ENDSCRIPT
+}
+
 sub print_helpsettings {
-    my ($dom,$confname,$settings,$rowtotal) = @_;
+    my ($position,$dom,$settings,$rowtotal) = @_;
+    my $confname = $dom.'-domainconfig';
+    my $formname = 'display';
     my ($datatable,$itemcount);
-    $itemcount = 1;
-    my (%choices,%defaultchecked,@toggles);
-    $choices{'submitbugs'} = &mt('Display link to: [_1]?',
-                                 &Apache::loncommon::modal_link('http://bugs.loncapa.org',
-                                 &mt('LON-CAPA bug tracker'),600,500));
-    %defaultchecked = ('submitbugs' => 'on');
-    @toggles = ('submitbugs',);
-
-    ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
-                                                 \%choices,$itemcount);
+    if ($position eq 'top') {
+        $itemcount = 1;
+        my (%choices,%defaultchecked,@toggles);
+        $choices{'submitbugs'} = &mt('Display link to: [_1]?',
+                                     &Apache::loncommon::modal_link('http://bugs.loncapa.org',
+                                     &mt('LON-CAPA bug tracker'),600,500));
+        %defaultchecked = ('submitbugs' => 'on');
+        @toggles = ('submitbugs');
+        ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
+                                                     \%choices,$itemcount);
+        $$rowtotal ++;
+    } else {
+        my $css_class;
+        my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_');
+        my (%customroles,%ordered,%current);
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{'adhoc'}) eq 'HASH') {
+                %current = %{$settings->{'adhoc'}};
+            }
+        }
+        my $count = 0;
+        foreach my $key (sort(keys(%existing))) {
+            if ($key=~/^rolesdef\_(\w+)$/) {
+                my $rolename = $1;
+                my (%privs,$order);
+                ($privs{'system'},$privs{'domain'},$privs{'course'}) = split(/\_/,$existing{$key});
+                $customroles{$rolename} = \%privs;
+                if (ref($current{$rolename}) eq 'HASH') {
+                    $order = $current{$rolename}{'order'};
+                }
+                if ($order eq '') {
+                    $order = $count;
+                }
+                $ordered{$order} = $rolename;
+                $count++;
+            }
+        }
+        my $maxnum = scalar(keys(%ordered));
+        my @roles_by_num = ();
+        foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
+            push(@roles_by_num,$item);
+        }
+        my $context = 'domprefs';
+        my $crstype = 'Course';
+        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+        my @accesstypes = ('all','dh','da','none');
+        my ($numstatustypes,@jsarray);
+        if (ref($types) eq 'ARRAY') {
+            if (@{$types} > 0) {
+                $numstatustypes = scalar(@{$types});
+                push(@accesstypes,'status');
+                @jsarray = ('bystatus');
+            }
+        }
+        my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh'.'da']);
+        if (keys(%domhelpdesk)) {
+            push(@accesstypes,('inc','exc'));
+            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_';
+        my $add_class = 'LC_hidden';
+        foreach my $num (@roles_by_num) {
+            my $role = $ordered{$num};
+            my ($desc,$access,@statuses);
+            if (ref($current{$role}) eq 'HASH') {
+                $desc = $current{$role}{'desc'};
+                $access = $current{$role}{'access'};
+                if (ref($current{$role}{'insttypes'}) eq 'ARRAY') {
+                    @statuses = @{$current{$role}{'insttypes'}};
+                }
+            }
+            if ($desc eq '') {
+                $desc = $role;
+            }
+            my $identifier = 'custhelp'.$num;
+            my %full=();
+            my %levels= (
+                         course => {},
+                         domain => {},
+                         system => {},
+                        );
+            my %levelscurrent=(
+                               course => {},
+                               domain => {},
+                               system => {},
+                              );
+            &Apache::lonuserutils::custom_role_privs($customroles{$role},\%full,\%levels,\%levelscurrent);
+            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 />'.
+                          '<select name="helproles_'.$num.'_pos"'.$chgstr.'>';
+            for (my $k=0; $k<=$maxnum; $k++) {
+                my $vpos = $k+1;
+                my $selstr;
+                if ($k == $num) {
+                    $selstr = ' selected="selected" ';
+                }
+                $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+            }
+            $datatable .= '</select>'.('&nbsp;'x2).
+                          '<input type="hidden" name="helproles_'.$num.'" value="'.$role.'" />'.
+                          '</td>'.
+                          '<td><fieldset><legend>'.&mt('Role name').'</legend>'.
+                          &mt('Name shown to users:').
+                          '<input type="text" name="helproles_'.$num.'_desc" value="'.$desc.'" />'.
+                          '</fieldset>'.
+                          &helpdeskroles_access($dom,$prefix,$num,$add_class,$current{$role},\@accesstypes,
+                                                $othertitle,$usertypes,$types,\%domhelpdesk).
+                          '<fieldset>'.
+                          '<legend>'.&mt('Role privileges').&adhocbutton($prefix,$num,'privs','show').'</legend>'.
+                          &Apache::lonuserutils::custom_role_table($crstype,\%full,\%levels,
+                                                                   \%levelscurrent,$identifier,
+                                                                   'LC_hidden',$prefix.$num.'_privs').
+                          '</fieldset></td>';
+            $itemcount ++;
+        }
+        $css_class = $itemcount%2?' class="LC_odd_row"':'';
+        my $newcust = 'custhelp'.$count;
+        my (%privs,%levelscurrent);
+        my %full=();
+        my %levels= (
+                     course => {},
+                     domain => {},
+                     system => {},
+                    );
+        &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>'.
+                      '<input type="hidden" name="helproles_maxnum" value="'.$maxnum.'" />'."\n".
+                      '<select name="helproles_'.$count.'_pos"'.$chgstr.'>';
+        for (my $k=0; $k<$maxnum+1; $k++) {
+            my $vpos = $k+1;
+            my $selstr;
+            if ($k == $maxnum) {
+                $selstr = ' selected="selected" ';
+            }
+            $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+        }
+        $datatable .= '</select>&nbsp;'."\n".
+                      '<input type="checkbox" name="newcusthelp" value="'.$count.'" />'. &mt('Add').
+                      '</label></span></td>'.
+                      '<td><fieldset><legend>'.&mt('Role name').'</legend>'.
+                      '<span class="LC_nobreak">'.
+                      &mt('Internal name:').
+                      '<input type="text" size="10" name="custhelpname'.$count.'" value="" />'.
+                      '</span>'.('&nbsp;'x4).
+                      '<span class="LC_nobreak">'.
+                      &mt('Name shown to users:').
+                      '<input type="text" size="20" name="helproles_'.$count.'_desc" value="" />'.
+                      '</span></fieldset>'.
+                       &helpdeskroles_access($dom,$prefix,$count,'',undef,\@accesstypes,$othertitle,
+                                             $usertypes,$types,\%domhelpdesk).
+                      '<fieldset><legend>'.&mt('Role privileges').'</legend>'.
+                      &Apache::lonuserutils::custom_role_header($context,$crstype,
+                                                                \@templateroles,$newcust).
+                      &Apache::lonuserutils::custom_role_table('Course',\%full,\%levels,
+                                                               \%levelscurrent,$newcust).
+                      '</fieldset></td></tr>';
+        $count ++;
+        $$rowtotal += $count;
+    }
     return $datatable;
 }
 
+sub adhocbutton {
+    my ($prefix,$num,$field,$visibility) = @_;
+    my %lt = &Apache::lonlocal::texthash(
+                                          show => 'Show details',
+                                          hide => 'Hide details',
+                                        );
+    return '<span style="text-decoration:line-through; font-weight: normal;">'.('&nbsp;'x10).
+           '</span>'.('&nbsp;'x2).'<input type="button" id="'.$prefix.$num.'_'.$field.'_vis"'.
+           ' value="'.$lt{$visibility}.'" style="height:20px;" '.
+           'onclick="toggleHelpdeskItem('."'$num','$field'".');" />'.('&nbsp;'x2);
+}
+
+sub helpsettings_javascript {
+    my ($roles_by_num,$total,$hiddenstr,$formname) = @_;
+    return unless(ref($roles_by_num) eq 'ARRAY');
+    my %html_js_lt = &Apache::lonlocal::texthash(
+                                          show => 'Show details',
+                                          hide => 'Hide details',
+                                        );
+    &html_escape(\%html_js_lt);
+    my $jstext = '    var helproles = Array('."'".join("','",@{$roles_by_num})."'".');'."\n";
+    return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+
+function reorderHelpRoles(form,item) {
+    var changedVal;
+$jstext
+    var newpos = 'helproles_${total}_pos';
+    var maxh = 1 + $total;
+    var current = new Array();
+    var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value;
+    if (item == newpos) {
+        changedVal = newitemVal;
+    } else {
+        changedVal = form.elements[item].options[form.elements[item].selectedIndex].value;
+        current[newitemVal] = newpos;
+    }
+    for (var i=0; i<helproles.length; i++) {
+        var elementName = 'helproles_'+helproles[i]+'_pos';
+        if (elementName != item) {
+            if (form.elements[elementName]) {
+                var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value;
+                current[currVal] = elementName;
+            }
+        }
+    }
+    var oldVal;
+    for (var j=0; j<maxh; j++) {
+        if (current[j] == undefined) {
+            oldVal = j;
+        }
+    }
+    if (oldVal < changedVal) {
+        for (var k=oldVal+1; k<=changedVal ; k++) {
+           var elementName = current[k];
+           form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex - 1;
+        }
+    } else {
+        for (var k=changedVal; k<oldVal; k++) {
+            var elementName = current[k];
+            form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex + 1;
+        }
+    }
+    return;
+}
+
+function helpdeskAccess(num) {
+    var curraccess = null;
+    if (document.$formname.elements['helproles_'+num+'_access'].length) {
+        for (var i=0; i<document.$formname.elements['helproles_'+num+'_access'].length; i++) {
+            if (document.$formname.elements['helproles_'+num+'_access'][i].checked) {
+                curraccess = document.$formname.elements['helproles_'+num+'_access'][i].value;
+            }
+        }
+    }
+    var shown = Array();
+    var hidden = Array();
+    if (curraccess == 'none') {
+        hidden = Array('$hiddenstr');
+    } else {
+        if (curraccess == 'status') {
+            shown = Array('bystatus');
+            hidden = Array('notinc','notexc');
+        } else {
+            if (curraccess == 'exc') {
+                shown = Array('notexc');
+                hidden = Array('notinc','bystatus');
+            }
+            if (curraccess == 'inc') {
+                shown = Array('notinc');
+                hidden = Array('notexc','bystatus');
+            }
+            if ((curraccess == 'all') || (curraccess == 'dh') || (curraccess == 'da')) {
+                hidden = Array('notinc','notexc','bystatus');
+            }
+        }
+    }
+    if (hidden.length > 0) {
+        for (var i=0; i<hidden.length; i++) {
+            if (document.getElementById('helproles_'+num+'_'+hidden[i])) {
+                document.getElementById('helproles_'+num+'_'+hidden[i]).style.display = 'none';
+            }
+        }
+    }
+    if (shown.length > 0) {
+        for (var i=0; i<shown.length; i++) {
+            if (document.getElementById('helproles_'+num+'_'+shown[i])) {
+                if (shown[i] == 'privs') {
+                    document.getElementById('helproles_'+num+'_'+shown[i]).style.display = 'block';
+                } else {
+                    document.getElementById('helproles_'+num+'_'+shown[i]).style.display = 'inline-block';
+                }
+            }
+        }
+    }
+    return;
+}
+
+function toggleHelpdeskItem(num,field) {
+    if (document.getElementById('helproles_'+num+'_'+field)) {
+        if (document.getElementById('helproles_'+num+'_'+field).className.match(/(?:^|\\s)LC_hidden(?!\\S)/)) {
+            document.getElementById('helproles_'+num+'_'+field).className =
+                document.getElementById('helproles_'+num+'_'+field).className.replace(/(?:^|\\s)LC_hidden(?!\\S)/g ,'');
+            if (document.getElementById('helproles_'+num+'_'+field+'_vis')) {
+                document.getElementById('helproles_'+num+'_'+field+'_vis').value = '$html_js_lt{hide}';
+            }
+        } else {
+            document.getElementById('helproles_'+num+'_'+field).className += ' LC_hidden';
+            if (document.getElementById('helproles_'+num+'_'+field+'_vis')) {
+                document.getElementById('helproles_'+num+'_'+field+'_vis').value = '$html_js_lt{show}';
+            }
+        }
+    }
+    return;
+}
+
+// ]]>
+</script>
+
+ENDSCRIPT
+}
+
+sub helpdeskroles_access {
+    my ($dom,$prefix,$num,$add_class,$current,$accesstypes,$othertitle,
+        $usertypes,$types,$domhelpdesk) = @_;
+    return unless ((ref($accesstypes) eq 'ARRAY') && (ref($domhelpdesk) eq 'HASH'));
+    my %lt = &Apache::lonlocal::texthash(
+                    'rou'    => 'Role usage',
+                    'whi'    => 'Which helpdesk personnel may use this role?',
+                    'all'    => 'All with domain helpdesk or helpdesk assistant role',
+                    'dh'     => 'All with domain helpdesk role',
+                    'da'     => 'All with domain helpdesk assistant role',
+                    'none'   => 'None',
+                    'status' => 'Determined based on institutional status',
+                    'inc'    => 'Include all, but exclude specific personnel',
+                    'exc'    => 'Exclude all, but include specific personnel',
+                  );
+    my %usecheck = (
+                     all => ' checked="checked"',
+                   );
+    my %displaydiv = (
+                      status => 'none',
+                      inc    => 'none',
+                      exc    => 'none',
+                      priv   => 'block',
+                     );
+    my $output;
+    if (ref($current) eq 'HASH') {
+        if (($current->{'access'} ne '') && ($current->{'access'} ne 'all')) {
+            if (grep(/^\Q$current->{access}\E$/,@{$accesstypes})) {
+                $usecheck{$current->{access}} = $usecheck{'all'};
+                delete($usecheck{'all'});
+                if ($current->{access} =~ /^(status|inc|exc)$/) {
+                    my $access = $1;
+                    $displaydiv{$access} = 'inline';
+                } elsif ($current->{access} eq 'none') {
+                    $displaydiv{'priv'} = 'none';
+                }
+            }
+        }
+    }
+    $output = '<fieldset id="'.$prefix.$num.'_usage"><legend>'.$lt{'rou'}.'</legend>'.
+              '<p>'.$lt{'whi'}.'</p>';
+    foreach my $access (@{$accesstypes}) {
+        $output .= '<p><label><input type="radio" name="'.$prefix.$num.'_access" value="'.$access.'" '.$usecheck{$access}.
+                   ' onclick="helpdeskAccess('."'$num'".');" />'.
+                   $lt{$access}.'</label>';
+        if ($access eq 'status') {
+            $output .= '<div id="'.$prefix.$num.'_bystatus" style="display:'.$displaydiv{$access}.'">'.
+                       &Apache::lonuserutils::adhoc_status_types($dom,$prefix,$num,$current->{$access},
+                                                                 $othertitle,$usertypes,$types).
+                       '</div>';
+        } elsif (($access eq 'inc') && (keys(%{$domhelpdesk}) > 0)) {
+            $output .= '<div id="'.$prefix.$num.'_notinc" style="display:'.$displaydiv{$access}.'">'.
+                       &Apache::lonuserutils::adhoc_staff($access,$prefix,$num,$current->{$access},$domhelpdesk).
+                       '</div>';
+        } elsif (($access eq 'exc') && (keys(%{$domhelpdesk}) > 0)) {
+            $output .= '<div id="'.$prefix.$num.'_notexc" style="display:'.$displaydiv{$access}.'">'.
+                       &Apache::lonuserutils::adhoc_staff($access,$prefix,$num,$current->{$access},$domhelpdesk).
+                       '</div>';
+        }
+        $output .= '</p>';
+    }
+    $output .= '</fieldset>';
+    return $output;
+}
+
 sub radiobutton_prefs {
     my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick,
         $additional,$align) = @_;
@@ -2880,6 +3735,373 @@ sub radiobutton_prefs {
     return ($datatable,$itemcount);
 }
 
+sub print_ltitools {
+    my ($dom,$settings,$rowtotal) = @_;
+    my $rownum = 0;
+    my $css_class;
+    my $itemcount = 1;
+    my $maxnum = 0;
+    my %ordered;
+    if (ref($settings) eq 'HASH') {
+        foreach my $item (keys(%{$settings})) {
+            if (ref($settings->{$item}) eq 'HASH') {
+                my $num = $settings->{$item}{'order'};
+                $ordered{$num} = $item;
+            }
+        }
+    }
+    my $confname = $dom.'-domainconfig';
+    my $switchserver = &check_switchserver($dom,$confname);
+    my $maxnum = scalar(keys(%ordered));
+    my $datatable = &ltitools_javascript($settings);
+    my %lt = &ltitools_names();
+    my @courseroles = ('cc','in','ta','ep','st');
+    my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner);
+    my @fields = ('fullname','firstname','lastname','email','user','roles');
+    if (keys(%ordered)) {
+        my @items = sort { $a <=> $b } keys(%ordered);
+        for (my $i=0; $i<@items; $i++) {
+            $css_class = $itemcount%2?' class="LC_odd_row"':'';
+            my $item = $ordered{$items[$i]};
+            my ($title,$key,$secret,$url,$imgsrc,$version);
+            if (ref($settings->{$item}) eq 'HASH') {
+                $title = $settings->{$item}->{'title'};
+                $url = $settings->{$item}->{'url'};
+                $key = $settings->{$item}->{'key'};
+                $secret = $settings->{$item}->{'secret'};
+                my $image = $settings->{$item}->{'image'};
+                if ($image ne '') {
+                    $imgsrc = '<img src="'.$image.'" alt="'.&mt('Tool Provider icon').'" />';
+                }
+            }
+            my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'ltitools_".$item."'".');"';
+            $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
+                         .'<select name="ltitools_'.$item.'"'.$chgstr.'>';
+            for (my $k=0; $k<=$maxnum; $k++) {
+                my $vpos = $k+1;
+                my $selstr;
+                if ($k == $i) {
+                    $selstr = ' selected="selected" ';
+                }
+                $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+            }
+            $datatable .= '</select>'.('&nbsp;'x2).
+                '<label><input type="checkbox" name="ltitools_del" value="'.$item.'" />'.
+                &mt('Delete?').'</label></span></td>'.
+                '<td colspan="2">'.
+                '<fieldset><legend>'.&mt('Required settings').'</legend>'.
+                '<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="30" name="ltitools_title_'.$i.'" value="'.$title.'" /></span> '.
+                ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'version'}.':<select name="ltitools_version_'.$i.'">'.
+                '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '.
+                ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'msgtype'}.':<select name="ltitools_msgtype_'.$i.'">'.
+                '<option value="basic-lti-launch-request" selected="selected">Launch</option></select></span> '.
+                '<br /><br />'.
+                '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="30" name="ltitools_url_'.$i.'"'.
+                ' value="'.$url.'" /></span>'.
+                ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'key'}.
+                '<input type="text" size="25" name="ltitools_key_'.$i.'" value="'.$key.'" /></span> '.
+                ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'secret'}.':'.
+                '<input type="password" size="20" name="ltitools_secret_'.$i.'" value="'.$secret.'" />'.
+                '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltitools_secret_'.$i.'.type='."'text'".' } else { this.form.ltitools_secret_'.$i.'.type='."'password'".' }" />'.&mt('Visible input').'</label>'.
+                '<input type="hidden" name="ltitools_id_'.$i.'" value="'.$item.'" /></span>'.
+                '</fieldset>'.
+                '<fieldset><legend>'.&mt('Optional settings').'</legend>'.
+                '<span class="LC_nobreak">'.&mt('Display target:');
+            my %currdisp;
+            if (ref($settings->{$item}->{'display'}) eq 'HASH') {
+                if ($settings->{$item}->{'display'}->{'target'} eq 'window') {
+                    $currdisp{'window'} = ' checked="checked"';
+                } elsif ($settings->{$item}->{'display'}->{'target'} eq 'tab') {
+                    $currdisp{'tab'} = ' checked="checked"';
+                } else {
+                    $currdisp{'iframe'} = ' checked="checked"';
+                }
+                if ($settings->{$item}->{'display'}->{'width'} =~ /^(\d+)$/) {
+                    $currdisp{'width'} = $1;
+                }
+                if ($settings->{$item}->{'display'}->{'height'} =~ /^(\d+)$/) {
+                     $currdisp{'height'} = $1;
+                }
+                $currdisp{'linktext'} = $settings->{$item}->{'display'}->{'linktext'};
+                $currdisp{'explanation'} = $settings->{$item}->{'display'}->{'explanation'};
+            } else {
+                $currdisp{'iframe'} = ' checked="checked"';
+            }
+            foreach my $disp ('iframe','tab','window') {
+                $datatable .= '<label><input type="radio" name="ltitools_target_'.$i.'" value="'.$disp.'"'.$currdisp{$disp}.' />'.
+                              $lt{$disp}.'</label>'.('&nbsp;'x2);
+            }
+            $datatable .= ('&nbsp;'x4);
+            foreach my $dimen ('width','height') {
+                $datatable .= '<label>'.$lt{$dimen}.'&nbsp;'.
+                              '<input type="text" name="ltitools_'.$dimen.'_'.$i.'" size="5" value="'.$currdisp{$dimen}.'" /></label>'.
+                              ('&nbsp;'x2);
+            }
+            $datatable .= '<br />'.
+                          '<div class="LC_left_float">'.$lt{'linktext'}.'<br />'.
+                          '<input type="text" name="ltitools_linktext_'.$i.'" size="25" value="'.$currdisp{'linktext'}.'" /></label></div>'.
+                          '<div class="LC_left_float">'.$lt{'explanation'}.'<br />'.
+                          '<textarea name="ltitools_explanation_'.$i.'" rows="5" cols="40">'.$currdisp{'explanation'}.
+                          '</textarea></div><div style=""></div><br />';
+            $datatable .= '<br />';
+            foreach my $extra ('passback','roster') {
+                my $checkedon = '';
+                my $checkedoff = ' checked="checked"';
+                if ($settings->{$item}->{$extra}) {
+                    $checkedon = $checkedoff;
+                    $checkedoff = '';
+                }
+                $datatable .= $lt{$extra}.'&nbsp;'.
+                              '<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="1"'.$checkedon.' />'.
+                              &mt('Yes').'</label>'.('&nbsp;'x2).
+                              '<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="0"'.$checkedoff.' />'.
+                              &mt('No').'</label>'.('&nbsp;'x4);
+            }
+            $datatable .= '<br /><br /><span class="LC_nobreak">'.$lt{'icon'}.':&nbsp;';
+            if ($imgsrc) {
+                $datatable .= $imgsrc.
+                              '<label><input type="checkbox" name="ltitools_image_del"'.
+                              ' value="'.$item.'" />'.&mt('Delete?').'</label></span> '.
+                              '<span class="LC_nobreak">&nbsp;'.&mt('Replace:').'&nbsp;';
+            } else {
+                $datatable .= '('.&mt('if larger than 21x21 pixels, image will be scaled').')&nbsp;';
+            }
+            if ($switchserver) {
+                $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+            } else {
+                $datatable .= '<input type="file" name="ltitools_image_'.$i.'" value="" />';
+            }
+            $datatable .= '</span></fieldset>';
+            my (%checkedfields,%rolemaps);
+            if (ref($settings->{$item}) eq 'HASH') {
+                if (ref($settings->{$item}->{'fields'}) eq 'HASH') {
+                    %checkedfields = %{$settings->{$item}->{'fields'}};
+                }
+                if (ref($settings->{$item}->{'roles'}) eq 'HASH') {
+                    %rolemaps = %{$settings->{$item}->{'roles'}};
+                    $checkedfields{'roles'} = 1;
+                }
+            }
+            $datatable .= '<fieldset><legend>'.&mt('User data sent on launch').'</legend>'.
+                          '<span class="LC_nobreak">';
+            foreach my $field (@fields) {
+                my $checked;
+                if ($checkedfields{$field}) {
+                    $checked = ' checked="checked"';
+                }
+                $datatable .= '<label>'.
+                              '<input type="checkbox" name="ltitools_fields_'.$i.'" value="'.$field.'"'.$checked.' />'.
+                              $lt{$field}.'</label>'.('&nbsp;' x2);
+            }
+            $datatable .= '</span></fieldset>'.
+                          '<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>';
+            foreach my $role (@courseroles) {
+                my ($selected,$selectnone);
+                if (!$rolemaps{$role}) {
+                    $selectnone = ' selected="selected"';
+                }
+                $datatable .= '<td align="center">'.
+                              &Apache::lonnet::plaintext($role,'Course').'<br />'.
+                              '<select name="ltitools_roles_'.$role.'_'.$i.'">'.
+                              '<option value=""'.$selectnone.'>'.&mt('Select').'</option>';
+                foreach my $ltirole (@ltiroles) {
+                    unless ($selectnone) {
+                        if ($rolemaps{$role} eq $ltirole) {
+                            $selected = ' selected="selected"';
+                        } else {
+                            $selected = '';
+                        }
+                    }
+                    $datatable .= '<option value="'.$ltirole.'"'.$selected.'>'.$ltirole.'</option>';
+                }
+                $datatable .= '</select></td>';
+            }
+            $datatable .= '</tr></table></fieldset>';
+            my %courseconfig;
+            if (ref($settings->{$item}) eq 'HASH') {
+                if (ref($settings->{$item}->{'crsconf'}) eq 'HASH') {
+                    %courseconfig = %{$settings->{$item}->{'crsconf'}};
+                }
+            }
+            $datatable .= '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">';
+            foreach my $item ('label','title','target','linktext','explanation') {
+                my $checked;
+                if ($courseconfig{$item}) {
+                    $checked = ' checked="checked"';
+                }
+                $datatable .= '<label>'.
+                       '<input type="checkbox" name="ltitools_courseconfig_'.$i.'" value="'.$item.'"'.$checked.' />'.
+                       $lt{'crs'.$item}.'</label>'.('&nbsp;' x2)."\n";
+            }
+            $datatable .= '</span></fieldset>'.
+                          '<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'.
+                          '<table><tr><th>'.&mt('Action').'</th><th>'.&mt('Name').'</th><th>'.&mt('Value').'</th></tr>';
+            if (ref($settings->{$item}->{'custom'}) eq 'HASH') {
+                my %custom = %{$settings->{$item}->{'custom'}};
+                if (keys(%custom) > 0) {
+                    foreach my $key (sort(keys(%custom))) {
+                        $datatable .= '<tr><td><span class="LC_nobreak">'.
+                                      '<label><input type="checkbox" name="ltitools_customdel_'.$i.'" value="'.
+                                      $key.'" />'.&mt('Delete').'</label></span></td><td>'.$key.'</td>'.
+                                      '<td><input type="text" name="ltitools_customval_'.$key.'_'.$i.'"'.
+                                      ' value="'.$custom{$key}.'" /></td></tr>';
+                    }
+                }
+            }
+            $datatable .= '<tr><td><span class="LC_nobreak">'.
+                          '<label><input type="checkbox" name="ltitools_customadd" value="'.$i.'" />'.
+                          &mt('Add').'</label></span></td><td><input type="text" name="ltitools_custom_name_'.$i.'" />'.
+                          '</td><td><input type="text" name="ltitools_custom_value_'.$i.'" /></td></tr>';
+            $datatable .= '</table></fieldset></td></tr>'."\n";
+            $itemcount ++;
+        }
+    }
+    $css_class = $itemcount%2?' class="LC_odd_row"':'';
+    my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'ltitools_add_pos'".');"';
+    $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n".
+                  '<input type="hidden" name="ltitools_maxnum" value="'.$maxnum.'" />'."\n".
+                  '<select name="ltitools_add_pos"'.$chgstr.'>';
+    for (my $k=0; $k<$maxnum+1; $k++) {
+        my $vpos = $k+1;
+        my $selstr;
+        if ($k == $maxnum) {
+            $selstr = ' selected="selected" ';
+        }
+        $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+    }
+    $datatable .= '</select>&nbsp;'."\n".
+                  '<input type="checkbox" name="ltitools_add" value="1" />'.&mt('Add').'</td>'."\n".
+                  '<td colspan="2">'.
+                  '<fieldset><legend>'.&mt('Required settings').'</legend>'.
+                  '<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="30" name="ltitools_add_title" value="" /></span> '."\n".
+                  ('&nbsp;'x2).
+                  '<span class="LC_nobreak">'.$lt{'version'}.':<select name="ltitools_add_version">'.
+                  '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '."\n".
+                  ('&nbsp;'x2).
+                  '<span class="LC_nobreak">'.$lt{'msgtype'}.':<select name="ltitools_add_msgtype">'.
+                  '<option value="basic-lti-launch-request" selected="selected">Launch</option></select></span> '.
+                  '<br />'.
+                  '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="30" name="ltitools_add_url" value="" /></span> '."\n".
+                  ('&nbsp;'x2).
+                  '<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="ltitools_add_key" value="" /></span> '."\n".
+                  ('&nbsp;'x2).
+                  '<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="ltitools_add_secret" value="" />'.
+                  '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltitools_add_secret.type='."'text'".' } else { this.form.ltitools_add_secret.type='."'password'".' }" />'.&mt('Visible input').'</label></span> '."\n".
+                  '</fieldset>'.
+                  '<fieldset><legend>'.&mt('Optional settings').'</legend>'.
+                  '<span class="LC_nobreak">'.&mt('Display target:');
+    my %defaultdisp;
+    $defaultdisp{'iframe'} = ' checked="checked"';
+    foreach my $disp ('iframe','tab','window') {
+        $datatable .= '<label><input type="radio" name="ltitools_add_target" value="'.$disp.'"'.$defaultdisp{$disp}.' />'.
+                      $lt{$disp}.'</label>'.('&nbsp;'x2);
+    }
+    $datatable .= ('&nbsp;'x4);
+    foreach my $dimen ('width','height') {
+        $datatable .= '<label>'.$lt{$dimen}.'&nbsp;'.
+                      '<input type="text" name="ltitools_add_'.$dimen.'" size="5" /></label>'.
+                      ('&nbsp;'x2);
+    }
+    $datatable .= '<br />'.
+                  '<div class="LC_left_float">'.$lt{'linktext'}.'<br />'.
+                  '<input type="text" name="ltitools_add_linktext" size="5" /></label></div>'.
+                  '<div class="LC_left_float">'.$lt{'explanation'}.'<br />'.
+                  '<textarea name=ltitools_add_explanation" rows="5" cols="40"></textarea>'.
+                  '</div><div style=""></div><br />';
+    foreach my $extra ('passback','roster') {
+        $datatable .= $lt{$extra}.'&nbsp;'.
+                      '<label><input type="radio" name="ltitools_add_'.$extra.'" value="1" />'.
+                      &mt('Yes').'</label>'.('&nbsp;'x2).
+                      '<label><input type="radio" name="ltitools_add_'.$extra.'" value="0" checked="checked" />'.
+                      &mt('No').'</label>'.('&nbsp;'x4);
+    }
+    $datatable .= '<br /><br /><span class="LC_nobreak">'.$lt{'icon'}.':&nbsp;'.
+                  '('.&mt('if larger than 21x21 pixels, image will be scaled').')&nbsp;';
+    if ($switchserver) {
+        $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+    } else {
+        $datatable .= '<input type="file" name="ltitools_add_image" value="" />';
+    }
+    $datatable .= '</span></fieldset>'.
+                  '<fieldset><legend>'.&mt('User data sent on launch').'</legend>'.
+                  '<span class="LC_nobreak">';
+    foreach my $field (@fields) {
+        $datatable .= '<label>'.
+                      '<input type="checkbox" name="ltitools_add_fields" value="'.$field.'" />'.
+                      $lt{$field}.'</label>'.('&nbsp;' x2);
+    }
+    $datatable .= '</span></fieldset>'.
+                  '<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>';
+    foreach my $role (@courseroles) {
+        my ($checked,$checkednone);
+        $datatable .= '<td align="center">'.
+                      &Apache::lonnet::plaintext($role,'Course').'<br />'.
+                      '<select name="ltitools_add_roles_'.$role.'">'.
+                      '<option value="" selected="selected">'.&mt('Select').'</option>';
+        foreach my $ltirole (@ltiroles) {
+            $datatable .= '<option value="'.$ltirole.'">'.$ltirole.'</option>';
+        }
+        $datatable .= '</select></td>';
+    }
+    $datatable .= '</tr></table></fieldset>'.
+                  '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">';
+    foreach my $item ('label','title','target','linktext','explanation') {
+        $datatable .= '<label>'.
+                      '<input type="checkbox" name="ltitools_courseconfig" value="'.$item.'" checked="checked" />'.
+                      $lt{'crs'.$item}.'</label>'.('&nbsp;' x2)."\n";
+    }
+    $datatable .= '</span></fieldset>'.
+                  '<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'.
+                  '<table><tr><th>'.&mt('Action').'</th><th>'.&mt('Name').'</th><th>'.&mt('Value').'</th></tr>'.
+                  '<tr><td><span class="LC_nobreak">'.
+                  '<label><input type="checkbox" name="ltitools_add_custom" value="1" />'.
+                  &mt('Add').'</label></span></td><td><input type="text" name="ltitools_add_custom_name" />'.
+                  '</td><td><input type="text" name="ltitools_add_custom_value" /></td></tr>'.
+                  '</table></fieldset></td></tr>'."\n".
+                  '</td>'."\n".
+                  '</tr>'."\n";
+    $itemcount ++;
+    return $datatable;
+}
+
+sub ltitools_names {
+    my %lt = &Apache::lonlocal::texthash(
+                                          'title'          => 'Title',
+                                          'version'        => 'Version',
+                                          'msgtype'        => 'Message Type',
+                                          'url'            => 'URL',
+                                          'key'            => 'Key',
+                                          'secret'         => 'Secret',
+                                          'icon'           => 'Icon',
+                                          'user'           => 'Username:domain',
+                                          'fullname'       => 'Full Name',
+                                          'firstname'      => 'First Name',
+                                          'lastname'       => 'Last Name',
+                                          'email'          => 'E-mail',
+                                          'roles'          => 'Role',
+                                          'window'         => 'Window',
+                                          'tab'            => 'Tab',
+                                          'iframe'         => 'iFrame',
+                                          'height'         => 'Height',
+                                          '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',
+                                          'crslinktext'    => 'Link Text',
+                                          'crsexplanation' => 'Explanation',
+                                        );
+
+    return %lt;
+}
+
 sub print_coursedefaults {
     my ($position,$dom,$settings,$rowtotal) = @_;
     my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles);
@@ -2892,11 +4114,13 @@ sub print_coursedefaults {
         usejsme              => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',
         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',
     );
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
                            postsubmit           => 60,
+                           mysqltables          => 172800,
                          );
     if ($position eq 'top') {
         %defaultchecked = (
@@ -2980,7 +4204,7 @@ sub print_coursedefaults {
         $itemcount ++;
     } else {
         $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-        my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout);
+        my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout,%currmysql);
         my $currusecredits = 0;
         my $postsubmitclient = 1;
         my @types = ('official','unofficial','community','textbook');
@@ -3024,6 +4248,15 @@ sub print_coursedefaults {
                     $deftimeout{$type} = $staticdefaults{'postsubmit'};
                 }
             }
+            if (ref($settings->{'mysqltables'}) eq 'HASH') {
+                foreach my $type (keys(%{$settings->{'mysqltables'}})) {
+                    $currmysql{$type} = $settings->{'mysqltables'}{$type};
+                }
+            } else {
+                foreach my $type (@types) {
+                    $currmysql{$type} = $staticdefaults{'mysqltables'};
+                }
+            }
         } else {
             foreach my $type (@types) {
                 $deftimeout{$type} = $staticdefaults{'postsubmit'};
@@ -3101,13 +4334,27 @@ sub print_coursedefaults {
         $additional .= '</tr></table></div>'."\n";
         %defaultchecked = ('postsubmit' => 'on');
         @toggles = ('postsubmit');
-        my $current = {
-                        'postsubmit' => $postsubmitclient,
-                      };
+        $current = {
+                       'postsubmit' => $postsubmitclient,
+                   };
         ($table,$itemcount) =
             &radiobutton_prefs($current,\@toggles,\%defaultchecked,
                                \%choices,$itemcount,$onclick,$additional,'left');
         $datatable .= $table;
+        $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+        $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
+                      $choices{'mysqltables'}.
+                      '</span></td>'.
+                      '<td align="right" class="LC_right_item">'.
+                      '<table><tr>';
+        foreach my $type (@types) {
+            $datatable .= '<td align="center">'.&mt($type).'<br />'.
+                           '<input type="text" name="mysqltables_'.$type.'"'.
+                           ' value="'.$currmysql{$type}.'" size="8" /></td>';
+        }
+        $datatable .= '</tr></table></td></tr>'."\n";
+        $itemcount ++;
+
     }
     $$rowtotal += $itemcount;
     return $datatable;
@@ -3847,6 +5094,9 @@ sub print_loadbalancing {
         my ($numspares,@spares) = &count_servers($lonhost,%servers);
         my @sparestypes = ('primary','default');
         my %typetitles = &sparestype_titles();
+        my %hostherechecked = (
+                                  no => ' checked="checked"',
+                              );
         foreach my $sparetype (@sparestypes) {
             my $targettable;
             for (my $i=0; $i<$numspares; $i++) {
@@ -3892,6 +5142,23 @@ sub print_loadbalancing {
                 $datatable .=  '<i>'.$typetitles{$sparetype}.'</i><br />'.
                                '<table><tr>'.$targettable.'</tr></table><br />';
             }
+            $hostherechecked{$sparetype} = '';
+            if (ref($currtargets{$lonhost}) eq 'HASH') {
+                if (ref($currtargets{$lonhost}{$sparetype}) eq 'ARRAY') {
+                    if (grep(/^\Q$lonhost\E$/,@{$currtargets{$lonhost}{$sparetype}})) {
+                        $hostherechecked{$sparetype} = ' checked="checked"';
+                        $hostherechecked{'no'} = '';
+                    }
+                }
+            }
+        }
+        $datatable .= &mt('Hosting on balancer itself').'<br />'.
+                      '<label><input type="radio" name="loadbalancing_target_'.$balnum.'_hosthere" value="no"'.
+                      $hostherechecked{'no'}.' />'.&mt('No').'</label><br />';
+        foreach my $sparetype (@sparestypes) {
+            $datatable .= '<label><input type="radio" name="loadbalancing_target_'.$balnum.'_hosthere" '.
+                          'value="'.$sparetype.'"'.$hostherechecked{$sparetype}.' /><i>'.$typetitles{$sparetype}.
+                          '</i></label><br />';
         }
         $datatable .= '</div></td></tr>'.
                       &loadbalancing_rules($dom,$intdom,$currrules{$lonhost},
@@ -4109,14 +5376,15 @@ sub sparestype_titles {
 
 sub contact_titles {
     my %titles = &Apache::lonlocal::texthash (
-                   'supportemail' => 'Support E-mail address',
-                   'adminemail'   => 'Default Server Admin E-mail address',
-                   'errormail'    => 'Error reports to be e-mailed to',
-                   'packagesmail' => 'Package update alerts to be e-mailed to',
-                   'helpdeskmail' => 'Helpdesk requests to be e-mailed to',
-                   'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)',
-                   'requestsmail' => 'E-mail from course requests requiring approval',
-                   'updatesmail'  => 'E-mail from nightly check of LON-CAPA module integrity/updates',
+                   'supportemail'    => 'Support E-mail address',
+                   'adminemail'      => 'Default Server Admin E-mail address',
+                   'errormail'       => 'Error reports to be e-mailed to',
+                   'packagesmail'    => 'Package update alerts to be e-mailed to',
+                   'helpdeskmail'    => "Helpdesk requests from all users in this domain",
+                   'otherdomsmail'   => 'Helpdesk requests from users in other (unconfigured) domains',
+                   'lonstatusmail'   => 'E-mail from nightly status check (warnings/errors)',
+                   'requestsmail'    => 'E-mail from course requests requiring approval',
+                   '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',
                  );
     my %short_titles = &Apache::lonlocal::texthash (
@@ -4126,6 +5394,34 @@ sub contact_titles {
     return (\%titles,\%short_titles);
 }
 
+sub helpform_fields {
+    my %titles =  &Apache::lonlocal::texthash (
+                       'username'   => 'Name',
+                       'user'       => 'Username/domain',
+                       'phone'      => 'Phone',
+                       'cc'         => 'Cc e-mail',
+                       'course'     => 'Course Details',
+                       'section'    => 'Sections',
+                       'screenshot' => 'File upload',
+    );
+    my @fields = ('username','phone','user','course','section','cc','screenshot');
+    my %possoptions = (
+                        username     => ['yes','no','req'],
+                        phone        => ['yes','no','req'],
+                        user         => ['yes','no'],
+                        cc           => ['yes','no'],
+                        course       => ['yes','no'],
+                        section      => ['yes','no'],
+                        screenshot   => ['yes','no'],
+                      );
+    my %fieldoptions = &Apache::lonlocal::texthash (
+                         'yes'  => 'Optional',
+                         'req'  => 'Required',
+                         'no'   => "Not shown",
+    );
+    return (\@fields,\%titles,\%fieldoptions,\%possoptions);
+}
+
 sub tool_titles {
     my %titles = &Apache::lonlocal::texthash (
                      aboutme    => 'Personal web page',
@@ -4354,7 +5650,7 @@ sub print_selfcreation {
             if (keys(%{$usertypes}) > 0) {
                 $datatable .= &insttypes_row($createsettings,$types,$usertypes,
                                              $dom,$numinrow,$othertitle,
-                                             'statustocreate',$$rowtotal);
+                                             'statustocreate',$rowtotal);
                 $$rowtotal ++;
             }
         }
@@ -4535,7 +5831,8 @@ sub email_as_username {
 
 sub captcha_choice {
     my ($context,$settings,$itemcount) = @_;
-    my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext);
+    my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext,
+        $vertext,$currver); 
     my %lt = &captcha_phrases();
     $keyentry = 'hidden';
     if ($context eq 'cancreate') {
@@ -4553,6 +5850,11 @@ sub captcha_choice {
             $pubtext = $lt{'pub'};
             $privtext = $lt{'priv'};
             $keyentry = 'text';
+            $vertext = $lt{'ver'};
+            $currver = $settings->{'recaptchaversion'};
+            if ($currver ne '2') {
+                $currver = 1;
+            }
         }
         if (ref($settings->{'recaptchakeys'}) eq 'HASH') {
             $currpub = $settings->{'recaptchakeys'}{'public'};
@@ -4586,7 +5888,11 @@ sub captcha_choice {
                $currpub.'" size="40" /></span><br />'."\n".
                '<span class="LC_nobreak"><span id="'.$context.'_recaptchaprivtxt">'.$privtext.'</span>&nbsp;'."\n".
                '<input type="'.$keyentry.'" id="'.$context.'_recaptchapriv" name="'.$context.'_recaptchapriv" value="'.
-               $currpriv.'" size="40" /></span></td></tr></table>'."\n".
+               $currpriv.'" size="40" /></span><br />'.
+               '<span class="LC_nobreak"><span id="'.$context.'_recaptchavertxt">'.$vertext.'</span>&nbsp;'."\n".
+               '<input type="'.$keyentry.'" id="'.$context.'_recaptchaversion" name="'.$context.'_recaptchaversion" value="'.
+               $currver.'" size="3" /></span><br />'.
+               '</td></tr></table>'."\n".
                '</td></tr>';
     return $output;
 }
@@ -4721,7 +6027,10 @@ sub print_usermodification {
 sub print_defaults {
     my ($position,$dom,$settings,$rowtotal) = @_;
     my $rownum = 0;
-    my ($datatable,$css_class);
+    my ($datatable,$css_class,$titles);
+    unless ($position eq 'bottom') {
+        $titles = &defaults_titles($dom);
+    }
     if ($position eq 'top') {
         my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
                      'datelocale_def','portal_def');
@@ -4734,7 +6043,6 @@ sub print_defaults {
                 $defaults{$item} = $domdefaults{$item};
             }
         }
-        my $titles = &defaults_titles($dom);
         foreach my $item (@items) {
             if ($rownum%2) {
                 $css_class = '';
@@ -4782,8 +6090,87 @@ sub print_defaults {
             $datatable .= '</td></tr>';
             $rownum ++;
         }
+    } elsif ($position eq 'middle') {
+        my @items = ('intauth_cost','intauth_check','intauth_switch');
+        my %defaults;
+        if (ref($settings) eq 'HASH') {
+            %defaults = %{$settings};
+            if ($defaults{'intauth_cost'} !~ /^\d+$/) {
+                $defaults{'intauth_cost'} = 10;
+            }
+            if ($defaults{'intauth_check'} !~ /^(0|1|2)$/) {
+                $defaults{'intauth_check'} = 0;
+            }
+            if ($defaults{'intauth_switch'} !~ /^(0|1|2)$/) {
+                $defaults{'intauth_switch'} = 0;
+            }
+        } else {
+            %defaults = (
+                          'intauth_cost'   => 10,
+                          'intauth_check'  => 0,
+                          'intauth_switch' => 0,
+                        );
+        }
+        foreach my $item (@items) {
+            if ($rownum%2) {
+                $css_class = '';
+            } else {
+                $css_class = ' class="LC_odd_row" ';
+            }
+            $datatable .= '<tr'.$css_class.'>'.
+                          '<td><span class="LC_nobreak">'.$titles->{$item}.
+                          '</span></td><td class="LC_left_item" colspan="3">';
+            if ($item eq 'intauth_switch') {
+                my @options = (0,1,2);
+                my %optiondesc = &Apache::lonlocal::texthash (
+                                   0 => 'No',
+                                   1 => 'Yes',
+                                   2 => 'Yes, and copy existing passwd file to passwd.bak file',
+                                 );
+                $datatable .= '<table width="100%">';
+                foreach my $option (@options) {
+                    my $checked = ' ';
+                    if ($defaults{$item} eq $option) {
+                        $checked = ' checked="checked"';
+                    }
+                    $datatable .= '<tr><td class="LC_left_item"><span class="LC_nobreak">'.
+                                  '<label><input type="radio" name="'.$item.
+                                  '" value="'.$option.'"'.$checked.' />'.
+                                  $optiondesc{$option}.'</label></span></td></tr>';
+                }
+                $datatable .= '</table>';
+            } elsif ($item eq 'intauth_check') {
+                my @options = (0,1,2);
+                my %optiondesc = &Apache::lonlocal::texthash (
+                                   0 => 'No',
+                                   1 => 'Yes, allow login then update passwd file using default cost (if higher)',
+                                   2 => 'Yes, disallow login if stored cost is less than domain default',
+                                 );
+                $datatable .= '<table wisth="100%">';
+                foreach my $option (@options) {
+                    my $checked = ' ';
+                    my $onclick;
+                    if ($defaults{$item} eq $option) {
+                        $checked = ' checked="checked"';
+                    }
+                    if ($option == 2) {
+                        $onclick = ' onclick="javascript:warnIntAuth(this);"';
+                    }
+                    $datatable .= '<tr><td class="LC_left_item"><span class="LC_nobreak">'.
+                                  '<label><input type="radio" name="'.$item.
+                                  '" value="'.$option.'"'.$checked.$onclick.' />'.
+                                  $optiondesc{$option}.'</label></span></td></tr>';
+                }
+                $datatable .= '</table>';
+            } else {
+                $datatable .= '<input type="text" name="'.$item.'" value="'.
+                              $defaults{$item}.'" size="3" onblur="javascript:warnIntAuth(this);" />';
+            }
+            $datatable .= '</td></tr>';
+            $rownum ++;
+        }
     } else {
-        my (%defaults);
+        my %defaults;
         if (ref($settings) eq 'HASH') {
             if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH') &&
                 (ref($settings->{'inststatusguest'}) eq 'ARRAY')) {
@@ -4878,6 +6265,9 @@ sub defaults_titles {
                    'timezone_def'  => 'Default timezone',
                    'datelocale_def' => 'Default locale for dates',
                    'portal_def'     => 'Portal/Default URL',
+                   'intauth_cost'   => 'Encryption cost for bcrypt (positive integer)',
+                   'intauth_check'  => 'Check bcrypt cost if authenticated',
+                   'intauth_switch' => 'Existing crypt-based switched to bcrypt on authentication',
                  );
     if ($dom) {
         my $uprimary_id = &Apache::lonnet::domain($dom,'primary');
@@ -5381,7 +6771,35 @@ sub serverstatus_pages {
 
 sub defaults_javascript {
     my ($settings) = @_;
-    return unless (ref($settings) eq 'HASH');
+    my $intauthcheck = &mt('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.');
+    my $intauthcost = &mt('Warning: bcrypt encryption cost for internal authentication must be an integer.');
+    &js_escape(\$intauthcheck);
+    &js_escape(\$intauthcost);
+    my $intauthjs = <<"ENDSCRIPT";
+
+function warnIntAuth(field) {
+    if (field.name == 'intauth_check') {
+        if (field.value == '2') {
+            alert('$intauthcheck');
+        }
+    }
+    if (field.name == 'intauth_cost') {
+        field.value.replace(/\s/g,'');
+        if (field.value != '') {
+            var regexdigit=/^\\d+\$/;
+            if (!regexdigit.test(field.value)) {
+                alert('$intauthcost');
+            }
+        }
+    }
+    return;
+}
+
+ENDSCRIPT
+
+    if (ref($settings) ne 'HASH') {
+        return &Apache::lonhtmlcommon::scripttag($intauthjs);
+    }
     if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) {
         my $maxnum = scalar(@{$settings->{'inststatusorder'}});
         if ($maxnum eq '') {
@@ -5435,10 +6853,14 @@ $jstext
     return;
 }
 
+$intauthjs
+
 // ]]>
 </script>
 
 ENDSCRIPT
+    } else {
+        return &Apache::lonhtmlcommon::scripttag($intauthjs);
     }
 }
 
@@ -5466,7 +6888,10 @@ 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 $choose_again = '\\n'.&mt('Please use a different name for the new top level category.'); 
+    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(\$choose_again);
     $output = <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
@@ -5803,11 +7228,13 @@ sub modifiable_userdata_row {
 }
 
 sub insttypes_row {
-    my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context,$rownum) = @_;
+    my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context,$rowtotal,$onclick,
+        $customcss,$rowstyle) = @_;
     my %lt = &Apache::lonlocal::texthash (
                       cansearch => 'Users allowed to search',
                       statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)',
                       lockablenames => 'User preference to lock name',
+                      overrides     => "Override domain's helpdesk settings based on requester's affiliation",
              );
     my $showdom;
     if ($context eq 'cansearch') {
@@ -5817,9 +7244,22 @@ sub insttypes_row {
     if ($context eq 'statustocreate') {
         $class = 'LC_right_item';
     }
-    my $css_class = ' class="LC_odd_row"';
-    if ($rownum ne '') { 
-        $css_class = ($rownum%2? ' class="LC_odd_row"':'');
+    my $css_class;
+    if ($$rowtotal%2) {
+        $css_class = 'LC_odd_row';
+    }
+    if ($customcss) {
+        $css_class .= ' '.$customcss;
+    }
+    $css_class =~ s/^\s+//;
+    if ($css_class) {
+        $css_class = ' class="'.$css_class.'"';
+    }
+    if ($rowstyle) {
+        $css_class .= ' style="'.$rowstyle.'"';
+    }
+    if ($onclick) {
+        $onclick = 'onclick="'.$onclick.'" ';
     }
     my $output = '<tr'.$css_class.'>'.
                  '<td>'.$lt{$context}.$showdom.
@@ -5841,6 +7281,10 @@ sub insttypes_row {
                         if (grep(/^\Q$types->[$i]\E$/,@{$settings->{$context}})) {
                             $check = ' checked="checked" ';
                         }
+                    } elsif (ref($settings->{$context}) eq 'HASH') {
+                        if (ref($settings->{$context}->{$types->[$i]}) eq 'HASH') {
+                            $check = ' checked="checked" ';
+                        }
                     } elsif ($context eq 'statustocreate') {
                         $check = ' checked="checked" ';
                     }
@@ -5855,29 +7299,38 @@ sub insttypes_row {
         $rem = @{$types}%($numinrow);
     }
     my $colsleft = $numinrow - $rem;
-    if (($rem == 0) && (@{$types} > 0)) {
-        $output .= '<tr>';
-    }
-    if ($colsleft > 1) {
-        $output .= '<td colspan="'.$colsleft.'" class="LC_left_item">';
+    if ($context eq 'overrides') {
+        if ($colsleft > 1) {
+            $output .= '<td colspan="'.$colsleft.'" class="LC_left_item">';
+        } else {
+            $output .= '<td class="LC_left_item">';
+        }
+        $output .= '&nbsp;';
     } else {
-        $output .= '<td class="LC_left_item">';
-    }
-    my $defcheck = ' ';
-    if (ref($settings) eq 'HASH') {  
-        if (ref($settings->{$context}) eq 'ARRAY') {
-            if (grep(/^default$/,@{$settings->{$context}})) {
+        if (($rem == 0) && (@{$types} > 0)) {
+            $output .= '<tr>';
+        }
+        if ($colsleft > 1) {
+            $output .= '<td colspan="'.$colsleft.'" class="LC_left_item">';
+        } else {
+            $output .= '<td class="LC_left_item">';
+        }
+        my $defcheck = ' ';
+        if (ref($settings) eq 'HASH') {  
+            if (ref($settings->{$context}) eq 'ARRAY') {
+                if (grep(/^default$/,@{$settings->{$context}})) {
+                    $defcheck = ' checked="checked" ';
+                }
+            } elsif ($context eq 'statustocreate') {
                 $defcheck = ' checked="checked" ';
             }
-        } elsif ($context eq 'statustocreate') {
-            $defcheck = ' checked="checked" ';
         }
+        $output .= '<span class="LC_nobreak"><label>'.
+                   '<input type="checkbox" name="'.$context.'" '.
+                   'value="default"'.$defcheck.'/>'.
+                   $othertitle.'</label></span>';
     }
-    $output .= '<span class="LC_nobreak"><label>'.
-               '<input type="checkbox" name="'.$context.'" '.
-               'value="default"'.$defcheck.'/>'.
-               $othertitle.'</label></span></td>'.
-               '</tr></table></td></tr>';
+    $output .= '</td></tr></table></td></tr>';
     return $output;
 }
 
@@ -6120,7 +7573,6 @@ sub modify_login {
                         $errors .= '<li><span class="LC_error">'.$puberror.'</span></li>';
                         if ((grep(/^\Q$lang\E$/,@currlangs)) &&
                             (!grep(/^\Q$lang\E$/,@delurls))) {
-
                             $loginhash{'login'}{'helpurl'}{$lang} = $domconfig{'login'}{'helpurl'}{$lang};
                         }
                     }
@@ -6144,7 +7596,7 @@ sub modify_login {
                 if ($domservers{$lonhost}) {
                     if (ref($domconfig{'login'}{'headtag'}{$lonhost}) eq 'HASH') {
                         $currheadtagurls{$lonhost} = $domconfig{'login'}{'headtag'}{$lonhost}{'url'};
-                        $currexempt{$lonhost} = $domconfig{'login'}{'headtagexempt'}{$lonhost}{'exempt'}
+                        $currexempt{$lonhost} = $domconfig{'login'}{'headtag'}{$lonhost}{'exempt'};
                     }
                 }
             }
@@ -6214,7 +7666,6 @@ sub modify_login {
             $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
         }
     }
-
     &process_captcha('login',\%changes,$loginhash{'login'},$domconfig{'login'});
 
     my $defaulthelpfile = '/adm/loginproblems.html';
@@ -6370,6 +7821,13 @@ sub modify_login {
                         $chgtxt .= '</ul>';
                         $resulttext .= '<li>'.$chgtxt.'</li>';
                     }
+                } elsif ($item eq 'recaptchaversion') {
+                    if (ref($loginhash{'login'}) eq 'HASH') {
+                        if ($loginhash{'login'}{'captcha'} eq 'recaptcha') {
+                            $resulttext .= '<li>'.&mt('ReCAPTCHA for helpdesk form set to version [_1]',$loginhash{'login'}{'recaptchaversion'}).
+                                           '</li>';
+                        }
+                    }
                 } else {
                     $resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>';
                 }
@@ -7395,10 +8853,14 @@ sub modify_quotas {
                         if (@{$confhash{'validation'}{$item}} > 0) {
                             @{$confhash{'validation'}{$item}} = sort(@{$confhash{'validation'}{$item}});
                         }
-                        if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                            if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') {
-                                @changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item},
-                                                                              $domconfig{'requestcourses'}{'validation'}{$item});
+                        if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+                            if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                                if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') {
+                                    @changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item},
+                                                                                  $domconfig{'requestcourses'}{'validation'}{$item});
+                                } else {
+                                    @changed = @{$confhash{'validation'}{$item}};
+                                }
                             } else {
                                 @changed = @{$confhash{'validation'}{$item}};
                             }
@@ -7419,9 +8881,15 @@ sub modify_quotas {
                                 $env{'form.requestcourses_validation_'.$item} =~ s/[\n\r\f]+/\s/gs;
                             }
                         }
-                        if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                            if ($domconfig{'requestcourses'}{'validation'}{$item} ne $confhash{'validation'}{$item}) {
-                                $changes{'validation'}{$item} = $confhash{'validation'}{$item};
+                        if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+                            if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                                if ($domconfig{'requestcourses'}{'validation'}{$item} ne $confhash{'validation'}{$item}) {
+                                    $changes{'validation'}{$item} = $confhash{'validation'}{$item};
+                                }
+                            } else {
+                                if ($confhash{'validation'}{$item} ne '') {
+                                    $changes{'validation'}{$item} = $confhash{'validation'}{$item};
+                                }
                             }
                         } else {
                             if ($confhash{'validation'}{$item} ne '') {
@@ -7433,20 +8901,24 @@ sub modify_quotas {
             }
             if ($env{'form.validationdc'}) {
                 my $newval = $env{'form.validationdc'};
-                my %domcoords = &get_active_dcs($dom);
+                my %domcoords = &Apache::lonnet::get_active_domroles($dom,['dc']);
                 if (exists($domcoords{$newval})) {
                     $confhash{'validation'}{'dc'} = $newval;
                 }
             }
             if (ref($confhash{'validation'}) eq 'HASH') {
-                if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                    if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
-                        unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) {
-                            if ($confhash{'validation'}{'dc'} eq '') {
-                                $changes{'validation'}{'dc'} = &mt('None');
-                            } else {
-                                $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
+                if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+                    if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                        if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
+                            unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) {
+                                if ($confhash{'validation'}{'dc'} eq '') {
+                                    $changes{'validation'}{'dc'} = &mt('None');
+                                } else {
+                                    $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
+                                }
                             }
+                        } elsif ($confhash{'validation'}{'dc'} ne '') {
+                            $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
                         }
                     } elsif ($confhash{'validation'}{'dc'} ne '') {
                         $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
@@ -7454,9 +8926,13 @@ sub modify_quotas {
                 } elsif ($confhash{'validation'}{'dc'} ne '') {
                     $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
                 }
-            } elsif (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
-                    $changes{'validation'}{'dc'} = &mt('None');
+            } else {
+                if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+                    if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                        if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
+                            $changes{'validation'}{'dc'} = &mt('None');
+                        }
+                    }
                 }
             }
         }
@@ -7852,6 +9328,589 @@ sub process_textbook_image {
     return ($url,$error);
 }
 
+sub modify_ltitools {
+    my ($r,$dom,$action,$lastactref,%domconfig) = @_;
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
+    my ($newid,@allpos,%changes,%confhash,%encconfig,$errors,$resulttext);
+    my $confname = $dom.'-domainconfig';
+    my $servadm = $r->dir_config('lonAdmEMail');
+    my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm);
+    my (%posslti,%possfield);
+    my @courseroles = ('cc','in','ta','ep','st');
+    my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner);
+    map { $posslti{$_} = 1; } @ltiroles;
+    my @allfields = ('fullname','firstname','lastname','email','user','roles');
+    map { $possfield{$_} = 1; } @allfields;
+    my %lt = &ltitools_names();
+    if ($env{'form.ltitools_add'}) {
+        my $title = $env{'form.ltitools_add_title'};
+        $title =~ s/(`)/'/g;
+        ($newid,my $error) = &get_ltitools_id($dom,$title);
+        if ($newid) {
+            my $position = $env{'form.ltitools_add_pos'};
+            $position =~ s/\D+//g;
+            if ($position ne '') {
+                $allpos[$position] = $newid;
+            }
+            $changes{$newid} = 1;
+            foreach my $item ('title','url','key','secret') {
+                $env{'form.ltitools_add_'.$item} =~ s/(`)/'/g;
+                if ($env{'form.ltitools_add_'.$item}) {
+                    if (($item eq 'key') || ($item eq 'secret')) {
+                        $encconfig{$newid}{$item} = $env{'form.ltitools_add_'.$item};
+                    } else {
+                        $confhash{$newid}{$item} = $env{'form.ltitools_add_'.$item};
+                    }
+                }
+            }
+            if ($env{'form.ltitools_add_version'} eq 'LTI-1p0') {
+                $confhash{$newid}{'version'} = $env{'form.ltitools_add_version'};
+            }
+            if ($env{'form.ltitools_add_msgtype'} eq 'basic-lti-launch-request') {
+                $confhash{$newid}{'msgtype'} = $env{'form.ltitools_add_msgtype'};
+            }
+            foreach my $item ('width','height','linktext','explanation') {
+                $env{'form.ltitools_add_'.$item} =~ s/^\s+//;
+                $env{'form.ltitools_add_'.$item} =~ s/\s+$//;
+                if (($item eq 'width') || ($item eq 'height')) {
+                    if ($env{'form.ltitools_add_'.$item} =~ /^\d+$/) {
+                        $confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item};
+                    }
+                } else {
+                    if ($env{'form.ltitools_add_'.$item} ne '') {
+                        $confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item};
+                    }
+                }
+            }
+            if ($env{'form.ltitools_add_target'} eq 'window') {
+                $confhash{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'};
+            } elsif ($env{'form.ltitools_add_target'} eq 'tab') {
+                $confhash{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'};
+            } else {
+                $confhash{$newid}{'display'}{'target'} = 'iframe';
+            }
+            foreach my $item ('passback','roster') {
+                if ($env{'form.ltitools_add_'.$item}) {
+                    $confhash{$newid}{$item} = 1;
+                }
+            }
+            if ($env{'form.ltitools_add_image.filename'} ne '') {
+                my ($imageurl,$error) =
+                    &process_ltitools_image($r,$dom,$confname,'ltitools_add_image',$newid,
+                                            $configuserok,$switchserver,$author_ok);
+                if ($imageurl) {
+                    $confhash{$newid}{'image'} = $imageurl;
+                }
+                if ($error) {
+                    &Apache::lonnet::logthis($error);
+                    $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+                }
+            }
+            my @fields = &Apache::loncommon::get_env_multiple('form.ltitools_add_fields');
+            foreach my $field (@fields) {
+                if ($possfield{$field}) {
+                    if ($field eq 'roles') {
+                        foreach my $role (@courseroles) {
+                            my $choice = $env{'form.ltitools_add_roles_'.$role};
+                            if (($choice ne '') && ($posslti{$choice})) {
+                                $confhash{$newid}{'roles'}{$role} = $choice;
+                                if ($role eq 'cc') {
+                                    $confhash{$newid}{'roles'}{'co'} = $choice;
+                                }
+                            }
+                        }
+                    } else {
+                        $confhash{$newid}{'fields'}{$field} = 1;
+                    }
+                }
+            }
+            my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig');
+            foreach my $item (@courseconfig) {
+                $confhash{$newid}{'crsconf'}{$item} = 1;
+            }
+            if ($env{'form.ltitools_add_custom'}) {
+                my $name = $env{'form.ltitools_add_custom_name'};
+                my $value = $env{'form.ltitools_add_custom_value'};
+                $value =~ s/(`)/'/g;
+                $name =~ s/(`)/'/g;
+                $confhash{$newid}{'custom'}{$name} = $value;
+            }
+        } else {
+            my $error = &mt('Failed to acquire unique ID for new external tool');
+            $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+        }
+    }
+    if (ref($domconfig{$action}) eq 'HASH') {
+        my %deletions;
+        my @todelete = &Apache::loncommon::get_env_multiple('form.ltitools_del');
+        if (@todelete) {
+            map { $deletions{$_} = 1; } @todelete;
+        }
+        my %customadds;
+        my @newcustom = &Apache::loncommon::get_env_multiple('form.ltitools_customadd');
+        if (@newcustom) {
+            map { $customadds{$_} = 1; } @newcustom;
+        }
+        my %imgdeletions;
+        my @todeleteimages = &Apache::loncommon::get_env_multiple('form.ltitools_image_del');
+        if (@todeleteimages) {
+            map { $imgdeletions{$_} = 1; } @todeleteimages;
+        }
+        my $maxnum = $env{'form.ltitools_maxnum'};
+        for (my $i=0; $i<=$maxnum; $i++) {
+            my $itemid = $env{'form.ltitools_id_'.$i};
+            if (ref($domconfig{$action}{$itemid}) eq 'HASH') {
+                if ($deletions{$itemid}) {
+                    if ($domconfig{$action}{$itemid}{'image'}) {
+                        #FIXME need to obsolete item in RES space
+                    }
+                    $changes{$itemid} = $domconfig{$action}{$itemid}{'title'};
+                    next;
+                } else {
+                    my $newpos = $env{'form.ltitools_'.$itemid};
+                    $newpos =~ s/\D+//g;
+                    foreach my $item ('title','url') {
+                        $confhash{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i};
+                        if ($domconfig{$action}{$itemid}{$item} ne $confhash{$itemid}{$item}) {
+                            $changes{$itemid} = 1;
+                        }
+                    }
+                    foreach my $item ('key','secret') {
+                        $encconfig{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i};
+                        if ($domconfig{$action}{$itemid}{$item} ne $encconfig{$itemid}{$item}) {
+                            $changes{$itemid} = 1;
+                        }
+                    }
+                    if ($env{'form.ltitools_version_'.$i} eq 'LTI-1p0') {
+                        $confhash{$itemid}{'version'} = $env{'form.ltitools_version_'.$i};
+                    }
+                    if ($env{'form.ltitools_msgtype_'.$i} eq 'basic-lti-launch-request') {
+                        $confhash{$itemid}{'msgtype'} = $env{'form.ltitools_msgtype_'.$i};
+                    }
+                    foreach my $size ('width','height') {
+                        $env{'form.ltitools_'.$size.'_'.$i} =~ s/^\s+//;
+                        $env{'form.ltitools_'.$size.'_'.$i} =~ s/\s+$//;
+                        if ($env{'form.ltitools_'.$size.'_'.$i} =~ /^\d+$/) {
+                            $confhash{$itemid}{'display'}{$size} = $env{'form.ltitools_'.$size.'_'.$i};
+                            if (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') {
+                                if ($domconfig{$action}{$itemid}{'display'}{$size} ne $confhash{$itemid}{'display'}{$size}) {
+                                    $changes{$itemid} = 1;
+                                }
+                            } else {
+                                $changes{$itemid} = 1;
+                            }
+                        } elsif (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') {
+                            if ($domconfig{$action}{$itemid}{'display'}{$size} ne '') {
+                                $changes{$itemid} = 1;
+                            }
+                        }
+                    }
+                    foreach my $item ('linktext','explanation') {
+                        $env{'form.ltitools_'.$item.'_'.$i} =~ s/^\s+//;
+                        $env{'form.ltitools_'.$item.'_'.$i} =~ s/\s+$//;
+                        if ($env{'form.ltitools_'.$item.'_'.$i} ne '') {
+                            $confhash{$itemid}{'display'}{$item} = $env{'form.ltitools_'.$item.'_'.$i};
+                            if (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') {
+                                if ($domconfig{$action}{$itemid}{'display'}{$item} ne $confhash{$itemid}{'display'}{$item}) {
+                                    $changes{$itemid} = 1;
+                                }
+                            } else {
+                                $changes{$itemid} = 1;
+                            }
+                        } elsif (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') {
+                            if ($domconfig{$action}{$itemid}{'display'}{$item} ne '') {
+                                $changes{$itemid} = 1;
+                            }
+                        }
+                    }
+                    if ($env{'form.ltitools_target_'.$i} eq 'window') {
+                        $confhash{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i};
+                    } elsif ($env{'form.ltitools_target_'.$i} eq 'tab') {
+                        $confhash{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i};
+                    } else {
+                        $confhash{$itemid}{'display'}{'target'} = 'iframe';
+                    }
+                    if (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') {
+                        if ($domconfig{$action}{$itemid}{'display'}{'target'} ne $confhash{$itemid}{'display'}{'target'}) {
+                            $changes{$itemid} = 1;
+                        }
+                    } else {
+                        $changes{$itemid} = 1;
+                    }
+                    foreach my $extra ('passback','roster') {
+                        if ($env{'form.ltitools_'.$extra.'_'.$i}) {
+                            $confhash{$itemid}{$extra} = 1;
+                        }
+                        if ($domconfig{$action}{$itemid}{$extra} ne $confhash{$itemid}{$extra}) {
+                            $changes{$itemid} = 1;
+                        }
+                    }
+                    my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig_'.$i);
+                    foreach my $item ('label','title','target','linktext','explanation') {
+                        if (grep(/^\Q$item\E$/,@courseconfig)) {
+                            $confhash{$itemid}{'crsconf'}{$item} = 1;
+                            if (ref($domconfig{$action}{$itemid}{'crsconf'}) eq 'HASH') {
+                                if ($domconfig{$action}{$itemid}{'crsconf'}{$item} ne $confhash{$itemid}{'crsconf'}{$item}) {
+                                    $changes{$itemid} = 1;
+                                }
+                            } else {
+                                $changes{$itemid} = 1;
+                            }
+                        }
+                    }
+                    my @fields = &Apache::loncommon::get_env_multiple('form.ltitools_fields_'.$i);
+                    foreach my $field (@fields) {
+                        if ($possfield{$field}) {
+                            if ($field eq 'roles') {
+                                foreach my $role (@courseroles) {
+                                    my $choice = $env{'form.ltitools_roles_'.$role.'_'.$i};
+                                    if (($choice ne '') && ($posslti{$choice})) {
+                                        $confhash{$itemid}{'roles'}{$role} = $choice;
+                                        if ($role eq 'cc') {
+                                            $confhash{$itemid}{'roles'}{'co'} = $choice;
+                                        }
+                                    }
+                                    if (ref($domconfig{$action}{$itemid}{'roles'}) eq 'HASH') {
+                                        if ($domconfig{$action}{$itemid}{'roles'}{$role} ne $confhash{$itemid}{'roles'}{$role}) {
+                                            $changes{$itemid} = 1;
+                                        }
+                                    } elsif ($confhash{$itemid}{'roles'}{$role}) {
+                                        $changes{$itemid} = 1;
+                                    }
+                                }
+                            } else {
+                                $confhash{$itemid}{'fields'}{$field} = 1;
+                                if (ref($domconfig{$action}{$itemid}{'fields'}) eq 'HASH') {
+                                    if ($domconfig{$action}{$itemid}{'fields'}{$field} ne $confhash{$itemid}{'fields'}{$field}) {
+                                        $changes{$itemid} = 1;
+                                    }
+                                } else {
+                                    $changes{$itemid} = 1;
+                                }
+                            }
+                        }
+                    }
+                    $allpos[$newpos] = $itemid;
+                }
+                if ($imgdeletions{$itemid}) {
+                    $changes{$itemid} = 1;
+                    #FIXME need to obsolete item in RES space
+                } elsif ($env{'form.ltitools_image_'.$i.'.filename'}) {
+                    my ($imgurl,$error) = &process_ltitools_image($r,$dom,$confname,'ltitools_image_'.$i,
+                                                                 $itemid,$configuserok,$switchserver,
+                                                                 $author_ok);
+                    if ($imgurl) {
+                        $confhash{$itemid}{'image'} = $imgurl;
+                        $changes{$itemid} = 1;
+                    }
+                    if ($error) {
+                        &Apache::lonnet::logthis($error);
+                        $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+                    }
+                } elsif ($domconfig{$action}{$itemid}{'image'}) {
+                    $confhash{$itemid}{'image'} =
+                       $domconfig{$action}{$itemid}{'image'};
+                }
+                if ($customadds{$i}) {
+                    my $name = $env{'form.ltitools_custom_name_'.$i};
+                    $name =~ s/(`)/'/g;
+                    $name =~ s/^\s+//;
+                    $name =~ s/\s+$//;
+                    my $value = $env{'form.ltitools_custom_value_'.$i};
+                    $value =~ s/(`)/'/g;
+                    $value =~ s/^\s+//;
+                    $value =~ s/\s+$//;
+                    if ($name ne '') {
+                        $confhash{$itemid}{'custom'}{$name} = $value;
+                        $changes{$itemid} = 1;
+                    }
+                }
+                my %customdels;
+                my @customdeletions = &Apache::loncommon::get_env_multiple('form.ltitools_customdel_'.$i);
+                if (@customdeletions) {
+                    $changes{$itemid} = 1;
+                }
+                map { $customdels{$_} = 1; } @customdeletions;
+                if (ref($domconfig{$action}{$itemid}{'custom'}) eq 'HASH') {
+                    foreach my $key (keys(%{$domconfig{$action}{$itemid}{'custom'}})) {
+                        unless ($customdels{$key}) {
+                            if ($env{'form.ltitools_customval_'.$key.'_'.$i} ne '') {
+                                $confhash{$itemid}{'custom'}{$key} = $env{'form.ltitools_customval_'.$key.'_'.$i};
+                            }
+                            if ($domconfig{$action}{$itemid}{'custom'}{$key} ne $env{'form.ltitools_customval_'.$key.'_'.$i}) {
+                                $changes{$itemid} = 1;
+                            }
+                        }
+                    }
+                }
+                unless ($changes{$itemid}) {
+                    foreach my $key (keys(%{$domconfig{$action}{$itemid}})) {
+                        if (ref($domconfig{$action}{$itemid}{$key}) eq 'HASH') {
+                            if (ref($confhash{$itemid}{$key}) eq 'HASH') {
+                                foreach my $innerkey (keys(%{$domconfig{$action}{$itemid}{$key}})) {
+                                    unless (exists($confhash{$itemid}{$key}{$innerkey})) {
+                                        $changes{$itemid} = 1;
+                                        last;
+                                    }
+                                }
+                            } elsif (keys(%{$domconfig{$action}{$itemid}{$key}}) > 0) {
+                                $changes{$itemid} = 1;
+                            }
+                        }
+                        last if ($changes{$itemid});
+                    }
+                }
+            }
+        }
+    }
+    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 %ltitoolshash = (
+                          $action => { %confhash }
+                       );
+    my $putresult = &Apache::lonnet::put_dom('configuration',\%ltitoolshash,
+                                             $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('ltitools',$dom,\%ltiall,$cachetime);
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'ltitools'} = 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}{'title'}.'</b>';
+                    if ($confhash{$itemid}{'image'}) {
+                        $resulttext .= '&nbsp;'.
+                                       '<img src="'.$confhash{$itemid}{'image'}.'"'.
+                                       ' alt="'.&mt('Tool Provider icon').'" />';
+                    }
+                    $resulttext .= '</li><ul>';
+                    my $position = $pos + 1;
+                    $resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>';
+                    foreach my $item ('version','msgtype','url') {
+                        if ($confhash{$itemid}{$item} ne '') {
+                            $resulttext .= '<li>'.$lt{$item}.':&nbsp;'.$confhash{$itemid}{$item}.'</li>';
+                        }
+                    }
+                    if ($encconfig{$itemid}{'key'} ne '') {
+                        $resulttext .= '<li>'.$lt{'key'}.':&nbsp;'.$encconfig{$itemid}{'key'}.'</li>';
+                    }
+                    if ($encconfig{$itemid}{'secret'} ne '') {
+                        $resulttext .= '<li>'.$lt{'secret'}.':&nbsp;';
+                        my $num = length($encconfig{$itemid}{'secret'});
+                        $resulttext .= ('*'x$num).'</li>';
+                    }
+                    $resulttext .= '<li>'.&mt('Configurable in course:');
+                    my @possconfig = ('label','title','target','linktext','explanation');
+                    my $numconfig = 0;
+                    if (ref($confhash{$itemid}{'crsconf'}) eq 'HASH') {
+                        foreach my $item (@possconfig) {
+                            if ($confhash{$itemid}{'crsconf'}{$item}) {
+                                $numconfig ++;
+                                $resulttext .= ' "'.$lt{'crs'.$item}.'"';
+                            }
+                        }
+                    }
+                    if (!$numconfig) {
+                        $resulttext .= &mt('None');
+                    }
+                    $resulttext .= '</li>';
+                    foreach my $item ('passback','roster') {
+                        $resulttext .= '<li>'.$lt{$item}.'&nbsp;';
+                        if ($confhash{$itemid}{$item}) {
+                            $resulttext .= &mt('Yes');
+                        } else {
+                            $resulttext .= &mt('No');
+                        }
+                        $resulttext .= '</li>';
+                    }
+                    if (ref($confhash{$itemid}{'display'}) eq 'HASH') {
+                        my $displaylist;
+                        if ($confhash{$itemid}{'display'}{'target'}) {
+                            $displaylist = &mt('Display target').':&nbsp;'.
+                                           $confhash{$itemid}{'display'}{'target'}.',';
+                        }
+                        foreach my $size ('width','height') {
+                            if ($confhash{$itemid}{'display'}{$size}) {
+                                $displaylist .= ('&nbsp;'x2).$lt{$size}.':&nbsp;'.
+                                                $confhash{$itemid}{'display'}{$size}.',';
+                            }
+                        }
+                        if ($displaylist) {
+                            $displaylist =~ s/,$//;
+                            $resulttext .= '<li>'.$displaylist.'</li>';
+                        }
+                        foreach my $item ('linktext','explanation') {
+                            if ($confhash{$itemid}{'display'}{$item}) {
+                                $resulttext .= '<li>'.$lt{$item}.':&nbsp;'.$confhash{$itemid}{'display'}{$item}.'</li>';
+                            }
+                        }
+                    }
+                    if (ref($confhash{$itemid}{'fields'}) eq 'HASH') {
+                        my $fieldlist;
+                        foreach my $field (@allfields) {
+                            if ($confhash{$itemid}{'fields'}{$field}) {
+                                $fieldlist .= ('&nbsp;'x2).$lt{$field}.',';
+                            }
+                        }
+                        if ($fieldlist) {
+                            $fieldlist =~ s/,$//;
+                            $resulttext .= '<li>'.&mt('Data sent').':'.$fieldlist.'</li>';
+                        }
+                    }
+                    if (ref($confhash{$itemid}{'roles'}) eq 'HASH') {
+                        my $rolemaps;
+                        foreach my $role (@courseroles) {
+                            if ($confhash{$itemid}{'roles'}{$role}) {
+                                $rolemaps .= ('&nbsp;'x2).&Apache::lonnet::plaintext($role,'Course').'='.
+                                             $confhash{$itemid}{'roles'}{$role}.',';
+                            }
+                        }
+                        if ($rolemaps) {
+                            $rolemaps =~ s/,$//;
+                            $resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>';
+                        }
+                    }
+                    if (ref($confhash{$itemid}{'custom'}) eq 'HASH') {
+                        my $customlist;
+                        if (keys(%{$confhash{$itemid}{'custom'}})) {
+                            foreach my $key (sort(keys(%{$confhash{$itemid}{'custom'}}))) {
+                                $customlist .= $key.':'.$confhash{$itemid}{'custom'}{$key}.('&nbsp;'x2);
+                            }
+                        }
+                        if ($customlist) {
+                            $resulttext .= '<li>'.&mt('Custom items').':'.$customlist.'</li>';
+                        }
+                    }
+                    $resulttext .= '</ul></li>';
+                }
+            }
+            $resulttext .= '</ul>';
+        } else {
+            $resulttext = &mt('No changes made.');
+        }
+    } else {
+        $errors .= '<li><span class="LC_error">'.&mt('Failed to save changes').'</span></li>';
+    }
+    if ($errors) {
+        $resulttext .= &mt('The following errors occurred: ').'<ul>'.
+                       $errors.'</ul>';
+    }
+    return $resulttext;
+}
+
+sub process_ltitools_image {
+    my ($r,$dom,$confname,$caller,$itemid,$configuserok,$switchserver,$author_ok) = @_;
+    my $filename = $env{'form.'.$caller.'.filename'};
+    my ($error,$url);
+    my ($width,$height) = (21,21);
+    if ($configuserok eq 'ok') {
+        if ($switchserver) {
+            $error = &mt('Upload of Tool Provider (LTI) icon is not permitted to this server: [_1]',
+                         $switchserver);
+        } elsif ($author_ok eq 'ok') {
+            my ($result,$imageurl,$madethumb) =
+                &publishlogo($r,'upload',$caller,$dom,$confname,
+                             "ltitools/$itemid/icon",$width,$height);
+            if ($result eq 'ok') {
+                if ($madethumb) {
+                    my ($path,$imagefile) = ($imageurl =~ m{^(.+)/([^/]+)$});
+                    my $imagethumb = "$path/tn-".$imagefile;
+                    $url = $imagethumb;
+                } else {
+                    $url = $imageurl;
+                }
+            } else {
+                $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result);
+            }
+        } else {
+            $error = &mt("Upload of [_1] failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3].  Error was: [_4].",$filename,$confname,$dom,$author_ok);
+        }
+    } else {
+        $error = &mt("Upload of [_1] failed because a Domain Configuration user ([_2]) could not be created in domain: [_3].  Error was: [_4].",$filename,$confname,$dom,$configuserok);
+    }
+    return ($url,$error);
+}
+
+sub get_ltitools_id {
+    my ($cdom,$title) = @_;
+    # get lock on ltitools db
+    my $lockhash = {
+                      lock => $env{'user.name'}.
+                              ':'.$env{'user.domain'},
+                   };
+    my $tries = 0;
+    my $gotlock = &Apache::lonnet::newput_dom('ltitools',$lockhash,$cdom);
+    my ($id,$error);
+
+    while (($gotlock ne 'ok') && ($tries<10)) {
+        $tries ++;
+        sleep (0.1);
+        $gotlock = &Apache::lonnet::newput_dom('ltitools',$lockhash,$cdom);
+    }
+    if ($gotlock eq 'ok') {
+        my %currids = &Apache::lonnet::dump_dom('ltitools',$cdom);
+        if ($currids{'lock'}) {
+            delete($currids{'lock'});
+            if (keys(%currids)) {
+                my @curr = sort { $a <=> $b } keys(%currids);
+                if ($curr[-1] =~ /^\d+$/) {
+                    $id = 1 + $curr[-1];
+                }
+            } else {
+                $id = 1;
+            }
+            if ($id) {
+                unless (&Apache::lonnet::newput_dom('ltitools',{ $id => $title },$cdom) eq 'ok') {
+                    $error = 'nostore';
+                }
+            } else {
+                $error = 'nonumber';
+            }
+        }
+        my $dellockoutcome = &Apache::lonnet::del_dom('ltitools',['lock'],$cdom);
+    } else {
+        $error = 'nolock';
+    }
+    return ($id,$error);
+}
+
 sub modify_autoenroll {
     my ($dom,$lastactref,%domconfig) = @_;
     my ($resulttext,%changes);
@@ -7864,7 +9923,8 @@ sub modify_autoenroll {
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
     my %title = ( run => 'Auto-enrollment active',
                   sender => 'Sender for notification messages',
-                  coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)');
+                  coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)',
+                  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'};
@@ -7874,11 +9934,17 @@ sub modify_autoenroll {
         $sender_domain = '';
     }
     my $coowners = $env{'form.autoassign_coowners'};
+    my $failsafe = $env{'form.autoenroll_failsafe'};
+    $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' => $failsafe,
                                 }
                      );
     my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash,
@@ -7905,7 +9971,10 @@ sub modify_autoenroll {
             }
         } elsif ($coowners) {
             $changes{'coowners'} = 1;
-        }      
+        }
+        if ($currautoenroll{'autofailsafe'} ne $failsafe) {
+            $changes{'autofailsafe'} = 1;
+        }
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'run'}) {
@@ -7925,6 +9994,17 @@ sub modify_autoenroll {
                     $lastactref->{'domainconfig'} = 1;
                 }
             }
+            if ($changes{'autofailsafe'}) {
+                if ($failsafe ne '') {
+                    $resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section set to: [_1]',$failsafe).'</li>';
+                } else {
+                    $resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section: deleted');
+                }
+                &Apache::lonnet::get_domain_defaults($dom,1);
+                if (ref($lastactref) eq 'HASH') {
+                    $lastactref->{'domdefaults'} = 1;
+                }
+            }
             $resulttext .= '</ul>';
         } else {
             $resulttext = &mt('No changes made to auto-enrollment settings');
@@ -8140,7 +10220,7 @@ sub modify_autocreate {
         $newvals{$item} = 0 if ($newvals{$item} eq '');
     }
     $newvals{'xmldc'} = $env{'form.autocreate_xmldc'};
-    my %domcoords = &get_active_dcs($dom);
+    my %domcoords = &Apache::lonnet::get_active_domroles($dom,['dc']);
     unless (exists($domcoords{$newvals{'xmldc'}})) {
         $newvals{'xmldc'} = '';
     } 
@@ -8197,7 +10277,7 @@ sub modify_autocreate {
 }
 
 sub modify_directorysrch {
-    my ($dom,%domconfig) = @_;
+    my ($dom,$lastactref,%domconfig) = @_;
     my ($resulttext,%changes);
     my %currdirsrch;
     if (ref($domconfig{'directorysrch'}) eq 'HASH') {
@@ -8205,8 +10285,10 @@ sub modify_directorysrch {
             $currdirsrch{$key} = $domconfig{'directorysrch'}{$key};
         }
     }
-    my %title = ( available => 'Directory search available',
-                  localonly => 'Other domains can search',
+    my %title = ( available => 'Institutional directory search available',
+                  localonly => 'Other domains can search institution',
+                  lcavailable => 'LON-CAPA directory search available',
+                  lclocalonly => 'Other domains can search LON-CAPA domain',
                   searchby => 'Search types',
                   searchtypes => 'Search latitude');
     my @offon = ('off','on');
@@ -8280,7 +10362,9 @@ sub modify_directorysrch {
     my %dirsrch_hash =  (
             directorysrch => { available => $env{'form.dirsrch_available'},
                                cansearch => \@cansearch,
-                               localonly => $env{'form.dirsrch_localonly'},
+                               localonly => $env{'form.dirsrch_instlocalonly'},
+                               lclocalonly => $env{'form.dirsrch_domlocalonly'},
+                               lcavailable => $env{'form.dirsrch_domavailable'},
                                searchby => \@searchby,
                                searchtypes => \@searchtypes,
                              }
@@ -8297,24 +10381,47 @@ sub modify_directorysrch {
                 $changes{'available'} = 1;
             }
         }
+        if (exists($currdirsrch{'lcavailable'})) {
+            if ($currdirsrch{'lcavailable'} ne $env{'form.dirsrch_domavailable'}) {
+                $changes{'lcavailable'} = 1;
+            }
+        } else {
+            if ($env{'form.dirsrch_lcavailable'} eq '1') {
+                $changes{'lcavailable'} = 1;
+            }
+        }
         if (exists($currdirsrch{'localonly'})) {
-             if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_localonly'}) {
-                 $changes{'localonly'} = 1;
-             }
+            if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_instlocalonly'}) {
+                $changes{'localonly'} = 1;
+            }
         } else {
-            if ($env{'form.dirsrch_localonly'} eq '1') {
+            if ($env{'form.dirsrch_instlocalonly'} eq '1') {
                 $changes{'localonly'} = 1;
             }
         }
+        if (exists($currdirsrch{'lclocalonly'})) {
+            if ($currdirsrch{'lclocalonly'} ne $env{'form.dirsrch_domlocalonly'}) {
+                $changes{'lclocalonly'} = 1;
+            }
+        } else {
+            if ($env{'form.dirsrch_domlocalonly'} eq '1') {
+                $changes{'lclocalonly'} = 1;
+            }
+        }
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'available'}) {
                 $resulttext .= '<li>'.&mt("$title{'available'} set to: $offon[$env{'form.dirsrch_available'}]").'</li>';
             }
+            if ($changes{'lcavailable'}) {
+                $resulttext .= '<li>'.&mt("$title{'lcavailable'} set to: $offon[$env{'form.dirsrch_domavailable'}]").'</li>';
+            }
             if ($changes{'localonly'}) {
-                $resulttext .= '<li>'.&mt("$title{'localonly'} set to: $otherdoms[$env{'form.dirsrch_localonly'}]").'</li>';
+                $resulttext .= '<li>'.&mt("$title{'localonly'} set to: $otherdoms[$env{'form.dirsrch_instlocalonly'}]").'</li>';
+            }
+            if ($changes{'lclocalonly'}) {
+                $resulttext .= '<li>'.&mt("$title{'lclocalonly'} set to: $otherdoms[$env{'form.dirsrch_domlocalonly'}]").'</li>';
             }
-
             if (ref($changes{'cansearch'}) eq 'ARRAY') {
                 my $chgtext;
                 if (ref($usertypes) eq 'HASH') {
@@ -8364,8 +10471,12 @@ sub modify_directorysrch {
                 $resulttext .= '<li>'.&mt($title{'searchtypes'}.' set to: "[_1]"',$chgtext).'</li>';
             }
             $resulttext .= '</ul>';
+            &Apache::lonnet::do_cache_new('directorysrch',$dom,$dirsrch_hash{'directorysrch'},3600);
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'directorysrch'} = 1;
+            }
         } else {
-            $resulttext = &mt('No changes made to institution directory search settings');
+            $resulttext = &mt('No changes made to directory search settings');
         }
     } else {
         $resulttext = '<span class="LC_error">'.
@@ -8382,11 +10493,12 @@ sub modify_contacts {
             $currsetting{$key} = $domconfig{'contacts'}{$key};
         }
     }
-    my (%others,%to,%bcc);
+    my (%others,%to,%bcc,%includestr,%includeloc);
     my @contacts = ('supportemail','adminemail');
-    my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail',
-                    'requestsmail','updatesmail','idconflictsmail');
+    my @mailings = ('errormail','packagesmail','helpdeskmail','otherdomsmail',
+                    'lonstatusmail','requestsmail','updatesmail','idconflictsmail');
     my @toggles = ('reporterrors','reportupdates');
+    my ($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields();
     foreach my $type (@mailings) {
         @{$newsetting{$type}} = 
             &Apache::loncommon::get_env_multiple('form.'.$type);
@@ -8396,12 +10508,17 @@ sub modify_contacts {
             } else {
                 $contacts_hash{contacts}{$type}{$item} = 0;
             }
-        }  
+        }
         $others{$type} = $env{'form.'.$type.'_others'};
         $contacts_hash{contacts}{$type}{'others'} = $others{$type};
-        if ($type eq 'helpdeskmail') {
+        if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
             $bcc{$type} = $env{'form.'.$type.'_bcc'};
             $contacts_hash{contacts}{$type}{'bcc'} = $bcc{$type};
+            if (($env{'form.'.$type.'_includestr'} ne '') && ($env{'form.'.$type.'_includeloc'} =~ /^s|b$/)) {
+                $includestr{$type} = $env{'form.'.$type.'_includestr'};
+                $includeloc{$type} = $env{'form.'.$type.'_includeloc'};
+                $contacts_hash{contacts}{$type}{'include'} = $includeloc{$type}.':'.&escape($includestr{$type});
+            }
         }
     }
     foreach my $item (@contacts) {
@@ -8413,6 +10530,63 @@ sub modify_contacts {
             $contacts_hash{'contacts'}{$item} = $env{'form.'.$item};
         }
     }
+    if ((ref($fields) eq 'ARRAY') && (ref($possoptions) eq 'HASH')) {
+        foreach my $field (@{$fields}) {
+            if (ref($possoptions->{$field}) eq 'ARRAY') {
+                my $value = $env{'form.helpform_'.$field};
+                $value =~ s/^\s+|\s+$//g;
+                if (grep(/^\Q$value\E$/,@{$possoptions->{$field}})) {
+                    $contacts_hash{'contacts'}{'helpform'}{$field} = $value;
+                    if ($field eq 'screenshot') {
+                        $env{'form.helpform_maxsize'} =~ s/^\s+|\s+$//g;
+                        if ($env{'form.helpform_maxsize'} =~ /^\d+\.?\d*$/) {
+                            $contacts_hash{'contacts'}{'helpform'}{'maxsize'} = $env{'form.helpform_maxsize'};
+                        }
+                    }
+                }
+            }
+        }
+    }
+    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+    my (@statuses,%usertypeshash,@overrides);
+    if ((ref($types) eq 'ARRAY') && (@{$types} > 0)) {
+        @statuses = @{$types};
+        if (ref($usertypes) eq 'HASH') {
+            %usertypeshash = %{$usertypes};
+        }
+    }
+    if (@statuses) {
+        my @possoverrides = &Apache::loncommon::get_env_multiple('form.overrides');
+        foreach my $type (@possoverrides) {
+            if (($type ne '') && (grep(/^\Q$type\E$/,@statuses))) {
+                push(@overrides,$type);
+            }
+        }
+        if (@overrides) {
+            foreach my $type (@overrides) {
+                my @standard = &Apache::loncommon::get_env_multiple('form.override_'.$type);
+                foreach my $item (@contacts) {
+                    if (grep(/^\Q$item\E$/,@standard)) {
+                        $contacts_hash{'contacts'}{'overrides'}{$type}{$item} = 1;
+                        $newsetting{'override_'.$type}{$item} = 1;
+                    } else {
+                        $contacts_hash{'contacts'}{'overrides'}{$type}{$item} = 0;
+                        $newsetting{'override_'.$type}{$item} = 0;
+                    }
+                }
+                $contacts_hash{'contacts'}{'overrides'}{$type}{'others'} = $env{'form.override_'.$type.'_others'};
+                $contacts_hash{'contacts'}{'overrides'}{$type}{'bcc'} = $env{'form.override_'.$type.'_bcc'};
+                $newsetting{'override_'.$type}{'others'} = $env{'form.override_'.$type.'_others'};
+                $newsetting{'override_'.$type}{'bcc'} = $env{'form.override_'.$type.'_bcc'};
+                if (($env{'form.override_'.$type.'_includestr'} ne '') && ($env{'form.override_'.$type.'_includeloc'} =~ /^s|b$/)) {
+                    $includestr{$type} = $env{'form.override_'.$type.'_includestr'};
+                    $includeloc{$type} = $env{'form.override_'.$type.'_includeloc'};
+                    $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) {
         foreach my $item (@contacts) {
             if ($to{$item} ne $currsetting{$item}) {
@@ -8432,10 +10606,66 @@ sub modify_contacts {
             if ($others{$type} ne $currsetting{$type}{'others'}) {
                 push(@{$changes{$type}},'others');
             }
-            if ($type eq 'helpdeskmail') {   
+            if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
                 if ($bcc{$type} ne $currsetting{$type}{'bcc'}) {
                     push(@{$changes{$type}},'bcc'); 
                 }
+                my ($currloc,$currstr) = split(/:/,$currsetting{$type}{'include'},2);
+                if (($includeloc{$type} ne $currloc) || (&escape($includestr{$type}) ne $currstr)) {
+                    push(@{$changes{$type}},'include');
+                }
+            }
+        }
+        if (ref($fields) eq 'ARRAY') {
+            if (ref($currsetting{'helpform'}) eq 'HASH') {
+                foreach my $field (@{$fields}) {
+                    if ($currsetting{'helpform'}{$field} ne $contacts_hash{'contacts'}{'helpform'}{$field}) {
+                        push(@{$changes{'helpform'}},$field);
+                    }
+                    if (($field eq 'screenshot') && ($contacts_hash{'contacts'}{'helpform'}{'screenshot'} ne 'no')) {
+                        if ($currsetting{'helpform'}{'maxsize'} ne $contacts_hash{'contacts'}{'helpform'}{'maxsize'}) {
+                            push(@{$changes{'helpform'}},'maxsize');
+                        }
+                    }
+                }
+            } else {
+                foreach my $field (@{$fields}) {
+                    if ($contacts_hash{'contacts'}{'helpform'}{$field} ne 'yes') {
+                        push(@{$changes{'helpform'}},$field);
+                    }
+                    if (($field eq 'screenshot') && ($contacts_hash{'contacts'}{'helpform'}{'screenshot'} ne 'no')) {
+                        if ($contacts_hash{'contacts'}{'helpform'}{'maxsize'} != 1) {
+                            push(@{$changes{'helpform'}},'maxsize');
+                        }
+                    }
+                }
+            }
+        }
+        if (@statuses) {
+            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}) {
+                                    push(@{$changes{'overrides'}},$key);
+                                    last;
+                                }
+                            }
+                        } else {
+                            push(@{$changes{'overrides'}},$key);
+                        }
+                    }
+                }
+                foreach my $key (@overrides) {
+                    unless (exists($currsetting{'overrides'}{$key})) {
+                        push(@{$changes{'overrides'}},$key);
+                    }
+                }
+            } else {
+                foreach my $key (@overrides) {
+                    push(@{$changes{'overrides'}},$key);
+                }
             }
         }
     } else {
@@ -8445,26 +10675,41 @@ sub modify_contacts {
         $default{'errormail'} = 'adminemail';
         $default{'packagesmail'} = 'adminemail';
         $default{'helpdeskmail'} = 'supportemail';
+        $default{'otherdomsmail'} = 'supportemail';
         $default{'lonstatusmail'} = 'adminemail';
         $default{'requestsmail'} = 'adminemail';
         $default{'updatesmail'} = 'adminemail';
         foreach my $item (@contacts) {
            if ($to{$item} ne $default{$item}) {
-              $changes{$item} = 1;
+               $changes{$item} = 1;
            }
         }
         foreach my $type (@mailings) {
             if ((@{$newsetting{$type}} != 1) || ($newsetting{$type}[0] ne $default{$type})) {
-               
                 push(@{$changes{$type}},@{$newsetting{$type}});
             }
             if ($others{$type} ne '') {
                 push(@{$changes{$type}},'others');
             }
-            if ($type eq 'helpdeskmail') {
+            if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
                 if ($bcc{$type} ne '') {
                     push(@{$changes{$type}},'bcc');
                 }
+                if (($includeloc{$type} =~ /^b|s$/) && ($includestr{$type} ne '')) {
+                    push(@{$changes{$type}},'include');
+                }
+            }
+        }
+        if (ref($fields) eq 'ARRAY') {
+            foreach my $field (@{$fields}) {
+                if ($contacts_hash{'contacts'}{'helpform'}{$field} ne 'yes') {
+                    push(@{$changes{'helpform'}},$field);
+                }
+                if (($field eq 'screenshot') && ($contacts_hash{'contacts'}{'helpform'}{'screenshot'} ne 'no')) {
+                    if ($contacts_hash{'contacts'}{'helpform'}{'maxsize'} != 1) {
+                        push(@{$changes{'helpform'}},'maxsize');
+                    }
+                }
             }
         }
     }
@@ -8496,7 +10741,11 @@ sub modify_contacts {
             }
             foreach my $type (@mailings) {
                 if (ref($changes{$type}) eq 'ARRAY') {
-                    $resulttext .= '<li>'.$titles->{$type}.': ';
+                    if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
+                        $resulttext .= '<li>'.$titles->{$type}.' -- '.&mt('sent to').': ';
+                    } else {
+                        $resulttext .= '<li>'.$titles->{$type}.': ';
+                    }
                     my @text;
                     foreach my $item (@{$newsetting{$type}}) {
                         push(@text,$short_titles->{$item});
@@ -8504,16 +10753,89 @@ sub modify_contacts {
                     if ($others{$type} ne '') {
                         push(@text,$others{$type});
                     }
-                    $resulttext .= '<span class="LC_cusr_emph">'.
-                                   join(', ',@text).'</span>';
-                    if ($type eq 'helpdeskmail') {
+                    if (@text) {
+                        $resulttext .= '<span class="LC_cusr_emph">'.
+                                       join(', ',@text).'</span>';
+                    }
+                    if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
                         if ($bcc{$type} ne '') {
-                            $resulttext .= '&nbsp;'.&mt('with Bcc to').': <span class="LC_cusr_emph">'.$bcc{$type}.'</span>';
+                            my $bcctext;
+                            if (@text) {
+                                $bcctext = '&nbsp;'.&mt('with Bcc to');
+                            } else {
+                                $bcctext = '(Bcc)';
+                            }
+                            $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};
+                            } elsif ($includeloc{$type} eq 's') {
+                                $resulttext .= '<br />'.&mt('Text automatically added to e-mail subject:').' '.$includestr{$type};
+                            }
                         }
+                    } elsif (!@text) {
+                        $resulttext .= &mt('No recipients');
                     }
                     $resulttext .= '</li>';
                 }
             }
+            if (ref($changes{'overrides'}) eq 'ARRAY') {
+                my @deletions;
+                foreach my $type (@{$changes{'overrides'}}) {
+                    if ($usertypeshash{$type}) {
+                        if (grep(/^\Q$type\E/,@overrides)) {
+                            $resulttext .= '<li>'.&mt("Overrides based on requester's affiliation set for [_1]",
+                                                      $usertypeshash{$type}).'<ul><li>';
+                            if (ref($newsetting{'override_'.$type}) eq 'HASH') {
+                                my @text;
+                                foreach my $item (@contacts) {
+                                    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>');
+                                }
+                                if ($newsetting{'override_'.$type}{'bcc'} ne '') {
+                                    my $bcctext;
+                                    if (@text) {
+                                        $bcctext = '&nbsp;'.&mt('with Bcc to');
+                                    } else {
+                                        $bcctext = '(Bcc)';
+                                    }
+                                    $resulttext .= $bcctext.': <span class="LC_cusr_emph">'.$newsetting{'override_'.$type}{'bcc'}.'</span>';
+                                } elsif (!@text) {
+                                     $resulttext .= &mt('Helpdesk e-mail sent to no one');
+                                }
+                                $resulttext .= '</li>';
+                                if ($newsetting{'override_'.$type}{'include'} ne '') {
+                                    my ($loc,$str) = split(/:/,$newsetting{'override_'.$type}{'include'});
+                                    if ($loc eq 'b') {
+                                        $resulttext .= '<li>'.&mt('Text automatically added to e-mail body:').' '.&unescape($str).'</li>';
+                                    } elsif ($loc eq 's') {
+                                        $resulttext .= '<li>'.&mt('Text automatically added to e-mail subject:').' '.&unescape($str).'</li>';
+                                    }
+                                }
+                            }
+                            $resulttext .= '</li></ul></li>';
+                        } else {
+                            push(@deletions,$usertypeshash{$type});
+                        }
+                    }
+                }
+                if (@deletions) {
+                    $resulttext .= '<li>'.&mt("Overrides based on requester's affiliation discontinued for: [_1]",
+                                              join(', ',@deletions)).'</li>';
+                }
+            }
             my @offon = ('off','on');
             if ($changes{'reporterrors'}) {
                 $resulttext .= '<li>'.
@@ -8531,9 +10853,49 @@ sub modify_contacts {
                                         &mt('LON-CAPA core group - MSU'),600,500)).
                                 '</li>';
             }
+            if ((ref($changes{'helpform'}) eq 'ARRAY') && (ref($fields) eq 'ARRAY')) {
+                my (@optional,@required,@unused,$maxsizechg);
+                foreach my $field (@{$changes{'helpform'}}) {
+                    if ($field eq 'maxsize') {
+                        $maxsizechg = 1;
+                        next;
+                    }
+                    if ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'yes') {
+                        push(@optional,$field);
+                    } elsif ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'no') {
+                        push(@unused,$field);
+                    } elsif ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'req') {
+                        push(@required,$field);
+                    }
+                }
+                if (@optional) {
+                    $resulttext .= '<li>'.
+                                   &mt('Help form fields changed to "Optional": [_1].',
+                                       '<span class="LC_cusr_emph">'.join(', ',map { $fieldtitles->{$_}; } @optional)).'</span>'.
+                                   '</li>';
+                }
+                if (@required) {
+                    $resulttext .= '<li>'.
+                                   &mt('Help form fields changed to "Required": [_1].',
+                                       '<span class="LC_cusr_emph">'.join(', ',map { $fieldtitles->{$_}; } @required)).'</span>'.
+                                   '</li>';
+                }
+                if (@unused) {
+                    $resulttext .= '<li>'.
+                                   &mt('Help form fields changed to "Not shown": [_1].',
+                                       '<span class="LC_cusr_emph">'.join(', ',map { $fieldtitles->{$_}; } @unused)).'</span>'.
+                                   '</li>';
+                }
+                if ($maxsizechg) {
+                    $resulttext .= '<li>'.
+                                   &mt('Max size for file uploaded to help form by logged-in user set to [_1] MB.',
+                                       $contacts_hash{'contacts'}{'helpform'}{'maxsize'}).
+                                   '</li>';
+                }
+            }
             $resulttext .= '</ul>';
         } else {
-            $resulttext = &mt('No changes made to contact information');
+            $resulttext = &mt('No changes made to contacts and form settings');
         }
     } else {
         $resulttext = '<span class="LC_error">'.
@@ -8552,7 +10914,8 @@ sub modify_usercreation {
                 if (ref($domconfig{'usercreation'}{$key}) eq 'HASH') {
                     foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) {
                         if (($item eq 'selfcreate') || ($item eq 'statustocreate') ||
-                            ($item eq 'captcha') || ($item eq 'recaptchakeys')) {
+                            ($item eq 'captcha') || ($item eq 'recaptchakeys') ||
+                            ($item eq 'recaptchaversion')) {
                             $save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
                         } else {
                             $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
@@ -8776,6 +11139,7 @@ sub modify_selfcreation {
                     foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) {
                         if (($item eq 'selfcreate') || ($item eq 'statustocreate') ||
                             ($item eq 'captcha') || ($item eq 'recaptchakeys') || 
+                            ($item eq 'recaptchaversion') ||
                             ($item eq 'emailusername') || ($item eq 'notify') ||
                             ($item eq 'selfcreateprocessing') || ($item eq 'shibenv')) {
                             $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
@@ -9105,6 +11469,7 @@ sub modify_selfcreation {
 #
     $save_usercreate{'cancreate'}{'captcha'} = $savecaptcha{'captcha'};
     $save_usercreate{'cancreate'}{'recaptchakeys'} = $savecaptcha{'recaptchakeys'};
+    $save_usercreate{'cancreate'}{'recaptchaversion'} = $savecaptcha{'recaptchaversion'};
     $save_usercreate{'cancreate'}{'selfcreate'} = $cancreate{'selfcreate'};
     if (ref($cancreate{'notify'}) eq 'HASH') {
         $save_usercreate{'cancreate'}{'notify'} = $cancreate{'notify'};
@@ -9119,7 +11484,7 @@ sub modify_selfcreation {
         $save_usercreate{'cancreate'}{'shibenv'} = $cancreate{'shibenv'};
     }
     $save_usercreate{'cancreate'}{'emailusername'} = $cancreate{'emailusername'};
-    $save_usercreate{'emailrule'} = \@email_rule;
+    $save_usercreate{'email_rule'} = \@email_rule;
 
     my %userconfig_hash = (
             usercreation     => \%save_usercreate,
@@ -9266,6 +11631,10 @@ sub modify_selfcreation {
                             $chgtext .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>';
                         }
                         $chgtext .= '</ul>';
+                    } elsif ($type eq 'recaptchaversion') {
+                        if ($savecaptcha{'captcha'} eq 'recaptcha') {
+                            $chgtext .= &mt('ReCAPTCHA set to version [_1]',$savecaptcha{$type});
+                        }
                     } elsif ($type eq 'emailusername') {
                         if (ref($cancreate{'emailusername'}) eq 'HASH') {
                             if (ref($types) eq 'ARRAY') {
@@ -9386,7 +11755,7 @@ sub process_captcha {
             $changes->{'captcha'} = 1;
         }
     }
-    my ($newpub,$newpriv,$currpub,$currpriv);
+    my ($newpub,$newpriv,$currpub,$currpriv,$newversion,$currversion);
     if ($newsettings->{'captcha'} eq 'recaptcha') {
         $newpub = $env{'form.'.$container.'_recaptchapub'};
         $newpriv = $env{'form.'.$container.'_recaptchapriv'};
@@ -9396,6 +11765,12 @@ sub process_captcha {
                                              public  => $newpub,
                                              private => $newpriv,
                                           };
+        $newversion = $env{'form.'.$container.'_recaptchaversion'};
+        $newversion =~ s/\D//g;
+        if ($newversion ne '2') {
+            $newversion = 1;
+        }
+        $newsettings->{'recaptchaversion'} = $newversion;
     }
     if (ref($current->{'recaptchakeys'}) eq 'HASH') {
         $currpub = $current->{'recaptchakeys'}{'public'};
@@ -9407,6 +11782,23 @@ sub process_captcha {
                                               }
         }
     }
+    if ($current->{'captcha'} eq 'recaptcha') {
+        $currversion = $current->{'recaptchaversion'};
+        if ($currversion ne '2') {
+            $currversion = 1;
+        }
+    }
+    if ($currversion ne $newversion) {
+        if ($container eq 'cancreate') {
+            if (ref($changes->{'cancreate'}) eq 'ARRAY') {
+                push(@{$changes->{'cancreate'}},'recaptchaversion');
+            } elsif (!defined($changes->{'cancreate'})) {
+                $changes->{'cancreate'} = ['recaptchaversion'];
+            }
+        } else {
+            $changes->{'recaptchaversion'} = 1;
+        }
+    }
     if (($newpub ne $currpub) || ($newpriv ne $currpriv)) {
         if ($container eq 'cancreate') {
             if (ref($changes->{'cancreate'}) eq 'ARRAY') {
@@ -9528,7 +11920,8 @@ sub modify_defaults {
     my ($dom,$lastactref,%domconfig) = @_;
     my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors);
     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 @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def',
+                 'portal_def','intauth_cost','intauth_check','intauth_switch');
     my @authtypes = ('internal','krb4','krb5','localauth');
     foreach my $item (@items) {
         $newvalues{$item} = $env{'form.'.$item};
@@ -9570,6 +11963,24 @@ sub modify_defaults {
                     push(@errors,$item);
                 }
             }
+        } elsif ($item eq 'intauth_cost') {
+            if ($newvalues{$item} ne '') {
+                if ($newvalues{$item} =~ /\D/) {
+                    push(@errors,$item);
+                }
+            }
+        } elsif ($item eq 'intauth_check') {
+            if ($newvalues{$item} ne '') {
+                unless ($newvalues{$item} =~ /^(0|1|2)$/) {
+                    push(@errors,$item);
+                }
+            }
+        } elsif ($item eq 'intauth_switch') {
+            if ($newvalues{$item} ne '') {
+                unless ($newvalues{$item} =~ /^(0|1|2)$/) {
+                    push(@errors,$item);
+                }
+            }
         }
         if (grep(/^\Q$item\E$/,@errors)) {
             $newvalues{$item} = $domdefaults{$item};
@@ -9724,6 +12135,28 @@ sub modify_defaults {
                                           localauth  => 'loc',
                         );
                         $value = $authnames{$shortauth{$value}};
+                    } elsif ($item eq 'intauth_switch') {
+                        my %optiondesc = &Apache::lonlocal::texthash (
+                                            0 => 'No',
+                                            1 => 'Yes',
+                                            2 => 'Yes, and copy existing passwd file to passwd.bak file',
+                                         );
+                        if ($value =~ /^(0|1|2)$/) {
+                            $value = $optiondesc{$value};
+                        } else {
+                            $value = &mt('none -- defaults to No');
+                        }
+                    } elsif ($item eq 'intauth_check') {
+                        my %optiondesc = &Apache::lonlocal::texthash (
+                                             0 => 'No',
+                                             1 => 'Yes, allow login then update passwd file using default cost (if higher)',
+                                             2 => 'Yes, disallow login if stored cost is less than domain default',
+                                         );
+                        if ($value =~ /^(0|1|2)$/) {
+                            $value = $optiondesc{$value};
+                        } else {
+                            $value = &mt('none -- defaults to No');
+                        }
                     }
                     $resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>';
                     $mailmsgtext .= "$title->{$item} set to $value\n";  
@@ -10239,32 +12672,210 @@ sub modify_serverstatuses {
 }
 
 sub modify_helpsettings {
-    my ($r,$dom,$confname,%domconfig) = @_;
+    my ($r,$dom,$confname,$lastactref,%domconfig) = @_;
     my ($resulttext,$errors,%changes,%helphash);
     my %defaultchecked = ('submitbugs' => 'on');
     my @offon = ('off','on');
     my @toggles = ('submitbugs');
+    my %current = ('submitbugs' => '',
+                   'adhoc'      => {},
+                  );
     if (ref($domconfig{'helpsettings'}) eq 'HASH') {
-        foreach my $item (@toggles) {
-            if ($defaultchecked{$item} eq 'on') { 
-                if ($domconfig{'helpsettings'}{$item} eq '') {
-                    if ($env{'form.'.$item} eq '0') {
-                        $changes{$item} = 1;
-                    }
-                } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
+        %current = %{$domconfig{'helpsettings'}};
+    }
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
+    foreach my $item (@toggles) {
+        if ($defaultchecked{$item} eq 'on') { 
+            if ($current{$item} eq '') {
+                if ($env{'form.'.$item} eq '0') {
                     $changes{$item} = 1;
                 }
-            } elsif ($defaultchecked{$item} eq 'off') {
-                if ($domconfig{'helpsettings'}{$item} eq '') {
-                    if ($env{'form.'.$item} eq '1') {
-                        $changes{$item} = 1;
-                    }
-                } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
+            } elsif ($current{$item} ne $env{'form.'.$item}) {
+                $changes{$item} = 1;
+            }
+        } elsif ($defaultchecked{$item} eq 'off') {
+            if ($current{$item} eq '') {
+                if ($env{'form.'.$item} eq '1') {
                     $changes{$item} = 1;
                 }
+            } elsif ($current{$item} ne $env{'form.'.$item}) {
+                $changes{$item} = 1;
             }
-            if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) {
-                $helphash{'helpsettings'}{$item} = $env{'form.'.$item};
+        }
+        if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) {
+            $helphash{'helpsettings'}{$item} = $env{'form.'.$item};
+        }
+    }
+    my $maxnum = $env{'form.helproles_maxnum'};
+    my $confname = $dom.'-domainconfig';
+    my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_');
+    my (@allpos,%newsettings,%changedprivs,$newrole);
+    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+    my @accesstypes = ('all','dh','da','none','status','inc','exc');
+    my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']);
+    my %lt = &Apache::lonlocal::texthash(
+                    s      => 'system',
+                    d      => 'domain',
+                    order  => 'Display order',
+                    access => 'Role usage',
+                    all    => 'All with domain helpdesk or helpdesk assistant role',
+                    dh     => 'All with domain helpdesk role',
+                    da     => 'All with domain helpdesk assistant role',
+                    none   => 'None',
+                    status => 'Determined based on institutional status',
+                    inc    => 'Include all, but exclude specific personnel',
+                    exc    => 'Exclude all, but include specific personnel',
+    );
+    for (my $num=0; $num<=$maxnum; $num++) {
+        my ($prefix,$identifier,$rolename,%curr);
+        if ($num == $maxnum) {
+            next unless ($env{'form.newcusthelp'} == $maxnum);
+            $identifier = 'custhelp'.$num;
+            $prefix = 'helproles_'.$num;
+            $rolename = $env{'form.custhelpname'.$num};
+            $rolename=~s/[^A-Za-z0-9]//gs;
+            next if ($rolename eq '');
+            next if (exists($existing{'rolesdef_'.$rolename}));
+            my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$identifier);
+            my $result = &Apache::lonnet::definerole($rolename,$newprivs{'s'},$newprivs{'d'},
+                                                     $newprivs{'c'},$confname,$dom);
+            if ($result ne 'ok') {
+                $errors .= '<li><span class="LC_error">'.
+                           &mt('An error occurred storing the new custom role: [_1]',
+                           $result).'</span></li>';
+                next;
+            } else {
+                $changedprivs{$rolename} = \%newprivs;
+                $newrole = $rolename;
+            }
+        } else {
+            $prefix = 'helproles_'.$num;
+            $rolename = $env{'form.'.$prefix};
+            next if ($rolename eq '');
+            next unless (exists($existing{'rolesdef_'.$rolename}));
+            $identifier = 'custhelp'.$num;
+            my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$identifier);
+            my %currprivs;
+            ($currprivs{'s'},$currprivs{'d'},$currprivs{'c'}) =
+                split(/\_/,$existing{'rolesdef_'.$rolename});
+            foreach my $level ('c','d','s') {
+                if ($newprivs{$level} ne $currprivs{$level}) {
+                    my $result = &Apache::lonnet::definerole($rolename,$newprivs{'s'},$newprivs{'d'},
+                                                             $newprivs{'c'},$confname,$dom);
+                    if ($result ne 'ok') {
+                        $errors .= '<li><span class="LC_error">'.
+                                   &mt('An error occurred storing privileges for existing role [_1]: [_2]',
+                                       $rolename,$result).'</span></li>';
+                    } else {
+                        $changedprivs{$rolename} = \%newprivs;
+                    }
+                    last;
+                }
+            }
+            if (ref($current{'adhoc'}) eq 'HASH') {
+                if (ref($current{'adhoc'}{$rolename}) eq 'HASH') {
+                    %curr = %{$current{'adhoc'}{$rolename}};
+                }
+            }
+        }
+        my $newpos = $env{'form.'.$prefix.'_pos'};
+        $newpos =~ s/\D+//g;
+        $allpos[$newpos] = $rolename;
+        my $newdesc = $env{'form.'.$prefix.'_desc'};
+        $helphash{'helpsettings'}{'adhoc'}{$rolename}{'desc'} = $newdesc;
+        if ($curr{'desc'}) {
+            if ($curr{'desc'} ne $newdesc) {
+                $changes{'customrole'}{$rolename}{'desc'} = 1;
+                $newsettings{$rolename}{'desc'} = $newdesc;
+            }
+        } elsif ($newdesc ne '') {
+            $changes{'customrole'}{$rolename}{'desc'} = 1;
+            $newsettings{$rolename}{'desc'} = $newdesc;
+        }
+        my $access = $env{'form.'.$prefix.'_access'};
+        if (grep(/^\Q$access\E$/,@accesstypes)) {
+            $helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'} = $access;
+            if ($access eq 'status') {
+                my @statuses = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_status');
+                if (scalar(@statuses) == 0) {
+                    $helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'} = 'none';
+                } else {
+                    my (@shownstatus,$numtypes);
+                    $helphash{'helpsettings'}{'adhoc'}{$rolename}{$access} = [];
+                    if (ref($types) eq 'ARRAY') {
+                        $numtypes = scalar(@{$types});
+                        foreach my $type (sort(@statuses)) {
+                            if ($type eq 'default') {
+                                push(@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}},$type);
+                            } elsif (grep(/^\Q$type\E$/,@{$types})) {
+                                push(@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}},$type);
+                                push(@shownstatus,$usertypes->{$type});
+                            }
+                        }
+                    }
+                    if (grep(/^default$/,@statuses)) {
+                        push(@shownstatus,$othertitle);
+                    }
+                    if (scalar(@shownstatus) == 1+$numtypes) {
+                        $helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'} = 'all';
+                        delete($helphash{'helpsettings'}{'adhoc'}{$rolename}{'status'});
+                    } else {
+                        $newsettings{$rolename}{'status'} = join(' '.&mt('or').' ',@shownstatus);
+                        if (ref($curr{'status'}) eq 'ARRAY') {
+                            my @diffs = &Apache::loncommon::compare_arrays($helphash{'helpsettings'}{'adhoc'}{$rolename}{$access},$curr{$access});
+                            if (@diffs) {
+                                $changes{'customrole'}{$rolename}{$access} = 1;
+                            }
+                        } elsif (@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}}) {
+                            $changes{'customrole'}{$rolename}{$access} = 1;
+                        }
+                    }
+                }
+            } elsif (($access eq 'inc') || ($access eq 'exc')) {
+                my @personnel = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_staff_'.$access);
+                my @newspecstaff;
+                $helphash{'helpsettings'}{'adhoc'}{$rolename}{$access} = [];
+                foreach my $person (sort(@personnel)) {
+                    if ($domhelpdesk{$person}) {
+                        push(@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}},$person);
+                    }
+                }
+                if (ref($curr{$access}) eq 'ARRAY') {
+                    my @diffs = &Apache::loncommon::compare_arrays($helphash{'helpsettings'}{'adhoc'}{$rolename}{$access},$curr{$access});
+                    if (@diffs) {
+                        $changes{'customrole'}{$rolename}{$access} = 1;
+                    }
+                } elsif (@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}}) {
+                    $changes{'customrole'}{$rolename}{$access} = 1;
+                }
+                foreach my $person (@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}}) {
+                    my ($uname,$udom) = split(/:/,$person);
+                        push(@newspecstaff,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom,'lastname'),$uname,$udom));
+                }
+                $newsettings{$rolename}{$access} = join(', ',sort(@newspecstaff));
+            }
+        } else {
+            $helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'}= 'all';
+        }
+        unless ($curr{'access'} eq $access) {
+            $changes{'customrole'}{$rolename}{'access'} = 1;
+            $newsettings{$rolename}{'access'} = $lt{$helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'}};
+        }
+    }
+    if (@allpos > 0) {
+        my $idx = 0;
+        foreach my $rolename (@allpos) {
+            if ($rolename ne '') {
+                $helphash{'helpsettings'}{'adhoc'}{$rolename}{'order'} = $idx;
+                if (ref($current{'adhoc'}) eq 'HASH') {
+                    if (ref($current{'adhoc'}{$rolename}) eq 'HASH') {
+                        if ($current{'adhoc'}{$rolename}{'order'} ne $idx) {
+                            $changes{'customrole'}{$rolename}{'order'} = 1;
+                            $newsettings{$rolename}{'order'} = $idx+1;
+                        }
+                    }
+                }
+                $idx ++;
             }
         }
     }
@@ -10272,25 +12883,115 @@ sub modify_helpsettings {
     if (keys(%changes) > 0) {
         $putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom);
         if ($putresult eq 'ok') {
-            $resulttext = &mt('Changes made:').'<ul>';
+            if (ref($helphash{'helpsettings'}) eq 'HASH') {
+                $domdefaults{'submitbugs'} = $helphash{'helpsettings'}{'submitbugs'};
+                if (ref($helphash{'helpsettings'}{'adhoc'}) eq 'HASH') {
+                    $domdefaults{'adhocroles'} = $helphash{'helpsettings'}{'adhoc'};
+                }
+            }
+            my $cachetime = 24*60*60;
+            &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'domdefaults'} = 1;
+            }
+        } else {
+            $errors .= '<li><span class="LC_error">'.
+                       &mt('An error occurred storing the settings: [_1]',
+                           $putresult).'</span></li>';
+        }
+    }
+    if ((keys(%changes) && ($putresult eq 'ok')) || (keys(%changedprivs))) {
+        $resulttext = &mt('Changes made:').'<ul>';
+        my (%shownprivs,@levelorder);
+        @levelorder = ('c','d','s');
+        if ((keys(%changes)) && ($putresult eq 'ok')) {
             foreach my $item (sort(keys(%changes))) {
                 if ($item eq 'submitbugs') {
                     $resulttext .= '<li>'.&mt('Display link to: [_1] set to "'.$offon[$env{'form.'.$item}].'".',
                                               &Apache::loncommon::modal_link('http://bugs.loncapa.org',
                                               &mt('LON-CAPA bug tracker'),600,500)).'</li>';
+                } elsif ($item eq 'customrole') {
+                    if (ref($changes{'customrole'}) eq 'HASH') {
+                        my @keyorder = ('order','desc','access','status','exc','inc');
+                        my %keytext = &Apache::lonlocal::texthash(
+                                                                   order  => 'Order',
+                                                                   desc   => 'Role description',
+                                                                   access => 'Role usage',
+                                                                   status => 'Allowed institutional types',
+                                                                   exc    => 'Allowed personnel',
+                                                                   inc    => 'Disallowed personnel',
+                        );
+                        foreach my $role (sort(keys(%{$changes{'customrole'}}))) {
+                            if (ref($changes{'customrole'}{$role}) eq 'HASH') {
+                                if ($role eq $newrole) {
+                                    $resulttext .= '<li>'.&mt('New custom role added: [_1]',
+                                                              $role).'<ul>';
+                                } else {
+                                    $resulttext .= '<li>'.&mt('Existing custom role modified: [_1]',
+                                                              $role).'<ul>';
+                                }
+                                foreach my $key (@keyorder) {
+                                    if ($changes{'customrole'}{$role}{$key}) {
+                                        $resulttext .= '<li>'.&mt("[_1] set to: [_2]",
+                                                                  $keytext{$key},$newsettings{$role}{$key}).
+                                                       '</li>';
+                                    }
+                                }
+                                if (ref($changedprivs{$role}) eq 'HASH') {
+                                    $shownprivs{$role} = 1;
+                                    $resulttext .= '<li>'.&mt('Privileges set to :').'<ul>';
+                                    foreach my $level (@levelorder) {
+                                        foreach my $item (split(/\:/,$changedprivs{$role}{$level})) {
+                                            next if ($item eq '');
+                                            my ($priv) = split(/\&/,$item,2);
+                                            if (&Apache::lonnet::plaintext($priv)) {
+                                                $resulttext .= '<li>'.&Apache::lonnet::plaintext($priv);
+                                                unless ($level eq 'c') {
+                                                    $resulttext .= ' ('.$lt{$level}.')';
+                                                }
+                                                $resulttext .= '</li>';
+                                            }
+                                        }
+                                    }
+                                    $resulttext .= '</ul>';
+                                }
+                                $resulttext .= '</ul></li>';
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if (keys(%changedprivs)) {
+            foreach my $role (sort(keys(%changedprivs))) {
+                unless ($shownprivs{$role}) {
+                    $resulttext .= '<li>'.&mt('Existing custom role modified: [_1]',
+                                              $role).'<ul>'.
+                                   '<li>'.&mt('Privileges set to :').'<ul>';
+                    foreach my $level (@levelorder) {
+                        foreach my $item (split(/\:/,$changedprivs{$role}{$level})) {
+                            next if ($item eq '');
+                            my ($priv) = split(/\&/,$item,2);
+                            if (&Apache::lonnet::plaintext($priv)) {
+                                $resulttext .= '<li>'.&Apache::lonnet::plaintext($priv);
+                                unless ($level eq 'c') {
+                                    $resulttext .= ' ('.$lt{$level}.')';
+                                }
+                                $resulttext .= '</li>';
+                            }
+                        }
+                    }
+                    $resulttext .= '</ul></li></ul></li>';
                 }
             }
-            $resulttext .= '</ul>';
-        } else {
-            $resulttext = &mt('No changes made to help settings');
-            $errors .= '<li><span class="LC_error">'.
-                       &mt('An error occurred storing the settings: [_1]',
-                           $putresult).'</span></li>';
         }
+        $resulttext .= '</ul>';
+    } else {
+        $resulttext = &mt('No changes made to help settings');
     }
     if ($errors) {
         $resulttext .= '<br />'.&mt('The following errors occurred: ').'<ul>'.
-                       $errors.'</ul>';
+                                    $errors.'</ul>';
     }
     return $resulttext;
 }
@@ -10304,12 +13005,14 @@ sub modify_coursedefaults {
                          );
     my @toggles = ('uselcmath','usejsme');
     my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial',
-                   'uploadquota_community','uploadquota_textbook');
+                   'uploadquota_community','uploadquota_textbook','mysqltables_official',
+                   'mysqltables_unofficial','mysqltables_community','mysqltables_textbook');
     my @types = ('official','unofficial','community','textbook');
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
                            postsubmit           => 60,
+                           mysqltables          => 172800,
                          );
 
     $defaultshash{'coursedefaults'} = {};
@@ -10350,12 +13053,12 @@ sub modify_coursedefaults {
                 }
                 $defaultshash{'coursedefaults'}{$item} = $newdef;
             } else {
-                my ($type) = ($item =~ /^\Quploadquota_\E(\w+)$/);
-                if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
-                    $currdef = $domconfig{'coursedefaults'}{'uploadquota'}{$type};
+                my ($setting,$type) = ($item =~ /^(uploadquota|mysqltables)_(\w+)$/);
+                if (ref($domconfig{'coursedefaults'}{$setting}) eq 'HASH') {
+                    $currdef = $domconfig{'coursedefaults'}{$setting}{$type};
                 }
                 $newdef =~ s/[^\w.\-]//g;
-                $defaultshash{'coursedefaults'}{'uploadquota'}{$type} = $newdef;
+                $defaultshash{'coursedefaults'}{$setting}{$type} = $newdef;
             }
             if ($currdef ne $newdef) {
                 my $staticdef;
@@ -10363,9 +13066,10 @@ sub modify_coursedefaults {
                     unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) {
                         $changes{$item} = 1;
                     }
-                } else {
-                    unless (($currdef eq '') && ($newdef == $staticdefaults{'uploadquota'})) {
-                        $changes{'uploadquota'} = 1;
+                } elsif ($item =~ /^(uploadquota|mysqltables)_/) {
+                    my $setting = $1;
+                    unless (($currdef eq '') && ($newdef == $staticdefaults{$setting})) {
+                        $changes{$setting} = 1;
                     }
                 }
             }
@@ -10490,7 +13194,7 @@ sub modify_coursedefaults {
             my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
             if (($changes{'uploadquota'}) || ($changes{'postsubmit'}) ||
                 ($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) ||
-                ($changes{'canclone'})) {
+                ($changes{'canclone'}) || ($changes{'mysqltables'})) {
                 foreach my $item ('uselcmath','usejsme') {
                     if ($changes{$item}) {
                         $domdefaults{$item}=$defaultshash{'coursedefaults'}{$item};
@@ -10569,6 +13273,18 @@ sub modify_coursedefaults {
                     } else {
                         $resulttext .= '<li>'.&mt('Default quota for content uploaded via Course Editor remains default: [_1] MB',$staticdefaults{'uploadquota'}).'</li>';
                     }
+                } elsif ($item eq 'mysqltables') {
+                    if (ref($defaultshash{'coursedefaults'}{'mysqltables'}) eq 'HASH') {
+                        $resulttext .= '<li>'.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver').'<ul>'.
+                                       '<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('Communities: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'community'}.'</b>').'</li>'.
+                                       '</ul>'.
+                                       '</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver remains default: [_1] s',$staticdefaults{'uploadquota'}).'</li>';
+                    }
                 } elsif ($item eq 'postsubmit') {
                     if ($domdefaults{'postsubmit'} eq 'off') {
                         $resulttext .= '<li>'.&mt('Submit button(s) remain enabled on page after student makes submission.');
@@ -11117,8 +13833,10 @@ sub modify_usersessions {
             }
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+            &Apache::lonnet::do_cache_new('usersessions',$dom,$defaultshash{'usersessions'},3600);
             if (ref($lastactref) eq 'HASH') {
                 $lastactref->{'domdefaults'} = 1;
+                $lastactref->{'usersessions'} = 1;
             }
             if (keys(%changes) > 0) {
                 my %lt = &usersession_titles();
@@ -11271,8 +13989,13 @@ sub modify_loadbalancing {
                         push(@offloadto,$target);
                     }
                 }
-                $defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto;
             }
+            if ($env{'form.loadbalancing_target_'.$i.'_hosthere'} eq $sparetype) {
+                unless(grep(/^\Q$balancer\E$/,@offloadto)) {
+                    push(@offloadto,$balancer);
+                }
+            }
+            $defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto;
         }
         if (ref($currtargets{$balancer}) eq 'HASH') {
             foreach my $sparetype (@sparestypes) {
@@ -11506,24 +14229,9 @@ sub recurse_cat_deletes {
     return;
 }
 
-sub get_active_dcs {
-    my ($dom) = @_;
-    my $now = time;
-    my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc'],$now,$now);
-    my %domcoords;
-    my $numdcs = 0;
-    foreach my $server (keys(%dompersonnel)) {
-        foreach my $user (sort(keys(%{$dompersonnel{$server}}))) {
-            my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);
-            $domcoords{$uname.':'.$udom} = $dompersonnel{$server}{$user};
-        }
-    }
-    return %domcoords;
-}
-
 sub active_dc_picker {
     my ($dom,$numinrow,$inputtype,$name,%currhash) = @_;
-    my %domcoords = &get_active_dcs($dom);
+    my %domcoords = &Apache::lonnet::get_active_domroles($dom,['dc']);
     my @domcoord = keys(%domcoords);
     if (keys(%currhash)) {
         foreach my $dc (keys(%currhash)) {
@@ -12087,6 +14795,8 @@ function updateCaptcha(caller,context) {
     var pubitem;
     var privtext;
     var pubtext;
+    var versionitem;
+    var versiontext;
     if (document.getElementById(context+'_recaptchapub')) {
         pubitem = document.getElementById(context+'_recaptchapub');
     } else {
@@ -12107,6 +14817,16 @@ function updateCaptcha(caller,context) {
     } else {
         return;
     }
+    if (document.getElementById(context+'_recaptchaversion')) {
+        versionitem = document.getElementById(context+'_recaptchaversion');
+    } else {
+        return;
+    }
+    if (document.getElementById(context+'_recaptchavertxt')) {
+        versiontext = document.getElementById(context+'_recaptchavertxt');
+    } else {
+        return;
+    }
     if (caller.checked) {
         if (caller.value == 'recaptcha') {
             pubitem.type = 'text';
@@ -12115,11 +14835,16 @@ function updateCaptcha(caller,context) {
             privitem.size = '40';
             pubtext.innerHTML = "$lt{'pub'}";
             privtext.innerHTML = "$lt{'priv'}";
+            versionitem.type = 'text';
+            versionitem.size = '3';
+            versiontext.innerHTML = "$lt{'ver'}";
         } else {
             pubitem.type = 'hidden';
             privitem.type = 'hidden';
+            versionitem.type = 'hidden';
             pubtext.innerHTML = '';
             privtext.innerHTML = '';
+            versiontext.innerHTML = '';
         }
     }
     return;
@@ -12185,6 +14910,7 @@ sub captcha_phrases {
                  original  => 'original (CAPTCHA)',
                  recaptcha => 'successor (ReCAPTCHA)',
                  notused   => 'unused',
+                 ver => 'ReCAPTCHA version (1 or 2)',
     );
 }
 
@@ -12194,7 +14920,7 @@ sub devalidate_remote_domconfs {
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
     my %thismachine;
     map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
-    my @posscached = ('domainconfig','domdefaults');
+    my @posscached = ('domainconfig','domdefaults','ltitools','usersessions','directorysrch');
     if (keys(%servers)) {
         foreach my $server (keys(%servers)) {
             next if ($thismachine{$server});