--- loncom/publisher/loncfile.pm	2006/04/13 18:30:30	1.76
+++ loncom/publisher/loncfile.pm	2006/11/23 01:50:57	1.79
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.76 2006/04/13 18:30:30 albertel Exp $
+# $Id: loncfile.pm,v 1.79 2006/11/23 01:50:57 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,6 +72,9 @@ use Apache::loncacc;
 use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonlocal;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 my $DEBUG=0;
 my $r;				# Needs to be global for some stuff RF.
@@ -1135,7 +1138,7 @@ sub phasetwo {
     
     &Debug($r, "loncfile - Entering phase 2 for $fn");
     
-    # Break down the file into it's component pieces.
+    # Break down the file into its component pieces.
     
     my $dir;		# Directory path
     my $main;		# Filename.
@@ -1148,8 +1151,10 @@ sub phasetwo {
 	$suffix=$1; #This is the actually filename extension if it exists
 	$main=~s/\.\w+$//; #strip the extension
     }
-    my $dest;                   # On success this is where we'll go.
-    
+    my $dest;                       #
+    my $dest_dir;                   # On success this is where we'll go.
+    my $disp_newname;               #
+    my $dest_newname;               #
     &Debug($r,"loncfile::phase2 dir = $dir main = $main suffix = $suffix");
     &Debug($r,"    newfilename = ".$env{'form.newfilename'});
 
@@ -1176,7 +1181,11 @@ sub phasetwo {
 	    if(!&Rename2($r, $uname, $dir, $fn, $env{'form.newfilename'})) {
 		return;
 	    }
-	    $dest = $env{'form.newfilename'};
+	    $dest = $dir."/";
+	    $dest_newname = $env{'form.newfilename'};
+	    $env{'form.newfilename'} =~ /.+(\/.+$)/;
+	    $disp_newname = $1;
+	    $disp_newname =~ s/\///;
 	}
     } elsif ($env{'form.action'} eq 'delete') { 
 	if(!&Delete2($r, $uname, $env{'form.newfilename'})) {
@@ -1207,7 +1216,12 @@ sub phasetwo {
     if ( ($env{'form.action'} eq 'newdir') && ($env{'form.phase'} eq 'two') && ( ($env{'form.callingmode'} eq 'testbank') || ($env{'form.callingmode'} eq 'imsimport') ) ) {
 	$r->print('<h3><a href="javascript:self.close()">'.&mt('Done').'</a></h3>');
     } else {
-	$r->print('<h3><a href="'.&url($dest).'">'.&mt('Done').'</a></h3>');
+        if ($env{'form.action'} eq 'rename') {
+            $r->print('<h3><a href="'.&url($dest).'">'.&mt('Return to Directory').'</a></h3>');
+            $r->print('<h3><a href="'.&url($dest_newname).'">'.$disp_newname.'</a></h3>');
+        } else {
+	    $r->print('<h3><a href="'.&url($dest).'">'.&mt('Done').'</a></h3>');
+	}
     }
 }
 
@@ -1229,12 +1243,12 @@ sub handler {
 
     if ($env{'form.filename'}) {
 	&Debug($r, "test: $env{'form.filename'}");
-	$fn=&Apache::lonnet::unescape($env{'form.filename'});
+	$fn=&unescape($env{'form.filename'});
 	$fn=&URLToPath($fn);
     }  elsif($ENV{'QUERY_STRING'} && $env{'form.phase'} ne 'two') {  
 	#Just hijack the script only the first time around to inject the
 	#correct information for further processing
-	$fn=&Apache::lonnet::unescape($env{'form.decompress'});
+	$fn=&unescape($env{'form.decompress'});
 	$fn=&URLToPath($fn);
 	$env{'form.action'}="decompress";
     } elsif ($env{'form.qualifiedfilename'}) {