From 4d238c3949894f464575aea626b14053a25cb7d6 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 18 Apr 2015 10:18:58 +0200 Subject: [PATCH 1/3] Fix display name of encryption modules --- lib/private/encryption/manager.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php index e01054c92a4..7a3f17519fc 100644 --- a/lib/private/encryption/manager.php +++ b/lib/private/encryption/manager.php @@ -106,11 +106,11 @@ class Manager implements IManager { $this->setDefaultEncryptionModule($id); } - $this->encryptionModules[$id] = array( + $this->encryptionModules[$id] = [ 'id' => $id, - 'displayName' => 'displayName', - 'callback' => $callback - ); + 'displayName' => $displayName, + 'callback' => $callback, + ]; } /** From b5c5775626451304f8b3f0cfd0bcc8e5dbc63c94 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 18 Apr 2015 10:20:13 +0200 Subject: [PATCH 2/3] Fix potential undefined variable --- settings/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/admin.php b/settings/admin.php index 773e8276534..94e48aab14e 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -92,13 +92,13 @@ try { $defaultEncryptionModule = \OC::$server->getEncryptionManager()->getDefaultEncryptionModule(); $defaultEncryptionModuleId = $defaultEncryptionModule->getId(); } catch (Exception $e) { - $defaultEncryptionModule = null; + $defaultEncryptionModuleId = null; } $encModulues = array(); foreach ($encryptionModules as $module) { $encModulues[$module['id']]['displayName'] = $module['displayName']; $encModulues[$module['id']]['default'] = false; - if ($defaultEncryptionModule && $module['id'] === $defaultEncryptionModuleId) { + if ($module['id'] === $defaultEncryptionModuleId) { $encModulues[$module['id']]['default'] = true; } } From 491e5901652474fdf30fcab5d1deb8e8193dc5de Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 18 Apr 2015 10:20:32 +0200 Subject: [PATCH 3/3] Fix dummy encryption module registration --- apps/encryption_dummy/appinfo/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/encryption_dummy/appinfo/app.php b/apps/encryption_dummy/appinfo/app.php index fa17e676eda..f04886f9f1f 100644 --- a/apps/encryption_dummy/appinfo/app.php +++ b/apps/encryption_dummy/appinfo/app.php @@ -2,5 +2,5 @@ $manager = \OC::$server->getEncryptionManager(); $module = new \OCA\Encryption_Dummy\DummyModule(); -$manager->registerEncryptionModule($module); +$manager->registerEncryptionModule('OC_DUMMY_MODULE', 'Dummy Encryption Module', $module);