--- loncom/interface/portfolio.pm	2004/08/25 18:48:26	1.33
+++ loncom/interface/portfolio.pm	2004/09/06 23:11:57	1.36
@@ -266,19 +266,6 @@ sub open_form {
 	      $ENV{'form.currentpath'}.'" />');
 }
 
-sub clean_filename {
-    my ($fname)=@_;
-# Replace Windows backslashes by forward slashes
-    $fname=~s/\\/\//g;
-# Get rid of everything but the actual filename
-    $fname=~s/^.*\/([^\/]+)$/$1/;
-# Replace spaces by underscores
-    $fname=~s/\s+/\_/g;
-# Replace all other weird characters by nothing
-    $fname=~s/[^\w\.\-]//g;
-    return $fname;
-}
-
 sub close_form {
     my ($r)=@_;
     $r->print('<p><input type="submit" value="'.&mt('Continue').
@@ -388,25 +375,22 @@ sub rename_confirmed {
 
 sub upload {
     my ($r)=@_;
-    #FIXME if the file already exists we need to do a confirmation pass 
-    #before overwriting
     my $fname=$ENV{'form.uploaddoc.filename'};
-    $fname=&clean_filename($fname);
-   	my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
+    $fname=&Apache::lonnet::clean_filename($fname);
+    my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
 						 $ENV{'user.name'}).
 						'/userfiles/portfolio';
-	my @dir_list=&Apache::lonnet::dirlist($ENV{'form.currentpath'},
-					    $ENV{'user.domain'},
-					    $ENV{'user.name'},$portfolio_root);
-  	my $found_file = 0;
+    my @dir_list=&Apache::lonnet::dirlist($ENV{'form.currentpath'},
+					  $ENV{'user.domain'},
+					  $ENV{'user.name'},$portfolio_root);
+    my $found_file = 0;
     foreach my $line (@dir_list) {
-    	#$strip holds directory/file name
-    	#$dom 
-    	my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
+        my ($filename)=split(/\&/,$line,2);
         if ($filename eq $fname){
             $found_file = 1;
         }
     }
+    $r->print('<br />'.&Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root).'<br />');
     if ($found_file){   
         $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$ENV{'form.currentpath'}.'</strong></font>'.
                   '<br />To upload, rename or delete existing '.$fname.' in '.$ENV{'form.currentpath'});
@@ -414,8 +398,8 @@ sub upload {
         my $result=&Apache::lonnet::userfileupload('uploaddoc','',
 	        	 'portfolio'.$ENV{'form.currentpath'});
         if ($result !~ m|^/uploaded/|) {
-        	$r->print('<font color="red"> An errror occured ('.$result.
-		              ') while trying to upload '.&display_file().'</font><br />');
+            $r->print('<font color="red"> An errror occured ('.$result.
+	              ') while trying to upload '.&display_file().'</font><br />');
         }
     }
     $r->print(&done());
@@ -459,7 +443,14 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['selectfile','currentpath',
 					     'currentfile']);
-
+	# make sure there is a portfolio directory off /userfiles
+	my @dir_list=&Apache::lonnet::dirlist('/',
+					    $ENV{'user.domain'},
+					    $ENV{'user.name'},$portfolio_root);
+	if ($dir_list[0] eq 'no_such_dir'){
+	     &Apache::lonnet::mkdiruserfile($ENV{'user.name'},
+	     $ENV{'user.domain'},'portfolio');
+	}
     if ($ENV{'form.uploaddoc.filename'}) {
 	&upload($r);
     } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {