--- loncom/publisher/loncfile.pm	2003/03/08 01:41:53	1.28
+++ loncom/publisher/loncfile.pm	2003/12/15 22:01:14	1.48
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.28 2003/03/08 01:41:53 www Exp $
+# $Id: loncfile.pm,v 1.48 2003/12/15 22:01:14 taceyjo1 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,27 +33,6 @@
 #
 # http://www.lon-capa.org/
 #
-#
-# (Handler to retrieve an old version of a file
-#
-# (Publication Handler
-# 
-# (TeX Content Handler
-#
-# 05/29/00,05/30,10/11 Gerd Kortemeyer)
-#
-# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
-# 03/23 Guy Albertelli
-# 03/24,03/29 Gerd Kortemeyer)
-#
-# 03/31,04/03,05/02,05/09,06/23,06/24 Gerd Kortemeyer)
-#
-# 06/23 Gerd Kortemeyer
-# 05/07/02 Ron Fox:
-#           - Added Debug log output so that I can trace what the heck this
-#             undocumented thingy does.
-# 05/28/02  Ron Fox:
-#           - Started putting in pod in standard format.
 =pod
 
 =head1 NAME
@@ -92,6 +71,8 @@ use Apache::Constants qw(:common :http :
 use Apache::loncacc;
 use Apache::Log ();
 use Apache::lonnet;
+use Apache::loncommon();
+use Apache::lonlocal;
 
 my $DEBUG=0;
 my $r;				# Needs to be global for some stuff RF.
@@ -130,7 +111,7 @@ sub Debug {
   # Put out the indicated message butonly if DEBUG is true.
   
   if ($DEBUG) {
-    $log->debug($message);
+  $r->log_reason($message);
   }
 }
 
@@ -172,120 +153,29 @@ Global References
 sub URLToPath {
   my $Url = shift;
   &Debug($r, "UrlToPath got: $Url");
-  $Url=~ s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
+  $Url=~ s/\/+/\//g;
   $Url=~ s/^http\:\/\/[^\/]+//;
+  $Url=~ s/^\///;
+  $Url=~ s/(\~|priv\/)(\w+)\//\/home\/$2\/public_html\//;
   &Debug($r, "Returning $Url \n");
   return $Url;
 }
 
-=pod
-
-=item PublicationPath($domain, $user, $dir, $file)
-
-   Determines the filesystem path corresponding to a published resource
-   specification.  The returned value is the path.
-Parameters:
-
-=over 4
-
-=item   $domain - string [in] Name of the domain within which the resource is 
-             stored.
-
-=item   $user   - string [in] Name of the user asking about the resource.
-
-=item   $dir    - Directory path relative to the top of the resource space.
-
-=item   $file   - name of the resource file itself without path info.
-
-=back
-
-=over 4
-
-Returns:
-
-=item  string - full path to the file if it exists in publication space.
-
-=back
-     
-=cut
-
-sub PublicationPath
-{
-  my ($domain, $user, $dir, $file)=@_;
-
-  return '/home/httpd/html/res/'.$domain.'/'.$user.'/'.$dir.'/'.
-	$file;
-}
-
-=pod
-
-=item ConstructionPath($domain, $user, $dir, $file)
-
-   Determines the filesystem path corresponding to a construction space
-   resource specification.  The returned value is the path
-Parameters:
-
-=over 4
-
-=item   $user   - string [in] Name of the user asking about the resource.
-
-=item   $dir    - Directory path relative to the top of the resource space.
-
-=item   $file   - name of the resource file itself without path info.
-
-Returns:
-
-=item  string - full path to the file if it exists in Construction space.
-
-=back
-     
-=cut
-
-sub ConstructionPath {
-  my ($user, $dir, $file) = @_;
-
-  return '/home/'.$user.'/public_html/'.$dir.'/'.$file;
-
+sub url {
+    my $fn=shift;
+    $fn=~s/^\/home\/(\w+)\/public\_html/\/priv\/$1/;
+    return $fn;
 }
-=pod
-
-=item  ConstructionPathFromRelative($user, $relname)
-
-   Determines the path to a construction space file given
-the username and the path relative to the root of construction space.
-
-Parameters:
-
-=over 4
-
-=item  $user  - string [in] Name of the user in whose construction space the
-           file [will] live.
-
-=item  $relname - string[in] Path to the file relative to the root of the
-            construction space.
-
-=back
-
-Returns:
-
-=over 4   
-
-=item  string - Full path to the file.
-
-=back
-
-=cut
-
-sub ConstructionPathFromRelative {
-
-  my ($user, $relname) = @_;
-  return '/home/'.$user.'/public_html'.$relname;
 
+sub display {
+    my $fn=shift;
+    $fn=~s-^/home/(\w+)/public_html-/priv/$1-;
+    return '<tt>'.$fn.'</tt>';
 }
 
 =pod
 
-=item exists($user, $domain, $directory, $file)
+=item exists($user, $domain, $file)
 
    Determine if a resource file name has been published or exists
    in the construction space.
@@ -299,9 +189,6 @@ sub ConstructionPathFromRelative {
 =item  $domain - string [in] - Name of the domain in which the resource
                           might have been published.
 
-=item  $dir    - string [in] - Path relative to construction or resource space
-                          in which the resource might live.
-
 =item  $file   - string [in] - Name of the file.
 
 =back
@@ -319,28 +206,19 @@ Returns:
 =cut
 
 sub exists {
-  my ($user, $domain, $dir, $file) = @_;
-
-  # Create complete paths in publication and construction space.
-  my $relativedir=$dir;
-  $relativedir=s|/home/\Q$user\E/public_html||;
-  my $published = &PublicationPath($domain, $user, $relativedir, $file);
-  my $construct = &ConstructionPath($user, $relativedir, $file);
-
-  # If the resource exists in either space indicate this fact.
-  # Note that the check for existence in resource space is stricter.
-
-  my $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 'Error: destination for operation is a directory.';
+      return &mt('Error: destination for operation is an existing directory.');
   }
   if ( -e $published) {
-      $result.='<p><font color="red">Warning: target file exists, and has been published!</font></p>';
-  }
-  elsif ( -e $construct) {
-      $result.='<p><font color="red">Warning: target file exists!</font></p>';
+      $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;
 
 }
@@ -383,10 +261,38 @@ sub checksuffix {
     if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; }
     if ($oldsuffix ne $newsuffix) {
 	$result.=
-            '<p><font color="red">Warning: change of MIME type!</font></p>';
+            '<p><font color="red">'.&mt('Warning: change of MIME type!').'</font></p>';
     }
     return $result;
 }
+
+sub cleanDest {
+    my ($request,$dest)=@_;
+    #remove bad characters
+    if  ($dest=~/[\#\?&]/) {
+	$request->print("<p><font color=\"red\">".&mt('Invalid characters in requested name have been removed.')."</font></p>");
+	$dest=~s/[\#\?&]//g;
+    }
+    return $dest;
+}
+
+sub relativeDest {
+    my ($fn,$newfilename,$uname)=@_;
+    if ($newfilename=~/^\//) {
+# absolute, simply add path
+	$newfilename='/home/'.$uname.'/public_html/';
+    } else {
+	my $dir=$fn;
+	$dir=~s/\/[^\/]+$//;
+	$newfilename=$dir.'/'.$newfilename;
+    }
+    $newfilename=~s://+:/:g; # remove duplicate /
+    while ($newfilename=~m:/\.\./:) {
+	$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/..
+    }
+    return $newfilename;
+}
+
 =pod
 
 =item CloseForm1($request, $user, $file)
@@ -406,14 +312,10 @@ Parameters:
 =cut
 
 sub CloseForm1 {
-   my ($request,  $cancelurl) = @_;
-
-
-   &Debug($request, "Cancel url is: ".$cancelurl);
-   $request->print('<p><input type="submit" value="Continue" /></p></form>');
-   $request->print('<form action="'.$cancelurl.
-		   '" method="GET"><p><input type="submit" value="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>');
 }
 
 
@@ -442,9 +344,8 @@ Parameters:
 =cut
 
 sub CloseForm2 {
-  my ($request, $user, $directory) = @_;
-
-  $request->print('<h3><a href="/priv/'.$user.$directory.'/">Done </a> </h3>');
+  my ($request, $user, $fn) = @_;
+  $request->print('<h3><a href="'.&url($fn).'/">'.&mt('Done').'</a></h3>');
 }
 
 =pod
@@ -483,49 +384,47 @@ new filename relative to the current dir
 =cut  
 
 sub Rename1 {
-    my ($request, $filename, $user, $domain, $dir) = @_;
-    &Debug($request, "Username - ".$user." filename: ".$filename."\n");
-    my $conspace = $filename;
-
-    my $cancelurl = "/priv/".$filename;
-    $cancelurl    =~ s/\/home\///;
-    $cancelurl    =~ s/\/public_html//;
-    
-    if(-e $conspace) {
-	if($ENV{'form.newfilename'}) {
-	    my $newfilename = $ENV{'form.newfilename'};
-	    if ($newfilename =~ m|^[^\.]+$|) {
-		#no extension add on orignal extension
-		if ($filename =~ m|/[^\.]*\.([^\.]+)$|) {
+    my ($request, $user, $domain, $fn, $newfilename) = @_;
+
+    if(-e $fn) {
+	if($newfilename) {
+	    # is dest a dir
+	    if (-d $newfilename) {
+		if ($fn =~ m|/([^/]*)$|) { $newfilename .= '/'.$1; }
+	    }
+	    if ($newfilename =~ m|/[^\.]+$|) {
+		#no extension add on original extension
+		if ($fn =~ m|/[^\.]*\.([^\.]+)$|) {
 		    $newfilename.='.'.$1;
 		}
 	    }
-	    $request->print(&checksuffix($filename, $newfilename));
+	    $request->print(&checksuffix($fn, $newfilename));
 	    #renaming a dir, delete the trailing /
-            #remove last element for current dir
-	    if ($filename =~ m|/$|) {
-		$filename =~ s|/$||;
-		$dir =~ s|/[^/]*$||;
+            #remove second to last element for current dir
+	    if (-d $fn) {
+		$newfilename=~s/\/[^\/]+\/([^\/]+)$/\/$1/;
+	    }
+	    $newfilename=~s://+:/:g; # remove duplicate /
+	    while ($newfilename=~m:/\.\./:) {
+		$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/..
 	    }
-	    my $return=&exists($user, $domain, $dir, $newfilename);
+	    my $return=&exists($user, $domain, $newfilename);
 	    $request->print($return);
 	    if ($return =~/^Error:/) {
-		$request->print('<br /><a href="'.$cancelurl.'">Cancel</a>');
+		$request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
 		return;
 	    }
-	    my $dest=&SimplifyDir($dir,$newfilename);
 	    $request->print('<input type="hidden" name="newfilename" value="'.
 			    $newfilename.
-			    '" /><p>Rename <tt>'.$filename.
-			    '</tt><br /> to <tt>'.
-			    $dest.'</tt>?</p>');
-	    &CloseForm1($request, $cancelurl);
+			    '" /><p>'.&mt('Rename').' '.&display($fn).
+			    '</tt><br />to '.&display($newfilename).'?</p>');
+	    &CloseForm1($request, $fn);
 	} else {
-	    $request->print('<p>No new filename specified</p></form>');
+	    $request->print('<p>'.&mt('No new filename specified.').'</p></form>');
 	    return;
 	}
     } else {
-	$request->print('<p> No such File </p> </form>');
+	$request->print('<p> '.&mt('No such file').': '.&display($fn).'</p></form>');
 	return;
     }
     
@@ -541,34 +440,29 @@ Parameters:
 
 =over 4
 
-=item   $request   - Apache Request Object [in] request object for the current
+=item   $request   - Apache Request Object [in] request object for the current 
                 request.
 
-=item   $user      - string [in] Name of session user.
+=item   $user      - string [in]  Name of the user initiating the request.
 
+=item   $domain    - string [in]  Domain the initiating user is logged in as
 
-=item   $filename  - string [in] Name fo the file to be deleted:
-                Filename is the full filesystem path to the file.
+=item   $filename  - string [in]  Source filename.
 
 =back
 
 =cut
 
 sub Delete1 {
-  my ($request, $user,  $filename) = @_;
-
-  my $cancelurl = '/priv/'.$filename;
-  $cancelurl    =~ s/\/home\///;
-  $cancelurl    =~ s/\/public_html//;
-  
+  my ($request, $user, $domain, $fn) = @_;
 
-  if( -e $filename) {
+  if( -e $fn) {
     $request->print('<input type="hidden" name="newfilename" value="'.
-		    $filename.'"/>');
-    $request->print('<p> Delete <tt>'.$filename.'</tt>?</p>');
-    &CloseForm1($request, $cancelurl);
+		    $fn.'"/>');
+    $request->print('<p>'.&mt('Delete').' '.&display($fn).'?</p>');
+    &CloseForm1($request, $fn);
   } else {
-    $request->print('<p> No Such file: <tt>'.$filename.'</tt></p></form>');
+    $request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
   }
 }
 
@@ -591,9 +485,7 @@ Parameters:
 
 =item   $domain    - string [in]  Domain the initiating user is logged in as
 
-=item   $dir       - string [in]  Directory path.
-
-=item   $filename  - string [in]  Source filename.
+=item   $fn  - string [in]  Source filename.
 
 =item   $newfilename-string [in]  Destination filename.
 
@@ -602,58 +494,36 @@ Parameters:
 =cut
 
 sub Copy1 {
-  my ($request, $user, $domain, $dir, $filename, $newfilename) = @_;
-
-  my $cancelurl = "/priv/".$filename;
-  $cancelurl    =~ s/\/home\///;
-  $cancelurl    =~ s/\/public_html//;
-    
+    my ($request, $user, $domain, $fn, $newfilename) = @_;
 
-  if(-e $filename) {
-    $request->print(&checksuffix($filename,$newfilename));
-    my $return=&exists($user, $domain, $dir, $newfilename);
-    $request->print($return);
-    if ($return =~/^Error:/) {
-	$request->print('<br /><a href="'.$cancelurl.'">Cancel</a>');
-	return;
+    if(-e $fn) {
+	# is dest a dir
+	if (-d $newfilename) {
+	    if ($fn =~ m|/([^/]*)$|) { $newfilename .= '/'.$1; }
+	}
+	if ($newfilename =~ m|/[^\.]+$|) {
+	    #no extension add on original extension
+	    if ($fn =~ m|/[^\.]*\.([^\.]+)$|) {	$newfilename.='.'.$1; }
+	} 
+	$newfilename=~s://+:/:g; # remove duplicate /
+	while ($newfilename=~m:/\.\./:) {
+	    $newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/..
+	}
+	$request->print(&checksuffix($fn,$newfilename));
+	my $return=&exists($user, $domain, $newfilename);
+	$request->print($return);
+	if ($return =~/^Error:/) {
+	    $request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+	    return;
+	}
+	$request->print('<input type="hidden" name="newfilename" value="'.
+			$newfilename.
+			'" /><p>'.&mt('Copy').' '.&display($fn).'<br />to '.
+			&display($newfilename).'?</p>');
+	&CloseForm1($request, $fn);
+    } else {
+	$request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
     }
-    my $dest=&SimplifyDir($dir,$newfilename);
-    $request->print('<input type = "hidden" name = "newfilename" value = "'.
-		    $dir.'/'.$newfilename.
-		    '" /><p>Copy <tt>'.$filename.'</tt><br />  to '.
-		    '<tt>'.$dest.'</tt>?</p>');
-    &CloseForm1($request, $cancelurl);
-  } else {
-    $request->print('<p>No such file <tt>'.$filename.'</p></form>');
-  }
-}
-
-=pod
-
-=item SimplifyDir
-
-  Removes all extra / and all .. references
-
-Parameters:
-
-=over 4
-
-=item $dir - string [in] a directory name
-
-=item $file - string [in] a file reference relative to $dir
-
-=back
-
-Results: the concatenated path.
-
-=cut
-
-sub SimplifyDir {
-    my ($dir,$file) = @_;
-    my $location = $dir. '/'.$file;
-    $location=~s://+:/:g; # remove duplicate /
-    while ($location=~m:/\.\./:) {$location=~s:/[^/]+/\.\./:/:g;}#remove dir/..
-    return $location;
 }
 
 =pod
@@ -673,7 +543,9 @@ Parameters:
 
 =item   $username - Name of the user that is requesting the directory creation.
 
-=item   $path     - current directory relative to construction space.
+=item $domain - Domain user is in
+
+=item   $fn     - source file.
 
 =item   $newdir   - Name of the directory to be created; path relative to the 
                top level of construction space.
@@ -695,27 +567,30 @@ causes the newdir operation to transitio
 
 sub NewDir1
 {
-  my ($request, $username, $path, $newdir) = @_;
-
-  my $fullpath = '/home/'.$username.'/public_html/'.
-    $path.'/'.$newdir;
-
-  my $cancelurl = '/priv/'.$username.'/'.$path;
+  my ($request, $username, $domain, $fn, $newfilename) = @_;
 
-  &Debug($request, "Full path is : ".$fullpath);
-
-  if(-e $fullpath) {
-    $request->print('<p>Directory exists.</p></form>');
-  }
-  else {
+  my $result=&exists($username,$domain,$newfilename);
+  if ($result) {
+    $request->print('<font color="red">'.$result.'</font></form>');
+  } else {
     $request->print('<input type="hidden" name="newfilename" value="'.
-		    $newdir.'" /><p>Make new directory <tt>'.
-		    $path."/".$newdir.'</tt>?</p>');
-    &CloseForm1($request, $cancelurl);
-
+		    $newfilename.'" /><p>'.&mt('Make new directory').' '.
+		    &display($newfilename).'?</p>');
+    &CloseForm1($request, $fn);
   }
 }
 
+
+sub Decompress1 {
+   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>');
+     	  }
+}
 =pod
 
 =item NewFile1
@@ -737,7 +612,7 @@ Parameters:
 
 =item   $domain   - Name of the domain of the user
 
-=item   $dir      - current absolute diretory
+=item   $fn      - Source file name
 
 =item   $newfilename
                   - Name of the file to be created; no path information
@@ -749,7 +624,7 @@ Side Effects:
 
 =item 2 new forms are displayed.  Clicking on the confirmation button
 causes the browser to attempt to load the specfied URL, allowing the
-proper handler to take care of file creation. There is also a Cancle
+proper handler to take care of file creation. There is also a Cancel
 button which returns you to the driectory listing you came from
 
 =back
@@ -758,17 +633,18 @@ button which returns you to the driector
 
 
 sub NewFile1 {
-    my ($request, $user, $domain, $dir, $newfilename) = @_;
-
-    &Debug($request, "Dir is : ".$dir);
-    &Debug($request, "Newfile is : ".$newfilename);
-
-    my $cancelurl = "/priv/".$dir;
-    $cancelurl    =~ s/\/home\///;
-    $cancelurl    =~ s/\/public_html//;
+    my ($request, $user, $domain, $fn, $newfilename) = @_;
 
     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('Not Allowed').'</font>');
+	    return;
+	}
 	if ($newfilename !~ /\Q.$extension\E$/) {
 	    if ($newfilename =~ m|^[^\.]*\.([^\.]+)$|) {
 		#already has an extension strip it and add in expected one
@@ -777,24 +653,16 @@ sub NewFile1 {
 	    $newfilename.=".$extension";
 	}
     }
-
-    my $fullpath = $dir.'/'.$newfilename;
-
-    &Debug($request, "Full path is : ".$fullpath);
-
-    if(-e $fullpath) {
-	$request->print('<p>File exists.</p></form>');
-    }
-    else {
-	$request->print('<p>Make new file <tt>'.$dir.'/'.$newfilename.'</tt>?</p>');
-	my $dest=&MakeFinalUrl($request,$fullpath);
-	&Debug($request, "Cancel url is: ".$cancelurl);
-	&Debug($request, "Dest url is: ".$dest);
+    my $result=&exists($user,$domain,$newfilename);
+    if($result) {
+	$request->print('<font color="red">'.$result.'</font></form>');
+    } else {
+	$request->print('<p>'.&mt('Make new file').' '.&display($newfilename).'?</p>');
 	$request->print('</form>');
-	$request->print('<form action="'.$dest.
-			'" method="GET"><p><input type="submit" value="Continue" /></p></form>');
-	$request->print('<form action="'.$cancelurl.
-			'" method="GET"><p><input type="submit" value="Cancel" /></p></form>');
+	$request->print('<form action="'.&url($newfilename).
+			'" method="POST"><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>');
     }
 }
 
@@ -829,52 +697,39 @@ performed and reported to the user.
 sub phaseone {
   my ($r,$fn,$uname,$udom)=@_;
   
-  $fn=~m:(.*)/([^/]+)\.(\w+)$:;
-  my $dir=$1;
-  my $main=$2;
-  my $suffix=$3;
-  
-  #  my $conspace=ConstructionPathFromRelative($uname, $fn);
-  
-  
+  my $newfilename=&cleanDest($r,$ENV{'form.newfilename'});
+  $newfilename=&relativeDest($fn,$newfilename,$uname);
   $r->print('<form action="/adm/cfile" method="post">'.
-	    '<input type="hidden" name="filename" value="/~'.$uname.$fn.'" />'.
-	    '<input type="hidden" name="phase" value="two" />'.
-	    '<input type="hidden" name="action" value="'.$ENV{'form.action'}.'" />');
+      '<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') {
-      if (!defined($dir)) {
-	  $fn=~m:(.*)/:;
-	  $dir=$1;
-      }
-      &Rename1($r, $fn, $uname, $udom, $dir);
+      &Rename1($r, $uname, $udom, $fn, $newfilename);
   } elsif ($ENV{'form.action'} eq 'delete') { 
-    
-    &Delete1($r, $uname, $fn);
-    
+      &Delete1($r, $uname, $udom, $fn);
+  } elsif ($ENV{'form.action'} eq 'decompress') {
+      &Decompress1($r, $uname, $udom, $fn);
   } elsif ($ENV{'form.action'} eq 'copy') { 
-    if($ENV{'form.newfilename'}) {
-      my $newfilename = $ENV{'form.newfilename'};
-      &Copy1($r, $uname, $udom, $dir, $fn, $newfilename);
-    }else {
-      $r->print('<p>No new filename specified.</p></form>');
-    }
+      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') {
-    &NewDir1($r, $uname, $dir, $ENV{'form.newfilename'});
+      &NewDir1($r, $uname, $udom, $fn, $newfilename);
   }  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') {
-      if($ENV{'form.newfilename'}) {
-	  my $newfilename = $ENV{'form.newfilename'};
-	  if (!defined($dir)) {
-	      $fn=~m:(.*)/:;
-	      $dir=$1;
-	  }
-	  &NewFile1($r, $uname, $udom, $dir, $newfilename);
+            $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>No new filename specified.</p></form>');
+	  $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
       }
   }
 }
@@ -921,27 +776,47 @@ sub Rename2 {
 	 " new file ".$newfile."\n");
   &Debug($request, "Target is: ".$directory.'/'.
 	 $newfile);
+  if (-e $oldfile) {
 
-  if(-e $oldfile) {
-      my $dest;
-
-      if ($oldfile =~ m|/$|) {
-	  #renaming a dir
-	  $oldfile =~ s|/$||;
-	  $dest=$directory;
-	  $dest=~s|(/)([^/]*)$|$1|;
-	  $dest.='/'.$newfile;
-      } else {
-	  $dest=$directory.'/'.$newfile;
-      }
-
-      unless(rename($oldfile,$dest)) {
-	  $request->print('<font color="red">Error: '.$!.'</font>');
+      my $oRN=$oldfile;
+      my $nRN=$newfile;
+      unless (rename($oldfile,$newfile)) {
+	  $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
 	  return 0;
-      } else {}
+      }
+      ## 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> No such file: /home".$user.'/public_html'.
-		      $oldfile.' </p></form>');
+      $request->print("<p> ".&mt('No such file').": ".&display($oldfile).'</p></form>');
       return 0;
   }
   return 1;
@@ -977,16 +852,34 @@ Returns:
 
 sub Delete2 {
   my ($request, $user, $filename) = @_;
-
-  if(-e $filename) {
-    unless(unlink($filename)) {
-      $request->print('<font color="red">Error: '.$!.'</font>');
+  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;
+      }
+    } else {
+      $request->print('<p> '.&mt('No such file').'. </p></form>');
       return 0;
-    }
-  } else {
-    $request->print('<p> No such file. </p></form');
-    return 0;
   }
+	}
   return 1;
 }
 
@@ -1023,17 +916,17 @@ sub Copy2 {
     &Debug($request ,"Will try to copy $oldfile to $newfile");
     if(-e $oldfile) {
 	unless (copy($oldfile, $newfile)) {
-	    $request->print('<font color="red"> copy Error: '.$!.'</font>');
+	    $request->print('<font color="red"> '.&mt('copy Error').': '.$!.'</font>');
 	    return 0;
 	} else {
 	    unless (chmod(0660, $newfile)) {
-		$request->print('<font color="red"> chmod error: '.$!.'</font>');
+		$request->print('<font color="red"> '.&mt('chmod error').': '.$!.'</font>');
 		return 0;
 	    }
 	    return 1;
 	}
     } else {
-	$request->print('<p> No such file </p>');
+	$request->print('<p> '.&mt('No such file').' </p>');
 	return 0;
     }
     return 1;
@@ -1064,16 +957,25 @@ sub NewDir2 {
   my ($request, $user, $newdirectory) = @_;
   
   unless(mkdir($newdirectory, 02770)) {
-    $request->print('<font color="red">Error: '.$!.'</font>');
+    $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
     return 0;
   }
   unless(chmod(02770, ($newdirectory))) {
-      $request->print('<font color="red"> Error: '.$!.'</font>');
+      $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;
+}
 =pod
 
 =item phasetwo($r, $fn, $uname, $udom)
@@ -1116,13 +1018,14 @@ sub phasetwo {
     my $dir;		# Directory path
     my $main;		# Filename.
     my $suffix;		# Extension.
-
-    if ($fn=~m:(.*)/([^/]+)\.(\w+)$:) {
+    if ($fn=~m:(.*)/([^/]+):) {
 	$dir=$1;		# Directory path
 	$main=$2;		# Filename.
-	$suffix=$3;		# Extension.
-    }
-        
+	}
+	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, 
@@ -1139,8 +1042,16 @@ sub phasetwo {
 	   "loncfie::phase2 action is $ENV{'form.action'}");
     
     # Select the appropriate processing sub.
-    
-    if ($ENV{'form.action'} eq 'rename') { # Rename.
+    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 (!defined($dir)) {
 		$fn=~m:^(.*)/:;
@@ -1149,13 +1060,7 @@ sub phasetwo {
 	    if(!&Rename2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {
 		return;
 	    }
-	    # Prepend the directory to the new name to form the basis of the
-	    # url of the new resource.
-	    #
-	    #renaming a dir
-            #remove last element for current dir
-	    if ($fn =~ m|/$|) { $dir =~ s|/[^/]*$||; }
-	    $dest = $dir."/".$ENV{'form.newfilename'};
+	    $dest = &url($ENV{'form.newfilename'});
 	}
     } elsif ($ENV{'form.action'} eq 'delete') { 
 	if(!&Delete2($r, $uname, $ENV{'form.newfilename'})) {
@@ -1168,48 +1073,23 @@ sub phasetwo {
     } elsif ($ENV{'form.action'} eq 'copy') { 
 	if($ENV{'form.newfilename'}) {
 	    if(!&Copy2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {
-		return
+		return ;
 		}
 	    $dest = $ENV{'form.newfilename'};
      
 	} else {
-	    $r->print('<p>No New filename specified</p></form>');
+	    $r->print('<p>'.&mt('No New filename specified').'</p></form>');
 	    return;
 	}
 	
     } elsif ($ENV{'form.action'} eq 'newdir') {
-	#
-	# Since the newfilename form field is construction space
-	# relative, ew need to prepend the current path; now in $fn.
-	#
-        my $newdir= $fn.$ENV{'form.newfilename'};
+        my $newdir= $ENV{'form.newfilename'};
 	if(!&NewDir2($r, $uname, $newdir)) {
 	    return;
 	}
 	$dest = $newdir."/"
     }
-    #
-    #  Substitute for priv for the first home in $dir to get our
-    # construction space path.
-    #
-    $dest=&MakeFinalUrl($r,$dest);
-
-    $r->print('<h3><a href="'.$dest.'">Done</a></h3>');
-}
-
-sub MakeFinalUrl {
-    my($r,$dest)=@_;
-    &Debug($r, "Final url is: $dest");
-    $dest =~ s|/home/|/priv/|;
-    $dest =~ s|/public_html||;
-
-    my $base = &File::Basename::basename($dest);
-    my $dpath= &File::Basename::dirname($dest);
-    if ($base eq '.') { $base=''; }
-    $dest = &HTML::Entities::encode($dpath.'/'.$base);
-
-    &Debug($r, "Final url after rewrite: $dest");
-    return $dest;
+    $r->print('<h3><a href="'.&url($dest).'">'.&mt('Done').'</a></h3>');
 }
 
 sub handler {
@@ -1220,17 +1100,29 @@ sub handler {
   &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;
 
   if ($ENV{'form.filename'}) {
+	
+	&Debug($r, "test: $ENV{'form.filename'}");
       $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
-      &Debug($r, "loncfile::handler - raw url: $fn");
-#      $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
-#      $fn=~s/^http\:\/\/[^\/]+//;
-      $fn=URLToPath($fn);
-      &Debug($r, "loncfile::handler - doctored url: $fn");
+      $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'});
+	$fn=&URLToPath($fn);
+	$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'}.
@@ -1261,22 +1153,19 @@ sub handler {
      return HTTP_NOT_ACCEPTABLE;
   }
 
-  $fn=~s/\/\~(\w+)//;
-  &Debug($r, "loncfile::handler ~ removed filename: $fn");
 
   $r->content_type('text/html');
   $r->send_http_header;
 
   $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
 
-  $r->print(
-   '<body bgcolor="#FFFFFF"><img align="right" src="/adm/lonIcons/lonlogos.gif" />');
+  $r->print(&Apache::loncommon::bodytag('Construction Space File Operation'));
 
   
-  $r->print('<h1>Construction Space <tt>'.$fn.'</tt></h1>');
+  $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">Co-Author: '.$uname.' at '.$udom.
+          $r->print('<h3><font color="red">'.&mt('Co-Author').': '.$uname.' at '.$udom.
                '</font></h3>');
   }
 
@@ -1284,21 +1173,26 @@ sub handler {
   &Debug($r, "loncfile::handler Form action is $ENV{'form.action'} ");
   if ($ENV{'form.action'} eq 'delete') {
       
-      $r->print('<h3>Delete</h3>');
+      $r->print('<h3>'.&mt('Delete').'</h3>');
   } elsif ($ENV{'form.action'} eq 'rename') {
-      $r->print('<h3>Rename</h3>');
+      $r->print('<h3>'.&mt('Rename').'</h3>');
   } elsif ($ENV{'form.action'} eq 'newdir') {
-      $r->print('<h3>New Directory</h3>');
+      $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>Copy</h3>');
+      $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' ) {
-      $r->print('<h3>New Resource</h3>');
+           $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>Unknown Action</p></body></html>');
+     $r->print('<p>'.&mt('Unknown Action').' '.$ENV{'form.action'}.' </p></body></html>');
      return OK;  
   }
   if ($ENV{'form.phase'} eq 'two') {