--- loncom/homework/essayresponse.pm 2010/08/29 19:36:37 1.112 +++ loncom/homework/essayresponse.pm 2019/02/19 14:24:38 1.118.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # essay (ungraded) style responses # -# $Id: essayresponse.pm,v 1.112 2010/08/29 19:36:37 raeburn Exp $ +# $Id: essayresponse.pm,v 1.118.2.1 2019/02/19 14:24:38 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -58,22 +58,18 @@ sub start_essayresponse { if (!defined($maxfilesize)) { $maxfilesize = 10.0; #FIXME This should become a domain configuration } + my $hiddendraft; if (($Apache::lonhomework::type eq 'survey') || ($Apache::lonhomework::type eq 'surveycred') || ($Apache::lonhomework::type eq 'anonsurvey') || ($Apache::lonhomework::type eq 'anonsurveycred')) { - $result.= ''; - } - my $status_text = &mt('Submission type'); - if ($Apache::lonhomework::history{"resource.$part.award"} eq 'DRAFT') { - $status_text .= '
'.&mt('(Currently -- draft)'); - } - $result.= '

'.&Apache::lonhtmlcommon::start_pick_box(). - &Apache::lonhtmlcommon::row_title($status_text); - if (($Apache::lonhomework::type ne 'survey') && - ($Apache::lonhomework::type ne 'surveycred') && - ($Apache::lonhomework::type ne 'anonsurvey') && - ($Apache::lonhomework::type ne 'anonsurveycred')) { + $hiddendraft = ''; + } else { + my $status_text = &mt('Submission type'); + if ($Apache::lonhomework::history{"resource.$part.award"} eq 'DRAFT') { + $status_text .= '
'.&mt('(Currently -- draft)'); + } + $result = &Apache::lonhtmlcommon::row_title($status_text); my $closure; unless ($ncol || $uploadedfiletypes) { $closure = 1; @@ -95,7 +91,7 @@ sub start_essayresponse { '

'; + if ($result) { + $result = + '
'.$hiddendraft. + &Apache::lonhtmlcommon::start_pick_box(). + $result. + &Apache::lonhtmlcommon::end_pick_box().'
'; + } else { + $result = $hiddendraft; + } } elsif ($target eq 'web' && $Apache::inputtags::status[-1] ne 'CAN_ANSWER') { my $part= $Apache::inputtags::part; @@ -206,16 +210,30 @@ sub end_essayresponse { &escape($crsid)); my $essayurl= &Apache::lonnet::declutter($ENV{'REQUEST_URI'}); - my ($adom,$aname,$apath)= - ($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/); - $apath=&escape($apath); - $apath=~s/\W/\_/gs; - &Apache::lonnet::put('nohist_essay_'.$apath, - { $akey => $response },$adom,$aname); - } + if ($essayurl eq 'lib/templates/simpleproblem.problem') { + my %crsinfo = &Apache::lonnet::coursedescription($crsid); + my $cdom = $crsinfo{'domain'}; + my $cnum = $crsinfo{'num'}; + my ($map,$id,$res) = &Apache::lonnet::decode_symb($symb); + if ($map =~ m{^\Quploaded/$cdom/$cnum/\E(default(?:|_\d+)\.(?:sequence|page))$}) { + my $apath = $1.'_'.$id; + $apath=~s/\W/\_/gs; + my $akey = join('.',&escape($name),&escape($domain)); + &Apache::lonnet::put('nohist_essay_'.$apath, + { $akey => $response },$cdom,$cnum); + } + } else { + my ($adom,$aname,$apath)= + ($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/); + $apath=&escape($apath); + $apath=~s/\W/\_/gs; + &Apache::lonnet::put('nohist_essay_'.$apath, + { $akey => $response },$adom,$aname); + } + } } } - } + } } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table(); @@ -275,7 +293,7 @@ sub format_prior_response { } if ($answer =~ /\S/) { $output.='

'.&mt('Submitted text'). - '

'.$answer.'

'; + '
'.&HTML::Entities::encode($answer, '"<>&').'

