From b6050b44c27e74d87c813f108976c62a0fa31cb9 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 2 Mar 2016 19:38:21 +0100
Subject: [PATCH] disable the recovery key if the master key is enabled

---
 apps/encryption/settings/settings-admin.php  |   1 +
 apps/encryption/templates/settings-admin.php | 100 ++++++++++---------
 2 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/apps/encryption/settings/settings-admin.php b/apps/encryption/settings/settings-admin.php
index 6c7c0987fd..79e900ebbd 100644
--- a/apps/encryption/settings/settings-admin.php
+++ b/apps/encryption/settings/settings-admin.php
@@ -49,5 +49,6 @@ $encryptHomeStorage = $util->shouldEncryptHomeStorage();
 $tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
 $tmpl->assign('initStatus', $session->getStatus());
 $tmpl->assign('encryptHomeStorage', $encryptHomeStorage);
+$tmpl->assign('masterKeyEnabled', $util->isMasterKeyEnabled());
 
 return $tmpl->fetchPage();
diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php
index e55aba6757..9804db045c 100644
--- a/apps/encryption/templates/settings-admin.php
+++ b/apps/encryption/templates/settings-admin.php
@@ -16,56 +16,58 @@ style('encryption', 'settings-admin');
 			<em><?php p( $l->t( "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" ) ); ?></em>
 		</p>
 		<br />
-		<p id="encryptionSetRecoveryKey">
-			<?php $_["recoveryEnabled"] === '0' ?  p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>
-			<span class="msg"></span>
-			<br/>
-			<em>
-				<?php p($l->t("The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password.")) ?>
-			</em>
-			<br/>
-			<input type="password"
-				   name="encryptionRecoveryPassword"
-				   id="encryptionRecoveryPassword"
-				   placeholder="<?php p($l->t("Recovery key password")); ?>"/>
-			<input type="password"
-				   name="encryptionRecoveryPassword"
-				   id="repeatEncryptionRecoveryPassword"
-				   placeholder="<?php p($l->t("Repeat recovery key password")); ?>"/>
-			<input type="button"
-				   name="enableRecoveryKey"
-				   id="enableRecoveryKey"
-				   status="<?php p($_["recoveryEnabled"]) ?>"
-				   value="<?php $_["recoveryEnabled"] === '0' ?  p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>"/>
-		</p>
-		<br/><br/>
+		<?php if($_['masterKeyEnabled'] === false): ?>
+			<p id="encryptionSetRecoveryKey">
+				<?php $_["recoveryEnabled"] === '0' ?  p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>
+				<span class="msg"></span>
+				<br/>
+				<em>
+					<?php p($l->t("The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password.")) ?>
+				</em>
+				<br/>
+				<input type="password"
+					   name="encryptionRecoveryPassword"
+					   id="encryptionRecoveryPassword"
+					   placeholder="<?php p($l->t("Recovery key password")); ?>"/>
+				<input type="password"
+					   name="encryptionRecoveryPassword"
+					   id="repeatEncryptionRecoveryPassword"
+					   placeholder="<?php p($l->t("Repeat recovery key password")); ?>"/>
+				<input type="button"
+					   name="enableRecoveryKey"
+					   id="enableRecoveryKey"
+					   status="<?php p($_["recoveryEnabled"]) ?>"
+					   value="<?php $_["recoveryEnabled"] === '0' ?  p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>"/>
+			</p>
+			<br/><br/>
 
-		<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>>
-			<?php p($l->t("Change recovery key password:")); ?>
-			<span class="msg"></span>
-			<br/>
-			<input
-				type="password"
-				name="changeRecoveryPassword"
-				id="oldEncryptionRecoveryPassword"
-				placeholder="<?php p($l->t("Old recovery key password")); ?>"/>
-			<br />
-			<input
-				type="password"
-				name="changeRecoveryPassword"
-				id="newEncryptionRecoveryPassword"
-				placeholder="<?php p($l->t("New recovery key password")); ?>"/>
-			<input
-				type="password"
-				name="changeRecoveryPassword"
-				id="repeatedNewEncryptionRecoveryPassword"
-				placeholder="<?php p($l->t("Repeat new recovery key password")); ?>"/>
+			<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>>
+				<?php p($l->t("Change recovery key password:")); ?>
+				<span class="msg"></span>
+				<br/>
+				<input
+					type="password"
+					name="changeRecoveryPassword"
+					id="oldEncryptionRecoveryPassword"
+					placeholder="<?php p($l->t("Old recovery key password")); ?>"/>
+				<br />
+				<input
+					type="password"
+					name="changeRecoveryPassword"
+					id="newEncryptionRecoveryPassword"
+					placeholder="<?php p($l->t("New recovery key password")); ?>"/>
+				<input
+					type="password"
+					name="changeRecoveryPassword"
+					id="repeatedNewEncryptionRecoveryPassword"
+					placeholder="<?php p($l->t("Repeat new recovery key password")); ?>"/>
 
-			<button
-				type="button"
-				name="submitChangeRecoveryKey">
-				<?php p($l->t("Change Password")); ?>
-			</button>
-		</p>
+				<button
+					type="button"
+					name="submitChangeRecoveryKey">
+					<?php p($l->t("Change Password")); ?>
+				</button>
+			</p>
+		<?php endif; ?>
 	<?php endif; ?>
 </form>