--- loncom/interface/domainprefs.pm	2017/12/06 23:41:19	1.321
+++ loncom/interface/domainprefs.pm	2018/12/08 15:03:25	1.344
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.321 2017/12/06 23:41:19 raeburn Exp $
+# $Id: domainprefs.pm,v 1.344 2018/12/08 15:03:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -104,7 +104,7 @@ $datatable  - HTML containing form eleme
 
 In the case of course requests, radio buttons are displayed for each institutional
 affiliate type (and also default, and _LC_adv) for each of the course types 
-(official, unofficial, community, textbook, and placement).  
+(official, unofficial, community, textbook, placement, and lti).  
 In each case the radio buttons allow the selection of one of four values:  
 
 0, approval, validate, autolimit=N (where N is blank, or a positive integer).
@@ -352,6 +352,8 @@ sub handler {
                                 col2 => 'Value',},
                                {col1 => 'Recipient(s) for notifications',
                                 col2 => 'Value',},
+                               {col1 => 'Nightly status check e-mail',
+                                col2 => 'Settings',},
                                {col1 => 'Ask helpdesk form settings',
                                 col2 => 'Value',},],
                     print => \&print_contacts,
@@ -781,6 +783,10 @@ sub print_config_box {
         $output =
             &Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname,\%full, 
                                                       \@templateroles);
+    } elsif ($action eq 'ltitools') {
+        $output .= &ltitools_javascript($settings);
+    } elsif ($action eq 'lti') {
+        $output .= &lti_javascript($settings);
     }
     $output .=
          '<table class="LC_nested_outer">
@@ -900,6 +906,23 @@ sub print_config_box {
              </tr>'."\n";
                 if ($action eq 'coursecategories') {
                     $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
+                } elsif ($action eq 'contacts') {
+                    $output .= $item->{'print'}->('lower',$dom,$settings,\$rowtotal).'
+             </tr>
+            </table>
+           </td>
+          </tr>
+          <tr>
+           <td>
+            <table class="LC_nested">
+             <tr class="LC_info_row">
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
+              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'.
+                           $item->{'print'}->('bottom',$dom,$settings,\$rowtotal).'
+            </table>
+          </td>
+         </tr>
+         <tr>';
                 } else {
                     $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
                 }
@@ -1436,7 +1459,7 @@ sub print_login {
             } else {
                 $datatable .= '<input type="file" name="loginheadtag_'.$lonhost.'" />';
             }
-            $datatable .= '</td><td><input type="textbox" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>';
+            $datatable .= '</td><td><input type="text" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>';
         }
         $datatable .= '</table></td></tr>';
     }
