diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2015-04-27 11:40:10 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2015-05-06 11:35:45 +0200 |
| commit | e7a3911c83806f0a11ebf00b96d7498815d718be (patch) | |
| tree | 860d5588dca6ed8e79a4fb8502686a95cb39bc5b /lib/private/encryption/update.php | |
| parent | 9a159372cb31b9fe4616e5403773eb078c5ad828 (diff) | |
| download | nextcloud-server-e7a3911c83806f0a11ebf00b96d7498815d718be.tar.gz nextcloud-server-e7a3911c83806f0a11ebf00b96d7498815d718be.zip | |
check if encryption is enbaled before we start moving keys
Diffstat (limited to 'lib/private/encryption/update.php')
| -rw-r--r-- | lib/private/encryption/update.php | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/lib/private/encryption/update.php b/lib/private/encryption/update.php index a0b0af968c6..ddcee3bae93 100644 --- a/lib/private/encryption/update.php +++ b/lib/private/encryption/update.php @@ -81,11 +81,13 @@ class Update { * @param array $params */ public function postShared($params) { - if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') { - $path = Filesystem::getPath($params['fileSource']); - list($owner, $ownerPath) = $this->getOwnerPath($path); - $absPath = '/' . $owner . '/files/' . $ownerPath; - $this->update($absPath); + if ($this->encryptionManager->isEnabled()) { + if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') { + $path = Filesystem::getPath($params['fileSource']); + list($owner, $ownerPath) = $this->getOwnerPath($path); + $absPath = '/' . $owner . '/files/' . $ownerPath; + $this->update($absPath); + } } } @@ -95,11 +97,13 @@ class Update { * @param array $params */ public function postUnshared($params) { - if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') { - $path = Filesystem::getPath($params['fileSource']); - list($owner, $ownerPath) = $this->getOwnerPath($path); - $absPath = '/' . $owner . '/files/' . $ownerPath; - $this->update($absPath); + if ($this->encryptionManager->isEnabled()) { + if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') { + $path = Filesystem::getPath($params['fileSource']); + list($owner, $ownerPath) = $this->getOwnerPath($path); + $absPath = '/' . $owner . '/files/' . $ownerPath; + $this->update($absPath); + } } } |