From f5638d9163d7f46752351eb90ba2f3b381d68dc0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20M=C3=BCller?= Date: Tue, 31 Mar 2015 12:06:36 +0200 Subject: [PATCH] Fix settings --- apps/encryption/settings/settings-admin.php | 6 +++--- apps/encryption/settings/settings-personal.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/encryption/settings/settings-admin.php b/apps/encryption/settings/settings-admin.php index a34d30d1de5..36e9c532bbd 100644 --- a/apps/encryption/settings/settings-admin.php +++ b/apps/encryption/settings/settings-admin.php @@ -6,16 +6,16 @@ * See the COPYING-README file. */ -use OCA\Encryption\KeyManager; - \OC_Util::checkAdminUser(); $tmpl = new OCP\Template('encryption', 'settings-admin'); // Check if an adminRecovery account is enabled for recovering files after lost pwd $recoveryAdminEnabled = \OC::$server->getConfig()->getAppValue('encryption', 'recoveryAdminEnabled', '0'); +$session = new \OCA\Encryption\Session(\OC::$server->getSession()); + $tmpl->assign('recoveryEnabled', $recoveryAdminEnabled); -$tmpl->assign('initStatus', KeyManager::$session->get('initStatus')); +$tmpl->assign('initStatus', $session->getStatus()); return $tmpl->fetchPage(); diff --git a/apps/encryption/settings/settings-personal.php b/apps/encryption/settings/settings-personal.php index 83594b8467e..a4173dbd40f 100644 --- a/apps/encryption/settings/settings-personal.php +++ b/apps/encryption/settings/settings-personal.php @@ -22,7 +22,7 @@ $keymanager = new \OCA\Encryption\KeyManager( \OC::$server->getConfig(), \OC::$server->getUserSession(), $session, - \OC::$server->getLogger()); + \OC::$server->getLogger(), null); $user = \OCP\User::getUser(); -- 2.39.5