@@ -1596,7 +1619,7 @@ sub display_color_options {
     my $datatable = '<tr'.$css_class.'>'.
         '<td>'.$choices->{'font'}.'</td>';
     if (!$is_custom->{'font'}) {
-        $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>';
+        $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span class="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>';
     } else {
         $datatable .= '<td>&nbsp;</td>';
     }
@@ -1605,12 +1628,12 @@ sub display_color_options {
     $datatable .= '<td><span class="LC_nobreak">'.
                   '<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'.
                   ' value="'.$current_color.'" />&nbsp;'.
-                  '&nbsp;</td></tr>';
+                  '&nbsp;</span></td></tr>';
     unless ($role eq 'login') { 
         $datatable .= '<tr'.$css_class.'>'.
                       '<td>'.$choices->{'fontmenu'}.'</td>';
         if (!$is_custom->{'fontmenu'}) {
-            $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span id="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>';
+            $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span class="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>';
         } else {
             $datatable .= '<td>&nbsp;</td>';
         }
@@ -1620,7 +1643,7 @@ sub display_color_options {
                       '<input class="colorchooser" type="text" size="10" name="'
 		      .$role.'_fontmenu"'.
                       ' value="'.$current_color.'" />&nbsp;'.
-                      '&nbsp;</td></tr>';
+                      '&nbsp;</span></td></tr>';
     }
     my $switchserver = &check_switchserver($dom,$confname);
     foreach my $img (@{$images}) {
@@ -1738,7 +1761,7 @@ sub display_color_options {
     my $bgs_def;
     foreach my $item (@{$bgs}) {
         if (!$is_custom->{$item}) {
-            $bgs_def .= '<td><span class="LC_nobreak">'.$choices->{$item}.'</span>&nbsp;<span id="css_default_'.$role.'_'.$item.'" style="background-color: '.$defaults->{'bgs'}{$item}.';">&nbsp;&nbsp;&nbsp;</span><br />'.$defaults->{'bgs'}{$item}.'</td>';
+            $bgs_def .= '<td><span class="LC_nobreak">'.$choices->{$item}.'</span>&nbsp;<span class="css_default_'.$role.'_'.$item.'" style="background-color: '.$defaults->{'bgs'}{$item}.';">&nbsp;&nbsp;&nbsp;</span><br />'.$defaults->{'bgs'}{$item}.'</td>';
         }
     }
     if ($bgs_def) {
@@ -1766,7 +1789,7 @@ sub display_color_options {
     my $links_def;
     foreach my $item (@{$links}) {
         if (!$is_custom->{$item}) {
-            $links_def .= '<td>'.$choices->{$item}.'<br /><span id="css_default_'.$role.'_'.$item.'" style="color: '.$defaults->{'links'}{$item}.';">'.$defaults->{'links'}{$item}.'</span></td>';
+            $links_def .= '<td>'.$choices->{$item}.'<br /><span class="css_default_'.$role.'_'.$item.'" style="color: '.$defaults->{'links'}{$item}.';">'.$defaults->{'links'}{$item}.'</span></td>';
         }
     }
     if ($links_def) {
@@ -1852,17 +1875,15 @@ sub image_changes {
     my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_;
     my $output;
     if ($img eq 'login') {
-            # suppress image for Log-in header
+        $output = '</td><td>'.$logincolors; # suppress image for Log-in header
     } elsif (!$is_custom) {
         if ($img ne 'domlogo') {
-            $output .= &mt('Default image:').'<br />';
+            $output = &mt('Default image:').'<br />';
         } else {
-            $output .= &mt('Default in use:').'<br />';
+            $output = &mt('Default in use:').'<br />';
         }
     }
-    if ($img eq 'login') { # suppress image for Log-in header
-        $output .= '<td>'.$logincolors;
-    } else {
+    if ($img ne 'login') {
         if ($img_import) {
             $output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />';
         }
@@ -1893,7 +1914,7 @@ sub print_quotas {
     my $typecount = 0;
     my ($css_class,%titles);
     if ($context eq 'requestcourses') {
-        @usertools = ('official','unofficial','community','textbook','placement');
+        @usertools = ('official','unofficial','community','textbook','placement','lti');
         @options =('norequest','approval','validate','autolimit');
         %validations = &Apache::lonnet::auto_courserequest_checks($dom);
         %titles = &courserequest_titles();
@@ -2357,7 +2378,7 @@ sub print_studentcode {
     my ($settings,$rowtotal) = @_;
     my $rownum = 0; 
     my ($output,%current);
-    my @crstypes = ('official','unofficial','community','textbook','placement');
+    my @crstypes = ('official','unofficial','community','textbook','placement','lti');
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{'uniquecode'}) eq 'HASH') {
             foreach my $type (@crstypes) {
@@ -2484,7 +2505,7 @@ sub print_textbookcourses {
         $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
     }
     $datatable .= '</select>&nbsp;'."\n".
-                  '<input type="checkbox" name="'.$type.'_addbook" value="1" />'.&mt('Add').'</td>'."\n".
+                  '<input type="checkbox" name="'.$type.'_addbook" value="1" />'.&mt('Add').'</span></td>'."\n".
                   '<td colspan="2">'.
                   '<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_addbook_subject" value="" /></span> '."\n".
                   ('&nbsp;'x2).
@@ -2501,13 +2522,13 @@ sub print_textbookcourses {
         } else {
             $datatable .= '<input type="file" name="'.$type.'_addbook_image" value="" />';
         }
+        $datatable .= '</span>'."\n";
     }
-    $datatable .= '</span>'."\n".
-                  '<span class="LC_nobreak">'.&mt('LON-CAPA course:').'&nbsp;'.
+    $datatable .= '<span class="LC_nobreak">'.&mt('LON-CAPA course:').'&nbsp;'.
                   &Apache::loncommon::select_dom_form($env{'request.role.domain'},$type.'_addbook_cdom').
                   '<input type="text" size="25" name="'.$type.'_addbook_cnum" value="" />'.
                   &Apache::loncommon::selectcourse_link
-                      ('display',$type.'_addbook_cnum',$type.'_addbook_cdom',undef,undef,undef,'Course');
+                      ('display',$type.'_addbook_cnum',$type.'_addbook_cdom',undef,undef,undef,'Course').
                   '</span></td>'."\n".
                   '</tr>'."\n";
     $itemcount ++;
@@ -2712,6 +2733,19 @@ function toggleLTITools(form,setting,ite
             }
         }
     }
+    if (setting == 'user') {
+        divid = 'ltitools_'+setting+'_div_'+item;
+        var checkid = 'ltitools_'+setting+'_field_'+item;
+        if (document.getElementById(divid)) {
+            if (document.getElementById(checkid)) {
+                if (document.getElementById(checkid).checked) {
+                    document.getElementById(divid).style.display = 'inline-block';
+                } else {
+                    document.getElementById(divid).style.display = 'none';
+                }
+            }
+        }
+    }
     return;
 }
 // ]]>
@@ -2793,32 +2827,49 @@ ENDSCRIPT
 }
 
 sub lti_toggle_js {
+    my %lcauthparmtext = &Apache::lonlocal::texthash (
+                            localauth => 'Local auth argument',
+                            krb       => 'Kerberos domain',
+                         );
     return <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
 
 function toggleLTI(form,setting,item) {
-    if ((setting == 'user') || (setting == 'crs')) {
+    if ((setting == 'user') || (setting == 'crs') || (setting == 'passback')) {
         var radioname = '';
         var divid = '';
         if (setting == 'user') {
             radioname = 'lti_mapuser_'+item;
             divid = 'lti_userfield_'+item;
-        } else {
+        } else if (setting == 'crs') {
             radioname = 'lti_mapcrs_'+item;
             divid = 'lti_crsfield_'+item;
+        } else {
+            radioname = 'lti_passbackformat_'+item;
+            divid =  'lti_passback_'+item;
         }
         var num = form.elements[radioname].length;
         if (num) {
             var setvis = '';
             for (var i=0; i<num; i++) {
                if (form.elements[radioname][i].checked) {
-                   if (form.elements[radioname][i].value == 'other') {
-                       if (document.getElementById(divid)) {
-                           document.getElementById(divid).style.display = 'inline-block';
+                   if (setting == 'passback') {
+                       if (form.elements[radioname][i].value == '1') {
+                           if (document.getElementById(divid)) {
+                               document.getElementById(divid).style.display = 'inline-block';
+                           }
+                           setvis = 1;
+                           break;
+                       }
+                   } else {
+                       if (form.elements[radioname][i].value == 'other') {
+                           if (document.getElementById(divid)) {
+                               document.getElementById(divid).style.display = 'inline-block';
+                           }
+                           setvis = 1;
+                           break;
                        }
-                       setvis = 1;
-                       break;
                    }
                } 
             }
@@ -2870,6 +2921,57 @@ function toggleLTI(form,setting,item) {
                 }
             }
         }
+    } else if (setting == 'lcauth') {
+        var numauth = form.elements['lti_lcauth_'+item].length;
+        if (numauth) {
+            for (var i=0; i<numauth; i++) {
+                if (form.elements['lti_lcauth_'+item][i].checked) {
+                    if (document.getElementById('lti_'+setting+'_parmrow_'+item)) {
+                        if ((form.elements['lti_'+setting+'_'+item][i].value == 'internal') || (form.elements['lti_'+setting+'_'+item][i].value == 'lti')) {
+                            document.getElementById('lti_'+setting+'_parmrow_'+item).style.display = 'none';
+                        } else {
+                            document.getElementById('lti_'+setting+'_parmrow_'+item).style.display = 'table-row';
+                            if (document.getElementById('lti_'+setting+'_parmtext_'+item)) {
+                                if (form.elements['lti_'+setting+'_'+item][i].value == 'localauth') {
+                                    document.getElementById('lti_'+setting+'_parmtext_'+item).innerHTML = "$lcauthparmtext{'localauth'}";
+                                } else {
+                                    document.getElementById('lti_'+setting+'_parmtext_'+item).innerHTML = "$lcauthparmtext{'krb'}";
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    } else if (setting == 'lcmenu') {
+        var menus = new Array('lti_topmenu_'+item,'lti_inlinemenu_'+item);
+        var divid = 'lti_menufield_'+item;
+        var setvis = '';
+        for (var i=0; i<menus.length; i++) {
+            var radioname = menus[i];  
+            var num = form.elements[radioname].length;
+            if (num) {
+                for (var j=0; j<num; j++) {
+                    if (form.elements[radioname][j].checked) {
+                        if (form.elements[radioname][j].value == '1') {
+                            if (document.getElementById(divid)) {
+                                document.getElementById(divid).style.display = 'inline-block';
+                            }
+                            setvis = 1;
+                            break;
+                        }
+                    }
+                }
+            }
+            if (setvis == 1) {
+                break;
+            }
+        }
+        if (!setvis) {
+            if (document.getElementById(divid)) {
+                document.getElementById(divid).style.display = 'none';
+            }
+        }
     }
     return;
 }
@@ -2958,7 +3060,7 @@ sub print_autoenroll {
                   '<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>';
+                  ' value="'.$failsafe.'" size="4" /></span></td></tr>';
     $$rowtotal += 4;
     return $datatable;
 }
@@ -3240,7 +3342,7 @@ sub print_contacts {
     my $datatable;
     my @contacts = ('adminemail','supportemail');
     my (%checked,%to,%otheremails,%bccemails,%includestr,%includeloc,%currfield,
-        $maxsize,$fields,$fieldtitles,$fieldoptions,$possoptions,@mailings);
+        $maxsize,$fields,$fieldtitles,$fieldoptions,$possoptions,@mailings,%lonstatus);
     if ($position eq 'top') {
         if (ref($settings) eq 'HASH') {
             foreach my $item (@contacts) {
@@ -3255,6 +3357,12 @@ sub print_contacts {
         foreach my $type (@mailings) {
             $otheremails{$type} = '';
         }
+    } elsif ($position eq 'lower') {
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{'lonstatus'}) eq 'HASH') {
+                %lonstatus = %{$settings->{'lonstatus'}};
+            }
+        }
     } else {
         @mailings = ('helpdeskmail','otherdomsmail');
         foreach my $type (@mailings) {
@@ -3267,7 +3375,7 @@ sub print_contacts {
         ($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields();
     }
     if (ref($settings) eq 'HASH') {
-        unless ($position eq 'top') {
+        unless (($position eq 'top') || ($position eq 'lower')) {
             foreach my $type (@mailings) {
                 if (exists($settings->{$type})) {
                     if (ref($settings->{$type}) eq 'HASH') {
@@ -3388,7 +3496,7 @@ sub print_contacts {
                     if ($currfield{$field} eq 'no') {
                         $display = ' style="display:none"';
                     }
-                    $datatable .= '</td></tr><tr id="help_screenshotsize"'.$display.' />'.
+                    $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.'" />';
                 }
@@ -3399,7 +3507,7 @@ sub print_contacts {
         $datatable .= '</td></tr>'."\n";
         $rownum ++;
     }
-    unless ($position eq 'top') {
+    unless (($position eq 'top') || ($position eq 'lower')) {
         foreach my $type (@mailings) {
             $css_class = $rownum%2?' class="LC_odd_row"':'';
             $datatable .= '<tr'.$css_class.'>'.
@@ -3433,7 +3541,7 @@ sub print_contacts {
                               '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 >'.
+                              '<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).
@@ -3446,18 +3554,110 @@ sub print_contacts {
     }
     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));
+        my $corelink = &core_link_msu();
+        $choices{'reporterrors'} = &mt('E-mail error reports to [_1]',$corelink);
         $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');
+                                        $corelink);
+        $choices{'reportstatus'} = &mt('E-mail status if errors above threshold to [_1]',$corelink);
+        my @toggles = ('reporterrors','reportupdates','reportstatus');
         my %defaultchecked = ('reporterrors'  => 'on',
-                              'reportupdates' => 'on');
+                              'reportupdates' => 'on',
+                              'reportstatus'  => 'on');
         (my $reports,$rownum) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
                                                    \%choices,$rownum);
         $datatable .= $reports;
+    } elsif ($position eq 'lower') {
+        $css_class = $rownum%2?' class="LC_odd_row"':'';
+        my ($threshold,$sysmail,%excluded,%weights);
+        my ($defaults,$names) = &Apache::loncommon::lon_status_items();
+        if ($lonstatus{'threshold'} =~ /^\d+$/) {
+            $threshold = $lonstatus{'threshold'};
+        } else {
+            $threshold = $defaults->{'threshold'};
+        }
+        if ($lonstatus{'sysmail'} =~ /^\d+$/) {
+            $sysmail = $lonstatus{'sysmail'};
+        } else {
+            $sysmail = $defaults->{'sysmail'};
+        }
+        if (ref($lonstatus{'weights'}) eq 'HASH') {
+            foreach my $type ('E','W','N','U') {
+                if ($lonstatus{'weights'}{$type} =~ /^\d+$/) {
+                    $weights{$type} = $lonstatus{'weights'}{$type};
+                } else {
+                    $weights{$type} = $defaults->{$type};
+                }
+            }
+        } else {
+            foreach my $type ('E','W','N','U') {
+                $weights{$type} = $defaults->{$type};
+            }
+        }
+        if (ref($lonstatus{'excluded'}) eq 'ARRAY') {
+            if (@{$lonstatus{'excluded'}} > 0) {
+                map {$excluded{$_} = 1; } @{$lonstatus{'excluded'}};
+            }
+        }
+        $datatable .= '<tr'.$css_class.'>'.
+                      '<td class="LC_left_item"><span class="LC_nobreak">'.
+                      $titles->{'errorthreshold'}.
+                      '</span></td><td class="LC_left_item">'.
+                      '<input type="text" name="errorthreshold" value="'.
+                      $threshold.'" size="5" /></td></tr>';
+        $rownum ++;
+        $css_class = $rownum%2?' class="LC_odd_row"':'';
+        $datatable .= '<tr'.$css_class.'>'.
+                      '<td class="LC_left_item">'.
+                      '<span class="LC_nobreak">'.$titles->{'errorweights'}.
+                      '</span></td><td class="LC_left_item"><table><tr>';
+        foreach my $type ('E','W','N','U') {
+            $datatable .= '<td>'.$names->{$type}.'<br />'.
+                          '<input type="text" name="errorweights_'.$type.'" value="'.
+                          $weights{$type}.'" size="5" /></td>';
+        }
+        $datatable .= '</tr></table></tr>';
+        $rownum ++;
+        $css_class = $rownum%2?' class="LC_odd_row"':'';
+        $datatable .= '<tr'.$css_class.'><td class="LC_left_item">'.
+                      $titles->{'errorexcluded'}.'</td>'.
+                      '<td class="LC_left_item"><table>';
+        my $numinrow = 4;
+        my @ids = sort(values(%Apache::lonnet::serverhomeIDs));
+        for (my $i=0; $i<@ids; $i++) {
+            my $rem = $i%($numinrow);
+            if ($rem == 0) {
+                if ($i > 0) {
+                    $datatable .= '</tr>';
+                }
+                $datatable .= '<tr>';
+            }
+            my $check;
+            if ($excluded{$ids[$i]}) {
+                $check = ' checked="checked" ';
+            }
+            $datatable .= '<td class="LC_left_item">'.
+                          '<span class="LC_nobreak"><label>'.
+                          '<input type="checkbox" name="errorexcluded" '.
+                          'value="'.$ids[$i].'"'.$check.' />'.
+                          $ids[$i].'</label></span></td>';
+        }
+        my $colsleft = $numinrow - @ids%($numinrow);
+        if ($colsleft > 1 ) {
+            $datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
+                          '&nbsp;</td>';
+        } elsif ($colsleft == 1) {
+            $datatable .= '<td class="LC_left_item">&nbsp;</td>';
+        }
+        $datatable .= '</tr></table></td></tr>';
+        $rownum ++;
+        $css_class = $rownum%2?' class="LC_odd_row"':'';
+        $datatable .= '<tr'.$css_class.'>'.
+                      '<td class="LC_left_item"><span class="LC_nobreak">'.
+                      $titles->{'errorsysmail'}.
+                      '</span></td><td class="LC_left_item">'.
+                      '<input type="text" name="errorsysmail" value="'.
+                      $sysmail.'" size="5" /></td></tr>';
+        $rownum ++;
     } elsif ($position eq 'bottom') {
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
         my (@posstypes,%usertypeshash);
@@ -3531,6 +3731,11 @@ sub print_contacts {
     return $datatable;
 }
 
+sub core_link_msu {
+    return &Apache::loncommon::modal_link('http://loncapa.org/core.html',
+                                          &mt('LON-CAPA core group - MSU'),600,500);
+}
+
 sub overridden_helpdesk {
     my ($checked,$otheremails,$bccemails,$includeloc,$includestr,$type,$rowid,
         $typetitle,$css_class,$rowstyle,$contacts,$short_titles) = @_;
@@ -3581,7 +3786,7 @@ sub overridden_helpdesk {
                '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 >'.
+               '<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).
@@ -3710,7 +3915,6 @@ sub print_helpsettings {
             push(@jsarray,('notinc','notexc'));
         }
         my $hiddenstr = join("','",@jsarray);
-        $datatable .= &helpsettings_javascript(\@roles_by_num,$maxnum,$hiddenstr,$formname);
         my $context = 'domprefs';
         my $crstype = 'Course';
         my $prefix = 'helproles_';
@@ -3813,7 +4017,9 @@ sub print_helpsettings {
                                                                 \@templateroles,$newcust).
                       &Apache::lonuserutils::custom_role_table('Course',\%full,\%levels,
                                                                \%levelscurrent,$newcust).
-                      '</fieldset></td></tr>';
+                      '</fieldset>'.
+                      &helpsettings_javascript(\@roles_by_num,$maxnum,$hiddenstr,$formname).
+                      '</td></tr>';
         $count ++;
         $$rowtotal += $count;
     }
@@ -4102,26 +4308,32 @@ sub print_ltitools {
     my $confname = $dom.'-domainconfig';
     my $switchserver = &check_switchserver($dom,$confname);
     my $maxnum = scalar(keys(%ordered));
-    my $datatable = &ltitools_javascript($settings);
+    my $datatable;
     my %lt = &ltitools_names();
     my @courseroles = ('cc','in','ta','ep','st');
     my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner);
-    my @fields = ('fullname','firstname','lastname','email','user','roles');
+    my @fields = ('fullname','firstname','lastname','email','roles','user');
     if (keys(%ordered)) {
         my @items = sort { $a <=> $b } keys(%ordered);
         for (my $i=0; $i<@items; $i++) {
             $css_class = $itemcount%2?' class="LC_odd_row"':'';
             my $item = $ordered{$items[$i]};
-            my ($title,$key,$secret,$url,$imgsrc);
+            my ($title,$key,$secret,$url,$lifetime,$imgsrc,%sigsel);
             if (ref($settings->{$item}) eq 'HASH') {
                 $title = $settings->{$item}->{'title'};
                 $url = $settings->{$item}->{'url'};
                 $key = $settings->{$item}->{'key'};
                 $secret = $settings->{$item}->{'secret'};
+                $lifetime = $settings->{$item}->{'lifetime'};
                 my $image = $settings->{$item}->{'image'};
                 if ($image ne '') {
                     $imgsrc = '<img src="'.$image.'" alt="'.&mt('Tool Provider icon').'" />';
                 }
+                if ($settings->{$item}->{'sigmethod'} eq 'HMAC-256') {
+                    $sigsel{'HMAC-256'} = ' selected="selected"';
+                } else {
+                    $sigsel{'HMAC-SHA1'} = ' selected="selected"';
+                }
             }
             my $chgstr = ' onchange="javascript:reorderLTITools(this.form,'."'ltitools_".$item."'".');"';
             $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
@@ -4139,20 +4351,27 @@ sub print_ltitools {
                 &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> '.
+                '<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="20" name="ltitools_title_'.$i.'" value="'.$title.'" /></span> '.
                 ('&nbsp;'x2).
                 '<span class="LC_nobreak">'.$lt{'version'}.':<select name="ltitools_version_'.$i.'">'.
                 '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '.
                 ('&nbsp;'x2).
                 '<span class="LC_nobreak">'.$lt{'msgtype'}.':<select name="ltitools_msgtype_'.$i.'">'.
                 '<option value="basic-lti-launch-request" selected="selected">Launch</option></select></span> '.
+                ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'sigmethod'}.':<select name="ltitools_sigmethod_'.$i.'">'.
+                '<option value="HMAC-SHA1"'.$sigsel{'HMAC-SHA1'}.'>HMAC-SHA1</option>'.
+                '<option value="HMAC-SHA256"'.$sigsel{'HMAC-SHA256'}.'>HMAC-SHA256</option></select></span>'.
                 '<br /><br />'.
-                '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="30" name="ltitools_url_'.$i.'"'.
+                '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="40" name="ltitools_url_'.$i.'"'.
                 ' value="'.$url.'" /></span>'.
                 ('&nbsp;'x2).
                 '<span class="LC_nobreak">'.$lt{'key'}.':'.
                 '<input type="text" size="25" name="ltitools_key_'.$i.'" value="'.$key.'" /></span> '.
                 ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'lifetime'}.':'.
+                '<input type="text" size="5" name="ltitools_lifetime_'.$i.'" value="'.$lifetime.'" /></span> '.
+                ('&nbsp;'x2).
                 '<span class="LC_nobreak">'.$lt{'secret'}.':'.
                 '<input type="password" size="20" name="ltitools_secret_'.$i.'" value="'.$secret.'" />'.
                 '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltitools_secret_'.$i.'.type='."'text'".' } else { this.form.ltitools_secret_'.$i.'.type='."'password'".' }" />'.&mt('Visible input').'</label>'.
@@ -4190,9 +4409,9 @@ sub print_ltitools {
                               '<input type="text" name="ltitools_'.$dimen.'_'.$i.'" size="5" value="'.$currdisp{$dimen}.'" /></label>'.
                               ('&nbsp;'x2);
             }
-            $datatable .= '<br />'.
+            $datatable .= '</span><br />'.
                           '<div class="LC_left_float">'.$lt{'linktext'}.'<br />'.
-                          '<input type="text" name="ltitools_linktext_'.$i.'" size="25" value="'.$currdisp{'linktext'}.'" /></label></div>'.
+                          '<input type="text" name="ltitools_linktext_'.$i.'" size="25" value="'.$currdisp{'linktext'}.'" /></div>'.
                           '<div class="LC_left_float">'.$lt{'explanation'}.'<br />'.
                           '<textarea name="ltitools_explanation_'.$i.'" rows="5" cols="40">'.$currdisp{'explanation'}.
                           '</textarea></div><div style=""></div><br />';
@@ -4240,11 +4459,12 @@ sub print_ltitools {
                 $datatable .= '<input type="file" name="ltitools_image_'.$i.'" value="" />';
             }
             $datatable .= '</span></fieldset>';
-            my (%checkedfields,%rolemaps);
+            my (%checkedfields,%rolemaps,$userincdom);
             if (ref($settings->{$item}) eq 'HASH') {
                 if (ref($settings->{$item}->{'fields'}) eq 'HASH') {
                     %checkedfields = %{$settings->{$item}->{'fields'}};
                 }
+                $userincdom = $settings->{$item}->{'incdom'};
                 if (ref($settings->{$item}->{'roles'}) eq 'HASH') {
                     %rolemaps = %{$settings->{$item}->{'roles'}};
                     $checkedfields{'roles'} = 1;
@@ -4252,16 +4472,40 @@ sub print_ltitools {
             }
             $datatable .= '<fieldset><legend>'.&mt('User data sent on launch').'</legend>'.
                           '<span class="LC_nobreak">';
+            my $userfieldstyle = 'display:none;';
+            my $seluserdom = '';
+            my $unseluserdom = ' selected="selected"';
             foreach my $field (@fields) {
-                my $checked;
+                my ($checked,$onclick,$id,$spacer);
                 if ($checkedfields{$field}) {
                     $checked = ' checked="checked"';
                 }
+                if ($field eq 'user') {
+                    $id = ' id="ltitools_user_field_'.$i.'"';
+                    $onclick = ' onclick="toggleLTITools(this.form,'."'$field','$i'".')"';
+                    if ($checked) {
+                        $userfieldstyle = 'display:inline-block';
+                        if ($userincdom) {
+                            $seluserdom = $unseluserdom;
+                            $unseluserdom = '';
+                        }
+                    }
+                } else {
+                    $spacer = ('&nbsp;' x2);
+                }
                 $datatable .= '<label>'.
-                              '<input type="checkbox" name="ltitools_fields_'.$i.'" value="'.$field.'"'.$checked.' />'.
-                              $lt{$field}.'</label>'.('&nbsp;' x2);
+                              '<input type="checkbox" name="ltitools_fields_'.$i.'" value="'.$field.'"'.$id.$checked.$onclick.' />'.
+                              $lt{$field}.'</label>'.$spacer;
             }
-            $datatable .= '</span></fieldset>'.
+            $datatable .= '</span>';
+            $datatable .= '<div style="'.$userfieldstyle.'" id="ltitools_user_div_'.$i.'">'.
+                          '<span class="LC_nobreak"> : '.
+                          '<select name="ltitools_userincdom_'.$i.'">'.
+                          '<option value="">'.&mt('Select').'</option>'.
+                          '<option value="0"'.$unseluserdom.'>'.&mt('username').'</option>'.
+                          '<option value="1"'.$seluserdom.'>'.&mt('username:domain').'</option>'.
+                          '</select></span></div>';
+            $datatable .= '</fieldset>'.
                           '<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>';
             foreach my $role (@courseroles) {
                 my ($selected,$selectnone);
@@ -4338,21 +4582,26 @@ sub print_ltitools {
         $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
     }
     $datatable .= '</select>&nbsp;'."\n".
-                  '<input type="checkbox" name="ltitools_add" value="1" />'.&mt('Add').'</td>'."\n".
+                  '<input type="checkbox" name="ltitools_add" value="1" />'.&mt('Add').'</span></td>'."\n".
                   '<td colspan="2">'.
                   '<fieldset><legend>'.&mt('Required settings').'</legend>'.
-                  '<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="30" name="ltitools_add_title" value="" /></span> '."\n".
+                  '<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="20" name="ltitools_add_title" value="" /></span> '."\n".
                   ('&nbsp;'x2).
                   '<span class="LC_nobreak">'.$lt{'version'}.':<select name="ltitools_add_version">'.
                   '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '."\n".
                   ('&nbsp;'x2).
                   '<span class="LC_nobreak">'.$lt{'msgtype'}.':<select name="ltitools_add_msgtype">'.
                   '<option value="basic-lti-launch-request" selected="selected">Launch</option></select></span> '.
+                  '<span class="LC_nobreak">'.$lt{'sigmethod'}.':<select name="ltitools_add_sigmethod">'.
+                  '<option value="HMAC-SHA1" selected="selected">HMAC-SHA1</option>'.
+                  '<option value="HMAC-SHA256">HMAC-SHA256</option></select></span>'.
                   '<br />'.
-                  '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="30" name="ltitools_add_url" value="" /></span> '."\n".
+                  '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="40" name="ltitools_add_url" value="" /></span> '."\n".
                   ('&nbsp;'x2).
                   '<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="ltitools_add_key" value="" /></span> '."\n".
                   ('&nbsp;'x2).
+                  '<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" size="5" name="ltitools_add_lifetime" value="300" /></span> '."\n".
+                  ('&nbsp;'x2).
                   '<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="ltitools_add_secret" value="" />'.
                   '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltitools_add_secret.type='."'text'".' } else { this.form.ltitools_add_secret.type='."'password'".' }" />'.&mt('Visible input').'</label></span> '."\n".
                   '</fieldset>'.
@@ -4370,11 +4619,11 @@ sub print_ltitools {
                       '<input type="text" name="ltitools_add_'.$dimen.'" size="5" /></label>'.
                       ('&nbsp;'x2);
     }
-    $datatable .= '<br />'.
+    $datatable .= '</span><br />'.
                   '<div class="LC_left_float">'.$lt{'linktext'}.'<br />'.
-                  '<input type="text" name="ltitools_add_linktext" size="5" /></label></div>'.
+                  '<input type="text" name="ltitools_add_linktext" size="5" /></div>'.
                   '<div class="LC_left_float">'.$lt{'explanation'}.'<br />'.
-                  '<textarea name=ltitools_add_explanation" rows="5" cols="40"></textarea>'.
+                  '<textarea name="ltitools_add_explanation" rows="5" cols="40"></textarea>'.
                   '</div><div style=""></div><br />';
     my %units = (
                   'passback' => 'days',
@@ -4382,7 +4631,7 @@ sub print_ltitools {
                 );
     my %defaulttimes = (
                      'passback' => '7',
-                     'roster' => '300',
+                     'roster'   => '300',
                    );
     foreach my $extra ('passback','roster') {
         my $onclick = ' onclick="toggleLTITools(this.form,'."'$extra','add'".');"';
@@ -4408,12 +4657,26 @@ sub print_ltitools {
                   '<fieldset><legend>'.&mt('User data sent on launch').'</legend>'.
                   '<span class="LC_nobreak">';
     foreach my $field (@fields) {
+        my ($id,$onclick,$spacer);
+        if ($field eq 'user') {
+            $id = ' id="ltitools_user_field_add"';
+            $onclick = ' onclick="toggleLTITools(this.form,'."'$field','add'".')"';
+        } else {
+            $spacer = ('&nbsp;' x2);
+        }
         $datatable .= '<label>'.
-                      '<input type="checkbox" name="ltitools_add_fields" value="'.$field.'" />'.
-                      $lt{$field}.'</label>'.('&nbsp;' x2);
+                      '<input type="checkbox" name="ltitools_add_fields" value="'.$field.'"'.$id.$onclick.' />'.
+                      $lt{$field}.'</label>'.$spacer;
     }
-    $datatable .= '</span></fieldset>'.
-                  '<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>';
+    $datatable .= '</span>'.
+                  '<div style="display:none;" id="ltitools_user_div_add">'.
+                  '<span class="LC_nobreak"> : '.
+                  '<select name="ltitools_userincdom_add">'.
+                  '<option value="" selected="selected">'.&mt('Select').'</option>'.
+                  '<option value="0">'.&mt('username').'</option>'.
+                  '<option value="1">'.&mt('username:domain').'</option>'.
+                  '</select></span></div></fieldset>';
+    $datatable .= '<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>';
     foreach my $role (@courseroles) {
         my ($checked,$checkednone);
         $datatable .= '<td style="text-align: center">'.
@@ -4439,7 +4702,7 @@ sub print_ltitools {
                   '<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".
+                  '</table></fieldset>'."\n".
                   '</td>'."\n".
                   '</tr>'."\n";
     $itemcount ++;
@@ -4451,11 +4714,13 @@ sub ltitools_names {
                                           'title'          => 'Title',
                                           'version'        => 'Version',
                                           'msgtype'        => 'Message Type',
+                                          'sigmethod'      => 'Signature Method',
                                           'url'            => 'URL',
                                           'key'            => 'Key',
+                                          'lifetime'       => 'Nonce lifetime (s)',
                                           'secret'         => 'Secret',
                                           'icon'           => 'Icon',   
-                                          'user'           => 'Username:domain',
+                                          'user'           => 'User',
                                           'fullname'       => 'Full Name',
                                           'firstname'      => 'First Name',
                                           'lastname'       => 'Last Name',
@@ -4495,7 +4760,7 @@ sub print_lti {
         }
     }
     my $maxnum = scalar(keys(%ordered));
-    my $datatable = &lti_javascript($settings);
+    my $datatable;
     my %lt = &lti_names();
     if (keys(%ordered)) {
         my @items = sort { $a <=> $b } keys(%ordered);
@@ -4542,7 +4807,7 @@ sub print_lti {
                 '<input type="password" size="20" name="lti_secret_'.$i.'" value="'.$secret.'" />'.
                 '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.lti_secret_'.$i.'.type='."'text'".' } else { this.form.lti_secret_'.$i.'.type='."'password'".' }" />'.&mt('Visible input').'</label>'.
                 '<input type="hidden" name="lti_id_'.$i.'" value="'.$item.'" /></span>'.
-                '</fieldset>'.&lti_options($i,$current,%lt).'</td></tr>';
+                '</fieldset>'.&lti_options($i,$current,$itemcount,%lt).'</td></tr>';
             $itemcount ++;
         }
     }
@@ -4560,7 +4825,7 @@ sub print_lti {
         $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
     }
     $datatable .= '</select>&nbsp;'."\n".
-                  '<input type="checkbox" name="lti_add" value="1" />'.&mt('Add').'</td>'."\n".
+                  '<input type="checkbox" name="lti_add" value="1" />'.&mt('Add').'</span></td>'."\n".
                   '<td colspan="2">'.
                   '<fieldset><legend>'.&mt('Required settings').'</legend>'.
                   '<span class="LC_nobreak">'.$lt{'consumer'}.
@@ -4569,13 +4834,13 @@ sub print_lti {
                   '<span class="LC_nobreak">'.$lt{'version'}.':<select name="lti_version_add">'.
                   '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '."\n".
                   ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" size="5" name="lti_lifetime_add" value="" /></span> '."\n".
+                  '<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" size="5" name="lti_lifetime_add" value="300" /></span> '."\n".
                   '<br /><br />'.
                   '<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="lti_key_add" value="" /></span> '."\n".
                   ('&nbsp;'x2).
                   '<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="lti_secret_add" value="" />'.
                   '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.lti_secret_add.type='."'text'".' } else { this.form.lti_secret_add.type='."'password'".' }" />'.&mt('Visible input').'</label></span> '."\n".
-                  '</fieldset>'.&lti_options('add',undef,%lt).
+                  '</fieldset>'.&lti_options('add',undef,$itemcount,%lt).
                   '</td>'."\n".
                   '</tr>'."\n";
     $$rowtotal ++;
@@ -4587,7 +4852,7 @@ sub lti_names {
                                           'version'   => 'LTI Version',
                                           'url'       => 'URL',
                                           'key'       => 'Key',
-                                          'lifetime'  => 'Nonce lifetime (seconds)',
+                                          'lifetime'  => 'Nonce lifetime (s)',
                                           'consumer'  => 'LTI Consumer', 
                                           'secret'    => 'Secret',
                                           'email'     => 'Email address',
@@ -4595,12 +4860,14 @@ sub lti_names {
                                           'other'     => 'Other',
                                           'passback'  => 'Can return grades to Consumer:',
                                           'roster'    => 'Can retrieve roster from Consumer:',
+                                          'topmenu'   => 'Display LON-CAPA page header',
+                                          'inlinemenu'=> 'Display LON-CAPA inline menu', 
                                         );
     return %lt;
 }
 
 sub lti_options {
-    my ($num,$current,%lt) = @_;
+    my ($num,$current,$itemcount,%lt) = @_;
     my (%checked,%rolemaps,$crssecsrc,$userfield,$cidfield);
     $checked{'mapuser'}{'sourcedid'} = ' checked="checked"';
     $checked{'mapcrs'}{'course_offering_sourcedid'} = ' checked="checked"';
@@ -4610,11 +4877,22 @@ sub lti_options {
     $checked{'selfenroll'} = {};
     $checked{'crssec'} = {};
     $checked{'crssecsrc'} = {};
-
+    $checked{'lcauth'} = {};
+    $checked{'menuitem'} = {};
+    if ($num eq 'add') {
+        $checked{'lcauth'}{'lti'} = ' checked="checked"';
+    }
     my $userfieldsty = 'none';
     my $crsfieldsty = 'none';
     my $crssecfieldsty = 'none';
     my $secsrcfieldsty = 'none';
+    my $passbacksty = 'none';
+    my $lcauthparm;
+    my $lcauthparmstyle = 'display:none';
+    my $lcauthparmtext;
+    my $menusty;
+    my $numinrow = 4;
+    my %menutitles = &ltimenu_titles();
 
     if (ref($current) eq 'HASH') {
         if (($current->{'mapuser'} ne '') && ($current->{'mapuser'} ne 'lis_person_sourcedid')) {
@@ -4644,12 +4922,24 @@ sub lti_options {
         }
         if ($current->{'makecrs'}) { 
             $checked{'makecrs'}{'Y'} = '  checked="checked"';
-        } 
+        }
         if (ref($current->{'makeuser'}) eq 'ARRAY') {
             foreach my $role (@{$current->{'makeuser'}}) {
                 $checked{'makeuser'}{$role} = ' checked="checked"';
             }
         }
+        if ($current->{'lcauth'} =~ /^(internal|localauth|krb4|krb5|lti)$/) {
+            $checked{'lcauth'}{$1} = ' checked="checked"';
+            unless (($current->{'lcauth'} eq 'lti') || ($current->{'lcauth'} eq 'internal')) {
+                $lcauthparm = $current->{'lcauthparm'};
+                $lcauthparmstyle = 'display:table-row'; 
+                if ($current->{'lcauth'} eq 'localauth') {
+                    $lcauthparmtext = &mt('Local auth argument');
+                } else {
+                    $lcauthparmtext = &mt('Kerberos domain');
+                }
+            }
+        }
         if (ref($current->{'selfenroll'}) eq 'ARRAY') {
             foreach my $role (@{$current->{'selfenroll'}}) {
                 $checked{'selfenroll'}{$role} = ' checked="checked"';
@@ -4671,18 +4961,53 @@ sub lti_options {
         } else {
             $checked{'crssec'}{'N'} = ' checked="checked"';
         }
+        if ($current->{'topmenu'}) {
+            $checked{'topmenu'}{'Y'} = ' checked="checked"';
+        } else {
+            $checked{'topmenu'}{'N'} = ' checked="checked"';
+        }
+        if ($current->{'inlinemenu'}) {
+            $checked{'inlinemenu'}{'Y'} = ' checked="checked"';
+        } else {
+            $checked{'inlinemenu'}{'N'} = ' checked="checked"';
+        }
+        if (($current->{'topmenu'}) || ($current->{'inlinemenu'})) {
+            $menusty = 'inline-block';
+            if (ref($current->{'lcmenu'}) eq 'ARRAY') {
+                foreach my $item (@{$current->{'lcmenu'}}) {
+                    if (exists($menutitles{$item})) {
+                        $checked{'menuitem'}{$item} = ' checked="checked"';
+                    }
+                }
+            }
+        } else {
+            $menusty = 'none';
+        }
     } else {
         $checked{'makecrs'}{'N'} = ' checked="checked"';
         $checked{'crssec'}{'N'} = ' checked="checked"';
+        $checked{'topmenu'}{'N'} = ' checked="checked"';
+        $checked{'inlinemenu'}{'Y'} = ' checked="checked"'; 
+        $checked{'menuitem'}{'grades'} = ' checked="checked"';
+        $menusty = 'inline-block'; 
     }
-    my @coursetypes = ('official','unofficial','community','textbook','placement');
+    my @coursetypes = ('official','unofficial','community','textbook','placement','lti');
     my %coursetypetitles = &Apache::lonlocal::texthash (
                                official   => 'Official',
                                unofficial => 'Unofficial',
                                community  => 'Community',
                                textbook   => 'Textbook',
                                placement  => 'Placement Test',
+                               lti        => 'LTI Provider',
     );
+    my @authtypes = ('internal','krb4','krb5','localauth');
+    my %shortauth = (
+                     internal => 'int',
+                     krb4 => 'krb4',
+                     krb5 => 'krb5',
+                     localauth  => 'loc'
+                    );
+    my %authnames = &authtype_names();
     my @ltiroles = qw(Learner Instructor ContentDeveloper TeachingAssistant Mentor Member Manager Administrator);
     my @lticourseroles = qw(Learner Instructor TeachingAssistant Mentor);
     my @courseroles = ('cc','in','ta','ep','st');
@@ -4690,6 +5015,8 @@ sub lti_options {
     my $onclickcrs = ' onclick="toggleLTI(this.form,'."'crs','$num'".');"';
     my $onclicksec = ' onclick="toggleLTI(this.form,'."'sec','$num'".');"';
     my $onclicksecsrc = ' onclick="toggleLTI(this.form,'."'secsrc','$num'".')"';
+    my $onclicklcauth = ' onclick="toggleLTI(this.form,'."'lcauth','$num'".')"';
+    my $onclickmenu = ' onclick="toggleLTI(this.form,'."'lcmenu','$num'".');"';
     my $output = '<fieldset><legend>'.&mt('Mapping users').'</legend>'.
                  '<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('LON-CAPA username').':&nbsp;';
     foreach my $option ('sourcedid','email','other') {
@@ -4731,6 +5058,29 @@ sub lti_options {
                    $checked{'makeuser'}{$ltirole}.' />'.$ltirole.'</label>&nbsp;</span> ';     
     }
     $output .= '</fieldset>'.
+               '<fieldset><legend>'.&mt('New user accounts created for LTI users').'</legend>'.
+               '<table>'.
+               &modifiable_userdata_row('lti','instdata_'.$num,$current,$numinrow,$itemcount).
+               '</table>'.
+               '<table class="LC_nested"><tr><td class="LC_left_item">LON-CAPA Authentication</td>'.
+               '<td class="LC_left_item">';
+    foreach my $auth ('lti',@authtypes) {
+        my $authtext;
+        if ($auth eq 'lti') {
+            $authtext = &mt('None');
+        } else {
+            $authtext = $authnames{$shortauth{$auth}};
+        }
+        $output .= '<span class="LC_nobreak"><label><input type="radio" name="lti_lcauth_'.$num.
+                   '" value="'.$auth.'"'.$checked{'lcauth'}{$auth}.$onclicklcauth.' />'.
+                   $authtext.'</label></span> &nbsp;';
+    }
+    $output .= '</td></tr>'.
+               '<tr id="lti_lcauth_parmrow_'.$num.'" style="'.$lcauthparmstyle.'">'.
+               '<td class="LC_right_item" colspan="2"><span class="LC_nobreak">'.
+               '<span id="lti_lcauth_parmtext_'.$num.'">'.$lcauthparmtext.'</span>'.
+               '<input type="text" name="lti_lcauthparm_'.$num.'" value="" /></span></td></tr>'.
+               '</table></fieldset>'.
                '<fieldset><legend>'.&mt('Mapping courses').'</legend>'.
                '<div class="LC_floatleft"><span class="LC_nobreak">'.
                &mt('Unique course identifier').':&nbsp;';
@@ -4739,7 +5089,7 @@ sub lti_options {
                    $checked{'mapcrs'}{$option}.$onclickcrs.' />'.$option.'</label>'.
                    ($option eq 'other' ? '' : ('&nbsp;'x2) );
     }
-    $output .= '</div><div class="LC_floatleft" style="display:'.$crsfieldsty.';" id="lti_crsfield_'.$num.'".>'.
+    $output .= '</span></div><div class="LC_floatleft" style="display:'.$crsfieldsty.';" id="lti_crsfield_'.$num.'">'.
                '<input type="text" name="lti_mapcrsfield_'.$num.'" value="'.$cidfield.'" />'.
                '</div><div style="padding:0;clear:both;margin:0;border:0"></div>'.
                '<span class="LC_nobreak">'.&mt('LON-CAPA course type(s)').':&nbsp;';
@@ -4767,7 +5117,7 @@ sub lti_options {
                '<label><input type="radio" name="lti_crssec_'.$num.'" value="0"'.
                $checked{'crssec'}{'N'}.$onclicksec.' />'.&mt('No').'</label>'.('&nbsp;'x2).
                '<label><input type="radio" name="lti_crssec_'.$num.'" value="1"'.
-               $checked{'crssec'}{'Y'}.$onclicksec.' />'.&mt('Yes').'</label><span></div>'.
+               $checked{'crssec'}{'Y'}.$onclicksec.' />'.&mt('Yes').'</label></span></div>'.
                '<div class="LC_floatleft" style="display:'.$crssecfieldsty.';" id="lti_crssecfield_'.$num.'">'.
                '<span class="LC_nobreak">'.&mt('From').':<label>'.
                '<input type="radio" name="lti_crssecsrc_'.$num.'" value="course_section_sourcedid"'.
@@ -4775,25 +5125,66 @@ sub lti_options {
                &mt('Standard field').'</label>'.('&nbsp;'x2).
                '<label><input type="radio" name="lti_crssecsrc_'.$num.'" value="other"'.
                $checked{'crssecsrc'}{'other'}.$onclicksecsrc.' />'.&mt('Other').
-               '</label></div><div class="LC_floatleft" style="display:'.$secsrcfieldsty.';" id="lti_secsrcfield_'.$num.'">'.
+               '</label></span></div><div class="LC_floatleft" style="display:'.$secsrcfieldsty.';" id="lti_secsrcfield_'.$num.'">'.
                '<input type="text" name="lti_customsection_'.$num.'" value="'.$crssecsrc.'" />'.
-               '</div><div style="padding:0;clear:both;margin:0;border:0"></div>'; 
-    foreach my $extra ('passback','roster') {
+               '</div><div style="padding:0;clear:both;margin:0;border:0"></div>';
+    my ($pb1p1chk,$pb1p0chk,$onclickpb);
+    foreach my $extra ('roster','passback') {
         my $checkedon = '';
         my $checkedoff = ' checked="checked"';
+        if ($extra eq 'passback') {
+            $pb1p1chk = ' checked="checked"';
+            $pb1p0chk = '';
+            $onclickpb = ' onclick="toggleLTI(this.form,'."'passback','$num'".');"'; 
+        } else {
+            $onclickpb = ''; 
+        }
         if (ref($current) eq 'HASH') {
             if (($current->{$extra})) {
                 $checkedon = $checkedoff;
                 $checkedoff = '';
+                if ($extra eq 'passback') {
+                    $passbacksty = 'inline-block';
+                }
+                if ($current->{'passbackformat'} eq '1.0') {
+                    $pb1p0chk =  ' checked="checked"';
+                    $pb1p1chk = '';
+                }
             }
         }
         $output .= $lt{$extra}.'&nbsp;'.
-                   '<label><input type="radio" name="lti_'.$extra.'_'.$num.'" value="0"'.$checkedoff.' />'.
+                   '<label><input type="radio" name="lti_'.$extra.'_'.$num.'" value="0"'.$checkedoff.$onclickpb.' />'.
                    &mt('No').'</label>'.('&nbsp;'x2).
-                   '<label><input type="radio" name="lti_'.$extra.'_'.$num.'" value="1"'.$checkedon.' />'.
+                   '<label><input type="radio" name="lti_'.$extra.'_'.$num.'" value="1"'.$checkedon.$onclickpb.' />'.
                    &mt('Yes').'</label><br />';
     }
-    $output .= '</span></fieldset>';
+    $output .= '<div class="LC_floatleft" style="display:'.$passbacksty.';" id="lti_passback_'.$num.'">'.
+               '<span class="LC_nobreak">'.&mt('Grade format').
+               '<label><input type="radio" name="lti_passbackformat_'.$num.'" value="1.1"'.$pb1p1chk.' />'.
+               &mt('Outcomes Service (1.1)').'</label>'.('&nbsp;'x2).
+               '<label><input type="radio" name="lti_passbackformat_'.$num.'" value="1.0"'.$pb1p0chk.'/>'.
+               &mt('Outcomes Extension (1.0)').'</label></span></div></fieldset>'.
+               '<fieldset><legend>'.&mt('Course defaults (Course Coordinator can override)').'</legend>'.
+               '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'topmenu'}.':&nbsp;'.
+               '<label><input type="radio" name="lti_topmenu_'.$num.'" value="0"'.
+               $checked{'topmenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.('&nbsp;'x2).
+               '<label><input type="radio" name="lti_topmenu_'.$num.'" value="1"'.
+               $checked{'topmenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>'.
+               '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
+               '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'inlinemenu'}.':&nbsp;'.
+               '<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="0"'.
+               $checked{'inlinemenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.('&nbsp;'x2).
+               '<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="1"'.
+               $checked{'inlinemenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>';
+     $output .='<div style="padding:0;clear:both;margin:0;border:0"></div>'. 
+               '<div class="LC_floatleft" style="display:'.$menusty.';" id="lti_menufield_'.$num.'">'.
+               '<span class="LC_nobreak">'.&mt('Menu items').':&nbsp;';
+    foreach my $type ('fullname','coursetitle','role','logout','grades') {
+        $output .= '<label><input type="checkbox" name="lti_menuitem_'.$num.'" value="'.$type.'"'.
+                   $checked{'menuitem'}{$type}.' />'.$menutitles{$type}.'</label>'.
+                   ('&nbsp;'x2);
+    }
+    $output .= '</span></div></fieldset>';
 #        '<fieldset><legend>'.&mt('Assigning author roles').'</legend>';
 #
 #    $output .= '</fieldset>'.
@@ -4801,6 +5192,16 @@ sub lti_options {
     return $output;
 }
 
+sub ltimenu_titles {
+    return &Apache::lonlocal::texthash(
+                                        fullname    => 'Full name',
+                                        coursetitle => 'Course title',
+                                        role        => 'Role',
+                                        logout      => 'Logout',
+                                        grades      => 'Grades',
+    );
+}
+
 sub print_coursedefaults {
     my ($position,$dom,$settings,$rowtotal) = @_;
     my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles);
@@ -5279,7 +5680,7 @@ sub print_validation_rows {
                               '</label></span> ';
             }
         } elsif ($item eq 'markup') {
-            $datatable .= '<textarea name="'.$caller.'_validation_markup" cols="50" rows="5" wrap="soft">'.
+            $datatable .= '<textarea name="'.$caller.'_validation_markup" cols="50" rows="5">'.
                            $currvalidation{$item}.
                               '</textarea>';
         }
@@ -5301,7 +5702,7 @@ sub print_validation_rows {
         my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
                                                        'validationdc',%currhash);
         my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-        $datatable .= '</td></tr><tr'.$css_class.'><td>';
+        $datatable .= '<tr'.$css_class.'><td>';
         if ($numdc > 1) {
             $datatable .= &mt('Course creation processed as: (choose Dom. Coord.)');
         } else {
@@ -5938,13 +6339,13 @@ sub print_loadbalancing {
     my $numinrow = 1;
     my $datatable;
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
-    my (%currbalancer,%currtargets,%currrules,%existing);
+    my (%currbalancer,%currtargets,%currrules,%existing,%currcookies);
     if (ref($settings) eq 'HASH') {
         %existing = %{$settings};
     }
     if ((keys(%servers) > 1) || (keys(%existing) > 0)) {
         &get_loadbalancers_config(\%servers,\%existing,\%currbalancer,
-                                  \%currtargets,\%currrules);
+                                  \%currtargets,\%currrules,\%currcookies);
     } else {
         return;
     }
@@ -6021,6 +6422,9 @@ sub print_loadbalancing {
         my %hostherechecked = (
                                   no => ' checked="checked"',
                               );
+        my %balcookiechecked = (
+                                  no => ' checked="checked"', 
+                               );
         foreach my $sparetype (@sparestypes) {
             my $targettable;
             for (my $i=0; $i<$numspares; $i++) {
@@ -6076,6 +6480,11 @@ sub print_loadbalancing {
                 }
             }
         }
+        if ($currcookies{$lonhost}) {
+            %balcookiechecked = (
+                                    yes => ' checked="checked"',
+                                );
+        }
         $datatable .= &mt('Hosting on balancer itself').'<br />'.
                       '<label><input type="radio" name="loadbalancing_target_'.$balnum.'_hosthere" value="no"'.
                       $hostherechecked{'no'}.' />'.&mt('No').'</label><br />';
@@ -6084,7 +6493,12 @@ sub print_loadbalancing {
                           'value="'.$sparetype.'"'.$hostherechecked{$sparetype}.' /><i>'.$typetitles{$sparetype}.
                           '</i></label><br />';
         }
-        $datatable .= '</div></td></tr>'.
+        $datatable .= &mt('Use balancer cookie').'<br />'.
+                      '<label><input type="radio" name="loadbalancing_cookie_'.$balnum.'" value="1"'.
+                      $balcookiechecked{'yes'}.' />'.&mt('Yes').'</label><br />'.
+                      '<label><input type="radio" name="loadbalancing_cookie_'.$balnum.'" value="0"'.
+                      $balcookiechecked{'no'}.' />'.&mt('No').'</label><br />'.
+                      '</div></td></tr>'.
                       &loadbalancing_rules($dom,$intdom,$currrules{$lonhost},
                                            $othertitle,$usertypes,$types,\%servers,
                                            \%currbalancer,$lonhost,
@@ -6098,10 +6512,11 @@ sub print_loadbalancing {
 }
 
 sub get_loadbalancers_config {
-    my ($servers,$existing,$currbalancer,$currtargets,$currrules) = @_;
+    my ($servers,$existing,$currbalancer,$currtargets,$currrules,$currcookies) = @_;
     return unless ((ref($servers) eq 'HASH') &&
                    (ref($existing) eq 'HASH') && (ref($currbalancer) eq 'HASH') &&
-                   (ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH'));
+                   (ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH') &&
+                   (ref($currcookies) eq 'HASH'));
     if (keys(%{$existing}) > 0) {
         my $oldlonhost;
         foreach my $key (sort(keys(%{$existing}))) {
@@ -6120,6 +6535,9 @@ sub get_loadbalancers_config {
                 $currbalancer->{$key} = 1;
                 $currtargets->{$key} = $existing->{$key}{'targets'};
                 $currrules->{$key} = $existing->{$key}{'rules'};
+                if ($existing->{$key}{'cookie'}) {
+                    $currcookies->{$key} = 1;
+                }
             }
         }
     } else {
@@ -6315,6 +6733,10 @@ sub contact_titles {
                    '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',
+                   'errorthreshold'  => 'Error/warning threshold for status e-mail',
+                   'errorsysmail'    => 'Error threshold for e-mail to core group',
+                   'errorweights'    => 'Weights used to compute error count',
+                   'errorexcluded'   => 'Servers with unsent updates excluded from count',
                  );
     my %short_titles = &Apache::lonlocal::texthash (
                            adminemail   => 'Admin E-mail address',
@@ -6373,8 +6795,9 @@ sub courserequest_titles {
                                    community  => 'Communities',
                                    textbook   => 'Textbook',
                                    placement  => 'Placement tests',
+                                   lti        => 'LTI Provider',
                                    norequest  => 'Not allowed',
-                                   approval   => 'Approval by Dom. Coord.',
+                                   approval   => 'Approval by DC',
                                    validate   => 'With validation',
                                    autolimit  => 'Numerical limit',
                                    unlimited  => '(blank for unlimited)',
@@ -6486,7 +6909,7 @@ sub print_usercreation {
         }
     } else {
         my @contexts = ('author','course','domain');
-        my @authtypes = ('int','krb4','krb5','loc');
+        my @authtypes = ('int','krb4','krb5','loc','lti');
         my %checked;
         if (ref($settings) eq 'HASH') {
             if (ref($settings->{'authtypes'}) eq 'HASH') {
@@ -6603,7 +7026,7 @@ sub print_selfcreation {
         $datatable .= '<tr'.$css_class.'>'.
                      '<td class="LC_left_item">'.&mt('Mapping of Shibboleth environment variable names to user data fields (SSO auth)').'</td>'.
                      '<td class="LC_left_item">'."\n".
-                     '<table><tr><td>'."\n";
+                     '<table>'."\n";
         for (my $i=0; $i<@fields; $i++) {
             $rem = $i%($numperrow);
             if ($rem == 0) {
@@ -7226,6 +7649,7 @@ sub authtype_names {
                       krb4   => 'Kerberos 4',
                       krb5   => 'Kerberos 5',
                       loc    => 'Local',
+                      lti    => 'LTI',
                   );
     return %lt;
 }
@@ -7294,12 +7718,13 @@ sub print_defaults {
                           '<td><span class="LC_nobreak">'.$titles->{$item}.
                           '</span></td><td class="LC_right_item" colspan="3">';
             if ($item eq 'auth_def') {
-                my @authtypes = ('internal','krb4','krb5','localauth');
+                my @authtypes = ('internal','krb4','krb5','localauth','lti');
                 my %shortauth = (
                                  internal => 'int',
                                  krb4 => 'krb4',
                                  krb5 => 'krb5',
-                                 localauth  => 'loc'
+                                 localauth  => 'loc',
+                                 lti => 'lti',
                                 );
                 my %authnames = &authtype_names();
                 foreach my $auth (@authtypes) {
@@ -7387,7 +7812,7 @@ sub print_defaults {
                                    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%">';
+                $datatable .= '<table width="100%">';
                 foreach my $option (@options) {
                     my $checked = ' ';
                     my $onclick;
@@ -7717,7 +8142,7 @@ sub print_coursecategories {
                              '<input type="radio" name="coursecat_'.$item.'" value="'.$type.'"'.$ischecked.
                              ' />'.$lt{$type}.'</label>&nbsp;';
            }
-           $datatable .= '</td></tr>';
+           $datatable .= '</span></td></tr>';
            $itemcount ++;
         }
         $$rowtotal += $itemcount;
@@ -7803,7 +8228,7 @@ sub print_coursecategories {
                   $can_catcomm_dom.' value="dom" />'.$level{'dom'}.'</label>&nbsp;'.
                   '<label><input type="radio" name="categorizecomm"'.
                   $can_catcomm_comm.'value="comm" />'.$level{'comm'}.'</label></span></td>'.
-                  '</tr><tr>'.
+                  '</tr><tr class="LC_odd_row">'.
                   '<td>'.$title{'togglecatsplace'}.'</td>'.
                   '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
                   '<input type="radio" name="togglecatsplace"'.
@@ -7960,7 +8385,7 @@ sub print_coursecategories {
                 $datatable .= &initialize_categories($itemcount);
             }
         } else {
-            $datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[1]->{'col2'}.'</td>'
+            $datatable .= '<tr><td class="LC_right_item">'.$hdritem->{'header'}->[1]->{'col2'}.'</td></tr>'
                           .&initialize_categories($itemcount);
         }
         $$rowtotal += $itemcount;
@@ -8008,7 +8433,7 @@ sub print_serverstatuses {
                       '<span class="LC_nobreak">'.
                       '<input type="text" name="'.$type.'_machines" '.
                       'value="'.$machineaccess{$type}.'" size="10" />'.
-                      '</td></tr>'."\n";
+                      '</span></td></tr>'."\n";
     }
     $$rowtotal += $rownum;
     return $datatable;
@@ -8236,20 +8661,23 @@ sub initialize_categories {
                       communities => 'Communities',
                       placement   => 'Placement Tests',
                         );
-    my $select0 = ' selected="selected"';
-    my $select1 = '';
+    my %selnum = (
+                   instcode    => '0',
+                   communities => '1',
+                   placement   => '2',
+                 );
+    my %selected;
     foreach my $default ('instcode','communities','placement') {
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $chgstr = ' onchange="javascript:reorderCats(this.form,'."'',$default"."_pos','0'".');"';
-        if (($default eq 'communities') || ($default eq 'placement')) {
-            $select1 = $select0;
-            $select0 = '';
-        }
+        $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','0'".');"';
+        map { $selected{$selnum{$_}} = '' } keys(%selnum);
+        $selected{$selnum{$default}} = ' selected="selected"';
         $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
-                     .'<select name="'.$default.'_pos">'
-                     .'<option value="0"'.$select0.'>1</option>'
-                     .'<option value="1"'.$select1.'>2</option>'
-                     .'<option value="2">3</option></select>&nbsp;'
+                     .'<select name="'.$default.'_pos"'.$chgstr.'>'
+                     .'<option value="0"'.$selected{'0'}.'>1</option>'
+                     .'<option value="1"'.$selected{'1'}.'>2</option>'
+                     .'<option value="2"'.$selected{'2'}.'>3</option>'
+                     .'<option value="3">4</option></select>&nbsp;'
                      .$default_names{$default}
                      .'</span></td><td><span class="LC_nobreak">'
                      .'<label><input type="radio" name="'.$default.'" value="1" checked="checked" />'
@@ -8264,9 +8692,11 @@ sub initialize_categories {
                   .'<select name="addcategory_pos"'.$chgstr.'>'
                   .'<option value="0">1</option>'
                   .'<option value="1">2</option>'
-                  .'<option value="2" selected="selected">3</option></select>&nbsp;'
-                  .&mt('Add category').'</td><td>'.&mt('Name:')
-                  .'&nbsp;<input type="text" size="20" name="addcategory_name" value="" /></td></tr>';
+                  .'<option value="2">3</option>'
+                  .'<option value="3" selected="selected">4</option></select>&nbsp;'
+                  .&mt('Add category').'</span></td><td><span class="LC_nobreak">'.&mt('Name:')
+                  .'&nbsp;<input type="text" size="20" name="addcategory_name" value="" /></span>'
+                  .'</td></tr>';
     return $datatable;
 }
 
@@ -8321,7 +8751,7 @@ sub build_category_rows {
                             pop(@{$path});
                         }
                     } else {
-                        $text .= &mt('Add subcategory:').'&nbsp;</span><input type="textbox" size="20" name="addcategory_name_';
+                        $text .= &mt('Add subcategory:').'&nbsp;</span><input type="text" size="20" name="addcategory_name_';
                         if ($j == $numchildren) {
                             $text .= $name;
                         } else {
@@ -8344,7 +8774,7 @@ sub build_category_rows {
                 my $colspan;
                 if ($parent ne 'instcode') {
                     $colspan = $maxdepth - $depth - 1;
-                    $text .= '<td colspan="'.$colspan.'">'.&mt('Add subcategory:').'<input type="textbox" size="20" name="subcat_'.$name.'" value="" /></td>';
+                    $text .= '<td colspan="'.$colspan.'">'.&mt('Add subcategory:').'<input type="text" size="20" name="subcat_'.$name.'" value="" /></td>';
                 }
             }
         }
@@ -8375,6 +8805,8 @@ sub modifiable_userdata_row {
         } else {
             $rolename = $role;
         }
+    } elsif ($context eq 'lti') {
+        $rolename = &mt('Institutional data used (if available)');
     } else {
         if ($role eq 'cr') {
             $rolename = &mt('Custom role');
@@ -8417,30 +8849,32 @@ sub modifiable_userdata_row {
               '<td class="LC_left_item" colspan="2"><table>';
     my $rem;
     my %checks;
+    my %current;
     if (ref($settings) eq 'HASH') {
-        if (ref($settings->{$context}) eq 'HASH') {
+        my $hashref;
+        if ($context eq 'lti') {
+            if (ref($settings) eq 'HASH') {
+                $hashref = $settings->{'instdata'};
+            }
+        } elsif (ref($settings->{$context}) eq 'HASH') {
             if (ref($settings->{$context}->{$role}) eq 'HASH') {
-                my $hashref = $settings->{$context}->{$role};
-                if ($role eq 'emailusername') {
-                    if ($statustype) {
-                        if (ref($settings->{$context}->{$role}->{$statustype}) eq 'HASH') {
-                            $hashref = $settings->{$context}->{$role}->{$statustype};
-                            if (ref($hashref) eq 'HASH') { 
-                                foreach my $field (@fields) {
-                                    if ($hashref->{$field}) {
-                                        $checks{$field} = $hashref->{$field};
-                                    }
-                                }
-                            }
-                        }
+                $hashref = $settings->{'lti_instdata'};
+            }
+            if ($role eq 'emailusername') {
+                if ($statustype) {
+                    if (ref($settings->{$context}->{$role}->{$statustype}) eq 'HASH') {
+                        $hashref = $settings->{$context}->{$role}->{$statustype};
                     }
-                } else {
-                    if (ref($hashref) eq 'HASH') {
-                        foreach my $field (@fields) {
-                            if ($hashref->{$field}) {
-                                $checks{$field} = ' checked="checked" ';
-                            }
-                        }
+                }
+            }
+        }
+        if (ref($hashref) eq 'HASH') { 
+            foreach my $field (@fields) {
+                if ($hashref->{$field}) {
+                    if ($role eq 'emailusername') {
+                        $checks{$field} = $hashref->{$field};
+                    } else {
+                        $checks{$field} = ' checked="checked" ';
                     }
                 }
             }
@@ -8460,7 +8894,7 @@ sub modifiable_userdata_row {
         unless ($role eq 'emailusername') {
             if (exists($checks{$fields[$i]})) {
                 $check = $checks{$fields[$i]}
-            } else {
+            } elsif ($context ne 'lti') {
                 if ($role eq 'st') {
                     if (ref($settings) ne 'HASH') {
                         $check = ' checked="checked" '; 
@@ -8470,6 +8904,7 @@ sub modifiable_userdata_row {
         }
         $output .= '<td class="LC_left_item">'.
                    '<span class="LC_nobreak">';
+        my $prefix = 'canmodify';
         if ($role eq 'emailusername') {
             unless ($checks{$fields[$i]} =~ /^(required|optional)$/) {
                 $checks{$fields[$i]} = 'omit';
@@ -8480,13 +8915,16 @@ sub modifiable_userdata_row {
                     $checked='checked="checked" ';
                 }
                 $output .= '<label>'.
-                           '<input type="radio" name="canmodify_'.$item.'_'.$fields[$i].'" value="'.$option.'" '.$checked.'/>'.
+                           '<input type="radio" name="'.$prefix.'_'.$item.'_'.$fields[$i].'" value="'.$option.'" '.$checked.'/>'.
                            &mt($option).'</label>'.('&nbsp;' x2);
             }
             $output .= '<i>'.$fieldtitles{$fields[$i]}.'</i>';
         } else {
+            if ($context eq 'lti') {
+                $prefix = 'lti';
+            }
             $output .= '<label>'.
-                       '<input type="checkbox" name="canmodify_'.$role.'" '.
+                       '<input type="checkbox" name="'.$prefix.'_'.$role.'" '.
                        'value="'.$fields[$i].'"'.$check.'/>'.$fieldtitles{$fields[$i]}.
                        '</label>';
         }
@@ -8588,7 +9026,7 @@ sub insttypes_row {
         }
         $output .= '&nbsp;';  
     } else {
-        if (($rem == 0) && (@{$types} > 0)) {
+        if ($rem == 0) {
             $output .= '<tr>';
         }
         if ($colsleft > 1) {
@@ -9896,7 +10334,7 @@ sub modify_quotas {
         $context = $action;
     }
     if ($context eq 'requestcourses') {
-        @usertools = ('official','unofficial','community','textbook','placement');
+        @usertools = ('official','unofficial','community','textbook','placement','lti');
         @options =('norequest','approval','validate','autolimit');
         %validations = &Apache::lonnet::auto_courserequest_checks($dom);
         %titles = &courserequest_titles();
@@ -9945,7 +10383,7 @@ sub modify_quotas {
         my @approvalnotify = &Apache::loncommon::get_env_multiple('form.'.$context.'notifyapproval');
         @approvalnotify = sort(@approvalnotify);
         $confhash{'notify'}{'approval'} = join(',',@approvalnotify);
-        my @crstypes = ('official','unofficial','community','textbook','placement');
+        my @crstypes = ('official','unofficial','community','textbook','placement','lti');
         my @hasuniquecode = &Apache::loncommon::get_env_multiple('form.uniquecode');
         foreach my $type (@hasuniquecode) {
             if (grep(/^\Q$type\E$/,@crstypes)) {
@@ -10644,8 +11082,11 @@ sub modify_ltitools {
                 $allpos[$position] = $newid;
             }
             $changes{$newid} = 1;
-            foreach my $item ('title','url','key','secret') {
+            foreach my $item ('title','url','key','secret','lifetime') {
                 $env{'form.ltitools_add_'.$item} =~ s/(`)/'/g;
+                if ($item eq 'lifetime') {
+                    $env{'form.ltitools_add_'.$item} =~ s/[^\d.]//g;
+                }
                 if ($env{'form.ltitools_add_'.$item}) {
                     if (($item eq 'key') || ($item eq 'secret')) {
                         $encconfig{$newid}{$item} = $env{'form.ltitools_add_'.$item};
@@ -10660,6 +11101,11 @@ sub modify_ltitools {
             if ($env{'form.ltitools_add_msgtype'} eq 'basic-lti-launch-request') {
                 $confhash{$newid}{'msgtype'} = $env{'form.ltitools_add_msgtype'};
             }
+            if ($env{'form.ltitools_add_sigmethod'} eq 'HMAC-SHA256') {
+                $confhash{$newid}{'sigmethod'} = $env{'form.ltitools_add_sigmethod'};
+            } else {
+                $confhash{$newid}{'sigmethod'} = 'HMAC-SHA1';
+            }
             foreach my $item ('width','height','linktext','explanation') {
                 $env{'form.ltitools_add_'.$item} =~ s/^\s+//;
                 $env{'form.ltitools_add_'.$item} =~ s/\s+$//;
@@ -10722,6 +11168,13 @@ sub modify_ltitools {
                     }
                 }
             }
+            if (ref($confhash{$newid}{'fields'}) eq 'HASH') {
+                if ($confhash{$newid}{'fields'}{'user'}) {
+                    if ($env{'form.ltitools_userincdom_add'}) {
+                        $confhash{$newid}{'incdom'} = 1;
+                    }
+                }
+            }
             my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig');
             foreach my $item (@courseconfig) {
                 $confhash{$newid}{'crsconf'}{$item} = 1;
@@ -10768,7 +11221,7 @@ sub modify_ltitools {
                 } else {
                     my $newpos = $env{'form.ltitools_'.$itemid};
                     $newpos =~ s/\D+//g;
-                    foreach my $item ('title','url') {
+                    foreach my $item ('title','url','lifetime') {
                         $confhash{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i};
                         if ($domconfig{$action}{$itemid}{$item} ne $confhash{$itemid}{$item}) {
                             $changes{$itemid} = 1;
@@ -10786,6 +11239,18 @@ sub modify_ltitools {
                     if ($env{'form.ltitools_msgtype_'.$i} eq 'basic-lti-launch-request') {
                         $confhash{$itemid}{'msgtype'} = $env{'form.ltitools_msgtype_'.$i};
                     }
+                    if ($env{'form.ltitools_sigmethod_'.$i} eq 'HMAC-SHA256') {
+                        $confhash{$itemid}{'sigmethod'} = $env{'form.ltitools_sigmethod_'.$i};
+                    } else {
+                        $confhash{$itemid}{'sigmethod'} = 'HMAC-SHA1'; 
+                    }
+                    if ($domconfig{$action}{$itemid}{'sigmethod'} eq '') {
+                        if ($confhash{$itemid}{'sigmethod'} ne 'HMAC-SHA1') {
+                            $changes{$itemid} = 1;
+                        }
+                    } elsif ($domconfig{$action}{$itemid}{'sigmethod'} ne $confhash{$itemid}{'sigmethod'}) {
+                        $changes{$itemid} = 1;
+                    }
                     foreach my $size ('width','height') {
                         $env{'form.ltitools_'.$size.'_'.$i} =~ s/^\s+//;
                         $env{'form.ltitools_'.$size.'_'.$i} =~ s/\s+$//;
@@ -10840,7 +11305,7 @@ sub modify_ltitools {
                         if ($env{'form.ltitools_'.$extra.'_'.$i}) {
                             $confhash{$itemid}{$extra} = 1;
                             if ($env{'form.ltitools_'.$extra.'valid_'.$i} ne '') {
-                                my $lifetime = $env{'form.ltitools_'.$extra.'valid_add'};
+                                my $lifetime = $env{'form.ltitools_'.$extra.'valid_'.$i};
                                 $lifetime =~ s/^\s+|\s+$//g;
                                 if ($lifetime =~ /^\d+\.?\d*$/) {
                                     $confhash{$itemid}{$extra.'valid'} = $lifetime;
@@ -10899,6 +11364,16 @@ sub modify_ltitools {
                             }
                         }
                     }
+                    if (ref($confhash{$itemid}{'fields'}) eq 'HASH') {
+                        if ($confhash{$itemid}{'fields'}{'user'}) {
+                            if ($env{'form.ltitools_userincdom_'.$i}) {
+                                $confhash{$itemid}{'incdom'} = 1;
+                            }
+                            if ($domconfig{$action}{$itemid}{'incdom'} ne $confhash{$itemid}{'incdom'}) {
+                                $changes{$itemid} = 1;
+                            }
+                        }
+                    }
                     $allpos[$newpos] = $itemid;
                 }
                 if ($imgdeletions{$itemid}) {
@@ -11032,7 +11507,7 @@ sub modify_ltitools {
                     $resulttext .= '</li><ul>';
                     my $position = $pos + 1;
                     $resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>';
-                    foreach my $item ('version','msgtype','url') {
+                    foreach my $item ('version','msgtype','sigmethod','url','lifetime') {
                         if ($confhash{$itemid}{$item} ne '') {
                             $resulttext .= '<li>'.$lt{$item}.':&nbsp;'.$confhash{$itemid}{$item}.'</li>';
                         }
@@ -11109,6 +11584,13 @@ sub modify_ltitools {
                         }
                         if ($fieldlist) {
                             $fieldlist =~ s/,$//;
+                            if ($confhash{$itemid}{'fields'}{'user'}) {
+                                if ($confhash{$itemid}{'incdom'}) {
+                                    $fieldlist .= ' ('.&mt('username:domain').')';
+                                } else {
+                                    $fieldlist .= ' ('.&mt('username').')';
+                                }
+                            }
                             $resulttext .= '<li>'.&mt('Data sent').':'.$fieldlist.'</li>';
                         }
                     }
@@ -11245,11 +11727,14 @@ sub modify_lti {
                                textbook   => 'Textbook',
                                placement  => 'Placement Test',
     );
+    my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
     my %lt = &lti_names();
     map { $posslti{$_} = 1; } @ltiroles;
     map { $posslticrs{$_} = 1; } @lticourseroles;
     map { $posscrstype{$_} = 1; } @coursetypes;
-    
+
+    my %menutitles = &ltimenu_titles();
+
     my (@items,%deletions,%itemids);
     if ($env{'form.lti_add'}) {
         my $consumer = $env{'form.lti_consumer_add'};
@@ -11337,6 +11822,30 @@ sub modify_lti {
             }
         }
         $confhash{$itemid}{'makeuser'} = \@makeuser;
+        if (@makeuser) {
+            my $lcauth = $env{'form.lti_lcauth_'.$idx};
+            if ($lcauth =~ /^(internal|krb4|krb5|localauth)$/) {
+                $confhash{$itemid}{'lcauth'} = $lcauth;
+                if ($lcauth ne 'internal') {
+                    my $lcauthparm = $env{'form.lti_lcauthparm_'.$idx};
+                    $lcauthparm =~ s/^(\s+|\s+)$//g;
+                    $lcauthparm =~ s/`//g;
+                    if ($lcauthparm ne '') {
+                        $confhash{$itemid}{'lcauthparm'} = $lcauthparm;
+                    }
+                }
+            } else {
+                $confhash{$itemid}{'lcauth'} = 'lti';
+            }
+        }
+        my @possinstdata =  &Apache::loncommon::get_env_multiple('form.lti_instdata_'.$idx);
+        if (@possinstdata) {
+            foreach my $field (@possinstdata) {
+                if (exists($fieldtitles{$field})) {
+                    push(@{$confhash{$itemid}{'instdata'}});
+                }
+            }
+        }
         if (($env{'form.lti_mapcrs_'.$idx} eq 'course_offering_sourcedid') ||
             ($env{'form.lti_mapcrs_'.$idx} eq 'context_id'))  {
             $confhash{$itemid}{'mapcrs'} = $env{'form.lti_mapcrs_'.$idx};
@@ -11377,18 +11886,44 @@ sub modify_lti {
                 }
             }
         }
-        foreach my $field ('passback','roster') {
+        foreach my $field ('passback','roster','topmenu','inlinemenu') {
             if ($env{'form.lti_'.$field.'_'.$idx}) {
                 $confhash{$itemid}{$field} = 1;
             }
         }
+        if ($env{'form.lti_passback_'.$idx}) {
+            if ($env{'form.lti_passbackformat_'.$idx} eq '1.0') {
+                $confhash{$itemid}{'passbackformat'} = '1.0';
+            } else {
+                $confhash{$itemid}{'passbackformat'} = '1.1';
+            }
+        }
+        if ($env{'form.lti_topmenu_'.$idx} || $env{'form.lti_inlinemenu_'.$idx}) {
+            $confhash{$itemid}{lcmenu} = [];
+            my @possmenu = &Apache::loncommon::get_env_multiple('form.lti_menuitem_'.$idx);
+            foreach my $field (@possmenu) {
+                if (exists($menutitles{$field})) {
+                    if ($field eq 'grades') {
+                        next unless ($env{'form.lti_inlinemenu_'.$idx});
+                    }
+                    push(@{$confhash{$itemid}{lcmenu}},$field);
+                }
+            }
+        }
         unless (($idx eq 'add') || ($changes{$itemid})) {
-            foreach my $field ('mapuser','mapcrs','section','passback','roster') {
+            foreach my $field ('mapuser','mapcrs','makecrs','section','passback','roster','lcauth','lcauthparm','topmenu','inlinemenu') {
                 if ($domconfig{$action}{$itemid}{$field} ne $confhash{$itemid}{$field}) {
                     $changes{$itemid} = 1;
                 }
             }
-            foreach my $field ('makeuser','mapcrstype','selfenroll') {
+            unless ($changes{$itemid}) {
+                if ($domconfig{$action}{$itemid}{'passback'} eq $confhash{$itemid}{'passback'}) {
+                    if ($domconfig{$action}{$itemid}{'passbackformat'} ne $confhash{$itemid}{'passbackformat'}) {
+                        $changes{$itemid} = 1;
+                    }
+                }
+            }
+            foreach my $field ('makeuser','mapcrstype','selfenroll','instdata','lcmenu') {
                 unless ($changes{$itemid}) {
                     if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') {
                         if (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
@@ -11534,11 +12069,35 @@ sub modify_lti {
                     if (ref($confhash{$itemid}{'makeuser'}) eq 'ARRAY') {
                         if (@{$confhash{$itemid}{'makeuser'}} > 0) { 
                             $resulttext .= '<li>'.&mt('Following roles may create user accounts: [_1]',
-                                                      join(', ',@{$confhash{$itemid}{'makeuser'}})).'</li>';
+                                                      join(', ',@{$confhash{$itemid}{'makeuser'}})).'<br />';
+                            if ($confhash{$itemid}{'lcauth'} eq 'lti') {
+                                $resulttext .= &mt('New users will only be able to authenticate via LTI').'</li>';
+                            } else {
+                                $resulttext .= &mt('New users will be assigned LON-CAPA authentication: [_1]',
+                                                   $confhash{$itemid}{'lcauth'});
+                                if ($confhash{$itemid}{'lcauth'} eq 'internal') {
+                                    $resulttext .= '; '.&mt('a randomly generated password will be created');
+                                } elsif ($confhash{$itemid}{'lcauth'} eq 'localauth') {
+                                    if ($confhash{$itemid}{'lcauthparm'} ne '') {
+                                        $resulttext .= ' '.&mt('with argument: [_1]',$confhash{$itemid}{'lcauthparm'});
+                                    }
+                                } else {
+                                    $resulttext .= '; '.&mt('Kerberos domain: [_1]',$confhash{$itemid}{'lcauthparm'});
+                                }
+                            }
+                            $resulttext .= '</li>';
                         } else {
                             $resulttext .= '<li>'.&mt('User account creation not permitted.').'</li>';
                         }
                     }
+                    if (ref($confhash{$itemid}{'instdata'}) eq 'ARRAY') {
+                        if (@{$confhash{$itemid}{'instdata'}} > 0) {
+                            $resulttext .= '<li>'.&mt('Institutional data will be used when creating a new user for: [_1]',
+                                                      join(', ',map { $fieldtitles{$_}; } @{$confhash{$itemid}{'instdata'}})).'</li>';
+                        } else {
+                            $resulttext .= '<li>'.&mt('No institutional data used when creating a new user.').'</li>';
+                        }
+                    }
                     if ($confhash{$itemid}{'mapcrs'}) {
                         $resulttext .= '<li>'.&mt('Unique course identifier').': '.$confhash{$itemid}{'mapcrs'}.'</li>';
                     }
@@ -11576,15 +12135,30 @@ sub modify_lti {
                     } else {
                         $resulttext .= '<li>'.&mt('No section assignment').'</li>';
                     }
-                    foreach my $item ('passback','roster') {
-                        $resulttext .= '<li>'.$lt{$item}.'&nbsp;';
+                    foreach my $item ('passback','roster','topmenu','inlinemenu') {
+                        $resulttext .= '<li>'.$lt{$item}.':&nbsp;';
                         if ($confhash{$itemid}{$item}) {
                             $resulttext .= &mt('Yes');
+                            if ($item eq 'passback') {
+                                if ($confhash{$itemid}{'passbackformat'} eq '1.0') {
+                                    $resulttext .= '&nbsp;('.&mt('Outcomes Extension (1.0)').')';
+                                } elsif ($confhash{$itemid}{'passbackformat'} eq '1.1') {
+                                    $resulttext .= '&nbsp;('.&mt('Outcomes Service (1.1)').')';
+                                }
+                            }
                         } else {
                             $resulttext .= &mt('No');
                         }
                         $resulttext .= '</li>';
                     }
+                    if (ref($confhash{$itemid}{'lcmenu'}) eq 'ARRAY') {
+                        if (@{$confhash{$itemid}{'lcmenu'}} > 0) {
+                            $resulttext .= '<li>'.&mt('Menu items:').' '.
+                                           join(', ', map { $menutitles{$_}; } (@{$confhash{$itemid}{'lcmenu'}})).'</li>'; 
+                        } else {
+                            $resulttext .= '<li>'.&mt('No menu items displayed in header or online menu').'</li>'; 
+                        }
+                    }
                     $resulttext .= '</ul></li>';
                 }
             }
@@ -12231,7 +12805,8 @@ sub modify_contacts {
     my @contacts = ('supportemail','adminemail');
     my @mailings = ('errormail','packagesmail','helpdeskmail','otherdomsmail',
                     'lonstatusmail','requestsmail','updatesmail','idconflictsmail');
-    my @toggles = ('reporterrors','reportupdates');
+    my @toggles = ('reporterrors','reportupdates','reportstatus');
+    my @lonstatus = ('threshold','sysmail','weights','excluded');
     my ($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields();
     foreach my $type (@mailings) {
         @{$newsetting{$type}} = 
@@ -12264,6 +12839,41 @@ sub modify_contacts {
             $contacts_hash{'contacts'}{$item} = $env{'form.'.$item};
         }
     }
+    my ($lonstatus_defs,$lonstatus_names) = &Apache::loncommon::lon_status_items();
+    foreach my $item (@lonstatus) {
+        if ($item eq 'excluded') {
+            my (%serverhomes,@excluded);
+            map { $serverhomes{$_} = 1; } values(%Apache::lonnet::serverhomeIDs);
+            my @possexcluded = &Apache::loncommon::get_env_multiple('form.errorexcluded');
+            if (@possexcluded) {
+                foreach my $id (sort(@possexcluded)) {
+                    if ($serverhomes{$id}) {
+                        push(@excluded,$id);
+                    }
+                }
+            }
+            if (@excluded) {
+                $contacts_hash{'contacts'}{'lonstatus'}{$item} = \@excluded;
+            }
+        } elsif ($item eq 'weights') {
+            foreach my $type ('E','W','N') {
+                $env{'form.error'.$item.'_'.$type} =~ s/^\s+|\s+$//g;
+                if ($env{'form.error'.$item.'_'.$type} =~ /^\d+$/) {
+                    unless ($env{'form.error'.$item.'_'.$type} == $lonstatus_defs->{$type}) {
+                        $contacts_hash{'contacts'}{'lonstatus'}{$item}{$type} =
+                            $env{'form.error'.$item.'_'.$type};
+                    }
+                }
+            }
+        } elsif (($item eq 'threshold') || ($item eq 'sysmail')) {
+            $env{'form.error'.$item} =~ s/^\s+|\s+$//g;
+            if ($env{'form.error'.$item} =~ /^\d+$/) {
+                unless ($env{'form.error'.$item} == $lonstatus_defs->{$item}) {
+                    $contacts_hash{'contacts'}{'lonstatus'}{$item} = $env{'form.error'.$item};
+                }
+            }
+        }
+    }
     if ((ref($fields) eq 'ARRAY') && (ref($possoptions) eq 'HASH')) {
         foreach my $field (@{$fields}) {
             if (ref($possoptions->{$field}) eq 'ARRAY') {
@@ -12402,6 +13012,76 @@ sub modify_contacts {
                 }
             }
         }
+        if (ref($currsetting{'lonstatus'}) eq 'HASH') {
+            foreach my $key ('excluded','weights','threshold','sysmail') {
+                if ($key eq 'excluded') {
+                    if ((ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') &&
+                        (ref($contacts_hash{contacts}{lonstatus}{excluded}) eq 'ARRAY')) {
+                        if ((ref($currsetting{'lonstatus'}{$key}) eq 'ARRAY') &&
+                            (@{$currsetting{'lonstatus'}{$key}})) {
+                            my @diffs =
+                                &Apache::loncommon::compare_arrays($contacts_hash{contacts}{lonstatus}{excluded},
+                                                                   $currsetting{'lonstatus'}{$key});
+                            if (@diffs) {
+                                push(@{$changes{'lonstatus'}},$key);
+                            }
+                        } elsif (@{$contacts_hash{contacts}{lonstatus}{excluded}}) {
+                            push(@{$changes{'lonstatus'}},$key);
+                        }
+                    } elsif ((ref($currsetting{'lonstatus'}{$key}) eq 'ARRAY') &&
+                             (@{$currsetting{'lonstatus'}{$key}})) {
+                        push(@{$changes{'lonstatus'}},$key);
+                    }
+                } elsif ($key eq 'weights') {
+                    if ((ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') &&
+                        (ref($contacts_hash{contacts}{lonstatus}{$key}) eq 'HASH')) {
+                        if (ref($currsetting{'lonstatus'}{$key}) eq 'HASH') {
+                            foreach my $type ('E','W','N','U') {
+                                unless ($contacts_hash{contacts}{lonstatus}{$key}{$type} eq
+                                        $currsetting{'lonstatus'}{$key}{$type}) {
+                                    push(@{$changes{'lonstatus'}},$key);
+                                    last;
+                                }
+                            }
+                        } else {
+                            foreach my $type ('E','W','N','U') {
+                                if ($contacts_hash{contacts}{lonstatus}{$key}{$type} ne '') {
+                                    push(@{$changes{'lonstatus'}},$key);
+                                    last;
+                                }
+                            }
+                        }
+                    } elsif (ref($currsetting{'lonstatus'}{$key}) eq 'HASH') {
+                        foreach my $type ('E','W','N','U') {
+                            if ($currsetting{'lonstatus'}{$key}{$type} ne '') {
+                                push(@{$changes{'lonstatus'}},$key);
+                                last;
+                            }
+                        }
+                    }
+                } elsif (($key eq 'threshold') || ($key eq 'sysmail')) {
+                    if (ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') {
+                        if ($currsetting{'lonstatus'}{$key} =~ /^\d+$/) {
+                            if ($currsetting{'lonstatus'}{$key} != $contacts_hash{contacts}{lonstatus}{$key}) {
+                                push(@{$changes{'lonstatus'}},$key);
+                            }
+                        } elsif ($contacts_hash{contacts}{lonstatus}{$key} =~ /^\d+$/) {
+                            push(@{$changes{'lonstatus'}},$key);
+                        }
+                    } elsif ($currsetting{'lonstatus'}{$key} =~ /^\d+$/) {
+                        push(@{$changes{'lonstatus'}},$key);
+                    }
+                }
+            }
+        } else {
+            if (ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') {
+                foreach my $key ('excluded','weights','threshold','sysmail') {
+                    if (exists($contacts_hash{contacts}{lonstatus}{$key})) {
+                        push(@{$changes{'lonstatus'}},$key);
+                    }
+                }
+            }
+        }
     } else {
         my %default;
         $default{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'};
@@ -12446,6 +13126,13 @@ sub modify_contacts {
                 }
             }
         }
+        if (ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') {
+            foreach my $key ('excluded','weights','threshold','sysmail') {
+                if (exists($contacts_hash{contacts}{lonstatus}{$key})) {
+                    push(@{$changes{'lonstatus'}},$key);
+                }
+            }
+        }
     }
     foreach my $item (@toggles) {
         if (($env{'form.'.$item} == 1) && ($currsetting{$item} == 0)) {
@@ -12571,22 +13258,79 @@ sub modify_contacts {
                 }
             }
             my @offon = ('off','on');
+            my $corelink = &core_link_msu();
             if ($changes{'reporterrors'}) {
                 $resulttext .= '<li>'.
                                &mt('E-mail error reports to [_1] set to "'.
                                    $offon[$env{'form.reporterrors'}].'".',
-                                   &Apache::loncommon::modal_link('http://loncapa.org/core.html',
-                                       &mt('LON-CAPA core group - MSU'),600,500)).
+                                   $corelink).
                                '</li>';
             }
             if ($changes{'reportupdates'}) {
                 $resulttext .= '<li>'.
                                 &mt('E-mail record of completed LON-CAPA updates to [_1] set to "'.
                                     $offon[$env{'form.reportupdates'}].'".',
-                                    &Apache::loncommon::modal_link('http://loncapa.org/core.html',
-                                        &mt('LON-CAPA core group - MSU'),600,500)).
+                                    $corelink).
+                                '</li>';
+            }
+            if ($changes{'reportstatus'}) {
+                $resulttext .= '<li>'.
+                                &mt('E-mail status if errors above threshold to [_1] set to "'.
+                                    $offon[$env{'form.reportstatus'}].'".',
+                                    $corelink).
                                 '</li>';
             }
+            if (ref($changes{'lonstatus'}) eq 'ARRAY') {
+                $resulttext .= '<li>'.
+                               &mt('Nightly status check e-mail settings').':<ul>';
+                my (%defval,%use_def,%shown);
+                $defval{'threshold'} = $lonstatus_defs->{'threshold'};
+                $defval{'sysmail'} = $lonstatus_defs->{'sysmail'};
+                $defval{'weights'} =
+                    join(', ',map { $lonstatus_names->{$_}.'='.$lonstatus_defs->{$_}; } ('E','W','N','U'));
+                $defval{'excluded'} = &mt('None');
+                if (ref($contacts_hash{'contacts'}{'lonstatus'}) eq 'HASH') {
+                    foreach my $item ('threshold','sysmail','weights','excluded') {
+                        if (exists($contacts_hash{'contacts'}{'lonstatus'}{$item})) {
+                            if (($item eq 'threshold') || ($item eq 'sysmail')) {
+                                $shown{$item} = $contacts_hash{'contacts'}{'lonstatus'}{$item};
+                            } elsif ($item eq 'weights') {
+                                if (ref($contacts_hash{'contacts'}{'lonstatus'}{$item}) eq 'HASH') {
+                                    foreach my $type ('E','W','N','U') {
+                                        $shown{$item} .= $lonstatus_names->{$type}.'=';
+                                        if (exists($contacts_hash{'contacts'}{'lonstatus'}{$item}{$type})) {
+                                            $shown{$item} .= $contacts_hash{'contacts'}{'lonstatus'}{$item}{$type};
+                                        } else {
+                                            $shown{$item} .= $lonstatus_defs->{$type};
+                                        }
+                                        $shown{$item} .= ', ';
+                                    }
+                                    $shown{$item} =~ s/, $//;
+                                } else {
+                                    $shown{$item} = $defval{$item};
+                                }
+                            } elsif ($item eq 'excluded') {
+                                if (ref($contacts_hash{'contacts'}{'lonstatus'}{$item}) eq 'ARRAY') {
+                                    $shown{$item} = join(', ',@{$contacts_hash{'contacts'}{'lonstatus'}{$item}});
+                                } else {
+                                    $shown{$item} = $defval{$item};
+                                }
+                            }
+                        } else {
+                            $shown{$item} = $defval{$item};
+                        }
+                    }
+                } else {
+                    foreach my $item ('threshold','weights','excluded','sysmail') {
+                        $shown{$item} = $defval{$item};
+                    }
+                }
+                foreach my $item ('threshold','weights','excluded','sysmail') {
+                    $resulttext .= '<li>'.&mt($titles->{'error'.$item}.' -- [_1]',
+                                          $shown{$item}).'</li>';
+                }
+                $resulttext .= '</ul></li>';
+            }
             if ((ref($changes{'helpform'}) eq 'ARRAY') && (ref($fields) eq 'ARRAY')) {
                 my (@optional,@required,@unused,$maxsizechg);
                 foreach my $field (@{$changes{'helpform'}}) {
@@ -12722,7 +13466,7 @@ sub modify_usercreation {
     }
 
     my @authen_contexts = ('author','course','domain');
-    my @authtypes = ('int','krb4','krb5','loc');
+    my @authtypes = ('int','krb4','krb5','loc','lti');
     my %authhash;
     foreach my $item (@authen_contexts) {
         my @authallowed =  &Apache::loncommon::get_env_multiple('form.'.$item.'_auth');
@@ -13904,7 +14648,7 @@ sub modify_defaults {
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
     my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def',
                  'portal_def','intauth_cost','intauth_check','intauth_switch');
-    my @authtypes = ('internal','krb4','krb5','localauth');
+    my @authtypes = ('internal','krb4','krb5','localauth','lti');
     foreach my $item (@items) {
         $newvalues{$item} = $env{'form.'.$item};
         if ($item eq 'auth_def') {
@@ -14096,6 +14840,7 @@ sub modify_defaults {
                                           krb4       => 'krb4',
                                           krb5       => 'krb5',
                                           localauth  => 'loc',
+                                          lti        => 'lti',
                         );
                         $value = $authnames{$shortauth{$value}};
                     } elsif ($item eq 'intauth_switch') {
@@ -15897,14 +16642,18 @@ sub modify_usersessions {
                         } else {
                             foreach my $type (@{$types{$prefix}}) {
                                 if (defined($changes{$prefix}{$type})) {
-                                    my $newvalue;
+                                    my ($newvalue,$notinuse);
                                     if (ref($defaultshash{'usersessions'}) eq 'HASH') {
                                         if (ref($defaultshash{'usersessions'}{$prefix})) {
                                             if ($type eq 'version') {
                                                 $newvalue = $defaultshash{'usersessions'}{$prefix}{$type};
-                                            } elsif (ref($defaultshash{'usersessions'}{$prefix}{$type}) eq 'ARRAY') {
-                                                if (@{$defaultshash{'usersessions'}{$prefix}{$type}} > 0) {
-                                                    $newvalue = join(', ',@{$defaultshash{'usersessions'}{$prefix}{$type}});
+                                            } else {
+                                                if (ref($defaultshash{'usersessions'}{$prefix}{$type}) eq 'ARRAY') {
+                                                    if (@{$defaultshash{'usersessions'}{$prefix}{$type}} > 0) {
+                                                        $newvalue = join(', ',@{$defaultshash{'usersessions'}{$prefix}{$type}});
+                                                    }
+                                                } else {
+                                                    $notinuse = 1;
                                                 }
                                             }
                                         }
@@ -15912,12 +16661,14 @@ sub modify_usersessions {
                                     if ($newvalue eq '') {
                                         if ($type eq 'version') {
                                             $resulttext .= '<li>'.&mt('[_1] set to: off',$lt{$type}).'</li>';
+                                        } elsif ($notinuse) {
+                                            $resulttext .= '<li>'.&mt('[_1] set to: not in use',$lt{$type}).'</li>';
                                         } else {
                                             $resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>';
                                         }
                                     } else {
                                         if ($type eq 'version') {
-                                            $newvalue .= ' '.&mt('(or later)'); 
+                                            $newvalue .= ' '.&mt('(or later)');
                                         }
                                         $resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>';
                                     }
@@ -15985,12 +16736,17 @@ sub modify_ssl {
                 if ($env{'form.'.$prefix.'_'.$type} =~ /^(no|req)$/) {
                     $value = $env{'form.'.$prefix.'_'.$type};
                 }
-                if (ref($domconfig{$action}{$prefix}) eq 'HASH') {
-                    if ($domconfig{$action}{$prefix}{$type} ne '') {
-                        if ($value ne $domconfig{$action}{$prefix}{$type}) {
+                if (ref($domconfig{$action}) eq 'HASH') {
+                    if (ref($domconfig{$action}{$prefix}) eq 'HASH') {
+                        if ($domconfig{$action}{$prefix}{$type} ne '') {
+                            if ($value ne $domconfig{$action}{$prefix}{$type}) {
+                                $changes{$prefix}{$type} = 1;
+                            }
+                            $defaultshash{$action}{$prefix}{$type} = $value;
+                        } else {
+                            $defaultshash{$action}{$prefix}{$type} = $value;
                             $changes{$prefix}{$type} = 1;
                         }
-                        $defaultshash{$action}{$prefix}{$type} = $value;
                     } else {
                         $defaultshash{$action}{$prefix}{$type} = $value;
                         $changes{$prefix}{$type} = 1;
@@ -16060,6 +16816,17 @@ sub modify_ssl {
             }
         }
     }
+    if (keys(%changes)) {
+        foreach my $prefix (keys(%changes)) {
+            if (ref($changes{$prefix}) eq 'HASH') {
+                if (scalar(keys(%{$changes{$prefix}})) == 0) {
+                    delete($changes{$prefix});
+                }
+            } else {
+                delete($changes{$prefix});
+            }
+        }
+    }
     my $nochgmsg = &mt('No changes made to LON-CAPA SSL settings');
     if (keys(%changes) > 0) {
         my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
@@ -16070,10 +16837,10 @@ sub modify_ssl {
                     $domdefaults{'replication'} = $defaultshash{$action}{'replication'};
                 }
                 if (ref($defaultshash{$action}{'connto'}) eq 'HASH') {
-                    $domdefaults{'connto'} = $domconfig{$action}{'connto'};
+                    $domdefaults{'connto'} = $defaultshash{$action}{'connto'};
                 }
                 if (ref($defaultshash{$action}{'connfrom'}) eq 'HASH') {
-                    $domdefaults{'connfrom'} = $domconfig{$action}{'connfrom'};
+                    $domdefaults{'connfrom'} = $defaultshash{$action}{'connfrom'};
                 }
             }
             my $cachetime = 24*60*60;
@@ -16089,18 +16856,24 @@ sub modify_ssl {
                         $resulttext .= '<li>'.$titles{$prefix}.'<ul>';
                         foreach my $type (@{$types{$prefix}}) {
                             if (defined($changes{$prefix}{$type})) {
-                                my $newvalue;
+                                my ($newvalue,$notinuse);
                                 if (ref($defaultshash{$action}) eq 'HASH') {
                                     if (ref($defaultshash{$action}{$prefix})) {
                                         if (($prefix eq 'connto') || ($prefix eq 'connfrom')) {
                                             $newvalue = $titles{$defaultshash{$action}{$prefix}{$type}};
-                                        } elsif (ref($defaultshash{$action}{$prefix}{$type}) eq 'ARRAY') {
-                                            if (@{$defaultshash{$action}{$prefix}{$type}} > 0) {
-                                                $newvalue = join(', ',@{$defaultshash{$action}{$prefix}{$type}});
+                                        } else {
+                                            if (ref($defaultshash{$action}{$prefix}{$type}) eq 'ARRAY') {
+                                                if (@{$defaultshash{$action}{$prefix}{$type}} > 0) {
+                                                    $newvalue = join(', ',@{$defaultshash{$action}{$prefix}{$type}});
+                                                }
+                                            } else {
+                                                $notinuse = 1;
                                             }
                                         }
                                     }
-                                    if ($newvalue eq '') {
+                                    if ($notinuse) {
+                                        $resulttext .= '<li>'.&mt('[_1] set to: not in use',$titles{$type}).'</li>';
+                                    } elsif ($newvalue eq '') {
                                         $resulttext .= '<li>'.&mt('[_1] set to: none',$titles{$type}).'</li>';
                                     } else {
                                         $resulttext .= '<li>'.&mt('[_1] set to: [_2].',$titles{$type},$newvalue).'</li>';
@@ -16214,17 +16987,21 @@ sub modify_trust {
                         $resulttext .= '<li>'.$lt{$prefix}.'<ul>';
                         foreach my $type (@types) {
                             if (defined($changes{$prefix}{$type})) {
-                                my $newvalue;
+                                my ($newvalue,$notinuse);
                                 if (ref($defaultshash{'trust'}) eq 'HASH') {
                                     if (ref($defaultshash{'trust'}{$prefix})) {
                                         if (ref($defaultshash{'trust'}{$prefix}{$type}) eq 'ARRAY') {
                                             if (@{$defaultshash{'trust'}{$prefix}{$type}} > 0) {
                                                 $newvalue = join(', ',@{$defaultshash{'trust'}{$prefix}{$type}});
                                             }
+                                        } else {
+                                            $notinuse = 1;
                                         }
                                     }
                                 }
-                                if ($newvalue eq '') {
+                                if ($notinuse) {
+                                    $resulttext .= '<li>'.&mt('[_1] set to: not in use',$lt{$type}).'</li>';
+                                } elsif ($newvalue eq '') {
                                     $resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>';
                                 } else {
                                     $resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>';
@@ -16259,12 +17036,12 @@ sub modify_loadbalancing {
     my @sparestypes = ('primary','default');
     my %typetitles = &sparestype_titles();
     my $resulttext;
-    my (%currbalancer,%currtargets,%currrules,%existing);
+    my (%currbalancer,%currtargets,%currrules,%existing,%currcookies);
     if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
         %existing = %{$domconfig{'loadbalancing'}};
     }
     &get_loadbalancers_config(\%servers,\%existing,\%currbalancer,
-                              \%currtargets,\%currrules);
+                              \%currtargets,\%currrules,\%currcookies);
     my ($saveloadbalancing,%defaultshash,%changes);
     my ($alltypes,$othertypes,$titles) =
         &loadbalancing_titles($dom,$intdom,$usertypes,$types);
@@ -16316,6 +17093,18 @@ sub modify_loadbalancing {
             }
             $defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto;
         }
+        if ($env{'form.loadbalancing_cookie_'.$i}) {
+            $defaultshash{'loadbalancing'}{$balancer}{'cookie'} = 1;
+            if (exists($currbalancer{$balancer})) { 
+                unless ($currcookies{$balancer}) {
+                    $changes{'curr'}{$balancer}{'cookie'} = 1;
+                }
+            }
+        } elsif (exists($currbalancer{$balancer})) {
+            if ($currcookies{$balancer}) {
+                $changes{'curr'}{$balancer}{'cookie'} = 1;
+            }
+        }
         if (ref($currtargets{$balancer}) eq 'HASH') {
             foreach my $sparetype (@sparestypes) {
                 if (ref($currtargets{$balancer}{$sparetype}) eq 'ARRAY') {
@@ -16469,6 +17258,10 @@ sub modify_loadbalancing {
                                 }
                             }
                         }
+                        if ($changes{'curr'}{$balancer}{'cookie'}) {
+                            $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use enabled',
+                                                      $balancer).'</li>'; 
+                        }
                         if (keys(%toupdate)) {
                             my %thismachine;
                             my $updatedhere;
@@ -16698,12 +17491,12 @@ sub lonbalance_targets_js {
     }
     push(@alltypes,'default','_LC_adv','_LC_author','_LC_internetdom','_LC_external');
     $allinsttypes = join("','",@alltypes);
-    my (%currbalancer,%currtargets,%currrules,%existing);
+    my (%currbalancer,%currtargets,%currrules,%existing,%currcookies);
     if (ref($settings) eq 'HASH') {
         %existing = %{$settings};
     }
     &get_loadbalancers_config($servers,\%existing,\%currbalancer,
-                              \%currtargets,\%currrules);
+                              \%currtargets,\%currrules,\%currcookies);
     my $balancers = join("','",sort(keys(%currbalancer)));
     return <<"END";