Allow overriding content-type for text/ and image/ files served by plugins

rombert · rombert · commit bfc04a4d87b5 · 2011-12-07T01:36:12.000+02:00
Fixes #13193: Files served by plugins do not have a Content-Type header set

Conflicts:
	file_download.php
diff --git a/core/plugin_api.php b/core/plugin_api.php
@@ -152,10 +152,27 @@ function plugin_file_include( $p_filename, $p_basename = null ) {
 		trigger_error( ERROR_GENERIC, ERROR );
 	}
 	
-	$t_extension = pathinfo( $t_file_path, PATHINFO_EXTENSION );
-	if ( $t_extension && array_key_exists( $t_extension , $g_plugin_mime_types ) ) {
-	    header('Content-Type: ' . $g_plugin_mime_types [ $t_extension ] );
+	$t_content_type = '';
+	$finfo = finfo_get_if_available();
+	
+	if ( $finfo ) {
+		$t_file_info_type = $finfo->file( $t_file_path );
+		if ( $t_file_info_type !== false ) {
+			$t_content_type = $t_file_info_type;
+		}
+	}
+	
+	// allow overriding the content type for specific text and image extensions
+	// see bug #13193 for details
+	if ( strpos($t_content_type, 'text/') === 0 || strpos( $t_content_type, 'image/') === 0 ) {
+		$t_extension = pathinfo( $t_file_path, PATHINFO_EXTENSION );
+		if ( $t_extension && array_key_exists( $t_extension , $g_plugin_mime_types ) ) {
+			$t_content_type =  $g_plugin_mime_types [ $t_extension ];
+		}
 	}
+
+	if ( $t_content_type )
+    	header('Content-Type: ' . $t_content_type );
 	
 	readfile( $t_file_path );
 }
diff --git a/core/utility_api.php b/core/utility_api.php
@@ -264,3 +264,22 @@ function get_font_path() {
 		}
 		return $t_font_path;
 }
+
+function finfo_get_if_available() {
+	
+	if ( class_exists( 'finfo' ) ) {
+		$t_info_file = config_get( 'fileinfo_magic_db_file' );
+	
+		if ( is_blank( $t_info_file ) ) {
+			$finfo = new finfo( FILEINFO_MIME );
+		} else {
+			$finfo = new finfo( FILEINFO_MIME, $t_info_file );
+		}
+	
+		if ( $finfo ) {
+			return $finfo;
+		}
+	}
+
+	return null;
+}
diff --git a/file_download.php b/file_download.php
@@ -163,20 +163,7 @@
 header( 'Content-Length: ' . $v_filesize );
 
 # If finfo is available (always true for PHP >= 5.3.0) we can use it to determine the MIME type of files
-$finfo_available = false;
-if ( class_exists( 'finfo' ) ) {
-	$t_info_file = config_get( 'fileinfo_magic_db_file' );
-
-	if ( is_blank( $t_info_file ) ) {
-		$finfo = new finfo( FILEINFO_MIME );
-	} else {
-		$finfo = new finfo( FILEINFO_MIME, $t_info_file );
-	}
-
-	if ( $finfo ) {
-		$finfo_available = true;
-	}
-}
+$finfo = finfo_get_if_available();;
 
 $t_content_type = $v_file_type;
 
@@ -186,7 +173,7 @@
 		$t_local_disk_file = file_normalize_attachment_path( $v_diskfile, $t_project_id );
 
 		if ( file_exists( $t_local_disk_file ) ) {
-			if ( $finfo_available ) {
+			if ( $finfo ) {
 				$t_file_info_type = $finfo->file( $t_local_disk_file );
 
 				if ( $t_file_info_type !== false ) {
@@ -212,7 +199,7 @@
 			file_ftp_disconnect( $ftp );
 		}
 
-		if ( $finfo_available ) {
+		if ( $finfo ) {
 			$t_file_info_type = $finfo->file( $t_local_disk_file );
 
 			if ( $t_file_info_type !== false ) {
@@ -224,7 +211,7 @@
 		readfile( $t_local_disk_file );
 		break;
 	default:
-		if ( $finfo_available ) {
+		if ( $finfo ) {
 			$t_file_info_type = $finfo->buffer( $v_content );
 
 			if ( $t_file_info_type !== false ) {
