loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

version 1.1172.2.19, 2013/03/02 15:34:17	version 1.1172.2.21, 2013/03/18 00:30:46
Line 3184 sub userfileupload {	Line 3184 sub userfileupload {
$codebase,$thumbwidth,$thumbheight,	$codebase,$thumbwidth,$thumbheight,
$resizewidth,$resizeheight,$context,$mimetype);	$resizewidth,$resizeheight,$context,$mimetype);
} else {	} else {
$fname=$env{'form.folder'}.'/'.$fname;	if ($env{'form.folder'}) {
	$fname=$env{'form.folder'}.'/'.$fname;
	}
return &process_coursefile('uploaddoc',$docuname,$docudom,	return &process_coursefile('uploaddoc',$docuname,$docudom,
$fname,$formname,$parser,	$fname,$formname,$parser,
$allfiles,$codebase,$mimetype);	$allfiles,$codebase,$mimetype);
Line 9896 sub metadata {	Line 9898 sub metadata {
# if it is a non metadata possible uri return quickly	# if it is a non metadata possible uri return quickly
if (($uri eq '') \|\|	if (($uri eq '') \|\|
(($uri =~ m\|^/*adm/\|) &&	(($uri =~ m\|^/*adm/\|) &&
($uri !~ m\|^adm/includes\|) && ($uri !~ m\|/bulletinboard$\|)) \|\|	($uri !~ m\|^adm/includes\|) && ($uri !~ m{/(smppg\|bulletinboard)$})) \|\|
($uri =~ m\|/$\|) \|\| ($uri =~ m\|/.meta$\|) \|\| ($uri =~ m{^/*uploaded/.+\.sequence$})) {	($uri =~ m\|/$\|) \|\| ($uri =~ m\|/.meta$\|) \|\| ($uri =~ m{^/*uploaded/.+\.sequence$})) {
return undef;	return undef;
}	}