--- loncom/interface/domainprefs.pm 2019/01/28 21:36:45 1.347 +++ loncom/interface/domainprefs.pm 2019/02/15 20:56:14 1.349 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.347 2019/01/28 21:36:45 raeburn Exp $ +# $Id: domainprefs.pm,v 1.349 2019/02/15 20:56:14 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -5272,7 +5272,6 @@ sub print_coursedefaults { mysqltables => 'Lifetime (s) of "Temporary" MySQL tables (student performance data) on homeserver', ); my %staticdefaults = ( - texengine => 'MathJax', anonsurvey_threshold => 10, uploadquota => 500, postsubmit => 60, @@ -5286,7 +5285,7 @@ sub print_coursedefaults { 'canclone' => 'none', ); @toggles = ('canuse_pdfforms','uselcmath','usejsme'); - my $deftex = $staticdefaults{'texengine'}; + my $deftex = $Apache::lonnet::deftex; if (ref($settings) eq 'HASH') { if ($settings->{'texengine'}) { if ($settings->{'texengine'} =~ /^(MathJax|mimetex|tth)$/) { @@ -8313,7 +8312,7 @@ sub scantronconfig_titles { csv => 'Comma separated values (.csv)', hdr => 'Remove first line in file (contains column titles)', pad => 'Prepend 0s to PaperID', - rem => 'Remove leading spaces (except Q columns)', + rem => 'Remove leading spaces (except Question Response columns)', CODE => 'CODE', ID => 'Student ID', PaperID => 'Paper ID', @@ -16133,7 +16132,6 @@ sub modify_coursedefaults { $defaultshash{'coursedefaults'}{$setting}{$type} = $newdef; } if ($currdef ne $newdef) { - my $staticdef; if ($item eq 'anonsurvey_threshold') { unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) { $changes{$item} = 1; @@ -16149,11 +16147,12 @@ sub modify_coursedefaults { my $texengine; if ($env{'form.texengine'} =~ /^(MathJax|mimetex|tth)$/) { $texengine = $env{'form.texengine'}; - if ($defaultshash{'coursedefaults'}{'texengine'} eq '') { - unless ($texengine eq 'MathJax') { + my $currdef = $domconfig{'coursedefaults'}{'texengine'}; + if ($currdef eq '') { + unless ($texengine eq $Apache::lonnet::deftex) { $changes{'texengine'} = 1; } - } elsif ($defaultshash{'coursedefaults'}{'texengine'} ne $texengine) { + } elsif ($currdef ne $texengine) { $changes{'texengine'} = 1; } }