loncom/homework/essayresponse.pm - diff

Return to essayresponse.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/essayresponse.pm between versions 1.33 and 1.35

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

version 1.33, 2004/03/05 20:18:26	version 1.35, 2004/05/10 23:09:18
Line 46 sub start_essayresponse {	Line 46 sub start_essayresponse {
my $part= $Apache::inputtags::part;	my $part= $Apache::inputtags::part;

my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");	my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");
my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});	my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");	my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
$uploadedfiletypes=~s/[^\w\,]//g;	$uploadedfiletypes=~s/[^\w\,]//g;
my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"});	my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
$result='<br /><table border="1">';	$result='<br /><table border="1">';
$result.='<tr><td>'.	$result.='<tr><td>'.
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked> '.	'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked> '.
Line 73 sub start_essayresponse {	Line 73 sub start_essayresponse {
&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).	&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).
'<br />';	'<br />';
if ($uploadedfile) {	if ($uploadedfile) {
my $curfile='<a href="'.&Apache::lonnet::tokenwrapper($Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}).	my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
	push (@Apache::lonxml::extlinks,$url);
	&Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
	my $curfile='<a href="'.$url.
'"><img src="/adm/lonIcons/unknown.gif" border=0" /> '.	'"><img src="/adm/lonIcons/unknown.gif" border=0" /> '.
$uploadedfile.'</a>';	$uploadedfile.'</a>';
$result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile);	$result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile);
Line 96 sub end_essayresponse {	Line 99 sub end_essayresponse {
if ( $target eq 'grade' ) {	if ( $target eq 'grade' ) {
my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};	my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};
if ($collaborators =~ /[^\s]/) {	if ($collaborators =~ /[^\s]/) {
my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});	my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators	$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
if ($collaborators ne $previous_list);	if ($collaborators ne $previous_list);
}	}
Line 122 sub end_essayresponse {	Line 125 sub end_essayresponse {
if ($uploadedfiletypes=~/\,$extension\,/i) {	if ($uploadedfiletypes=~/\,$extension\,/i) {
$Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename;	$Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename;
$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=	$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
&Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id);	&Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,'essayresponse');
$uploadedflag=1;	$uploadedflag=1;
} else {	} else {
$award='INVALID_FILETYPE';	$award='INVALID_FILETYPE';

Removed from v.1.33
changed lines
	Added in v.1.35