From: Florin Peter <github@florin-peter.de>
Date: Thu, 30 May 2013 20:07:36 +0000 (+0200)
Subject: added our own file extension .part will not work here if we use file_get_contents... 
X-Git-Tag: v6.0.0alpha2~705^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=eaa4f92275a5dea91743eab57423c2b698386e69;p=nextcloud-server.git

added our own file extension .part will not work here if we use file_get_contents so we used our own extension '.etmp'
---

diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 9bb854325de..e911c1785df 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -169,7 +169,7 @@ class Keymanager {
 	 */
 	public static function fixPartialFilePath($path) {
 
-		if (preg_match('/\.part$/', $path)) {
+		if (preg_match('/\.part$/', $path) || preg_match('/\.etmp$/', $path)) {
 
 			$newLength = strlen($path) - 5;
 			$fPath = substr($path, 0, $newLength);
@@ -191,7 +191,7 @@ class Keymanager {
 	 */
 	public static function isPartialFilePath($path) {
 
-		if (preg_match('/\.part$/', $path)) {
+		if (preg_match('/\.part$/', $path) || preg_match('/\.etmp$/', $path)) {
 
 			return true;
 
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 2e18f7f9201..0df34a38bd7 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -116,7 +116,7 @@ class Proxy extends \OC_FileProxy {
 					return true;
 				}
 
-				$handle = fopen('crypt://' . $relativePath . '.part', 'w');
+				$handle = fopen('crypt://' . $relativePath . '.etmp', 'w');
 				if (is_resource($handle)) {
 
 					// write data to stream
@@ -130,10 +130,10 @@ class Proxy extends \OC_FileProxy {
 					\OC_FileProxy::$enabled = false;
 
 					// get encrypted content
-					$data = $view->file_get_contents($path . '.part');
+					$data = $view->file_get_contents($path . '.etmp');
 
 					// remove our temp file
-					$view->unlink($path . '.part');
+					$view->unlink($path . '.etmp');
 
 					// re-enable proxy - our work is done
 					\OC_FileProxy::$enabled = $proxyStatus;