--- loncom/interface/domainprefs.pm	2018/11/06 15:37:37	1.340
+++ loncom/interface/domainprefs.pm	2019/01/27 14:39:48	1.346
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.340 2018/11/06 15:37:37 raeburn Exp $
+# $Id: domainprefs.pm,v 1.346 2019/01/27 14:39:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -394,11 +394,12 @@ sub handler {
                     modify => \&modify_usermodification,
                   },
         'scantron' =>
-                  { text => 'Bubblesheet format file',
+                  { text => 'Bubblesheet format',
                     help => 'Domain_Configuration_Scantron_Format',
-                    header => [ {col1 => 'Item',
-                                 col2 => '',
-                              }],
+                    header => [ {col1 => 'Bubblesheet format file',
+                                 col2 => ''},
+                                {col1 => 'Bubblesheet data upload formats',
+                                 col2 => 'Settings'}],
                     print => \&print_scantron,
                     modify => \&modify_scantron,
                   },
@@ -627,6 +628,9 @@ END
         if (grep(/^contacts$/,@actions)) {
             $js .= &contacts_javascript();
         }
+        if (grep(/^scantron$/,@actions)) {
+            $js .= &scantron_javascript();
+        }
         &Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js);
     } else {
 # check if domconfig user exists for the domain.
@@ -828,6 +832,8 @@ sub print_config_box {
             $output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'coursecategories') {
             $output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal);
+        } elsif ($action eq 'scantron') {
+            $output .= $item->{'print'}->($r,'top',$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
             if ($numheaders == 4) {
                 $colspan = ' colspan="2"';
@@ -932,6 +938,8 @@ sub print_config_box {
                  ($action eq 'defaults') || ($action eq 'directorysrch') ||
                  ($action eq 'helpsettings')) {
             $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
+        } elsif ($action eq 'scantron') {
+            $output .= $item->{'print'}->($r,'bottom',$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'ssl') {
             $output .= $item->{'print'}->('connto',$dom,$settings,\$rowtotal).'
             </table>
@@ -1113,8 +1121,6 @@ sub print_config_box {
                  ($action eq 'serverstatuses') || ($action eq 'loadbalancing') || 
                  ($action eq 'ltitools') || ($action eq 'lti')) {
             $output .= $item->{'print'}->($dom,$settings,\$rowtotal);
-        } elsif ($action eq 'scantron') {
-            $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
         }
     }
     $output .= '
@@ -2836,13 +2842,37 @@ sub lti_toggle_js {
 // <![CDATA[
 
 function toggleLTI(form,setting,item) {
-    if ((setting == 'user') || (setting == 'crs') || (setting == 'passback')) {
+    if (setting == 'requser') {
+        var fieldsets = document.getElementsByClassName('ltioption_'+item);
+        if (fieldsets.length) {
+            var radioname = 'lti_'+setting+'_'+item;
+            var num = form.elements[radioname].length;
+            if (num) {
+                var setvis = '';
+                for (var i=0; i<num; i++) {
+                    if (form.elements[radioname][i].checked) {
+                        if (form.elements[radioname][i].value == '1') {
+                           setvis = 1;
+                           break;
+                        }
+                    }
+                }
+                for (var j=0; j<fieldsets.length; j++) { 
+                    if (setvis) {
+                        fieldsets[j].style.display = 'block';
+                    } else {
+                        fieldsets[j].style.display = 'none';
+                    }
+                }
+            }
+        }
+    } else if ((setting == 'user') || (setting == 'crs') || (setting == 'passback')) {
         var radioname = '';
         var divid = '';
         if (setting == 'user') {
             radioname = 'lti_mapuser_'+item;
             divid = 'lti_userfield_'+item;
-        } else if (settings == 'crs') {
+        } else if (setting == 'crs') {
             radioname = 'lti_mapcrs_'+item;
             divid = 'lti_crsfield_'+item;
         } else {
@@ -3581,7 +3611,7 @@ sub print_contacts {
             $sysmail = $defaults->{'sysmail'};
         }
         if (ref($lonstatus{'weights'}) eq 'HASH') {
-            foreach my $type ('E','W','N') {
+            foreach my $type ('E','W','N','U') {
                 if ($lonstatus{'weights'}{$type} =~ /^\d+$/) {
                     $weights{$type} = $lonstatus{'weights'}{$type};
                 } else {
@@ -3589,7 +3619,7 @@ sub print_contacts {
                 }
             }
         } else {
-            foreach my $type ('E','W','N') {
+            foreach my $type ('E','W','N','U') {
                 $weights{$type} = $defaults->{$type};
             }
         }
@@ -3610,7 +3640,7 @@ sub print_contacts {
                       '<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') {
+        foreach my $type ('E','W','N','U') {
             $datatable .= '<td>'.$names->{$type}.'<br />'.
                           '<input type="text" name="errorweights_'.$type.'" value="'.
                           $weights{$type}.'" size="5" /></td>';
@@ -4767,14 +4797,24 @@ 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,$current);
+            my ($key,$secret,$lifetime,$consumer,$requser,$current);
             if (ref($settings->{$item}) eq 'HASH') {
                 $key = $settings->{$item}->{'key'};
                 $secret = $settings->{$item}->{'secret'};
                 $lifetime = $settings->{$item}->{'lifetime'};
                 $consumer = $settings->{$item}->{'consumer'};
+                $requser = $settings->{$item}->{'requser'};
                 $current = $settings->{$item};
             }
+            my $onclickrequser = ' onclick="toggleLTI(this.form,'."'requser','$i'".');"';
+            my %checkedrequser = (
+                                   yes => ' checked="checked"',
+                                   no  => '',
+                                 );
+            if (!$requser) {
+                $checkedrequser{'no'} = $checkedrequser{'yes'};
+                $checkedrequser{'yes'} = '';
+            } 
             my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'lti_pos_".$item."'".');"';
             $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
                          .'<select name="lti_pos_'.$item.'"'.$chgstr.'>';
@@ -4792,13 +4832,17 @@ sub print_lti {
                 '<td colspan="2">'.
                 '<fieldset><legend>'.&mt('Required settings').'</legend>'.
                 '<span class="LC_nobreak">'.$lt{'consumer'}.
-                ':<input type="text" size="20" name="lti_consumer_'.$i.'" value="'.$consumer.'" /></span> '.
+                ':<input type="text" size="15" name="lti_consumer_'.$i.'" value="'.$consumer.'" /></span> '.
                 ('&nbsp;'x2).
                 '<span class="LC_nobreak">'.$lt{'version'}.':<select name="lti_version_'.$i.'">'.
                 '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '.
                 ('&nbsp;'x2).
                 '<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" name="lti_lifetime_'.$i.'"'.
-                'value="'.$lifetime.'" size="5" /></span>'.
+                'value="'.$lifetime.'" size="3" /></span>'.
+                ('&nbsp;'x2).
+                 '<span class="LC_nobreak">'.$lt{'requser'}.':'.
+                 '<label><input type="radio" name="lti_requser_'.$i.'" value="1"'.$onclickrequser.$checkedrequser{yes}.' />'.&mt('Yes').'</label>&nbsp;'."\n".
+                 '<label><input type="radio" name="lti_requser_'.$i.'" value="0"'.$onclickrequser.$checkedrequser{no}.' />'.&mt('No').'</label></span>'."\n".
                 '<br /><br />'.
                 '<span class="LC_nobreak">'.$lt{'key'}.
                 ':<input type="text" size="25" name="lti_key_'.$i.'" value="'.$key.'" /></span> '.
@@ -4829,12 +4873,16 @@ sub print_lti {
                   '<td colspan="2">'.
                   '<fieldset><legend>'.&mt('Required settings').'</legend>'.
                   '<span class="LC_nobreak">'.$lt{'consumer'}.
-                  ':<input type="text" size="20" name="lti_consumer_add" value="" /></span> '."\n".
+                  ':<input type="text" size="15" name="lti_consumer_add" value="" /></span> '."\n".
                   ('&nbsp;'x2).
                   '<span class="LC_nobreak">'.$lt{'version'}.':<select name="lti_version_add">'.
                   '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '."\n".
                   ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" size="5" name="lti_lifetime_add" value="300" /></span> '."\n".
+                  '<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" size="3" name="lti_lifetime_add" value="300" /></span> '."\n".
+                  ('&nbsp;'x2).
+                  '<span class="LC_nobreak">'.$lt{'requser'}.':'.
+                  '<label><input type="radio" name="lti_requser_add" value="1" onclick="toggleLTI(this.form,'."'requser','add'".');" checked="checked" />'.&mt('Yes').'</label>&nbsp;'."\n".
+                  '<label><input type="radio" name="lti_requser_add" value="0" onclick="toggleLTI(this.form,'."'requser','add'".');" />'.&mt('No').'</label></span>'."\n".
                   '<br /><br />'.
                   '<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="lti_key_add" value="" /></span> '."\n".
                   ('&nbsp;'x2).
@@ -4853,15 +4901,16 @@ sub lti_names {
                                           'url'       => 'URL',
                                           'key'       => 'Key',
                                           'lifetime'  => 'Nonce lifetime (s)',
-                                          'consumer'  => 'LTI Consumer', 
+                                          'consumer'  => 'Consumer',
                                           'secret'    => 'Secret',
+                                          'requser'   => "User's identity sent",
                                           'email'     => 'Email address',
                                           'sourcedid' => 'User ID',
                                           'other'     => 'Other',
                                           'passback'  => 'Can return grades to Consumer:',
                                           'roster'    => 'Can retrieve roster from Consumer:',
                                           'topmenu'   => 'Display LON-CAPA page header',
-                                          'inlinemenu'=> 'Display LON-CAPA inline menu', 
+                                          'inlinemenu'=> 'Display LON-CAPA inline menu',
                                         );
     return %lt;
 }
@@ -4887,6 +4936,7 @@ sub lti_options {
     my $crssecfieldsty = 'none';
     my $secsrcfieldsty = 'none';
     my $passbacksty = 'none';
+    my $optionsty = 'block';
     my $lcauthparm;
     my $lcauthparmstyle = 'display:none';
     my $lcauthparmtext;
@@ -4895,6 +4945,9 @@ sub lti_options {
     my %menutitles = &ltimenu_titles();
 
     if (ref($current) eq 'HASH') {
+        if (!$current->{'requser'}) {
+            $optionsty = 'none';
+        }
         if (($current->{'mapuser'} ne '') && ($current->{'mapuser'} ne 'lis_person_sourcedid')) {
             $checked{'mapuser'}{'sourcedid'} = '';
             if ($current->{'mapuser'} eq 'lis_person_contact_email_primary') {
@@ -4920,7 +4973,7 @@ sub lti_options {
                 $checked{'mapcrstype'}{$type} = ' checked="checked"';
             }
         }
-        if ($current->{'makecrs'}) { 
+        if ($current->{'makecrs'}) {
             $checked{'makecrs'}{'Y'} = '  checked="checked"';
         }
         if (ref($current->{'makeuser'}) eq 'ARRAY') {
@@ -5017,7 +5070,7 @@ 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><legend>'.&mt('Mapping users').'</legend>'.
+    my $output = '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping users').'</legend>'.
                  '<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('LON-CAPA username').':&nbsp;';
     foreach my $option ('sourcedid','email','other') {
         $output .= '<label><input type="radio" name="lti_mapuser_'.$num.'" value="'.$option.'"'.
@@ -5028,7 +5081,7 @@ 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><legend>'.&mt('Mapping course roles').'</legend><table><tr>';
+               '<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 '') {
@@ -5052,13 +5105,13 @@ sub lti_options {
         $output .= '</select></td>';
     }
     $output .= '</tr></table></fieldset>'.
-               '<fieldset><legend>'.&mt('Roles which may create user accounts').'</legend>';
+               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Roles which may create user accounts').'</legend>';
     foreach my $ltirole (@ltiroles) {
         $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="lti_makeuser_'.$num.'" value="'.$ltirole.'"'.
                    $checked{'makeuser'}{$ltirole}.' />'.$ltirole.'</label>&nbsp;</span> ';     
     }
     $output .= '</fieldset>'.
-               '<fieldset><legend>'.&mt('New user accounts created for LTI users').'</legend>'.
+               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('New user accounts created for LTI users').'</legend>'.
                '<table>'.
                &modifiable_userdata_row('lti','instdata_'.$num,$current,$numinrow,$itemcount).
                '</table>'.
@@ -5081,7 +5134,7 @@ 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><legend>'.&mt('Mapping courses').'</legend>'.
+               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping courses').'</legend>'.
                '<div class="LC_floatleft"><span class="LC_nobreak">'.
                &mt('Unique course identifier').':&nbsp;';
     foreach my $option ('course_offering_sourcedid','context_id','other') {
@@ -5099,20 +5152,20 @@ sub lti_options {
                    ('&nbsp;'x2);
     }
     $output .= '</span></fieldset>'.
-               '<fieldset><legend>'.&mt('Creating courses').'</legend>'.
+               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Creating courses').'</legend>'.
                '<span class="LC_nobreak">'.&mt('Course created (if absent) on Instructor access').':&nbsp;'.
                '<label><input type="radio" name="lti_makecrs_'.$num.'" value="0"'.
                $checked{'makecrs'}{'N'}.' />'.&mt('No').'</label>'.('&nbsp;'x2).
                '<label><input type="radio" name="lti_makecrs_'.$num.'" value="1"'.
                $checked{'makecrs'}{'Y'}.' />'.&mt('Yes').'</label></span>'.
                '</fieldset>'.
-               '<fieldset><legend>'.&mt('Roles which may self-enroll').'</legend>';
+               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Roles which may self-enroll').'</legend>';
     foreach my $lticrsrole (@lticourseroles) {
         $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="lti_selfenroll_'.$num.'" value="'.$lticrsrole.'"'.
                    $checked{'selfenroll'}{$lticrsrole}.' />'.$lticrsrole.'</label>&nbsp;</span> ';
     }
     $output .= '</fieldset>'.
-               '<fieldset><legend>'.&mt('Course options').'</legend>'.
+               '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Course options').'</legend>'.
                '<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('Assign users to sections').':&nbsp;'.
                '<label><input type="radio" name="lti_crssec_'.$num.'" value="0"'.
                $checked{'crssec'}{'N'}.$onclicksec.' />'.&mt('No').'</label>'.('&nbsp;'x2).
@@ -5164,7 +5217,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></fieldset>'.
-               '<fieldset><legend>'.&mt('Course defaults (Course Coordinator can override)').'</legend>'.
+               '<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).
@@ -6339,13 +6392,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;
     }
@@ -6422,6 +6475,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++) {
@@ -6477,6 +6533,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 />';
@@ -6485,7 +6546,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,
@@ -6499,10 +6565,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}))) {
@@ -6521,6 +6588,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 {
@@ -7910,6 +7980,48 @@ sub defaults_titles {
     return (\%titles);
 }
 
+sub print_scantron {
+    my ($r,$position,$dom,$confname,$settings,$rowtotal) = @_;
+    if ($position eq 'top') {
+        return &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
+    } else {
+        return &print_scantronconfig($dom,$settings,\$rowtotal);
+    }
+}
+
+sub scantron_javascript {
+    return <<"ENDSCRIPT";
+
+<script type="text/javascript">
+// <![CDATA[
+
+function toggleScantron(form) {
+    if (document.getElementById('scantroncsv_cols')) {
+        var csvfieldset = document.getElementById('scantroncsv_cols');
+        if (document.getElementById('scantronconfcsv')) {
+            var scantroncsv = document.getElementById('scantronconfcsv'); 
+            if (scantroncsv.checked) {
+                csvfieldset.style.display = 'inline-block';
+            } else {
+                csvfieldset.style.display = 'none';
+                var csvselects = document.getElementsByClassName('scantronconfig_csv');
+                if (csvselects.length) {
+                    for (var j=0; j<csvselects.length; j++) {
+                        csvselects[j].selectedIndex = 0;
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+// ]]>
+</script>
+
+ENDSCRIPT
+
+}
+
 sub print_scantronformat {
     my ($r,$dom,$confname,$settings,$rowtotal) = @_;
     my $itemcount = 1;
@@ -7936,8 +8048,8 @@ sub print_scantronformat {
             if ($configuserok eq 'ok') {
                 if ($author_ok eq 'ok') {
                     my %legacyfile = (
- default => $Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab', 
- custom  => $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab', 
+ default => $Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab',
+ custom  => $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab',
                     );
                     my %md5chk;
                     foreach my $type (keys(%legacyfile)) {
@@ -7946,7 +8058,7 @@ sub print_scantronformat {
                     }
                     if ($md5chk{'default'} ne $md5chk{'custom'}) {
                         foreach my $type (keys(%legacyfile)) {
-                            ($scantronurls{$type},my $error) = 
+                            ($scantronurls{$type},my $error) =
                                 &legacy_scantronformat($r,$dom,$confname,
                                                  $type,$legacyfile{$type},
                                                  $scantronurls{$type},
@@ -7957,13 +8069,13 @@ sub print_scantronformat {
                         }
                         if (keys(%error) == 0) {
                             $is_custom = 1;
-                            $confhash{'scantron'}{'scantronformat'} = 
+                            $confhash{'scantron'}{'scantronformat'} =
                                 $scantronurls{'custom'};
-                            my $putresult = 
+                            my $putresult =
                                 &Apache::lonnet::put_dom('configuration',
                                                          \%confhash,$dom);
                             if ($putresult ne 'ok') {
-                                $error{'custom'} = 
+                                $error{'custom'} =
                                     '<span class="LC_error">'.
                                     &mt('An error occurred updating the domain configuration: [_1]',$putresult).'</span>';
                             }
@@ -8083,6 +8195,96 @@ sub legacy_scantronformat {
     return ($url,$error);
 }
 
+sub print_scantronconfig {
+    my ($dom,$settings,$rowtotal) = @_;
+    my $itemcount = 2;
+    my $is_checked = ' checked="checked"';
+    my $currcsvsty = 'none';
+    my ($datatable,%csvfields,%checked,%onclick);
+    my @fields = &scantroncsv_fields();
+    my %titles = &scantronconfig_titles();
+    if (ref($settings) eq 'HASH') {
+        if (ref($settings->{config}) eq 'HASH') {
+            if ($settings->{config}->{dat}) {
+                $checked{'dat'} = $is_checked;
+            }
+            if (ref($settings->{config}->{csv}) eq 'HASH') {
+                %csvfields = %{$settings->{config}->{csv}};
+                if (keys(%csvfields) > 0) {
+                    $checked{'csv'} = $is_checked;
+                    $currcsvsty = 'inline-block';
+                }
+            }
+        } else {
+            $checked{'dat'} = $is_checked;
+        }
+    } else {
+        $checked{'dat'} = $is_checked;
+    }
+    $onclick{'csv'} = ' onclick="toggleScantron(this.form);"';
+    my $css_class = $itemcount%2? ' class="LC_odd_row"':'';
+    $datatable = '<tr '.$css_class.'><td>'.&mt('Supported formats').'</td>'.
+                 '<td class="LC_left_item" valign="top"><span class="LC_nobreak">';
+    foreach my $item ('dat','csv') {
+        my $id;
+        if ($item eq 'csv') {
+            $id = 'id="scantronconfcsv" ';
+        } 
+        $datatable .= '<label><input type="checkbox" name="scantronconfig" '.$id.'value="'.$item.'"'.$checked{$item}.$onclick{$item}.' />'.
+                      $titles{$item}.'</label>'.('&nbsp;'x3);
+        if ($item eq 'csv') {
+            $datatable .= '<fieldset style="display:'.$currcsvsty.'" id="scantroncsv_cols">'.
+                          '<legend>'.&mt('CSV Column Mapping').'</legend>'.
+                          '<table><tr><th>'.&mt('Field').'</th><th>'.&mt('Location').'</th></tr>'."\n";
+            foreach my $col (@fields) {
+                my $selnone;
+                if ($csvfields{$col} eq '') {
+                    $selnone = ' selected="selected"';
+                }
+                $datatable .= '<tr><td>'.$titles{$col}.'</td>'.
+                              '<td><select name="scantronconfig_csv_'.$col.'" class="scantronconfig_csv">'.
+                              '<option value=""'.$selnone.'></option>';
+                for (my $i=0; $i<20; $i++) {
+                    my $shown = $i+1;
+                    my $sel;
+                    unless ($selnone) {
+                        if (exists($csvfields{$col})) {
+                            if ($csvfields{$col} == $i) {
+                                $sel = ' selected="selected"';
+                            }
+                        }
+                    }
+                    $datatable .= '<option value="'.$i.'"'.$sel.'>'.$shown.'</option>';
+                }
+                $datatable .= '</select></td></tr>';
+           }
+           $datatable .= '</table></fieldset>';
+           $itemcount ++;
+        }
+    }
+    $datatable .= '</td></tr>';
+    $$rowtotal ++;
+    return $datatable;
+}
+
+sub scantronconfig_titles {
+    return &Apache::lonlocal::texthash(
+                                          dat => 'Standard format (.dat)',
+                                          csv => 'Comma separated values (.csv)',
+                                          CODE => 'CODE',
+                                          ID   => 'Student ID',
+                                          PaperID => 'Paper ID',
+                                          FirstName => 'First Name',
+                                          LastName => 'Last Name',
+                                          FirstQuestion => 'First Question Response',
+                                          Section => 'Section',
+    );
+}
+
+sub scantroncsv_fields {
+    return ('PaperID','LastName','FirstName','ID','Section','CODE','FirstQuestion');
+}
+
 sub print_coursecategories {
     my ($position,$dom,$hdritem,$settings,$rowtotal) = @_;
     my $datatable;
@@ -11759,7 +11961,7 @@ sub modify_lti {
         if ($position ne '') {
             $allpos[$position] = $itemid;
         }
-        foreach my $item ('consumer','key','secret','lifetime') {
+        foreach my $item ('consumer','key','secret','lifetime','requser') {
             my $formitem = 'form.lti_'.$item.'_'.$idx;
             $env{$formitem} =~ s/(`)/'/g;
             if ($item eq 'lifetime') {
@@ -11781,177 +11983,179 @@ sub modify_lti {
         if ($env{'form.lti_version_'.$idx} eq 'LTI-1p0') {
             $confhash{$itemid}{'version'} = $env{'form.lti_version_'.$idx};
         }
-        if ($env{'form.lti_mapuser_'.$idx} eq 'sourcedid') {
-            $confhash{$itemid}{'mapuser'} = 'lis_person_sourcedid'; 
-        } elsif ($env{'form.lti_mapuser_'.$idx} eq 'email') {
-            $confhash{$itemid}{'mapuser'} = 'lis_person_contact_email_primary';
-        } elsif ($env{'form.lti_mapuser_'.$idx} eq 'other') {
-            my $mapuser = $env{'form.lti_customuser_'.$idx};
-            $mapuser =~ s/(`)/'/g;
-            $mapuser =~ s/^\s+|\s+$//g; 
-            $confhash{$itemid}{'mapuser'} = $mapuser; 
-        }
-        foreach my $ltirole (@lticourseroles) {
-            my $possrole = $env{'form.lti_maprole_'.$ltirole.'_'.$idx};
-            if (grep(/^\Q$possrole\E$/,@courseroles)) {
-                $confhash{$itemid}{'maproles'}{$ltirole} = $possrole;
-            }
-        }
-        my @possmakeuser = &Apache::loncommon::get_env_multiple('form.lti_makeuser_'.$idx);
-        my @makeuser;
-        foreach my $ltirole (sort(@possmakeuser)) {
-            if ($posslti{$ltirole}) {
-                push(@makeuser,$ltirole);
-            }
-        }
-        $confhash{$itemid}{'makeuser'} = \@makeuser;
-        if (@makeuser) {
-            my $lcauth = $env{'form.lti_lcauth_'.$idx};
-            if ($lcauth =~ /^(internal|krb4|krb5|localauth)$/) {
-                $confhash{$itemid}{'lcauth'} = $lcauth;
-                if ($lcauth ne 'internal') {
-                    my $lcauthparm = $env{'form.lti_lcauthparm_'.$idx};
-                    $lcauthparm =~ s/^(\s+|\s+)$//g;
-                    $lcauthparm =~ s/`//g;
-                    if ($lcauthparm ne '') {
-                        $confhash{$itemid}{'lcauthparm'} = $lcauthparm;
+        if ($confhash{$itemid}{'requser'}) {
+            if ($env{'form.lti_mapuser_'.$idx} eq 'sourcedid') {
+                $confhash{$itemid}{'mapuser'} = 'lis_person_sourcedid'; 
+            } elsif ($env{'form.lti_mapuser_'.$idx} eq 'email') {
+                $confhash{$itemid}{'mapuser'} = 'lis_person_contact_email_primary';
+            } elsif ($env{'form.lti_mapuser_'.$idx} eq 'other') {
+                my $mapuser = $env{'form.lti_customuser_'.$idx};
+                $mapuser =~ s/(`)/'/g;
+                $mapuser =~ s/^\s+|\s+$//g; 
+                $confhash{$itemid}{'mapuser'} = $mapuser; 
+            }
+            foreach my $ltirole (@lticourseroles) {
+                my $possrole = $env{'form.lti_maprole_'.$ltirole.'_'.$idx};
+                if (grep(/^\Q$possrole\E$/,@courseroles)) {
+                    $confhash{$itemid}{'maproles'}{$ltirole} = $possrole;
+                }
+            }
+            my @possmakeuser = &Apache::loncommon::get_env_multiple('form.lti_makeuser_'.$idx);
+            my @makeuser;
+            foreach my $ltirole (sort(@possmakeuser)) {
+                if ($posslti{$ltirole}) {
+                    push(@makeuser,$ltirole);
+                }
+            }
+            $confhash{$itemid}{'makeuser'} = \@makeuser;
+            if (@makeuser) {
+                my $lcauth = $env{'form.lti_lcauth_'.$idx};
+                if ($lcauth =~ /^(internal|krb4|krb5|localauth)$/) {
+                    $confhash{$itemid}{'lcauth'} = $lcauth;
+                    if ($lcauth ne 'internal') {
+                        my $lcauthparm = $env{'form.lti_lcauthparm_'.$idx};
+                        $lcauthparm =~ s/^(\s+|\s+)$//g;
+                        $lcauthparm =~ s/`//g;
+                        if ($lcauthparm ne '') {
+                            $confhash{$itemid}{'lcauthparm'} = $lcauthparm;
+                        }
                     }
+                } else {
+                    $confhash{$itemid}{'lcauth'} = 'lti';
                 }
-            } 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'}});
+            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};
-        } 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);
+            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;
             }
-        }
-        $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;
+            my @posstypes = &Apache::loncommon::get_env_multiple('form.lti_mapcrstype_'.$idx);
+            my @crstypes;
+            foreach my $type (sort(@posstypes)) {
+                if ($posscrstype{$type}) {
+                    push(@crstypes,$type);
                 }
             }
-        }
-        foreach my $field ('passback','roster','topmenu','inlinemenu') {
-            if ($env{'form.lti_'.$field.'_'.$idx}) {
-                $confhash{$itemid}{$field} = 1;
+            $confhash{$itemid}{'mapcrstype'} = \@crstypes;
+            if ($env{'form.lti_makecrs_'.$idx}) {
+                $confhash{$itemid}{'makecrs'} = 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';
+            my @possenroll = &Apache::loncommon::get_env_multiple('form.lti_selfenroll_'.$idx);
+            my @selfenroll;
+            foreach my $type (sort(@possenroll)) {
+                if ($posslticrs{$type}) {
+                    push(@selfenroll,$type);
+                }
             }
-        }
-        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});
+            $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;
                     }
-                    push(@{$confhash{$itemid}{lcmenu}},$field);
                 }
             }
-        }
-        unless (($idx eq 'add') || ($changes{$itemid})) {
-            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 ('passback','roster','topmenu','inlinemenu') {
+                if ($env{'form.lti_'.$field.'_'.$idx}) {
+                    $confhash{$itemid}{$field} = 1;
                 }
             }
-            unless ($changes{$itemid}) {
-                if ($domconfig{$action}{$itemid}{'passback'} eq $confhash{$itemid}{'passback'}) {
-                    if ($domconfig{$action}{$itemid}{'passbackformat'} ne $confhash{$itemid}{'passbackformat'}) {
-                        $changes{$itemid} = 1;
+            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);
                     }
                 }
             }
-            foreach my $field ('makeuser','mapcrstype','selfenroll','instdata','lcmenu') {
+            unless (($idx eq 'add') || ($changes{$itemid})) {
+                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;
+                    }
+                }
                 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) {
+                    if ($domconfig{$action}{$itemid}{'passback'} eq $confhash{$itemid}{'passback'}) {
+                        if ($domconfig{$action}{$itemid}{'passbackformat'} ne $confhash{$itemid}{'passbackformat'}) {
                             $changes{$itemid} = 1;
                         }
-                    } elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
-                        if (@{$confhash{$itemid}{$field}} > 0) {
-                            $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 ('makeuser','mapcrstype','selfenroll','instdata','lcmenu') {
+                    unless ($changes{$itemid}) {
+                        if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') {
+                            if (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
+                                my @diffs = &Apache::loncommon::compare_arrays($domconfig{$action}{$itemid}{$field},
+                                                                               $confhash{$itemid}{$field});
+                                if (@diffs) {
+                                    $changes{$itemid} = 1;
+                                }
+                            } elsif (@{$domconfig{$action}{$itemid}{$field}} > 0) {
+                                $changes{$itemid} = 1;
+                            }
+                        } elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
+                            if (@{$confhash{$itemid}{$field}} > 0) {
                                 $changes{$itemid} = 1;
-                                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;
                                 }
                             }
-                        }
-                    } 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) {
+                            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;
+                            }
+                        }
                     }
                 }
             }
@@ -12024,122 +12228,124 @@ sub modify_lti {
                         my $num = length($encconfig{$itemid}{'secret'});
                         $resulttext .= ('*'x$num).'</li>';
                     }
-                    if ($confhash{$itemid}{'mapuser'}) {
-                        my $shownmapuser;
-                        if ($confhash{$itemid}{'mapuser'} eq 'lis_person_sourcedid') {
-                            $shownmapuser = $lt{'sourcedid'}.' (lis_person_sourcedid)';
-                        } elsif ($confhash{$itemid}{'mapuser'} eq 'lis_person_contact_email_primary') {
-                            $shownmapuser = $lt{'email'}.' (lis_person_contact_email_primary)';
-                        } else {
-                            $shownmapuser = &mt('Other').' ('.$confhash{$itemid}{'mapuser'}.')';
-                        } 
-                        $resulttext .= '<li>'.&mt('LON-CAPA username').': '.$shownmapuser.'</li>';
-                    }
-                    if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') {
-                        my $rolemaps;
-                        foreach my $role (@ltiroles) {
-                            if ($confhash{$itemid}{'maproles'}{$role}) {
-                                $rolemaps .= ('&nbsp;'x2).$role.'='.
-                                             &Apache::lonnet::plaintext($confhash{$itemid}{'maproles'}{$role},
-                                                                        'Course').',';
+                    if ($confhash{$itemid}{'requser'}) {
+                        if ($confhash{$itemid}{'mapuser'}) {
+                            my $shownmapuser;
+                            if ($confhash{$itemid}{'mapuser'} eq 'lis_person_sourcedid') {
+                                $shownmapuser = $lt{'sourcedid'}.' (lis_person_sourcedid)';
+                            } elsif ($confhash{$itemid}{'mapuser'} eq 'lis_person_contact_email_primary') {
+                                $shownmapuser = $lt{'email'}.' (lis_person_contact_email_primary)';
+                            } else {
+                                $shownmapuser = &mt('Other').' ('.$confhash{$itemid}{'mapuser'}.')';
                             }
+                            $resulttext .= '<li>'.&mt('LON-CAPA username').': '.$shownmapuser.'</li>';
                         }
-                        if ($rolemaps) {
-                            $rolemaps =~ s/,$//;
-                            $resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>';
-                        }
-                    }
-                    if (ref($confhash{$itemid}{'makeuser'}) eq 'ARRAY') {
-                        if (@{$confhash{$itemid}{'makeuser'}} > 0) { 
-                            $resulttext .= '<li>'.&mt('Following roles may create user accounts: [_1]',
-                                                      join(', ',@{$confhash{$itemid}{'makeuser'}})).'<br />';
-                            if ($confhash{$itemid}{'lcauth'} eq 'lti') {
-                                $resulttext .= &mt('New users will only be able to authenticate via LTI').'</li>';
-                            } else {
-                                $resulttext .= &mt('New users will be assigned LON-CAPA authentication: [_1]',
-                                                   $confhash{$itemid}{'lcauth'});
-                                if ($confhash{$itemid}{'lcauth'} eq 'internal') {
-                                    $resulttext .= '; '.&mt('a randomly generated password will be created');
-                                } elsif ($confhash{$itemid}{'lcauth'} eq 'localauth') {
-                                    if ($confhash{$itemid}{'lcauthparm'} ne '') {
-                                        $resulttext .= ' '.&mt('with argument: [_1]',$confhash{$itemid}{'lcauthparm'});
-                                    }
+                        if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') {
+                            my $rolemaps;
+                            foreach my $role (@ltiroles) {
+                                if ($confhash{$itemid}{'maproles'}{$role}) {
+                                    $rolemaps .= ('&nbsp;'x2).$role.'='.
+                                                 &Apache::lonnet::plaintext($confhash{$itemid}{'maproles'}{$role},
+                                                                            'Course').',';
+                                }
+                            }
+                            if ($rolemaps) {
+                                $rolemaps =~ s/,$//;
+                                $resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>';
+                            }
+                        }
+                        if (ref($confhash{$itemid}{'makeuser'}) eq 'ARRAY') {
+                            if (@{$confhash{$itemid}{'makeuser'}} > 0) { 
+                                $resulttext .= '<li>'.&mt('Following roles may create user accounts: [_1]',
+                                                          join(', ',@{$confhash{$itemid}{'makeuser'}})).'<br />';
+                                if ($confhash{$itemid}{'lcauth'} eq 'lti') {
+                                    $resulttext .= &mt('New users will only be able to authenticate via LTI').'</li>';
                                 } else {
-                                    $resulttext .= '; '.&mt('Kerberos domain: [_1]',$confhash{$itemid}{'lcauthparm'});
+                                    $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>';
                             }
-                            $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 (ref($confhash{$itemid}{'instdata'}) eq 'ARRAY') {
+                            if (@{$confhash{$itemid}{'instdata'}} > 0) {
+                                $resulttext .= '<li>'.&mt('Institutional data will be used when creating a new user for: [_1]',
+                                                          join(', ',map { $fieldtitles{$_}; } @{$confhash{$itemid}{'instdata'}})).'</li>';
+                            } else {
+                                $resulttext .= '<li>'.&mt('No institutional data used when creating a new user.').'</li>';
+                            }
                         }
-                    }
-                    if ($confhash{$itemid}{'mapcrs'}) {
-                        $resulttext .= '<li>'.&mt('Unique course identifier').': '.$confhash{$itemid}{'mapcrs'}.'</li>';
-                    }
-                    if (ref($confhash{$itemid}{'mapcrstype'}) eq 'ARRAY') {
-                        if (@{$confhash{$itemid}{'mapcrstype'}} > 0) {
-                            $resulttext .= '<li>'.&mt('Mapping for the following LON-CAPA course types: [_1]',
-                                           join(', ',map { $coursetypetitles{$_}; } @coursetypes)).
-                                           '</li>';
-                        } else {
-                            $resulttext .= '<li>'.&mt('No mapping to LON-CAPA courses').'</li>';
+                        if ($confhash{$itemid}{'mapcrs'}) {
+                            $resulttext .= '<li>'.&mt('Unique course identifier').': '.$confhash{$itemid}{'mapcrs'}.'</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>';
+                        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('Self-enrollment not permitted').'</li>';
+                            $resulttext .= '<li>'.&mt('Instructor may not create course (if absent).').'</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>';  
+                        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('User section from:').' '.
-                                                  $confhash{$itemid}{'section'}.'</li>';
+                            $resulttext .= '<li>'.&mt('No section assignment').'</li>';
                         }
-                    } else {
-                        $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)').')';
+                        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');
                             }
-                        } else {
-                            $resulttext .= &mt('No');
+                            $resulttext .= '</li>';
                         }
-                        $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>'; 
+                        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>';
@@ -13019,7 +13225,7 @@ sub modify_contacts {
                     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') {
+                            foreach my $type ('E','W','N','U') {
                                 unless ($contacts_hash{contacts}{lonstatus}{$key}{$type} eq
                                         $currsetting{'lonstatus'}{$key}{$type}) {
                                     push(@{$changes{'lonstatus'}},$key);
@@ -13027,7 +13233,7 @@ sub modify_contacts {
                                 }
                             }
                         } else {
-                            foreach my $type ('E','W','N') {
+                            foreach my $type ('E','W','N','U') {
                                 if ($contacts_hash{contacts}{lonstatus}{$key}{$type} ne '') {
                                     push(@{$changes{'lonstatus'}},$key);
                                     last;
@@ -13035,7 +13241,7 @@ sub modify_contacts {
                             }
                         }
                     } elsif (ref($currsetting{'lonstatus'}{$key}) eq 'HASH') {
-                        foreach my $type ('E','W','N') {
+                        foreach my $type ('E','W','N','U') {
                             if ($currsetting{'lonstatus'}{$key}{$type} ne '') {
                                 push(@{$changes{'lonstatus'}},$key);
                                 last;
@@ -13270,7 +13476,7 @@ sub modify_contacts {
                 $defval{'threshold'} = $lonstatus_defs->{'threshold'};
                 $defval{'sysmail'} = $lonstatus_defs->{'sysmail'};
                 $defval{'weights'} =
-                    join(', ',map { $lonstatus_names->{$_}.'='.$lonstatus_defs->{$_}; } ('E','W','N'));
+                    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') {
@@ -13279,7 +13485,7 @@ sub modify_contacts {
                                 $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') {
+                                    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};
@@ -14896,7 +15102,7 @@ sub modify_scantron {
     my $custom = 'custom.tab';
     my $default = 'default.tab';
     my $servadm = $r->dir_config('lonAdmEMail');
-    my ($configuserok,$author_ok,$switchserver) = 
+    my ($configuserok,$author_ok,$switchserver) =
         &config_check($dom,$confname,$servadm);
     if ($env{'form.scantronformat.filename'} ne '') {
         my $error;
@@ -14934,6 +15140,56 @@ sub modify_scantron {
             }
         }
     }
+    my @fields = &scantroncsv_fields();
+    my %titles = &scantronconfig_titles();
+    my @formats = &Apache::loncommon::get_env_multiple('form.scantronformat');
+    my ($newdat,$currdat,%newcol,%currcol);
+    if (grep(/^dat$/,@formats)) {
+        $confhash{'scantron'}{config}{dat} = 1;
+        $newdat = 1;
+    } else {
+        $confhash{'scantron'}{config}{dat} = 0;
+        $newdat = 0;
+    }
+    if (grep(/^csv$/,@formats)) {
+        my %bynum;
+        foreach my $field (@fields) {
+            if ($env{'form.scantronconfig_csv_'.$field} =~ /^(\d+)$/) {
+                my $posscol = $1;
+                if (($posscol < 20) && (!$bynum{$posscol})) {
+                    $confhash{'scantron'}{config}{csv}{$field} = $posscol;
+                    $bynum{$posscol} = $field;
+                    $newcol{$field} = $posscol;
+                }
+            }
+        }
+    }
+    $currdat = 1;
+    if (ref($domconfig{'scantron'}) eq 'HASH') {
+        if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') {
+            if (!$domconfig{'scantron'}{'config'}{'dat'}) {
+                $currdat = 0;
+            }
+            if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') {
+                %currcol = %{$domconfig{'scantron'}{'config'}{'csv'}};
+            }
+        }
+    }
+    if ($currdat != $newdat) {
+        $changes{'config'} = 1;
+    } else {
+        foreach my $field (@fields) {
+            if ($currcol{$field} ne '') {
+                if ($currcol{$field} ne $newcol{$field}) {
+                    $changes{'config'} = 1;
+                    last;
+                } 
+            } elsif ($newcol{$field} ne '') {
+                $changes{'config'} = 1;
+                last;
+            }
+        }
+    }
     if (keys(%confhash) > 0) {
         my $putresult = &Apache::lonnet::put_dom('configuration',\%confhash,
                                                  $dom);
@@ -14941,22 +15197,44 @@ sub modify_scantron {
             if (keys(%changes) > 0) {
                 if (ref($confhash{'scantron'}) eq 'HASH') {
                     $resulttext = &mt('Changes made:').'<ul>';
-                    if ($confhash{'scantron'}{'scantronformat'} eq '') {
-                        $resulttext .= '<li>'.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>';
-                    } else {
-                        $resulttext .= '<li>'.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>';
+                    if ($changes{'scantronformat'}) {
+                        if ($confhash{'scantron'}{'scantronformat'} eq '') {
+                            $resulttext .= '<li>'.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>';
+                        } else {
+                            $resulttext .= '<li>'.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>';
+                        }
+                    }
+                    if ($changes{'config'}) {    
+                        if (ref($confhash{'scantron'}{'config'}) eq 'HASH') {
+                            if ($confhash{'scantron'}{'config'}{'dat'}) {
+                                $resulttext .= '<li>'.&mt('Bubblesheet data upload formats includes .dat format').'</li>';
+                            }
+                            if (ref($confhash{'scantron'}{'config'}{'csv'}) eq 'HASH') {
+                                if (keys(%{$confhash{'scantron'}{'config'}{'csv'}})) { 
+                                    '<li>'.&mt('Bubblesheet data upload formats includes .csv format, with following fields/column numbers supported:').'<ul>';
+                                    foreach my $field (@fields) {
+                                        if ($confhash{'scantron'}{'config'}{'csv'}{$field} ne '') {
+                                            my $showcol = $confhash{'scantron'}{'config'}{'csv'}{$field} + 1; 
+                                            $resulttext .= '<li>'.$titles{$field}.': '.$showcol.'</li>';
+                                        }
+                                    }
+                                    $resulttext .= '</ul></li>';
+                                }
+                            }
+                        } else {
+                            $resulttext .= '<li>'.&mt('No bubblesheet data upload formats set -- will default to assuming .dat format').'</li>';
+                        }
                     }
                     $resulttext .= '</ul>';
                 } else {
                     $resulttext = &mt('Changes made to bubblesheet format file.');
                 }
-                $resulttext .= '</ul>';
                 &Apache::loncommon::devalidate_domconfig_cache($dom);
                 if (ref($lastactref) eq 'HASH') {
                     $lastactref->{'domainconfig'} = 1;
                 }
             } else {
-                $resulttext = &mt('No changes made to bubblesheet format file');
+                $resulttext = &mt('No changes made to bubblesheet format settings');
             }
         } else {
             $resulttext = '<span class="LC_error">'.
@@ -16625,14 +16903,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;
                                                 }
                                             }
                                         }
@@ -16640,12 +16922,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>';
                                     }
@@ -16833,18 +17117,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>';
@@ -16958,17 +17248,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>';
@@ -17003,12 +17297,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);
@@ -17060,6 +17354,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') {
@@ -17213,6 +17519,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;
@@ -17442,12 +17752,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";