--- rat/lonpage.pm 2019/08/11 14:16:59 1.128 +++ rat/lonpage.pm 2020/02/17 23:04:24 1.131 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.128 2019/08/11 14:16:59 raeburn Exp $ +# $Id: lonpage.pm,v 1.131 2020/02/17 23:04:24 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -360,7 +360,9 @@ ENDEXT if ($env{'form.all_submit_pressed'}) { $posthash{'all_submit'}='yes'; } - } + } elsif ($env{'form.'.$prefix.'markaccess'} eq 'yes') { + $posthash{'markaccess'} = $env{'form.'.$prefix.'markaccess'}; + } my $output=Apache::lonnet::ssi($src,%posthash); $output=~s|//(\s*)?\s||gs; if (($target eq 'tex') || ($target eq 'tex_answer')) { @@ -896,6 +898,10 @@ sub get_buttons { return; } } + my $crs_sec = $env{'request.course.id'} . (($env{'request.course.sec'} ne '') + ? "/$env{'request.course.sec'}" + : ''); + if ($hash->{'encrypted_'.$rid}) { $symb=&Apache::lonenc::encrypted($symb); $esrc=&Apache::lonenc::encrypted($esrc); @@ -983,12 +989,15 @@ sub get_buttons { if ((&Apache::lonnet::allowed('cre','/')) && (&Apache::lonnet::metadata($url,'sourceavail') eq 'open')) { $viewsrcbutton = 1; - } elsif (&Apache::lonnet::allowed('vxc',$env{'request.course.id'})) { + } elsif (&Apache::lonnet::allowed('vxc',$crs_sec)) { if ($url =~ m{^\Q/res/$cdom/\E($LONCAPA::match_username)/}) { my $auname = $1; if (($env{'request.course.adhocsrcaccess'} ne '') && (grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) { $viewsrcbutton = 1; + } elsif ((&Apache::lonnet::metadata($url,'sourceavail') eq 'open') && + (&Apache::lonnet::allowed('bre',$crs_sec))) { + $viewsrcbutton = 1; } } }