*6876* Galleys uploaded in Firefox not indexed for search

pkp · Sep 30, 2011 · e24789a · e24789a
1 parent 7cee43f
commit e24789a
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 3 deletions.
diff --git a/classes/file/ArticleFileManager.inc.php b/classes/file/ArticleFileManager.inc.php
@@ -513,7 +513,7 @@ function handleUpload($fileName, $fileStage, $fileId = null, $overwrite = false)
 			$articleFile->setDateModified(Core::getCurrentDate());
 		}
 
-		$articleFile->setFileType($_FILES[$fileName]['type']);
+		$articleFile->setFileType($this->getUploadedFileType($fileName));
 		$articleFile->setFileSize($_FILES[$fileName]['size']);
 		$articleFile->setOriginalFileName(ArticleFileManager::truncateFileName($_FILES[$fileName]['name'], 127));
 		$articleFile->setFileStage($fileStage);

diff --git a/classes/file/IssueFileManager.inc.php b/classes/file/IssueFileManager.inc.php
@@ -179,7 +179,7 @@ function _handleUpload($fileName, $contentType, $fileId = null, $overwrite = fal
 		$issueFile->setDateUploaded(Core::getCurrentDate());
 		$issueFile->setDateModified(Core::getCurrentDate());
 		$issueFile->setFileName('');
-		$issueFile->setFileType($_FILES[$fileName]['type']);
+		$issueFile->setFileType($this->getUploadedFileType($fileName));
 		$issueFile->setFileSize($_FILES[$fileName]['size']);
 		$issueFile->setOriginalFileName($this->truncateFileName($_FILES[$fileName]['name'], 127));
 		$issueFile->setContentType($contentType);

diff --git a/dbscripts/xml/upgrade/2.3.7_update.xml b/dbscripts/xml/upgrade/2.3.7_update.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE data SYSTEM "../../../lib/pkp/dtd/xmlData.dtd">
+
+<!--
+  * 2.3.7_update.xml
+  *
+  * Copyright (c) 2000-2011 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  *
+  * 2.3.7 database updates XML file.
+  *
+  -->
+
+<data>
+	<!-- Bug #6876: Galleys uploaded in Firefox not indexed for search -->
+	<sql>
+		<!-- Syntax for MySQL. -->
+		<query driver="mysql">
+			UPDATE article_files SET file_type = 'application/pdf' WHERE original_file_name RLIKE '\\.pdf$'
+		</query>
+
+		<query driver="mysql">
+			UPDATE article_files SET file_type = 'application/msword' WHERE original_file_name RLIKE '\\.doc$'
+		</query>
+
+		<query driver="mysql">
+			UPDATE article_files SET file_type = 'application/vnd.ms-powerpoint' WHERE original_file_name RLIKE '\\.ppt$'
+		</query>
+
+		<query driver="mysql">
+			UPDATE article_files SET file_type = 'application/vnd.ms-powerpoint' WHERE original_file_name RLIKE '\\.pps$'
+		</query>
+
+		<query driver="mysql">
+			UPDATE article_files SET file_type = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' WHERE original_file_name RLIKE '\\.docx$'
+		</query>
+
+		<query driver="mysql">
+			UPDATE article_files SET file_type = 'application/vnd.openxmlformats-officedocument.presentationml.presentation' WHERE original_file_name RLIKE '\\.pptx$'
+		</query>
+
+		<query driver="mysql">
+			UPDATE article_files SET file_type = 'application/vnd.openxmlformats-officedocument.presentationml.slideshow' WHERE original_file_name RLIKE '\\.ppsx$'
+		</query>
+
+		<!-- Syntax for PostgreSQL. -->
+		<query driver="postgres">
+			UPDATE article_files SET file_type = 'application/pdf' WHERE original_file_name ~* '.pdf$'
+		</query>
+
+		<query driver="postgres">
+			UPDATE article_files SET file_type = 'application/msword' WHERE original_file_name ~* '.doc$'
+		</query>
+
+		<query driver="postgres">
+			UPDATE article_files SET file_type = 'application/vnd.ms-powerpoint' WHERE original_file_name ~* '.ppt$'
+		</query>
+
+		<query driver="postgres">
+			UPDATE article_files SET file_type = 'application/vnd.ms-powerpoint' WHERE original_file_name ~* '.pps$'
+		</query>
+
+		<query driver="postgres">
+			UPDATE article_files SET file_type = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' WHERE original_file_name ~* '.docx$'
+		</query>
+
+		<query driver="postgres">
+			UPDATE article_files SET file_type = 'application/vnd.openxmlformats-officedocument.presentationml.presentation' WHERE original_file_name ~* '.pptx$'
+		</query>
+
+		<query driver="postgres">
+			UPDATE article_files SET file_type = 'application/vnd.openxmlformats-officedocument.presentationml.slideshow' WHERE original_file_name ~* '.ppsx$'
+		</query>
+	</sql>
+</data>
diff --git a/pages/manager/SetupHandler.inc.php b/pages/manager/SetupHandler.inc.php
@@ -200,7 +200,7 @@ function saveSetup($args, &$request) {
 						if (!is_array($templates)) $templates = array();
 						$templateId = count($templates);
 						$originalFilename = $_FILES['template-file']['name'];
-						$fileType = $_FILES['template-file']['type'];
+						$fileType = $journalFileManager->getUploadedFileType('template-file');
 						$filename = "template-$templateId." . $journalFileManager->parseFileExtension($originalFilename);
 						$journalFileManager->uploadFile('template-file', $filename);
 						$templates[$templateId] = array(