--- loncom/interface/portfolio.pm	2004/08/24 06:51:11	1.26
+++ loncom/interface/portfolio.pm	2004/08/25 17:30:49	1.32
@@ -161,7 +161,7 @@ sub displayActions {
 
 my $dirptr=16384;
 sub display_directory {
-    my ($r,$current_path,$dir_list)=@_;
+    my ($r,$current_path,$is_empty,$dir_list)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
     $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');
     $r->print('<td bgcolor="#ccddaa" align="center">');
@@ -180,7 +180,7 @@ sub display_directory {
     $r->print($displayOut);
     $r->print('</td></tr></table>');
     my @tree = split (/\//,$current_path);
-    $r->print('<font size="+2">'.&make_anchor('/','/'));
+    $r->print('<font size="+2">'.&make_anchor('portfolio','/').'/');
     if (@tree > 1){
         my $newCurrentPath = '';
         for (my $i = 1; $i< @tree; $i++){
@@ -194,6 +194,17 @@ sub display_directory {
 	      &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
 						    'this.form.submit();'));
     $r->print("</form>");
+    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").'" />'.
+        '<input type="hidden" name="selectfile" value="" />'.
+        '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+        '</form>';
+        
+        $r->print($displayOut);
+	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/";
@@ -269,7 +280,10 @@ sub close_form {
 }
 
 sub display_file {
-    return $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
+    my ($path,$filename)=@_;
+    if (!defined($path)) { $path=$ENV{'form.currentpath'}; }
+    if (!defined($filename)) { $filename=$ENV{'form.selectfile'}; }
+    return '<tt>'.$path.$filename.'</tt>';
 }
 
 sub done {
@@ -291,23 +305,73 @@ sub delete_confirmed {
 					       $ENV{'form.currentpath'}.
 					       $ENV{'form.selectfile'});
     if ($result ne 'ok') {
-	$r->print('<font color="red"> An errror occured ('.$result.
+	$r->print('<font color="red"> An error occured ('.$result.
 		  ') while trying to delete '.&display_file().'</font><br />');
     }
     $r->print(&done());
 }
 
+sub delete_dir {
+    my ($r)=@_;
+    &open_form($r);
+    $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
+    &close_form($r);
+} 
+
+sub delete_dir_confirmed {
+    my ($r)=@_;
+    my $directory_name = $ENV{'form.currentpath'};
+    $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 '.$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());
+}
+
 sub rename {
     my ($r)=@_;
     &open_form($r);
-    $r->print('<p>'.&mt('Rename').' '.&display_file().'?</p>');
+    $r->print('<p>'.&mt('Rename').' '.&display_file().' to 
+               <input name="filenewname" type="input" size="50" />?</p>');
     &close_form($r);
 }
 
 sub rename_confirmed {
     my ($r)=@_;
-    &Apache::lonnet::renameuserfile($ENV{'form.currentpath'}.$ENV{'form.selectfile'}, 'rename', $ENV{'form.currentpath'}.$ENV{'form.filenewname'} );
-} 
+    my $filenewname=&Apache::lonnet::clean_filename($ENV{'form.filenewname'});
+    if ($filenewname eq '') {
+	$r->print('<font color="red">'.
+		  &mt("Error: no valid filename was provided to rename to.").
+		  '</font><br />');
+	$r->print(&done());
+	return;
+    } 
+    my $result=
+	&Apache::lonnet::renameuserfile($ENV{'user.name'},$ENV{'user.domain'},
+            'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.selectfile'},
+            'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.filenewname'});
+    if ($result ne 'ok') {
+	$r->print('<font color="red"> An errror occured ('.$result.
+		  ') while trying to rename '.&display_file().' to '.
+		  &display_file(undef,$filenewname).'</font><br />');
+    }
+    $r->print(&done());
+}
 
 sub upload {
     my ($r)=@_;
@@ -324,10 +388,17 @@ sub upload {
 
 sub createdir {
     my ($r)=@_;
-    #FIXME 1) bad dirnames ( '/' etc)
-    #      2) file exists in place of dir (errormessage needs improvement)
+    #FIXME 1) file exists in place of dir (errormessage needs improvement)
+    my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
+    if ($newdir eq '') {
+	$r->print('<font color="red">'.
+		  &mt("Error: no valid directory name was provided.").
+		  '</font><br />');
+	$r->print(&done());
+	return;
+    } 
     my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'},
-	     $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.newdir'});
+	     $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$newdir);
     if ($result ne 'ok') {
 	$r->print('<font color="red"> An errror occured ('.$result.
 		  ') while trying to create a new directory '.&display_file().'</font><br />');
@@ -338,12 +409,6 @@ sub createdir {
 sub handler {
     # this handles file management
     my $r = shift;
-    my @dir_list; # will hold directory listing as array
-    my $udir; # returned from home server
-    my $currentFile; # directory or file contained in $pathToRoot.$current_path
-    my $action; # delete, rename, makedirectory, removedirectory,
-    my $filenewname; # for rename action (guess what we do with it!)
-    my $isFile;
     &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
@@ -357,20 +422,19 @@ sub handler {
                                             ['selectfile','currentpath',
 					     'currentfile']);
 
-    # if we're uploading a file, we need to do it early so it will
-    # show in the directory list
-
     if ($ENV{'form.uploaddoc.filename'}) {
 	&upload($r);
+    } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {
+	&delete_confirmed($r);
     } elsif ($ENV{'form.action'} eq 'delete') {
-	if ($ENV{'form.confirmed'}) {
-	    &delete_confirmed($r);
-	} else {
-	    &delete($r);
-	}
+	&delete($r);
+    } elsif ($ENV{'form.action'} eq 'deletedir' && $ENV{'form.confirmed'}) {
+	&delete_dir_confirmed($r);
+    } elsif ($ENV{'form.action'} eq 'deletedir'){
+	&delete_dir($r);
+    } elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) {
+	&rename_confirmed($r);
     } elsif ($ENV{'form.action'} eq 'rename') {
-	# similarly, we need to delete or rename files before getting
-	# directory list
 	&rename($r);
     } elsif ($ENV{'form.createdir'}) {
 	&createdir($r);
@@ -383,20 +447,16 @@ sub handler {
 	my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
 							 $ENV{'user.name'}).
 							'/userfiles/portfolio';
-	@dir_list=&Apache::lonnet::dirlist($current_path,$ENV{'user.domain'},
-					   $ENV{'user.name'},$portfolio_root);
+	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,\@dir_list);
-
+	&display_directory($r,$current_path,$is_empty,\@dir_list);
+	$r->print("</body>\n</html>\n");
+	return OK;
     }
-
-    $r->print("</body>\n</html>\n");
-    $r->rflush();
-    return OK;
 }
-
 1;
 __END__