aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Encryption/Manager.php
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2020-04-10 14:19:56 +0200
committerChristoph Wurst <christoph@winzerhof-wurst.at>2020-04-10 14:19:56 +0200
commitcaff1023ea72bb2ea94130e18a2a6e2ccf819e5f (patch)
tree186d494c2aea5dea7255d3584ef5d595fc6e6194 /lib/private/Encryption/Manager.php
parentedf8ce32cffdb920e8171207b342abbd7f1fbe73 (diff)
downloadnextcloud-server-caff1023ea72bb2ea94130e18a2a6e2ccf819e5f.tar.gz
nextcloud-server-caff1023ea72bb2ea94130e18a2a6e2ccf819e5f.zip
Format control structures, classes, methods and function
To continue this formatting madness, here's a tiny patch that adds unified formatting for control structures like if and loops as well as classes, their methods and anonymous functions. This basically forces the constructs to start on the same line. This is not exactly what PSR2 wants, but I think we can have a few exceptions with "our" style. The starting of braces on the same line is pracrically standard for our code. This also removes and empty lines from method/function bodies at the beginning and end. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'lib/private/Encryption/Manager.php')
-rw-r--r--lib/private/Encryption/Manager.php7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/private/Encryption/Manager.php b/lib/private/Encryption/Manager.php
index 52fc23de947..f160a16a995 100644
--- a/lib/private/Encryption/Manager.php
+++ b/lib/private/Encryption/Manager.php
@@ -84,7 +84,6 @@ class Manager implements IManager {
* @return bool true if enabled, false if not
*/
public function isEnabled() {
-
$installed = $this->config->getSystemValue('installed', false);
if (!$installed) {
return false;
@@ -101,7 +100,6 @@ class Manager implements IManager {
* @throws ServiceUnavailableException
*/
public function isReady() {
-
if ($this->isKeyStorageReady() === false) {
throw new ServiceUnavailableException('Key Storage is not ready');
}
@@ -137,7 +135,6 @@ class Manager implements IManager {
* @throws Exceptions\ModuleAlreadyExistsException
*/
public function registerEncryptionModule($id, $displayName, callable $callback) {
-
if (isset($this->encryptionModules[$id])) {
throw new Exceptions\ModuleAlreadyExistsException($id, $displayName);
}
@@ -213,7 +210,6 @@ class Manager implements IManager {
$message = 'No default encryption module defined';
throw new Exceptions\ModuleDoesNotExistsException($message);
}
-
}
/**
@@ -260,7 +256,6 @@ class Manager implements IManager {
* @return bool
*/
protected function isKeyStorageReady() {
-
$rootDir = $this->util->getKeyStorageRoot();
// the default root is always valid
@@ -275,6 +270,4 @@ class Manager implements IManager {
return false;
}
-
-
}