From: Björn Schießle <schiessle@owncloud.com>
Date: Wed, 5 Jun 2013 11:51:28 +0000 (+0200)
Subject: only show personal settings if the recovery feature is enabled or if no private key... 
X-Git-Tag: v6.0.0alpha2~641^2~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=57bda411d11a1aab85c74bb288ffc465e181112b;p=nextcloud-server.git

only show personal settings if the recovery feature is enabled or if no private key is set
---

diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index 3aa8b399355..fddc3ea5eee 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -21,12 +21,19 @@ $privateKeySet = ($session->getPrivateKey() !== false) ? true : false;
 $recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
 $recoveryEnabledForUser = $util->recoveryEnabledForUser();
 
-\OCP\Util::addscript('files_encryption', 'settings-personal');
-\OCP\Util::addScript('settings', 'personal');
+$result = false;
 
-$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
-$tmpl->assign('recoveryEnabledForUser', $recoveryEnabledForUser);
-$tmpl->assign('privateKeySet', $privateKeySet);
+if ($recoveryAdminEnabled || !$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;