--- loncom/interface/courseprefs.pm	2023/04/13 15:21:00	1.119
+++ loncom/interface/courseprefs.pm	2023/06/03 02:29:57	1.122
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.119 2023/04/13 15:21:00 raeburn Exp $
+# $Id: courseprefs.pm,v 1.122 2023/06/03 02:29:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1661,14 +1661,28 @@ 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;
@@ -1883,7 +1897,7 @@ sub process_ltitools {
     my @allfields = ('fullname','firstname','lastname','email','user','roles');
     map { $possfield{$_} = 1; } @allfields;
 
-    my ($dest,$privnum,$cipher,$errors,%ltitools);
+    my ($dest,$privnum,$cipher);
 
     ($cipher,$privnum) = &get_credentials($cdom,$cnum,'ltitools',$context);
     if ($context eq 'domain') {
@@ -3088,7 +3102,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})) {
@@ -3108,6 +3122,12 @@ sub store_linkprot {
                             if ($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}.', ';
                         }
@@ -3223,7 +3243,7 @@ sub store_ltitools {
                 &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('courseltitoolsenc',$hashid);
+                        &Apache::lonnet::devalidate_cache_new('crsltitoolsenc',$hashid);
                     }
                 }
             } else {
@@ -6310,8 +6330,38 @@ sub print_bridgetasks {
 sub print_ltitools {
     my ($cdom,$cnum,$settings,$rowtotal,$crstype,$noedit,$context) = @_;
     my ($datatable,$disabled,$css_class,$dest);
-    my %lt = &ltitools_names();
+    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') {
@@ -6393,7 +6443,7 @@ sub print_ltitools {
                 '<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="40" name="ltitools_url_'.$i.'"'.
+                '<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'}.':'.
@@ -6671,7 +6721,7 @@ sub print_ltitools {
                   '<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="40" name="ltitools_add_url" value="" /></span> '."\n".
+                  '<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) {
@@ -7286,7 +7336,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'".');"';
@@ -7375,6 +7445,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;'.
@@ -7405,7 +7488,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'".');"';
@@ -7415,6 +7499,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"',
@@ -7437,6 +7530,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;'.
@@ -7469,6 +7575,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',
@@ -8224,7 +8331,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});