only show personal settings if the recovery feature is enabled or if no private key is set
This commit is contained in:
parent
055c901091
commit
57bda411d1
|
@ -21,12 +21,19 @@ $privateKeySet = ($session->getPrivateKey() !== false) ? true : false;
|
||||||
$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
|
$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
|
||||||
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
|
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
|
||||||
|
|
||||||
\OCP\Util::addscript('files_encryption', 'settings-personal');
|
$result = false;
|
||||||
\OCP\Util::addScript('settings', 'personal');
|
|
||||||
|
|
||||||
$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
|
if ($recoveryAdminEnabled || !$privateKeySet) {
|
||||||
$tmpl->assign('recoveryEnabledForUser', $recoveryEnabledForUser);
|
|
||||||
$tmpl->assign('privateKeySet', $privateKeySet);
|
|
||||||
|
|
||||||
return $tmpl->fetchPage();
|
\OCP\Util::addscript('files_encryption', 'settings-personal');
|
||||||
|
\OCP\Util::addScript('settings', 'personal');
|
||||||
|
|
||||||
|
$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
|
||||||
|
$tmpl->assign('recoveryEnabledForUser', $recoveryEnabledForUser);
|
||||||
|
$tmpl->assign('privateKeySet', $privateKeySet);
|
||||||
|
|
||||||
|
$result = $tmpl->fetchPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue