--- loncom/interface/domainprefs.pm	2021/09/27 03:26:24	1.387
+++ loncom/interface/domainprefs.pm	2021/11/24 04:25:01	1.392
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.387 2021/09/27 03:26:24 raeburn Exp $
+# $Id: domainprefs.pm,v 1.392 2021/11/24 04:25:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3177,14 +3177,16 @@ sub lti_javascript {
         return $togglejs;
     }
     my (%ordered,$total,%jstext);
-    $total = 0;
+    $total = scalar(keys(%{$settings}));
     foreach my $item (keys(%{$settings})) {
         if (ref($settings->{$item}) eq 'HASH') {
             my $num = $settings->{$item}{'order'};
+            if ($num eq '') {
+                $num = $total - 1;
+            }
             $ordered{$num} = $item;
         }
     }
-    $total = scalar(keys(%{$settings}));
     my @jsarray = ();
     foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
         push(@jsarray,$ordered{$item});
@@ -3247,32 +3249,65 @@ sub lti_toggle_js {
                             localauth => 'Local auth argument',
                             krb       => 'Kerberos domain',
                          );
+    my $crsincalert = &mt('"User\'s identity sent" needs to be set to "Yes" first,[_1] before setting "Course\'s identity sent" to "Yes"',"\n");
+    &js_escape(\$crsincalert);
     return <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
 
 function toggleLTI(form,setting,item) {
-    if (setting == 'requser') {
-        var fieldsets = document.getElementsByClassName('ltioption_'+item);
-        if (fieldsets.length) {
-            var radioname = 'lti_'+setting+'_'+item;
+    if ((setting == 'requser') || (setting == 'crsinc')) {
+        var usrfieldsets = document.getElementsByClassName('ltioption_usr_'+item);
+        var setvis = '';
+        var radioname = 'lti_requser_'+item;
+        var num = form.elements[radioname].length;
+        if (num) {
+            for (var i=0; i<num; i++) {
+                if (form.elements[radioname][i].checked) {
+                    if (form.elements[radioname][i].value == '1') {
+                        setvis = 1;
+                        break;
+                    }
+                }
+            }
+        }
+        if (usrfieldsets.length) {
+            for (var j=0; j<usrfieldsets.length; j++) {
+                if (setvis) {
+                    usrfieldsets[j].style.display = 'block';
+                } else {
+                    usrfieldsets[j].style.display = 'none';
+                }
+            }
+        }
+        var crsfieldsets = document.getElementsByClassName('ltioption_crs_'+item);
+        if (crsfieldsets.length) {
+            radioname = 'lti_crsinc_'+item;
             var num = form.elements[radioname].length;
             if (num) {
-                var setvis = '';
+                var crsvis = '';
                 for (var i=0; i<num; i++) {
                     if (form.elements[radioname][i].checked) {
                         if (form.elements[radioname][i].value == '1') {
-                           setvis = 1;
-                           break;
+                            if (setvis == '') {
+                                if (setting == 'crsinc'){
+                                    alert("$crsincalert");
+                                    form.elements[radioname][0].checked = true;
+                                }
+                            } else {
+                                crsvis = 1;
+                            }
+                            break;
                         }
                     }
                 }
-                for (var j=0; j<fieldsets.length; j++) {
-                    if (setvis) {
-                        fieldsets[j].style.display = 'block';
-                    } else {
-                        fieldsets[j].style.display = 'none';
-                    }
+                setvis = crsvis;
+            }
+            for (var j=0; j<crsfieldsets.length; j++) {
+                if (setvis) {
+                    crsfieldsets[j].style.display = 'block';
+                } else {
+                    crsfieldsets[j].style.display = 'none';
                 }
             }
         }
@@ -5937,6 +5972,9 @@ sub print_lti {
         foreach my $item (keys(%{$settings})) {
             if (ref($settings->{$item}) eq 'HASH') {
                 my $num = $settings->{$item}{'order'};
+                if ($num eq '') {
+                    $num = scalar(keys(%{$settings}));
+                }
                 $ordered{$num} = $item;
             }
         }
@@ -5949,13 +5987,14 @@ sub print_lti {
         for (my $i=0; $i<@items; $i++) {
             $css_class = $itemcount%2?' class="LC_odd_row"':'';
             my $item = $ordered{$items[$i]};
-            my ($key,$secret,$lifetime,$consumer,$requser,$current);
+            my ($key,$secret,$lifetime,$consumer,$requser,$crsinc,$current);
             if (ref($settings->{$item}) eq 'HASH') {
                 $key = $settings->{$item}->{'key'};
                 $secret = $settings->{$item}->{'secret'};
                 $lifetime = $settings->{$item}->{'lifetime'};
                 $consumer = $settings->{$item}->{'consumer'};
                 $requser = $settings->{$item}->{'requser'};
+                $crsinc = $settings->{$item}->{'crsinc'};
                 $current = $settings->{$item};
             }
             my $onclickrequser = ' onclick="toggleLTI(this.form,'."'requser','$i'".');"';
@@ -5967,6 +6006,15 @@ sub print_lti {
                 $checkedrequser{'no'} = $checkedrequser{'yes'};
                 $checkedrequser{'yes'} = '';
             }
+            my $onclickcrsinc = ' onclick="toggleLTI(this.form,'."'crsinc','$i'".');"';
+            my %checkedcrsinc = (
+                                      yes => ' checked="checked"',
+                                      no  => '',
+                                   );
+            if (!$crsinc) {
+                $checkedcrsinc{'no'} = $checkedcrsinc{'yes'};
+                $checkedcrsinc{'yes'} = '';
+            }
             my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'lti_pos_".$item."'".');"';
             $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
                          .'<select name="lti_pos_'.$item.'"'.$chgstr.'>';
@@ -5996,6 +6044,10 @@ sub print_lti {
                  '<label><input type="radio" name="lti_requser_'.$i.'" value="1"'.$onclickrequser.$checkedrequser{yes}.' />'.&mt('Yes').'</label>&nbsp;'."\n".
                  '<label><input type="radio" name="lti_requser_'.$i.'" value="0"'.$onclickrequser.$checkedrequser{no}.' />'.&mt('No').'</label></span>'."\n".
                 '<br /><br />'.
+                '<span class="LC_nobreak">'.$lt{'crsinc'}.':'.
+                '<label><input type="radio" name="lti_crsinc_'.$i.'" value="1"'.$onclickcrsinc.$checkedcrsinc{yes}.' />'.&mt('Yes').'</label>&nbsp;'."\n".
+                '<label><input type="radio" name="lti_crsinc_'.$i.'" value="0"'.$onclickcrsinc.$checkedcrsinc{no}.' />'.&mt('No').'</label></span>'."\n".
+                ('&nbsp;'x4).
                 '<span class="LC_nobreak">'.$lt{'key'}.
                 ':<input type="text" size="25" name="lti_key_'.$i.'" value="'.$key.'" /></span> '.
                 ('&nbsp;'x2).
@@ -6036,6 +6088,10 @@ sub print_lti {
                   '<label><input type="radio" name="lti_requser_add" value="1" onclick="toggleLTI(this.form,'."'requser','add'".');" checked="checked" />'.&mt('Yes').'</label>&nbsp;'."\n".
                   '<label><input type="radio" name="lti_requser_add" value="0" onclick="toggleLTI(this.form,'."'requser','add'".');" />'.&mt('No').'</label></span>'."\n".
                   '<br /><br />'.
+                  '<span class="LC_nobreak">'.$lt{'crsinc'}.':'.
+                  '<label><input type="radio" name="lti_crsinc_add" value="1" onclick="toggleLTI(this.form,'."'crsinc','add'".');" checked="checked" />'.&mt('Yes').'</label>&nbsp;'."\n".
+                  '<label><input type="radio" name="lti_crsinc_add" value="0" onclick="toggleLTI(this.form,'."'crsinc','add'".');" />'.&mt('No').'</label></span>'."\n".
+                  ('&nbsp;'x4).
                   '<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="" />'.
@@ -6056,6 +6112,7 @@ sub lti_names {
                                           'consumer'  => 'Consumer',
                                           'secret'    => 'Secret',
                                           'requser'   => "User's identity sent",
+                                          'crsinc'    => "Course's identity sent",
                                           'email'     => 'Email address',
                                           'sourcedid' => 'User ID',
                                           'other'     => 'Other',
@@ -6072,7 +6129,8 @@ sub lti_options {
     my (%checked,%rolemaps,$crssecsrc,$userfield,$cidfield,$callback);
     $checked{'mapuser'}{'sourcedid'} = ' checked="checked"';
     $checked{'mapcrs'}{'course_offering_sourcedid'} = ' checked="checked"';
-    $checked{'makecrs'}{'N'} = '  checked="checked"';
+    $checked{'storecrs'}{'Y'} = ' checked="checked"';
+    $checked{'makecrs'}{'N'} = ' checked="checked"';
     $checked{'mapcrstype'} = {};
     $checked{'makeuser'} = {};
     $checked{'selfenroll'} = {};
@@ -6090,6 +6148,7 @@ sub lti_options {
     my $callbacksty = 'none';
     my $passbacksty = 'none';
     my $optionsty = 'block';
+    my $crssty = 'block';
     my $lcauthparm;
     my $lcauthparmstyle = 'display:none';
     my $lcauthparmtext;
@@ -6100,6 +6159,9 @@ sub lti_options {
     if (ref($current) eq 'HASH') {
         if (!$current->{'requser'}) {
             $optionsty = 'none';
+            $crssty = 'none';
+        } elsif (!$current->{'crsinc'}) {
+            $crssty = 'none';
         }
         if (($current->{'mapuser'} ne '') && ($current->{'mapuser'} ne 'lis_person_sourcedid')) {
             $checked{'mapuser'}{'sourcedid'} = '';
@@ -6126,6 +6188,10 @@ sub lti_options {
                 $checked{'mapcrstype'}{$type} = ' checked="checked"';
             }
         }
+        if (!$current->{'storecrs'}) {
+            $checked{'storecrs'}{'N'} = $checked{'storecrs'}{'Y'};
+            $checked{'storecrs'}{'Y'} = '';
+        }
         if ($current->{'makecrs'}) {
             $checked{'makecrs'}{'Y'} = '  checked="checked"';
         }
@@ -6232,7 +6298,17 @@ sub lti_options {
     my $onclicksecsrc = ' onclick="toggleLTI(this.form,'."'secsrc','$num'".')"';
     my $onclicklcauth = ' onclick="toggleLTI(this.form,'."'lcauth','$num'".')"';
     my $onclickmenu = ' onclick="toggleLTI(this.form,'."'lcmenu','$num'".');"';
-    my $output = '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping users').'</legend>'.
+    my $output = '<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Logout options').'</legend>'.
+                 '<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('Callback to logout LON-CAPA on log out from Consumer').':&nbsp;'.
+                 '<label><input type="radio" name="lti_callback_'.$num.'" value="0"'.
+                 $checked{'callback'}{'N'}.$onclickcallback.' />'.&mt('No').'</label>'.('&nbsp;'x2).
+                 '<label><input type="radio" name="lti_callback_'.$num.'" value="1"'.
+                 $checked{'callback'}{'Y'}.$onclickcallback.' />'.&mt('Yes').'</label></span></div>'.
+                 '<div class="LC_floatleft" style="display:'.$callbacksty.';" id="lti_callbackfield_'.$num.'">'.
+                 '<span class="LC_nobreak">'.&mt('Parameter').': '.
+                 '<input type="text" name="lti_callbackparam_'.$num.'" value="'.$callback.'" /></span>'.
+                 '</div><div style="padding:0;clear:both;margin:0;border:0"></div></fieldset>'.
+                 '<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping users').'</legend>'.
                  '<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('LON-CAPA username').':&nbsp;';
     foreach my $option ('sourcedid','email','other') {
         $output .= '<label><input type="radio" name="lti_mapuser_'.$num.'" value="'.$option.'"'.
@@ -6243,37 +6319,13 @@ sub lti_options {
                '<div class="LC_floatleft" style="display:'.$userfieldsty.';" id="lti_userfield_'.$num.'">'.
                '<input type="text" name="lti_customuser_'.$num.'" '.
                'value="'.$userfield.'" /></div></fieldset>'.
-               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping course roles').'</legend><table><tr>';
-    foreach my $ltirole (@lticourseroles) {
-        my ($selected,$selectnone);
-        if ($rolemaps{$ltirole} eq '') {
-            $selectnone = ' selected="selected"';
-        }
-        $output .= '<td style="text-align: center">'.$ltirole.'<br />'.
-                   '<select name="lti_maprole_'.$ltirole.'_'.$num.'">'.
-                   '<option value=""'.$selectnone.'>'.&mt('Select').'</option>';
-        foreach my $role (@courseroles) {
-            unless ($selectnone) {
-                if ($rolemaps{$ltirole} eq $role) {
-                    $selected = ' selected="selected"';
-                } else {
-                    $selected = '';
-                }
-            }
-            $output .= '<option value="'.$role.'"'.$selected.'>'.
-                       &Apache::lonnet::plaintext($role,'Course').
-                       '</option>';
-        }
-        $output .= '</select></td>';
-    }
-    $output .= '</tr></table></fieldset>'.
-               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Roles which may create user accounts').'</legend>';
+               '<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Roles which may create user accounts').'</legend>';
     foreach my $ltirole (@ltiroles) {
         $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="lti_makeuser_'.$num.'" value="'.$ltirole.'"'.
                    $checked{'makeuser'}{$ltirole}.' />'.$ltirole.'</label>&nbsp;</span> ';     
     }
     $output .= '</fieldset>'.
-               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('New user accounts created for LTI users').'</legend>'.
+               '<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('New user accounts created for LTI users').'</legend>'.
                '<table>'.
                &modifiable_userdata_row('lti','instdata_'.$num,$current,$numinrow,$itemcount).
                '</table>'.
@@ -6296,7 +6348,29 @@ sub lti_options {
                '<span id="lti_lcauth_parmtext_'.$num.'">'.$lcauthparmtext.'</span>'.
                '<input type="text" name="lti_lcauthparm_'.$num.'" value="" /></span></td></tr>'.
                '</table></fieldset>'.
-               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping courses').'</legend>'.
+               '<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.
+               &mt('LON-CAPA menu items (Course Coordinator can override)').'</legend>'.
+               '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'topmenu'}.':&nbsp;'.
+               '<label><input type="radio" name="lti_topmenu_'.$num.'" value="0"'.
+               $checked{'topmenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.('&nbsp;'x2).
+               '<label><input type="radio" name="lti_topmenu_'.$num.'" value="1"'.
+               $checked{'topmenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>'.
+               '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
+               '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'inlinemenu'}.':&nbsp;'.
+               '<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="0"'.
+               $checked{'inlinemenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.('&nbsp;'x2).
+               '<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="1"'.
+               $checked{'inlinemenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>';
+     $output .='<div style="padding:0;clear:both;margin:0;border:0"></div>'.
+               '<div class="LC_floatleft" style="display:'.$menusty.';" id="lti_menufield_'.$num.'">'.
+               '<span class="LC_nobreak">'.&mt('Menu items').':&nbsp;';
+    foreach my $type ('fullname','coursetitle','role','logout','grades') {
+        $output .= '<label><input type="checkbox" name="lti_menuitem_'.$num.'" value="'.$type.'"'.
+                   $checked{'menuitem'}{$type}.' />'.$menutitles{$type}.'</label>'.
+                   ('&nbsp;'x2);
+    }
+    $output .= '</span></div></fieldset>'.
+               '<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Mapping courses').'</legend>'.
                '<div class="LC_floatleft"><span class="LC_nobreak">'.
                &mt('Unique course identifier').':&nbsp;';
     foreach my $option ('course_offering_sourcedid','context_id','other') {
@@ -6313,21 +6387,51 @@ sub lti_options {
                    $checked{'mapcrstype'}{$type}.' />'.$coursetypetitles{$type}.'</label>'.
                    ('&nbsp;'x2);
     }
-    $output .= '</span></fieldset>'.
-               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Creating courses').'</legend>'.
+    $output .= '</span><br /><br />'.
+               '<span class="LC_nobreak">'.&mt('Store mapping of course identifier to LON-CAPA CourseID').':&nbsp;'.
+               '<label><input type="radio" name="lti_storecrs_'.$num.'" value="0"'.
+               $checked{'storecrs'}{'N'}.' />'.&mt('No').'</label>'.('&nbsp;'x2).
+               '<label><input type="radio" name="lti_storecrs_'.$num.'" value="1"'.
+               $checked{'storecrs'}{'Y'}.' />'.&mt('Yes').'</label></span>'.
+               '</fieldset>'.
+               '<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Mapping course roles').'</legend><table><tr>';
+    foreach my $ltirole (@lticourseroles) {
+        my ($selected,$selectnone);
+        if ($rolemaps{$ltirole} eq '') {
+            $selectnone = ' selected="selected"';
+        }
+        $output .= '<td style="text-align: center">'.$ltirole.'<br />'.
+                   '<select name="lti_maprole_'.$ltirole.'_'.$num.'">'.
+                   '<option value=""'.$selectnone.'>'.&mt('Select').'</option>';
+        foreach my $role (@courseroles) {
+            unless ($selectnone) {
+                if ($rolemaps{$ltirole} eq $role) {
+                    $selected = ' selected="selected"';
+                } else {
+                    $selected = '';
+                }
+            }
+            $output .= '<option value="'.$role.'"'.$selected.'>'.
+                       &Apache::lonnet::plaintext($role,'Course').
+                       '</option>';
+        }
+        $output .= '</select></td>';
+    }
+    $output .= '</tr></table></fieldset>'.
+               '<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Creating courses').'</legend>'.
                '<span class="LC_nobreak">'.&mt('Course created (if absent) on Instructor access').':&nbsp;'.
                '<label><input type="radio" name="lti_makecrs_'.$num.'" value="0"'.
                $checked{'makecrs'}{'N'}.' />'.&mt('No').'</label>'.('&nbsp;'x2).
                '<label><input type="radio" name="lti_makecrs_'.$num.'" value="1"'.
                $checked{'makecrs'}{'Y'}.' />'.&mt('Yes').'</label></span>'.
                '</fieldset>'.
-               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Roles which may self-enroll').'</legend>';
+               '<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Roles which may self-enroll').'</legend>';
     foreach my $lticrsrole (@lticourseroles) {
         $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="lti_selfenroll_'.$num.'" value="'.$lticrsrole.'"'.
                    $checked{'selfenroll'}{$lticrsrole}.' />'.$lticrsrole.'</label>&nbsp;</span> ';
     }
     $output .= '</fieldset>'.
-               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Course options').'</legend>'.
+               '<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Course options').'</legend>'.
                '<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('Assign users to sections').':&nbsp;'.
                '<label><input type="radio" name="lti_crssec_'.$num.'" value="0"'.
                $checked{'crssec'}{'N'}.$onclicksec.' />'.&mt('No').'</label>'.('&nbsp;'x2).
@@ -6379,36 +6483,7 @@ sub lti_options {
                &mt('Outcomes Service (1.1)').'</label>'.('&nbsp;'x2).
                '<label><input type="radio" name="lti_passbackformat_'.$num.'" value="1.0"'.$pb1p0chk.'/>'.
                &mt('Outcomes Extension (1.0)').'</label></span></div>'.
-               '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
-               '<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('Callback on logout').':&nbsp;'.
-               '<label><input type="radio" name="lti_callback_'.$num.'" value="0"'.
-               $checked{'callback'}{'N'}.$onclickcallback.' />'.&mt('No').'</label>'.('&nbsp;'x2).
-               '<label><input type="radio" name="lti_callback_'.$num.'" value="1"'.
-               $checked{'callback'}{'Y'}.$onclickcallback.' />'.&mt('Yes').'</label></span></div>'.
-               '<div class="LC_floatleft" style="display:'.$callbacksty.';" id="lti_callbackfield_'.$num.'">'.
-               '<span class="LC_nobreak">'.&mt('Parameter').': '.
-               '<input type="text" name="lti_callbackparam_'.$num.'" value="'.$callback.'" /></span>'.
-               '</div><div style="padding:0;clear:both;margin:0;border:0"></div></fieldset>'.
-               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Course defaults (Course Coordinator can override)').'</legend>'.
-               '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'topmenu'}.':&nbsp;'.
-               '<label><input type="radio" name="lti_topmenu_'.$num.'" value="0"'.
-               $checked{'topmenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.('&nbsp;'x2).
-               '<label><input type="radio" name="lti_topmenu_'.$num.'" value="1"'.
-               $checked{'topmenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>'.
-               '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
-               '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'inlinemenu'}.':&nbsp;'.
-               '<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="0"'.
-               $checked{'inlinemenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.('&nbsp;'x2).
-               '<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="1"'.
-               $checked{'inlinemenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>';
-     $output .='<div style="padding:0;clear:both;margin:0;border:0"></div>'. 
-               '<div class="LC_floatleft" style="display:'.$menusty.';" id="lti_menufield_'.$num.'">'.
-               '<span class="LC_nobreak">'.&mt('Menu items').':&nbsp;';
-    foreach my $type ('fullname','coursetitle','role','logout','grades') {
-        $output .= '<label><input type="checkbox" name="lti_menuitem_'.$num.'" value="'.$type.'"'.
-                   $checked{'menuitem'}{$type}.' />'.$menutitles{$type}.'</label>'.
-                   ('&nbsp;'x2);
-    }
+               '<div style="padding:0;clear:both;margin:0;border:0"></div></fieldset>';
     $output .= '</span></div></fieldset>';
 #        '<fieldset><legend>'.&mt('Assigning author roles').'</legend>';
 #
@@ -7518,7 +7593,7 @@ sub print_wafproxy {
     my $itemcount = 0;
     my $datatable;
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
-    my (%othercontrol,%otherdoms,%aliases,%values,$setdom,$showdom);
+    my (%othercontrol,%otherdoms,%aliases,%saml,%values,$setdom,$showdom);
     my %lt = &wafproxy_titles();
     foreach my $server (sort(keys(%servers))) {
         my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server});
@@ -7543,6 +7618,9 @@ sub print_wafproxy {
                             $showdom = 1;
                         }
                     }
+                    if (ref($settings->{'saml'}) eq 'HASH') {
+                        $saml{$dom} = $settings->{'saml'};
+                    }
                 }
             }
         }
@@ -7562,6 +7640,9 @@ sub print_wafproxy {
             my %config = &Apache::lonnet::get_dom('configuration',['wafproxy'],$domain);
             if (ref($config{'wafproxy'}) eq 'HASH') {
                 $aliases{$domain} = $config{'wafproxy'}{'alias'};
+                if (exists($config{'wafproxy'}{'saml'})) { 
+                    $saml{$domain} = $config{'wafproxy'}{'saml'};
+                }
                 foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') {
                     $values{$domain}{$item} = $config{'wafproxy'}{$item};
                 }
@@ -7580,14 +7661,22 @@ sub print_wafproxy {
                             '<i>'.&Apache::lonnet::hostname($server).'</i></td><td>&nbsp;</td>';
             if ($othercontrol{$server}) {
                 $dom_in_effect = $othercontrol{$server};
-                my $current;
+                my ($current,$forsaml);
                 if (ref($aliases{$dom_in_effect}) eq 'HASH') {
                     $current = $aliases{$dom_in_effect}{$server};
                 }
+                if (ref($saml{$dom_in_effect}) eq 'HASH') {
+                    if ($saml{$dom_in_effect}{$server}) {
+                        $forsaml = 1;
+                    }
+                }
                 $aliasrows .= '<td class="LC_left_item" style="vertical-align: baseline;">'.
                               &mt('Alias').':&nbsp';
                 if ($current) {
                     $aliasrows .= $current;
+                    if ($forsaml) {
+                         $aliasrows .= '&nbsp;('.&mt('also for Shibboleth').')';
+                    }
                 } else {
                     $aliasrows .= &mt('None');
                 }
@@ -7596,16 +7685,30 @@ sub print_wafproxy {
                                   '<b>'.$dom_in_effect.'</b>').')</span></td>';
             } else {
                 $dom_in_effect = $dom;
-                my $current;
+                my ($current,$samlon,$samloff);
+                $samloff = ' checked="checked"';
                 if (ref($aliases{$dom}) eq 'HASH') {
                     if ($aliases{$dom}{$server}) {
                         $current = $aliases{$dom}{$server};
                     }
                 }
+                if (ref($saml{$dom}) eq 'HASH') {
+                    if ($saml{$dom}{$server}) {
+                        $samlon = $samloff;
+                        undef($samloff);
+                    }
+                }
                 $aliasrows .= '<td class="LC_left_item" style="vertical-align: baseline;">'.
                               &mt('Alias').':&nbsp;'.
                               '<input type="text" name="wafproxy_alias_'.$server.'" '.
-                              'value="'.$current.'" size="30" /></td>';
+                              'value="'.$current.'" size="30" />'.
+                              ('&nbsp;'x2).'<span class="LC_nobreak">'.
+                              &mt('Alias used for Shibboleth').':&nbsp;<label>'.
+                              '<input type="radio" value="0"'.$samloff.' name="wafproxy_alias_saml_'.$server.'" />'.
+                              &mt('No').'</label>&nbsp;<label>'. 
+                              '<input type="radio" value="1"'.$samlon.' name="wafproxy_alias_saml_'.$server.'" />'.
+                              &mt('Yes').'</label></span>'.
+                              '</td>'; 
             }
             $aliasrows .= '</tr>';
             $aliasinfo{$dom_in_effect} .= $aliasrows;
@@ -11717,7 +11820,10 @@ sub modify_login {
                 $currsaml{$lonhost}{$item} = $env{'form.saml_'.$item.'_'.$lonhost};
             }
         } else {
-            delete($currsaml{$lonhost});
+            if ($saml{$lonhost}) {  
+                $changes{'saml'}{$lonhost} = 1;
+                delete($currsaml{$lonhost});
+            }
         }
     }
     foreach my $posshost (keys(%currsaml)) {
@@ -14680,13 +14786,14 @@ sub modify_lti {
     my @courseroles = ('cc','in','ta','ep','st');
     my @ltiroles = qw(Learner Instructor ContentDeveloper TeachingAssistant Mentor Member Manager Administrator);
     my @lticourseroles = qw(Instructor TeachingAssistant Mentor Learner);
-    my @coursetypes = ('official','unofficial','community','textbook','placement');
+    my @coursetypes = ('official','unofficial','community','textbook','placement','lti');
     my %coursetypetitles = &Apache::lonlocal::texthash (
                                official   => 'Official',
                                unofficial => 'Unofficial',
                                community  => 'Community',
                                textbook   => 'Textbook',
                                placement  => 'Placement Test',
+                               lti        => 'LTI Provider',
     );
     my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
     my %lt = &lti_names();
@@ -14716,15 +14823,15 @@ sub modify_lti {
             map { $deletions{$_} = 1; } @todelete;
         }
         my $maxnum = $env{'form.lti_maxnum'};
-        for (my $i=0; $i<=$maxnum; $i++) {
+        for (my $i=0; $i<$maxnum; $i++) {
             my $itemid = $env{'form.lti_id_'.$i};
             $itemid =~ s/\D+//g;
             if (ref($domconfig{$action}{$itemid}) eq 'HASH') {
                 if ($deletions{$itemid}) {
                     $changes{$itemid} = $domconfig{$action}{$itemid}{'consumer'};
                 } else {
-                   push(@items,$i);
-                   $itemids{$i} = $itemid;
+                    push(@items,$i);
+                    $itemids{$i} = $itemid;
                 }
             }
         }
@@ -14732,12 +14839,12 @@ sub modify_lti {
     foreach my $idx (@items) {
         my $itemid = $itemids{$idx};
         next unless ($itemid);
-        my $position = $env{'form.lti_pos_'.$idx};
+        my $position = $env{'form.lti_pos_'.$itemid};
         $position =~ s/\D+//g;
         if ($position ne '') {
             $allpos[$position] = $itemid;
         }
-        foreach my $item ('consumer','key','secret','lifetime','requser') {
+        foreach my $item ('consumer','key','secret','lifetime','requser','crsinc') {
             my $formitem = 'form.lti_'.$item.'_'.$idx;
             $env{$formitem} =~ s/(`)/'/g;
             if ($item eq 'lifetime') {
@@ -14770,12 +14877,6 @@ sub modify_lti {
                 $mapuser =~ s/^\s+|\s+$//g; 
                 $confhash{$itemid}{'mapuser'} = $mapuser; 
             }
-            foreach my $ltirole (@lticourseroles) {
-                my $possrole = $env{'form.lti_maprole_'.$ltirole.'_'.$idx};
-                if (grep(/^\Q$possrole\E$/,@courseroles)) {
-                    $confhash{$itemid}{'maproles'}{$ltirole} = $possrole;
-                }
-            }
             my @possmakeuser = &Apache::loncommon::get_env_multiple('form.lti_makeuser_'.$idx);
             my @makeuser;
             foreach my $ltirole (sort(@possmakeuser)) {
@@ -14808,46 +14909,6 @@ sub modify_lti {
                     }
                 }
             }
-            if (($env{'form.lti_mapcrs_'.$idx} eq 'course_offering_sourcedid') ||
-                ($env{'form.lti_mapcrs_'.$idx} eq 'context_id'))  {
-                $confhash{$itemid}{'mapcrs'} = $env{'form.lti_mapcrs_'.$idx};
-            } elsif ($env{'form.lti_mapcrs_'.$idx} eq 'other') {
-                my $mapcrs = $env{'form.lti_mapcrsfield_'.$idx}; 
-                $mapcrs =~ s/(`)/'/g;
-                $mapcrs =~ s/^\s+|\s+$//g;
-                $confhash{$itemid}{'mapcrs'} = $mapcrs;
-            }
-            my @posstypes = &Apache::loncommon::get_env_multiple('form.lti_mapcrstype_'.$idx);
-            my @crstypes;
-            foreach my $type (sort(@posstypes)) {
-                if ($posscrstype{$type}) {
-                    push(@crstypes,$type);
-                }
-            }
-            $confhash{$itemid}{'mapcrstype'} = \@crstypes;
-            if ($env{'form.lti_makecrs_'.$idx}) {
-                $confhash{$itemid}{'makecrs'} = 1;
-            }
-            my @possenroll = &Apache::loncommon::get_env_multiple('form.lti_selfenroll_'.$idx);
-            my @selfenroll;
-            foreach my $type (sort(@possenroll)) {
-                if ($posslticrs{$type}) {
-                    push(@selfenroll,$type);
-                }
-            }
-            $confhash{$itemid}{'selfenroll'} = \@selfenroll;
-            if ($env{'form.lti_crssec_'.$idx}) {
-                if ($env{'form.lti_crssecsrc_'.$idx} eq 'course_section_sourcedid') {
-                    $confhash{$itemid}{'section'} = $env{'form.lti_crssecsrc_'.$idx};
-                } elsif ($env{'form.lti_crssecsrc_'.$idx} eq 'other') {
-                    my $section = $env{'form.lti_customsection_'.$idx};
-                    $section =~ s/(`)/'/g;
-                    $section =~ s/^\s+|\s+$//g;
-                    if ($section ne '') {
-                        $confhash{$itemid}{'section'} = $section;
-                    }
-                }
-            }
             if ($env{'form.lti_callback_'.$idx}) {
                 if ($env{'form.lti_callbackparam_'.$idx}) {
                     my $callback = $env{'form.lti_callbackparam_'.$idx};
@@ -14855,18 +14916,11 @@ sub modify_lti {
                     $confhash{$itemid}{'callback'} = $callback;
                 }
             }
-            foreach my $field ('passback','roster','topmenu','inlinemenu') {
+            foreach my $field ('topmenu','inlinemenu') {
                 if ($env{'form.lti_'.$field.'_'.$idx}) {
                     $confhash{$itemid}{$field} = 1;
                 }
             }
-            if ($env{'form.lti_passback_'.$idx}) {
-                if ($env{'form.lti_passbackformat_'.$idx} eq '1.0') {
-                    $confhash{$itemid}{'passbackformat'} = '1.0';
-                } else {
-                    $confhash{$itemid}{'passbackformat'} = '1.1';
-                }
-            }
             if ($env{'form.lti_topmenu_'.$idx} || $env{'form.lti_inlinemenu_'.$idx}) {
                 $confhash{$itemid}{lcmenu} = [];
                 my @possmenu = &Apache::loncommon::get_env_multiple('form.lti_menuitem_'.$idx);
@@ -14879,64 +14933,155 @@ sub modify_lti {
                     }
                 }
             }
-            unless (($idx eq 'add') || ($changes{$itemid})) {
-                foreach my $field ('mapuser','mapcrs','makecrs','section','passback','roster','lcauth','lcauthparm','topmenu','inlinemenu','callback') {
-                    if ($domconfig{$action}{$itemid}{$field} ne $confhash{$itemid}{$field}) {
-                        $changes{$itemid} = 1;
+            if ($confhash{$itemid}{'crsinc'}) {
+                if (($env{'form.lti_mapcrs_'.$idx} eq 'course_offering_sourcedid') ||
+                    ($env{'form.lti_mapcrs_'.$idx} eq 'context_id'))  {
+                    $confhash{$itemid}{'mapcrs'} = $env{'form.lti_mapcrs_'.$idx};
+                } elsif ($env{'form.lti_mapcrs_'.$idx} eq 'other') {
+                    my $mapcrs = $env{'form.lti_mapcrsfield_'.$idx}; 
+                    $mapcrs =~ s/(`)/'/g;
+                    $mapcrs =~ s/^\s+|\s+$//g;
+                    $confhash{$itemid}{'mapcrs'} = $mapcrs;
+                }
+                my @posstypes = &Apache::loncommon::get_env_multiple('form.lti_mapcrstype_'.$idx);
+                my @crstypes;
+                foreach my $type (sort(@posstypes)) {
+                    if ($posscrstype{$type}) {
+                        push(@crstypes,$type);
+                    }
+                }
+                $confhash{$itemid}{'mapcrstype'} = \@crstypes;
+                if ($env{'form.lti_storecrs_'.$idx}) {
+                    $confhash{$itemid}{'storecrs'} = 1;
+                }       
+                if ($env{'form.lti_makecrs_'.$idx}) {
+                    $confhash{$itemid}{'makecrs'} = 1;
+                }
+                foreach my $ltirole (@lticourseroles) {
+                    my $possrole = $env{'form.lti_maprole_'.$ltirole.'_'.$idx};
+                    if (grep(/^\Q$possrole\E$/,@courseroles)) {
+                        $confhash{$itemid}{'maproles'}{$ltirole} = $possrole;
+                    }
+                }
+                my @possenroll = &Apache::loncommon::get_env_multiple('form.lti_selfenroll_'.$idx);
+                my @selfenroll;
+                foreach my $type (sort(@possenroll)) {
+                    if ($posslticrs{$type}) {
+                        push(@selfenroll,$type);
+                    }
+                }
+                $confhash{$itemid}{'selfenroll'} = \@selfenroll;
+                if ($env{'form.lti_crssec_'.$idx}) {
+                    if ($env{'form.lti_crssecsrc_'.$idx} eq 'course_section_sourcedid') {
+                        $confhash{$itemid}{'section'} = $env{'form.lti_crssecsrc_'.$idx};
+                    } elsif ($env{'form.lti_crssecsrc_'.$idx} eq 'other') {
+                        my $section = $env{'form.lti_customsection_'.$idx};
+                        $section =~ s/(`)/'/g;
+                        $section =~ s/^\s+|\s+$//g;
+                        if ($section ne '') {
+                            $confhash{$itemid}{'section'} = $section;
+                        }
                     }
                 }
-                unless ($changes{$itemid}) {
-                    if ($domconfig{$action}{$itemid}{'passback'} eq $confhash{$itemid}{'passback'}) {
-                        if ($domconfig{$action}{$itemid}{'passbackformat'} ne $confhash{$itemid}{'passbackformat'}) {
+                foreach my $field ('passback','roster') {
+                    if ($env{'form.lti_'.$field.'_'.$idx}) {
+                        $confhash{$itemid}{$field} = 1;
+                    }
+                }
+                if ($env{'form.lti_passback_'.$idx}) {
+                    if ($env{'form.lti_passbackformat_'.$idx} eq '1.0') {
+                        $confhash{$itemid}{'passbackformat'} = '1.0';
+                    } else {
+                        $confhash{$itemid}{'passbackformat'} = '1.1';
+                    }
+                }
+            }
+            unless (($idx eq 'add') || ($changes{$itemid})) {
+                if ($confhash{$itemid}{'crsinc'}) {
+                    foreach my $field ('mapcrs','storecrs','makecrs','section','passback','roster') {
+                        if ($domconfig{$action}{$itemid}{$field} ne $confhash{$itemid}{$field}) {
                             $changes{$itemid} = 1;
                         }
                     }
-                }
-                foreach my $field ('makeuser','mapcrstype','selfenroll','instdata','lcmenu') {
                     unless ($changes{$itemid}) {
-                        if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') {
-                            if (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
-                                my @diffs = &Apache::loncommon::compare_arrays($domconfig{$action}{$itemid}{$field},
-                                                                               $confhash{$itemid}{$field});
-                                if (@diffs) {
-                                    $changes{$itemid} = 1;
-                                }
-                            } elsif (@{$domconfig{$action}{$itemid}{$field}} > 0) {
-                                $changes{$itemid} = 1;
-                            }
-                        } elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
-                            if (@{$confhash{$itemid}{$field}} > 0) {
+                        if ($domconfig{$action}{$itemid}{'passback'} eq $confhash{$itemid}{'passback'}) {
+                            if ($domconfig{$action}{$itemid}{'passbackformat'} ne $confhash{$itemid}{'passbackformat'}) {
                                 $changes{$itemid} = 1;
                             }
                         }
                     }
-                }
-                unless ($changes{$itemid}) {
-                    if (ref($domconfig{$action}{$itemid}{'maproles'}) eq 'HASH') {
-                        if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') {
-                            foreach my $ltirole (keys(%{$domconfig{$action}{$itemid}{'maproles'}})) {
-                                if ($domconfig{$action}{$itemid}{'maproles'}{$ltirole} ne 
-                                    $confhash{$itemid}{'maproles'}{$ltirole}) {
+                    foreach my $field ('mapcrstype','selfenroll') {
+                        unless ($changes{$itemid}) {
+                            if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') {
+                                if (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
+                                    my @diffs = &Apache::loncommon::compare_arrays($domconfig{$action}{$itemid}{$field},
+                                                                                   $confhash{$itemid}{$field});
+                                    if (@diffs) {
+                                        $changes{$itemid} = 1;
+                                    }
+                                } elsif (@{$domconfig{$action}{$itemid}{$field}} > 0) {
+                                    $changes{$itemid} = 1;
+                                }
+                            } elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
+                                if (@{$confhash{$itemid}{$field}} > 0) {
                                     $changes{$itemid} = 1;
-                                    last;
                                 }
                             }
-                            unless ($changes{$itemid}) {
-                                foreach my $ltirole (keys(%{$confhash{$itemid}{'maproles'}})) {
-                                    if ($confhash{$itemid}{'maproles'}{$ltirole} ne 
-                                        $domconfig{$action}{$itemid}{'maproles'}{$ltirole}) {
+                        }
+                    }
+                    unless ($changes{$itemid}) {
+                        if (ref($domconfig{$action}{$itemid}{'maproles'}) eq 'HASH') {
+                            if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') {
+                                foreach my $ltirole (keys(%{$domconfig{$action}{$itemid}{'maproles'}})) {
+                                    if ($domconfig{$action}{$itemid}{'maproles'}{$ltirole} ne 
+                                        $confhash{$itemid}{'maproles'}{$ltirole}) {
                                         $changes{$itemid} = 1;
                                         last;
                                     }
                                 }
+                                unless ($changes{$itemid}) {
+                                    foreach my $ltirole (keys(%{$confhash{$itemid}{'maproles'}})) {
+                                        if ($confhash{$itemid}{'maproles'}{$ltirole} ne 
+                                            $domconfig{$action}{$itemid}{'maproles'}{$ltirole}) {
+                                            $changes{$itemid} = 1;
+                                            last;
+                                        }
+                                    }
+                                }
+                            } elsif (keys(%{$domconfig{$action}{$itemid}{'maproles'}}) > 0) {
+                                $changes{$itemid} = 1;
+                            }
+                        } elsif (ref($confhash{$itemid}{'maproles'}) eq 'HASH') {
+                            unless ($changes{$itemid}) {
+                                if (keys(%{$confhash{$itemid}{'maproles'}}) > 0) {
+                                    $changes{$itemid} = 1;
+                                }
                             }
-                        } elsif (keys(%{$domconfig{$action}{$itemid}{'maproles'}}) > 0) {
+                        }
+                    }
+                }
+                unless ($changes{$itemid}) {
+                    foreach my $field ('mapuser','lcauth','lcauthparm','topmenu','inlinemenu','callback') {
+                        if ($domconfig{$action}{$itemid}{$field} ne $confhash{$itemid}{$field}) {
                             $changes{$itemid} = 1;
                         }
-                    } elsif (ref($confhash{$itemid}{'maproles'}) eq 'HASH') {
-                        unless ($changes{$itemid}) {
-                            if (keys(%{$confhash{$itemid}{'maproles'}}) > 0) {
-                                $changes{$itemid} = 1;
+                    }
+                    unless ($changes{$itemid}) {
+                        foreach my $field ('makeuser','lcmenu') {
+                            if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') {
+                                if (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
+                                    my @diffs = &Apache::loncommon::compare_arrays($domconfig{$action}{$itemid}{$field},
+                                                                                   $confhash{$itemid}{$field});
+                                    if (@diffs) {
+                                        $changes{$itemid} = 1;
+                                    }
+                                } elsif (@{$domconfig{$action}{$itemid}{$field}} > 0) {
+                                    $changes{$itemid} = 1;
+                                }
+                            } elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
+                                if (@{$confhash{$itemid}{$field}} > 0) {
+                                    $changes{$itemid} = 1;
+                                }
                             }
                         }
                     }
@@ -14995,7 +15140,7 @@ sub modify_lti {
                 if (ref($confhash{$itemid}) ne 'HASH') {
                     $resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>';
                 } else {
-                    $resulttext .= '<li><b>'.$confhash{$itemid}{'consumer'}.'</b></li><ul>';
+                    $resulttext .= '<li><b>'.$confhash{$itemid}{'consumer'}.'</b><ul>';
                     my $position = $pos + 1;
                     $resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>';
                     foreach my $item ('version','lifetime') {
@@ -15012,6 +15157,11 @@ sub modify_lti {
                         $resulttext .= ('*'x$num).'</li>';
                     }
                     if ($confhash{$itemid}{'requser'}) {
+                        if ($confhash{$itemid}{'callback'}) {
+                            $resulttext .= '<li>'.&mt('Callback setting').': '.$confhash{$itemid}{'callback'}.'</li>';
+                        } else {
+                            $resulttext .= '<li>'.&mt('Callback to logout LON-CAPA on log out from Consumer').'</li>';
+                        }
                         if ($confhash{$itemid}{'mapuser'}) {
                             my $shownmapuser;
                             if ($confhash{$itemid}{'mapuser'} eq 'lis_person_sourcedid') {
@@ -15023,20 +15173,6 @@ sub modify_lti {
                             }
                             $resulttext .= '<li>'.&mt('LON-CAPA username').': '.$shownmapuser.'</li>';
                         }
-                        if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') {
-                            my $rolemaps;
-                            foreach my $role (@ltiroles) {
-                                if ($confhash{$itemid}{'maproles'}{$role}) {
-                                    $rolemaps .= ('&nbsp;'x2).$role.'='.
-                                                 &Apache::lonnet::plaintext($confhash{$itemid}{'maproles'}{$role},
-                                                                            'Course').',';
-                                }
-                            }
-                            if ($rolemaps) {
-                                $rolemaps =~ s/,$//;
-                                $resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>';
-                            }
-                        }
                         if (ref($confhash{$itemid}{'makeuser'}) eq 'ARRAY') {
                             if (@{$confhash{$itemid}{'makeuser'}} > 0) { 
                                 $resulttext .= '<li>'.&mt('Following roles may create user accounts: [_1]',
@@ -15069,59 +15205,10 @@ sub modify_lti {
                                 $resulttext .= '<li>'.&mt('No institutional data used when creating a new user.').'</li>';
                             }
                         }
-                        if ($confhash{$itemid}{'mapcrs'}) {
-                            $resulttext .= '<li>'.&mt('Unique course identifier').': '.$confhash{$itemid}{'mapcrs'}.'</li>';
-                        }
-                        if (ref($confhash{$itemid}{'mapcrstype'}) eq 'ARRAY') {
-                            if (@{$confhash{$itemid}{'mapcrstype'}} > 0) {
-                                $resulttext .= '<li>'.&mt('Mapping for the following LON-CAPA course types: [_1]',
-                                               join(', ',map { $coursetypetitles{$_}; } @coursetypes)).
-                                               '</li>';
-                            } else {
-                                $resulttext .= '<li>'.&mt('No mapping to LON-CAPA courses').'</li>';
-                            }
-                        }
-                        if ($confhash{$itemid}{'makecrs'}) {
-                            $resulttext .= '<li>'.&mt('Instructor may create course (if absent).').'</li>';
-                        } else {
-                            $resulttext .= '<li>'.&mt('Instructor may not create course (if absent).').'</li>';
-                        }
-                        if (ref($confhash{$itemid}{'selfenroll'}) eq 'ARRAY') {
-                            if (@{$confhash{$itemid}{'selfenroll'}} > 0) {
-                                $resulttext .= '<li>'.&mt('Self-enrollment for following roles: [_1]',
-                                                          join(', ',@{$confhash{$itemid}{'selfenroll'}})).
-                                               '</li>';
-                            } else {
-                                $resulttext .= '<li>'.&mt('Self-enrollment not permitted').'</li>';
-                            }
-                        }
-                        if ($confhash{$itemid}{'section'}) {
-                            if ($confhash{$itemid}{'section'} eq 'course_section_sourcedid') {
-                                $resulttext .= '<li>'.&mt('User section from standard field:').
-                                                     ' (course_section_sourcedid)'.'</li>';  
-                            } else {
-                                $resulttext .= '<li>'.&mt('User section from:').' '.
-                                                      $confhash{$itemid}{'section'}.'</li>';
-                            }
-                        } else {
-                            $resulttext .= '<li>'.&mt('No section assignment').'</li>';
-                        }
-                        if ($confhash{$itemid}{'callback'}) {
-                            $resulttext .= '<li>'.&mt('Callback setting').': '.$confhash{$itemid}{'callback'}.'</li>';
-                        } else {
-                            $resulttext .= '<li>'.&mt('No callback to logout LON-CAPA session when user logs out of Comsumer');
-                        }
-                        foreach my $item ('passback','roster','topmenu','inlinemenu') {
+                        foreach my $item ('topmenu','inlinemenu') {
                             $resulttext .= '<li>'.$lt{$item}.':&nbsp;';
                             if ($confhash{$itemid}{$item}) {
                                 $resulttext .= &mt('Yes');
-                                if ($item eq 'passback') {
-                                    if ($confhash{$itemid}{'passbackformat'} eq '1.0') {
-                                        $resulttext .= '&nbsp;('.&mt('Outcomes Extension (1.0)').')';
-                                    } elsif ($confhash{$itemid}{'passbackformat'} eq '1.1') {
-                                        $resulttext .= '&nbsp;('.&mt('Outcomes Service (1.1)').')';
-                                    }
-                                }
                             } else {
                                 $resulttext .= &mt('No');
                             }
@@ -15130,9 +15217,89 @@ sub modify_lti {
                         if (ref($confhash{$itemid}{'lcmenu'}) eq 'ARRAY') {
                             if (@{$confhash{$itemid}{'lcmenu'}} > 0) {
                                 $resulttext .= '<li>'.&mt('Menu items:').' '.
-                                               join(', ', map { $menutitles{$_}; } (@{$confhash{$itemid}{'lcmenu'}})).'</li>'; 
+                                               join(', ', map { $menutitles{$_}; } (@{$confhash{$itemid}{'lcmenu'}})).'</li>';
+                            } else {
+                                $resulttext .= '<li>'.&mt('No menu items displayed in header or online menu').'</li>';
+                            }
+                        }
+                        if ($confhash{$itemid}{'crsinc'}) {
+                            if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') {
+                                my $rolemaps;
+                                foreach my $role (@ltiroles) {
+                                    if ($confhash{$itemid}{'maproles'}{$role}) {
+                                        $rolemaps .= ('&nbsp;'x2).$role.'='.
+                                                     &Apache::lonnet::plaintext($confhash{$itemid}{'maproles'}{$role},
+                                                                                'Course').',';
+                                    }
+                                }
+                                if ($rolemaps) {
+                                    $rolemaps =~ s/,$//;
+                                    $resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>';
+                                }
+                            }
+                            if ($confhash{$itemid}{'mapcrs'}) {
+                                $resulttext .= '<li>'.&mt('Unique course identifier').': '.$confhash{$itemid}{'mapcrs'}.'</li>';
+                            }
+                            if (ref($confhash{$itemid}{'mapcrstype'}) eq 'ARRAY') {
+                                if (@{$confhash{$itemid}{'mapcrstype'}} > 0) {
+                                    $resulttext .= '<li>'.&mt('Mapping for the following LON-CAPA course types: [_1]',
+                                                   join(', ',map { $coursetypetitles{$_}; } @coursetypes)).
+                                                   '</li>';
+                                } else {
+                                    $resulttext .= '<li>'.&mt('No mapping to LON-CAPA courses').'</li>';
+                                }
+                            }
+                            if ($confhash{$itemid}{'storecrs'}) {
+                                $resulttext .= '<li>'.&mt('Store mapping of course identifier to LON-CAPA CourseID').': '.$confhash{$itemid}{'storecrs'}.'</li>';
+                            }
+                            if ($confhash{$itemid}{'makecrs'}) {
+                                $resulttext .= '<li>'.&mt('Instructor may create course (if absent).').'</li>';
+                            } else {
+                                $resulttext .= '<li>'.&mt('Instructor may not create course (if absent).').'</li>';
+                            }
+                            if (ref($confhash{$itemid}{'selfenroll'}) eq 'ARRAY') {
+                                if (@{$confhash{$itemid}{'selfenroll'}} > 0) {
+                                    $resulttext .= '<li>'.&mt('Self-enrollment for following roles: [_1]',
+                                                              join(', ',@{$confhash{$itemid}{'selfenroll'}})).
+                                                   '</li>';
+                                } else {
+                                    $resulttext .= '<li>'.&mt('Self-enrollment not permitted').'</li>';
+                                }
+                            }
+                            if ($confhash{$itemid}{'section'}) {
+                                if ($confhash{$itemid}{'section'} eq 'course_section_sourcedid') {
+                                    $resulttext .= '<li>'.&mt('User section from standard field:').
+                                                         ' (course_section_sourcedid)'.'</li>';  
+                                } else {
+                                    $resulttext .= '<li>'.&mt('User section from:').' '.
+                                                          $confhash{$itemid}{'section'}.'</li>';
+                                }
                             } else {
-                                $resulttext .= '<li>'.&mt('No menu items displayed in header or online menu').'</li>'; 
+                                $resulttext .= '<li>'.&mt('No section assignment').'</li>';
+                            }
+                            foreach my $item ('passback','roster','topmenu','inlinemenu') {
+                                $resulttext .= '<li>'.$lt{$item}.':&nbsp;';
+                                if ($confhash{$itemid}{$item}) {
+                                    $resulttext .= &mt('Yes');
+                                    if ($item eq 'passback') {
+                                        if ($confhash{$itemid}{'passbackformat'} eq '1.0') {
+                                            $resulttext .= '&nbsp;('.&mt('Outcomes Extension (1.0)').')';
+                                        } elsif ($confhash{$itemid}{'passbackformat'} eq '1.1') {
+                                            $resulttext .= '&nbsp;('.&mt('Outcomes Service (1.1)').')';
+                                        }
+                                    }
+                                } else {
+                                    $resulttext .= &mt('No');
+                                }
+                                $resulttext .= '</li>';
+                            }
+                            if (ref($confhash{$itemid}{'lcmenu'}) eq 'ARRAY') {
+                                if (@{$confhash{$itemid}{'lcmenu'}} > 0) {
+                                    $resulttext .= '<li>'.&mt('Menu items:').' '.
+                                                   join(', ', map { $menutitles{$_}; } (@{$confhash{$itemid}{'lcmenu'}})).'</li>'; 
+                                } else {
+                                    $resulttext .= '<li>'.&mt('No menu items displayed in header or online menu').'</li>'; 
+                                }
                             }
                         }
                     }
@@ -20236,8 +20403,8 @@ sub modify_selfenrollment {
 sub modify_wafproxy {
     my ($dom,$action,$lastactref,%domconfig) = @_;
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
-    my (%othercontrol,%canset,%values,%curralias,%currvalue,@warnings,%wafproxy,
-        %changes,%expirecache);
+    my (%othercontrol,%canset,%values,%curralias,%currsaml,%currvalue,@warnings,
+        %wafproxy,%changes,%expirecache,%expiresaml);
     foreach my $server (sort(keys(%servers))) {
         my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server});
         if ($serverhome eq $server) {
@@ -20252,6 +20419,9 @@ sub modify_wafproxy {
         if (ref($domconfig{'wafproxy'}{'alias'}) eq 'HASH') {
             %curralias = %{$domconfig{'wafproxy'}{'alias'}};
         }
+        if (ref($domconfig{'wafproxy'}{'saml'}) eq 'HASH') {
+            %currsaml = %{$domconfig{'wafproxy'}{'saml'}};
+        }
         foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') {
             $currvalue{$item} = $domconfig{'wafproxy'}{$item};
         }
@@ -20259,6 +20429,7 @@ sub modify_wafproxy {
     my $output;
     if (keys(%canset)) {
         %{$wafproxy{'alias'}} = ();
+        %{$wafproxy{'saml'}} = ();
         foreach my $key (sort(keys(%canset))) {
             if ($env{'form.wafproxy_'.$dom}) {
                 $wafproxy{'alias'}{$key} = $env{'form.wafproxy_alias_'.$key};
@@ -20266,11 +20437,21 @@ sub modify_wafproxy {
                 if ($wafproxy{'alias'}{$key} ne $curralias{$key}) {
                     $changes{'alias'} = 1;
                 }
+                if ($env{'form.wafproxy_alias_saml_'.$key}) {
+                    $wafproxy{'saml'}{$key} = 1;
+                }
+                if ($wafproxy{'saml'}{$key} ne $currsaml{$key}) {
+                    $changes{'saml'} = 1;
+                }
             } else {
                 $wafproxy{'alias'}{$key} = '';
+                $wafproxy{'saml'}{$key} = '';
                 if ($curralias{$key}) {
                     $changes{'alias'} = 1;
                 }
+                if ($currsaml{$key}) {
+                    $changes{'saml'} = 1;
+                }
             }
             if ($wafproxy{'alias'}{$key} eq '') {
                 if ($curralias{$key}) {
@@ -20278,11 +20459,20 @@ sub modify_wafproxy {
                 }
                 delete($wafproxy{'alias'}{$key});
             }
+            if ($wafproxy{'saml'}{$key} eq '') {
+                if ($currsaml{$key}) {
+                    $expiresaml{$key} = 1;
+                }
+                delete($wafproxy{'saml'}{$key});
+            }
         }
         unless (keys(%{$wafproxy{'alias'}})) {
             delete($wafproxy{'alias'});
         }
-        # Localization for values in %warn occus in &mt() calls separately.
+        unless (keys(%{$wafproxy{'saml'}})) {
+            delete($wafproxy{'saml'});
+        }
+        # Localization for values in %warn occurs in &mt() calls separately.
         my %warn = (
                      trusted => 'trusted IP range(s)',
                      vpnint => 'internal IP range(s) for VPN sessions(s)',
@@ -20350,6 +20540,9 @@ sub modify_wafproxy {
     } else {
         if (keys(%curralias)) {
             $changes{'alias'} = 1;
+        }
+        if (keys(%currsaml)) {
+            $changes{'saml'} = 1;
         } 
         if (keys(%currvalue)) {
             foreach my $key (keys(%currvalue)) {
@@ -20402,6 +20595,23 @@ sub modify_wafproxy {
                     $lastactref->{'proxyalias'} = \%updates;
                 }
             }
+            if ((exists($wafproxy{'saml'})) || (keys(%expiresaml))) {
+                my %samlupdates = %expiresaml;
+                foreach my $key (keys(%expiresaml)) {
+                    &Apache::lonnet::devalidate_cache_new('proxysaml',$key);
+                }
+                if (ref($wafproxy{'saml'}) eq 'HASH') {
+                    my $cachetime = 24*60*60;
+                    foreach my $key (keys(%{$wafproxy{'saml'}})) {
+                        $samlupdates{$key} = 1;
+                        &Apache::lonnet::do_cache_new('proxysaml',$key,$wafproxy{'saml'}{$key},
+                                                      $cachetime);
+                    }
+                }
+                if (ref($lastactref) eq 'HASH') {
+                    $lastactref->{'proxysaml'} = \%samlupdates;
+                }
+            }
             $output = &mt('Changes were made to Web Application Firewall/Reverse Proxy').'<ul>';
             foreach my $item ('alias','remoteip','ipheader','trusted','vpnint','vpnext','sslopt') {
                 if ($changes{$item}) {
@@ -20425,6 +20635,19 @@ sub modify_wafproxy {
                         unless ($numaliased) {
                             $output .= '<li>'.&mt('Aliases deleted for hostnames').'</li>';
                         }
+                    } elsif ($item eq 'saml') {
+                        my $shown; 
+                        if (ref($wafproxy{'saml'}) eq 'HASH') {
+                            if (keys(%{$wafproxy{'saml'}})) {
+                                $shown = join(', ',sort(keys(%{$wafproxy{'saml'}})));
+                            }
+                        }
+                        if ($shown) {
+                            $output .= '<li>'.&mt('Alias used by Shibboleth for: [_1]',
+                                                  $shown).'</li>';
+                        } else {
+                            $output .= '<li>'.&mt('No alias used for Shibboleth').'</li>';
+                        }
                     } else {
                         if ($item eq 'remoteip') {
                             my %ip_methods = &remoteip_methods();
@@ -21437,8 +21660,13 @@ sub modify_loadbalancing {
                             }
                         }
                         if ($changes{'curr'}{$balancer}{'cookie'}) {
-                            $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use enabled',
-                                                      $balancer).'</li>'; 
+                            if ($currcookies{$balancer}) {
+                                $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use disabled',
+                                                          $balancer).'</li>';
+                            } else {
+                                $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use enabled',
+                                                          $balancer).'</li>';
+                            }
                         }
                     }
                 }
@@ -22218,7 +22446,7 @@ sub devalidate_remote_domconfs {
     my %thismachine;
     map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
     my @posscached = ('domainconfig','domdefaults','ltitools','usersessions',
-                      'directorysrch','passwdconf','cats','proxyalias');
+                      'directorysrch','passwdconf','cats','proxyalias','proxysaml');
     my %cache_by_lonhost;
     if (exists($cachekeys->{'samllanding'})) {
         if (ref($cachekeys->{'samllanding'}) eq 'HASH') {
@@ -22244,7 +22472,7 @@ sub devalidate_remote_domconfs {
             my @cached;
             foreach my $name (@posscached) {
                 if ($cachekeys->{$name}) {
-                    if ($name eq 'proxyalias') {
+                    if (($name eq 'proxyalias') || ($name eq 'proxysaml')) {
                         if (ref($cachekeys->{$name}) eq 'HASH') {
                             foreach my $key (keys(%{$cachekeys->{$name}})) {
                                 push(@cached,&escape($name).':'.&escape($key));