From ea6baa72937a740ce2b8a7257507414b99fb3959 Mon Sep 17 00:00:00 2001
From: megan_w <megan_w@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Tue, 18 Dec 2007 12:29:24 +0000
Subject: [PATCH] KTC-299 "Bulk Upload failed: File is not a zip file" Fixed. Added check for application/zip.

---
 plugins/ktcore/folder/BulkUpload.php | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/plugins/ktcore/folder/BulkUpload.php b/plugins/ktcore/folder/BulkUpload.php
index f3f29e6..18839d5 100644
--- a/plugins/ktcore/folder/BulkUpload.php
+++ b/plugins/ktcore/folder/BulkUpload.php
@@ -5,32 +5,32 @@
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
  * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
  * Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
  * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
  * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
- * 
+ *
  * The interactive user interfaces in modified source and object code versions
  * of this program must display Appropriate Legal Notices, as required under
  * Section 5 of the GNU General Public License version 3.
- * 
+ *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
- * copyright notice. 
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
  * Contributor( s): ______________________________________
  *
  */
@@ -114,16 +114,17 @@ class KTBulkUploadFolderAction extends KTFolderAction {
 
         unset($aErrorOptions['message']);
         $aFile = $this->oValidator->validateFile($_FILES['file'], $aErrorOptions);
-        
+
         // Ensure file is a zip file
         $sMime = $aFile['type'];
         $pos = strpos($sMime, 'x-zip-compressed');
-        if($pos === false){
+        $pos2 = strpos($sMime, 'application/zip');
+        if($pos === false && $pos2 === false){
             $this->addErrorMessage(_kt("Bulk Upload failed: File is not a zip file."));
             controllerRedirect("browse", 'fFolderId=' . $this->oFolder->getID());
             exit(0);
         }
-        
+
         $matches = array();
         $aFields = array();
         foreach ($_REQUEST as $k => $v) {
@@ -141,7 +142,7 @@ class KTBulkUploadFolderAction extends KTFolderAction {
         $bm =& new KTBulkImportManager($this->oFolder, $fs, $this->oUser, $aOptions);
         $this->startTransaction();
         $res = $bm->import();
-        
+
         $aErrorOptions['message'] = _kt("Bulk Upload failed");
         $this->oValidator->notError($res, $aErrorOptions);
 
--
libgit2 0.21.4