--- loncom/interface/lonconfigsettings.pm 2024/07/06 16:46:51 1.21.4.15
+++ loncom/interface/lonconfigsettings.pm 2021/07/30 13:48:20 1.49
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: lonconfigsettings.pm,v 1.21.4.15 2024/07/06 16:46:51 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.49 2021/07/30 13:48:20 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,11 +35,12 @@ 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,$values) = @_;
my ($pagetitle,$brcrumtitle,$action,$call_category_check,$instcode_check,
$crstype,@actions,@code_order);
if ($phase eq 'display') {
@@ -91,7 +92,7 @@ sub print_header {
var gotcode = 0;
for (var i=0; i '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,29 +209,59 @@ $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(/^wafproxy$/,@actions)) {
- $onload .= "toggleWAF();checkWAF();updateWAF();";
+ 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');";
+ }
+ }
+ }
}
- if (grep(/^scantron$/,@actions)) {
- $onload .= "toggleScantron(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(/^autoupdate$/,@actions)) {
- $onload .= "toggleLastActiveDays(document.display);";
+ if (grep(/^wafproxy$/,@actions)) {
+ $onload .= "toggleWAF();checkWAF();updateWAF();";
}
- if (grep(/^autoenroll$/,@actions)) {
- $onload .= "toggleFailsafe(document.display);";
+ if (grep(/^proctoring$/,@actions)) {
+ $onload .= "toggleProctoring(document.display,'proctorio');".
+ "toggleProctoring(document.display,'examity');";
}
- if (grep(/^login$/,@actions)) {
- my %domservers = &Apache::lonnet::get_servers($dom);
- foreach my $server (sort(keys(%domservers))) {
- $onload .= "toggleSamlOptions(document.display,'$server');";
- }
+ if (grep(/^scantron$/,@actions)) {
+ $onload .= "toggleScantron('document.display');";
}
if ($onload) {
my %loaditems = (
@@ -239,21 +270,13 @@ $jscript
$additem = {'add_entries' => \%loaditems,};
}
} elsif ($context eq 'course') {
- my $onload;
if (grep(/^courseinfo$/,@actions)) {
- if (@code_order) {
- $onload = "courseSet('','load');toggleCloners(document.display.cloners_instcode);";
+ if (@code_order) {
+ $additem = {
+ add_entries => {'onload' => "courseSet('','load');toggleCloners(document.display.cloners_instcode);"},
+ };
}
}
- if (grep(/^grading$/,@actions)) {
- $onload .= 'toggleGrading(document.display);toggleHiddenTotalsSec(document.display);';
- }
- if ($onload) {
- my %loaditems = (
- 'onload' => $onload,
- );
- $additem = {'add_entries' => \%loaditems,};
- }
}
}
$r->print(&Apache::loncommon::start_page($pagetitle,$js,$additem));
@@ -265,6 +288,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;
@@ -326,7 +355,7 @@ sub make_changes {
{href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Updated"});
&print_header($r,$phase,$context,undef,$container);
- my ($crstype,%lastact,$errors);
+ my ($crstype,%lastact);
if ($context eq 'course') {
$crstype = &Apache::loncommon::course_type();
}
@@ -340,10 +369,9 @@ sub make_changes {
$confname,$item,$roles,$values,\%lastact));
} else {
$changes{$item} = {};
- $errors =
- &Apache::courseprefs::process_changes($dom,$item,$values,
- $prefs->{$item},$changes{$item},
- $allitems,\%disallowed,$crstype);
+ &Apache::courseprefs::process_changes($dom,$item,$values,
+ $prefs->{$item},$changes{$item},
+ $allitems,\%disallowed,$crstype);
if (keys(%{$changes{$item}}) > 0) {
$numchanged ++;
}
@@ -375,9 +403,6 @@ sub make_changes {
}
$r->print('
');
}
- if ($errors) {
- $r->print(''.$errors.'
');
- }
}
$r->print('');
my $footer_text = 'Back to configuration display';
@@ -401,26 +426,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,$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 +465,7 @@ sub display_settings {
my $inststatus = {
inststatustypes => $usertypes,
inststatusorder => $types,
- inststatusguest => [],
+ inststatusguest => [],
};
if (ref($values->{defaults}) eq 'HASH') {
$settings = {%{$inststatus},%{$values->{'defaults'}}};
@@ -451,7 +479,7 @@ sub display_settings {
$phase,$item,$prefs->{$item},$settings);
} else {
($output{$item},$rowtotal{$item}) =
- &Apache::courseprefs::print_config_box($r,$dom,$confname,$phase,
+ &Apache::courseprefs::print_config_box($r,$dom,$phase,
$item,$prefs->{$item},$values,$allitems,$crstype,$parm_permission);
}
$rowsum += $rowtotal{$item};
@@ -470,6 +498,9 @@ sub display_settings {
}
$r->print('');
}
+ if ($container) {
+ &Apache::lonparmset::endSettingsScreen($r);
+ }
$r->print(&Apache::loncommon::end_page());
return;
}
@@ -532,6 +563,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;
}