--- loncom/interface/courseprefs.pm	2021/12/29 23:15:54	1.49.2.28.2.1
+++ loncom/interface/courseprefs.pm	2021/10/18 22:29:20	1.94
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.49.2.28.2.1 2021/12/29 23:15:54 raeburn Exp $
+# $Id: courseprefs.pm,v 1.94 2021/10/18 22:29:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -310,7 +310,7 @@ sub handler {
                 idnu => 'Course ID or number',
                 unco => 'Unique code',
                 desc => 'Course Description',
-                cred => 'Student credits',
+                cred => 'Student credits', 
                 ownr => 'Course Owner',
                 cown => 'Course Co-owners',
                 catg => 'Categorize course',
@@ -373,7 +373,7 @@ sub handler {
     my @prefs_order = ('courseinfo','localization','feedback','discussion',
                        'classlists','appearance','grading','printouts',
                        'menuitems','linkprotection','spreadsheet','bridgetasks',
-                       'other');
+                       'lti','other');
 
     my %prefs = (
         'courseinfo' =>
@@ -388,7 +388,7 @@ sub handler {
                                    'co-owners'        => $lt{'cown'},
                                    'description'      => $lt{'desc'},
                                    'courseid'         => $lt{'idnu'},
-                                   'uniquecode'       => $lt{'unco'}, 
+                                   'uniquecode'       => $lt{'unco'},
                                    'categories'       => $lt{'catg'},
                                    'hidefromcat'      => $lt{'excc'},
                                    'cloners'          => $lt{'clon'}, 
@@ -425,6 +425,7 @@ sub handler {
                     { text => 'Discussion and Chat',
                       help => 'Course_Prefs_Discussions',
                       ordered => ['pch.roles.denied','pch.users.denied',
+                                  'pac.roles.denied','pac.users.denied',
                                   'plc.roles.denied','plc.users.denied',
                                   'allow_limited_html_in_feedback',
                                   'allow_discussion_post_editing',
@@ -434,9 +435,11 @@ sub handler {
                          'pch.users.denied'             => 'No Resource Discussion',
                          'plc.roles.denied'             => 'No Chat room use',
                          'plc.users.denied'             => 'No Chat room use',
+                         'pac.roles.denied'             => 'No Anonymous Resource Discussion',
+                         'pac.users.denied'             => 'No Anonymous Resource Discussion',  
                          allow_limited_html_in_feedback => 'Allow limited HTML in discussion',
                          allow_discussion_post_editing  => 'Users can edit/delete own discussion posts',
-                         discussion_post_fonts       => 'Discussion post fonts based on likes/unlikes',
+                         discussion_post_fonts          => 'Discussion post fonts based on likes/unlikes',
                                   },
                     },
         'classlists' =>
@@ -470,7 +473,7 @@ sub handler {
                      help => 'Course_Prefs_Display',
                      ordered => ['default_xml_style','pageseparators',
                                  'disable_receipt_display','texengine',
-                                 'tthoptions','uselcmath','usejsme','inline_chem'],
+                                 'tthoptions','uselcmath','usejsme'],
                       itemtext => {
                           default_xml_style       => 'Default XML style file',
                           pageseparators          => 'Visibly Separate Items on Pages',
@@ -479,7 +482,6 @@ sub handler {
                           tthoptions              => 'Default set of options to pass to tth/m when converting TeX',
                           uselcmath               => 'Student formula entry uses inline preview, not DragMath pop-up',
                           usejsme                 => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',
-                          inline_chem             => 'Chemical reaction response uses inline preview, not pop-up',
                                   },
                   },
         'grading' =>
@@ -500,7 +502,7 @@ sub handler {
                     help => 'Course_Prefs_Printouts',
                     ordered => ['problem_stream_switch','suppress_tries',
                                 'default_paper_size','print_header_format',
-                                'disableexampointprint'],
+                                'disableexampointprint','canuse_pdfforms'],
                     itemtext => {
                         problem_stream_switch => 'Allow problems to be split over pages',
                         suppress_tries        => 'Suppress number of tries in printing',
@@ -534,6 +536,18 @@ sub handler {
                         suppress_embed_prompt => 'Hide upload references prompt if uploading file to portfolio',
                                 },
                   },
+        'lti' =>
+                  {
+                    text => 'LTI provider settings',
+                    help => 'Course_Prefs_LTIProvider',
+                    ordered => ['lti.override','lti.topmenu','lti.inlinemenu','lti.lcmenu'],
+                    itemtext => {
+                         'lti.override'   => 'Override domain defaults',
+                         'lti.topmenu'    => 'Display LON-CAPA page header',
+                         'lti.inlinemenu' => 'Display LON-CAPA inline menu',
+                         'lti.lcmenu'     => 'Menu items',
+                                },
+                  },
         'menuitems' =>
                    {
                      text => 'Menu display',
@@ -760,6 +774,8 @@ sub print_config_box {
         $output .= &print_spreadsheet($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
     } elsif ($action eq 'bridgetasks') {
         $output .= &print_bridgetasks($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
+    } elsif ($action eq 'lti') {
+        $output .= &print_lti($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
     } elsif ($action eq 'menuitems') {
         $output .= &print_menuitems('bottom',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit);
     } elsif ($action eq 'linkprotection') {
@@ -980,6 +996,7 @@ sub process_changes {
                             }
                         }
                     }
+
                     foreach my $idx (@items) {
                         my $itemid = $itemids{$idx};
                         next unless ($itemid);
@@ -1260,7 +1277,8 @@ sub process_changes {
                                     }
                                 }
                             }
-                        } elsif (($entry eq 'plc.roles.denied') || ($entry eq 'pch.roles.denied')) {
+                        } elsif (($entry eq 'plc.roles.denied') || ($entry eq 'pch.roles.denied') ||
+                                 ($entry eq 'pac.roles.denied')) {
                             my @denied = &Apache::loncommon::get_env_multiple('form.'.$entry);
                             @denied = sort(@denied);
                             my $deniedstr = '';
@@ -1268,7 +1286,8 @@ sub process_changes {
                                 $deniedstr = join(',',@denied);  
                             }
                             $newvalues{$entry} = $deniedstr;
-                        } elsif (($entry eq 'plc.users.denied') || ($entry eq 'pch.users.denied')) {
+                        } elsif (($entry eq 'plc.users.denied') || ($entry eq 'pch.users.denied') ||
+                                 ($entry eq 'pac.users.denied')) {
                             my $total = $env{'form.'.$entry.'_total'};
                             my $userstr = '';
                             my @denied;  
@@ -1320,14 +1339,14 @@ sub process_changes {
                             my ($classorder,$classtitles) = &discussion_vote_classes();
                             my $fontchange = 0;
                             foreach my $class (@{$classorder}) {
-                                my $ext_entry = $entry.'_'.$class;
+                                my $ext_entry = $entry.'_'.$class; 
                                 my $size = $env{'form.'.$ext_entry.'_size'};
                                 my $unit = $env{'form.'.$ext_entry.'_unit'};
                                 my $weight = $env{'form.'.$ext_entry.'_weight'};
                                 my $style = $env{'form.'.$ext_entry.'_style'};
                                 my $other = $env{'form.'.$ext_entry.'_other'};
                                 $size =~ s/,//g;
-                                $unit =~ s/,//g;
+                                $unit =~ s/,//g; 
                                 $weight =~ s/,//g;
                                 $style =~ s/,//g;
                                 $other =~ s/[^\w;:\s\-\%.]//g;
@@ -1335,7 +1354,7 @@ sub process_changes {
                                 $newvalues{$ext_entry} = join(',',($size.$unit,$weight,$style,$other));
                                 my $current = $values->{$ext_entry};
                                 if ($values->{$ext_entry} eq '') {
-                                    $current = ',,,';
+                                    $current = ',,,'; 
                                 }
                                 if ($newvalues{$ext_entry} ne $current) {
                                     $changes->{$ext_entry} = $newvalues{$ext_entry};
@@ -1344,7 +1363,7 @@ sub process_changes {
                             }
                             if ($fontchange) {
                                 $changes->{$entry} = 1;
-                            }
+                            } 
                         } elsif ($entry eq 'nothideprivileged') {
                             my @curr_nothide;
                             my @new_nothide;
@@ -1419,7 +1438,7 @@ sub process_changes {
                             my $newtext = $maxnum-1;
                             $newhdr[$env{'form.printfmthdr_pos_'.$newtext}] = $env{'form.printfmthdr_text_'.$newtext};
                             $newvalues{$entry} = join('',@newhdr);
-                        } elsif (($entry eq 'languages') ||
+                        } elsif (($entry eq 'languages') || 
                                  ($entry eq 'checkforpriv')) {
                             my $settings;
                             my $total = $env{'form.'.$entry.'_total'};
@@ -1435,7 +1454,7 @@ sub process_changes {
                             }
                             if ($env{'form.'.$entry.'_'.$total} ne '') {
                                 my $new = $env{'form.'.$entry.'_'.$total};
-                                if ($entry eq 'languages') {
+                                if ($entry eq 'languages') { 
                                     my %langchoices = &get_lang_choices();
                                     if ($langchoices{$new}) {
                                         $settings .= $new;
@@ -1456,6 +1475,38 @@ sub process_changes {
                                 $settings =~ s/,$//;
                             }
                             $newvalues{$entry} = $settings;
+                        } elsif ($action eq 'lti') {
+                            if ($entry eq 'lti.override') {
+                                $newvalues{$entry} = $env{'form.'.$entry};
+                            } elsif (($entry eq 'lti.topmenu') || ($entry eq 'lti.inlinemenu')) {
+                                if ($env{'form.lti.override'}) {
+                                    $newvalues{$entry} = $env{'form.'.$entry};
+                                } else {
+                                    $newvalues{$entry} = '';
+                                }
+                            } elsif ($entry eq 'lti.lcmenu') {
+                                if (($env{'form.lti.override'}) &&
+                                    (($env{'form.lti.topmenu'}) || ($env{'form.lti.inlinemenu'}))) {
+                                    my @lcmenu = &Apache::loncommon::get_env_multiple('form.lti.lcmenu');
+                                    my @newlcmenu;
+                                    if (@lcmenu) {
+                                        my @menuitems = ('fullname','coursetitle','role','logout','grades');
+                                        foreach my $item (@menuitems) {
+                                            next if (($item eq 'grades') && (!$newvalues{'lti.inlinemenu'}));
+                                            if (grep(/^\Q$item\E$/,@lcmenu)) {
+                                                push(@newlcmenu,$item);
+                                            }
+                                        }
+                                    }
+                                    if (@newlcmenu) {
+                                        $newvalues{$entry} = join(',',@newlcmenu);
+                                    } else {
+                                        $newvalues{$entry} = 'none';
+                                    }
+                                } else {
+                                    $newvalues{$entry} = '';
+                                }
+                            }
                         } else {
                             $newvalues{$entry} = $env{'form.'.$entry};
                         }
@@ -1763,6 +1814,22 @@ sub store_changes {
                                             }
                                         }
                                         $displayname = &mt($text);
+                                    } elsif ($item eq 'lti') {
+                                        if ($key eq 'lti.lcmenu') {
+                                            if ($changes->{$item}{$key} eq 'none') {
+                                                $displayval = &mt('None of the configurable menu items displayed');
+                                            } else {
+                                                my %ltititles = &ltimenu_titles();
+                                                $displayval = join(', ', map { $ltititles{$_}; } split(/,/,$changes->{$item}{$key}));
+                                            }
+                                        } else {
+                                            if ($changes->{$item}{$key} eq '1') {
+                                                $displayval = &mt('Yes');
+                                            } elsif ($changes->{$item}{$key} eq '') {
+                                                $displayval = &mt('No');
+                                            }
+                                        }
+                                        $displayname = &mt($text);
                                     } elsif ($item eq 'menuitems') {
                                         unless ($changes->{$item}{$key} eq '') {
                                             if ($key eq 'menudefault') {
@@ -1785,8 +1852,7 @@ sub store_changes {
                                         $displayval = &Apache::lonlocal::locallocaltime($displayval);
                                     } elsif ($key eq 'categories') {
                                         $displayval = $env{'form.categories_display'};
-                                    } elsif (($key eq 'canuse_pdfforms') || ($key eq 'usejsme') ||
-                                             ($key eq 'uselcmath') || ($key eq 'inline_chem')) {
+                                    } elsif (($key eq 'canuse_pdfforms') || ($key eq 'usejsme') || ($key eq 'uselcmath')) {
                                         if ($changes->{$item}{$key} eq '1') {
                                             $displayval = &mt('Yes');
                                         } elsif ($changes->{$item}{$key} eq '0') {
@@ -1836,7 +1902,20 @@ sub store_changes {
                                         }
                                     } elsif ($changes->{$item}{$key} eq '') {
                                         push(@delkeys,$key);
-                                        if ($item eq 'menuitems') {
+                                        if ($item eq 'lti') {
+                                            if (($key eq 'lti.override') || (($key ne 'lti.override') && ($env{'form.lti.override'} ne ''))) {
+                                                if (($key eq 'lti.lcmenu') &&
+                                                    ((!$env{'form.lti.topmenu'}) && (!$env{'form.lti.inlinemenu'}))) {
+                                                    $output .= '<li>'.&mt('LTI settings for menu items only saved if page header and/or inline menu is set to be displayed').'</li>';
+                                                } else {
+                                                    $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]',
+                                                               '<i>'.$displayname.'</i>',
+                                                               "'<b>$displayval</b>'")).'</li>';
+                                                }
+                                            } elsif (!exists($changes->{$item}{'lti.override'})) {
+                                                $output .= '<li>'.&mt('LTI settings only saved if Override is set to "Yes"').'</li>';
+                                            }
+                                        } elsif ($item eq 'menuitems') {
                                             if ($key eq 'menudefault') {
                                                 $output .= '<li>'.&mt("Default collection of menu items set to: 'Standard' (all menus shown)").'</li>';
                                             } elsif ($key eq 'menucollections') {
@@ -1887,7 +1966,9 @@ sub store_changes {
                                 }
                                 if (($key eq 'description') || ($key eq 'cloners') ||
                                     ($key eq 'hidefromcat') || ($key eq 'categories') ||
-                                    ($key eq 'co-owners')) {
+                                    ($key eq 'co-owners') || ($key eq 'lti.override') ||
+                                    ($key eq 'lti.topmenu') || ($key eq 'lti.inlinemenu') ||
+                                    ($key eq 'lti.lcmenu')) {
                                     push(@need_env_update,$key);
                                 }
                             }
@@ -1974,6 +2055,8 @@ sub update_env {
                     my @coowners = split(',',$storehash->{'internal.'.$key});
                     $crsinfo{$env{'request.course.id'}}{'co-owners'} = \@coowners;
                     $count ++;
+                } elsif ($key =~ /^lti\./) {
+                    &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.'.$key => $storehash->{$key}});
                 }
             }
             if ($count) {
@@ -2102,7 +2185,7 @@ sub get_jscript {
                                     $local_to_standard{$code_order[$i]} = $standardnames[$i];
                                 }
                                 foreach my $cloner (@cloners) {
-                                    if (($cloner !~ /^\Q*:\E$match_domain$/) &&
+                                    if (($cloner !~ /^\Q*:\E$match_domain$/) && 
                                         ($cloner !~ /^$match_username\:$match_domain$/)) {
                                         foreach my $item (split(/\&/,$cloner)) {
                                             my ($key,$val) = split(/\=/,$item);
@@ -2287,7 +2370,7 @@ function toggleAddmenucoll() {
 ENDSCRIPT
     }
     $jscript = '<script type="text/javascript" language="Javascript">'."\n".
-               '// <![CDATA['."\n".
+               '// <![CDATA['."\n".  
                $browse_js."\n".$categorize_js."\n".$loncaparev_js."\n".
                $cloners_js."\n".$instcode_js.
                $syllabus_js."\n".$menuitems_js."\n".'//]]>'."\n".
@@ -2470,7 +2553,7 @@ sub print_courseinfo {
                    &mt('Modification may make assessment data inaccessible!').
                    '</span>';
         $editsyllabus = &mt('[_1]Edit[_2]','<a href="/public/'.$cdom.'/'.$cnum.'/syllabus?forceedit=1">',
-                            '</a>');
+                            '</a>');  
     }
     my %items = (
         'url' => {
@@ -2551,7 +2634,7 @@ sub print_courseinfo {
             next if (!$env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'});
         }
         unless (($item eq 'cloners') || ($item eq 'rolenames')) {
-            $colspan = 2;
+            $colspan = 2; 
         }
         $count ++;
         if (exists $items{$item}{advanced} && $items{$item}{advanced} == 1) {
@@ -2595,7 +2678,7 @@ sub print_courseinfo {
                         $default = '0';
                     }
                     $datatable .= &new_cloners_dom_row($cdom,'0',$default);
-                } 
+                }
             } elsif ($settings->{$item} ne '*') {
                 my @entries = split(/,/,$settings->{$item});
                 if (@entries > 0) {
@@ -2734,12 +2817,12 @@ sub print_courseinfo {
             if ($clonesrc =~ m{/$match_domain/$match_courseid}) {
                 my %clonesrcinfo = &Apache::lonnet::coursedescription($clonesrc);
                 if ($clonesrcinfo{'description'}) {
-                    $clonedfrom = $clonesrcinfo{'description'}.' '.($clonesrc);
+                    $clonedfrom = $clonesrcinfo{'description'}.' '.($clonesrc); 
                 }
             }
             $datatable .= $clonedfrom;
         } elsif ($item eq 'uniquecode') {
-            my $code = $env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'};
+            my $code = $env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'}; 
             if ($code) {
                 $datatable .= $code;
             }
@@ -2786,12 +2869,12 @@ sub print_courseinfo {
             } elsif ($uploaded) {
                 $datatable .= &mt('Uploaded file');
             } else {
-                $datatable .= &mt('Standard template');
+                $datatable .= &mt('Standard template'); 
             }
             $datatable .= ('&nbsp;' x 2).
                           &mt('[_1]View[_2]',
                               '<a href="javascript:syllabusinfo();">',
-                              '</a>');
+                              '</a>'); 
         } elsif ($item eq 'loncaparev') {
             my $loncaparev = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
             my $showreqd;
@@ -2816,7 +2899,7 @@ sub new_cloners_dom_row {
     my ($output,$checkedon,$checkedoff);
     if ($newdom ne '') {
         if ($num eq $default) {
-           $checkedon = 'checked="checked" ';
+           $checkedon = 'checked="checked" '; 
         } else {
            $checkedoff = 'checked="checked" ';
         }
@@ -2967,7 +3050,7 @@ ENDSCRIPT
 
 sub display_loncaparev_constraints {
     my ($r,$navmap,$loncaparev,$crstype) = @_;
-    my ($reqdmajor,$reqdminor);
+    my ($reqdmajor,$reqdminor); 
     my $cid = $env{'request.course.id'};
     my $cdom = $env{'course.'.$cid.'.domain'};
     my $cnum = $env{'course.'.$cid.'.num'};
@@ -2984,116 +3067,160 @@ sub display_loncaparev_constraints {
                               $Apache::lonrelrequtils::checkcrstypes{$crstype}).'</h4>';
     }
     my (%fromparam,%rowspan,%bymap,%byresource,@scopeorder,%toshow,%allmaps,
-        %byresponsetype,%bysubmission,%fromblocks);
+        %byresponsetype,%bysubmission,%fromblocks,%bycrsrestype);
     @scopeorder = ('all','section/group','user');
     my $now = time;
     my $resourcedata = &Apache::lonparmset::readdata($cnum,$cdom);
     if (ref($resourcedata) eq 'HASH') {
         foreach my $key (keys(%{$resourcedata})) {
+            my %found;
             foreach my $item (keys(%Apache::lonrelrequtils::checkparms)) {
                 if ($key =~ /(\Q$item\E)$/) {
-                     if (ref($Apache::lonrelrequtils::checkparms{$item}) eq 'ARRAY') {
-                         my $value = $resourcedata->{$key};
-                         if ($item eq 'examcode') {
-                             if (&Apache::lonnet::validCODE($value)) {
-                                 $value = 'valid';
-                             } else {
-                                 $value = '';
-                             }
-                         } elsif ($item eq 'printstartdate') {
-                             if ($value =~ /^\d+$/) {
-                                 if ($value > $now) {
-                                     $value = 'future';
-                                 }
-                             }
-                         } elsif ($item eq 'printenddate') {
-                             if ($value =~ /^\d+$/) {
-                                 if ($value < $now) {
-                                     $value = 'past';
-                                 }
-                             }
-
-                         }
-                         my ($middle,$scope,$which,$level,$map,$resource);
-                         if (grep(/^\Q$value\E$/,@{$Apache::lonrelrequtils::checkparms{$item}})) {
-                             my $stdtype = &Apache::lonparmset::standard_parameter_types($item);
-                             my $stdname = &Apache::lonparmset::standard_parameter_names($item);
-                             my $valname = &get_param_description($stdtype,$value);
-                             my $rev = $Apache::lonnet::needsrelease{'parameter:'.$item.':'.$value};
-                             my $start = $cid.'.';
-                             if ($key =~ /^\Q$start\E(\[useropt\:($match_username\:$match_domain)\]\.)/) {
-                                 $middle = $1;
-                                 $which = $2;
-                                 $scope = 'user'; 
-                             } elsif ($key =~ /^\Q$start\E(\[(\w+)\]\.)/) {
-                                 $middle = $1;
-                                 $which = $2;
-                                 $scope = 'section/group';
-                             } else {
-                                 $scope = 'all';
-                             }
-                             my $what="$stdname=$valname";
-                             if ($key =~ /^\Q$start$middle\E\w+\.\Q$item\E$/) {
-                                 $level = 'general';
-                                 if ($scope eq 'all') {
-                                     if (ref($fromparam{$rev}{$scope}) eq 'ARRAY') {
-                                         unless(grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}})) {
-                                             push(@{$fromparam{$rev}{$scope}},$what);
-                                         }
-                                     } else {
-                                         push(@{$fromparam{$rev}{$scope}},$what);
-                                     }
-                                 } else {
-                                     if (ref($fromparam{$rev}{$scope}{$which}) eq 'ARRAY') {
-                                         unless (grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}{$which}})) {
-                                             push(@{$fromparam{$rev}{$scope}{$which}},$what);
-                                         }
-                                     } else {
-                                         push(@{$fromparam{$rev}{$scope}{$which}},$what);
-                                     }
-                                 }
-                                 $rowspan{$rev} ++;
-                             } elsif ($key =~ /^\Q$start$middle\E(.+)___\(all\).\w+\.\Q$item\E$/) {
-                                 $level = 'folder';
-                                 $map = $1;
-                                 if ($scope eq 'all') {
-                                     if (ref($bymap{$map}{$rev}{$scope}) eq 'ARRAY') {
-                                         unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}})) {
-                                             push(@{$bymap{$map}{$rev}{$scope}},$what);
-                                         }
-                                     } else {
-                                         push(@{$bymap{$map}{$rev}{$scope}},$what);
-                                     }
-                                 } else {
-                                     if (ref($bymap{$map}{$rev}{$scope}{$which}) eq 'ARRAY') {
-                                         unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}{$which}})) {
-                                             push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
-                                         }
-                                     } else {
-                                         push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
-                                     }
-                                 }
-                             } elsif ($key =~ /^\Q$start$middle\E(.+)\.\w+\.\Q$item\E$/) {
-                                 $level = 'resource';
-                                 $resource = $1;
-                                 if ($scope eq 'all') {
-                                     if (ref($byresource{$resource}{$rev}{$scope}) eq 'ARRAY') {
-                                         unless(grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}})) {
-                                             push(@{$byresource{$resource}{$rev}{$scope}},$what);
-                                         }
-                                     } else {
-                                         push(@{$byresource{$resource}{$rev}{$scope}},$what);
-                                     }
-                                 } else {
-                                     if (ref($byresource{$resource}{$rev}{$scope}{$which}) eq 'ARRAY') {
-                                         unless (grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}{$which}})) {
-                                             push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
-                                         }
-                                     } else {
-                                         push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
-                                     }
-                                 }
-                             }
+                    if (ref($Apache::lonrelrequtils::checkparms{$item}) eq 'ARRAY') {
+                        my $value = $resourcedata->{$key};
+                        if ($item eq 'examcode') {
+                            if (&Apache::lonnet::validCODE($value)) {
+                                $value = 'valid';
+                            } else {
+                                $value = '';
+                            }
+                        } elsif ($item eq 'printstartdate') {
+                            if ($value =~ /^\d+$/) {
+                                if ($value > $now) {
+                                    $value = 'future';
+                                }
+                            }
+                        } elsif ($item eq 'printenddate') {
+                            if ($value =~ /^\d+$/) {
+                                if ($value < $now) {
+                                    $value = 'past';
+                                }
+                            }
+                        }
+                        if (grep(/^\Q$value\E$/,@{$Apache::lonrelrequtils::checkparms{$item}})) {
+                            my $stdtype = &Apache::lonparmset::standard_parameter_types($item);
+                            $found{$item}{'valname'} = &get_param_description($stdtype,$value);
+                            $found{$item}{'rev'} = $Apache::lonnet::needsrelease{'parameter:'.$item.':'.$value.'::'};
+                        }
+                    }
+                }
+            }
+            foreach my $item (keys(%Apache::lonrelrequtils::checkparmvalsmatch)) {
+                if (ref($Apache::lonrelrequtils::checkparmvalsmatch{$item}) eq 'ARRAY') {
+                    my $value = $resourcedata->{$key};
+                    foreach my $valuematch (@{$Apache::lonrelrequtils::checkparmvalsmatch{$item}}) {
+                        if ($value =~ /$valuematch/) {
+                            my $stdtype = &Apache::lonparmset::standard_parameter_types($item);
+                            $found{$item}{'valname'} = &get_param_description($stdtype,$value,1);
+                            $found{$item}{'rev'} = 
+                                $Apache::lonnet::needsrelease{'parameter:'.$item.'::'.$valuematch.':'};
+                            last;
+                        }
+                    }
+                }
+            }
+            foreach my $item (keys(%Apache::lonrelrequtils::checkparmnamesmatch)) {
+                my $regexp;
+                if ($item eq 'maplevelrecurse') {
+                    $regexp = '\.(?:sequence|page)___\(rec\)\.';
+                }
+                if ($regexp ne '') {
+                    if ($key =~ /$regexp.*\.(\w+)$/) {
+                        my $name = $1;
+                        my $value = $resourcedata->{$key};
+                        if ($name eq 'type') { 
+                            last unless (($value eq 'problem') || ($value eq 'practice') || ($value eq 'exam') ||
+                                         ($value eq 'survey') || ($value eq 'surveycred') || ($value eq 'anonsurvey') || 
+                                         ($value eq 'anonsurveycred') || ($value eq 'randomizetry') || ($value eq 'library'));
+                        }
+                        my $stdtype = &Apache::lonparmset::standard_parameter_types($name);
+                        $found{$name}{'valname'} = &get_param_description($stdtype,$value);
+                        $found{$name}{'extra'} = &mt('Recursive into sub-folders');
+                        $found{$name}{'rev'} =
+                            $Apache::lonnet::needsrelease{'parameter::::'.$item};
+                    }
+                }
+            }
+            foreach my $item (keys(%found)) {
+                my $stdname = &Apache::lonparmset::standard_parameter_names($item);
+                my $rev = $found{$item}{'rev'};
+                my $valname = $found{$item}{'valname'};
+                my $extra = $found{$item}{'extra'};
+                my ($middle,$scope,$which,$level,$map,$resource);  
+                my $start = $cid.'.';
+                if ($key =~ /^\Q$start\E(\[useropt\:($match_username\:$match_domain)\]\.)/) {
+                    $middle = $1;
+                    $which = $2;
+                    $scope = 'user'; 
+                } elsif ($key =~ /^\Q$start\E(\[(\w+)\]\.)/) {
+                    $middle = $1;
+                    $which = $2;
+                    $scope = 'section/group';
+                } else {
+                    $scope = 'all';
+                }
+                my $what="$stdname=$valname";
+                if ($extra) {
+                    $what .= "<br/>$extra<br />";
+                }
+                if ($key =~ /^\Q$start$middle\E\w+\.\Q$item\E$/) {
+                    $level = 'general';
+                    if ($scope eq 'all') {
+                        if (ref($fromparam{$rev}{$scope}) eq 'ARRAY') {
+                            unless(grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}})) {
+                                push(@{$fromparam{$rev}{$scope}},$what);
+                            }
+                        } else {
+                            push(@{$fromparam{$rev}{$scope}},$what);
+                        }
+                    } else {
+                        if (ref($fromparam{$rev}{$scope}{$which}) eq 'ARRAY') {
+                            unless (grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}{$which}})) {
+                                push(@{$fromparam{$rev}{$scope}{$which}},$what);
+                            }
+                        } else {
+                            push(@{$fromparam{$rev}{$scope}{$which}},$what);
+                        }
+                    }
+                    $rowspan{$rev} ++;
+                } elsif ($key =~ /^\Q$start$middle\E(.+)___\((all|rec)\).\w+\.\Q$item\E$/) {
+                    $level = 'folder';
+                    $map = $1;
+                    if ($scope eq 'all') {
+                        if (ref($bymap{$map}{$rev}{$scope}) eq 'ARRAY') {
+                            unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}})) {
+                                push(@{$bymap{$map}{$rev}{$scope}},$what);
+                            }
+                        } else {
+                            push(@{$bymap{$map}{$rev}{$scope}},$what);
+                        }
+                    } else {
+                        if (ref($bymap{$map}{$rev}{$scope}{$which}) eq 'ARRAY') {
+                            unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}{$which}})) {
+                                push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
+                            }
+                        } else {
+                            push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
+                        }
+                    }
+                } elsif ($key =~ /^\Q$start$middle\E(.+)\.\w+\.\Q$item\E$/) {
+                    $level = 'resource';
+                    $resource = $1;
+                    if ($scope eq 'all') {
+                        if (ref($byresource{$resource}{$rev}{$scope}) eq 'ARRAY') {
+                            unless(grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}})) {
+                                push(@{$byresource{$resource}{$rev}{$scope}},$what);
+                            }
+                        } else {
+                            push(@{$byresource{$resource}{$rev}{$scope}},$what);
+                        }
+                    } else {
+                        if (ref($byresource{$resource}{$rev}{$scope}{$which}) eq 'ARRAY') {
+                            unless (grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}{$which}})) {
+                                push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
+                            }
+                        } else {
+                            push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
                         }
                     }
                 }
