Fix for bug 63601: Recommend filename when downloading attachments (except in IE4, which chokes on the Content-Disposition header)

Patch by Daniel Raichle <draichle@gmx.net> and Dave Miller <justdave@syndicomm.com>
r= bbaetz, gerv

3 files changed, 34 insertions, 9 deletions

diff --git a/attachment.cgi b/attachment.cgi
index fcbe86a78..3b29a321e 100755
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -20,6 +20,8 @@
 #
 # Contributor(s): Terry Weissman <terry@mozilla.org>
 #                 Myk Melez <myk@mozilla.org>
+#                 Daniel Raichle <draichle@gmx.net>
+#                 Dave Miller <justdave@syndicomm.com>
 
 ################################################################################
 # Script Initialization
@@ -338,13 +340,23 @@ sub view
     # Display an attachment.
 
     # Retrieve the attachment content and its content type from the database.
-    SendSQL("SELECT mimetype, thedata FROM attachments WHERE attach_id = $::FORM{'id'}");
-    my ($contenttype, $thedata) = FetchSQLData();
+    SendSQL("SELECT mimetype, filename, thedata FROM attachments WHERE attach_id = $::FORM{'id'}");
+    my ($contenttype, $filename, $thedata) = FetchSQLData();
+
+    # Determine if the browser supports the Content-Disposition header or not
+    my $usedisposition = 1; # assume yes, unless we discover otherwise
+    if ($::ENV{HTTP_USER_AGENT} =~ /^Mozilla.*MSIE (\d+)/) {
+        if ($1 < 5) { $usedisposition = 0; } # MSIE < 5.0 chokes on it
+    }
     
     # Return the appropriate HTTP response headers.
-    print "Content-Type: $contenttype\n\n";
+    $filename =~ s/^.*[\/\\]//;
+    my $filesize = length($thedata);
+    print qq{Content-Type: $contenttype; name="$filename"\n};
+    print qq{Content-Disposition: attachment; filename=$filename\n} if $usedisposition;
+    print qq{Content-Length: $filesize\n};
+    print qq{\n$thedata};
 
-    print $thedata;
 }
 
 
@@ -529,9 +541,9 @@ sub edit
   # Users cannot edit the content of the attachment itself.
 
   # Retrieve the attachment from the database.
-  SendSQL("SELECT description, mimetype, bug_id, ispatch, isobsolete, isprivate 
+  SendSQL("SELECT description, mimetype, filename, bug_id, ispatch, isobsolete, isprivate 
            FROM attachments WHERE attach_id = $::FORM{'id'}");
-  my ($description, $contenttype, $bugid, $ispatch, $isobsolete, $isprivate) = FetchSQLData();
+  my ($description, $contenttype, $filename, $bugid, $ispatch, $isobsolete, $isprivate) = FetchSQLData();
 
   # Flag attachment as to whether or not it can be viewed (as opposed to
   # being downloaded).  Currently I decide it is viewable if its content
@@ -577,6 +589,7 @@ sub edit
   $vars->{'attachid'} = $::FORM{'id'}; 
   $vars->{'description'} = $description; 
   $vars->{'contenttype'} = $contenttype; 
+  $vars->{'filename'} = $filename;
   $vars->{'bugid'} = $bugid; 
   $vars->{'bugsummary'} = $bugsummary; 
   $vars->{'ispatch'} = $ispatch; 
@@ -614,10 +627,10 @@ sub update
            attachstatusdefs READ , fielddefs READ , bugs_activity WRITE");
   # Get a copy of the attachment record before we make changes
   # so we can record those changes in the activity table.
-  SendSQL("SELECT description, mimetype, ispatch, isobsolete, isprivate 
+  SendSQL("SELECT description, mimetype, filename, ispatch, isobsolete, isprivate
            FROM attachments WHERE attach_id = $::FORM{'id'}");
-  my ($olddescription, $oldcontenttype, $oldispatch, $oldisobsolete, 
-      $oldisprivate ) = FetchSQLData();
+  my ($olddescription, $oldcontenttype, $oldfilename, $oldispatch,
+      $oldisobsolete, $oldisprivate) = FetchSQLData();
 
   # Get the list of old status flags.
   SendSQL("SELECT    attachstatusdefs.name 
@@ -657,12 +670,14 @@ sub update
   # Quote the description and content type for use in the SQL UPDATE statement.
   my $quoteddescription = SqlQuote($::FORM{'description'});
   my $quotedcontenttype = SqlQuote($::FORM{'contenttype'});
+  my $quotedfilename = SqlQuote($::FORM{'filename'});
 
   # Update the attachment record in the database.
   # Sets the creation timestamp to itself to avoid it being updated automatically.
   SendSQL("UPDATE  attachments 
            SET     description = $quoteddescription , 
                    mimetype = $quotedcontenttype , 
+                   filename = $quotedfilename ,
                    ispatch = $::FORM{'ispatch'} , 
                    isobsolete = $::FORM{'isobsolete'} ,
                    isprivate = $::FORM{'isprivate'} 
@@ -682,6 +697,12 @@ sub update
     SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added) 
              VALUES ($bugid, $::FORM{'id'}, $::userid, NOW(), $fieldid, $quotedoldcontenttype, $quotedcontenttype)");
   }
+  if ($oldfilename ne $::FORM{'filename'}) {
+    my $quotedoldfilename = SqlQuote($oldfilename);
+    my $fieldid = GetFieldID('attachments.filename');
+    SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added) 
+             VALUES ($bugid, $::FORM{'id'}, $::userid, NOW(), $fieldid, $quotedoldfilename, $quotedfilename)");
+  }
   if ($oldispatch ne $::FORM{'ispatch'}) {
     my $fieldid = GetFieldID('attachments.ispatch');
     SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added) 
diff --git a/checksetup.pl b/checksetup.pl
index 803d64d14..c00301742 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -1805,6 +1805,7 @@ AddFDef("dependson", "BugsThisDependsOn", 0);
 AddFDef("blocked", "OtherBugsDependingOnThis", 0);
 AddFDef("attachments.description", "Attachment description", 0);
 AddFDef("attachments.thedata", "Attachment data", 0);
+AddFDef("attachments.filename", "Attachment filename", 0);
 AddFDef("attachments.mimetype", "Attachment mime type", 0);
 AddFDef("attachments.ispatch", "Attachment is patch", 0);
 AddFDef("attachments.isobsolete", "Attachment is obsolete", 0);
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index c9bc7c1cd..ec2616bf9 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -153,6 +153,9 @@
         <b>Description:</b><br>
           <textarea rows="3" cols="25" name="description" wrap="soft">[% description FILTER html %]</textarea><br>
 
+        <b>Filename:</b><br>
+          <input type="text" size="20" name="filename" value="[% filename FILTER html %]"><br>
+
         <b>MIME Type:</b><br>
           <input type="text" size="20" name="contenttypeentry" value="[% contenttype FILTER html %]"><br>