version 1.160.6.89, 2018/09/15 15:15:32
|
version 1.160.6.92, 2019/07/26 16:55:49
|
Line 2807 sub print_contacts {
|
Line 2807 sub print_contacts {
|
} |
} |
} elsif ($position eq 'middle') { |
} elsif ($position eq 'middle') { |
@mailings = ('errormail','packagesmail','lonstatusmail','requestsmail', |
@mailings = ('errormail','packagesmail','lonstatusmail','requestsmail', |
'updatesmail','idconflictsmail'); |
'updatesmail','idconflictsmail','hostipmail'); |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
$otheremails{$type} = ''; |
$otheremails{$type} = ''; |
} |
} |
Line 2884 sub print_contacts {
|
Line 2884 sub print_contacts {
|
$checked{'requestsmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'requestsmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'updatesmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'updatesmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'idconflictsmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'idconflictsmail'}{'adminemail'} = ' checked="checked" '; |
|
$checked{'hostipmail'}{'adminemail'} = ' checked="checked" '; |
} elsif ($position eq 'bottom') { |
} elsif ($position eq 'bottom') { |
$checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" '; |
$checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" '; |
$checked{'otherdomsmail'}{'supportemail'} = ' checked="checked" '; |
$checked{'otherdomsmail'}{'supportemail'} = ' checked="checked" '; |
Line 3492 sub print_coursedefaults {
|
Line 3493 sub print_coursedefaults {
|
coursecredits => 'Credits can be specified for courses', |
coursecredits => 'Credits can be specified for courses', |
uselcmath => 'Math preview uses LON-CAPA previewer (javascript) in place of DragMath (Java)', |
uselcmath => 'Math preview uses LON-CAPA previewer (javascript) in place of DragMath (Java)', |
usejsme => 'Molecule editor uses JSME (HTML5) in place of JME (Java)', |
usejsme => 'Molecule editor uses JSME (HTML5) in place of JME (Java)', |
|
texengine => 'Default method to display mathematics', |
postsubmit => 'Disable submit button/keypress following student submission', |
postsubmit => 'Disable submit button/keypress following student submission', |
canclone => "People who may clone a course (besides course's owner and coordinators)", |
canclone => "People who may clone a course (besides course's owner and coordinators)", |
mysqltables => 'Lifetime (s) of "Temporary" MySQL tables (student performance data) on homeserver', |
mysqltables => 'Lifetime (s) of "Temporary" MySQL tables (student performance data) on homeserver', |
Line 3509 sub print_coursedefaults {
|
Line 3511 sub print_coursedefaults {
|
'canclone' => 'none', |
'canclone' => 'none', |
); |
); |
@toggles = ('uselcmath','usejsme'); |
@toggles = ('uselcmath','usejsme'); |
|
my $deftex = $Apache::lonnet::deftex; |
|
if (ref($settings) eq 'HASH') { |
|
if ($settings->{'texengine'}) { |
|
if ($settings->{'texengine'} =~ /^(MathJax|mimetex|tth)$/) { |
|
$deftex = $settings->{'texengine'}; |
|
} |
|
} |
|
} |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
my $mathdisp = '<tr'.$css_class.'><td style="vertical-align: top">'. |
|
'<span class="LC_nobreak">'.$choices{'texengine'}. |
|
'</span></td><td class="LC_right_item">'. |
|
'<select name="texengine">'."\n"; |
|
my %texoptions = ( |
|
MathJax => 'MathJax', |
|
mimetex => &mt('Convert to Images'), |
|
tth => &mt('TeX to HTML'), |
|
); |
|
foreach my $renderer ('MathJax','mimetex','tth') { |
|
my $selected = ''; |
|
if ($renderer eq $deftex) { |
|
$selected = ' selected="selected"'; |
|
} |
|
$mathdisp .= '<option value="'.$renderer.'"'.$selected.'>'.$texoptions{$renderer}.'</option>'."\n"; |
|
} |
|
$mathdisp .= '</select></td></tr>'."\n"; |
|
$itemcount ++; |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
\%choices,$itemcount); |
\%choices,$itemcount); |
|
$datatable = $mathdisp.$datatable; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$datatable .= |
$datatable .= |
'<tr'.$css_class.'><td valign="top">'. |
'<tr'.$css_class.'><td valign="top">'. |
Line 4771 sub contact_titles {
|
Line 4801 sub contact_titles {
|
'requestsmail' => 'E-mail from course requests requiring approval', |
'requestsmail' => 'E-mail from course requests requiring approval', |
'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates', |
'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates', |
'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID', |
'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID', |
|
'hostipmail' => 'E-mail from nightly check of hostname/IP network changes', |
); |
); |
my %short_titles = &Apache::lonlocal::texthash ( |
my %short_titles = &Apache::lonlocal::texthash ( |
adminemail => 'Admin E-mail address', |
adminemail => 'Admin E-mail address', |
Line 9284 sub modify_contacts {
|
Line 9315 sub modify_contacts {
|
my (%others,%to,%bcc,%includestr,%includeloc); |
my (%others,%to,%bcc,%includestr,%includeloc); |
my @contacts = ('supportemail','adminemail'); |
my @contacts = ('supportemail','adminemail'); |
my @mailings = ('errormail','packagesmail','helpdeskmail','otherdomsmail', |
my @mailings = ('errormail','packagesmail','helpdeskmail','otherdomsmail', |
'lonstatusmail','requestsmail','updatesmail','idconflictsmail'); |
'lonstatusmail','requestsmail','updatesmail','idconflictsmail',hostipmail'); |
my @toggles = ('reporterrors','reportupdates'); |
my @toggles = ('reporterrors','reportupdates'); |
my ($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields(); |
my ($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields(); |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
Line 9400 sub modify_contacts {
|
Line 9431 sub modify_contacts {
|
$default{'lonstatusmail'} = 'adminemail'; |
$default{'lonstatusmail'} = 'adminemail'; |
$default{'requestsmail'} = 'adminemail'; |
$default{'requestsmail'} = 'adminemail'; |
$default{'updatesmail'} = 'adminemail'; |
$default{'updatesmail'} = 'adminemail'; |
|
$default{'hostipmail'} = 'adminemail'; |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
if ($to{$item} ne $default{$item}) { |
if ($to{$item} ne $default{$item}) { |
$changes{$item} = 1; |
$changes{$item} = 1; |
Line 11189 sub modify_coursecategories {
|
Line 11221 sub modify_coursecategories {
|
} |
} |
$resulttext .= '</ul></li>'; |
$resulttext .= '</ul></li>'; |
} |
} |
|
&Apache::lonnet::do_cache_new('cats',$dom,$cathash,3600); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'cats'} = 1; |
|
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
if ($changes{'unauth'} || $changes{'auth'}) { |
if ($changes{'unauth'} || $changes{'auth'}) { |
Line 11682 sub modify_coursedefaults {
|
Line 11718 sub modify_coursedefaults {
|
postsubmit => 60, |
postsubmit => 60, |
mysqltables => 172800, |
mysqltables => 172800, |
); |
); |
|
my %texoptions = ( |
|
MathJax => 'MathJax', |
|
mimetex => &mt('Convert to Images'), |
|
tth => &mt('TeX to HTML'), |
|
); |
$defaultshash{'coursedefaults'} = {}; |
$defaultshash{'coursedefaults'} = {}; |
|
|
if (ref($domconfig{'coursedefaults'}) ne 'HASH') { |
if (ref($domconfig{'coursedefaults'}) ne 'HASH') { |
Line 11729 sub modify_coursedefaults {
|
Line 11769 sub modify_coursedefaults {
|
$defaultshash{'coursedefaults'}{$setting}{$type} = $newdef; |
$defaultshash{'coursedefaults'}{$setting}{$type} = $newdef; |
} |
} |
if ($currdef ne $newdef) { |
if ($currdef ne $newdef) { |
my $staticdef; |
|
if ($item eq 'anonsurvey_threshold') { |
if ($item eq 'anonsurvey_threshold') { |
unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) { |
unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) { |
$changes{$item} = 1; |
$changes{$item} = 1; |
Line 11742 sub modify_coursedefaults {
|
Line 11781 sub modify_coursedefaults {
|
} |
} |
} |
} |
} |
} |
|
my $texengine; |
|
if ($env{'form.texengine'} =~ /^(MathJax|mimetex|tth)$/) { |
|
$texengine = $env{'form.texengine'}; |
|
my $currdef = $domconfig{'coursedefaults'}{'texengine'}; |
|
if ($currdef eq '') { |
|
unless ($texengine eq $Apache::lonnet::deftex) { |
|
$changes{'texengine'} = 1; |
|
} |
|
} elsif ($currdef ne $texengine) { |
|
$changes{'texengine'} = 1; |
|
} |
|
} |
|
if ($texengine ne '') { |
|
$defaultshash{'coursedefaults'}{'texengine'} = $texengine; |
|
} |
my $currclone = $domconfig{'coursedefaults'}{'canclone'}; |
my $currclone = $domconfig{'coursedefaults'}{'canclone'}; |
my @currclonecode; |
my @currclonecode; |
if (ref($currclone) eq 'HASH') { |
if (ref($currclone) eq 'HASH') { |
Line 11862 sub modify_coursedefaults {
|
Line 11916 sub modify_coursedefaults {
|
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
if (($changes{'uploadquota'}) || ($changes{'postsubmit'}) || |
if (($changes{'uploadquota'}) || ($changes{'postsubmit'}) || |
($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) || |
($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) || |
($changes{'canclone'}) || ($changes{'mysqltables'})) { |
($changes{'canclone'}) || ($changes{'mysqltables'}) || ($changes{'texengine'})) { |
foreach my $item ('uselcmath','usejsme') { |
foreach my $item ('uselcmath','usejsme','texengine') { |
if ($changes{$item}) { |
if ($changes{$item}) { |
$domdefaults{$item}=$defaultshash{'coursedefaults'}{$item}; |
$domdefaults{$item}=$defaultshash{'coursedefaults'}{$item}; |
} |
} |
Line 11926 sub modify_coursedefaults {
|
Line 11980 sub modify_coursedefaults {
|
} else { |
} else { |
$resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</li>'; |
$resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</li>'; |
} |
} |
|
} elsif ($item eq 'texengine') { |
|
if ($defaultshash{'coursedefaults'}{'texengine'} ne '') { |
|
$resulttext .= '<li>'.&mt('Default method to display mathematics set to: "[_1]"', |
|
$texoptions{$defaultshash{'coursedefaults'}{'texengine'}}).'</li>'; |
|
} |
} elsif ($item eq 'anonsurvey_threshold') { |
} elsif ($item eq 'anonsurvey_threshold') { |
$resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>'; |
$resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>'; |
} elsif ($item eq 'uploadquota') { |
} elsif ($item eq 'uploadquota') { |
Line 13588 sub devalidate_remote_domconfs {
|
Line 13647 sub devalidate_remote_domconfs {
|
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %thismachine; |
my %thismachine; |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
my @posscached = ('domainconfig','domdefaults','usersessions','directorysrch'); |
my @posscached = ('domainconfig','domdefaults','usersessions','directorysrch','cats'); |
if (keys(%servers)) { |
if (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
next if ($thismachine{$server}); |
next if ($thismachine{$server}); |