--- loncom/publisher/loncfile.pm	2003/08/04 20:08:23	1.38
+++ loncom/publisher/loncfile.pm	2004/04/03 00:23:47	1.53
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.38 2003/08/04 20:08:23 www Exp $
+# $Id: loncfile.pm,v 1.53 2004/04/03 00:23:47 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,6 +72,7 @@ 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.
@@ -110,7 +111,7 @@ sub Debug {
   # Put out the indicated message butonly if DEBUG is true.
   
   if ($DEBUG) {
-    $log->debug($message);
+  $r->log_reason($message);
   }
 }
 
@@ -168,83 +169,35 @@ sub url {
 
 sub display {
     my $fn=shift;
-    $fn=~s/^\/home\/(\w+)\/public\_html//;
+    $fn=~s-^/home/(\w+)/public_html-/priv/$1-;
     return '<tt>'.$fn.'</tt>';
 }
 
-=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;
+# see if the file is
+# a) published (return 0 if not)
+# b) if, so obsolete (return 0 if not)
+
+sub obsolete_unpub {
+    my ($user,$domain,$construct)=@_;
+    my $published=$construct;
+    $published=~
+	s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//;
+    if (-e $published) {
+	if (&Apache::lonnet::metadata($published,'obsolete')) {
+	    return 1;
+	}
+	return 0;
+    } else {
+	return 1;
+    }
 }
 
-=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;
-
-}
 
 =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.
@@ -258,9 +211,6 @@ sub ConstructionPath {
 =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
@@ -278,27 +228,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>';
+      $result.='<p><font color="red">'.&mt('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!').'</font></p>';
   }
-
   return $result;
 
 }
@@ -341,7 +283,7 @@ 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;
 }
