--- loncom/publisher/loncfile.pm	2003/08/04 20:34:19	1.39
+++ loncom/publisher/loncfile.pm	2003/12/29 19:01:27	1.49
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.39 2003/08/04 20:34:19 www Exp $
+# $Id: loncfile.pm,v 1.49 2003/12/29 19:01:27 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,7 +169,7 @@ 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>';
 }
 
@@ -211,12 +212,12 @@ sub exists {
 s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//;
   my $result='';    
   if ( -d $construct ) {
-      return 'Error: destination for operation is an existing 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;
 
@@ -260,7 +261,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;
 }
@@ -269,7 +270,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;
@@ -312,9 +313,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>');
 }
 
 
@@ -344,7 +345,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
@@ -387,6 +388,10 @@ sub Rename1 {
 
     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|/[^\.]*\.([^\.]+)$|) {
@@ -399,23 +404,27 @@ sub Rename1 {
 	    if (-d $fn) {
 		$newfilename=~s/\/[^\/]+\/([^\/]+)$/\/$1/;
 	    }
+	    $newfilename=~s://+:/:g; # remove duplicate /
+	    while ($newfilename=~m:/\.\./:) {
+		$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/..
+	    }
 	    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;
 	    }
 	    $request->print('<input type="hidden" name="newfilename" value="'.
 			    $newfilename.
-			    '" /><p>Rename '.&display($fn).
+			    '" /><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: '.&display($fn).'</p></form>');
+	$request->print('<p> '.&mt('No such file').': '.&display($fn).'</p></form>');
 	return;
     }
     
@@ -450,10 +459,10 @@ sub Delete1 {
   if( -e $fn) {
     $request->print('<input type="hidden" name="newfilename" value="'.
 		    $fn.'"/>');
-    $request->print('<p>Delete '.&display($fn).'?</p>');
+    $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>');
   }
 }
 
@@ -485,24 +494,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, $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
@@ -553,12 +574,23 @@ sub NewDir1
     $request->print('<font color="red">'.$result.'</font></form>');
   } else {
     $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
@@ -605,6 +637,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
@@ -617,12 +657,12 @@ sub NewFile1 {
     if($result) {
 	$request->print('<font color="red">'.$result.'</font></form>');
     } else {
-	$request->print('<p>Make new file '.&display($newfilename).'?</p>');
+	$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>');
     }
 }
 
@@ -659,7 +699,6 @@ 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" />'.
@@ -669,11 +708,13 @@ sub phaseone {
       &Rename1($r, $uname, $udom, $fn, $newfilename);
   } 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);
@@ -688,7 +729,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>');
       }
   }
 }
@@ -736,12 +777,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;
@@ -777,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;
 }
 
@@ -823,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;
@@ -864,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)
@@ -916,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, 
@@ -939,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:^(.*)/:;
@@ -962,12 +1073,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;
 	}
 	
@@ -978,7 +1089,7 @@ sub phasetwo {
 	}
 	$dest = $newdir."/"
     }
-    $r->print('<h3><a href="'.&url($dest).'">Done</a></h3>');
+    $r->print('<h3><a href="'.&url($dest).'">'.&mt('Done').'</a></h3>');
 }
 
 sub handler {
@@ -997,9 +1108,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");
@@ -1032,7 +1154,7 @@ 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>');
@@ -1040,10 +1162,10 @@ sub handler {
   $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>');
   }
 
@@ -1051,13 +1173,15 @@ 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' ||
@@ -1066,9 +1190,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') {