mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Florin Peter 2013-05-30 22:07:36 +02:00
parent b3834b49c3
commit eaa4f92275
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_encryption/lib/keymanager.php
View File

@ -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;

6
apps/files_encryption/lib/proxy.php
View File

@ -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;