@@ -350,7 +292,7 @@ sub cleanDest {
     my ($request,$dest)=@_;
     #remove bad characters
     if  ($dest=~/[\#\?&]/) {
-	$request->print("<p><font color=\"red\">Invalid characters in requested name have been removed.</font></p>");
+	$request->print("<p><font color=\"red\">".&mt('Invalid characters in requested name have been removed.')."</font></p>");
 	$dest=~s/[\#\?&]//g;
     }
     return $dest;
@@ -393,9 +335,9 @@ Parameters:
 
 sub CloseForm1 {
    my ($request,  $fn) = @_;
-   $request->print('<p><input type="submit" value="Continue" /></p></form>');
+   $request->print('<p><input type="submit" value="'.&mt('Continue').'" /></p></form>');
    $request->print('<form action="'.&url($fn).
-     '" method="POST"><p><input type="submit" value="Cancel" /></p></form>');
+     '" method="POST"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>');
 }
 
 
@@ -425,7 +367,7 @@ Parameters:
 
 sub CloseForm2 {
   my ($request, $user, $fn) = @_;
-  $request->print('<h3><a href="'.&url($fn).'/">Done</a></h3>');
+  $request->print('<h3><a href="'.&url($fn).'/">'.&mt('Done').'</a></h3>');
 }
 
 =pod
@@ -464,10 +406,16 @@ new filename relative to the current dir
 =cut  
 
 sub Rename1 {
-    my ($request, $user, $domain, $fn, $newfilename) = @_;
+    my ($request, $user, $domain, $fn, $newfilename, $style) = @_;
 
     if(-e $fn) {
 	if($newfilename) {
+	    # is dest a dir
+	    if ($style eq 'move') {
+		if (-d $newfilename) {
+		    if ($fn =~ m|/([^/]*)$|) { $newfilename .= '/'.$1; }
+		}
+	    }
 	    if ($newfilename =~ m|/[^\.]+$|) {
 		#no extension add on original extension
 		if ($fn =~ m|/[^\.]*\.([^\.]+)$|) {
@@ -476,29 +424,50 @@ sub Rename1 {
 	    }
 	    $request->print(&checksuffix($fn, $newfilename));
 	    #renaming a dir, delete the trailing /
-            #remove last element for current dir
-	    my $dir=$fn;
-	    if ($fn =~ m|/$|) {
-		$fn =~ s|/$||;
-		$dir =~ s|/[^/]*$||;
+            #remove second to last element for current dir
+	    if (-d $fn) {
+		$newfilename=~/\.(\w+)$/;
+		if (&Apache::loncommon::fileembstyle($1) eq 'ssi') {
+		    $request->print('<br /><font color="red">'.
+				 &mt('Cannot change MIME type of a directory').
+				    '</font>'.
+			'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+		    return;
+		}
+		$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="'.&url($fn).'">Cancel</a>');
+		$request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
 		return;
 	    }
+	    unless (&obsolete_unpub($user,$domain,$fn)) {
+		$request->print('<h3>'.&mt('Cannot rename or move non-obsolete published file').'</h3>'.
+				'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+		return;
+	    }
+	    my $action;
+	    if ($style eq 'rename') {
+		$action=&mt('Rename');
+	    } else {
+		$action=&mt('Move');
+	    }
 	    $request->print('<input type="hidden" name="newfilename" value="'.
 			    $newfilename.
-			    '" /><p>Rename '.&display($fn).
+			    '" /><p>'.$action.' '.&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: '.&display($fn).'</p></form>');
+	$request->print('<p> '.&mt('No such file').': '.&display($fn).'</p></form>');
 	return;
     }
     
@@ -533,10 +502,15 @@ sub Delete1 {
   if( -e $fn) {
     $request->print('<input type="hidden" name="newfilename" value="'.
 		    $fn.'"/>');
-    $request->print('<p>Delete '.&display($fn).'?</p>');
+    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>No such file: '.&display($fn).'</p></form>');
+    $request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
   }
 }
 
@@ -568,24 +542,36 @@ Parameters:
 =cut
 
 sub Copy1 {
-  my ($request, $user, $domain, $fn, $newfilename) = @_;
+    my ($request, $user, $domain, $fn, $newfilename) = @_;
 
-  if(-e $fn) {
-    $request->print(&checksuffix($fn,$newfilename));
-    my $return=&exists($user, $domain, $fn, $newfilename);
-    $request->print($return);
-    if ($return =~/^Error:/) {
-	$request->print('<br /><a href="'.&url($fn).'">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>');
     }
-    $request->print('<input type = "hidden" name = "newfilename" value = "'.
-		    $newfilename.
-		    '" /><p>Copy '.&display($fn).'<br />to '.
-		    &display($newfilename).'?</p>');
-    &CloseForm1($request, $fn);
-  } else {
-    $request->print('<p>No such file: '.&display($fn).'</p></form>');
-  }
 }
 
 =pod
@@ -629,19 +615,35 @@ causes the newdir operation to transitio
 
 sub NewDir1
 {
-  my ($request, $username, $domain, $fn, $newfilename) = @_;
+  my ($request, $username, $domain, $fn, $newfilename, $mode) = @_;
 
-  if(-e $newfilename) {
-    $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 {
+    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>Make new directory '.
+		    $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
@@ -688,6 +690,14 @@ sub NewFile1 {
 
     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
@@ -696,17 +706,16 @@ sub NewFile1 {
 	    $newfilename.=".$extension";
 	}
     }
-
-    if(-e $newfilename) {
-	$request->print('<p>File exists.</p></form>');
-    }
-    else {
-	$request->print('<p>Make new file '.&display($newfilename).'?</p>');
+    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="'.&url($newfilename).
-			'" method="POST"><p><input type="submit" value="Continue" /></p></form>');
+			'" method="POST"><p><input type="submit" value="'.&mt('Continue').'" /></p></form>');
 	$request->print('<form action="'.&url($fn).
-			'" method="POST"><p><input type="submit" value="Cancel" /></p></form>');
+			'" method="POST"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>');
     }
 }
 
@@ -743,24 +752,31 @@ sub phaseone {
   
   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'}.'" />');
   
   if ($ENV{'form.action'} eq 'rename') {
-      &Rename1($r, $uname, $udom, $fn, $newfilename);
+      &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>No new filename specified.</p></form>');
+	  $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
       }
   } elsif ($ENV{'form.action'} eq 'newdir') {
-      &NewDir1($r, $uname, $udom, $fn, $newfilename);
+      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' ||
@@ -772,7 +788,7 @@ sub phaseone {
       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>');
       }
   }
 }
@@ -820,12 +836,46 @@ sub Rename2 {
   &Debug($request, "Target is: ".$directory.'/'.
 	 $newfile);
   if (-e $oldfile) {
+
+      my $oRN=$oldfile;
+      my $nRN=$newfile;
       unless (rename($oldfile,$newfile)) {
-	  $request->print('<font color="red">Error: '.$!.'</font>');
+	  $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> No such file: ".&display($oldfile).'</p></form>');
+      $request->print("<p> ".&mt('No such file').": ".&display($oldfile).'</p></form>');
       return 0;
   }
   return 1;
@@ -861,16 +911,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;
 }
 
@@ -907,17 +975,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;
@@ -948,16 +1016,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)
@@ -1000,13 +1077,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, 
@@ -1023,8 +1101,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:^(.*)/:;
@@ -1046,12 +1132,12 @@ 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;
 	}
 	
@@ -1062,7 +1148,11 @@ sub phasetwo {
 	}
 	$dest = $newdir."/"
     }
-    $r->print('<h3><a href="'.&url($dest).'">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>');
+    }
 }
 
 sub handler {
@@ -1081,9 +1171,20 @@ sub handler {
   my $fn;
 
   if ($ENV{'form.filename'}) {
+	
+	&Debug($r, "test: $ENV{'form.filename'}");
       $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
       $fn=&URLToPath($fn);
-  } elsif ($ENV{'form.qualifiedfilename'}) {
+  }  
+	#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");
@@ -1116,18 +1217,33 @@ sub handler {
   }
 
 
-  $r->content_type('text/html');
+  &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;
 
-  $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
-
-  $r->print(&Apache::loncommon::bodytag('Construction Space File Operation'));
+  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|
+function writeDone() {
+    var winName = window.opener
+    window.focus();
+    winName.document.dataForm.newdir.value = "$newdirname"
+    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'));
+  }
 
   
-  $r->print('<h3>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">Co-Author: '.$uname.' at '.$udom.
+          $r->print('<h3><font color="red">'.&mt('Co-Author').': '.$uname.' at '.$udom.
                '</font></h3>');
   }
 
@@ -1135,13 +1251,17 @@ 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 'move') {
+      $r->print('<h3>'.&mt('Move').'</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' ||
@@ -1150,9 +1270,9 @@ sub handler {
 	   $ENV{'form.action'} eq 'newrightsfile' ||
 	   $ENV{'form.action'} eq 'newstyfile' ||
            $ENV{'form.action'} eq 'Select Action' ) {
-      $r->print('<h3>New Resource</h3>');
+      $r->print('<h3>'.&mt('New Resource').'</h3>');
   } else {
-     $r->print('<p>Unknown Action '.$ENV{'form.action'}.' </p></body></html>');
+     $r->print('<p>'.&mt('Unknown Action').' '.$ENV{'form.action'}.' </p></body></html>');
      return OK;  
   }
   if ($ENV{'form.phase'} eq 'two') {