--- rat/lonpage.pm 2017/09/11 12:48:08 1.120.4.2 +++ 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.4.2 2017/09/11 12:48:08 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}; @@ -356,9 +357,6 @@ ENDEXT $posthash{'all_submit'}='yes'; } } - 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')) { @@ -445,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; @@ -751,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('{'src_'.$rid}); @@ -958,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');