KTC-275

"Files that are uploaded with the 'Import from Server Location' is MOVED instead of COPIED to the DMS." Fixed. Added a flag to aOptions to copy a file when uploading to the DMS instead of moving it. Committed By: Megan Watson Reviewed By: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7756 c91229c3-7414-0410-bfa2-8a42b809f60b

KTC-275
"Files that are uploaded with the 'Import from Server Location' is MOVED instead of COPIED to the DMS." Fixed. Added a flag to aOptions to copy a file when uploading to the DMS instead of moving it. Committed By: Megan Watson Reviewed By: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7756 c91229c3-7414-0410-bfa2-8a42b809f60b
megan_w
1 parent 0ac83164
Showing 4 changed files with 19 additions and 14 deletions
lib/documentmanagement/documentutil.inc.php
lib/import/bulkimport.inc.php
lib/storage/ondiskhashedstoragemanager.inc.php
plugins/ktcore/folder/BulkImport.php
@@ -718,7 +718,7 @@ class KTDocumentUtil {
         $iMimeTypeId = KTMime::getMimeTypeID($sType, $oDocument->getFileName());
         $oDocument->setMimeTypeId($iMimeTypeId);
-        $res = $oStorage->upload($oDocument, $sFilename);
+        $res = $oStorage->upload($oDocument, $sFilename, $aOptions);
         if ($res === false) {
             return PEAR::raiseError(sprintf(_kt("Couldn't store contents: %s"), _kt('No reason given')));
         }
@@ -150,6 +150,7 @@ class KTBulkImportManager {
             'metadata' => $this->aMetadata,
             'documenttype' => $this->oDocumentType,
         );
+        $aOptions = array_merge($aOptions, $this->aOptions);
         $oDocument =& KTDocumentUtil::add($oFolder, utf8_encode(basename($sPath)), $this->oUser, $aOptions);
         return $oDocument;
     }
@@ -44,7 +44,7 @@ require_once(KT_LIB_DIR . &#39;/documentmanagement/documentcontentversion.inc.php&#39;);
 require_once(KT_LIB_DIR . '/filelike/fsfilelike.inc.php');
 class KTOnDiskHashedStorageManager extends KTStorageManager {
-    function upload(&$oDocument, $sTmpFilePath) {
+    function upload(&$oDocument, $sTmpFilePath, $aOptions = null) {
         $oConfig =& KTConfig::getSingleton();
         $sStoragePath = $this->generateStoragePath($oDocument);
         if (PEAR::isError($sStoragePath)) {
@@ -60,7 +60,7 @@ class KTOnDiskHashedStorageManager extends KTStorageManager {
         if (OS_WINDOWS) {
             $sDocumentFileSystemPath = str_replace('\\','/',$sDocumentFileSystemPath);
         }
-        if ($this->writeToFile($sTmpFilePath, $sDocumentFileSystemPath)) {
+        if ($this->writeToFile($sTmpFilePath, $sDocumentFileSystemPath, $aOptions)) {
             $end_time = KTUtil::getBenchmarkTime();
             global $default;
             $default->log->info(sprintf("Uploaded %d byte file in %.3f seconds", $file_size, $end_time - $start_time));
@@ -100,8 +100,11 @@ class KTOnDiskHashedStorageManager extends KTStorageManager {
         return false;
     }
-    function writeToFile($sTmpFilePath, $sDocumentFileSystemPath) {
+    function writeToFile($sTmpFilePath, $sDocumentFileSystemPath, $aOptions = null) {
         // Make it easy to write compressed/encrypted storage
+        if(isset($aOptions['copy_upload']) && ($aOptions['copy_upload'] == 'true')) {
+            return copy($sTmpFilePath, $sDocumentFileSystemPath);
+        }
         if (is_uploaded_file($sTmpFilePath))
             return move_uploaded_file($sTmpFilePath, $sDocumentFileSystemPath);
@@ -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): ______________________________________
  *
  */
@@ -60,7 +60,7 @@ class KTBulkImportFolderAction extends KTFolderAction {
     function getInfo() {
         if (!Permission::userIsSystemAdministrator($this->oUser->getId())) {
             return null;
-            
+
         }
         return parent::getInfo();
     }
@@ -122,6 +122,7 @@ class KTBulkImportFolderAction extends KTFolderAction {
         $aOptions = array(
             'documenttype' => $oDocumentType,
             'metadata' => $aFields,
+            'copy_upload' => 'true',
         );
         $po =& new JavascriptObserver($this);