--- loncom/interface/domainprefs.pm	2018/07/25 20:23:31	1.335
+++ loncom/interface/domainprefs.pm	2018/10/22 13:46:14	1.339
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.335 2018/07/25 20:23:31 raeburn Exp $
+# $Id: domainprefs.pm,v 1.339 2018/10/22 13:46:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2817,27 +2817,40 @@ sub lti_toggle_js {
 // <![CDATA[
 
 function toggleLTI(form,setting,item) {
-    if ((setting == 'user') || (setting == 'crs')) {
+    if ((setting == 'user') || (setting == 'crs') || (setting == 'passback')) {
         var radioname = '';
         var divid = '';
         if (setting == 'user') {
             radioname = 'lti_mapuser_'+item;
             divid = 'lti_userfield_'+item;
-        } else {
+        } else if (settings == 'crs') {
             radioname = 'lti_mapcrs_'+item;
             divid = 'lti_crsfield_'+item;
+        } else {
+            radioname = 'lti_passbackformat_'+item;
+            divid =  'lti_passback_'+item;
         }
         var num = form.elements[radioname].length;
         if (num) {
             var setvis = '';
             for (var i=0; i<num; i++) {
                if (form.elements[radioname][i].checked) {
-                   if (form.elements[radioname][i].value == 'other') {
-                       if (document.getElementById(divid)) {
-                           document.getElementById(divid).style.display = 'inline-block';
+                   if (setting == 'passback') {
+                       if (form.elements[radioname][i].value == '1') {
+                           if (document.getElementById(divid)) {
+                               document.getElementById(divid).style.display = 'inline-block';
+                           }
+                           setvis = 1;
+                           break;
+                       }
+                   } else {
+                       if (form.elements[radioname][i].value == 'other') {
+                           if (document.getElementById(divid)) {
+                               document.getElementById(divid).style.display = 'inline-block';
+                           }
+                           setvis = 1;
+                           break;
                        }
-                       setvis = 1;
-                       break;
                    }
                } 
             }
@@ -4751,6 +4764,7 @@ sub lti_options {
     my $crsfieldsty = 'none';
     my $crssecfieldsty = 'none';
     my $secsrcfieldsty = 'none';
+    my $passbacksty = 'none';
     my $lcauthparm;
     my $lcauthparmstyle = 'display:none';
     my $lcauthparmtext;
@@ -4991,23 +5005,43 @@ sub lti_options {
                $checked{'crssecsrc'}{'other'}.$onclicksecsrc.' />'.&mt('Other').
                '</label></span></div><div class="LC_floatleft" style="display:'.$secsrcfieldsty.';" id="lti_secsrcfield_'.$num.'">'.
                '<input type="text" name="lti_customsection_'.$num.'" value="'.$crssecsrc.'" />'.
-               '</div><div style="padding:0;clear:both;margin:0;border:0"></div>'; 
-    foreach my $extra ('passback','roster') {
+               '</div><div style="padding:0;clear:both;margin:0;border:0"></div>';
+    my ($pb1p1chk,$pb1p0chk,$onclickpb);
+    foreach my $extra ('roster','passback') {
         my $checkedon = '';
         my $checkedoff = ' checked="checked"';
+        if ($extra eq 'passback') {
+            $pb1p1chk = ' checked="checked"';
+            $pb1p0chk = '';
+            $onclickpb = ' onclick="toggleLTI(this.form,'."'passback','$num'".');"'; 
+        } else {
+            $onclickpb = ''; 
+        }
         if (ref($current) eq 'HASH') {
             if (($current->{$extra})) {
                 $checkedon = $checkedoff;
                 $checkedoff = '';
+                if ($extra eq 'passback') {
+                    $passbacksty = 'inline-block';
+                }
+                if ($current->{'passbackformat'} eq '1.0') {
+                    $pb1p0chk =  ' checked="checked"';
+                    $pb1p1chk = '';
+                }
             }
         }
         $output .= $lt{$extra}.'&nbsp;'.
-                   '<label><input type="radio" name="lti_'.$extra.'_'.$num.'" value="0"'.$checkedoff.' />'.
+                   '<label><input type="radio" name="lti_'.$extra.'_'.$num.'" value="0"'.$checkedoff.$onclickpb.' />'.
                    &mt('No').'</label>'.('&nbsp;'x2).
-                   '<label><input type="radio" name="lti_'.$extra.'_'.$num.'" value="1"'.$checkedon.' />'.
+                   '<label><input type="radio" name="lti_'.$extra.'_'.$num.'" value="1"'.$checkedon.$onclickpb.' />'.
                    &mt('Yes').'</label><br />';
     }
-    $output .= '</fieldset>'.
+    $output .= '<div class="LC_floatleft" style="display:'.$passbacksty.';" id="lti_passback_'.$num.'">'.
+               '<span class="LC_nobreak">'.&mt('Grade format').
+               '<label><input type="radio" name="lti_passbackformat_'.$num.'" value="1.1"'.$pb1p1chk.' />'.
+               &mt('Outcomes Service (1.1)').'</label>'.('&nbsp;'x2).
+               '<label><input type="radio" name="lti_passbackformat_'.$num.'" value="1.0"'.$pb1p0chk.'/>'.
+               &mt('Outcomes Extension (1.0)').'</label></span></div></fieldset>'.
                '<fieldset><legend>'.&mt('Course defaults (Course Coordinator can override)').'</legend>'.
                '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'topmenu'}.':&nbsp;'.
                '<label><input type="radio" name="lti_topmenu_'.$num.'" value="0"'.
@@ -11128,7 +11162,7 @@ sub modify_ltitools {
                         if ($env{'form.ltitools_'.$extra.'_'.$i}) {
                             $confhash{$itemid}{$extra} = 1;
                             if ($env{'form.ltitools_'.$extra.'valid_'.$i} ne '') {
-                                my $lifetime = $env{'form.ltitools_'.$extra.'valid_add'};
+                                my $lifetime = $env{'form.ltitools_'.$extra.'valid_'.$i};
                                 $lifetime =~ s/^\s+|\s+$//g;
                                 if ($lifetime =~ /^\d+\.?\d*$/) {
                                     $confhash{$itemid}{$extra.'valid'} = $lifetime;
@@ -11714,7 +11748,13 @@ sub modify_lti {
                 $confhash{$itemid}{$field} = 1;
             }
         }
-
+        if ($env{'form.lti_passback_'.$idx}) {
+            if ($env{'form.lti_passbackformat_'.$idx} eq '1.0') {
+                $confhash{$itemid}{'passbackformat'} = '1.0';
+            } else {
+                $confhash{$itemid}{'passbackformat'} = '1.1';
+            }
+        }
         if ($env{'form.lti_topmenu_'.$idx} || $env{'form.lti_inlinemenu_'.$idx}) {
             $confhash{$itemid}{lcmenu} = [];
             my @possmenu = &Apache::loncommon::get_env_multiple('form.lti_menuitem_'.$idx);
@@ -11733,6 +11773,13 @@ sub modify_lti {
                     $changes{$itemid} = 1;
                 }
             }
+            unless ($changes{$itemid}) {
+                if ($domconfig{$action}{$itemid}{'passback'} eq $confhash{$itemid}{'passback'}) {
+                    if ($domconfig{$action}{$itemid}{'passbackformat'} ne $confhash{$itemid}{'passbackformat'}) {
+                        $changes{$itemid} = 1;
+                    }
+                }
+            }
             foreach my $field ('makeuser','mapcrstype','selfenroll','instdata','lcmenu') {
                 unless ($changes{$itemid}) {
                     if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') {
@@ -11949,6 +11996,13 @@ sub modify_lti {
                         $resulttext .= '<li>'.$lt{$item}.':&nbsp;';
                         if ($confhash{$itemid}{$item}) {
                             $resulttext .= &mt('Yes');
+                            if ($item eq 'passback') {
+                                if ($confhash{$itemid}{'passbackformat'} eq '1.0') {
+                                    $resulttext .= '&nbsp;('.&mt('Outcomes Extension (1.0)').')';
+                                } elsif ($confhash{$itemid}{'passbackformat'} eq '1.1') {
+                                    $resulttext .= '&nbsp;('.&mt('Outcomes Service (1.1)').')';
+                                }
+                            }
                         } else {
                             $resulttext .= &mt('No');
                         }
@@ -16443,6 +16497,17 @@ sub modify_ssl {
             }
         }
     }
+    if (keys(%changes)) {
+        foreach my $prefix (keys(%changes)) {
+            if (ref($changes{$prefix}) eq 'HASH') {
+                if (scalar(keys(%{$changes{$prefix}})) == 0) {
+                    delete($changes{$prefix});
+                }
+            } else {
+                delete($changes{$prefix});
+            }
+        }
+    }
     my $nochgmsg = &mt('No changes made to LON-CAPA SSL settings');
     if (keys(%changes) > 0) {
         my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,