From 03d5ea6cec4e88dad36648a931ff0f39a1da23ee Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 27 Sep 2013 13:34:48 +0200
Subject: [PATCH] check not only if the keyfile folder exists but also if it
contains keyfiles
---
lib/util.php | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/lib/util.php b/lib/util.php
index 41f5f1d16b..dd6c72bfc7 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -410,14 +410,18 @@ 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')) {
- $encryptedFiles = true;
+ $keyfilePath = '/files_encryption/keyfiles';
+ if ($view->is_dir($keyfilePath)) {
+ $dircontent = $view->getDirectoryContent($keyfilePath);
+ if (!empty($dircontent)) {
+ $encryptedFiles = true;
+ }
}
}
-
+
return $encryptedFiles;
}
-
+
/**
* @brief Check for correct file permissions of data directory
* @paran string $dataDirectory
@@ -654,16 +658,16 @@ class OC_Util {
}
return $value;
}
-
+
/**
* @brief Public function to encode url parameters
*
* This function is used to encode path to file before output.
* Encoding is done according to RFC 3986 with one exception:
- * Character '/' is preserved as is.
+ * Character '/' is preserved as is.
*
* @param string $component part of URI to encode
- * @return string
+ * @return string
*/
public static function encodePath($component) {
$encoded = rawurlencode($component);
@@ -810,7 +814,7 @@ class OC_Util {
}
}
}
-
+
/**
* @brief Check if the connection to the internet is disabled on purpose
* @return bool
--
GitLab