Allow content types to be overriden when downloading files

rombert · rombert · commit d6b959201f08 · 2011-12-07T01:55:01.000+02:00
Fixes #13439: Wrong Content-type for various MSOffice documents
diff --git a/config_defaults_inc.php b/config_defaults_inc.php
@@ -3256,6 +3256,22 @@
 		'zip'	=> 'zip.gif',
 		'?'		=> 'generic.gif' );
 
+	/**
+	 *
+	 * Content types which will be overriden when downloading files
+	 *
+	 * @global array $g_file_download_content_type_overrides
+	 */
+	$g_file_download_content_type_overrides = array (
+		'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+		'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+		'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+		'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+		'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+		'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+		'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template'
+	);
+
 	/**
 	 * Icon associative arrays
 	 * Status to icon mapping
diff --git a/core/file_api.php b/core/file_api.php
@@ -893,3 +893,18 @@ function file_copy_attachments( $p_source_bug_id, $p_dest_bug_id ) {
         db_query_bound( $query, Array( $p_dest_bug_id, $t_bug_file['title'], $t_bug_file['description'], $t_new_diskfile_name, $t_new_file_name, $t_bug_file['folder'], $t_bug_file['filesize'], $t_bug_file['file_type'], $t_bug_file['date_added'], $t_bug_file['content'] ) );
     }
 }
+
+/**
+ * Returns a possibly override content type for a file name
+ *
+ * @param string $p_filename the filename of the file which will be downloaded
+ * @return string the content type, or empty if it should not be overriden
+ */
+function file_get_content_type_override( $p_filename ) {
+
+	global $g_file_download_content_type_overrides;
+
+	$t_extension = pathinfo( $p_filename, PATHINFO_EXTENSION );
+
+	return $g_file_download_content_type_overrides[$t_extension];
+}
diff --git a/file_download.php b/file_download.php
@@ -143,6 +143,8 @@
 	$finfo = finfo_get_if_available();
 
 	$t_content_type = $v_file_type;
+	
+	$t_content_type_override = file_get_content_type_override ( $t_filename );
 
 	# dump file content to the connection.
 	switch ( config_get( 'file_upload_method' ) ) {
@@ -157,6 +159,10 @@
 						$t_content_type = $t_file_info_type;
 					}
 				}
+				
+				if ( $t_content_type_override ) {
+					$t_content_type = $t_content_type_override;
+				}
 
 				header( 'Content-Type: ' . $t_content_type );
 				readfile( $t_local_disk_file );
@@ -178,6 +184,10 @@
 					$t_content_type = $t_file_info_type;
 				}
 			}
+			
+			if ( $t_content_type_override ) {
+				$t_content_type = $t_content_type_override;
+			}
 
 			header( 'Content-Type: ' . $t_content_type );
 			readfile( $t_local_disk_file );
@@ -190,6 +200,10 @@
 					$t_content_type = $t_file_info_type;
 				}
 			}
+			
+			if ( $t_content_type_override ) {
+				$t_content_type = $t_content_type_override;
+			}
 
 			header( 'Content-Type: ' . $t_content_type );
 			echo $v_content;

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,8 @@`
`143`	`143`	`$finfo = finfo_get_if_available();`
`144`	`144`
`145`	`145`	`$t_content_type = $v_file_type;`
	`146`	`+`
	`147`	`+ $t_content_type_override = file_get_content_type_override ( $t_filename );`
`146`	`148`
`147`	`149`	`# dump file content to the connection.`
`148`	`150`	`switch ( config_get( 'file_upload_method' ) ) {`
`@@ -157,6 +159,10 @@`
`157`	`159`	`$t_content_type = $t_file_info_type;`
`158`	`160`	`}`
`159`	`161`	`}`
	`162`	`+`
	`163`	`+ if ( $t_content_type_override ) {`
	`164`	`+ $t_content_type = $t_content_type_override;`
	`165`	`+ }`
`160`	`166`
`161`	`167`	`header( 'Content-Type: ' . $t_content_type );`
`162`	`168`	`readfile( $t_local_disk_file );`
`@@ -178,6 +184,10 @@`
`178`	`184`	`$t_content_type = $t_file_info_type;`
`179`	`185`	`}`
`180`	`186`	`}`
	`187`	`+`
	`188`	`+ if ( $t_content_type_override ) {`
	`189`	`+ $t_content_type = $t_content_type_override;`
	`190`	`+ }`
`181`	`191`
`182`	`192`	`header( 'Content-Type: ' . $t_content_type );`
`183`	`193`	`readfile( $t_local_disk_file );`
`@@ -190,6 +200,10 @@`
`190`	`200`	`$t_content_type = $t_file_info_type;`
`191`	`201`	`}`
`192`	`202`	`}`
	`203`	`+`
	`204`	`+ if ( $t_content_type_override ) {`
	`205`	`+ $t_content_type = $t_content_type_override;`
	`206`	`+ }`
`193`	`207`
`194`	`208`	`header( 'Content-Type: ' . $t_content_type );`
`195`	`209`	`echo $v_content;`