--- loncom/interface/lonconfigsettings.pm 2015/06/09 21:22:56 1.31 +++ 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.31 2015/06/09 21:22:56 damieng Exp $ +# $Id: lonconfigsettings.pm,v 1.33 2016/10/11 22:58:55 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -213,7 +213,7 @@ $jscript } sub print_footer { - my ($r,$phase,$newphase,$button_text,$actions,$container) = @_; + my ($r,$phase,$newphase,$button_text,$actions,$container,$parm_permission) = @_; $button_text = &mt($button_text); $r->print(''); if (defined($env{'form.origin'})) { @@ -238,8 +238,16 @@ sub print_footer { } else { $onclick = '"javascript:changePage(document.'.$phase.','."'$newphase'".')"'; } - $r->print('
'); + my $showbutton = 1; + if (ref($parm_permission) eq 'HASH') { + unless (($parm_permission->{'process'}) || ($newphase eq 'display')) { + $showbutton = 0; + } + } + if ($showbutton) { + $r->print(''); + } } if ($phase eq 'process') { $r->print(''); @@ -252,7 +260,8 @@ sub print_footer { } sub make_changes { - my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$roles,$allitems,$container) = @_; + my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$roles, + $allitems,$container,$parm_permission) = @_; my %brcrumtext = &get_crumb_text(); my @actions = &Apache::loncommon::get_env_multiple('form.actions'); my ($numchanged,%changes,%disallowed); @@ -316,14 +325,14 @@ sub make_changes { if ($context eq 'course') { $footer_text = 'Back to display/edit settings'; } - &print_footer($r,$phase,'display',$footer_text,\@actions,$container); + &print_footer($r,$phase,'display',$footer_text,\@actions,$container,$parm_permission); $r->print(''); return \%lastact; } sub display_settings { my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$jscript, - $allitems,$crstype,$container) = @_; + $allitems,$crstype,$container,$parm_permission) = @_; my %brcrumtext = &get_crumb_text(); my @actions = &Apache::loncommon::get_env_multiple('form.actions'); &Apache::lonhtmlcommon::add_breadcrumb @@ -338,7 +347,7 @@ sub display_settings { 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); @@ -347,12 +356,15 @@ sub display_settings { 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'}; @@ -384,7 +396,7 @@ sub display_settings { } else { ($output{$item},$rowtotal{$item}) = &Apache::courseprefs::print_config_box($r,$dom,$phase, - $item,$prefs->{$item},$values,$allitems,$crstype); + $item,$prefs->{$item},$values,$allitems,$crstype,$parm_permission); } $rowsum += $rowtotal{$item}; } @@ -394,7 +406,7 @@ sub display_settings { $r->print($output{$items[$i]}); } $r->print(''); - $r->print(&print_footer($r,$phase,'process','Save Changes',\@actions,$container)); + $r->print(&print_footer($r,$phase,'process','Save Changes',\@actions,$container,$parm_permission)); } else { $r->print(''. ''.&mt('No settings chosen'). @@ -410,7 +422,7 @@ sub display_settings { } sub display_choices { - my ($r,$phase,$context,$prefs_order,$prefs,$container) = @_; + my ($r,$phase,$context,$prefs_order,$prefs,$container,$parm_permission) = @_; if ($phase eq '') { $phase = 'pickactions'; } @@ -421,7 +433,13 @@ sub display_choices { &Apache::loncommon::check_uncheck_jscript()."\n". '// ]]>'."\n". ''."\n"); - $r->print('