--- loncom/publisher/loncfile.pm	2004/04/03 00:23:47	1.53
+++ 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.53 2004/04/03 00:23:47 www Exp $
+# $Id: loncfile.pm,v 1.79 2006/11/23 01:50:57 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,10 +69,12 @@ use File::Copy;
 use HTML::Entities();
 use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;
-use Apache::Log ();
 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.
@@ -101,18 +103,11 @@ my $r;				# Needs to be global for some
 =cut
 
 sub Debug {
-  
-  # Marshall the parameters.
-  
-  my $r       = shift;
-  my $log     = $r->log;
-  my $message = shift;
-  
-  # Put out the indicated message butonly if DEBUG is true.
-  
-  if ($DEBUG) {
-  $r->log_reason($message);
-  }
+    # Put out the indicated message butonly if DEBUG is true.
+    if ($DEBUG) {
+	my ($r,$message) = @_;
+	$r->log_reason($message);
+    }
 }
 
 =pod
@@ -151,19 +146,20 @@ Global References
 =cut
 
 sub URLToPath {
-  my $Url = shift;
-  &Debug($r, "UrlToPath got: $Url");
-  $Url=~ s/\/+/\//g;
-  $Url=~ s/^http\:\/\/[^\/]+//;
-  $Url=~ s/^\///;
-  $Url=~ s/(\~|priv\/)(\w+)\//\/home\/$2\/public_html\//;
-  &Debug($r, "Returning $Url \n");
-  return $Url;
+    my $Url = shift;
+    &Debug($r, "UrlToPath got: $Url");
+    $Url=~ s/\/+/\//g;
+    $Url=~ s/^http\:\/\/[^\/]+//;
+    $Url=~ s/^\///;
+    $Url=~ s/(\~|priv\/)(\w+)\//\/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=&HTML::Entities::encode($fn,'<>"&');
     return $fn;
 }
 
@@ -193,7 +189,32 @@ sub obsolete_unpub {
     }
 }
 
-
+# see if directory is empty
+# ignores any .meta, .save, .bak, and .log files created for a previously
+# published file, which has since been marked obsolete and deleted.
+sub empty_directory {
+    my ($dirname,$phase) = @_;
+    if (opendir DIR, $dirname) {
+        my @files = grep(!/^\.\.?$/, readdir(DIR)); # ignore . and ..
+        if (@files) { 
+            my @orphans = grep(/\.(meta|save|log|bak)$/,@files);
+            if (scalar(@files) - scalar(@orphans) > 0) { 
+                return 0;
+            } else {
+                if (($phase eq 'Delete2') && (@orphans > 0)) {
+                    foreach my $file (@orphans) {
+                        if ($file =~ /\.(meta|save|log|bak)$/) {
+                            unlink($dirname.$file);
+                        }
+                    }
+                }
+            }
+        }
+        closedir(DIR);
+        return 1;
+    }
+    return 0;
+}
 
 =pod
 
@@ -228,21 +249,20 @@ Returns:
 =cut
 
 sub exists {
-  my ($user, $domain, $construct) = @_;
-  my $published=$construct;
-  $published=~
-s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//;
-  my $result='';    
-  if ( -d $construct ) {
-      return &mt('Error: destination for operation is an existing directory.');
-  }
-  if ( -e $published) {
-      $result.='<p><font color="red">'.&mt('Warning: target file exists, and has been published!').'</font></p>';
-  } elsif ( -e $construct) {
-      $result.='<p><font color="red">'.&mt('Warning: target file exists!').'</font></p>';
-  }
-  return $result;
-
+    my ($user, $domain, $construct) = @_;
+    my $published=$construct;
+    $published=~
+	s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//;
+    my $result='';    
+    if ( -d $construct ) {
+	return &mt('Error: destination for operation is an existing directory.');
+    }
+    if ( -e $published) {
+	$result.='<p><font color="red">'.&mt('Warning: target file exists, and has been published!').'</font></p>';
+    } elsif ( -e $construct) {
+	$result.='<p><font color="red">'.&mt('Warning: target file exists!').'</font></p>';
+    }
+    return $result;
 }
 
 =pod
