--- rat/lonpage.pm 2020/01/22 15:02:22 1.111.2.10.2.1 +++ 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.111.2.10.2.1 2020/01/22 15:02:22 raeburn Exp $ +# $Id: lonpage.pm,v 1.131 2020/02/17 23:04:24 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -199,7 +199,7 @@ sub handler { my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser(); unless ($pagesymb) { $pagesymb=&Apache::lonnet::symbread($requrl); - } + } if ($pagesymb && ($courseid ne '') && ($domain ne '') && ($name ne '')) { my %times=&Apache::lonnet::get('firstaccesstimes', [$courseid."\0".$pagesymb], @@ -325,7 +325,7 @@ ENDEXT } elsif ($cellemb{$_} eq 'ssi') { # --------------------------------------------------------- This is an SSI cell my $prefix='p_'.$_.'_'; - my $idprefix='p_'.join('_',($mapid,$resid,'')); + my $idprefix= 'p_'.join('_',($mapid,$resid,'')); my %posthash=('request.prefix' => $prefix, 'LONCAPA_INTERNAL_no_discussion' => 'true', 'symb' => $symb); @@ -363,9 +363,6 @@ ENDEXT } elsif ($env{'form.'.$prefix.'markaccess'} eq 'yes') { $posthash{'markaccess'} = $env{'form.'.$prefix.'markaccess'}; } - if ($env{'environment.remote'} eq 'on') { - $posthash{'inhibitmenu'} = 'yes'; - } my $output=Apache::lonnet::ssi($src,%posthash); $output=~s|//(\s*)?\s||gs; if (($target eq 'tex') || ($target eq 'tex_answer')) { @@ -603,7 +600,7 @@ ENDEXT &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; $r->print(&Apache::loncommon::start_page(undef,undef, - {'force_register' => 1})); + {'force_register' => 1,})); $r->print(&mt('This page is either empty or it only contains resources that are currently hidden').'. '); $r->print('

'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course'). &Apache::loncommon::end_page()); @@ -901,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); @@ -988,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; } } } @@ -1037,7 +1041,7 @@ sub add_countdown_timer { $donebuttontext = &mt('Done'); $type = 'map'; } - $donebutton = + $donebutton = &Apache::lonmenu::done_button_js($type,'','',$proctor,$donebuttontext); } unless ($env{'environment.icons'} eq 'iconsonly') {