From f76b64d3d7e5803008e0dbc29fdf1bcf29f0811e Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Tue, 16 Aug 2016 18:11:59 +0200
Subject: add missing encryption modules to settings

---
 lib/private/Settings/Admin/Encryption.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/private/Settings/Admin/Encryption.php b/lib/private/Settings/Admin/Encryption.php
index 69c6bd17f03..6e93407f1a3 100644
--- a/lib/private/Settings/Admin/Encryption.php
+++ b/lib/private/Settings/Admin/Encryption.php
@@ -48,11 +48,24 @@ class Encryption implements ISettings {
 	 * @return TemplateResponse
 	 */
 	public function getForm() {
+		$encryptionModules = $this->manager->getEncryptionModules();
+		$defaultEncryptionModuleId = $this->manager->getDefaultEncryptionModuleId();
+		$encryptionModuleList = [];
+		foreach ($encryptionModules as $module) {
+			$encryptionModuleList[$module['id']]['displayName'] = $module['displayName'];
+			$encryptionModuleList[$module['id']]['default'] = false;
+			if ($module['id'] === $defaultEncryptionModuleId) {
+				$encryptionModuleList[$module['id']]['default'] = true;
+			}
+		}
+
 		$parameters = [
 			// Encryption API
 			'encryptionEnabled'       => $this->manager->isEnabled(),
 			'encryptionReady'         => $this->manager->isReady(),
 			'externalBackendsEnabled' => count($this->userManager->getBackends()) > 1,
+			// Modules
+			'encryptionModules'       => $encryptionModuleList,
 		];
 
 		return new TemplateResponse('settings', 'admin/encryption', $parameters, '');
-- 
cgit v1.2.3