summaryrefslogtreecommitdiffstats
path: root/lib/ocs.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ocs.php')
-rw-r--r--lib/ocs.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/ocs.php b/lib/ocs.php
index cf4248395f3..17ae649deb6 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -808,8 +808,7 @@ class OC_OCS {
$login=OC_OCS::checkpassword();
if(($login==$user)) {
if(OC_App::isEnabled('files_encryption') && OCA_Encryption\Crypt::mode($user) === 'client') {
- if (($key = OCA_Encryption\Keymanager::setFileKey($user, $file, $key))) {
- // TODO: emit hook to move file from tmp location to the right place
+ if (($key = OCA_Encryption\Keymanager::setFileKey($user, $file, $key))) {
echo self::generateXml('', 'ok', 100, '');
return true;
} else {
@@ -821,7 +820,6 @@ class OC_OCS {
}else{
echo self::generateXml('', 'fail', 300, 'You donĀ“t have permission to access this ressource.');
}
- //TODO: emit signal to remove file from tmp location
return false;
}