'. - ''. - '
| '.
+ ' '. + ''. + ' |
| '.' '; + &mt('Collaborators:').' '. + &mt('(Enter a maximum of [quant,_1,collaborator] using username or username:domain, e.g. smithje or smithje:[_2].)',$ncol,$env{'user.domain'}); + if ($ncol > 1) { + $result .= ' '.&mt('If entering more than one, use spaces to separate the collaborators.'); + } + $result .= ' '; $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/); $result .=' |
- '.$file_list.'
'.&mt('Submitted text'). + '
'.$answer.''; + } + + return '
'.$output.'
';
+}
+
sub file_submission {
- my ($part,$id,$which,$award,$uploadedflag)=@_;
+ my ($part,$id,$which,$award,$uploadedflag,$totalsize)=@_;
my $files;
my $jspart=$part;
$jspart=~s/\./_/g;
- if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$jspart.'_'.$id}; }
- if ($which eq 'filename') {
- $files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'};
+ if ($which eq 'portfiles') {
+ $files= $env{'form.HWPORT'.$jspart.'_'.$id};
+ } elsif ($which eq 'filename') {
+ if ($env{'form.HWFILETOOBIG'.$jspart.'_'.$id} ne '') {
+ $$award = 'EXCESS_FILESIZE';
+ return;
+ } else {
+ $files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'};
+ }
}
-
if ($files =~ /[^\s]/) {
$files =~s/,$//;
- $Apache::lonhomework::results{"resource.$part.$id.$which"}=$files;
-
- my @submitted_files = ($files);
- if ( $which eq 'portfiles' ) {
- @submitted_files = split(/\s*,\s*/,$files);
- }
-
- my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
- if ($uploadedfiletypes) {
- $uploadedfiletypes=~s/[^\w\,]//g;
- $uploadedfiletypes=','.$uploadedfiletypes.',';
- foreach my $file (@submitted_files) {
- my ($extension)=($file=~/\.(\w+)$/);
- unless ($uploadedfiletypes=~/\,$extension\,/i) {
- $$award='INVALID_FILETYPE';
- }
- }
- }
- if ($$award ne 'INVALID_FILETYPE' && ref($uploadedflag)) {
+ my (@submitted_files,@acceptable_files,@accepted_files);
+ if ($which eq 'portfiles') {
+ @submitted_files = split(/\s*,\s*/,$files);
+ } else {
+ @submitted_files = ($files);
+ }
+ my $uploadedfiletypes=
+ &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
+ if ($uploadedfiletypes ne '') {
+ $uploadedfiletypes=~s/[^\w\,]//g;
+ $uploadedfiletypes=','.$uploadedfiletypes.',';
+ foreach my $file (@submitted_files) {
+ my ($extension)=($file=~/\.(\w+)$/);
+ if ($uploadedfiletypes=~/\,\s*\Q$extension\E\s*\,/i) {
+ push(@acceptable_files,$file);
+ } else {
+ $$award='INVALID_FILETYPE';
+ if ($which eq 'filename') {
+ &delete_form_items($jspart,$id);
+ }
+ }
+ }
+ } else {
+ @acceptable_files = @submitted_files;
+ }
+ my $maxfilesize=&Apache::lonnet::EXT("resource.$part".'_'."$id.maxfilesize");
+ if (!$maxfilesize) {
+ $maxfilesize = 10.0; #FIXME This should become a domain configuration
+ }
+ my %dirlist;
+ foreach my $file (@acceptable_files) {
+ if ($which eq 'filename') {
+ if (ref($totalsize)) {
+ $$totalsize += $env{'form.HWFILESIZE'.$jspart.'_'.$id};
+ }
+ } else {
+ my ($symb,$crsid,$udom,$uname) = &Apache::lonnet::whichuser();
+ 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;
+ }
+ if (ref($dirlist{$fullpath}) eq 'ARRAY') {
+ foreach my $dir_line (@{$dirlist{$fullpath}}) {
+ my ($fname,$dom,undef,$testdir,undef,undef,undef,undef,
+ $size,undef,$mtime,undef,undef,undef,$obs,undef) =
+ split(/\&/,$dir_line,16);
+ if ($filename eq $fname) {
+ my $mbsize = $size/(1024.0*1024.0);
+ if (ref($totalsize)) {
+ $$totalsize += $mbsize;
+ }
+ last;
+ }
+ }
+ }
+ }
+ if (ref($totalsize)) {
+ if ($$totalsize > $maxfilesize) {
+ $$award='EXCESS_FILESIZE';
+ if ($which eq 'filename') {
+ &delete_form_items($jspart,$id);
+ }
+ last;
+ } else {
+ push(@accepted_files,$file);
+ }
+ } else {
+ push(@accepted_files,$file);
+ }
+ }
+ $Apache::lonhomework::results{"resource.$part.$id.$which"}=join(',',@accepted_files);
+ if (($$award eq 'INVALID_FILETYPE') || ($$award eq 'EXCESS_FILESIZE')) {
+ return;
+ }
+ if (ref($uploadedflag)) {
$$uploadedflag=1;
}
- if ($$award ne 'INVALID_FILETYPE' && $which eq 'portfiles') {
- my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+ my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser();
+ if ($which eq 'portfiles') {
&Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]);
&Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,[$symb,$crsid]);
&Apache::lonnet::clear_selected_files($name);
}
- if ($$award ne 'INVALID_FILETYPE' && $which eq 'filename') {
+ if ($which eq 'filename') {
$Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=
$files;
+ my $cleanpart = $part;
+ $cleanpart =~ s/\W/_/g;
+ my $cleanid = $id;
+ $cleanid =~ s/\W/_/g;
+ my ($map,$resid,$res)=&Apache::lonnet::decode_symb($symb);
+ my $container;
+ if ($map =~ /^uploaded/) {
+ (my $prefix,$container) = ($map =~ m{^uploaded/[^/]+/[^/]+/(default|supplemental)_?([^.]*)\.(?:sequence|page)$});
+ if (length($container) > 10) {
+ $container = substr($container,-10,10);
+ }
+ if ($container ne '') {
+ $container = $prefix.'_'.$container;
+ } else {
+ $container = $prefix;
+ }
+ } else {
+ ($container) = ($map =~ m{(.+)\.(?:sequence|page)$});
+ $container =~ s/\W/_/g;
+ if (length($container) > 255) {
+ $container = substr($container,0,254);
+ }
+ }
+ my $subdir = 'essayresponse';
+ my %crsdesc = &Apache::lonnet::coursedescription($crsid);
+ foreach my $item ($crsdesc{'domain'},$crsdesc{'num'},$container,$resid,$cleanpart,$cleanid) {
+ if ($item ne '') {
+ $subdir .= '/'.$item;
+ }
+ }
$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
&Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef,
- 'essayresponse');
+ $subdir);
+ delete($env{'form.HWFILE'.$jspart.'_'.$id});
}
} elsif ($which eq 'portfiles' &&
$Apache::lonhomework::history{"resource.$part.$id.$which"}) {
- my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+ my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser();
&Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]);
$Apache::lonhomework::results{"resource.$part.$id.$which"}="";
}
}
+sub delete_form_items {
+ my ($jspart,$id) = @_;
+ delete($env{'form.HWFILE'.$jspart.'_'.$id.'.filename'});
+ delete($env{'form.HWFILE'.$jspart.'_'.$id.'.mimetype'});
+ delete($env{'form.HWFILE'.$jspart.'_'.$id});
+}
+
+
sub check_collaborators {
my ($ncol,$coll) = @_;
my %classlist=&Apache::lonnet::dump('classlist',
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});
my (@badcollaborators,$result);
- my (@collaborators) = split(/\,?\s+/,$coll);
- foreach (@collaborators) {
- my $collaborator = $_;
- if (/@/) {
- $collaborator =~ s/@/:/;
+
+ my (@collaborators) = split(/[,;\s]+/,$coll);
+ foreach my $entry (@collaborators) {
+ my $collaborator;
+ if ($entry =~ /:/) {
+ $collaborator = $entry;
} else {
- $collaborator = $_.':'.$env{'user.domain'};
+ $collaborator = $entry.':'.$env{'user.domain'};
}
- push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist);
+ if ($collaborator !~ /^$match_username:$match_domain$/) {
+ if (!grep(/^\Q$entry\E$/,@badcollaborators)) {
+ push(@badcollaborators,$entry);
+ }
+ } elsif (!grep(/^\Q$collaborator\E$/i,keys(%classlist))) {
+ if (!grep(/^\Q$entry\E$/,@badcollaborators)) {
+ push(@badcollaborators,$entry);
+ }
+ }
}
- if (scalar(@badcollaborators)) {
- $result = '| The following user'. - (scalar(@badcollaborators) > 1 ? 's are' : ' is').' invalid: '. - join(', ',@badcollaborators).'. Please correct. |
| '; + if ($numbad == 1) { + $result .= &mt('The following user is invalid:'); + } else { + $result .= &mt('The following [_1] users are invalid:',$numbad); + } + $result .= ' '.join(', ',@badcollaborators).'. '.&mt('Please correct.'). + ' |
| '. - 'You have too many collaborators. Please remove '.$toomany.' collaborator'. - ($toomany > 1 ? 's' :'').'. |