mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix settings

This commit is contained in:
Thomas Müller 2015-03-31 12:06:36 +02:00
parent bf809ac85a
commit f5638d9163
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/encryption/settings/settings-admin.php
View File

@ -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();

2
apps/encryption/settings/settings-personal.php
View File

@ -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();