--- rat/lonpage.pm 2018/09/04 15:16:12 1.111.2.6
+++ rat/lonpage.pm 2019/08/12 15:36:40 1.111.2.8
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.111.2.6 2018/09/04 15:16:12 raeburn Exp $
+# $Id: lonpage.pm,v 1.111.2.8 2019/08/12 15:36:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -185,6 +185,7 @@ sub handler {
my $fn=$env{'request.course.fn'};
if (-e "$fn.db") {
my %buttonshide;
+ my $hostname = $r->hostname();
if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) {
# ------------------------------------------------------------------- Hash tied
my $firstres=$hash{'map_start_'.$requrl};
@@ -297,23 +298,26 @@ 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';
}
}
@@ -427,8 +431,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 '') {
@@ -541,7 +543,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 = (
@@ -652,7 +656,7 @@ ENDEXT
my $avespan=$lcm/($#colcont+1);
for ($j=0;$j<=$#colcont;$j++) {
my $rid=$colcont[$j];
- my $metainfo =&get_buttons(\%hash,$rid,\%buttonshide).' ';
+ my $metainfo =&get_buttons(\%hash,$rid,\%buttonshide,$hostname).' ';
unless (($target eq 'tex') || ($target eq 'tex_answer')) {
$r->print(' | print(
''.
+ ''.
' '.
&mt('Processing your submission ...').' ');
}
@@ -780,7 +786,7 @@ ENDEXT
}
sub get_buttons {
- my ($hash,$rid,$buttonshide) = @_;
+ my ($hash,$rid,$buttonshide,$hostname) = @_;
my $metainfo = '';
my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid});
@@ -861,7 +867,8 @@ sub get_buttons {
if ($cfile ne '') {
my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,
$forceedit,1,$symb,undef,
- &escape($env{'form.title'}));
+ &escape($env{'form.title'},
+ $hostname));
if ($jscall) {
$editbutton = 1;
my $icon = 'pcstr.png';
|