Merge pull request #5012 from owncloud/check_keyfiles_exists
check not only if the keyfile folder exists but also if it contains keyfiles
This commit is contained in:
commit
d4fed61871
|
@ -410,10 +410,14 @@ class OC_Util {
|
|||
$encryptedFiles = false;
|
||||
if (OC_App::isEnabled('files_encryption') === false) {
|
||||
$view = new OC\Files\View('/' . OCP\User::getUser());
|
||||
if ($view->file_exists('/files_encryption/keyfiles')) {
|
||||
$keyfilePath = '/files_encryption/keyfiles';
|
||||
if ($view->is_dir($keyfilePath)) {
|
||||
$dircontent = $view->getDirectoryContent($keyfilePath);
|
||||
if (!empty($dircontent)) {
|
||||
$encryptedFiles = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $encryptedFiles;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue