--- loncom/interface/portfolio.pm	2004/08/24 20:57:12	1.30
+++ loncom/interface/portfolio.pm	2004/08/27 15:45:33	1.34
@@ -194,7 +194,7 @@ sub display_directory {
 	      &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
 						    'this.form.submit();'));
     $r->print("</form>");
-    if ($is_empty){
+    if ($is_empty) {
         $displayOut = '<form method="post" action="/adm/portfolio">'.
         '<input type="hidden" name="action" value="deletedir" />'.
         '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
@@ -203,7 +203,8 @@ sub display_directory {
         '</form>';
         
         $r->print($displayOut);
-    }else{
+	return;
+    }
     $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
             '<tr><th>Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
     my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio/$current_path/";
@@ -251,7 +252,6 @@ sub display_directory {
 #    $r->print('</td>><td>');
 #   $r->print(&display_actions($current_path, $currentFile, $isEmpty));
     $r->print('</table></form>');
-    }
 }
 
 sub open_form {
@@ -321,16 +321,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());
 }
@@ -367,13 +375,31 @@ sub rename_confirmed {
 
 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=&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;
+    foreach my $line (@dir_list) {
+        my ($filename)=split(/\&/,$line,2);
+        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 +427,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;
@@ -421,9 +450,9 @@ sub handler {
     } elsif ($ENV{'form.action'} eq 'delete') {
 	&delete($r);
     } elsif ($ENV{'form.action'} eq 'deletedir' && $ENV{'form.confirmed'}) {
-    &delete_dir_confirmed($r);
+	&delete_dir_confirmed($r);
     } elsif ($ENV{'form.action'} eq 'deletedir'){
-    &delete_dir($r);
+	&delete_dir($r);
     } elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) {
 	&rename_confirmed($r);
     } elsif ($ENV{'form.action'} eq 'rename') {
@@ -435,20 +464,15 @@ 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);
     
 	# need to know if directory is empty so it can be removed if desired
 	my $is_empty=(@dir_list == 2);
-    &display_directory($r,$current_path,$is_empty,\@dir_list);
-    $r->print("</body>\n</html>\n");
-    $r->rflush();
-    return OK;
+	&display_directory($r,$current_path,$is_empty,\@dir_list);
+	$r->print("</body>\n</html>\n");
+	return OK;
     }
 }
 1;