--- loncom/interface/lonconfigsettings.pm 2024/07/14 23:48:58 1.21.4.17
+++ loncom/interface/lonconfigsettings.pm 2022/02/15 04:28:01 1.59
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: lonconfigsettings.pm,v 1.21.4.17 2024/07/14 23:48:58 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.59 2022/02/15 04:28:01 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,13 +35,14 @@ use Apache::lonnet;
use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::lonlocal;
+use Apache::lonparmset();
use Apache::courseclassifier();
-use LONCAPA qw(:DEFAULT :match);
+use LONCAPA qw(:DEFAULT :match);
sub print_header {
- my ($r,$phase,$context,$jscript,$container,$instcode,$dom) = @_;
+ my ($r,$phase,$context,$jscript,$container,$instcode,$dom,$confname,$values) = @_;
my ($pagetitle,$brcrumtitle,$action,$call_category_check,$instcode_check,
- $crstype,@actions,@code_order);
+ $linkprot_check,$crstype,@actions,@code_order);
if ($phase eq 'display') {
@actions = &Apache::loncommon::get_env_multiple('form.actions');
}
@@ -91,7 +92,7 @@ sub print_header {
var gotcode = 0;
for (var i=0; i{'linkprotection'}) eq 'HASH') {
+ if (keys(%{$values->{'linkprotection'}})) {
+ my @current = sort { $a <=> $b } keys(%{$values->{'linkprotection'}});
+ if (@current) {
+ for (my $i=0; $i<@current; $i++) {
+ my $num = $current[$i];
+ if (ref($values->{'linkprotection'}->{$num}) eq 'HASH') {
+ if ($values->{'linkprotection'}->{$num}->{'usable'}) {
+ push(@changeable,$i);
+ } else {
+ push(@settable,$i);
+ }
+ }
+ }
+ }
+ }
+ }
+ my ($numrules,$intargjs);
+$linkprot_check .= < 'checkbox'})."\n";
} elsif ($phase eq 'display') {
- $js .= &Apache::lonhtmlcommon::color_picker();
+ $js .= &Apache::lonhtmlcommon::color_picker();
$js .= &color_pick_js()."\n";
}
$js .= &Apache::loncommon::viewport_size_js().'
@@ -208,15 +288,62 @@ $jscript
$onload .= "toggleEmailOptions(document.display,'cancreate_emailoptions','$hascustom',".
"'cancreate_emaildomain','default');";
}
- }
+ }
if (grep(/^contacts$/,@actions)) {
my $customclass = 'LC_helpdesk_override';
my $optionsprefix = 'LC_options_helpdesk_';
$onload .= "toggleHelpdeskRow(document.display,'overrides','$customclass','$optionsprefix');";
}
+ if (grep(/^lti$/,@actions)) {
+ $onload .= "toggleLTI(document.display,'user','add');".
+ "toggleLTI(document.display,'crs','add');".
+ "toggleLTI(document.display,'sec','add');".
+ "toggleLTI(document.display,'lcauth','add');".
+ "toggleLTI(document.display,'lcmenu','add');".
+ "toggleLTI(document.display,'passback','add');".
+ "toggleLTI(document.display,'callback','add');";
+ if (ref($values) eq 'HASH') {
+ if (ref($values->{'lti'}) eq 'HASH') {
+ my $numlti = scalar(keys(%{$values->{'lti'}}));
+ for (my $i=0; $i<$numlti; $i++) {
+ $onload .= "toggleLTI(document.display,'user','$i');".
+ "toggleLTI(document.display,'crs','$i');".
+ "toggleLTI(document.display,'sec','$i');".
+ "toggleLTI(document.display,'lcauth','$i');".
+ "toggleLTI(document.display,'lcmenu','$i');".
+ "toggleLTI(document.display,'passback','$i');".
+ "toggleLTI(document.display,'callback','$i');";
+ }
+ }
+ }
+ my %servers = &Apache::lonnet::get_servers($dom,'library');
+ foreach my $server (keys(%servers)) {
+ $onload .= "togglePrivKey(document.display,'$server');";
+ }
+ $onload .= "toggleLTIEncKey(document.display);";
+ }
+ if (grep(/^ltitools$/,@actions)) {
+ $onload .= "toggleLTITools(document.display,'passback','add');".
+ "toggleLTITools(document.display,'roster','add');".
+ "toggleLTITools(document.display,'user','add');";
+ if (ref($values) eq 'HASH') {
+ if (ref($values->{'ltitools'}) eq 'HASH') {
+ my $numltitools = scalar(keys(%{$values->{'ltitools'}}));
+ for (my $i=0; $i<$numltitools; $i++) {
+ $onload .= "toggleLTITools(document.display,'passback','$i');".
+ "toggleLTITools(document.display,'roster','$i');".
+ "toggleLTITools(document.display,'user','$i');";
+ }
+ }
+ }
+ }
if (grep(/^wafproxy$/,@actions)) {
$onload .= "toggleWAF();checkWAF();updateWAF();";
}
+ if (grep(/^proctoring$/,@actions)) {
+ $onload .= "toggleProctoring(document.display,'proctorio');".
+ "toggleProctoring(document.display,'examity');";
+ }
if (grep(/^scantron$/,@actions)) {
$onload .= "toggleScantron(document.display);";
}
@@ -245,8 +372,34 @@ $jscript
$onload = "courseSet('','load');toggleCloners(document.display.cloners_instcode);";
}
}
- if (grep(/^grading$/,@actions)) {
- $onload .= 'toggleGrading(document.display);toggleHiddenTotalsSec(document.display);';
+ if (grep(/^linkprotection$/,@actions)) {
+ if (ref($values) eq 'HASH') {
+ if (ref($values->{'linkprotection'}) eq 'HASH') {
+ my $ltiauth;
+ if (exists($env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'})) {
+ $ltiauth = $env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'};
+ } else {
+ my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
+ $ltiauth = $domdefs{'crsltiauth'};
+ }
+ my $posslti = scalar(keys(%{$values->{'linkprotection'}}));
+ for (my $i=0; $i<=$posslti; $i++) {
+ my $num = $i;
+ if ($i == $posslti) {
+ $num = 'add';
+ }
+ if (ref($values->{'linkprotection'}->{$i}) eq 'HASH') {
+ if ($values->{'linkprotection'}->{$i}->{'usable'}) {
+ $onload .= "toggleLinkProt(document.display,'$num','secret');";
+ }
+ }
+ if ($ltiauth) {
+ $onload .= "toggleLinkProtReqUser(document.display,'requser','optional','1','block','$num');".
+ "toggleLinkProtReqUser(document.display,'mapuser','userfield','other','inline-block','$num');";
+ }
+ }
+ }
+ }
}
if ($onload) {
my %loaditems = (
@@ -265,6 +418,9 @@ $jscript
');
+ if ($container) {
+ &Apache::lonparmset::startSettingsScreen($r,$container,$crstype);
+ }
$r->print('');
+ if ($container) {
+ &Apache::lonparmset::endSettingsScreen($r);
+ }
$r->print(&Apache::loncommon::end_page());
}
return;
@@ -384,8 +543,8 @@ sub make_changes {
if ($context eq 'course') {
$footer_text = 'Back to display/edit settings';
}
- $r->print('
');
&print_footer($r,$phase,'display',$footer_text,\@actions,$container,$parm_permission);
+ $r->print('');
return \%lastact;
}
@@ -401,26 +560,29 @@ sub display_settings {
if (ref($values) eq 'HASH') {
$instcode = $values->{'internal.coursecode'};
}
- &print_header($r,$phase,$context,$jscript,$container,$instcode,$dom);
+ &print_header($r,$phase,$context,$jscript,$container,$instcode,$dom,$confname,$values);
my $divwidth = 900;
if ((ref($prefs_order) eq 'ARRAY') && (ref($prefs) eq 'HASH') && (ref($values) eq 'HASH')) {
if (@actions > 0) {
my $rowsum = 0;
- my (%output,%rowtotal,@items);
+ my (%output,%rowtotal,@items,$got_check_uncheck);
foreach my $item (@{$prefs_order}) {
if (grep(/^\Q$item\E$/,@actions)) {
push(@items,$item);
if ($context eq 'domain') {
my $settings;
- if (ref($values) eq 'HASH') {
+ if (ref($values) eq 'HASH') {
$settings = $values->{$item};
}
- if ($item eq 'usersessions') {
- $r->print(''."\n");
+ if (($item eq 'usersessions') || ($item eq 'ssl')) {
+ unless ($got_check_uncheck) {
+ $r->print(''."\n");
+ $got_check_uncheck = 1;
+ }
} elsif ($item eq 'selfcreation') {
if (ref($values) eq 'HASH') {
$settings = $values->{'usercreation'};
@@ -437,7 +599,7 @@ sub display_settings {
my $inststatus = {
inststatustypes => $usertypes,
inststatusorder => $types,
- inststatusguest => [],
+ inststatusguest => [],
};
if (ref($values->{defaults}) eq 'HASH') {
$settings = {%{$inststatus},%{$values->{'defaults'}}};
@@ -445,6 +607,16 @@ sub display_settings {
$settings = $inststatus;
}
}
+ } elsif ($item eq 'lti') {
+ if (ref($values->{'ltisec'}) eq 'HASH') {
+ if (ref($values->{'lti'}) eq 'HASH') {
+ $settings = {%{$values->{'lti'}},%{$values->{'ltisec'}}};
+ } else {
+ $settings = $values->{'ltisec'};
+ }
+ } elsif (ref($values->{'lti'}) eq 'HASH') {
+ $settings = $values->{'lti'};
+ }
}
($output{$item},$rowtotal{$item}) =
&Apache::domainprefs::print_config_box($r,$dom,$confname,
@@ -470,6 +642,9 @@ sub display_settings {
}
$r->print('');
}
+ if ($container) {
+ &Apache::lonparmset::endSettingsScreen($r);
+ }
$r->print(&Apache::loncommon::end_page());
return;
}
@@ -532,6 +707,9 @@ sub display_choices {
$r->print('');
$r->print(&print_footer($r,$phase,'display','Display',undef,$container,$parm_permission));
$r->print('');
+ if ($container) {
+ &Apache::lonparmset::endSettingsScreen($r);
+ }
$r->print(&Apache::loncommon::end_page());
return;
}