version 1.64, 2005/04/19 00:56:39
|
version 1.66, 2005/05/03 19:22:58
|
Line 164 sub file_submission {
|
Line 164 sub file_submission {
|
$Apache::lonhomework::results{"resource.$part.$id.$which"}=$files; |
$Apache::lonhomework::results{"resource.$part.$id.$which"}=$files; |
my @submitted_files = split(/,/,$files); |
my @submitted_files = split(/,/,$files); |
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); |
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); |
$uploadedfiletypes=~s/[^\w\,]//g; |
if ($uploadedfiletypes) { |
$uploadedfiletypes=','.$uploadedfiletypes.','; |
$uploadedfiletypes=~s/[^\w\,]//g; |
foreach my $file (@submitted_files) { |
$uploadedfiletypes=','.$uploadedfiletypes.','; |
my ($extension)=($file=~/\.(\w+)$/); |
foreach my $file (@submitted_files) { |
unless ($uploadedfiletypes=~/\,$extension\,/i) { |
my ($extension)=($file=~/\.(\w+)$/); |
$$award='INVALID_FILETYPE'; |
unless ($uploadedfiletypes=~/\,$extension\,/i) { |
|
$$award='INVALID_FILETYPE'; |
|
} |
} |
} |
} |
} |
if ($$award ne 'INVALID_FILETYPE' && ref($uploadedflag)) { |
if ($$award ne 'INVALID_FILETYPE' && ref($uploadedflag)) { |
Line 177 sub file_submission {
|
Line 179 sub file_submission {
|
} |
} |
if ($$award ne 'INVALID_FILETYPE' && $which eq 'portfiles') { |
if ($$award ne 'INVALID_FILETYPE' && $which eq 'portfiles') { |
my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); |
my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); |
&Apache::lonnet::unmark_as_readonly($domain,$name,$symb.$crsid); |
&Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]); |
&Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$symb.$crsid); |
&Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,[$symb,$crsid]); |
&Apache::lonnet::clear_selected_files($name); |
&Apache::lonnet::clear_selected_files($name); |
} |
} |
if ($$award ne 'INVALID_FILETYPE' && $which eq 'filename') { |
if ($$award ne 'INVALID_FILETYPE' && $which eq 'filename') { |
Line 191 sub file_submission {
|
Line 193 sub file_submission {
|
} elsif ($which eq 'portfiles' && |
} elsif ($which eq 'portfiles' && |
$Apache::lonhomework::history{"resource.$part.$id.$which"}) { |
$Apache::lonhomework::history{"resource.$part.$id.$which"}) { |
my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); |
my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); |
&Apache::lonnet::unmark_as_readonly($domain,$name,$symb.$crsid); |
&Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]); |
$Apache::lonhomework::results{"resource.$part.$id.$which"}=""; |
$Apache::lonhomework::results{"resource.$part.$id.$which"}=""; |
} |
} |
} |
} |