@@ -3193,7 +3320,7 @@ sub display_loncaparev_constraints {
                 if (ref($fromblocks{$type}) eq 'HASH') {
                     foreach my $rev (keys(%{$fromblocks{$type}})) {
                         my ($major,$minor) = split(/\./,$rev);
-                        ($reqdmajor,$reqdminor) =
+                        ($reqdmajor,$reqdminor) = 
                             &Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor);
                         $output .= &Apache::loncommon::start_data_table_row().
                                    '<td>'.$rev.'</td><td>'.$lt{$type}.'</td><td>';
@@ -3211,18 +3338,25 @@ sub display_loncaparev_constraints {
 
     if (defined($navmap)) {
         my %anonsubms=&Apache::lonnet::dump('nohist_anonsurveys',$cdom,$cnum);
-        my $rev_anonsurv=$Apache::lonnet::needsrelease{'parameter:type:anonsurvey'};
+        my $rev_anonsurv=$Apache::lonnet::needsrelease{'parameter:type:anonsurvey::'};
         my %randtrysubms=&Apache::lonnet::dump('nohist_randomizetry',$cdom,$cnum);
-        my $rev_randtry=$Apache::lonnet::needsrelease{'parameter:type:randomizetry'};
+        my $rev_randtry=$Apache::lonnet::needsrelease{'parameter:type:randomizetry::'};
+        my $rev_exttool=$Apache::lonnet::needsrelease{'course:courserestype:exttool'};
         my $stdtype=&Apache::lonparmset::standard_parameter_types('type');
         my $stdname=&Apache::lonparmset::standard_parameter_names('type');
         my $valanon=&get_param_description($stdtype,'anonsurvey');
         my $valrandtry=&get_param_description($stdtype,'randomizetry');
         my %checkedrev;
-        foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() },1,0)) {
+        foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() || $_[0]->is_tool() },1,0)) {
             my @parts = @{$res->parts()};
             my $symb = $res->symb();
             my $enclosing_map = &Apache::lonnet::declutter($res->enclosing_map_src());
+            if ($res->is_tool()) {
+                my $rev = $rev_exttool;
+                $bycrsrestype{$symb}{$rev} = &mt('External Tool');
+                $allmaps{$enclosing_map} = 1;
+                next;
+            }
             foreach my $part (@parts) {
                 if (exists($anonsubms{$symb."\0".$part})) {
                     my $rev = $rev_anonsurv;
@@ -3273,7 +3407,7 @@ sub display_loncaparev_constraints {
                             &Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,
                                                                             $reqdmajor,$reqdminor);
                         $checkedrev{$key} = 1;
-                    }
+                    } 
                     push(@{$byresponsetype{$symb}{$rev}},$key);
                     $allmaps{$enclosing_map} = 1;
                 }
