--- loncom/publisher/loncfile.pm	2006/05/30 12:47:41	1.77
+++ loncom/publisher/loncfile.pm	2006/12/20 22:41:08	1.80
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.77 2006/05/30 12:47:41 www Exp $
+# $Id: loncfile.pm,v 1.80 2006/12/20 22:41:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,9 +72,8 @@ use Apache::loncacc;
 use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonlocal;
-use lib '/home/httpd/lib/perl/';
-use LONCAPA;
- 
+use LONCAPA qw(:DEFAULT :match);
+
 
 my $DEBUG=0;
 my $r;				# Needs to be global for some stuff RF.
@@ -151,21 +150,21 @@ sub URLToPath {
     $Url=~ s/\/+/\//g;
     $Url=~ s/^http\:\/\/[^\/]+//;
     $Url=~ s/^\///;
-    $Url=~ s/(\~|priv\/)(\w+)\//\/home\/$2\/public_html\//;
+    $Url=~ s/(\~|priv\/)($match_username)\//\/home\/$2\/public_html\//;
     &Debug($r, "Returning $Url \n");
     return $Url;
 }
 
 sub url {
     my $fn=shift;
-    $fn=~s/^\/home\/(\w+)\/public\_html/\/priv\/$1/;
+    $fn=~s/^\/home\/($match_username)\/public\_html/\/priv\/$1/;
     $fn=&HTML::Entities::encode($fn,'<>"&');
     return $fn;
 }
 
 sub display {
     my $fn=shift;
-    $fn=~s-^/home/(\w+)/public_html-/priv/$1-;
+    $fn=~s-^/home/($match_username)/public_html-/priv/$1-;
     return '<tt>'.$fn.'</tt>';
 }
 
@@ -1138,7 +1137,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.
@@ -1151,8 +1150,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'});
 
@@ -1179,7 +1180,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'})) {
@@ -1210,7 +1215,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>');
+	}
     }
 }