--- rat/lonpage.pm 2016/05/30 04:50:39 1.115
+++ 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.115 2016/05/30 04:50:39 raeburn Exp $
+# $Id: lonpage.pm,v 1.133 2020/02/18 22:28:41 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,6 +42,7 @@ use Apache::lonlocal;
use Apache::lonmenu;
use Apache::lonhomework;
use Apache::lonparmset;
+use Apache::lonenc();
use HTML::TokeParser;
use GDBM_File;
use Apache::lonsequence;
@@ -184,6 +185,8 @@ sub handler {
if (($env{'request.course.fn'}) && (!$env{'form.forceselect'})) {
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};
@@ -300,11 +303,17 @@ sub handler {
$lcm*=($#colcont+1)/euclid($lcm,($#colcont+1));
foreach (@colcont) {
my $src=$hash{'src_'.$_};
+ my $plainsrc = $src;
my ($extension)=($src=~/\.(\w+)$/);
$cellexternal{$_}=($hash{'ext_'.$_} eq 'true:');
if ($hash{'encrypted_'.$_}) {
$src=&Apache::lonenc::encrypted($src);
}
+ my ($mapid,$resid)=split(/\./,$_);
+ my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
+ unless ($env{'request.role.adv'}) {
+ $buttonshide{$symb} = &Apache::lonnet::EXT("resource.0.buttonshide",$symb);
+ }
$cellemb{$_}=
&Apache::loncommon::fileembstyle($extension);
if ($cellexternal{$_}) {
@@ -315,11 +324,8 @@ ENDEXT
}
} elsif ($cellemb{$_} eq 'ssi') {
# --------------------------------------------------------- This is an SSI cell
- my ($mapid,$resid)=split(/\./,$_);
- my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
-
- 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);
@@ -332,31 +338,36 @@ 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')) {
- $output =~ s/^([^&]+)\\begin{document}//;
- $output =~ s/\\end{document}//;
+ $output =~ s/^([^&]+)\\begin\{document}//;
+ $output =~ s/\\end\{document}//;
# $output = '\parbox{\minipagewidth}{ '.$output.' }';
#some additional cleanup necessary for LateX (due to limitations of table environment
$output =~ s/(\\vskip\s*\d+mm)\s*(\\\\)+/$1/g;
@@ -438,6 +449,8 @@ 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;
@@ -457,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 '') {
@@ -471,15 +482,15 @@ ENDEXT
$output=~
s/\<(input[^\>]+\Qonfocus=\"javascript:disableAutoComplete\E)\(\'([^\']+)\'\)(;\")/\<$1('$idprefix$2')$3/gsi;
unless ($hastimer) {
- if ($src =~ /$LONCAPA::assess_re/) {
+ if ($plainsrc =~ /$LONCAPA::assess_re/) {
%Apache::lonhomework::history =
&Apache::lonnet::restore($symb,$courseid,$domain,$name);
my $type = 'problem';
- if ($src =~ /\.task$/) {
+ if ($extension eq 'task') {
$type = 'Task';
}
my ($status,$accessmsg,$slot_name,$slot) =
- &Apache::lonhomework::check_slot_access('0',$type,$symb,$pagesymb);
+ &Apache::lonhomework::check_slot_access('0',$type,$symb);
undef(%Apache::lonhomework::history);
my $probstatus = &Apache::lonnet::EXT("resource.0.problemstatus",$symb);
if (($status eq 'CAN_ANSWER') || (($status eq 'CANNOT_ANSWER') &&
@@ -612,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 = (
@@ -630,6 +643,7 @@ ENDEXT
'// ]]>'.
"\n\n";
}
+ &Apache::lonhtmlcommon::clear_breadcrumb_tools();
if (keys(%hastimeleft)) {
my (%uniquetimes,%uniquedisplays);
foreach my $item (values(%hastimeleft)) {
@@ -676,10 +690,27 @@ ENDEXT
&add_countdown_timer($currdisp,$donebuttontime,$donebuttonextras);
}
}
+ my $pagebuttonshide;
+ if (keys(%buttonshide)) {
+ my %uniquebuttonhide;
+ foreach my $item (values(%buttonshide)) {
+ if (exists($uniquebuttonhide{$item})) {
+ $uniquebuttonhide{$item} ++;
+ } else {
+ $uniquebuttonhide{$item} = 1;
+ }
+ }
+ if (keys(%uniquebuttonhide) == 1) {
+ if (lc((keys(%uniquebuttonhide))[0]) eq 'yes') {
+ $pagebuttonshide = 'yes';
+ }
+ }
+ }
# ------------------------------------------------------------------ Start body
$r->print(&Apache::loncommon::start_page(undef,$allscript,
{'force_register' => 1,
- 'bgcolor' => '#ffffff',}));
+ 'bgcolor' => '#ffffff',
+ 'hide_buttons' => $pagebuttonshide}));
# ------------------------------------------------------------------ Start form
if ($nforms) {
my $fmtag = '';
+ my $metainfo =&get_buttons(\%hash,$rid,\%buttonshide,$hostname).' ';
unless (($target eq 'tex') || ($target eq 'tex_answer')) {
$r->print('
print(
''.
+ ''.
'
'.
&mt('Processing your submission ...').'
');
}
@@ -853,7 +886,7 @@ ENDEXT
}
sub get_buttons {
- my ($hash,$rid) = @_;
+ my ($hash,$rid,$buttonshide,$hostname) = @_;
my $metainfo = '';
my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid});
@@ -862,10 +895,13 @@ sub get_buttons {
$resid,
$hash->{'src_'.$rid});
unless ($env{'request.role.adv'}) {
- if (&Apache::lonnet::EXT('resource.0.buttonshide',$symb)) {
+ if ($buttonshide->{$symb} eq 'yes') {
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);
@@ -895,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.=
''.
@@ -903,7 +940,10 @@ sub get_buttons {
''.
- ''.
+ '';
+ }
+ if (&Apache::lonnet::allowed('mgr',$crs_sec)) {
+ $metainfo.=
''.
'&command=gradingmenu">'.
@@ -912,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.=
''.
@@ -923,23 +964,64 @@ sub get_buttons {
'';
}
}
- if (($env{'request.course.id'}) && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
+ if ($env{'request.course.id'}) {
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $file=&Apache::lonnet::declutter($hash->{'src_'.$rid});
- my ($cfile,$home,$switchserver,$forceedit,$forceview) =
- &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,$hash->{'src_'.$rid},$symb);
- if ($cfile ne '') {
- my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,
- $forceedit,1,$symb,undef,
- &escape($env{'form.title'}));
- if ($jscall) {
+ my $editbutton = '';
+ if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+ my ($cfile,$home,$switchserver,$forceedit,$forceview) =
+ &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,$hash->{'src_'.$rid},$symb);
+ if ($cfile ne '') {
+ my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,
+ $forceedit,1,$symb,undef,
+ &escape($env{'form.title'}),
+ $hostname);
+ if ($jscall) {
+ $editbutton = 1;
+ my $icon = 'pcstr.png';
+ my $label = &mt('Edit');
+ my $title = &mt('Edit this resource');
+ my $pic = '';
+ $metainfo .= ' '.$pic.'';
+ }
+ }
+ }
+ if ((!$editbutton) && ($file=~/$LONCAPA::assess_re/)) {
+ my $url = &Apache::lonnet::clutter($file);
+ my $viewsrcbutton;
+ if ((&Apache::lonnet::allowed('cre','/')) &&
+ (&Apache::lonnet::metadata($url,'sourceavail') eq 'open')) {
+ $viewsrcbutton = 1;
+ } 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;
+ }
+ }
+ }
+ if ($viewsrcbutton) {
my $icon = 'pcstr.png';
- my $label = &mt('Edit');
- my $title = &mt('Edit this resource');
+ my $label = &mt('View Source');
+ my $title = &mt('View source code');
+ my $jsrid = $rid;
+ $jsrid =~ s/\./_/g;
+ my $showurl = &escape(&Apache::lonenc::check_encrypt($url));
my $pic = '';
- $metainfo .= ' '.$pic.'';
+ $metainfo .= ' '.$pic.''."\n".
+ '\n";
}
}
}
@@ -962,6 +1044,7 @@ sub add_countdown_timer {
$type = $donebuttonextras->{'type'};
} else {
$donebuttontext = &mt('Done');
+ $type = 'map';
}
$donebutton =
&Apache::lonmenu::done_button_js($type,'','',$proctor,$donebuttontext);
@@ -982,7 +1065,6 @@ $collapse
$expand$title
END
- &Apache::lonhtmlcommon::clear_breadcrumb_tools();
&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$output);
return;
}
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.