Merge pull request #94 from ericvaandering/port_htaccess

Apply parts of missed commit from 2012

Author: ericvaandering

DocDB/cgi/FileUtilities.pm

@@ -200,8 +200,6 @@ sub StreamFile (%) {
 
     my @Parts = split /\//,$File;
     my $ShortFile = pop @Parts;
-    select STDOUT;
-    $| = 1;
 
     my $AttachmentString = "";
     if (defined($Preferences{Options}{FileEndingsForAttachment})) {
@@ -216,6 +214,9 @@ sub StreamFile (%) {
           "Content-Disposition: $AttachmentString filename=\"$ShortFile\"\n",
           "Content-Length: $Size\n\n";
 
+    select STDOUT;
+    $| = 1;
+
     open OUT, "<$File" or die "Cannot open File\n";
     binmode OUT if -B $File;
     my $BlockSize = (stat OUT)[11] || 16384;

DocDB/cgi/RetrieveArchive

@@ -113,17 +113,17 @@ unless (@ErrorStack) {
 
     if ($Type eq "tar.gz") {
       if ($GTar) {
-        $Status = system("$GTar czf $TmpFile -C $Directory .");
+        $Status = system("$GTar czf $TmpFile --exclude='.htaccess' -C $Directory .");
       }
       elsif ($Tar && $GZip) {
-        $Status = system("$Tar cf - $Directory | $GZip > $TmpFile");
+        $Status = system("$Tar cf - --exclude='.htaccess' $Directory | $GZip > $TmpFile");
       }
     }
     elsif ($Type eq "tar") {
-      $Status = system("$Tar cf $TmpFile $Directory");
+      $Status = system("$Tar cf --exclude='.htaccess' $TmpFile $Directory");
     }
     elsif ($Type eq "zip") {
-      $Status = system("$Zip $TmpFile $Directory/*");
+      $Status = system("$Zip $TmpFile $Directory/* -x .htaccess ");
     }
     if ($Status) {
       push @ErrorStack, "There was a problem creating the archive. Please contact an administrator.";