@@ -3310,6 +3444,10 @@ sub display_loncaparev_constraints {
             }
         }
     }
+    my $suppmap = 'supplemental.sequence';
+    my ($suppcount,$supptools,$errors) = (0,0,0);
+    ($suppcount,$supptools,$errors) = &Apache::loncommon::recurse_supplemental($cnum,$cdom,
+                                                      $suppmap,$suppcount,$supptools,$errors);
     my $mapres_header = '<h4>'.
                         &mt('Requirements for specific folders or resources').
                         '</h4>';
@@ -3324,9 +3462,9 @@ sub display_loncaparev_constraints {
     $r->print($start_page.$top_header);
     if ($output) {
         $r->print($output);
-        if (defined($navmap)) {
+        if (defined($navmap) || $supptools) {
             &show_contents_view($r,$navmap,$cid,\%toshow,\%bymap,\%byresource,\%bysubmission,
-                                \%byresponsetype,\@scopeorder,\%lt);
+                                \%byresponsetype,\%bycrsrestype,\@scopeorder,\%lt,$supptools);
         }
         $r->print('<br /><br />'); 
     } else {
@@ -3344,22 +3482,30 @@ sub display_loncaparev_constraints {
 
 sub show_contents_view {
     my ($r,$navmap,$cid,$toshow,$bymap,$byresource,$bysubmission,$byresponsetype,
-        $scopeorder,$lt) = @_;
-    if ((keys(%{$toshow}) > 0) || (keys(%{$byresource}) > 0) || 
-        (keys(%{$bysubmission}) > 0) || (keys(%{$byresponsetype}) > 0)) {
-        my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
-        my $whitespace = '<img src="'.$location.'/whitespace_21.gif" alt="" />';
-        my $icon =  '<img src="'.$location.'/navmap.folder.open.gif" alt="" />';
+        $bycrsrestype,$scopeorder,$lt,$supptools) = @_;
+    my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
+    my $whitespace = '<img src="'.$location.'/whitespace_21.gif" alt="" />';
+    my $showmaincontent;
+    if ((ref($navmap)) &&
+        ((keys(%{$toshow}) > 0) || (keys(%{$byresource}) > 0) ||
+         (keys(%{$bysubmission}) > 0) || (keys(%{$byresponsetype}) > 0) ||
+         (keys(%{$bycrsrestype}) > 0))) {
+        $showmaincontent = 1;
+    }
+    if ($showmaincontent || $supptools) {
+        $r->print(&Apache::loncommon::start_data_table());
+    }
+    if ($showmaincontent) {
+        my $icon = '<img src="'.$location.'/navmap.folder.open.gif" alt="" />';
         my $topmap = $env{'course.'.$cid.'.url'};
-        $r->print(&Apache::loncommon::start_data_table().
-                  &Apache::loncommon::start_data_table_header_row().
+        $r->print(&Apache::loncommon::start_data_table_header_row().
                   '<th>'.&mt('Location').'</th><th>'.&mt('Release').'</th>'.
                   '<th>'.&mt('Attribute/Setting').'</th>'.
                   &Apache::loncommon::end_data_table_header_row().
                   &Apache::loncommon::start_data_table_row().
                   '<td>&nbsp;'.$icon.'&nbsp;'.&mt('Main Content').'</td>');
-                  &releases_by_map($r,$bymap,$topmap,$scopeorder,$lt);
-                  $r->print(&Apache::loncommon::end_data_table_row());
+        &releases_by_map($r,$bymap,$topmap,$scopeorder,$lt);
+        $r->print(&Apache::loncommon::end_data_table_row());
         my $it=$navmap->getIterator(undef,undef,undef,1,1,undef);
         my $curRes;
         my $depth = 0;
@@ -3410,6 +3556,9 @@ sub show_contents_view {
                     if (ref($byresponsetype->{$symb}) eq 'HASH') {
                         $rowspan += scalar(keys(%{$byresponsetype->{$symb}}));
                     }
+                    if (ref($bycrsrestype->{$symb}) eq 'HASH') {
+                        $rowspan += scalar(keys(%{$bycrsrestype->{$symb}}));
+                    }
                     next if (!$rowspan);
                     $icon = '<img class="LC_contentImage" src="'.$location.'/problem.gif" alt="'.
                             &mt('Problem').'" />';
@@ -3474,10 +3623,37 @@ sub show_contents_view {
                             $r->print('</td>');
                         }
                         $r->print(&Apache::loncommon::end_data_table_row());
+                        $newrow = 1;
+                    }
+                    if (ref($bycrsrestype->{$symb}) eq 'HASH') {
+                        foreach my $rev (sort(keys(%{$bycrsrestype->{$symb}}))) {
+                            if ($newrow) {
+                                $r->print(&Apache::loncommon::continue_data_table_row());
+                            }
+                            $r->print('<td>'.$rev.'</td><td>'.$bycrsrestype->{$symb}{$rev}.'</td>');
+                        }
+                        $r->print(&Apache::loncommon::end_data_table_row());
                     }
                 }
             }
         }
+    }
+    if ($supptools) {
+        my $icon = '<img src="'.$location.'/navmap.folder.open.gif" alt="" />';
+        $r->print(&Apache::loncommon::start_data_table_header_row().
+                  '<th>'.&mt('Location').'</th><th>'.&mt('Release').'</th>'.
+                  '<th>'.&mt('Resource Type').'</th>'.
+                  &Apache::loncommon::end_data_table_header_row().
+                  &Apache::loncommon::start_data_table_row().
+                  '<td>&nbsp;'.$icon.'&nbsp;'.&mt('Supplemental Content').'</td>'.
+                  '<td valign="middle">'.
+                  $Apache::lonrelrequtils::exttool{'major'}.'.'.
+                  $Apache::lonrelrequtils::exttool{'minor'}.
+                  '</td><td>'.&mt('[quant,_1,External Tool,External Tools]',
+                                  $supptools).'</td>'.
+                  &Apache::loncommon::end_data_table_row());
+    }
+    if ($showmaincontent || $supptools) {
         $r->print(&Apache::loncommon::end_data_table());
     }
     return;
@@ -3486,7 +3662,7 @@ sub show_contents_view {
 sub releases_by_map {
     my ($r,$bymap,$url,$scopeorder,$lt) = @_;
     return unless ((ref($bymap) eq 'HASH') && (ref($scopeorder) eq 'ARRAY'));
-    my $newrow = 0;
+    my $newrow = 0; 
     if (ref($bymap->{$url}) eq 'HASH') {
         foreach my $rev (sort(keys(%{$bymap->{$url}}))) {
             if ($newrow) {
@@ -3523,18 +3699,67 @@ sub releases_by_map {
 }
 
 sub get_param_description {
-    my ($stdtype,$value) = @_;
-    my $name = $value;
-    my $paramstrings = &Apache::lonparmset::standard_string_options($stdtype);
-    unless (ref($paramstrings) eq 'ARRAY') {
-        return $name;
+    my ($stdtype,$value,$regexp) = @_;
+    my ($name,$parammatches,$paramstrings,@possibles);
+    if ($stdtype =~ /^string/) {
+        $paramstrings = &Apache::lonparmset::standard_string_options($stdtype);
+    } elsif ($stdtype eq 'date_interval') {
+        $paramstrings = &Apache::lonparmset::standard_interval_options($stdtype);
+    }
+    if ($regexp) {
+        if ($stdtype =~ /^string/) {
+            $parammatches = &Apache::lonparmset::standard_string_matches($stdtype);
+        } elsif ($stdtype eq 'date_interval') {
+            $parammatches = &Apache::lonparmset::standard_interval_matches($stdtype);
+        }
+        if (ref($parammatches) eq 'ARRAY') {
+            @possibles = @{$parammatches};
+        } else {
+            undef($regexp);
+            $name = $value;
+        }
+    }
+    unless ($regexp) {
+        $name = $value;
+        if (ref($paramstrings) eq 'ARRAY') {
+            @possibles = @{$paramstrings};
+        } else {
+            if (($stdtype eq 'date_start') || ($stdtype eq 'date_end')) {
+                if ($name == 0) {
+                    $name = &mt('Never');
+                } elsif (($name ne '') && ($name !~ /\D/)) {
+                    $name = &Apache::lonlocal::locallocaltime($name);
+                }
+            }
+            return $name;
+        }
     }
-    foreach my $possibilities (@{$paramstrings}) {
+    foreach my $possibilities (@possibles) {
         next unless (ref($possibilities) eq 'ARRAY');
-        my ($thing, $description) = @{ $possibilities };
-        if ($thing eq $value) {
-            $name = $description;
-            last;
+        my $gotregexmatch = '';
+        if ($regexp) {
+            last if ($gotregexmatch);
+            my ($item,$pattern) = @{ $possibilities };
+            if ($value =~ /$pattern/) {
+                if (ref($paramstrings) eq 'ARRAY') {
+                    foreach my $possibles (@{$paramstrings}) {
+                        next unless (ref($possibles) eq 'ARRAY');
+                        my ($thing,$description) = @{$possibles};
+                        if ($thing eq $item) {
+                            $name = $description;
+                            $gotregexmatch = 1;
+                            last;
+                        }
+                    }
+                    last if ($gotregexmatch);
+                }
+            }
+        } else {
+            my ($thing,$description) = @{ $possibilities };
+            if ($thing eq $value) {
+                $name = $description;
+                last;
+            }
         }
     }
     return $name;
@@ -3744,7 +3969,7 @@ sub print_localization {
                                                       undef,$includeempty,$disabled);
         } else {
             if ($settings->{$item} eq '') {
-                unless ($noedit) {
+                unless ($noedit) { 
                     $datatable .= '</td><td align="right">'.
                         &Apache::loncommon::select_language('languages_0','',1);
                 }
@@ -3774,15 +3999,15 @@ sub print_localization {
                     }
                 }
                 unless ($noedit) {
-                    $datatable .= 
+                    $datatable .=
                               &Apache::loncommon::start_data_table_row().
                               '<td align="left"><span class="LC_nobreak">'.
                               &mt('Additional language:'). '</span><br />'.
                               &Apache::loncommon::select_language('languages_'.$num,'',1).
                               '<input type="hidden" name="languages_total" value="'.$num.'" />'.
                               '</td>'.&Apache::loncommon::end_data_table_row();
-                }
-                $datatable .= &Apache::loncommon::end_data_table().'<br />';
+                 }
+                 $datatable .= &Apache::loncommon::end_data_table().'<br />';
             }
         }
         $datatable .= &item_table_row_end();
@@ -3870,7 +4095,7 @@ sub user_table {
     if ($currvalue eq '') {
         unless ($noedit) {
             $output .= &select_recipient($item,'0',$cdom,$sections);
-        }  
+        }
     } else {
         my $num = 0;
         my @curr = split(/,/,$currvalue);
@@ -4022,6 +4247,20 @@ sub print_discussion {
                            &mt('(specific user(s))'),
                    input => 'checkbox',
                  },
+
+        'pac.roles.denied' => {
+                   text => '<span class="LC_nobreak"><b>'.&mt($itemtext->{'pac.roles.denied'}).'</b>'.
+                           &Apache::loncommon::help_open_topic("Course_Disable_Anonymous_Discussion").'</span><br />'.
+                           &mt('(role-based)'),
+                   input => 'checkbox',
+                 },
+
+        'pac.users.denied'   => {
+                   text => '<span class="LC_nobreak"><b>'.&mt($itemtext->{'pac.users.denied'}).'</b><br />'.
+                           &mt('(specific user(s))'),
+                   input => 'checkbox',
+                 },
+
         'allow_limited_html_in_feedback' => {
                    text => '<b>'.&mt($itemtext->{'allow_limited_html_in_feedback'}).'</b>',
                    input => 'radio',
@@ -4054,7 +4293,7 @@ sub print_discussion {
         my $colspan;
         if ($item eq 'allow_limited_html_in_feedback') {
             $colspan = 2;
-        }
+        } 
         $datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
         if ($item eq 'plc.roles.denied') {
             $datatable .= '</td><td align="right">'.
@@ -4072,6 +4311,14 @@ sub print_discussion {
             $datatable .= '</td><td align="right">'.
                           &user_table($cdom,$item,undef,
                                       $settings->{$item},\%lt,$noedit);
+        } elsif ($item eq 'pac.roles.denied') {
+            $datatable .= '</td><td align="right">'.
+                          '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings,undef,undef,$noedit).
+                          '</table>';
+        } elsif ($item eq 'pac.users.denied') {
+            $datatable .=  '</td><td align="right">'.
+                           &user_table($cdom,$item,undef,
+                                      $settings->{$item},\%lt,$noedit);
         } elsif ($item eq 'allow_limited_html_in_feedback') {
             $datatable .= &yesno_radio($item,$settings,undef,undef,undef,$noedit);
         } elsif ($item eq 'allow_discussion_post_editing') {
@@ -4091,7 +4338,7 @@ sub print_discussion {
                           '<th align="center">'.&mt('font-size').'</th>'.
                           '<th align="center">'.&mt('font-weight').'</th>'.
                           '<th align="center">'.&mt('font-style').'</th>'.
-                          '<th align="center">'.&mt('Other css').'</th>'.
+                          '<th align="center">'.&mt('Other css').'</th>'. 
                           &Apache::loncommon::end_data_table_row().
                           &set_discussion_fonts($cdom,$cnum,$item,$settings,$noedit).
                           &Apache::loncommon::end_data_table().'<br />';
@@ -4143,7 +4390,7 @@ sub role_checkboxes {
     my $count = 0;
     my $disabled;
     if ($noedit) {
-        $disabled = ' disabled="disabled"';
+        $disabled = ' disabled="disabled"';  
     }
     foreach my $role (@roles) {
         my $checked = '';
@@ -4271,7 +4518,7 @@ sub set_discussion_fonts {
 
 sub discussion_vote_classes {
     my $classorder = ['twoplus','oneplus','zero','oneminus','twominus'];
-    my %classtitles = &Apache::lonlocal::texthash(
+    my %classtitles = &Apache::lonlocal::texthash( 
                         'twoplus'  => 'Two sigma above mean',
                         'oneplus'  => 'One sigma above mean',
                         'zero'     => 'Within one sigma of mean',
@@ -4337,7 +4584,7 @@ sub print_classlists {
         'defaultcredits' => {
                    text => '<b>'.&mt($itemtext->{'defaultcredits'}).'</b>',
                  },
-
+              
         'nothideprivileged'   => {
                    text => '<b>'.&mt($itemtext->{'nothideprivileged'}).'</b>',
                    input => 'checkbox',
@@ -4424,10 +4671,6 @@ sub print_appearance {
                    text => '<b>'.&mt($itemtext->{'usejsme'}).'</b>',
                    input => 'radio',
                  },
-         'inline_chem' => {
-                   text => '<b>'.&mt($itemtext->{'inline_chem'}).'</b>',
-                   input => 'radio',
-                 },
     );
     return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'appearance',$noedit);
 }
@@ -4444,11 +4687,12 @@ sub print_grading {
                    input => 'selectbox',
                    options => {
                                 standard => &mt('Standard: shows points'),
+                                categories => &mt('Categories: shows points according to categories'),
                                 external => &mt('External: shows number of completed parts and totals'),
                                 externalnototals => &mt('External: shows only number of completed parts'),
                                 spreadsheet => &mt('Spreadsheet: (with link to detailed scores)'), 
                               },
-                   order => ['standard','external','externalnototals','spreadsheet'],
+                   order => ['standard','categories','external','externalnototals','spreadsheet'],
                  },
         'rndseed' => {
                    text => '<b>'.&mt($itemtext->{'rndseed'}).'</b>'.
@@ -4618,6 +4862,134 @@ sub print_bridgetasks {
     return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'bridgetasks',$noedit);
 }
 
+sub print_lti {
+    my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
+    unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
+        return;
+    }
+    my @menuitems = ('fullname','coursetitle','role','logout','grades');
+    my %menutitles = &ltimenu_titles();
+    my ($domdefs,$displaydefs);
+    if ($env{'request.lti.login'}) {
+        my %lti = &Apache::lonnet::get_domain_lti($cdom,'provider');
+        my @domdefsmenu;
+        if (ref($lti{$env{'request.lti.login'}}) eq 'HASH') {
+            if ($lti{$env{'request.lti.login'}}{'topmenu'}) {
+                $domdefs = &mt('Header shown').', ';
+            }
+            if ($lti{$env{'request.lti.login'}}{'inlinemenu'}) {
+                $domdefs .= &mt('Inline menu shown');
+            }
+            $domdefs =~ s/,\s$//;
+            if (!$domdefs) {
+                $domdefs = &mt('No header or inline menu shown');
+            }
+            $domdefs = ' ('.&mt('Domain default').': '.$domdefs.')';
+            if (ref($lti{$env{'request.lti.login'}}{'lcmenu'}) eq 'ARRAY') {
+                @domdefsmenu = @{$lti{$env{'request.lti.login'}}{'lcmenu'}};
+            }
+        }
+        $displaydefs = &mt('Domain defaults');
+        if (@domdefsmenu) {
+            my @diffs = &Apache::loncommon::compare_arrays(\@menuitems,\@domdefsmenu);
+            if (@diffs) {
+                my $missing;
+                foreach my $item (@menuitems) {
+                    unless (grep(/^\Q$item\E$/,@domdefsmenu)) {
+                        $missing .= ' '.$menutitles{$item}.',';
+                    }
+                }
+                $missing =~ s/,$//;
+                $displaydefs .= ': '.&mt('Not shown').' --'.$missing;
+            } else {
+                $displaydefs .= ': '.&mt('All shown');
+            }
+        } else {
+            $displaydefs .= ': '.&mt('Not shown').' -- '.join(', ', map { $menutitles{$_}; } @menuitems);
+        }
+    } else {
+        $displaydefs = &mt('Domain defaults only available in LTI context');
+    }
+    my %items = (
+        'lti.override' => {
+            text => '<b>'.&mt($itemtext->{'lti.override'}).'</b>'.$domdefs,
+            input => 'radio',
+                   },
+        'lti.topmenu' => {
+            text => '<b>'.&mt($itemtext->{'lti.topmenu'}).'</b>',
+            input => 'radio',
+                   },
+        'lti.inlinemenu' => {
+            text => '<b>'.&mt($itemtext->{'lti.inlinemenu'}).'</b>',
+            input => 'radio',
+                      },
+        'lti.lcmenu' => {
+            text => '<b>'.&mt($itemtext->{'lti.lcmenu'}).'</b><br />'.$displaydefs,
+            input => 'custom',
+                  },
+                );
+    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'lti',$noedit);
+}
+
+sub lcmenu_checkboxes {
+    my ($cdom,$caller,$settings,$crstype,$noedit) = @_;
+    my @menuitems = ('fullname','coursetitle','role','logout','grades');
+    my %menutitles = &ltimenu_titles();
+    my (@current,@domdefs);
+    if ($env{'request.lti.login'}) {
+        my %lti = &Apache::lonnet::get_domain_lti($cdom,'provider');
+        if (ref($lti{$env{'request.lti.login'}}) eq 'HASH') {
+            if (ref($lti{$env{'request.lti.login'}}{'lcmenu'}) eq 'ARRAY') {
+                @domdefs = @{$lti{$env{'request.lti.login'}}{'lcmenu'}};
+            }
+        }
+    }
+    if (ref($settings) eq 'HASH') {
+        if ($settings->{'lti.lcmenu'}) {
+            unless ($settings->{'lti.lcmenu'} eq 'none') {
+                @current = split(',',$settings->{'lti.lcmenu'});
+            }
+        } else {
+            @current = @domdefs;
+        }
+    } else {
+        @current = @domdefs;
+    }
+    my $numinrow = 3;
+    my $count = 0;
+    my $disabled;
+    if ($noedit) {
+        $disabled = ' disabled="disabled"';
+    }
+    my $output = '<table>';
+    foreach my $item (@menuitems) {
+        my $checked = '';
+        if (grep(/^\Q$item\E$/,@current)) {
+            $checked = ' checked="checked" ';
+        }
+        my $rem = $count%($numinrow);
+        if ($rem == 0) {
+            if ($count > 0) {
+                $output .= '</tr>';
+            }
+            $output .= '<tr>';
+        }
+        $output .= '<td align="left"><span class="LC_nobreak"><label><input type="checkbox" '.
+                   'name="lti.lcmenu" value="'.$item.'"'.$checked.$disabled.'/>&nbsp;'.
+                   $menutitles{$item}.'</label></span></td>';
+        $count ++;
+    }
+    my $rem = $count%($numinrow);
+    my $colsleft = $numinrow - $rem;
+    if ($colsleft > 1 ) {
+        $output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
+                   '&nbsp;</td>';
+    } elsif ($colsleft == 1) {
+        $output .= '<td class="LC_left_item">&nbsp;</td>';
+    }
+    $output .= '</tr></table>';
+}
+
 sub ltimenu_titles {
     return &Apache::lonlocal::texthash(
                                         fullname    => 'Full name',
@@ -4863,7 +5235,7 @@ sub menucollections_display {
                                    '<legend>'.$menutitles{$category}.'</legend>'."\n";
                         if ($category eq 'text') {
                             $output .= '<b>'.&mt('Header Text').'</b><br /><br />';
-                        }
+                        } 
                         foreach my $field (@{$categories{$category}}) {
                             if ($field eq 'disc') {
                                 $output .= '<br /><b>'.&mt('Footer Text').'</b><br /><br />';
@@ -5167,6 +5539,8 @@ sub make_item_rows {
                 $datatable .= &checkforpriv_row($cdom,$item,$settings,$crstype,$noedit);
             } elsif ($item eq 'print_header_format') {
                 $datatable .= &print_hdrfmt_row($item,$settings,$noedit);
+            } elsif ($item eq 'lti.lcmenu') {
+                $datatable .= &lcmenu_checkboxes($cdom,$item,$settings,$crstype,$noedit);
             } elsif ($items->{$item}{input} eq 'dates') {
                my $disabled;
                if ($noedit) {
@@ -5177,13 +5551,15 @@ sub make_item_rows {
                                                        $settings->{$item},$disabled);
             } elsif ($items->{$item}{input} eq 'radio') {
                 my ($unsetdefault,$valueyes,$valueno);
-                if (($item eq 'usejsme') || ($item eq 'uselcmath') || ($item eq 'inline_chem')) {
+                if (($item eq 'usejsme') || ($item eq 'uselcmath')) {
                      my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
                      unless ($domdefs{$item} eq '0') {
                          $unsetdefault = 1;
                      }
                      $valueyes = "1";
                      $valueno = "0";
+                } elsif (($item eq 'lti.topmenu') || ($item eq 'lti.inlinemenu')) {
+                    $valueyes = '1';
                 }
                 $datatable .= &yesno_radio($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit);
             } elsif ($items->{$item}{input} eq 'selectbox') {
@@ -5231,7 +5607,7 @@ sub nothidepriv_row {
             }
         }
         if ($settings->{'checkforpriv'}) {
-            @checkdoms = split(/,/,$settings->{'checkforpriv'});
+            @checkdoms = split(/,/,$settings->{'checkforpriv'}); 
         }
     }
     push(@checkdoms,$cdom);
@@ -5245,7 +5621,7 @@ sub nothidepriv_row {
         if ($end == -1 || $start == -1) {
             next;
         }
-        foreach my $dom (@checkdoms) {
+        foreach my $dom (@checkdoms) { 
             if (&Apache::lonnet::privileged($uname,$udom,\@checkdoms,['dc','su'])) {
                 unless (grep(/^\Q$user\E$/,@privusers)) {
                     push(@privusers,$user);
@@ -5321,7 +5697,7 @@ sub checkforpriv_row {
                 my $domdesc = &Apache::lonnet::domain($currdom,'description');
                 if ($domdesc eq '') {
                     $domdesc = $currdom;
-                }
+                } 
                 $datatable .=
                     &Apache::loncommon::start_data_table_row().
                     '<td align="left"><span class="LC_nobreak">'.
@@ -5333,13 +5709,13 @@ sub checkforpriv_row {
                     &mt('Delete').'</label></span></td>'.
                     &Apache::loncommon::end_data_table_row();
                 $num ++;
-                unless (grep(/^\Q$currdom\E$/,@excdoms)) {
+                unless (grep(/^\Q$currdom\E$/,@excdoms)) { 
                     push(@excdoms,$currdom);
                 }
             }
         }
         if ((scalar(keys(%domains)) - scalar(@excdoms)) > 0) {
-            $datatable .=
+            $datatable .= 
                 &Apache::loncommon::start_data_table_row().
                 '<td align="left"><span class="LC_nobreak">'.
                 &mt('Additional domain:'). '</span><br />'.
@@ -5452,8 +5828,8 @@ ENDJS
             $output .= '</tr>';
         }
     }
-    my $pos = $currnum+1; 
-    unless ($noedit) {
+    my $pos = $currnum+1;
+    unless ($noedit) { 
         $output .= 
                '<tr>'.
                '<td align="left"><span class="LC_nobreak">'.