--- rat/lonpage.pm 2020/06/03 11:24:55 1.120.2.3 +++ rat/lonpage.pm 2017/02/22 22:10:20 1.122 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.120.2.3 2020/06/03 11:24:55 raeburn Exp $ +# $Id: lonpage.pm,v 1.122 2017/02/22 22:10:20 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}; @@ -322,8 +323,8 @@ ENDEXT } } elsif ($cellemb{$_} eq 'ssi') { # --------------------------------------------------------- This is an SSI cell - my $prefix='p_'.$_.'_'; - my $idprefix='p_'.join('_',($mapid,$resid,'')); + my $prefix=$_.'_'; + my $idprefix= join('_',($mapid,$resid,'')); my %posthash=('request.prefix' => $prefix, 'LONCAPA_INTERNAL_no_discussion' => 'true', 'symb' => $symb); @@ -336,34 +337,26 @@ ENDEXT $posthash{'rndseed'}=$env{'form.rndseed'}; $posthash{'answer_output_mode'} = $env{'form.answer_output_mode'}; } - my $submitted=$env{'form.all_submit_pressed'}; + my $submitted=exists($env{'form.all_submit'}); if (!$submitted) { foreach my $key (keys(%env)) { - if ($key=~/^\Qform.$prefix\Esubmit_(.+)_pressed$/) { - if ($env{$key}) { - $submitted=1; - last; - } + if ($key=~/^form.\Q$prefix\Esubmit_/) { + $submitted=1;last; } - } + } } if ($submitted) { foreach my $key (keys(%env)) { - if ($key=~/^\Qform.$prefix\E/) { + if ($key=~/^form.\Q$prefix\E/) { my $name=$key; - $name=~s/^\Qform.$prefix\E//; + $name=~s/^form.\Q$prefix\E//; $posthash{$name}=$env{$key}; - } + } } - if ($env{'form.all_submit_pressed'}) { + if (exists($env{'form.all_submit'})) { $posthash{'all_submit'}='yes'; } - } 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')) { @@ -450,8 +443,6 @@ ENDEXT s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi; $output=~ s/\<((?:input|select|button|textarea)[^\>]+)id\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 id="$idprefix$2" $3\>/gsi; - $output=~ - s/(\Qthis.form.elements['\E)(HW(?:VAL|CHK)_[^']+\'\]\.(?:value=\'|checked))/$1$prefix$2/gsi; if ($hastimer) { $output=~ s/\<(input[^\>]+name=\Q"$prefix\Eaccessbutton"[^\>]+)(?:\Qdocument.markaccess.submit();\E)([^\>]*)\>/\<$1pageTimer(this.form,'$prefix')$2\>/gsi; @@ -471,6 +462,8 @@ 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 '') { @@ -754,7 +747,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( ''. - ''. ''); } @@ -884,7 +875,7 @@ ENDEXT } sub get_buttons { - my ($hash,$rid,$buttonshide) = @_; + my ($hash,$rid,$buttonshide,$hostname) = @_; my $metainfo = ''; my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid}); @@ -963,7 +954,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) { my $icon = 'pcstr.png'; my $label = &mt('Edit');