diff options
| author | Julius Härtl <jus@bitgrid.net> | 2021-07-07 11:38:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-07 11:38:13 +0200 |
| commit | e8fb7c7640aa322f148c552f111f135642f676d1 (patch) | |
| tree | b6d29b28c37ee975ddfa497546635c02c44e49f2 /lib | |
| parent | d4618e9ef8e14d25e3bd85c2c5d1834b1d3285f4 (diff) | |
| parent | b344ff1a67539d3916601a4cc11248778dc0fbf8 (diff) | |
| download | nextcloud-server-e8fb7c7640aa322f148c552f111f135642f676d1.tar.gz nextcloud-server-e8fb7c7640aa322f148c552f111f135642f676d1.zip | |
Merge pull request #27830 from J0WI/simple-load-enc-module
Refactor getEncryptionModule routine
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Encryption/Manager.php | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/lib/private/Encryption/Manager.php b/lib/private/Encryption/Manager.php index 20ac9b41bfd..55578ee25f4 100644 --- a/lib/private/Encryption/Manager.php +++ b/lib/private/Encryption/Manager.php @@ -177,17 +177,15 @@ class Manager implements IManager { * @throws Exceptions\ModuleDoesNotExistsException */ public function getEncryptionModule($moduleId = '') { - if (!empty($moduleId)) { - if (isset($this->encryptionModules[$moduleId])) { - return call_user_func($this->encryptionModules[$moduleId]['callback']); - } else { - $message = "Module with ID: $moduleId does not exist."; - $hint = $this->l->t('Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator.', [$moduleId]); - throw new Exceptions\ModuleDoesNotExistsException($message, $hint); - } - } else { + if (empty($moduleId)) { return $this->getDefaultEncryptionModule(); } + if (isset($this->encryptionModules[$moduleId])) { + return call_user_func($this->encryptionModules[$moduleId]['callback']); + } + $message = "Module with ID: $moduleId does not exist."; + $hint = $this->l->t('Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator.', [$moduleId]); + throw new Exceptions\ModuleDoesNotExistsException($message, $hint); } /** @@ -198,17 +196,15 @@ class Manager implements IManager { */ protected function getDefaultEncryptionModule() { $defaultModuleId = $this->getDefaultEncryptionModuleId(); - if (!empty($defaultModuleId)) { - if (isset($this->encryptionModules[$defaultModuleId])) { - return call_user_func($this->encryptionModules[$defaultModuleId]['callback']); - } else { - $message = 'Default encryption module not loaded'; - throw new Exceptions\ModuleDoesNotExistsException($message); - } - } else { + if (empty($defaultModuleId)) { $message = 'No default encryption module defined'; throw new Exceptions\ModuleDoesNotExistsException($message); } + if (isset($this->encryptionModules[$defaultModuleId])) { + return call_user_func($this->encryptionModules[$defaultModuleId]['callback']); + } + $message = 'Default encryption module not loaded'; + throw new Exceptions\ModuleDoesNotExistsException($message); } /** |