--- loncom/publisher/loncfile.pm	2003/11/19 14:57:32	1.44
+++ loncom/publisher/loncfile.pm	2003/12/13 19:54:16	1.46
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.44 2003/11/19 14:57:32 taceyjo1 Exp $
+# $Id: loncfile.pm,v 1.46 2003/12/13 19:54:16 taceyjo1 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,7 +73,7 @@ use Apache::Log ();
 use Apache::lonnet;
 use Apache::loncommon();
 
-my $DEBUG=2;
+my $DEBUG=0;
 my $r;				# Needs to be global for some stuff RF.
 
 =pod
@@ -110,31 +110,12 @@ sub Debug {
   # Put out the indicated message butonly if DEBUG is true.
   
   if ($DEBUG) {
-   $r->log_reason($message);
+  $r->log_reason($message);
   }
 }
 
 =pod
 
-=item checksuffix($old, $new)
-        
-  Determine if a resource filename suffix (the stuff after the .) would change
-as a result of this operation.
-
- Parameters:
-
-=over 4
-
-=item  $old   = string [in]  Previous filename.
-
-=item  $new   = string [in]  Resultant filename.
-
-=back
-
-=cut
-
-=pod
-
 =item URLToPath($url)
 
   Convert a URL to a file system path.
@@ -717,7 +698,6 @@ sub phaseone {
   
   my $newfilename=&cleanDest($r,$ENV{'form.newfilename'});
   $newfilename=&relativeDest($fn,$newfilename,$uname);
-	&Debug($r, "Newfile: $newfilename");
   $r->print('<form action="/adm/cfile" method="post">'.
       '<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'.
       '<input type="hidden" name="phase" value="two" />'.
@@ -728,7 +708,6 @@ sub phaseone {
   } elsif ($ENV{'form.action'} eq 'delete') { 
       &Delete1($r, $uname, $udom, $fn);
   } elsif ($ENV{'form.action'} eq 'decompress') {
-	&Apache::lonnet::appenv('cgi.path' => $newfilename); 
       &Decompress1($r, $uname, $udom, $fn);
   } elsif ($ENV{'form.action'} eq 'copy') { 
       if($newfilename) {
@@ -872,16 +851,40 @@ 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"> Error: Directory Non Empty</font>'); 
       return 0;
     }
-  } else {
-    $request->print('<p> No such file. </p></form');
-    return 0;
+    else {   
+      if(-e $filename) {
+        unless(rmdir($filename)) {
+          $request->print('<font color="red">Error: '.$!.'</font>');
+          return 0;
+        }
+      }
+      else {
+        $request->print('<p> No such file. </p></form');
+        return 0;
+      }
+
+     }
+
+   }
+  else {
+    if(-e $filename) {
+      unless(unlink($filename)) {
+        $request->print('<font color="red">Error: '.$!.'</font>');
+        return 0;
+      }
+    }
+    else {
+      $request->print('<p> No such file. </p></form');
+      return 0;
   }
+	}
   return 1;
 }
 
@@ -1020,13 +1023,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=$`;
+		$suffix=$1;
+	}
     my $dest;                   # On success this is where we'll go.
     
     &Debug($r, 
@@ -1114,6 +1118,7 @@ sub handler {
       $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'});