@@ -289,11 +309,27 @@ sub checksuffix {
 }
 
 sub cleanDest {
-    my ($request,$dest)=@_;
+    my ($request,$dest,$subdir,$fn,$uname)=@_;
     #remove bad characters
-    if  ($dest=~/[\#\?&]/) {
+    my $foundbad=0;
+    if ($subdir && $dest =~/\./) {
+	$foundbad=1;
+	$dest=~s/\.//g;
+    }
+    if  ($dest=~/[\#\?&%\":]/) {
+	$foundbad=1;
+	$dest=~s/[\#\?&%\":]//g;
+    }
+    if ($dest=~m|/|) {
+	my ($newpath)=($dest=~m|(.*)/|);
+	$newpath=&relativeDest($fn,$newpath,$uname);
+	if (! -d "$newpath") {
+	    $request->print("<p><font color=\"red\">".&mt('You have requested to create file in directory [_1] which doesn\'t exist. The requested directory path has been removed from the requested file name.','"<tt>'.$newpath.'</tt>"')."</font></p>");
+	    $dest=~s|.*/||;
+	}
+    }
+    if ($foundbad) {
 	$request->print("<p><font color=\"red\">".&mt('Invalid characters in requested name have been removed.')."</font></p>");
-	$dest=~s/[\#\?&]//g;
     }
     return $dest;
 }
@@ -334,10 +370,10 @@ Parameters:
 =cut
 
 sub CloseForm1 {
-   my ($request,  $fn) = @_;
-   $request->print('<p><input type="submit" value="'.&mt('Continue').'" /></p></form>');
-   $request->print('<form action="'.&url($fn).
-     '" method="POST"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>');
+    my ($request,  $fn) = @_;
+    $request->print('<p><input type="submit" value="'.&mt('Continue').'" /></p></form>');
+    $request->print('<form action="'.&url($fn).
+		    '" method="POST"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>');
 }
 
 
@@ -366,8 +402,8 @@ Parameters:
 =cut
 
 sub CloseForm2 {
-  my ($request, $user, $fn) = @_;
-  $request->print('<h3><a href="'.&url($fn).'/">'.&mt('Done').'</a></h3>');
+    my ($request, $user, $fn) = @_;
+    $request->print('<h3><a href="'.&url($fn).'/">'.&mt('Done').'</a></h3>');
 }
 
 =pod
@@ -429,9 +465,9 @@ sub Rename1 {
 		$newfilename=~/\.(\w+)$/;
 		if (&Apache::loncommon::fileembstyle($1) eq 'ssi') {
 		    $request->print('<br /><font color="red">'.
-				 &mt('Cannot change MIME type of a directory').
+				    &mt('Cannot change MIME type of a directory').
 				    '</font>'.
-			'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+				    '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
 		    return;
 		}
 		$newfilename=~s/\/[^\/]+\/([^\/]+)$/\/$1/;
@@ -472,6 +508,7 @@ sub Rename1 {
     }
     
 }
+
 =pod
 
 =item Delete1
@@ -497,21 +534,30 @@ Parameters:
 =cut
 
 sub Delete1 {
-  my ($request, $user, $domain, $fn) = @_;
+    my ($request, $user, $domain, $fn) = @_;
 
-  if( -e $fn) {
-    $request->print('<input type="hidden" name="newfilename" value="'.
-		    $fn.'"/>');
-    unless (&obsolete_unpub($user,$domain,$fn)) {
-	$request->print('<h3>'.&mt('Cannot delete non-obsolete published file').'</h3>'.
-			'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
-	return;
+    if( -e $fn) {
+	$request->print('<input type="hidden" name="newfilename" value="'.
+			$fn.'"/>');
+        if (-d $fn) {
+            unless (&empty_directory($fn,'Delete1')) {
+                $request->print('<h3>'.&mt('Only empty directories may be deleted.').'</h3>'.
+                            'You must delete the contents of the directory first.<br />'.
+                            '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+                return;
+            }
+        } else { 
+	    unless (&obsolete_unpub($user,$domain,$fn)) {
+	        $request->print('<h3>'.&mt('Cannot delete non-obsolete published file').'</h3>'.
+			    '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+	        return;
+	    }
+        }
+	$request->print('<p>'.&mt('Delete').' '.&display($fn).'?</p>');
+	&CloseForm1($request, $fn);
+    } else {
+	$request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
     }
-    $request->print('<p>'.&mt('Delete').' '.&display($fn).'?</p>');
-    &CloseForm1($request, $fn);
-  } else {
-    $request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
-  }
 }
 
 =pod
@@ -613,37 +659,37 @@ causes the newdir operation to transitio
 =cut
 
 
-sub NewDir1
-{
-  my ($request, $username, $domain, $fn, $newfilename, $mode) = @_;
-
-  my $result=&exists($username,$domain,$newfilename);
-  if ($result) {
-    $request->print('<font color="red">'.$result.'</font></form>');
-  } else {
-    if ($mode eq 'testbank') {
-        $request->print('<input type="hidden" name="callingmode" value="testbank">');
-    } elsif ($mode eq 'imsimport') {
-        $request->print('<input type="hidden" name="callingmode" value="imsimport">');
-    }
-    $request->print('<input type="hidden" name="newfilename" value="'.
-		    $newfilename.'" /><p>'.&mt('Make new directory').' '.
-		    &display($newfilename).'?</p>');
-    &CloseForm1($request, $fn);
-  }
+sub NewDir1 {
+    my ($request, $username, $domain, $fn, $newfilename, $mode) = @_;
+
+    my $result=&exists($username,$domain,$newfilename);
+    if ($result) {
+	$request->print('<font color="red">'.$result.'</font></form>');
+    } else {
+	if ($mode eq 'testbank') {
+	    $request->print('<input type="hidden" name="callingmode" value="testbank">');
+	} elsif ($mode eq 'imsimport') {
+	    $request->print('<input type="hidden" name="callingmode" value="imsimport">');
+	}
+	$request->print('<input type="hidden" name="newfilename" value="'.
+			$newfilename.'" /><p>'.&mt('Make new directory').' '.
+			&display($newfilename).'?</p>');
+	&CloseForm1($request, $fn);
+    }
 }
 
 
 sub Decompress1 {
-   my ($request, $user, $domain, $fn) = @_;
-   if( -e $fn) {
+    my ($request, $user, $domain, $fn) = @_;
+    if( -e $fn) {
    	$request->print('<input type="hidden" name="newfilename" value="'.$fn.'"/>');
    	$request->print('<p>'.&mt('Decompress').' '.&display($fn).'?</p>');
    	&CloseForm1($request, $fn);
-   	} else {
-       		$request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
-     	  }
+    } else {
+	$request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
+    }
 }
+
 =pod
 
 =item NewFile1
@@ -684,17 +730,22 @@ button which returns you to the driector
 
 =cut
 
-
 sub NewFile1 {
     my ($request, $user, $domain, $fn, $newfilename) = @_;
 
-    if ($ENV{'form.action'} =~ /new(.+)file/) {
+    if ($env{'form.action'} =~ /new(.+)file/) {
 	my $extension=$1;
 
         ##Informs User (name).(number).(extension) not allowed 
 	if($newfilename =~ /\.(\d+)\.(\w+)$/){
 	    $r->print('<font color="red">'.$newfilename.
-		      ' - '.&mt('Bad Filename').'<br />('.&mt('name').').('.&mt('number').').('.&mt('extension').')'.
+		      ' - '.&mt('Bad Filename').'<br />('.&mt('name').').('.&mt('number').').('.&mt('extension').') '.
+		      ' '.&mt('Not Allowed').'</font>');
+	    return;
+	}
+	if($newfilename =~ /(\:\:\:|\&\&\&|\_\_\_)/){
+	    $r->print('<font color="red">'.$newfilename.
+		      ' - '.&mt('Bad Filename').'<br />('.&mt('Must not include').' '.$1.') '.
 		      ' '.&mt('Not Allowed').'</font>');
 	    return;
 	}
@@ -748,49 +799,53 @@ performed and reported to the user.
 =cut
 
 sub phaseone {
-  my ($r,$fn,$uname,$udom)=@_;
+    my ($r,$fn,$uname,$udom)=@_;
   
-  my $newfilename=&cleanDest($r,$ENV{'form.newfilename'});
-  $newfilename=&relativeDest($fn,$newfilename,$uname);
-  $r->print('<form action="/adm/cfile" method="post">'.
-      '<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'.
-      '<input type="hidden" name="phase" value="two" />'.
-      '<input type="hidden" name="action" value="'.$ENV{'form.action'}.'" />');
+    my $doingdir=0;
+    if ($env{'form.action'} eq 'newdir') { $doingdir=1; }
+    my $newfilename=&cleanDest($r,$env{'form.newfilename'},$doingdir,$fn,$uname);
+    $newfilename=&relativeDest($fn,$newfilename,$uname);
+    $r->print('<form action="/adm/cfile" method="post">'.
+	      '<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'.
+	      '<input type="hidden" name="phase" value="two" />'.
+	      '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />');
   
-  if ($ENV{'form.action'} eq 'rename') {
-      &Rename1($r, $uname, $udom, $fn, $newfilename, 'rename');
-  } elsif ($ENV{'form.action'} eq 'move') {
-      &Rename1($r, $uname, $udom, $fn, $newfilename, 'move');
-  } elsif ($ENV{'form.action'} eq 'delete') { 
-      &Delete1($r, $uname, $udom, $fn);
-  } elsif ($ENV{'form.action'} eq 'decompress') {
-      &Decompress1($r, $uname, $udom, $fn);
-  } elsif ($ENV{'form.action'} eq 'copy') { 
-      if($newfilename) {
-	  &Copy1($r, $uname, $udom, $fn, $newfilename);
-      } else {
-	  $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
-      }
-  } elsif ($ENV{'form.action'} eq 'newdir') {
-      my $mode = '';
-      if (exists($ENV{'form.callingmode'}) ) {
-          $mode = $ENV{'form.callingmode'};
-      }   
-      &NewDir1($r, $uname, $udom, $fn, $newfilename, $mode);
-  }  elsif ($ENV{'form.action'} eq 'newfile' ||
-	    $ENV{'form.action'} eq 'newhtmlfile' ||
-	    $ENV{'form.action'} eq 'newproblemfile' ||
-            $ENV{'form.action'} eq 'newpagefile' ||
-            $ENV{'form.action'} eq 'newsequencefile' ||
-            $ENV{'form.action'} eq 'newrightsfile' ||
-            $ENV{'form.action'} eq 'newstyfile' ||
-            $ENV{'form.action'} eq 'Select Action') {
-      if ($newfilename) {
-	  &NewFile1($r, $uname, $udom, $fn, $newfilename);
-      } else {
-	  $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
-      }
-  }
+    if ($env{'form.action'} eq 'rename') {
+	&Rename1($r, $uname, $udom, $fn, $newfilename, 'rename');
+    } elsif ($env{'form.action'} eq 'move') {
+	&Rename1($r, $uname, $udom, $fn, $newfilename, 'move');
+    } elsif ($env{'form.action'} eq 'delete') { 
+	&Delete1($r, $uname, $udom, $fn);
+    } elsif ($env{'form.action'} eq 'decompress') {
+	&Decompress1($r, $uname, $udom, $fn);
+    } elsif ($env{'form.action'} eq 'copy') { 
+	if($newfilename) {
+	    &Copy1($r, $uname, $udom, $fn, $newfilename);
+	} else {
+	    $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
+	}
+    } elsif ($env{'form.action'} eq 'newdir') {
+	my $mode = '';
+	if (exists($env{'form.callingmode'}) ) {
+	    $mode = $env{'form.callingmode'};
+	}   
+	&NewDir1($r, $uname, $udom, $fn, $newfilename, $mode);
+    }  elsif ($env{'form.action'} eq 'newfile' ||
+	      $env{'form.action'} eq 'newhtmlfile' ||
+	      $env{'form.action'} eq 'newproblemfile' ||
+	      $env{'form.action'} eq 'newpagefile' ||
+	      $env{'form.action'} eq 'newsequencefile' ||
+	      $env{'form.action'} eq 'newrightsfile' ||
+	      $env{'form.action'} eq 'newstyfile' ||
+              $env{'form.action'} eq 'newlibraryfile' ||
+	      $env{'form.action'} eq 'Select Action') {
+        my $empty=&mt('Type Name Here');
+	if (($newfilename!~/\/$/) && ($newfilename!~/$empty$/)) {
+	    &NewFile1($r, $uname, $udom, $fn, $newfilename);
+	} else {
+	    $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
+	}
+    }
 }
 
 =pod
@@ -829,57 +884,58 @@ Returns:
 
 sub Rename2 {
 
-  my ($request, $user, $directory, $oldfile, $newfile) = @_;
+    my ($request, $user, $directory, $oldfile, $newfile) = @_;
 
-  &Debug($request, "Rename2 directory: ".$directory." old file: ".$oldfile.
-	 " new file ".$newfile."\n");
-  &Debug($request, "Target is: ".$directory.'/'.
-	 $newfile);
-  if (-e $oldfile) {
-
-      my $oRN=$oldfile;
-      my $nRN=$newfile;
-      unless (rename($oldfile,$newfile)) {
-	  $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
-	  return 0;
-      }
-      ## If old name.(extension) exits, move under new name.
-      ## If it doesn't exist and a new.(extension) exists  
-      ## delete it (only concern when renaming over files)
-      my $tmp1=$oRN.'.meta';
-      my $tmp2=$nRN.'.meta';
-      if(-e $tmp1){
-	  unless(rename($tmp1,$tmp2)){ }
-      } elsif(-e $tmp2){
-	  unlink $tmp2;
-      }
-      $tmp1=$oRN.'.save';
-      $tmp2=$nRN.'.save';
-      if(-e $tmp1){
-	  unless(rename($tmp1,$tmp2)){ }
-      } elsif(-e $tmp2){
-	  unlink $tmp2;
-      }
-      $tmp1=$oRN.'.log';
-      $tmp2=$nRN.'.log';
-      if(-e $tmp1){
-	  unless(rename($tmp1,$tmp2)){ }
-      } elsif(-e $tmp2){
-	  unlink $tmp2;
-      }
-      $tmp1=$oRN.'.bak';
-      $tmp2=$nRN.'.bak';
-      if(-e $tmp1){
-	  unless(rename($tmp1,$tmp2)){ }
-      } elsif(-e $tmp2){
-	  unlink $tmp2;
-      }
-  } else {
-      $request->print("<p> ".&mt('No such file').": ".&display($oldfile).'</p></form>');
-      return 0;
-  }
-  return 1;
+    &Debug($request, "Rename2 directory: ".$directory." old file: ".$oldfile.
+	   " new file ".$newfile."\n");
+    &Debug($request, "Target is: ".$directory.'/'.
+	   $newfile);
+    if (-e $oldfile) {
+
+	my $oRN=$oldfile;
+	my $nRN=$newfile;
+	unless (rename($oldfile,$newfile)) {
+	    $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
+	    return 0;
+	}
+	## If old name.(extension) exits, move under new name.
+	## If it doesn't exist and a new.(extension) exists  
+	## delete it (only concern when renaming over files)
+	my $tmp1=$oRN.'.meta';
+	my $tmp2=$nRN.'.meta';
+	if(-e $tmp1){
+	    unless(rename($tmp1,$tmp2)){ }
+	} elsif(-e $tmp2){
+	    unlink $tmp2;
+	}
+	$tmp1=$oRN.'.save';
+	$tmp2=$nRN.'.save';
+	if(-e $tmp1){
+	    unless(rename($tmp1,$tmp2)){ }
+	} elsif(-e $tmp2){
+	    unlink $tmp2;
+	}
+	$tmp1=$oRN.'.log';
+	$tmp2=$nRN.'.log';
+	if(-e $tmp1){
+	    unless(rename($tmp1,$tmp2)){ }
+	} elsif(-e $tmp2){
+	    unlink $tmp2;
+	}
+	$tmp1=$oRN.'.bak';
+	$tmp2=$nRN.'.bak';
+	if(-e $tmp1){
+	    unless(rename($tmp1,$tmp2)){ }
+	} elsif(-e $tmp2){
+	    unlink $tmp2;
+	}
+    } else {
+	$request->print("<p> ".&mt('No such file').": ".&display($oldfile).'</p></form>');
+	return 0;
+    }
+    return 1;
 }
+
 =pod
 
 =item Delete2($request, $user, $filename)
@@ -910,36 +966,34 @@ Returns:
 =cut
 
 sub Delete2 {
-  my ($request, $user, $filename) = @_;
-  if(opendir DIR, $filename) { 
-    my @files=readdir(DIR);
-    shift @files; shift @files; # takes off . and ..
-    if(@files) { 
-      $request->print('<font color="red"> '.&mt('Error: Directory Non Empty').'</font>'); 
-      return 0;
-    } else {   
-      if(-e $filename) {
-        unless(rmdir($filename)) {
-          $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
-          return 0;
-        }
-      } else {
-        $request->print('<p> '.&mt('No such file').'. </p></form>');
-        return 0;
-      }
-     }
-   } else {
-    if(-e $filename) {
-      unless(unlink($filename)) {
-        $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
-        return 0;
-      }
+    my ($request, $user, $filename) = @_;
+    if (-d $filename) { 
+	unless (&empty_directory($filename,'Delete2')) { 
+	    $request->print('<font color="red"> '.&mt('Error: Directory Non Empty').'</font>'); 
+	    return 0;
+	} else {   
+	    if(-e $filename) {
+		unless(rmdir($filename)) {
+		    $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
+		    return 0;
+		}
+	    } else {
+		$request->print('<p> '.&mt('No such file').'. </p></form>');
+		return 0;
+	    }
+	}
     } else {
-      $request->print('<p> '.&mt('No such file').'. </p></form>');
-      return 0;
-  }
+	if(-e $filename) {
+	    unless(unlink($filename)) {
+		$request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
+		return 0;
+	    }
+	} else {
+	    $request->print('<p> '.&mt('No such file').'. </p></form>');
+	    return 0;
 	}
-  return 1;
+    }
+    return 1;
 }
 
 =pod
@@ -966,7 +1020,7 @@ sub Delete2 {
 
 =back
 
-Returns 0 failure, and 0 successs.
+Returns 0 failure, and 1 successs.
 
 =cut
 
@@ -974,14 +1028,23 @@ sub Copy2 {
     my ($request, $username, $dir, $oldfile, $newfile) = @_;
     &Debug($request ,"Will try to copy $oldfile to $newfile");
     if(-e $oldfile) {
+        if ($oldfile eq $newfile) {
+            $request->print('<font color="red"> '.&mt('Warning').': '.&mt('Name of new file is the same as name of old file').' - '.&mt('no action taken').'.</font>');
+            return 1;
+        }
 	unless (copy($oldfile, $newfile)) {
 	    $request->print('<font color="red"> '.&mt('copy Error').': '.$!.'</font>');
 	    return 0;
+	} elsif (!chmod(0660, $newfile)) {
+	    $request->print('<font color="red"> '.&mt('chmod error').': '.$!.'</font>');
+	    return 0;
+	} elsif (-e $oldfile.'.meta' && 
+		 !copy($oldfile.'.meta', $newfile.'.meta') &&
+		 !chmod(0660, $newfile.'.meta')) {
+	    $request->print('<font color="red"> '.&mt('copy metadata error').
+			    ': '.$!.'</font>');
+	    return 0;
 	} else {
-	    unless (chmod(0660, $newfile)) {
-		$request->print('<font color="red"> '.&mt('chmod error').': '.$!.'</font>');
-		return 0;
-	    }
 	    return 1;
 	}
     } else {
@@ -990,6 +1053,7 @@ sub Copy2 {
     }
     return 1;
 }
+
 =pod
 
 =item NewDir2($request, $user, $newdirectory)
@@ -1013,28 +1077,30 @@ Returns 0 - failure 1 - success.
 =cut
 
 sub NewDir2 {
-  my ($request, $user, $newdirectory) = @_;
+    my ($request, $user, $newdirectory) = @_;
   
-  unless(mkdir($newdirectory, 02770)) {
-    $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
-    return 0;
-  }
-  unless(chmod(02770, ($newdirectory))) {
-      $request->print('<font color="red"> '.&mt('Error').': '.$!.'</font>');
-      return 0;
-  }
-  return 1;
+    unless(mkdir($newdirectory, 02770)) {
+	$request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
+	return 0;
+    }
+    unless(chmod(02770, ($newdirectory))) {
+	$request->print('<font color="red"> '.&mt('Error').': '.$!.'</font>');
+	return 0;
+    }
+    return 1;
 }
+
 sub decompress2 {
-	my ($r, $user, $dir, $file) = @_;
-	&Apache::lonnet::appenv('cgi.file' => $file);
-	&Apache::lonnet::appenv('cgi.dir' => $dir);
-	my $result=&Apache::lonnet::ssi_body('/cgi-bin/decompress.pl');
-	$r->print($result);
-	&Apache::lonnet::delenv('cgi.file');
-	&Apache::lonnet::delenv('cgi.dir');
-	return 1;
+    my ($r, $user, $dir, $file) = @_;
+    &Apache::lonnet::appenv('cgi.file' => $file);
+    &Apache::lonnet::appenv('cgi.dir' => $dir);
+    my $result=&Apache::lonnet::ssi_body('/cgi-bin/decompress.pl');
+    $r->print($result);
+    &Apache::lonnet::delenv('cgi.file');
+    &Apache::lonnet::delenv('cgi.dir');
+    return 1;
 }
+
 =pod
 
 =item phasetwo($r, $fn, $uname, $udom)
@@ -1072,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.
@@ -1080,150 +1146,153 @@ sub phasetwo {
     if ($fn=~m:(.*)/([^/]+):) {
 	$dir=$1;		# Directory path
 	$main=$2;		# Filename.
-	}
-	if($main=~m:\.(\w+)$:){ # Fixes problems with filenames with no extensions
-		$main=$`; #This is what is before the match (.) so it's just the main filename, yea it's nasty
-		$suffix=$1; #This is the actually filename extension if it exists
-	}
-    my $dest;                   # On success this is where we'll go.
-    
-    &Debug($r, 
-	   "loncfile::phase2 dir = $dir main = $main suffix = $suffix");
-    &Debug($r,
-	   "    newfilename = ".$ENV{'form.newfilename'});
+    }
+    if($main=~m:\.(\w+)$:){ # Fixes problems with filenames with no extensions
+	$suffix=$1; #This is the actually filename extension if it exists
+	$main=~s/\.\w+$//; #strip the extension
+    }
+    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'});
 
     my $conspace=$fn;
     
-    &Debug($r, 
-	   "loncfile::phase2 Full construction space name: $conspace");
+    &Debug($r,"loncfile::phase2 Full construction space name: $conspace");
     
-    &Debug($r, 
-	   "loncfie::phase2 action is $ENV{'form.action'}");
+    &Debug($r,"loncfie::phase2 action is $env{'form.action'}");
     
     # Select the appropriate processing sub.
-    if ($ENV{'form.action'} eq 'decompress') { 
-	$main .= '.';
-	$main .= $suffix;
-	    if(!&decompress2($r, $uname, $dir, $main)) {
-		return ;
-		}
-	    $dest = $dir."/.";
-     
-	
-    } elsif ($ENV{'form.action'} eq 'rename') { # Rename.
-	if($ENV{'form.newfilename'}) {
+    if ($env{'form.action'} eq 'decompress') { 
+	$main .= '.'.$suffix;
+	if(!&decompress2($r, $uname, $dir, $main)) {
+	    return ;
+	}
+	$dest = $dir."/.";
+    } elsif ($env{'form.action'} eq 'rename' ||
+	     $env{'form.action'} eq 'move') {
+	if($env{'form.newfilename'}) {
 	    if (!defined($dir)) {
 		$fn=~m:^(.*)/:;
-		$dir=$1;
+		$dir=$1; 
 	    }
-	    if(!&Rename2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {
+	    if(!&Rename2($r, $uname, $dir, $fn, $env{'form.newfilename'})) {
 		return;
 	    }
-	    $dest = &url($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'})) {
+    } elsif ($env{'form.action'} eq 'delete') { 
+	if(!&Delete2($r, $uname, $env{'form.newfilename'})) {
 	    return ;
 	}
 	# Once a resource is deleted, we just list the directory that
 	# previously held it.
 	#
 	$dest = $dir."/.";		# Parent dir.
-    } elsif ($ENV{'form.action'} eq 'copy') { 
-	if($ENV{'form.newfilename'}) {
-	    if(!&Copy2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {
+    } elsif ($env{'form.action'} eq 'copy') { 
+	if($env{'form.newfilename'}) {
+	    if(!&Copy2($r, $uname, $dir, $fn, $env{'form.newfilename'})) {
 		return ;
-		}
-	    $dest = $ENV{'form.newfilename'};
-     
-	} else {
+	    }
+	    $dest = $env{'form.newfilename'};
+     	} else {
 	    $r->print('<p>'.&mt('No New filename specified').'</p></form>');
 	    return;
 	}
 	
-    } elsif ($ENV{'form.action'} eq 'newdir') {
-        my $newdir= $ENV{'form.newfilename'};
+    } elsif ($env{'form.action'} eq 'newdir') {
+        my $newdir= $env{'form.newfilename'};
 	if(!&NewDir2($r, $uname, $newdir)) {
 	    return;
 	}
-	$dest = $newdir."/"
+	$dest = $newdir."/";
     }
-    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>');
+    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>');
+	}
     }
 }
 
 sub handler {
 
-  $r=shift;
+    $r=shift;
 
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress','action','filename','newfilename']);
 
-  &Debug($r, "loncfile.pm - handler entered");
-  &Debug($r, " filename: ".$ENV{'form.filename'});
-  &Debug($r, " newfilename: ".$ENV{'form.newfilename'});
+    &Debug($r, "loncfile.pm - handler entered");
+    &Debug($r, " filename: ".$env{'form.filename'});
+    &Debug($r, " newfilename: ".$env{'form.newfilename'});
 #
 # Determine the root filename
 # This could come in as "filename", which actually is a URL, or
 # as "qualifiedfilename", which is indeed a real filename in filesystem
 #
-  my $fn;
+    my $fn;
 
-  if ($ENV{'form.filename'}) {
-	
-	&Debug($r, "test: $ENV{'form.filename'}");
-      $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
-      $fn=&URLToPath($fn);
-  }  
-	#Just hijack the script only the first time around to inject the correct information for further processing
-    elsif($ENV{'QUERY_STRING'} && $ENV{'form.phase'} ne 'two') {
-	  &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress']);
-	 $fn=&Apache::lonnet::unescape($ENV{'form.decompress'});
+    if ($env{'form.filename'}) {
+	&Debug($r, "test: $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=&unescape($env{'form.decompress'});
 	$fn=&URLToPath($fn);
-	$ENV{'form.action'}="decompress";
-  }
+	$env{'form.action'}="decompress";
+    } elsif ($env{'form.qualifiedfilename'}) {
+	$fn=$env{'form.qualifiedfilename'};
+    } else {
+	&Debug($r, "loncfile::handler - no form.filename");
+	$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
+		       ' unspecified filename for cfile', $r->filename); 
+	return HTTP_NOT_FOUND;
+    }
 
-    elsif ($ENV{'form.qualifiedfilename'}) {
-      $fn=$ENV{'form.qualifiedfilename'};
-  } else {
-      &Debug($r, "loncfile::handler - no form.filename");
-     $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
-         ' unspecified filename for cfile', $r->filename); 
-     return HTTP_NOT_FOUND;
-  }
-
-  unless ($fn) { 
-      &Debug($r, "loncfile::handler - doctored url is empty");
-     $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
-         ' trying to cfile non-existing file', $r->filename); 
-     return HTTP_NOT_FOUND;
-  } 
+    unless ($fn) { 
+	&Debug($r, "loncfile::handler - doctored url is empty");
+	$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
+		       ' trying to cfile non-existing file', $r->filename); 
+	return HTTP_NOT_FOUND;
+    } 
 
 # ----------------------------------------------------------- Start page output
-  my $uname;
-  my $udom;
+    my $uname;
+    my $udom;
 
-  ($uname,$udom)=
-    &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
-  &Debug($r, 
-	 "loncfile::handler constructaccess uname = $uname domain = $udom");
-  unless (($uname) && ($udom)) {
-     $r->log_reason($uname.' at '.$udom.
-         ' trying to manipulate file '.$ENV{'form.filename'}.
-         ' ('.$fn.') - not authorized', 
-         $r->filename); 
-     return HTTP_NOT_ACCEPTABLE;
-  }
-
-
-  &Apache::loncommon::content_type($r,'text/html');
-  $r->send_http_header;
-
-  if ( ($ENV{'form.action'} eq 'newdir') && ($ENV{'form.phase'} eq 'two') && ( ($ENV{'form.callingmode'} eq 'testbank') || ($ENV{'form.callingmode'} eq 'imsimport') ) ) {
-      my $newdirname = $ENV{'form.newfilename'};
-      $r->print('<html><head><title>LON-CAPA Construction Space</title><script language="Javascript">');
-      $r->print(qq|
+    ($uname,$udom)=
+	&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
+    &Debug($r, 
+	   "loncfile::handler constructaccess uname = $uname domain = $udom");
+    unless (($uname) && ($udom)) {
+	$r->log_reason($uname.' at '.$udom.
+		       ' trying to manipulate file '.$env{'form.filename'}.
+		       ' ('.$fn.') - not authorized', 
+		       $r->filename); 
+	return HTTP_NOT_ACCEPTABLE;
+    }
+
+
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+
+    my (%loaditem,$js);
+
+    if ( ($env{'form.action'} eq 'newdir') && ($env{'form.phase'} eq 'two') && ( ($env{'form.callingmode'} eq 'testbank') || ($env{'form.callingmode'} eq 'imsimport') ) ) {
+	my $newdirname = $env{'form.newfilename'};
+	$js = qq|
+<script type="text/javascript">
 function writeDone() {
     var winName = window.opener
     window.focus();
@@ -1231,60 +1300,60 @@ function writeDone() {
     setTimeout("self.close()",10000)
 }
   </script>
-  </head>|);
-      my $loaditem = 'onLoad="writeDone()"';
-      $r->print(&Apache::loncommon::bodytag('Construction Space File Operation','',$loaditem));
-  } else {
-      $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
-      $r->print(&Apache::loncommon::bodytag('Construction Space File Operation'));
-  }
-
+|;
+	$loaditem{'onload'} = "writeDone()";
+    }
+    
+    $r->print(&Apache::loncommon::start_page('Construction Space File Operation',
+					     $js,
+					     {'add_entries' => \%loaditem,}));
   
-  $r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>');
+    $r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>');
   
-  if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
-          $r->print('<h3><font color="red">'.&mt('Co-Author').': '.$uname.' at '.$udom.
-               '</font></h3>');
-  }
-
-
-  &Debug($r, "loncfile::handler Form action is $ENV{'form.action'} ");
-  if ($ENV{'form.action'} eq 'delete') {
-      
-      $r->print('<h3>'.&mt('Delete').'</h3>');
-  } elsif ($ENV{'form.action'} eq 'rename') {
-      $r->print('<h3>'.&mt('Rename').'</h3>');
-  } elsif ($ENV{'form.action'} eq 'move') {
-      $r->print('<h3>'.&mt('Move').'</h3>');
-  } elsif ($ENV{'form.action'} eq 'newdir') {
-      $r->print('<h3>'.&mt('New Directory').'</h3>');
-  } elsif ($ENV{'form.action'} eq 'decompress') {
-      $r->print('<h3>'.&mt('Decompress').'</h3>');
-  } elsif ($ENV{'form.action'} eq 'copy') {
-      $r->print('<h3>'.&mt('Copy').'</h3>');
-  } elsif ($ENV{'form.action'} eq 'newfile' ||
-	   $ENV{'form.action'} eq 'newhtmlfile' ||
-	   $ENV{'form.action'} eq 'newproblemfile' ||
-           $ENV{'form.action'} eq 'newpagefile' ||
-           $ENV{'form.action'} eq 'newsequencefile' ||
-	   $ENV{'form.action'} eq 'newrightsfile' ||
-	   $ENV{'form.action'} eq 'newstyfile' ||
-           $ENV{'form.action'} eq 'Select Action' ) {
-      $r->print('<h3>'.&mt('New Resource').'</h3>');
-  } else {
-     $r->print('<p>'.&mt('Unknown Action').' '.$ENV{'form.action'}.' </p></body></html>');
-     return OK;  
-  }
-  if ($ENV{'form.phase'} eq 'two') {
-      &Debug($r, "loncfile::handler  entering phase2");
-      &phasetwo($r,$fn,$uname,$udom);
-  } else {
-      &Debug($r, "loncfile::handler  entering phase1");
-      &phaseone($r,$fn,$uname,$udom);
-  }
+    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+	$r->print('<h3><font color="red">'.&mt('Co-Author').': '.$uname.' at '.$udom.
+		  '</font></h3>');
+    }
+
+
+    &Debug($r, "loncfile::handler Form action is $env{'form.action'} ");
+    if ($env{'form.action'} eq 'delete') {
+      	$r->print('<h3>'.&mt('Delete').'</h3>');
+    } elsif ($env{'form.action'} eq 'rename') {
+	$r->print('<h3>'.&mt('Rename').'</h3>');
+    } elsif ($env{'form.action'} eq 'move') {
+	$r->print('<h3>'.&mt('Move').'</h3>');
+    } elsif ($env{'form.action'} eq 'newdir') {
+	$r->print('<h3>'.&mt('New Directory').'</h3>');
+    } elsif ($env{'form.action'} eq 'decompress') {
+	$r->print('<h3>'.&mt('Decompress').'</h3>');
+    } elsif ($env{'form.action'} eq 'copy') {
+	$r->print('<h3>'.&mt('Copy').'</h3>');
+    } elsif ($env{'form.action'} eq 'newfile' ||
+	     $env{'form.action'} eq 'newhtmlfile' ||
+	     $env{'form.action'} eq 'newproblemfile' ||
+	     $env{'form.action'} eq 'newpagefile' ||
+	     $env{'form.action'} eq 'newsequencefile' ||
+	     $env{'form.action'} eq 'newrightsfile' ||
+	     $env{'form.action'} eq 'newstyfile' ||
+             $env{'form.action'} eq 'newlibraryfile' ||
+	     $env{'form.action'} eq 'Select Action' ) {
+	$r->print('<h3>'.&mt('New Resource').'</h3>');
+    } else {
+	$r->print('<p>'.&mt('Unknown Action').' '.$env{'form.action'}.' </p>'.
+		  &Apache::loncommon::end_page());
+	return OK;  
+    }
+    if ($env{'form.phase'} eq 'two') {
+	&Debug($r, "loncfile::handler  entering phase2");
+	&phasetwo($r,$fn,$uname,$udom);
+    } else {
+	&Debug($r, "loncfile::handler  entering phase1");
+	&phaseone($r,$fn,$uname,$udom);
+    }
 
-  $r->print('</body></html>');
-  return OK;  
+    $r->print(&Apache::loncommon::end_page());
+    return OK;  
 }
 
 1;
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>500 Internal Server Error</title>
</head><body>
<h1>Internal Server Error</h1>
<p>The server encountered an internal error or
misconfiguration and was unable to complete
your request.</p>
<p>Please contact the server administrator at 
 root@localhost to inform them of the time this error occurred,
 and the actions you performed just before this error.</p>
<p>More information about this error may be available
in the server error log.</p>
</body></html>