summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
diff options
context:
space:
mode:
authorFlorin Peter <github@florin-peter.de>2013-05-30 22:07:36 +0200
committerFlorin Peter <github@florin-peter.de>2013-05-30 22:07:36 +0200
commiteaa4f92275a5dea91743eab57423c2b698386e69 (patch)
tree8341660f19247d4ac1eb4d707bdfd7fde61848e5 /apps/files_encryption
parentb3834b49c3a98e5b7adbb64983f489f0d992c83c (diff)
downloadnextcloud-server-eaa4f92275a5dea91743eab57423c2b698386e69.tar.gz
nextcloud-server-eaa4f92275a5dea91743eab57423c2b698386e69.zip
added our own file extension .part will not work here if we use file_get_contents so we used our own extension '.etmp'
Diffstat (limited to 'apps/files_encryption')
-rwxr-xr-xapps/files_encryption/lib/keymanager.php4
-rw-r--r--apps/files_encryption/lib/proxy.php6
2 files changed, 5 insertions, 5 deletions
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;