--- rat/lonpage.pm 2017/09/29 19:18:18 1.125
+++ rat/lonpage.pm 2020/02/18 22:28:41 1.133
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.125 2017/09/29 19:18:18 raeburn Exp $
+# $Id: lonpage.pm,v 1.133 2020/02/18 22:28:41 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -324,8 +324,8 @@ ENDEXT
}
} elsif ($cellemb{$_} eq 'ssi') {
# --------------------------------------------------------- This is an SSI cell
- my $prefix=$_.'_';
- my $idprefix= join('_',($mapid,$resid,''));
+ my $prefix='p_'.$_.'_';
+ my $idprefix= 'p_'.join('_',($mapid,$resid,''));
my %posthash=('request.prefix' => $prefix,
'LONCAPA_INTERNAL_no_discussion' => 'true',
'symb' => $symb);
@@ -338,26 +338,31 @@ ENDEXT
$posthash{'rndseed'}=$env{'form.rndseed'};
$posthash{'answer_output_mode'} = $env{'form.answer_output_mode'};
}
- my $submitted=exists($env{'form.all_submit'});
+ my $submitted=$env{'form.all_submit_pressed'};
if (!$submitted) {
foreach my $key (keys(%env)) {
- if ($key=~/^form.\Q$prefix\Esubmit_/) {
- $submitted=1;last;
+ if ($key=~/^\Qform.$prefix\Esubmit_(.+)_pressed$/) {
+ if ($env{$key}) {
+ $submitted=1;
+ last;
+ }
}
- }
+ }
}
if ($submitted) {
foreach my $key (keys(%env)) {
- if ($key=~/^form.\Q$prefix\E/) {
+ if ($key=~/^\Qform.$prefix\E/) {
my $name=$key;
- $name=~s/^form.\Q$prefix\E//;
+ $name=~s/^\Qform.$prefix\E//;
$posthash{$name}=$env{$key};
- }
+ }
}
- if (exists($env{'form.all_submit'})) {
+ 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')) {
@@ -465,8 +470,6 @@ ENDEXT
$output=~
s/(\Q
)/$1$idprefix$2$3$4/g;
if ($nuploads) {
- $output=~
- s/\<(input[^\>]+name=\"\Q$prefix\EHWFILE[^\>]+)\s*id\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\)]*)\>/\<$1 id="$prefix$2" $3\>/gsi;
($turninpaths{$prefix},$multiresps{$prefix}) =
&Apache::loncommon::get_turnedin_filepath($symb,$env{'user.name'},$env{'user.domain'});
if ($turninparent eq '') {
@@ -620,7 +623,9 @@ ENDEXT
"\n\n";
}
if (($nforms) && ($nuploads)) {
- $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps);
+ $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps).
+ '';
}
if (($nforms) && (&Apache::lonhtmlcommon::htmlareabrowser())) {
my %textarea_args = (
@@ -638,6 +643,7 @@ ENDEXT
'// ]]>'.
"\n\n";
}
+ &Apache::lonhtmlcommon::clear_breadcrumb_tools();
if (keys(%hastimeleft)) {
my (%uniquetimes,%uniquedisplays);
foreach my $item (values(%hastimeleft)) {
@@ -840,6 +846,8 @@ ENDEXT
$r->print(
''.
+ ''.
' '.
&mt('Processing your submission ...').' ');
}
@@ -891,6 +899,9 @@ 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);
@@ -920,7 +931,8 @@ sub get_buttons {
if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) &&
($hash->{'src_'.$rid} !~ m-^/uploaded/-)) {
- if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
+ if ((&Apache::lonnet::allowed('mgr',$crs_sec)) ||
+ (&Apache::lonnet::allowed('vgr',$crs_sec))) {
$metainfo.=
''.
@@ -928,7 +940,10 @@ sub get_buttons {
' '.
- ''.
+ '';
+ }
+ if (&Apache::lonnet::allowed('mgr',$crs_sec)) {
+ $metainfo.=
''.
'&command=gradingmenu">'.
@@ -937,7 +952,8 @@ sub get_buttons {
' title="'.&mt('Content Grades').'" />'.
'';
}
- if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
+ if ((&Apache::lonnet::allowed('opa',$crs_sec)) ||
+ (&Apache::lonnet::allowed('vpa',$crs_sec))) {
$metainfo.=
''.
@@ -978,12 +994,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;
}
}
}
@@ -1046,7 +1065,6 @@ $collapse
$expand
END
- &Apache::lonhtmlcommon::clear_breadcrumb_tools();
&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$output);
return;
}
|