--- loncom/interface/courseprefs.pm	2022/10/19 00:03:10	1.117
+++ loncom/interface/courseprefs.pm	2023/09/24 03:31:18	1.127
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.117 2022/10/19 00:03:10 raeburn Exp $
+# $Id: courseprefs.pm,v 1.127 2023/09/24 03:31:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -225,6 +225,7 @@ use Apache::courseclassifier;
 use Apache::lonlocal;
 use LONCAPA qw(:DEFAULT :match);
 use Crypt::CBC;
+use Time::HiRes qw( sleep );
 
 my $registered_cleanup;
 my $modified_courses;
@@ -315,7 +316,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',
@@ -372,6 +373,8 @@ sub handler {
     my %values=&Apache::lonnet::dump('environment',$cdom,$cnum);
     my %linkprot=&Apache::lonnet::dump('lti',$cdom,$cnum,undef,undef,undef,1);
     my %ltienc = &Apache::lonnet::dump('nohist_ltienc',$cdom,$cnum,undef,undef,undef,1);
+    my %ltitools = &Apache::lonnet::dump('ltitools',$cdom,$cnum,undef,undef,undef,1);
+    my %ltitoolsenc = &Apache::lonnet::dump('nohist_toolsenc',$cdom,$cnum,undef,undef,undef,1);
     foreach my $id (keys(%linkprot)) {
         if (ref($linkprot{$id}) eq 'HASH') {
             if (ref($ltienc{$id}) eq 'HASH') {
@@ -389,11 +392,27 @@ sub handler {
     if ($linkprot{'lock'}) {
         delete($linkprot{'lock'});
     }
+    foreach my $id (keys(%ltitools)) {
+        if (ref($ltitools{$id}) eq 'HASH') {
+            if (ref($ltitoolsenc{$id}) eq 'HASH') {
+                $values{'ltitools'}{$id} = { %{$ltitools{$id}}, %{$ltitoolsenc{$id}} };
+            } else {
+                $values{'ltitools'}{$id} = $ltitools{$id};
+            }
+        }
+        unless ($phase eq 'process') {
+            if (ref($values{'ltitools'}{$id}) eq 'HASH') {
+                delete($values{'ltitools'}{$id}{'secret'});
+            }
+        }
+    }
+    if ($ltitools{'lock'}) {
+        delete($ltitools{'lock'});
+    }
     my @prefs_order = ('courseinfo','localization','feedback','discussion',
                        'classlists','appearance','grading','printouts',
-                       'menuitems','linkprot','spreadsheet','bridgetasks',
-                       'lti','other');
-
+                       'menuitems','ltitools','linkprot','spreadsheet',
+                       'bridgetasks','lti','other');
     my %prefs = (
         'courseinfo' =>
                    { text => $lt{'gens'},
@@ -503,7 +522,7 @@ sub handler {
                           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',
-                          extresource             => 'Display of external resources',   
+                          extresource             => 'Display of external resources',
                                   },
                   },
         'grading' =>
@@ -593,6 +612,14 @@ sub handler {
                                  col2 => 'Settings',
                                 }],
                    },
+        'ltitools' =>
+                   {
+                     text => 'External tools',
+                     help => 'Course_Prefs_ExternalTools',
+                     header => [{col1 => 'Item',
+                                 col2 => 'Settings',
+                                }],
+                   },
         'other' =>
                   { text => 'Other settings',
                     help => 'Course_Prefs_Other',
@@ -667,6 +694,8 @@ sub get_allitems {
                 if ($item eq 'feedback') {
                     push(@allitems,(map { $_.'.text'; } @{$prefs{$item}{'ordered'}}));
                 }
+            } elsif (($item eq 'linkprot') || ($item eq 'ltitools')) {
+                push(@allitems,$item);
             }
         }
     }
@@ -793,13 +822,19 @@ sub print_config_box {
     } elsif ($action eq 'appearance') {
         $output .= &print_appearance($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
     } elsif ($action eq 'grading') {
-        $output .= &print_grading($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
+        $output .= &print_grading($cdom,$cnum,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
     } elsif ($action eq 'printouts') {
         $output .= &print_printouts($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
     } elsif ($action eq 'spreadsheet') {
         $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 'ltitools') {
+        my $currtools = {};
+        if ((ref($settings) eq 'HASH') && (ref($settings->{'ltitools'}))) {
+            $currtools = $settings->{'ltitools'};
+        }
+        $output .= &print_ltitools($cdom,$cnum,$currtools,\$rowtotal,$crstype,$noedit,'course');
     } elsif ($action eq 'lti') {
         $output .= &print_lti($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
     } elsif ($action eq 'menuitems') {
@@ -836,7 +871,7 @@ sub process_changes {
                         }
                     }
                 }
-            } elsif ($action eq 'linkprot') {
+            } elsif (($action eq 'linkprot') || ($action eq 'ltitools')) {
                 if (ref($values->{$action}) eq 'HASH') {
                     foreach my $id (keys(%{$values->{$action}})) {
                         if ($id =~ /^\d+$/) {
@@ -845,8 +880,8 @@ sub process_changes {
                     }
                 }
                 @ordered = sort { $a <=> $b } @ordered;
-                if (($env{'form.linkprot_add'}) && ($env{'form.linkprot_maxnum'} =~ /^\d+$/)) {
-                    push(@ordered,$env{'form.linkprot_maxnum'});
+                if (($env{'form.'.$action.'_add'}) && ($env{'form.'.$action.'_maxnum'} =~ /^\d+$/)) {
+                    push(@ordered,$env{'form.'.$action.'_maxnum'});
                 }
             } elsif (ref($item->{'ordered'}) eq 'ARRAY') {
                 if ($action eq 'courseinfo') {
@@ -989,6 +1024,12 @@ sub process_changes {
                     if (ref($values) eq 'HASH') {
                         $errors = &process_linkprot($cdom,$cnum,$values->{$action},$changes,'course',$lastactref);
                     }
+                } elsif ($action eq 'ltitools') {
+                    if (ref($values) eq 'HASH') {
+                        my $switchserver = &check_switchserver($cdom,$cnum,'course','/adm/courseprefs');
+                        $errors = &process_ltitools('',$cdom,$cnum,$values->{$action},$changes,'course',$lastactref,
+                                                    'ok','','ok');
+                    }
                 } else {
                     foreach my $entry (@ordered) {
                         if ($entry eq 'cloners') {
@@ -1298,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;
@@ -1313,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};
@@ -1322,7 +1363,7 @@ sub process_changes {
                             }
                             if ($fontchange) {
                                 $changes->{$entry} = 1;
-                            } 
+                            }
                         } elsif ($entry eq 'nothideprivileged') {
                             my @curr_nothide;
                             my @new_nothide;
@@ -1397,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'};
@@ -1413,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;
@@ -1509,10 +1550,37 @@ sub process_changes {
                             } elsif ($values->{$entry}) {
                                 $changes->{$entry} = '';
                             }
+                        } elsif ($entry eq 'grading') {
+                            if ($env{'form.'.$entry} eq 'standard') {
+                                if ($env{'form.hidetotals'}) {
+                                    my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
+                                    if (keys(%sections)) {
+                                        my @secs = &Apache::loncommon::get_env_multiple('form.hidetotals_sections');
+                                        if (grep(/^all$/,@secs)) {
+                                            $newvalues{'hidetotals'} = 'all';
+                                        } elsif (@secs) {
+                                            $newvalues{'hidetotals'} = '';
+                                            foreach my $sec (sort {$a <=> $b} @secs) {
+                                                if (exists($sections{$sec})) {
+                                                    $newvalues{'hidetotals'} .= $sec.','
+                                                }
+                                            }
+                                            $newvalues{'hidetotals'} =~ s/,$//;
+                                        }
+                                    } else {
+                                        $newvalues{'hidetotals'} = 'all';
+                                    }
+                                }
+                            }
+                            if ($newvalues{'hidetotals'} ne $values->{'hidetotals'}) {
+                                $changes->{'hidetotals'} = $newvalues{'hidetotals'};
+                                $changes->{'grading'} = $env{'form.'.$entry};
+                            }
+                            $newvalues{$entry} = $env{'form.'.$entry};
                         } else {
                             $newvalues{$entry} = $env{'form.'.$entry};
                         }
-                        unless (($entry eq 'co-owners') || ($entry eq 'discussion_post_fonts') || 
+                        unless (($entry eq 'co-owners') || ($entry eq 'discussion_post_fonts') ||
                                 ($entry eq 'extresource') || ($entry eq 'timezone')) {
                             if ($newvalues{$entry} ne $values->{$entry}) {
                                 $changes->{$entry} = $newvalues{$entry};
@@ -1528,7 +1596,7 @@ sub process_changes {
 
 sub process_linkprot {
     my ($cdom,$cnum,$values,$changes,$context,$lastactref) = @_;
-    my ($home,$dest,$ltiauth,$privkey,$privnum,$cipher,$errors,%linkprot);
+    my ($dest,$ltiauth,$privnum,$cipher,$errors,%linkprot);
     if (ref($values) eq 'HASH') {
         foreach my $id (keys(%{$values})) {
             if ($id =~ /^\d+$/) {
@@ -1538,31 +1606,7 @@ sub process_linkprot {
             }
         }
     }
-    my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
-    my @ids=&Apache::lonnet::current_machine_ids();
-    if ($context eq 'domain') {
-        $home = &Apache::lonnet::domain($cdom,'primary');
-    } else {
-        $home = &Apache::lonnet::homeserver($cnum,$cdom);
-    }
-    if ((($context eq 'domain') && ($domdefs{'linkprotenc_dom'})) ||
-        (($context eq 'course') && ($domdefs{'linkprotenc_crs'}))) {
-        unless (($home eq 'no_host') || ($home eq '')) {
-            if (grep(/^\Q$home\E$/,@ids)) {
-                if (ref($domdefs{'privhosts'}) eq 'ARRAY') {
-                    if (grep(/^\Q$home\E$/,@{$domdefs{'privhosts'}})) {
-                        my %privhash  = &Apache::lonnet::restore_dom('lti','private',$cdom,$home,1);
-                        $privkey = $privhash{'key'};
-                        $privnum = $privhash{'version'};
-                        if (($privnum) && ($privkey ne '')) {
-                            $cipher = Crypt::CBC->new({'key'     => $privkey,
-                                                       'cipher'  => 'DES'});
-                        }
-                    }
-                }
-            }
-        }
-    }
+    ($cipher,$privnum) = &get_credentials($cdom,$cnum,'lti',$context);
     if ($context eq 'domain') {
         $dest = '/adm/domainprefs';
         $ltiauth = 1;
@@ -1646,15 +1690,32 @@ sub process_linkprot {
         } elsif (exists($env{$urlparamname})) {
             $env{$urlparamname} = '';
         }
+        my $passback = 'form.linkprot_passback_'.$idx;
+        my $passbackparamname = 'form.linkprot_passbackformat_'.$idx;
+        if ($env{$passback} == 1) {
+            unless ($env{$passbackparamname} =~ /^1\.(0|1)$/) {
+                $env{$passbackparamname} = '';
+            }
+        } elsif (exists($env{$passbackparamname})) {
+            $env{$passbackparamname} = '';
+        }
         unless ($idx eq 'add') {
             if ((!$current{'returnurl'} && ($env{$urlparamname} ne '')) ||
                 ($current{'returnurl'} && ($env{$urlparamname} eq ''))) {
                 $haschanges{$itemid} = 1;
             }
+            if ((!$current{'passback'} && ($env{$passbackparamname} ne '')) ||
+                ($current{'passback'} && ($env{$passbackparamname} eq ''))) {
+                $haschanges{$itemid} = 1;
+            }
         }
         if ($env{$urlparamname} ne '') {
             $linkprot{$itemid}{'returnurl'} = $env{$urlparamname};
         }
+        if ($env{$passbackparamname} ne '') {
+            $linkprot{$itemid}{'passback'} = 1;
+            $linkprot{$itemid}{'passbackformat'} = $env{$passbackparamname};
+        }
         if ($ltiauth) {
             my $reqitem = 'form.linkprot_requser_'.$idx;
             $env{$reqitem} =~ s/(`)/'/g;
@@ -1765,7 +1826,7 @@ sub get_linkprot_id {
         $tries ++;
         sleep (0.1);
         if ($context eq 'domain') {
-            $gotlock = &Apache::lonnet::newput_dom('linkprot',$lockhash,$cdom); 
+            $gotlock = &Apache::lonnet::newput_dom('linkprot',$lockhash,$cdom);
         } else {
             $gotlock = &Apache::lonnet::newput('lti',$lockhash,$cdom,$cnum);
         }
@@ -1803,7 +1864,7 @@ sub get_linkprot_id {
                 $error = 'nonumber';
             }
         }
-        my $dellockoutcome; 
+        my $dellockoutcome;
         if ($context eq 'domain') {
             $dellockoutcome = &Apache::lonnet::del_dom('linkprot',['lock'],$cdom);
         } else {
@@ -1815,6 +1876,604 @@ sub get_linkprot_id {
     return ($id,$error);
 }
 
+sub get_credentials {
+    my ($cdom,$cnum,$type,$context) = @_;
+    my ($cipher,$privnum,$home);
+    my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+    my @ids=&Apache::lonnet::current_machine_ids();
+    if ($context eq 'domain') {
+        $home = &Apache::lonnet::domain($cdom,'primary');
+    } else {
+        $home = &Apache::lonnet::homeserver($cnum,$cdom);
+    }
+    my ($hostskey,$domkey,$crskey);
+    if ($type eq 'ltitools') {
+        $hostskey = 'toolprivhosts';
+        $domkey = 'toolenc_dom';
+        $crskey = 'toolenc_crs';
+    } else {
+        $hostskey = 'ltiprivhosts';
+        $domkey = 'linkprotenc_dom';
+        $crskey = 'linkprotenc_crs';
+    }
+    if ((($context eq 'domain') && ($domdefs{$domkey})) ||
+        (($context eq 'course') && ($domdefs{$crskey}))) {
+        unless (($home eq 'no_host') || ($home eq '')) {
+            if (grep(/^\Q$home\E$/,@ids)) {
+                if (ref($domdefs{$hostskey}) eq 'ARRAY') {
+                    if (grep(/^\Q$home\E$/,@{$domdefs{$hostskey}})) {
+                        my %privhash  = &Apache::lonnet::restore_dom($type,'private',$cdom,$home,1);
+                        my $privkey = $privhash{'key'};
+                        $privnum = $privhash{'version'};
+                        if (($privnum) && ($privkey ne '')) {
+                            $cipher = Crypt::CBC->new({'key'     => $privkey,
+                                                       'cipher'  => 'DES'});
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return ($cipher,$privnum);
+}
+
+sub process_ltitools {
+    my ($r,$cdom,$cnum,$values,$changes,$context,$lastactref,$configuserok,$lonhost,
+        $author_ok,$confname) = @_;
+    my (%currconfig,$newid,@allpos,%changes,%ltitools,$errors);
+
+    my (%posslti,%possfield);
+    my @courseroles = ('cc','in','ta','ep','st');
+    my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner);
+    map { $posslti{$_} = 1; } @ltiroles;
+    my @allfields = ('fullname','firstname','lastname','email','user','roles');
+    map { $possfield{$_} = 1; } @allfields;
+
+    my ($dest,$privnum,$cipher);
+
+    ($cipher,$privnum) = &get_credentials($cdom,$cnum,'ltitools',$context);
+    if ($context eq 'domain') {
+        $dest = '/adm/domainprefs';
+    } else {
+        $dest = '/adm/courseprefs';
+    }
+    my $switchserver = &check_switchserver($cdom,$cnum,$context,$dest);
+
+    my (@allpos,@items,%deletions,%itemids,%haschanges);
+    if ($env{'form.ltitools_add'}) {
+        my $title = $env{'form.ltitools_add_title'};
+        $title =~ s/(`)/'/g;
+        my ($newid,$error) = &Apache::lonnet::get_ltitools_id($context,$cdom,$cnum,$title);
+        if ($newid) {
+            my $position = $env{'form.ltitools_add_pos'};
+            $position =~ s/\D+//g;
+            if ($position ne '') {
+                $allpos[$position] = $newid;
+            }
+            $haschanges{$newid} = 1;
+            foreach my $item ('title','url','lifetime') {
+                $env{'form.ltitools_add_'.$item} =~ s/(`)/'/g;
+                if ($item eq 'lifetime') {
+                    $env{'form.ltitools_add_'.$item} =~ s/[^\d.]//g;
+                }
+                if ($env{'form.ltitools_add_'.$item}) {
+                    $ltitools{$newid}{$item} = $env{'form.ltitools_add_'.$item};
+                }
+            }
+            if ($env{'form.ltitools_add_version'} eq 'LTI-1p0') {
+                $ltitools{$newid}{'version'} = $env{'form.ltitools_add_version'};
+            }
+            if ($env{'form.ltitools_add_msgtype'} eq 'basic-lti-launch-request') {
+                $ltitools{$newid}{'msgtype'} = $env{'form.ltitools_add_msgtype'};
+            }
+            if ($env{'form.ltitools_add_sigmethod'} eq 'HMAC-SHA256') {
+                $ltitools{$newid}{'sigmethod'} = $env{'form.ltitools_add_sigmethod'};
+            } else {
+                $ltitools{$newid}{'sigmethod'} = 'HMAC-SHA1';
+            }
+            foreach my $item ('width','height','linktext','explanation') {
+                $env{'form.ltitools_add_'.$item} =~ s/^\s+//;
+                $env{'form.ltitools_add_'.$item} =~ s/\s+$//;
+                if (($item eq 'width') || ($item eq 'height')) {
+                    if ($env{'form.ltitools_add_'.$item} =~ /^\d+$/) {
+                        $ltitools{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item};
+                    }
+                } else {
+                    if ($env{'form.ltitools_add_'.$item} ne '') {
+                        $ltitools{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item};
+                    }
+                }
+            }
+            if ($env{'form.ltitools_add_target'} eq 'window') {
+                $ltitools{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'};
+            } elsif ($env{'form.ltitools_add_target'} eq 'tab') {
+                $ltitools{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'};
+            } else {
+                $ltitools{$newid}{'display'}{'target'} = 'iframe';
+            }
+            foreach my $item ('passback','roster') {
+                if ($env{'form.ltitools_'.$item.'_add'}) {
+                    $ltitools{$newid}{$item} = 1;
+                    if ($env{'form.ltitools_'.$item.'valid_add'} ne '') {
+                        my $lifetime = $env{'form.ltitools_'.$item.'valid_add'};
+                        $lifetime =~ s/^\s+|\s+$//g;
+                        if ($lifetime =~ /^\d+\.?\d*$/) {
+                            $ltitools{$newid}{$item.'valid'} = $lifetime;
+                        }
+                    }
+                }
+            }
+            if ($env{'form.ltitools_add_image.filename'} ne '') {
+                my ($imageurl,$error) =
+                    &process_ltitools_image($r,$context,$cdom,$cnum,$confname,'ltitools_add_image',
+                                            $newid,$configuserok,$lonhost,$author_ok);
+                if ($imageurl) {
+                    $ltitools{$newid}{'image'} = $imageurl;
+                }
+                if ($error) {
+                    &Apache::lonnet::logthis($error);
+                    $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+                }
+            }
+            my @fields = &Apache::loncommon::get_env_multiple('form.ltitools_add_fields');
+            foreach my $field (@fields) {
+                if ($possfield{$field}) {
+                    if ($field eq 'roles') {
+                        foreach my $role (@courseroles) {
+                            my $choice = $env{'form.ltitools_add_roles_'.$role};
+                            if (($choice ne '') && ($posslti{$choice})) {
+                                $ltitools{$newid}{'roles'}{$role} = $choice;
+                                if ($role eq 'cc') {
+                                    $ltitools{$newid}{'roles'}{'co'} = $choice;
+                                }
+                            }
+                        }
+                    } else {
+                        $ltitools{$newid}{'fields'}{$field} = 1;
+                    }
+                }
+            }
+            if (ref($ltitools{$newid}{'fields'}) eq 'HASH') {
+                if ($ltitools{$newid}{'fields'}{'user'}) {
+                    if ($env{'form.ltitools_add_userincdom'}) {
+                        $ltitools{$newid}{'incdom'} = 1;
+                    }
+                }
+            }
+            my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_add_courseconfig');
+            foreach my $item (@courseconfig) {
+                $ltitools{$newid}{'crsconf'}{$item} = 1;
+            }
+            if ($env{'form.ltitools_add_custom'}) {
+                my $name = $env{'form.ltitools_add_custom_name'};
+                my $value = $env{'form.ltitools_add_custom_value'};
+                $value =~ s/(`)/'/g;
+                $name =~ s/(`)/'/g;
+                $ltitools{$newid}{'custom'}{$name} = $value;
+            }
+            unless ($switchserver) {
+                my $keyitem = 'form.ltitools_add_key';
+                $env{$keyitem} =~ s/(`)/'/g;
+                if ($env{$keyitem} ne '') {
+                    $ltitools{$newid}{'key'} = $env{$keyitem};
+                }
+                my $secretitem = 'form.ltitools_secret_add';
+                $env{$secretitem} =~ s/(`)/'/g;
+                if ($env{$secretitem} ne '') {
+                    if ($privnum && $cipher) {
+                        $ltitools{$newid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
+                        $ltitools{$newid}{'cipher'} = $privnum;
+                    } else {
+                        $ltitools{$newid}{'secret'} = $env{$secretitem};
+                    }
+                }
+            }
+        } else {
+            $errors .= '<li><span class="LC_error">'.
+                       &mt('Failed to acquire unique ID for new external tool').
+                       '</span></li>';
+        }
+    }
+    if (ref($values) eq 'HASH') {
+        my %deletions;
+        my @todelete = &Apache::loncommon::get_env_multiple('form.ltitools_del');
+        if (@todelete) {
+            map { $deletions{$_} = 1; } @todelete;
+        }
+        my %customadds;
+        my @newcustom = &Apache::loncommon::get_env_multiple('form.ltitools_customadd');
+        if (@newcustom) {
+            map { $customadds{$_} = 1; } @newcustom;
+        }
+        my %imgdeletions;
+        my @todeleteimages = &Apache::loncommon::get_env_multiple('form.ltitools_image_del');
+        if (@todeleteimages) {
+            map { $imgdeletions{$_} = 1; } @todeleteimages;
+        }
+        my $maxnum = $env{'form.ltitools_maxnum'};
+        for (my $i=0; $i<=$maxnum; $i++) {
+            my $itemid = $env{'form.ltitools_id_'.$i};
+            $itemid =~ s/\D+//g;
+            if (ref($values->{$itemid}) eq 'HASH') {
+                if ($deletions{$itemid}) {
+                    if ($values->{$itemid}{'image'}) {
+                        #FIXME need to obsolete item in RES space
+                    }
+                    $haschanges{$itemid} = $values->{$itemid}{'title'};
+                    next;
+                } else {
+                    my $newpos = $env{'form.ltitools_'.$itemid};
+                    $newpos =~ s/\D+//g;
+                    foreach my $item ('title','url','lifetime') {
+                        $ltitools{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i};
+                        if ($values->{$itemid}{$item} ne $ltitools{$itemid}{$item}) {
+                            $haschanges{$itemid} = 1;
+                        }
+                    }
+                    if ($env{'form.ltitools_version_'.$i} eq 'LTI-1p0') {
+                        $ltitools{$itemid}{'version'} = $env{'form.ltitools_version_'.$i};
+                    }
+                    if ($env{'form.ltitools_msgtype_'.$i} eq 'basic-lti-launch-request') {
+                        $ltitools{$itemid}{'msgtype'} = $env{'form.ltitools_msgtype_'.$i};
+                    }
+                    if ($env{'form.ltitools_sigmethod_'.$i} eq 'HMAC-SHA256') {
+                        $ltitools{$itemid}{'sigmethod'} = $env{'form.ltitools_sigmethod_'.$i};
+                    } else {
+                        $ltitools{$itemid}{'sigmethod'} = 'HMAC-SHA1';
+                    }
+                    if ($values->{$itemid}{'sigmethod'} eq '') {
+                        if ($ltitools{$itemid}{'sigmethod'} ne 'HMAC-SHA1') {
+                            $haschanges{$itemid} = 1;
+                        }
+                    } elsif ($values->{$itemid}{'sigmethod'} ne $ltitools{$itemid}{'sigmethod'}) {
+                        $haschanges{$itemid} = 1;
+                    }
+                    foreach my $size ('width','height') {
+                        $env{'form.ltitools_'.$size.'_'.$i} =~ s/^\s+//;
+                        $env{'form.ltitools_'.$size.'_'.$i} =~ s/\s+$//;
+                        if ($env{'form.ltitools_'.$size.'_'.$i} =~ /^\d+$/) {
+                            $ltitools{$itemid}{'display'}{$size} = $env{'form.ltitools_'.$size.'_'.$i};
+                            if (ref($values->{$itemid}{'display'}) eq 'HASH') {
+                                if ($values->{$itemid}{'display'}{$size} ne $ltitools{$itemid}{'display'}{$size}) {
+                                    $haschanges{$itemid} = 1;
+                                }
+                            } else {
+                                $haschanges{$itemid} = 1;
+                            }
+                        } elsif (ref($values->{$itemid}{'display'}) eq 'HASH') {
+                            if ($values->{$itemid}{'display'}{$size} ne '') {
+                                $haschanges{$itemid} = 1;
+                            }
+                        }
+                    }
+                    foreach my $item ('linktext','explanation') {
+                        $env{'form.ltitools_'.$item.'_'.$i} =~ s/^\s+//;
+                        $env{'form.ltitools_'.$item.'_'.$i} =~ s/\s+$//;
+                        if ($env{'form.ltitools_'.$item.'_'.$i} ne '') {
+                            $ltitools{$itemid}{'display'}{$item} = $env{'form.ltitools_'.$item.'_'.$i};
+                            if (ref($values->{$itemid}{'display'}) eq 'HASH') {
+                                if ($values->{$itemid}{'display'}{$item} ne $ltitools{$itemid}{'display'}{$item}) {
+                                    $haschanges{$itemid} = 1;
+                                }
+                            } else {
+                                $haschanges{$itemid} = 1;
+                            }
+                        } elsif (ref($values->{$itemid}{'display'}) eq 'HASH') {
+                            if ($values->{$itemid}{'display'}{$item} ne '') {
+                                $haschanges{$itemid} = 1;
+                            }
+                        }
+                    }
+                    if ($env{'form.ltitools_target_'.$i} eq 'window') {
+                        $ltitools{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i};
+                    } elsif ($env{'form.ltitools_target_'.$i} eq 'tab') {
+                        $ltitools{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i};
+                    } else {
+                        $ltitools{$itemid}{'display'}{'target'} = 'iframe';
+                    }
+                    if (ref($values->{$itemid}{'display'}) eq 'HASH') {
+                        if ($values->{$itemid}{'display'}{'target'} ne $ltitools{$itemid}{'display'}{'target'}) {
+                            $haschanges{$itemid} = 1;
+                        }
+                    } else {
+                        $haschanges{$itemid} = 1;
+                    }
+                    foreach my $extra ('passback','roster') {
+                        if ($env{'form.ltitools_'.$extra.'_'.$i}) {
+                            $ltitools{$itemid}{$extra} = 1;
+                            if ($env{'form.ltitools_'.$extra.'valid_'.$i} ne '') {
+                                my $lifetime = $env{'form.ltitools_'.$extra.'valid_'.$i};
+                                $lifetime =~ s/^\s+|\s+$//g;
+                                if ($lifetime =~ /^\d+\.?\d*$/) {
+                                    $ltitools{$itemid}{$extra.'valid'} = $lifetime;
+                                }
+                            }
+                        }
+                        if ($values->{$itemid}{$extra} ne $ltitools{$itemid}{$extra}) {
+                            $haschanges{$itemid} = 1;
+                        }
+                        if ($values->{$itemid}{$extra.'valid'} ne $ltitools{$itemid}{$extra.'valid'}) {
+                            $haschanges{$itemid} = 1;
+                        }
+                    }
+                    my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig_'.$i);
+                    foreach my $item ('label','title','target','linktext','explanation','append') {
+                        if (grep(/^\Q$item\E$/,@courseconfig)) {
+                            $ltitools{$itemid}{'crsconf'}{$item} = 1;
+                            if (ref($values->{$itemid}{'crsconf'}) eq 'HASH') {
+                                if ($values->{$itemid}{'crsconf'}{$item} ne $ltitools{$itemid}{'crsconf'}{$item}) {
+                                    $haschanges{$itemid} = 1;
+                                }
+                            } else {
+                                $haschanges{$itemid} = 1;
+                            }
+                        }
+                    }
+                    my @fields = &Apache::loncommon::get_env_multiple('form.ltitools_fields_'.$i);
+                    foreach my $field (@fields) {
+                        if ($possfield{$field}) {
+                            if ($field eq 'roles') {
+                                foreach my $role (@courseroles) {
+                                    my $choice = $env{'form.ltitools_roles_'.$role.'_'.$i};
+                                    if (($choice ne '') && ($posslti{$choice})) {
+                                        $ltitools{$itemid}{'roles'}{$role} = $choice;
+                                        if ($role eq 'cc') {
+                                            $ltitools{$itemid}{'roles'}{'co'} = $choice;
+                                        }
+                                    }
+                                    if (ref($values->{$itemid}{'roles'}) eq 'HASH') {
+                                        if ($values->{$itemid}{'roles'}{$role} ne $ltitools{$itemid}{'roles'}{$role}) {
+                                            $haschanges{$itemid} = 1;
+                                        }
+                                    } elsif ($ltitools{$itemid}{'roles'}{$role}) {
+                                        $haschanges{$itemid} = 1;
+                                    }
+                                }
+                            } else {
+                                $ltitools{$itemid}{'fields'}{$field} = 1;
+                                if (ref($values->{$itemid}{'fields'}) eq 'HASH') {
+                                    if ($values->{$itemid}{'fields'}{$field} ne $ltitools{$itemid}{'fields'}{$field}) {
+                                        $haschanges{$itemid} = 1;
+                                    }
+                                } else {
+                                    $haschanges{$itemid} = 1;
+                                }
+                            }
+                        }
+                    }
+                    if (ref($ltitools{$itemid}{'fields'}) eq 'HASH') {
+                        if ($ltitools{$itemid}{'fields'}{'user'}) {
+                            if ($env{'form.ltitools_userincdom_'.$i}) {
+                                $ltitools{$itemid}{'incdom'} = 1;
+                            }
+                            if ($values->{$itemid}{'incdom'} ne $ltitools{$itemid}{'incdom'}) {
+                                $haschanges{$itemid} = 1;
+                            }
+                        }
+                    }
+                    $allpos[$newpos] = $itemid;
+                }
+                if ($imgdeletions{$itemid}) {
+                    $haschanges{$itemid} = 1;
+                    if ($context eq 'course') {
+                        my $currimgurl = $values->{$itemid}{'image'};
+                        if ($currimgurl =~ m{^(\Q/uploaded/$cdom/$cnum/toollogo/$itemid\E)/([^/]+)$}) {
+                            my ($path,$imagefile) = ($1,$2);
+                            if ($imagefile =~ /^tn\-(.+)$/) {
+                                my $origimg = $1;
+                                &Apache::lonnet::removeuploadedurl("$path/$origimg");
+                            }
+                            &Apache::lonnet::removeuploadedurl($currimgurl);
+                        }
+                    }
+                    #FIXME need to obsolete item in RES space
+                } elsif ($env{'form.ltitools_image_'.$i.'.filename'}) {
+                    my $currimgurl = $values->{$itemid}{'image'};
+                    my ($imgurl,$error) = &process_ltitools_image($r,$context,$cdom,$cnum,$confname,'ltitools_image_'.$i,
+                                                                 $itemid,$configuserok,$lonhost,$author_ok,$currimgurl);
+                    if ($imgurl) {
+                        $ltitools{$itemid}{'image'} = $imgurl;
+                        $haschanges{$itemid} = 1;
+                    }
+                    if ($error) {
+                        &Apache::lonnet::logthis($error);
+                        $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+                    }
+                } elsif ($values->{$itemid}{'image'}) {
+                    $ltitools{$itemid}{'image'} = $values->{$itemid}{'image'};
+                }
+                if ($customadds{$i}) {
+                    my $name = $env{'form.ltitools_custom_name_'.$i};
+                    $name =~ s/(`)/'/g;
+                    $name =~ s/^\s+//;
+                    $name =~ s/\s+$//;
+                    my $value = $env{'form.ltitools_custom_value_'.$i};
+                    $value =~ s/(`)/'/g;
+                    $value =~ s/^\s+//;
+                    $value =~ s/\s+$//;
+                    if ($name ne '') {
+                        $ltitools{$itemid}{'custom'}{$name} = $value;
+                        $haschanges{$itemid} = 1;
+                    }
+                }
+                my %customdels;
+                my @customdeletions = &Apache::loncommon::get_env_multiple('form.ltitools_customdel_'.$i);
+                if (@customdeletions) {
+                    $haschanges{$itemid} = 1;
+                }
+                map { $customdels{$_} = 1; } @customdeletions;
+                if (ref($values->{$itemid}{'custom'}) eq 'HASH') {
+                    foreach my $key (keys(%{$values->{$itemid}{'custom'}})) {
+                        unless ($customdels{$key}) {
+                            if ($env{'form.ltitools_customval_'.$key.'_'.$i} ne '') {
+                                $ltitools{$itemid}{'custom'}{$key} = $env{'form.ltitools_customval_'.$key.'_'.$i};
+                            }
+                            if ($values->{$itemid}{'custom'}{$key} ne $env{'form.ltitools_customval_'.$key.'_'.$i}) {
+                                $haschanges{$itemid} = 1;
+                            }
+                        }
+                    }
+                }
+                unless ($switchserver) {
+                    my $keyitem = 'form.ltitools_key_'.$i;
+                    $env{$keyitem} =~ s/(`)/'/g;
+                    if ($values->{$itemid}{'key'} ne $env{$keyitem}) {
+                        $haschanges{$itemid} = 1;
+                    }
+                    if ($env{$keyitem} ne '') {
+                        $ltitools{$itemid}{'key'} = $env{$keyitem};
+                    }
+                    my $secretitem = 'form.ltitools_secret_'.$i;
+                    $env{$secretitem} =~ s/(`)/'/g;
+                    if ($values->{$itemid}{'usable'}) {
+                        if ($env{'form.ltitools_changesecret_'.$i}) {
+                            if ($env{$secretitem} ne '') {
+                                if ($privnum && $cipher) {
+                                    $ltitools{$itemid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
+                                    $ltitools{$itemid}{'cipher'} = $privnum;
+                                } else {
+                                    $ltitools{$itemid}{'secret'} = $env{$secretitem};
+                                }
+                                $haschanges{$itemid} = 1;
+                            }
+                        } else {
+                            $ltitools{$itemid}{'secret'} = $values->{$itemid}{'secret'};
+                            $ltitools{$itemid}{'cipher'} = $values->{$itemid}{'cipher'};
+                        }
+                    } elsif ($env{$secretitem} ne '') {
+                        if ($privnum && $cipher) {
+                            $ltitools{$itemid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
+                            $ltitools{$itemid}{'cipher'} = $privnum;
+                        } else {
+                            $ltitools{$itemid}{'secret'} = $env{$secretitem};
+                        }
+                        $haschanges{$itemid} = 1;
+                    }
+                }
+                unless ($haschanges{$itemid}) {
+                    foreach my $key (keys(%{$values->{$itemid}})) {
+                        if (ref($values->{$itemid}{$key}) eq 'HASH') {
+                            if (ref($ltitools{$itemid}{$key}) eq 'HASH') {
+                                foreach my $innerkey (keys(%{$values->{$itemid}{$key}})) {
+                                    unless (exists($ltitools{$itemid}{$key}{$innerkey})) {
+                                        $haschanges{$itemid} = 1;
+                                        last;
+                                    }
+                                }
+                            } elsif (keys(%{$values->{$itemid}{$key}}) > 0) {
+                                $haschanges{$itemid} = 1;
+                            }
+                        }
+                        last if ($haschanges{$itemid});
+                    }
+                }
+            }
+        }
+    }
+    if (@allpos > 0) {
+        my $idx = 0;
+        foreach my $itemid (@allpos) {
+            if ($itemid ne '') {
+                $ltitools{$itemid}{'order'} = $idx;
+                if (ref($values) eq 'HASH') {
+                    if (ref($values->{$itemid}) eq 'HASH') {
+                        if ($values->{$itemid}{'order'} ne $idx) {
+                            $haschanges{$itemid} = 1;
+                        }
+                    }
+                }
+                $idx ++;
+            }
+        }
+    }
+    if (keys(%haschanges)) {
+        foreach my $entry (keys(%haschanges)) {
+            $changes->{$entry} = $ltitools{$entry};
+        }
+        if (ref($lastactref) eq 'HASH') {
+            $lastactref->{'courseltitools'} = 1;
+        }
+    }
+    return $errors;
+}
+
+sub process_ltitools_image {
+    my ($r,$context,$dom,$cnum,$confname,$caller,$itemid,$configuserok,$switch,$author_ok,$currimg) = @_;
+    my $filename = $env{'form.'.$caller.'.filename'};
+    my ($error,$url);
+    my ($width,$height) = (21,21);
+    if ($configuserok eq 'ok') {
+        if ($switch) {
+            $error = &mt('Upload of Tool Provider (LTI) icon is not permitted to this server: [_1]',
+                         $switch);
+        } elsif ($author_ok eq 'ok') {
+            my ($result,$imageurl,$madethumb);
+            if ($context eq 'domain') {
+                ($result,$imageurl,$madethumb) =
+                    &Apache::lonconfigsettings::publishlogo($r,'upload',$caller,$dom,$confname,
+                                                            "ltitools/$itemid/icon",$width,$height);
+            } else {
+                ($result,$imageurl,$madethumb) = &processlogo($dom,$cnum,$caller,$currimg,$itemid,$width,$height);
+            }
+            if ($result eq 'ok') {
+                if ($madethumb) {
+                    my ($path,$imagefile) = ($imageurl =~ m{^(.+)/([^/]+)$});
+                    my $imagethumb = "$path/tn-".$imagefile;
+                    $url = $imagethumb;
+                } else {
+                    $url = $imageurl;
+                }
+            } else {
+                if ($context eq 'domain') {
+                    $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result);
+                } else {
+                    $error = &mt("Upload of [_1] failed because an error occurred. Error was: [_2].",$filename,$result);
+                }
+            }
+        } else {
+            $error = &mt("Upload of [_1] failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3].  Error was: [_4].",$filename,$confname,$dom,$author_ok);
+        }
+    } else {
+        $error = &mt("Upload of [_1] failed because a Domain Configuration user ([_2]) could not be created in domain: [_3].  Error was: [_4].",$filename,$confname,$dom,$configuserok);
+    }
+    return ($url,$error);
+}
+
+sub processlogo {
+    my ($dom,$cnum,$caller,$currimg,$itemid,$width,$height) = @_;
+    my ($result,$imageurl,$madethumb);
+    if ($env{"form.$caller.filename"} ne '') {
+        unless ($caller eq 'ltitools_add_image') {
+            if ($currimg =~ m{^(\Q/uploaded/$dom/$cnum/toollogo/$itemid\E)/([^/]+)$}) {
+                my ($path,$imagefile) = ($1,$2);
+                if ($imagefile =~ /^tn\-(.+)$/) {
+                     my $origimg = $1;
+                     &Apache::lonnet::removeuploadedurl("$path/$origimg");
+                }
+                &Apache::lonnet::removeuploadedurl($currimg);
+            }
+        }
+        $imageurl = &Apache::lonnet::userfileupload($caller,'toollogo',"toollogo/$itemid",
+                                                    '','','',$cnum,$dom,$width,$height);
+        if ($imageurl =~ m{^(\Q/uploaded/$dom/$cnum/toollogo/$itemid\E)/([^/]+)$}) {
+            my ($path,$imagefile) = ($1,$2);
+            $result = 'ok';
+            my $thumburl = "$path/tn-".$imagefile;
+            my ($rtncode,$info);
+            my $res = &Apache::lonnet::getuploaded('HEAD',$thumburl,$dom,$cnum,\$info,\$rtncode);
+            if ($res eq 'ok') {
+                $madethumb = 1;
+            }
+        } elsif ($imageurl eq '/adm/notfound.html') {
+            undef($imageurl);
+            $result = 'store failed';
+        } elsif ($imageurl =~ /^error: (.+)$/) {
+            $result = $1;
+        }
+    }
+    return ($result,$imageurl,$madethumb);
+}
+
 sub get_sec_str {
     my ($entry,$num) = @_;
     my @secs = &Apache::loncommon::get_env_multiple('form.'.$entry.'_sections_'.$num);
@@ -1857,12 +2516,15 @@ sub check_clone {
 sub store_changes {
     my ($cdom,$cnum,$prefs_order,$actions,$prefs,$values,$changes,$crstype) = @_;
     my ($chome,$output);
-    my (%storehash,@delkeys,@need_env_update,@oldcloner,%oldlinkprot);
+    my (%storehash,@delkeys,@need_env_update,@oldcloner,%oldlinkprot,%oldltitools);
     if ((ref($values) eq 'HASH') && (ref($changes) eq 'HASH')) {
         if (ref($values->{'linkprot'}) eq 'HASH') {
             %oldlinkprot = %{$values->{'linkprot'}};
         }
         delete($values->{'linkprot'});
+        if (ref($values->{'ltitools'}) eq 'HASH') {
+            %oldltitools = %{$values->{'ltitools'}};
+        }
         %storehash = %{$values};
     } else {
         if ($crstype eq 'Community') {
@@ -1877,6 +2539,8 @@ sub store_changes {
         $numchanges = scalar(keys(%{$changes}));
         if (($numchanges == 1) && (exists($changes->{'linkprot'}))) {
             $skipstore = 1;
+        } elsif (($numchanges == 1) && (exists($changes->{'ltitools'}))) {
+            $skipstore = 1;
         } elsif (!$numchanges) {
             if ($crstype eq 'Community') {
                 $output = &mt('No changes made to community settings.');
@@ -1913,6 +2577,8 @@ sub store_changes {
                         }
                     } elsif ($item eq 'linkprot') {
                         $output .= &store_linkprot($cdom,$cnum,'course',$changes->{$item},\%oldlinkprot);
+                    } elsif ($item eq 'ltitools') {
+                        $output .= &store_ltitools($cdom,$cnum,'course',$changes->{$item},\%oldltitools);
                     } else {
                         if (ref($prefs->{$item}->{'ordered'}) eq 'ARRAY') {
                             my @settings = @{$prefs->{$item}->{'ordered'}};
@@ -1992,6 +2658,40 @@ sub store_changes {
                                     unless (($key eq 'co-owners') || ($key eq 'discussion_post_fonts') || ($key eq 'extresource')) {
                                         $displayval = $changes->{$item}{$key};
                                     }
+                                    if (($item eq 'grading') && ($key eq 'grading')) {
+                                        if ($displayval eq 'standard') {
+                                            my $hidetotals;
+                                            if (exists($changes->{$item}{'hidetotals'})) {
+                                                if ($changes->{$item}{'hidetotals'} eq '') {
+                                                    if (exists($values->{'hidetotals'})) {
+                                                        push(@delkeys,'hidetotals');
+                                                    }
+                                                } else {
+                                                    $hidetotals = $changes->{$item}{'hidetotals'};
+                                                }
+                                            } elsif (exists($values->{'hidetotals'})) {
+                                                $hidetotals = $values->{'hidetotals'};
+                                            }
+                                            if ($hidetotals eq '') {
+                                                $displayval = &mt('standard with "hide course totals" set to "No"');
+                                                if (exists($values->{'hidetotals'})) {
+                                                    push(@delkeys,'hidetotals');
+                                                }
+                                            } elsif ($hidetotals =~ /^([\w,]+)$/) {
+                                                my $secstr = $1;
+                                                my @secs = split(/,/,$secstr);
+                                                if (grep(/^all$/,@secs)) {
+                                                    $displayval = &mt('standard with "hide course totals" set to "Yes" for all users');
+                                                    $hidetotals = 'all';
+                                                } else {
+                                                    $displayval = &mt('standard with "hide course totals" set to "Yes" for users in section(s): [_1]',join(', ',@secs));
+                                                }
+                                                $storehash{'hidetotals'} = $hidetotals;
+                                            }
+                                        } elsif (exists($values->{'hidetotals'})) {
+                                            push(@delkeys,'hidetotals');
+                                        }
+                                    }
                                     if ($item eq 'feedback') {
                                         if ($key =~ /^(question|policy|comment)(\.email)\.text$/) {
                                             $text = $prefs->{$item}->{'itemtext'}{$1.$2};
@@ -2401,7 +3101,7 @@ sub store_linkprot {
                     my %values = %{$changes->{$id}};
                     my %desc = &linkprot_names();
                     my $display;
-                    foreach my $title ('name','lifetime','version','key','secret','returnurl') {
+                    foreach my $title ('name','lifetime','version','key','secret','returnurl','passbackformat') {
                         if (($title eq 'key') || ($title eq 'secret')) {
                             if (ref($ltienc{$id}) eq 'HASH') {
                                 if (exists($ltienc{$id}{$title})) {
@@ -2419,7 +3119,13 @@ sub store_linkprot {
                             }
                         } elsif ($title eq 'returnurl') {
                             if ($values{$title}) {
-                                $display .= &mt('Return URL parameter').': '.$values{$title}.', '; 
+                                $display .= &mt('Return URL parameter').': '.$values{$title}.', ';
+                            }
+                        } elsif ($title eq 'passbackformat') {
+                            if ($values{$title} eq '1.0') {
+                                $display .= &mt('Can return grades to Launcher with Outcomes Service 1.0 format').', ';
+                            } elsif ($values{$title} eq '1.1') {
+                                $display .= &mt('Can return grades to Launcher with Outcomes Service 1.1 format').', ';
                             }
                         } else {
                             $display .= $desc{$title}.': '.$values{$title}.', ';
@@ -2477,6 +3183,214 @@ sub store_linkprot {
     return $output;
 }
 
+sub store_ltitools {
+    my ($cdom,$cnum,$context,$changes,$oldltitools) = @_;
+    my ($home,$ltitools_save_error,$output,$error,%toolsenc,@deletions);
+    my %lt = &ltitools_names();
+    my @courseroles = ('cc','in','ta','ep','st');
+    my @allfields = ('fullname','firstname','lastname','email','user','roles');
+    if ($context eq 'domain') {
+        $home = &Apache::lonnet::domain($cdom,'primary');
+    } else {
+        $home = &Apache::lonnet::homeserver($cnum,$cdom);
+    }
+    if (ref($changes) eq 'HASH') {
+        foreach my $id (sort { $a <=> $b } keys(%{$changes})) {
+            if (ref($changes->{$id}) eq 'HASH') {
+                if (exists($changes->{$id}->{'key'})) {
+                    $toolsenc{$id}{'key'} = $changes->{$id}->{'key'};
+                    delete($changes->{$id}->{'key'});
+                }
+                if (exists($changes->{$id}->{'secret'})) {
+                    $toolsenc{$id}{'secret'} = $changes->{$id}->{'secret'};
+                    delete($changes->{$id}->{'secret'});
+                } elsif (ref($oldltitools->{$id}) eq 'HASH') {
+                    if (exists($oldltitools->{$id}{'usable'})) {
+                        $changes->{$id}->{'usable'} = 1;
+                    }
+                    if (exists($oldltitools->{$id}{'cipher'})) {
+                        $changes->{$id}->{'cipher'} = $oldltitools->{$id}{'cipher'};
+                    }
+                }
+            }
+        }
+    }
+    my @ids=&Apache::lonnet::current_machine_ids();
+    if (keys(%toolsenc) > 0) {
+        unless (($home eq 'no_host') || ($home eq '')) {
+            my $allowed;
+            foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+            if ($allowed) {
+                if (($context eq 'domain') ||
+                    (($context eq 'course') &&
+                     (&Apache::lonnet::put('nohist_toolsenc',\%toolsenc,$cdom,$cnum,1) eq 'ok'))) {
+                    foreach my $id (keys(%toolsenc)) {
+                        if (exists($toolsenc{$id}{'secret'})) {
+                            $changes->{$id}->{'usable'} = 1;
+                        }
+                    }
+                } else {
+                    $ltitools_save_error = 1;
+                }
+            }
+        }
+    }
+    unless ($ltitools_save_error) {
+        if ($context eq 'course') {
+            if (&Apache::lonnet::put('ltitools',$changes,$cdom,$cnum,1) eq 'ok') {
+                my $hashid=$cdom.'_'.$cnum;
+                &Apache::lonnet::devalidate_cache_new('courseltitools',$hashid);
+                unless (($home eq 'no_host') || ($home eq '')) {
+                    if (grep(/^\Q$home\E$/,@ids)) {
+                        &Apache::lonnet::devalidate_cache_new('crsltitoolsenc',$hashid);
+                    }
+                }
+            } else {
+                $ltitools_save_error = 1;
+            }
+        }
+        unless ($ltitools_save_error) {
+            my %bynum;
+            foreach my $itemid (sort(keys(%{$changes}))) {
+                my $position = $changes->{$itemid}{'order'};
+                $bynum{$position} = $itemid;
+            }
+            foreach my $pos (sort { $a <=> $b } keys(%bynum)) {
+                my $itemid = $bynum{$pos};
+                if (ref($changes->{$itemid}) ne 'HASH') {
+                    $output .= '<li>'.&mt('Deleted: [_1]',$changes->{$itemid}).'</li>';
+                } else {
+                    $output .= '<li><b>'.$changes->{$itemid}{'title'}.'</b>';
+                    if ($changes->{$itemid}{'image'}) {
+                        $output .= '&nbsp;'.
+                                   '<img src="'.$changes->{$itemid}{'image'}.'"'.
+                                   ' alt="'.&mt('Tool Provider icon').'" />';
+                    }
+                    $output .= '</li><ul>';
+                    my $position = $pos + 1;
+                    $output .= '<li>'.&mt('Order: [_1]',$position).'</li>';
+                    foreach my $item ('version','msgtype','sigmethod','url','lifetime') {
+                        if ($changes->{$itemid}{$item} ne '') {
+                            $output .= '<li>'.$lt{$item}.':&nbsp;'.$changes->{$itemid}{$item}.'</li>';
+                        }
+                    }
+                    if (ref($toolsenc{$itemid}) eq 'HASH') {
+                        foreach my $item ('key','secret') {
+                            if (exists($toolsenc{$itemid}{$item})) {
+                                if ($item eq 'secret') {
+                                    $output .= '<li>'.$lt{$item}.':&nbsp;['.&mt('not shown').']</li>';
+                                } else {
+                                    $output .= '<li>'.$lt{$item}.':&nbsp;'.$toolsenc{$itemid}{$item}.'</li>';
+                                }
+                            }
+                        }
+                    }
+                    $output .= '<li>'.&mt('Configurable in course:');
+                    my @possconfig = ('label','title','target','linktext','explanation','append');
+                    my $numconfig = 0;
+                    if (ref($changes->{$itemid}{'crsconf'}) eq 'HASH') {
+                        foreach my $item (@possconfig) {
+                            if ($changes->{$itemid}{'crsconf'}{$item}) {
+                                $numconfig ++;
+                                $output .= ' "'.$lt{'crs'.$item}.'"';
+                            }
+                        }
+                    }
+                    if (!$numconfig) {
+                        $output .= '&nbsp;'.&mt('None');
+                    }
+                    $output .= '</li>';
+                    foreach my $item ('passback','roster') {
+                        $output .= '<li>'.$lt{$item}.'&nbsp;';
+                        if ($changes->{$itemid}{$item}) {
+                            $output .= &mt('Yes');
+                            if ($changes->{$itemid}{$item.'valid'}) {
+                                if ($item eq 'passback') {
+                                    $output .= ' '.&mt('valid for at least [quant,_1,day] after launch',
+                                                       $changes->{$itemid}{$item.'valid'});
+                                } else {
+                                    $output .= ' '.&mt('valid for at least [quant,_1,second] after launch',
+                                                       $changes->{$itemid}{$item.'valid'});
+                                }
+                            }
+                        } else {
+                            $output .= &mt('No');
+                        }
+                        $output .= '</li>';
+                    }
+                    if (ref($changes->{$itemid}{'display'}) eq 'HASH') {
+                        my $displaylist;
+                        if ($changes->{$itemid}{'display'}{'target'}) {
+                            $displaylist = &mt('Display target').':&nbsp;'.
+                                           $changes->{$itemid}{'display'}{'target'}.',';
+                        }
+                        foreach my $size ('width','height') {
+                            if ($changes->{$itemid}{'display'}{$size}) {
+                                $displaylist .= ('&nbsp;'x2).$lt{$size}.':&nbsp;'.
+                                                $changes->{$itemid}{'display'}{$size}.',';
+                            }
+                        }
+                        if ($displaylist) {
+                            $displaylist =~ s/,$//;
+                            $output .= '<li>'.$displaylist.'</li>';
+                        }
+                        foreach my $item ('linktext','explanation') {
+                            if ($changes->{$itemid}{'display'}{$item}) {
+                                $output .= '<li>'.$lt{$item}.':&nbsp;'.$changes->{$itemid}{'display'}{$item}.'</li>';
+                            }
+                        }
+                    }
+                    if (ref($changes->{$itemid}{'fields'}) eq 'HASH') {
+                        my $fieldlist;
+                        foreach my $field (@allfields) {
+                            if ($changes->{$itemid}{'fields'}{$field}) {
+                                $fieldlist .= ('&nbsp;'x2).$lt{$field}.',';
+                            }
+                        }
+                        if ($fieldlist) {
+                            $fieldlist =~ s/,$//;
+                            if ($changes->{$itemid}{'fields'}{'user'}) {
+                                if ($changes->{$itemid}{'incdom'}) {
+                                    $fieldlist .= ' ('.&mt('username:domain').')';
+                                } else {
+                                    $fieldlist .= ' ('.&mt('username').')';
+                                }
+                            }
+                            $output .= '<li>'.&mt('Data sent').':'.$fieldlist.'</li>';
+                        }
+                    }
+                    if (ref($changes->{$itemid}{'roles'}) eq 'HASH') {
+                        my $rolemaps;
+                        foreach my $role (@courseroles) {
+                            if ($changes->{$itemid}{'roles'}{$role}) {
+                                $rolemaps .= ('&nbsp;'x2).&Apache::lonnet::plaintext($role,'Course').'='.
+                                             $changes->{$itemid}{'roles'}{$role}.',';
+                            }
+                        }
+                        if ($rolemaps) {
+                            $rolemaps =~ s/,$//;
+                            $output .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>';
+                        }
+                    }
+                    if (ref($changes->{$itemid}{'custom'}) eq 'HASH') {
+                        my $customlist;
+                        if (keys(%{$changes->{$itemid}{'custom'}})) {
+                            foreach my $key (sort(keys(%{$changes->{$itemid}{'custom'}}))) {
+                                $customlist .= $key.':'.$changes->{$itemid}{'custom'}{$key}.('&nbsp;'x2);
+                            }
+                        }
+                        if ($customlist) {
+                            $output .= '<li>'.&mt('Custom items').': '.$customlist.'</li>';
+                        }
+                    }
+                    $output .= '</ul></li>';
+                }
+            }
+        }
+    }
+    return $output;
+}
+
 sub update_env {
     my ($cnum,$cdom,$chome,$need_env_update,$storehash)  = @_;
     my $count = 0;
@@ -2613,6 +3527,11 @@ sub get_jscript {
     my $stubrowse_js = &Apache::loncommon::studentbrowser_javascript();
     my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
     my $cloners_js = &cloners_javascript($phase);
+    my $currltitools;
+    if (ref($settings) eq 'HASH') {
+        $currltitools = $settings->{'ltitools'};
+    }
+    my $ltitools_js = &Apache::lonconfigsettings::ltitools_javascript($currltitools);
     my @code_order;
     if ($crstype ne 'Community') {
         if (ref($settings) eq 'HASH') {
@@ -2632,7 +3551,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);
@@ -2733,7 +3652,7 @@ function syllabusinfo() {
     }
 }
 ENDSCRIPT
-    my $menuitems_js;
+    my ($menuitems_js,$grading_js);
     unless ($noedit) {
         my $collections;
         my $next = 1;
@@ -2815,6 +3734,48 @@ function toggleAddmenucoll() {
     }
 }
 ENDSCRIPT
+        $grading_js = <<"ENDSCRIPT";
+function toggleGrading(form) {
+    if (document.getElementById('hidetotalsdiv')) {
+        var totalsdivid = document.getElementById('hidetotalsdiv');
+        var selname = form.elements['grading'];
+        if (selname) {
+            var current = selname.options[selname.selectedIndex].value
+            if (current == 'standard') {
+                totalsdivid.style.display = 'inline-block';
+            } else {
+                totalsdivid.style.display = 'none';
+            }
+        }
+    }
+    return;
+}
+
+function toggleHiddenTotalsSec(form) {
+    if (document.getElementById('sectotalsdiv')) {
+        var sectotalsdivid = document.getElementById('sectotalsdiv');
+        var radioname = form.elements['hidetotals'];
+        if (radioname) {
+            if (radioname.length > 0) {
+                var setvis;
+                for (var i=0; i<radioname.length; i++) {
+                    if (radioname[i].checked == true) {
+                        if (radioname[i].value == 1) {
+                            sectotalsdivid.style.display = 'inline-block';
+                            setvis = 1;
+                        }
+                        break;
+                    }
+                }
+                if (!setvis) {
+                    sectotalsdivid.style.display = 'none';
+                }
+            }
+        }
+    }
+    return;
+}
+ENDSCRIPT
     }
     $extresource_js = <<"ENDSCRIPT";
 function toggleExtRes() {
@@ -2859,12 +3820,12 @@ function toggleTimeZone() {
 }
 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."\n".$localization_js."\n".
                $syllabus_js."\n".$menuitems_js."\n".$extresource_js."\n".
-               &linkprot_javascript()."\n".'//]]>'."\n".
-               '</script>'."\n".$stubrowse_js."\n";
+               $grading_js."\n".&linkprot_javascript()."\n".'//]]>'."\n".
+               '</script>'."\n".$stubrowse_js."\n".$ltitools_js."\n";
     return $jscript;
 }
 
@@ -2951,38 +3912,6 @@ ENDSCRIPT
 
 sub linkprot_javascript {
     return <<"ENDSCRIPT";
-function toggleLinkProt(form,num,item) {
-    var radioname = '';
-    var currdivid = '';
-    var newdivid = '';
-    if ((document.getElementById('linkprot_divcurr'+item+'_'+num)) &&
-        (document.getElementById('linkprot_divchg'+item+'_'+num))) {
-        currdivid = document.getElementById('linkprot_divcurr'+item+'_'+num);
-        newdivid = document.getElementById('linkprot_divchg'+item+'_'+num);
-        radioname = form.elements['linkprot_change'+item+'_'+num];
-        if (radioname) {
-            if (radioname.length > 0) {
-                var setvis;
-                for (var i=0; i<radioname.length; i++) {
-                    if (radioname[i].checked == true) {
-                        if (radioname[i].value == 1) {
-                            newdivid.style.display = 'inline-block';
-                            currdivid.style.display = 'none';
-                            setvis = 1;
-                        }
-                        break;
-                    }
-                }
-                if (!setvis) {
-                    newdivid.style.display = 'none';
-                    currdivid.style.display = 'inline-block';
-                }
-            }
-        }
-    }
-    return;
-}
-
 function toggleLinkProtExtra(form,item,extra,valon,styleon,num) {
     if (document.getElementById('linkprot_'+extra+'_'+num)) {
         var extraid = document.getElementById('linkprot_'+extra+'_'+num);
@@ -3008,20 +3937,10 @@ function toggleLinkProtExtra(form,item,e
     return;
 }
 
-function uncheckLinkProtMakeVis(item,num) {
-    if (document.getElementById('linkprot_'+item+'_'+num)) {
-        var currtype = document.getElementById('linkprot_'+item+'_'+num).type;
-        if (currtype.toLowerCase() == 'checkbox') {
-            document.getElementById('linkprot_'+item+'_'+num).checked = false;
-        }
-    }
-    return;
-}
 ENDSCRIPT
 
 }
 
-
 sub print_courseinfo {
     my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
@@ -3115,7 +4034,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' => {
@@ -3196,7 +4115,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) {
@@ -3379,12 +4298,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;
             }
@@ -3431,12 +4350,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;
@@ -3461,7 +4380,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" ';
         }
@@ -3612,7 +4531,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'};
@@ -3882,7 +4801,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>';
@@ -3969,7 +4888,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;
                 }
@@ -4221,7 +5140,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) {
@@ -4542,7 +5461,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);
                 }
@@ -4579,8 +5498,8 @@ sub print_localization {
                               &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();
@@ -4754,7 +5673,7 @@ sub select_recipient {
 }
 
 sub select_sections {
-    my ($item,$num,$sections,$selected,$noedit) = @_;
+    my ($item,$num,$sections,$selected,$noedit,$allval) = @_;
     my ($output,@currsecs,$allsec,$disabled);
     if (ref($selected) eq 'ARRAY') {
         @currsecs = @{$selected};
@@ -4770,16 +5689,24 @@ sub select_sections {
             my $mult;
             if (@{$sections} > 1) {
                 $mult = ' multiple="multiple"';
+                my $size;
                 if (@{$sections} > 3) {
-                    $mult .= ' size="4"';
+                    $size = 4;
+                } else {
+                    $size = 1 + scalar(@{$sections});
                 }
+                $mult .= ' size="'.$size.'"';
+            }
+            my $name = $item.'_sections';
+            unless ($item eq 'hidetotals') {
+                $name .= '_'.$num;
             }
-            $output = '<select name="'.$item.'_sections_'.$num.'"'.$mult.$disabled.'>'.
-                      ' <option value=""'.$allsec.'>'.&mt('All').'</option>';
+            $output = '<select name="'.$name.'"'.$mult.$disabled.'>'.
+                      ' <option value="'.$allval.'"'.$allsec.'>'.&mt('All').'</option>';
             foreach my $sec (@{$sections}) {
                 my $is_sel;
                 if ((@currsecs) && (grep(/^\Q$sec\E$/,@currsecs))) {
-                    $is_sel = 'selected="selected"';
+                    $is_sel = ' selected="selected"';
                 }
                 $output .= '<option value="'.$sec.'"'.$is_sel.'>'.$sec.'</option>';
             }
@@ -4866,7 +5793,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">'.
@@ -4911,7 +5838,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 />';
@@ -4963,7 +5890,7 @@ sub role_checkboxes {
     my $count = 0;
     my $disabled;
     if ($noedit) {
-        $disabled = ' disabled="disabled"';  
+        $disabled = ' disabled="disabled"';
     }
     foreach my $role (@roles) {
         my $checked = '';
@@ -5091,7 +6018,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',
@@ -5157,7 +6084,7 @@ sub print_classlists {
         'defaultcredits' => {
                    text => '<b>'.&mt($itemtext->{'defaultcredits'}).'</b>',
                  },
-              
+
         'nothideprivileged'   => {
                    text => '<b>'.&mt($itemtext->{'nothideprivileged'}).'</b>',
                    input => 'checkbox',
@@ -5263,7 +6190,7 @@ sub print_appearance {
 }
 
 sub print_grading {
-    my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
+    my ($cdom,$cnum,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
         return;
     }
@@ -5283,7 +6210,7 @@ sub print_grading {
                  },
         'rndseed' => {
                    text => '<b>'.&mt($itemtext->{'rndseed'}).'</b>'.
-                           '<span class="LC_warning">'.'<br />'.
+                           '<br /><span class="LC_warning LC_nobreak">'.
                            &mt('Modifying this will make problems have different numbers and answers!').
                            '</span>',
                    input => 'selectbox',
@@ -5315,7 +6242,7 @@ sub print_grading {
                    input => 'radio',
                  },
     );
-    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'grading',$noedit);
+    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'grading',$noedit,$cnum);
 }
 
 sub print_printouts {
@@ -5449,6 +6376,553 @@ sub print_bridgetasks {
     return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'bridgetasks',$noedit);
 }
 
+sub print_ltitools {
+    my ($cdom,$cnum,$settings,$rowtotal,$crstype,$noedit,$context) = @_;
+    my ($datatable,$disabled,$css_class,$dest);
+    if ($noedit) {
+        $disabled = ' disabled="disabled"';
+    }
+    my $itemcount = 1;
+    unless ($context eq 'domain') {
+        my %tooltypes = &Apache::loncommon::usable_exttools();
+        unless ($tooltypes{'crs'}) {
+            my $showtype = 'course';
+            if ($crstype eq 'Community') {
+                $showtype = lc($crstype);
+            }
+            $css_class = $itemcount%2?' class="LC_odd_row"':'';
+            $datatable = '<tr '.$css_class.'><td colspan="2">'.
+                         &mt("Definition of external tools is not enabled for this $showtype.").'<br />';
+            if ($tooltypes{'dom'}) {
+                         $datatable .= &mt("Contact an administrator for the $showtype domain ([_1]) to request this feature be enabled.",
+                                           '<i>'.$cdom.'</i>').
+                         '<br /><br />'.
+                         &mt("Use of external tools defined at a domain level is enabled, so the $showtype editor can be used to add tool(s), if any have been defined.");
+            } else {
+                $datatable .= &mt("Use of external tools defined at a domain level is not enabled, either, for this $showtype.").
+                              '<br /><br />'.
+                              &mt("Contact an administrator for the $showtype domain ([_1]) to request changes.",
+                                  '<i>'.$cdom.'</i>');
+
+            }
+            $datatable .= '</tr>';
+            $itemcount ++;
+            return $datatable;
+        }
+    }
+    my %lt = &ltitools_names();
+    my $maxnum = 0;
+    my %ordered;
+    if (ref($settings) eq 'HASH') {
+        foreach my $item (keys(%{$settings})) {
+            if (ref($settings->{$item}) eq 'HASH') {
+                my $num = $settings->{$item}{'order'};
+                $ordered{$num} = $item;
+            }
+        }
+    }
+
+    if ($context eq 'domain') {
+        $dest = '/adm/domainprefs';
+    } else {
+        $dest = '/adm/courseprefs';
+    }
+    my ($switchserver,$switchmessage);
+    $switchserver = &check_switchserver($cdom,$cnum,$context,$dest);
+    if ($switchserver) {
+        if ($context eq 'domain') {
+            $switchmessage = &mt("submit from domain's primary library server: [_1].",$switchserver);
+        } elsif ($crstype eq 'Community') {
+            $switchmessage = &mt("submit from community's home server: [_1].",$switchserver);
+        } else {
+            $switchmessage = &mt("submit from course's home server: [_1].",$switchserver);
+        }
+    }
+    my $maxnum = scalar(keys(%ordered));
+    my @courseroles = ('cc','in','ta','ep','st');
+    my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner);
+    my @fields = ('fullname','firstname','lastname','email','roles','user');
+    if (keys(%ordered)) {
+        my @items = sort { $a <=> $b } keys(%ordered);
+        for (my $i=0; $i<@items; $i++) {
+            $css_class = $itemcount%2?' class="LC_odd_row"':'';
+            my $item = $ordered{$items[$i]};
+            my ($title,$key,$url,$usable,$lifetime,$imgsrc,%sigsel);
+            if (ref($settings->{$item}) eq 'HASH') {
+                $title = $settings->{$item}->{'title'};
+                $url = $settings->{$item}->{'url'};
+                $key = $settings->{$item}->{'key'};
+                $usable = $settings->{$item}->{'usable'};
+                $lifetime = $settings->{$item}->{'lifetime'};
+                my $image = $settings->{$item}->{'image'};
+                if ($image ne '') {
+                    $imgsrc = '<img src="'.$image.'" alt="'.&mt('Tool Provider icon').'" />';
+                }
+                if ($settings->{$item}->{'sigmethod'} eq 'HMAC-256') {
+                    $sigsel{'HMAC-256'} = ' selected="selected"';
+                } else {
+                    $sigsel{'HMAC-SHA1'} = ' selected="selected"';
+                }
+            }
+            my $chgstr = ' onchange="javascript:reorderLTITools(this.form,'."'ltitools_".$item."'".');"';
+            $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
+                         .'<select name="ltitools_'.$item.'"'.$chgstr.'>';
+            for (my $k=0; $k<=$maxnum; $k++) {
+                my $vpos = $k+1;
+                my $selstr;
+                if ($k == $i) {
+                    $selstr = ' selected="selected" ';
+                }
+                $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+            }
+            $datatable .= '</select>'.('&nbsp;'x2).
+                '<label><input type="checkbox" name="ltitools_del" value="'.$item.'" />'.
+                &mt('Delete?').'</label></span></td>'.
+                '<td colspan="2">'.
+                '<fieldset><legend>'.&mt('Required settings').'</legend>'.
+                '<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="20" name="ltitools_title_'.$i.'" value="'.$title.'" /></span> '.
+                ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'version'}.':<select name="ltitools_version_'.$i.'">'.
+                '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '.
+                ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'msgtype'}.':<select name="ltitools_msgtype_'.$i.'">'.
+                '<option value="basic-lti-launch-request" selected="selected">Launch</option></select></span> '.
+                ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'sigmethod'}.':<select name="ltitools_sigmethod_'.$i.'">'.
+                '<option value="HMAC-SHA1"'.$sigsel{'HMAC-SHA1'}.'>HMAC-SHA1</option>'.
+                '<option value="HMAC-SHA256"'.$sigsel{'HMAC-SHA256'}.'>HMAC-SHA256</option></select></span>'.
+                '<br /><br />'.
+                '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="60" name="ltitools_url_'.$i.'"'.
+                ' value="'.$url.'" /></span>'.
+                ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'lifetime'}.':'.
+                '<input type="text" size="5" name="ltitools_lifetime_'.$i.'" value="'.$lifetime.'" /></span><br /><br />';
+            if ($key ne '') {
+                $datatable .= '<span class="LC_nobreak">'.$lt{'key'};
+                if ($noedit) {
+                    $datatable .= ': ['.&mt('not shown').']';
+                } elsif ($switchserver) {
+                    $datatable .= ': ['.&mt('[_1] to view/edit',$switchserver).']';
+                } else {
+                    $datatable .= ':<input type="text" size="25" name="ltitools_key_'.$i.'" value="'.$key.'" autocomplete="off"'.$disabled.' />';
+                }
+                $datatable .= '</span> '.('&nbsp;'x2);
+            } elsif (!$switchserver) {
+                $datatable .= '<span class="LC_nobreak">'.$lt{'key'}.':'.
+                              '<input type="text" size="25" name="ltitools_key_'.$i.'" value="'.$key.'" autocomplete="off"'.$disabled.' />'.
+                              '</span> '.('&nbsp;'x2);
+            }
+            if ($switchserver) {
+                if ($usable ne '') {
+                    $datatable .= '<div id="ltitools_divcurrsecret_'.$i.'" style="display:inline-block" /><span class="LC_nobreak">'.
+                                  $lt{'secret'}.': ['.&mt('not shown').'] '.('&nbsp;'x2).'</span></div>'.
+                                  '<span class="LC_nobreak">'.&mt('Change secret?').
+                                  '<label><input type="radio" value="0" name="ltitools_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','ltitools'".');" checked="checked"'.$disabled.' />'.&mt('No').'</label>'.
+                                  ('&nbsp;'x2).
+                                  '<label><input type="radio" value="1" name="ltitools_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','ltitools'".');" '.$disabled.' />'.&mt('Yes').'</label>'.('&nbsp;'x2).
+                                  '</span><div id="ltitools_divchgsecret_'.$i.'" style="display:none" />'.
+                                  '<span class="LC_nobreak"> - '.$switchmessage.'</span>'.
+                                  '</div>';
+                } elsif ($key eq '') {
+                    $datatable .= '<span class="LC_nobreak">'.&mt('Key and Secret are required').' - '.$switchmessage.'</span>'."\n";
+                } else {
+                    $datatable .= '<span class="LC_nobreak">'.&mt('Secret required').' - '.$switchmessage.'</span>'."\n";
+                }
+                $datatable .= '<input type="hidden" name="ltitools_id_'.$i.'" value="'.$item.'" />';
+            } else {
+                if ($usable ne '') {
+                    $datatable .= '<div id="ltitools_divcurrsecret_'.$i.'" style="display:inline-block" /><span class="LC_nobreak">'.
+                                  $lt{'secret'}.': ['.&mt('not shown').'] '.('&nbsp;'x2).'</span></div>'.
+                                  '<span class="LC_nobreak">'.&mt('Change?').
+                                  '<label><input type="radio" value="0" name="ltitools_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','ltitools'".');" checked="checked"'.$disabled.' />'.&mt('No').'</label>'.
+                                  ('&nbsp;'x2).
+                                  '<label><input type="radio" value="1" name="ltitools_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','ltitools'".');"'.$disabled.' />'.&mt('Yes').
+                                  '</label>&nbsp;&nbsp;</span><div id="ltitools_divchgsecret_'.$i.'" style="display:none" />'.
+                                  '<span class="LC_nobreak">'.&mt('New Secret').':'.
+                                  '<input type="password" size="20" name="ltitools_secret_'.$i.'" value="" autocomplete="new-password"'.$disabled.' />'.
+                                  '<label><input type="checkbox" name="ltitools_visible_'.$i.'" id="ltitools_visible_'.$i.'" onclick="if (this.checked) { this.form.ltitools_secret_'.$i.'.type='."'text'".' } else { this.form.ltitools_secret_'.$i.'.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label>'.
+                                  '<input type="hidden" name="ltitools_id_'.$i.'" value="'.$item.'" /></span></div>';
+                } else {
+                    $datatable .=
+                        '<span class="LC_nobreak">'.$lt{'secret'}.':'.
+                        '<input type="password" size="20" name="ltitools_secret_'.$i.'" value="" autocomplete="new-password"'.$disabled.' />'.
+                        '<label><input type="checkbox" name="ltitools_visible_'.$i.'" id="ltitools_visible_'.$i.'" onclick="if (this.checked) { this.form.ltitools_secret_'.$i.'.type='."'text'".' } else { this.form.ltitools_secret_'.$i.'.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label>'.
+                        '<input type="hidden" name="ltitools_id_'.$i.'" value="'.$item.'" /></span>';
+                }
+            }
+            $datatable .= '</fieldset>'.
+                          '<fieldset><legend>'.&mt('Optional settings').'</legend>'.
+                          '<span class="LC_nobreak">'.&mt('Display target:');
+            my %currdisp;
+            if (ref($settings->{$item}->{'display'}) eq 'HASH') {
+                if ($settings->{$item}->{'display'}->{'target'} eq 'window') {
+                    $currdisp{'window'} = ' checked="checked"';
+                } elsif ($settings->{$item}->{'display'}->{'target'} eq 'tab') {
+                    $currdisp{'tab'} = ' checked="checked"';
+                } else {
+                    $currdisp{'iframe'} = ' checked="checked"';
+                }
+                if ($settings->{$item}->{'display'}->{'width'} =~ /^(\d+)$/) {
+                    $currdisp{'width'} = $1;
+                }
+                if ($settings->{$item}->{'display'}->{'height'} =~ /^(\d+)$/) {
+                    $currdisp{'height'} = $1;
+                }
+                $currdisp{'linktext'} = $settings->{$item}->{'display'}->{'linktext'};
+                $currdisp{'explanation'} = $settings->{$item}->{'display'}->{'explanation'};
+            } else {
+                $currdisp{'iframe'} = ' checked="checked"';
+            }
+            foreach my $disp ('iframe','tab','window') {
+                $datatable .= '<label><input type="radio" name="ltitools_target_'.$i.'" value="'.$disp.'"'.$currdisp{$disp}.' />'.
+                              $lt{$disp}.'</label>'.('&nbsp;'x2);
+            }
+            $datatable .= ('&nbsp;'x4);
+            foreach my $dimen ('width','height') {
+                $datatable .= '<label>'.$lt{$dimen}.'&nbsp;'.
+                              '<input type="text" name="ltitools_'.$dimen.'_'.$i.'" size="5" value="'.$currdisp{$dimen}.'" /></label>'.
+                              ('&nbsp;'x2);
+            }
+            $datatable .= '</span><br />'.
+                          '<div class="LC_left_float">'.$lt{'linktext'}.'<br />'.
+                          '<input type="text" name="ltitools_linktext_'.$i.'" size="25" value="'.$currdisp{'linktext'}.'" /></div>'.
+                          '<div class="LC_left_float">'.$lt{'explanation'}.'<br />'.
+                          '<textarea name="ltitools_explanation_'.$i.'" rows="5" cols="40">'.$currdisp{'explanation'}.
+                          '</textarea></div><div style=""></div><br />';
+            my %units = (
+                          'passback' => 'days',
+                          'roster'   => 'seconds',
+                        );
+            foreach my $extra ('passback','roster') {
+                my $validsty = 'none';
+                my $currvalid;
+                my $checkedon = '';
+                my $checkedoff = ' checked="checked"';
+                if ($settings->{$item}->{$extra}) {
+                    $checkedon = $checkedoff;
+                    $checkedoff = '';
+                    $validsty = 'inline-block';
+                    if ($settings->{$item}->{$extra.'valid'} =~ /^\d+\.?\d*$/) {
+                        $currvalid = $settings->{$item}->{$extra.'valid'};
+                    }
+                }
+                my $onclick = ' onclick="toggleLTITools(this.form,'."'$extra','$i'".');"';
+                $datatable .= '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{$extra}.'&nbsp;'.
+                              '<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="0"'.$checkedoff.$onclick.' />'.
+                              &mt('No').'</label>'.('&nbsp;'x2).
+                              '<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="1"'.$checkedon.$onclick.' />'.
+                              &mt('Yes').'</label></span></div>'.
+                              '<div class="LC_floatleft" style="display:'.$validsty.';" id="ltitools_'.$extra.'time_'.$i.'">'.
+                              '<span class="LC_nobreak">'.
+                              &mt("until at least [_1] $units{$extra} after launch",
+                                  '<input type="text" name="ltitools_'.$extra.'valid_'.$i.'" value="'.$currvalid.'" />').
+                              '</span></div><div style="padding:0;clear:both;margin:0;border:0"></div>';
+            }
+            $datatable .= '<span class="LC_nobreak">'.$lt{'icon'}.':&nbsp;';
+            if ($imgsrc) {
+                $datatable .= $imgsrc.
+                              '<label><input type="checkbox" name="ltitools_image_del"'.
+                              ' value="'.$item.'" />'.&mt('Delete?').'</label></span> '.
+                              '<span class="LC_nobreak">&nbsp;'.&mt('Replace:').'&nbsp;';
+            } else {
+                $datatable .= '('.&mt('if larger than 21x21 pixels, image will be scaled').')&nbsp;';
+            }
+            if ($switchserver) {
+                $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+            } else {
+                $datatable .= '<input type="file" name="ltitools_image_'.$i.'" value="" />';
+            }
+            $datatable .= '</span></fieldset>';
+            my (%checkedfields,%rolemaps,$userincdom);
+            if (ref($settings->{$item}) eq 'HASH') {
+                if (ref($settings->{$item}->{'fields'}) eq 'HASH') {
+                    %checkedfields = %{$settings->{$item}->{'fields'}};
+                }
+                $userincdom = $settings->{$item}->{'incdom'};
+                if (ref($settings->{$item}->{'roles'}) eq 'HASH') {
+                    %rolemaps = %{$settings->{$item}->{'roles'}};
+                    $checkedfields{'roles'} = 1;
+                }
+            }
+            $datatable .= '<fieldset><legend>'.&mt('User data sent on launch').'</legend>'.
+                          '<span class="LC_nobreak">';
+            my $userfieldstyle = 'display:none;';
+            my $seluserdom = '';
+            my $unseluserdom = ' selected="selected"';
+            foreach my $field (@fields) {
+                my ($checked,$onclick,$id,$spacer);
+                if ($checkedfields{$field}) {
+                    $checked = ' checked="checked"';
+                }
+                if ($field eq 'user') {
+                    $id = ' id="ltitools_user_field_'.$i.'"';
+                    $onclick = ' onclick="toggleLTITools(this.form,'."'$field','$i'".')"';
+                    if ($checked) {
+                        $userfieldstyle = 'display:inline-block';
+                        if ($userincdom) {
+                            $seluserdom = $unseluserdom;
+                            $unseluserdom = '';
+                        }
+                    }
+                } else {
+                    $spacer = ('&nbsp;' x2);
+                }
+                $datatable .= '<label>'.
+                              '<input type="checkbox" name="ltitools_fields_'.$i.'" value="'.$field.'"'.$id.$checked.$onclick.' />'.
+                              $lt{$field}.'</label>'.$spacer;
+            }
+            $datatable .= '</span>';
+            $datatable .= '<div style="'.$userfieldstyle.'" id="ltitools_user_div_'.$i.'">'.
+                          '<span class="LC_nobreak"> : '.
+                          '<select name="ltitools_userincdom_'.$i.'">'.
+                          '<option value="">'.&mt('Select').'</option>'.
+                          '<option value="0"'.$unseluserdom.'>'.&mt('username').'</option>'.
+                          '<option value="1"'.$seluserdom.'>'.&mt('username:domain').'</option>'.
+                          '</select></span></div>';
+            $datatable .= '</fieldset>'.
+                          '<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>';
+            foreach my $role (@courseroles) {
+                my ($selected,$selectnone);
+                if (!$rolemaps{$role}) {
+                    $selectnone = ' selected="selected"';
+                }
+                $datatable .= '<td style="text-align: center">'.
+                              &Apache::lonnet::plaintext($role,'Course').'<br />'.
+                              '<select name="ltitools_roles_'.$role.'_'.$i.'">'.
+                              '<option value=""'.$selectnone.'>'.&mt('Select').'</option>';
+                foreach my $ltirole (@ltiroles) {
+                    unless ($selectnone) {
+                        if ($rolemaps{$role} eq $ltirole) {
+                            $selected = ' selected="selected"';
+                        } else {
+                            $selected = '';
+                        }
+                    }
+                    $datatable .= '<option value="'.$ltirole.'"'.$selected.'>'.$ltirole.'</option>';
+                }
+                $datatable .= '</select></td>';
+            }
+            $datatable .= '</tr></table></fieldset>';
+            my %courseconfig;
+            if (ref($settings->{$item}) eq 'HASH') {
+                if (ref($settings->{$item}->{'crsconf'}) eq 'HASH') {
+                    %courseconfig = %{$settings->{$item}->{'crsconf'}};
+                }
+            }
+            $datatable .= '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">';
+            foreach my $item ('label','title','target','linktext','explanation','append') {
+                my $checked;
+                if ($courseconfig{$item}) {
+                    $checked = ' checked="checked"';
+                }
+                $datatable .= '<label>'.
+                       '<input type="checkbox" name="ltitools_courseconfig_'.$i.'" value="'.$item.'"'.$checked.' />'.
+                       $lt{'crs'.$item}.'</label>&nbsp; '."\n";
+            }
+            $datatable .= '</span></fieldset>'.
+                          '<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'.
+                          '<table><tr><th>'.&mt('Action').'</th><th>'.&mt('Name').'</th><th>'.&mt('Value').'</th></tr>';
+            if (ref($settings->{$item}->{'custom'}) eq 'HASH') {
+                my %custom = %{$settings->{$item}->{'custom'}};
+                if (keys(%custom) > 0) {
+                    foreach my $key (sort(keys(%custom))) {
+                        $datatable .= '<tr><td><span class="LC_nobreak">'.
+                                      '<label><input type="checkbox" name="ltitools_customdel_'.$i.'" value="'.
+                                      $key.'" />'.&mt('Delete').'</label></span></td><td>'.$key.'</td>'.
+                                      '<td><input type="text" name="ltitools_customval_'.$key.'_'.$i.'"'.
+                                      ' value="'.$custom{$key}.'" /></td></tr>';
+                    }
+                }
+            }
+            $datatable .= '<tr><td><span class="LC_nobreak">'.
+                          '<label><input type="checkbox" name="ltitools_customadd" value="'.$i.'" />'.
+                          &mt('Add').'</label></span></td><td><input type="text" name="ltitools_custom_name_'.$i.'" />'.
+                          '</td><td><input type="text" name="ltitools_custom_value_'.$i.'" /></td></tr>';
+            $datatable .= '</table></fieldset></td></tr>'."\n";
+            $itemcount ++;
+        }
+    }
+    $css_class = $itemcount%2?' class="LC_odd_row"':'';
+    my $chgstr = ' onchange="javascript:reorderLTITools(this.form,'."'ltitools_add_pos'".');"';
+    $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n".
+                  '<input type="hidden" name="ltitools_maxnum" value="'.$maxnum.'" />'."\n".
+                  '<select name="ltitools_add_pos"'.$chgstr.'>';
+    for (my $k=0; $k<$maxnum+1; $k++) {
+        my $vpos = $k+1;
+        my $selstr;
+        if ($k == $maxnum) {
+            $selstr = ' selected="selected" ';
+        }
+        $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+    }
+    $datatable .= '</select>&nbsp;'."\n".
+                  '<input type="checkbox" name="ltitools_add" value="1" />'.&mt('Add').'</span></td>'."\n".
+                  '<td colspan="2">'.
+                  '<fieldset><legend>'.&mt('Required settings').'</legend>'.
+                  '<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="20" name="ltitools_add_title" value="" /></span> '."\n".
+                  ('&nbsp;'x2).
+                  '<span class="LC_nobreak">'.$lt{'version'}.':<select name="ltitools_add_version">'.
+                  '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '."\n".
+                  ('&nbsp;'x2).
+                  '<span class="LC_nobreak">'.$lt{'msgtype'}.':<select name="ltitools_add_msgtype">'.
+                  '<option value="basic-lti-launch-request" selected="selected">Launch</option></select></span> '.
+                  '<span class="LC_nobreak">'.$lt{'sigmethod'}.':<select name="ltitools_add_sigmethod">'.
+                  '<option value="HMAC-SHA1" selected="selected">HMAC-SHA1</option>'.
+                  '<option value="HMAC-SHA256">HMAC-SHA256</option></select></span>'.
+                  '<br />'.
+                  '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="60" name="ltitools_add_url" value="" /></span> '."\n".
+                  ('&nbsp;'x2).
+                  '<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" size="5" name="ltitools_add_lifetime" value="300" /></span><br />';
+    if ($switchserver) {
+        $datatable .= '<span class="LC_nobreak">'.&mt('Key and Secret are required').' - '.$switchmessage.'</span>'."\n";
+    } else {
+        $datatable .= '<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="ltitools_add_key" value="" autocomplete="off"'.$disabled.' /></span> '."\n".
+                      ('&nbsp;'x2).
+                      '<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="ltitools_secret_add" value="" autocomplete="new-password"'.$disabled.' />'.
+                      '<label><input type="checkbox" name="ltitools_add_visible" id="ltitools_add_visible" onclick="if (this.checked) { this.form.ltitools_secret_add.type='."'text'".' } else { this.form.ltitools_secret_add.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label></span> '."\n";
+    }
+    $datatable .= '<br /><br />'.
+                  '</fieldset>'.
+                  '<fieldset><legend>'.&mt('Optional settings').'</legend>'.
+                  '<span class="LC_nobreak">'.&mt('Display target:');
+    my %defaultdisp;
+    $defaultdisp{'iframe'} = ' checked="checked"';
+    foreach my $disp ('iframe','tab','window') {
+        $datatable .= '<label><input type="radio" name="ltitools_add_target" value="'.$disp.'"'.$defaultdisp{$disp}.' />'.
+                      $lt{$disp}.'</label>'.('&nbsp;'x2);
+    }
+    $datatable .= ('&nbsp;'x4);
+    foreach my $dimen ('width','height') {
+        $datatable .= '<label>'.$lt{$dimen}.'&nbsp;'.
+                      '<input type="text" name="ltitools_add_'.$dimen.'" size="5" /></label>'.
+                      ('&nbsp;'x2);
+    }
+    $datatable .= '</span><br />'.
+                  '<div class="LC_left_float">'.$lt{'linktext'}.'<br />'.
+                  '<input type="text" name="ltitools_add_linktext" size="5" /></div>'.
+                  '<div class="LC_left_float">'.$lt{'explanation'}.'<br />'.
+                  '<textarea name="ltitools_add_explanation" rows="5" cols="40"></textarea>'.
+                  '</div><div style=""></div><br />';
+    my %units = (
+                  'passback' => 'days',
+                  'roster'   => 'seconds',
+                );
+    my %defaulttimes = (
+                     'passback' => '7',
+                     'roster'   => '300',
+                   );
+    foreach my $extra ('passback','roster') {
+        my $onclick = ' onclick="toggleLTITools(this.form,'."'$extra','add'".');"';
+        $datatable .= '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{$extra}.'&nbsp;'.
+                      '<label><input type="radio" name="ltitools_'.$extra.'_add" value="0" checked="checked"'.$onclick.' />'.
+                      &mt('No').'</label></span>'.('&nbsp;'x2).'<span class="LC_nobreak">'.
+                      '<label><input type="radio" name="ltitools_'.$extra.'_add" value="1"'.$onclick.' />'.
+                      &mt('Yes').'</label></span></div>'.
+                      '<div class="LC_floatleft" style="display:none;" id="ltitools_'.$extra.'time_add">'.
+                      '<span class="LC_nobreak">'.
+                      &mt("until at least [_1] $units{$extra} after launch",
+                          '<input type="text" name="ltitools_'.$extra.'valid_add" value="'.$defaulttimes{$extra}.'" />').
+                      '</span></div><div style="padding:0;clear:both;margin:0;border:0"></div>';
+    }
+    $datatable .= '<span class="LC_nobreak">'.$lt{'icon'}.':&nbsp;'.
+                  '('.&mt('if larger than 21x21 pixels, image will be scaled').')&nbsp;';
+    if ($switchserver) {
+        $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+    } else {
+        $datatable .= '<input type="file" name="ltitools_add_image" value="" />';
+    }
+    $datatable .= '</span></fieldset>'.
+                  '<fieldset><legend>'.&mt('User data sent on launch').'</legend>'.
+                  '<span class="LC_nobreak">';
+    foreach my $field (@fields) {
+        my ($id,$onclick,$spacer);
+        if ($field eq 'user') {
+            $id = ' id="ltitools_user_field_add"';
+            $onclick = ' onclick="toggleLTITools(this.form,'."'$field','add'".')"';
+        } else {
+            $spacer = ('&nbsp;' x2);
+        }
+        $datatable .= '<label>'.
+                      '<input type="checkbox" name="ltitools_add_fields" value="'.$field.'"'.$id.$onclick.' />'.
+                      $lt{$field}.'</label>'.$spacer;
+    }
+    $datatable .= '</span>'.
+                  '<div style="display:none;" id="ltitools_user_div_add">'.
+                  '<span class="LC_nobreak"> : '.
+                  '<select name="ltitools_add_userincdom">'.
+                  '<option value="" selected="selected">'.&mt('Select').'</option>'.
+                  '<option value="0">'.&mt('username').'</option>'.
+                  '<option value="1">'.&mt('username:domain').'</option>'.
+                  '</select></span></div></fieldset>';
+    $datatable .= '<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>';
+    foreach my $role (@courseroles) {
+        my ($checked,$checkednone);
+        $datatable .= '<td style="text-align: center">'.
+                      &Apache::lonnet::plaintext($role,'Course').'<br />'.
+                      '<select name="ltitools_add_roles_'.$role.'">'.
+                      '<option value="" selected="selected">'.&mt('Select').'</option>';
+        foreach my $ltirole (@ltiroles) {
+            $datatable .= '<option value="'.$ltirole.'">'.$ltirole.'</option>';
+        }
+        $datatable .= '</select></td>';
+    }
+    $datatable .= '</tr></table></fieldset>'.
+                  '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">';
+    foreach my $item ('label','title','target','linktext','explanation','append') {
+        $datatable .= '<label>'.
+                      '<input type="checkbox" name="ltitools_add_courseconfig" value="'.$item.'" checked="checked" />'.
+                      $lt{'crs'.$item}.'</label>'.('&nbsp;' x2)."\n";
+    }
+    $datatable .= '</span></fieldset>'.
+                  '<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'.
+                  '<table><tr><th>'.&mt('Action').'</th><th>'.&mt('Name').'</th><th>'.&mt('Value').'</th></tr>'.
+                  '<tr><td><span class="LC_nobreak">'.
+                  '<label><input type="checkbox" name="ltitools_add_custom" value="1" />'.
+                  &mt('Add').'</label></span></td><td><input type="text" name="ltitools_add_custom_name" />'.
+                  '</td><td><input type="text" name="ltitools_add_custom_value" /></td></tr>'.
+                  '</table></fieldset>'."\n".
+                  '</td>'."\n".
+                  '</tr>'."\n";
+    $itemcount ++;
+    return $datatable;
+}
+
+sub ltitools_names {
+    my %lt = &Apache::lonlocal::texthash(
+                                          'title'          => 'Title',
+                                          'version'        => 'Version',
+                                          'msgtype'        => 'Message Type',
+                                          'sigmethod'      => 'Signature Method',
+                                          'url'            => 'URL',
+                                          'key'            => 'Key',
+                                          'lifetime'       => 'Nonce lifetime (s)',
+                                          'secret'         => 'Secret',
+                                          'icon'           => 'Icon',
+                                          'user'           => 'User',
+                                          'fullname'       => 'Full Name',
+                                          'firstname'      => 'First Name',
+                                          'lastname'       => 'Last Name',
+                                          'email'          => 'E-mail',
+                                          'roles'          => 'Role',
+                                          'window'         => 'Window',
+                                          'tab'            => 'Tab',
+                                          'iframe'         => 'iFrame',
+                                          'height'         => 'Height',
+                                          'width'          => 'Width',
+                                          'linktext'       => 'Default Link Text',
+                                          'explanation'    => 'Default Explanation',
+                                          'passback'       => 'Tool can return grades:',
+                                          'roster'         => 'Tool can retrieve roster:',
+                                          'crstarget'      => 'Display target',
+                                          'crslabel'       => 'Course label',
+                                          'crstitle'       => 'Course title',
+                                          'crslinktext'    => 'Link Text',
+                                          'crsexplanation' => 'Explanation',
+                                          'crsappend'      => 'Provider URL',
+                                        );
+    return %lt;
+}
+
 sub print_lti {
     my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
@@ -5822,7 +7296,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 />';
@@ -5877,12 +7351,12 @@ sub print_linkprotection {
     } else {
         $dest = '/adm/courseprefs';
     }
-    
+
     my ($switchserver,$switchmessage);
     $switchserver = &check_switchserver($cdom,$cnum,$context,$dest);
     if ($switchserver) {
         if ($context eq 'domain') {
-            $switchmessage = &mt("submit from domain's primary library server: [_1].",$switchserver);  
+            $switchmessage = &mt("submit from domain's primary library server: [_1].",$switchserver);
         } elsif ($crstype eq 'Community') {
            $switchmessage = &mt("submit from community's home server: [_1].",$switchserver);
         } else {
@@ -5911,7 +7385,27 @@ sub print_linkprotection {
                     '<tr '.$css_class.'><td><span class="LC_nobreak">'.
                     '<label><input type="checkbox" name="linkprot_del" value="'.$i.'"'.$disabled.' />'.
                     &mt('Delete?').'</label></span></td><td>';
-                my ($usersty,$onclickrequser,%checkedrequser,$onclickreturnurl,%checkedreturnurl);
+                my ($usersty,$onclickrequser,%checkedrequser,$onclickreturnurl,%checkedreturnurl,
+                    $onclickpassback,%checkedpassback,$passbacksty,%checkedpassbackfmt);
+                $passbacksty = 'none';
+                $onclickpassback = ' onclick="toggleLinkProtExtra(this.form,'."'passback','passbackparam','1','inline-block','$i'".');"';
+                %checkedpassback = (
+                    'no' => ' checked="checked"',
+                    'yes' => '',
+                );
+                %checkedpassbackfmt = (
+                    '1p1' => ' checked="checked"',
+                    '1p0' => '',
+                );
+                if ($values{'passback'} ne '') {
+                    $passbacksty = 'inline-block';
+                    $checkedpassback{'yes'} = ' checked="checked"';
+                    $checkedpassback{'no'} = '';
+                    if ($values{'passbackformat'} eq '1.0') {
+                        $checkedpassbackfmt{'1p0'} = ' checked="checked"';
+                        $checkedpassbackfmt{'1p1'} = '';
+                    }
+                }
                 if ($ltiauth) {
                     $usersty = 'display:none';
                     $onclickrequser = ' onclick="toggleLinkProtExtra(this.form,'."'requser','optional','1','block','$i'".');"';
@@ -5924,7 +7418,7 @@ sub print_linkprotection {
                         $checkedrequser{'no'} = '';
                     }
                     $datatable .= '<fieldset><legend>'.$lt{'requ'}.'</legend>';
-                    if ($values{'requser'}) { 
+                    if ($values{'requser'}) {
                         $usersty = 'display:inline-block';
                     }
                 }
@@ -5966,9 +7460,9 @@ sub print_linkprotection {
                         $datatable .= '<div id="linkprot_divcurrsecret_'.$i.'" style="display:inline-block" /><span class="LC_nobreak">'.
                                       $desc{'secret'}.': ['.&mt('not shown').'] '.('&nbsp;'x2).'</span></div>'.
                                       '<span class="LC_nobreak">'.&mt('Change secret?').
-                                      '<label><input type="radio" value="0" name="linkprot_changesecret_'.$i.'" onclick="javascript:toggleLinkProt(this.form,'."'$i','secret'".');" checked="checked"'.$disabled.' />'.&mt('No').'</label>'.
+                                      '<label><input type="radio" value="0" name="linkprot_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','linkprot'".');" checked="checked"'.$disabled.' />'.&mt('No').'</label>'.
                                       ('&nbsp;'x2).
-                                      '<label><input type="radio" value="1" name="linkprot_changesecret_'.$i.'" onclick="javascript:toggleLinkProt(this.form,'."'$i','secret'".');" '.$disabled.' />'.&mt('Yes').'</label>'.('&nbsp;'x2).
+                                      '<label><input type="radio" value="1" name="linkprot_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','linkprot'".');" '.$disabled.' />'.&mt('Yes').'</label>'.('&nbsp;'x2).
                                       '</span><div id="linkprot_divchgsecret_'.$i.'" style="display:none" />'.
                                       '<span class="LC_nobreak"> - '.$switchmessage.'</span>'.
                                       '</div>';
@@ -5983,9 +7477,9 @@ sub print_linkprotection {
                         $datatable .= '<div id="linkprot_divcurrsecret_'.$i.'" style="display:inline-block" /><span class="LC_nobreak">'.
                                       $desc{'secret'}.': ['.&mt('not shown').'] '.('&nbsp;'x2).'</span></div>'.
                                       '<span class="LC_nobreak">'.&mt('Change?').
-                                      '<label><input type="radio" value="0" name="linkprot_changesecret_'.$i.'" onclick="javascript:toggleLinkProt(this.form,'."'$i','secret'".');" checked="checked"'.$disabled.' />'.&mt('No').'</label>'.
+                                      '<label><input type="radio" value="0" name="linkprot_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','linkprot'".');" checked="checked"'.$disabled.' />'.&mt('No').'</label>'.
                                       ('&nbsp;'x2).
-                                      '<label><input type="radio" value="1" name="linkprot_changesecret_'.$i.'" onclick="javascript:toggleLinkProt(this.form,'."'$i','secret'".');"'.$disabled.' />'.&mt('Yes').
+                                      '<label><input type="radio" value="1" name="linkprot_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','linkprot'".');"'.$disabled.' />'.&mt('Yes').
                                       '</label>&nbsp;&nbsp;</span><div id="linkprot_divchgsecret_'.$i.'" style="display:none" />'.
                                       '<span class="LC_nobreak">'.&mt('New Secret').':'.
                                       '<input type="password" size="20" name="linkprot_secret_'.$i.'" value="" autocomplete="new-password"'.$disabled.' />'.
@@ -6000,6 +7494,19 @@ sub print_linkprotection {
                     }
                 }
                 $datatable .= '<br /><br />'.
+                              '<span class="LC_nobreak">'.$desc{'passback'}.'?'.
+                              '<label><input type="radio" name="linkprot_passback_'.$i.'" value="0"'.
+                              $onclickpassback.$checkedpassback{'no'}.$disabled.' />'.&mt('No').'</label>&nbsp;'.
+                              '<label><input type="radio" name="linkprot_passback_'.$i.'" value="1"'.
+                              $onclickpassback.$checkedpassback{'yes'}.$disabled.' />'.&mt('Yes').'</label></span><br />'.
+                              '<div id="linkprot_passbackparam_'.$i.'" class="LC_floatleft" style="display:'.$passbacksty.'" />'.
+                              '<span class="LC_nobreak">'.&mt('Grade format').
+                              '<label><input type="radio" name="linkprot_passbackformat_'.$i.'" value="1.1"'.$checkedpassbackfmt{'1p1'}.' />'.
+                              &mt('Outcomes Service (1.1)').'</label>'.('&nbsp;'x2).
+                              '<label><input type="radio" name="linkprot_passbackformat_'.$i.'" value="1.0"'.$checkedpassbackfmt{'1p0'}.'/>'.
+                              &mt('Outcomes Extension (1.0)').'</label></span></div>'.
+                              '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
+                              '<br />'.
                               '<span class="LC_nobreak">'.$desc{'returnurl'}.'?'.
                               '<label><input type="radio" name="linkprot_returnurl_'.$i.'" value="0"'.
                               $onclickreturnurl.$checkedreturnurl{'no'}.$disabled.' />'.&mt('No').'</label>&nbsp;'.
@@ -6030,7 +7537,8 @@ sub print_linkprotection {
                   '<input type="hidden" name="linkprot_maxnum" value="'.$next.'" />'."\n".
                   '<input type="checkbox" name="linkprot_add" value="1"'.$disabled.' />'.&mt('Add').'</span></td>'."\n".
                   '<td width="100%">';
-    my ($usersty,$onclickrequser,%checkedrequser,$onclickreturnurl,%checkedreturnurl);
+    my ($usersty,$onclickrequser,%checkedrequser,$onclickreturnurl,%checkedreturnurl,
+       $onclickpassback,%checkedpassback,%checkedpassbackfmt);
     if ($ltiauth) {
         $usersty = 'display:none';
         $onclickrequser = ' onclick="toggleLinkProtExtra(this.form,'."'requser','optional','1','block','add'".');"';
@@ -6040,6 +7548,15 @@ sub print_linkprotection {
         );
         $datatable .= '<fieldset><legend>'.$lt{'requ'}.'</legend>';
     }
+    $onclickpassback = ' onclick="toggleLinkProtExtra(this.form,'."'passback','passbackparam','1','inline-block','add'".');"';
+    %checkedpassback = (
+        'no' => ' checked="checked"',
+        'yes' => '',
+    );
+    %checkedpassbackfmt = (
+        '1p1' => ' checked="checked"',
+        '1p0' => '',
+    );
     $onclickreturnurl = ' onclick="toggleLinkProtExtra(this.form,'."'returnurl','divurlparam','1','inline-block','add'".');"';
     %checkedreturnurl = (
         no => ' checked="checked"',
@@ -6062,6 +7579,19 @@ sub print_linkprotection {
                       '<label><input type="checkbox" name="linkprot_visible_add" id="linkprot_visible_add" onclick="if (this.checked) { this.form.linkprot_secret_add.type='."'text'".' } else { this.form.linkprot_secret_add.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label></span> '."\n";
     }
     $datatable .= '<br /><br />'.
+                  '<span class="LC_nobreak">'.$desc{'passback'}.'?'.
+                  '<label><input type="radio" name="linkprot_passback_add" value="0"'.
+                  $onclickpassback.$checkedpassback{'no'}.$disabled.' />'.&mt('No').'</label>&nbsp;'.
+                  '<label><input type="radio" name="linkprot_passback_add" value="1"'.
+                  $onclickpassback.$checkedpassback{'yes'}.$disabled.' />'.&mt('Yes').'</label></span>'.
+                  '<br /><div id="linkprot_passbackparam_add" class="LC_floatleft" style="display:none" />'.
+                  '<span class="LC_nobreak">'.&mt('Grade format').
+                  '<label><input type="radio" name="linkprot_passbackformat_add" value="1.1"'.$checkedpassbackfmt{'1p1'}.$disabled.' />'.
+                  &mt('Outcomes Service (1.1)').'</label>'.('&nbsp;'x2).
+                  '<label><input type="radio" name="linkprot_passbackformat_add" value="1.0"'.$checkedpassbackfmt{'1p0'}.$disabled.' />'.
+                  &mt('Outcomes Extension (1.0)').'</label></span></div>'.
+                  '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
+                  '<br />'.
                   '<span class="LC_nobreak">'.$desc{'returnurl'}.'?'.
                   '<label><input type="radio" name="linkprot_returnurl_add" value="0"'.
                   $onclickreturnurl.$checkedreturnurl{'no'}.$disabled.' />'.&mt('No').'</label>&nbsp;'.
@@ -6094,6 +7624,7 @@ sub linkprot_names {
                                           'lifetime'  => 'Nonce lifetime (s)',
                                           'name'      => 'Launcher Application',
                                           'secret'    => 'Secret',
+                                          'passback'  => 'Can return grades to Launcher',
                                           'returnurl' => 'Launcher return URL',
                                           'requser'   => 'Use identity',
                                           'email'     => 'Email address',
@@ -6186,7 +7717,7 @@ sub print_extresource_row {
                                       $config->{'options'},$selected,
                                       $config->{'nullval'},
                                       undef,undef,$onchange,$noedit,$id);
-    my ($checked,$reusesty,$sizesty); 
+    my ($checked,$reusesty,$sizesty);
     if ($reuse) {
         $checked = ' checked="checked"';
     }
@@ -6290,7 +7821,7 @@ sub item_table_row_end {
 }
 
 sub yesno_radio {
-    my ($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit) = @_;
+    my ($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit,$onclick,$reverse) = @_;
     my $itemon = ' ';
     my $itemoff = ' checked="checked" ';
     if (($valueyes eq '') && ($valueno eq '')) {
@@ -6312,12 +7843,22 @@ sub yesno_radio {
     my $disabled;
     if ($noedit) {
         $disabled = ' disabled="disabled"';
+    } elsif ($onclick) {
+        $onclick = ' onclick="'.$onclick.'"';
+    }
+    if ($reverse) {
+        return '<span class="LC_nobreak"><label>'.
+               '<input type="radio" name="'.$item.'"'.
+               $itemoff.' value="'.$valueno.'"'.$disabled.$onclick.' />'.&mt('No').'</label>&nbsp;'.
+               '<label><input type="radio" name="'.$item.'"'.
+               $itemon.' value="'.$valueyes.'"'.$disabled.$onclick.' />'.&mt('Yes').'</label></span>';
+    } else {
+        return '<span class="LC_nobreak"><label>'.
+               '<input type="radio" name="'.$item.'"'.
+               $itemon.' value="'.$valueyes.'"'.$disabled.$onclick.' />'.&mt('Yes').'</label>&nbsp;'.
+               '<label><input type="radio" name="'.$item.'"'.
+               $itemoff.' value="'.$valueno.'"'.$disabled.$onclick.' />'.&mt('No').'</label></span>';
     }
-    return '<span class="LC_nobreak"><label>'.
-           '<input type="radio" name="'.$item.'"'.
-           $itemon.' value="'.$valueyes.'"'.$disabled.' />'.&mt('Yes').'</label>&nbsp;'.
-           '<label><input type="radio" name="'.$item.'"'.
-           $itemoff.' value="'.$valueno.'"'.$disabled.' />'.&mt('No').'</label></span>';
 }
 
 sub select_from_options {
@@ -6373,7 +7914,7 @@ sub select_from_options {
 }
 
 sub make_item_rows {
-    my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype,$caller,$noedit) = @_;
+    my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype,$caller,$noedit,$cnum) = @_;
     my $datatable;
     if ((ref($items) eq 'HASH') && (ref($ordered) eq 'ARRAY')) {
         my $count = 0;
@@ -6436,16 +7977,65 @@ sub make_item_rows {
                 }
                 $datatable .= &yesno_radio($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit);
             } elsif ($items->{$item}{input} eq 'selectbox') {
-                my $id;
+                my ($id,$onchange);
                 if ($caller eq 'menuitems') {
                     $id = $item;
+                } elsif ($caller eq 'grading') {
+                    if ($item eq 'grading') {
+                        $onchange = ' onchange="javascript:toggleGrading(this.form);"';
+                        $id = $item;
+                    }
                 }
                 my $curr = $settings->{$item};
                 $datatable .=
                     &select_from_options($item,$items->{$item}{'order'},
                                          $items->{$item}{'options'},$curr,
                                          $items->{$item}{'nullval'},
-                                         undef,undef,undef,$noedit,$id);
+                                         undef,undef,$onchange,$noedit,$id);
+                if ($item eq 'grading') {
+                    my ($unsetdefault,$valueyes,$valueno,$sectionbox);
+                    my $gradingsty = 'none';
+                    my $gradingsecsty = 'none';
+                    $unsetdefault = 0;
+                    my (@selsec,@sections,%current);
+                    if ($curr eq 'standard') {
+                        $gradingsty = 'inline-block';
+                        if (ref($settings) eq 'HASH') {
+                            $current{'hidetotals'} = $settings->{'hidetotals'};
+                            if ($settings->{'hidetotals'} =~ /^([\w,]+)$/) {
+                                my $secstr = $1;
+                                unless ($secstr eq 'all') {
+                                    @selsec = split(/,/,$secstr);
+                                }
+                                $current{'hidetotals'} = 1;
+                            }
+                        }
+                    }
+                    $valueyes = "1";
+                    $valueno = "0";
+                    my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
+                    if (keys(%sections)) {
+                        @sections = sort( { $a <=> $b } keys(%sections));
+                    }
+                    my $onclick = 'javascript:toggleHiddenTotalsSec(this.form);';
+                    my $sectionbox = '<div id="sectotalsdiv" style="display:'.$gradingsecsty.'; float:right">';
+                    my $reverse = 1;
+                    if (@sections) {
+                        $sectionbox .= '&nbsp;...&nbsp;'.&mt('hidden in sections').':&nbsp;'.
+                                       '<div style="position: relative; top: 0%;">'.
+                                       &select_sections('hidetotals','',\@sections,\@selsec,$noedit,'all').
+                                       '</div>';
+                    }
+                    $sectionbox .= '</div>';
+                    $datatable .= '<fieldset id="hidetotalsdiv" style="display:'.$gradingsty.';">'.
+                                  '<legend style="font-weight: normal;">'.
+                                  &mt('Hide Course Points Totals').'</legend>'.
+                                  '<div style="position: relative; top: 0%; float:left">'.
+                                  &yesno_radio('hidetotals',\%current,$unsetdefault,$valueyes,$valueno,$noedit,
+                                               $onclick,$reverse).'</div>'.
+                                  $sectionbox.
+                                  '</fieldset><div style="padding:0;clear:both;margin:0;border:0"></div>';
+                }
             } elsif ($items->{$item}{input} eq 'textbox') {
                 my $disabled;
                 if ($noedit) {
@@ -6480,7 +8070,7 @@ sub nothidepriv_row {
             }
         }
         if ($settings->{'checkforpriv'}) {
-            @checkdoms = split(/,/,$settings->{'checkforpriv'}); 
+            @checkdoms = split(/,/,$settings->{'checkforpriv'});
         }
     }
     push(@checkdoms,$cdom);
@@ -6494,7 +8084,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);
@@ -6570,7 +8160,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">'.
@@ -6582,13 +8172,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 />'.
@@ -6702,7 +8292,7 @@ ENDJS
         }
     }
     my $pos = $currnum+1;
-    unless ($noedit) { 
+    unless ($noedit) {
         $output .= 
                '<tr>'.
                '<td align="left"><span class="LC_nobreak">'.
@@ -6849,7 +8439,7 @@ sub devalidate_remote_courseprefs {
     my %servers = &Apache::lonnet::internet_dom_servers($cdom);
     my %thismachine;
     map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
-    my @posscached = ('courselti');
+    my @posscached = ('courselti','courseltitools');
     if (keys(%servers)) {
         foreach my $server (keys(%servers)) {
             next if ($thismachine{$server});