diff options
| -rw-r--r-- | apps/files_encryption/lib/util.php | 55 | ||||
| -rw-r--r-- | version.php | 2 |
2 files changed, 56 insertions, 1 deletions
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index c1f273d86ed..b300999ff24 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -43,18 +43,69 @@ class Util { const FILE_TYPE_VERSION = 1; const FILE_TYPE_CACHE = 2; + /** + * @var \OC\Files\View + */ private $view; // OC\Files\View object for filesystem operations + + /** + * @var string + */ private $userId; // ID of the user we use to encrypt/decrypt files + + /** + * @var string + */ private $keyId; // ID of the key we want to manipulate + + /** + * @var bool + */ private $client; // Client side encryption mode flag + + /** + * @var string + */ private $publicKeyDir; // Dir containing all public user keys + + /** + * @var string + */ private $encryptionDir; // Dir containing user's files_encryption + + /** + * @var string + */ private $keysPath; // Dir containing all file related encryption keys + + /** + * @var string + */ private $publicKeyPath; // Path to user's public key + + /** + * @var string + */ private $privateKeyPath; // Path to user's private key + + /** + * @var string + */ private $userFilesDir; + + /** + * @var string + */ private $publicShareKeyId; + + /** + * @var string + */ private $recoveryKeyId; + + /** + * @var bool + */ private $isPublic; /** @@ -279,6 +330,10 @@ class Util { while (false !== ($file = readdir($handle))) { if ($file !== "." && $file !== "..") { + // skip stray part files + if (Helper::isPartialFilePath($file)) { + continue; + } $filePath = $directory . '/' . $this->view->getRelativePath('/' . $file); $relPath = Helper::stripUserFilesPath($filePath); diff --git a/version.php b/version.php index 78c373cbfa5..3c0c6aa2042 100644 --- a/version.php +++ b/version.php @@ -3,7 +3,7 @@ // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version=array(8, 0, 0, 1); +$OC_Version=array(8, 0, 0, 3); // The human readable string $OC_VersionString='8.0 beta 1'; |