--- loncom/interface/portfolio.pm	2004/08/24 21:30:00	1.31
+++ loncom/interface/portfolio.pm	2004/08/25 18:48:26	1.33
@@ -266,6 +266,19 @@ 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').
@@ -321,16 +334,24 @@ sub delete_dir {
 sub delete_dir_confirmed {
     my ($r)=@_;
     my $directory_name = $ENV{'form.currentpath'};
-    $r->print('<br />'.$directory_name.'<br />');
     $directory_name =~ m/\/$/;
     $directory_name = $`;
     my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
 					       $ENV{'user.domain'},'portfolio'.
 					       $directory_name);
+					       
     if ($result ne 'ok') {
 	$r->print('<font color="red"> An error occured (dir) ('.$result.
-#		  ') while trying to delete '.&display_file().'</font><br />');
 		  ') while trying to delete '.$directory_name.'</font><br />');
+    } else {
+        my @dirs = split m!/!, $directory_name;
+        
+#        $directory_name =~ m/^(\/*\/)(\/*.)$/;
+        $directory_name='/';
+        for (my $i=1; $i < (@dirs - 1); $i ++){
+            $directory_name .= $dirs[$i].'/';
+        }
+        $ENV{'form.currentpath'} = $directory_name;
     }
     $r->print(&done());
 }
@@ -369,11 +390,33 @@ sub upload {
     my ($r)=@_;
     #FIXME if the file already exists we need to do a confirmation pass 
     #before overwriting
-    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 />');
+    my $fname=$ENV{'form.uploaddoc.filename'};
+    $fname=&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;
+    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); 
+        if ($filename eq $fname){
+            $found_file = 1;
+        }
+    }
+    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'});
+    } else {
+        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(&done());
 }
@@ -401,6 +444,9 @@ sub createdir {
 sub handler {
     # this handles file management
     my $r = shift;
+	my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
+							 $ENV{'user.name'}).
+							'/userfiles/portfolio';
     &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
@@ -435,10 +481,6 @@ sub handler {
 	if ($ENV{'form.currentpath'}) {
 	    $current_path = $ENV{'form.currentpath'};
 	}
-
-	my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
-							 $ENV{'user.name'}).
-							'/userfiles/portfolio';
 	my @dir_list=&Apache::lonnet::dirlist($current_path,
 					    $ENV{'user.domain'},
 					    $ENV{'user.name'},$portfolio_root);