--- loncom/interface/lonconfigsettings.pm 2022/03/12 23:11:47 1.21.4.13.2.5 +++ loncom/interface/lonconfigsettings.pm 2016/07/25 19:50:30 1.32 @@ -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.5 2022/03/12 23:11:47 raeburn Exp $ +# $Id: lonconfigsettings.pm,v 1.32 2016/07/25 19:50:30 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,$confname,$values) = @_; + my ($r,$phase,$context,$jscript,$container) = @_; my ($pagetitle,$brcrumtitle,$action,$call_category_check,$instcode_check, - $linkprot_check,$crstype,@actions,@code_order); + $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{'linkprot'}) eq 'HASH') { - if (keys(%{$values->{'linkprot'}})) { - my @current = sort { $a <=> $b } keys(%{$values->{'linkprot'}}); - if (@current) { - for (my $i=0; $i<@current; $i++) { - my $num = $current[$i]; - if (ref($values->{'linkprot'}->{$num}) eq 'HASH') { - if ($values->{'linkprot'}->{$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().' @@ -283,137 +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(/^lti$/,@actions)) { - 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,'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 (grep(/^linkprot$/,@actions)) { - if (ref($values) eq 'HASH') { - if (ref($values->{'linkprot'}) 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 $ishome; - my $chome = $env{'course.'.$env{'request.course.id'}.'.home'}; - unless (($chome eq 'no_host') || ($chome eq '')) { - my @ids=&Apache::lonnet::current_machine_ids(); - foreach my $id (@ids) { if ($id eq $chome) { $ishome=1; } } - } - my $posslti = scalar(keys(%{$values->{'linkprot'}})); - for (my $i=0; $i<=$posslti; $i++) { - my $num = $i; - if ($i == $posslti) { - $num = 'add'; - } - if (ref($values->{'linkprot'}->{$i}) eq 'HASH') { - if ($values->{'linkprot'}->{$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 ($ishome) { - $onload .= "uncheckLinkProtMakeVis('visible','$num');"; - } - } - } + if (@code_order) { + $additem = { + add_entries => {'onload' => "courseSet('','load');toggleCloners(document.display.cloners_instcode);"}, + }; } } - if ($onload) { - my %loaditems = ( - 'onload' => $onload, - ); - $additem = {'add_entries' => \%loaditems,}; - } } } $r->print(&Apache::loncommon::start_page($pagetitle,$js,$additem)); @@ -425,13 +204,16 @@ $jscript '); + if ($container) { + &Apache::lonparmset::startSettingsScreen($r,$container,$crstype); + } $r->print('
'); return; } sub print_footer { - my ($r,$phase,$newphase,$button_text,$actions,$container,$parm_permission) = @_; + my ($r,$phase,$newphase,$button_text,$actions,$container) = @_; $button_text = &mt($button_text); $r->print(''); if (defined($env{'form.origin'})) { @@ -456,27 +238,21 @@ sub print_footer { } else { $onclick = '"javascript:changePage(document.'.$phase.','."'$newphase'".')"'; } - my $showbutton = 1; - if (ref($parm_permission) eq 'HASH') { - unless (($parm_permission->{'process'}) || ($newphase eq 'display')) { - $showbutton = 0; - } - } - if ($showbutton) { - $r->print('

'); - } + $r->print('

'); } if ($phase eq 'process') { $r->print('
'); + if ($container) { + &Apache::lonparmset::endSettingsScreen($r); + } $r->print(&Apache::loncommon::end_page()); } return; } sub make_changes { - my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$roles, - $allitems,$container,$parm_permission) = @_; + my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$roles,$allitems,$container) = @_; my %brcrumtext = &get_crumb_text(); my @actions = &Apache::loncommon::get_env_multiple('form.actions'); my ($numchanged,%changes,%disallowed); @@ -486,7 +262,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(); } @@ -500,10 +276,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 ++; } @@ -535,23 +310,20 @@ sub make_changes { } $r->print('

'); } - if ($errors) { - $r->print('

'.$errors.'

'); - } } $r->print('

'); my $footer_text = 'Back to configuration display'; if ($context eq 'course') { $footer_text = 'Back to display/edit settings'; } - &print_footer($r,$phase,'display',$footer_text,\@actions,$container,$parm_permission); + &print_footer($r,$phase,'display',$footer_text,\@actions,$container); $r->print('

'); return \%lastact; } sub display_settings { my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$jscript, - $allitems,$crstype,$container,$parm_permission) = @_; + $allitems,$crstype,$container) = @_; my %brcrumtext = &get_crumb_text(); my @actions = &Apache::loncommon::get_env_multiple('form.actions'); &Apache::lonhtmlcommon::add_breadcrumb @@ -561,26 +333,29 @@ sub display_settings { if (ref($values) eq 'HASH') { $instcode = $values->{'internal.coursecode'}; } - &print_header($r,$phase,$context,$jscript,$container,$instcode,$dom,$confname,$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'}; @@ -597,7 +372,7 @@ sub display_settings { my $inststatus = { inststatustypes => $usertypes, inststatusorder => $types, - inststatusguest => [], + inststatusguest => [], }; if (ref($values->{defaults}) eq 'HASH') { $settings = {%{$inststatus},%{$values->{'defaults'}}}; @@ -605,18 +380,14 @@ sub display_settings { $settings = $inststatus; } } - } elsif ($item eq 'lti') { - if (ref($values->{'ltisec'}) eq 'HASH') { - $settings = $values->{'ltisec'}; - } } ($output{$item},$rowtotal{$item}) = &Apache::domainprefs::print_config_box($r,$dom,$confname, $phase,$item,$prefs->{$item},$settings); } else { ($output{$item},$rowtotal{$item}) = - &Apache::courseprefs::print_config_box($r,$dom,$confname,$phase, - $item,$prefs->{$item},$values,$allitems,$crstype,$parm_permission); + &Apache::courseprefs::print_config_box($r,$dom,$phase, + $item,$prefs->{$item},$values,$allitems,$crstype); } $rowsum += $rowtotal{$item}; } @@ -626,7 +397,7 @@ sub display_settings { $r->print($output{$items[$i]}); } $r->print(''); - $r->print(&print_footer($r,$phase,'process','Save Changes',\@actions,$container,$parm_permission)); + $r->print(&print_footer($r,$phase,'process','Save Changes',\@actions,$container)); } else { $r->print(''. ''.&mt('No settings chosen'). @@ -634,12 +405,15 @@ sub display_settings { } $r->print(''); } + if ($container) { + &Apache::lonparmset::endSettingsScreen($r); + } $r->print(&Apache::loncommon::end_page()); return; } sub display_choices { - my ($r,$phase,$context,$prefs_order,$prefs,$container,$parm_permission) = @_; + my ($r,$phase,$context,$prefs_order,$prefs,$container) = @_; if ($phase eq '') { $phase = 'pickactions'; } @@ -650,13 +424,7 @@ sub display_choices { &Apache::loncommon::check_uncheck_jscript()."\n". '// ]]>'."\n". ''."\n"); - my $heading = &mt('Settings to display/modify'); - if (ref($parm_permission) eq 'HASH') { - unless ($parm_permission->{'process'}) { - $heading = &mt('Settings to display'); - } - } - $r->print('

'.$heading.'

'. + $r->print('

'.&mt('Settings to display/modify').'

'. '
'.(' 'x2). @@ -692,10 +460,13 @@ sub display_choices { $thirddiv = 1; } } + $r->print('

'); } - $r->print('
'); - $r->print(&print_footer($r,$phase,'display','Display',undef,$container,$parm_permission)); + $r->print(&print_footer($r,$phase,'display','Display',undef,$container)); $r->print(''); + if ($container) { + &Apache::lonparmset::endSettingsScreen($r); + } $r->print(&Apache::loncommon::end_page()); return; }