--- loncom/interface/lonconfigsettings.pm 2022/02/07 12:00:27 1.21.4.13.2.2
+++ loncom/interface/lonconfigsettings.pm 2016/10/11 22:58:55 1.33
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: lonconfigsettings.pm,v 1.21.4.13.2.2 2022/02/07 12:00:27 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.33 2016/10/11 22:58:55 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,$values) = @_;
+ my ($r,$phase,$context,$jscript,$container) = @_;
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().'
@@ -176,121 +177,22 @@ $jscript
$additem = {'add_entries' => \%loaditems,};
} elsif ($phase eq 'display') {
if ($context eq 'domain') {
- my $onload;
if (grep(/^coursedefaults$/,@actions)) {
- $onload = "toggleDisplay(document.display,'cloneinstcode');".
- "toggleDisplay(document.display,'credits');".
- "toggleDisplay(document.display,'studentsubmission');";
- }
- if (grep(/^selfcreation$/,@actions)) {
- my $prefix = 'cancreate_emailverified';
- my $customclass = 'LC_selfcreate_email';
- my $classprefix = 'LC_canmodify_emailusername_';
- my $optionsprefix = 'LC_options_emailusername_';
- $onload .= "toggleRows(document.display,'cancreate_email','selfassign','$customclass','$classprefix','$optionsprefix');";
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- my $hascustom;
- my ($emailrules,$emailruleorder) = &Apache::lonnet::inst_userrules($dom,'email');
- if (ref($emailrules) eq 'HASH') {
- if (keys(%{$emailrules}) > 0) {
- $hascustom = 'cancreate_emailrule';
- }
- }
- my @posstypes;
- if (ref($types) eq 'ARRAY') {
- @posstypes = @{$types};
- push(@posstypes,'default');
- foreach my $type (@posstypes) {
- $onload .= "toggleEmailOptions(document.display,'cancreate_emailoptions','$hascustom',".
- "'cancreate_emaildomain','$type');";
- }
- } else {
- $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(/^ltitools$/,@actions)) {
- $onload .= "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,'user','$i');";
- }
- }
- }
- }
- if (grep(/^wafproxy$/,@actions)) {
- $onload .= "toggleWAF();checkWAF();updateWAF();";
- }
- if (grep(/^scantron$/,@actions)) {
- $onload .= "toggleScantron(document.display);";
- }
- if (grep(/^autoupdate$/,@actions)) {
- $onload .= "toggleLastActiveDays(document.display);";
- }
- if (grep(/^autoenroll$/,@actions)) {
- $onload .= "toggleFailsafe(document.display);";
- }
- if (grep(/^login$/,@actions)) {
- my %domservers = &Apache::lonnet::get_servers($dom);
- foreach my $server (sort(keys(%domservers))) {
- $onload .= "toggleSamlOptions(document.display,'$server');";
- }
- }
- if ($onload) {
my %loaditems = (
- 'onload' => $onload,
+ ' onload' => "toggleDisplay(document.display,'cloneinstcode');".
+ "toggleDisplay(document.display,'credits');".
+ "toggleDisplay(document.display,'studentsubmission');",
);
$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(/^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 .= "toggleLTI(document.display,'$num','secret');";
- }
- }
- if ($ltiauth) {
- $onload .= "toggleLTIReqUser(document.display,'requser','optional','1','block','$num');".
- "toggleLTIReqUser(document.display,'mapuser','userfield','other','inline-block','$num');";
- }
- }
- }
- }
- }
- if ($onload) {
- my %loaditems = (
- 'onload' => $onload,
- );
- $additem = {'add_entries' => \%loaditems,};
- }
}
}
$r->print(&Apache::loncommon::start_page($pagetitle,$js,$additem));
@@ -302,6 +204,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;
@@ -363,7 +271,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();
}
@@ -377,10 +285,9 @@ sub make_changes {
$confname,$item,$roles,$values,\%lastact));
} else {
$changes{$item} = {};
- $errors =
- &Apache::courseprefs::process_changes($dom,$confname,$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 ++;
}
@@ -412,9 +319,6 @@ sub make_changes {
}
$r->print('
');
}
- if ($errors) {
- $r->print(''.$errors.'
');
- }
}
$r->print('');
my $footer_text = 'Back to configuration display';
@@ -438,26 +342,29 @@ sub display_settings {
if (ref($values) eq 'HASH') {
$instcode = $values->{'internal.coursecode'};
}
- &print_header($r,$phase,$context,$jscript,$container,$instcode,$dom,$values);
+ &print_header($r,$phase,$context,$jscript,$container,$instcode);
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'};
@@ -474,7 +381,7 @@ sub display_settings {
my $inststatus = {
inststatustypes => $usertypes,
inststatusorder => $types,
- inststatusguest => [],
+ inststatusguest => [],
};
if (ref($values->{defaults}) eq 'HASH') {
$settings = {%{$inststatus},%{$values->{'defaults'}}};
@@ -488,7 +395,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};
@@ -507,6 +414,9 @@ sub display_settings {
}
$r->print('');
}
+ if ($container) {
+ &Apache::lonparmset::endSettingsScreen($r);
+ }
$r->print(&Apache::loncommon::end_page());
return;
}
@@ -565,10 +475,13 @@ sub display_choices {
$thirddiv = 1;
}
}
+ $r->print('
');
}
- $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;
}