--- loncom/lonnet/perl/lonnet.pm	2004/04/29 17:25:11	1.492
+++ loncom/lonnet/perl/lonnet.pm	2004/04/30 23:10:11	1.493
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.492 2004/04/29 17:25:11 albertel Exp $
+# $Id: lonnet.pm,v 1.493 2004/04/30 23:10:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1268,7 +1268,8 @@ sub process_coursefile {
 # output: url of file in userspace
 
 sub userfileupload {
-    my ($formname,$coursedoc)=@_;
+    my ($formname,$coursedoc,$subdir)=@_;
+    if (!defined($subdir)) { $subdir='unknown'; }
     my $fname=$ENV{'form.'.$formname.'.filename'};
 # Replace Windows backslashes by forward slashes
     $fname=~s/\\/\//g;
@@ -1285,6 +1286,7 @@ sub userfileupload {
     my $docuname='';
     my $docudom='';
     my $docuhome='';
+    $fname="$subdir/$fname";
     if ($coursedoc) {
 	$docuname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
 	$docudom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
@@ -1336,6 +1338,12 @@ sub finishuserfileupload {
     }    
 }
 
+sub removeuploadedurl {
+    my ($url)=@_;
+    my (undef,undef,$udom,$uname,$fname)=split('/',$url,5);
+    return &Apache::lonnet::removeuserfile($uname,$udom,$fname);
+}
+
 sub removeuserfile {
     my ($docuname,$docudom,$fname)=@_;
     my $home=&homeserver($docuname,$docudom);