'; } return '
'.$output.'
'; @@ -393,8 +411,11 @@ sub file_submission { my ($path,$filename) = ($file =~ m{^(.*/)([^/]+)$}); my $fullpath = '/userfiles/portfolio'.$path; if (!exists($dirlist{$fullpath})) { - my @list = &Apache::lonnet::dirlist($fullpath,$udom,$uname,1); - $dirlist{$fullpath} = \@list; + my ($listref,$listerror) = + &Apache::lonnet::dirlist($fullpath,$udom,$uname,1); + if (ref($listref) eq 'ARRAY') { + $dirlist{$fullpath} = $listref; + } } if (ref($dirlist{$fullpath}) eq 'ARRAY') { foreach my $dir_line (@{$dirlist{$fullpath}}) { @@ -437,81 +458,58 @@ sub file_submission { } } if ($accepted_upload ne '') { - my ($map,$resid,$resurl)=&Apache::lonnet::decode_symb($symb); - my $turnindir; - my %userhash = &Apache::lonnet::userenvironment($udom,$uname,'turnindir'); - $turnindir = $userhash{'turnindir'}; - if ($turnindir eq '') { - $turnindir = &mt('turned in'); - $turnindir =~ s/\W+/_/g; - my %newhash = ( - 'turnindir' => $turnindir, - ); - &Apache::lonnet::put('environment',\%newhash,$udom,$uname); - } - my $prefix = 'portfolio'; - my $path = '/'.$turnindir.'/'; - my $restitle=&Apache::lonnet::gettitle($symb); - $restitle =~ s/\W+/_/g; - if ($restitle eq '') { - $restitle = ($resurl =~ m{/[^/]+$}); - if ($restitle eq '') { - $restitle = time; - } - } - my @pathitems; - my $navmap = Apache::lonnavmaps::navmap->new(); - if (defined($navmap)) { - my $mapres = $navmap->getResourceByUrl($map); - if (ref($mapres)) { - my $pcslist = $mapres->map_hierarchy(); - if ($pcslist ne '') { - foreach my $pc (split(/,/,$pcslist)) { - my $res = $navmap->getByMapPc($pc); - if (ref($res)) { - my $title = $res->compTitle(); - $title =~ s/\W+/_/g; - if ($title ne '') { - push(@pathitems,$title); - } + my ($path,$multiresp) = + &Apache::loncommon::get_turnedin_filepath($symb,$uname,$udom, + 'submission'); + if ($path eq '') { + $$award = 'INTERNAL_ERROR'; + } else { + if ($multiresp) { + $path .= '/'.$jspart.'_'.$id; + } + my $prefix = 'portfolio'; + my $formelement = 'HWFILE'.$jspart.'_'.$id; + my $fname = &Apache::lonnet::clean_filename($env{'form.'.$formelement.'.filename'}); + my $url = '/uploaded/'.$udom.'/'.$uname.'/'.$prefix.$path.'/'.$fname; + my @stat = &Apache::lonnet::stat_file($url); + my $conflicts = 0; + if (@stat && $stat[0] ne 'no_such_dir') { + my $current_permissions = + &Apache::lonnet::get_portfile_permissions($udom,$uname); + if (ref($current_permissions) eq 'HASH') { + if (ref($current_permissions->{$path.'/'.$fname}) eq 'ARRAY') { + foreach my $record (@{$current_permissions->{$path.'/'.$fname}}) { + if (ref($record) eq 'ARRAY') { + next if (($record->[0] eq $symb) && + ($record->[1] eq $crsid)); + $conflicts ++; + } } } } - my $maptitle = $mapres->compTitle(); - $maptitle =~ s/\W+/_/g; - if ($maptitle ne '') { - push(@pathitems,$maptitle); + if ($conflicts) { + $$award = 'FILENAME_INUSE'; } - } else { - $$award = 'INTERNAL_ERROR'; } - } else { - $$award = 'INTERNAL_ERROR'; - } - push(@pathitems,$restitle); - $path .= join('/',@pathitems); - my $formelement = 'HWFILE'.$jspart.'_'.$id; - my $fname = &Apache::lonnet::clean_filename($env{'form.'.$formelement.'.filename'}); - my $url = '/uploaded/'.$udom.'/'.$uname.'/'.$prefix.$path.'/'.$fname; - my @stat = &Apache::lonnet::stat_file($url); - if (@stat && $stat[0] ne 'no_such_dir') { - $$award = 'FILENAME_INUSE'; - } else { - my ($mode,%allfiles,%codebase); - my $result = &Apache::lonnet::userfileupload($formelement,'', + unless ($conflicts) { + my ($mode,%allfiles,%codebase); + my $result = &Apache::lonnet::userfileupload($formelement,'', $prefix.$path,$mode,\%allfiles,\%codebase); - if ($result =~ m{^/uploaded/}) { - $stored_upload = $path.'/'.$fname; - $Apache::lonhomework::results{"resource.$part.$id.portfiles"} = $stored_upload; - push(@tolock,$stored_upload); - } else { - $$award = 'INTERNAL_ERROR'; + if ($result =~ m{^/uploaded/}) { + $stored_upload = $path.'/'.$fname; + unless (grep(/^\Q$stored_upload\E$/,@accepted_portfiles)) { + $Apache::lonhomework::results{"resource.$part.$id.portfiles"} = $stored_upload; + push(@tolock,$stored_upload); + } + } else { + $$award = 'INTERNAL_ERROR'; + } } } delete($env{'form.HWFILE'.$jspart.'_'.$id}); } if (@accepted_portfiles) { - if ($stored_upload) { + if ($Apache::lonhomework::results{"resource.$part.$id.portfiles"}) { $Apache::lonhomework::results{"resource.$part.$id.portfiles"} .= ','; } $Apache::lonhomework::results{"resource.$part.$id.portfiles"}.=join(',',@accepted_portfiles);