Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617

Encryption improved error messages

2 files changed, 9 insertions, 7 deletions

diff --git a/apps/files_encryption/templates/invalid_private_key.php b/apps/files_encryption/templates/invalid_private_key.php
index 5c086d6514c..9af65f831b4 100644
--- a/apps/files_encryption/templates/invalid_private_key.php
+++ b/apps/files_encryption/templates/invalid_private_key.php
@@ -2,9 +2,11 @@
 	<li class='error'>
 		<?php $location = \OC_Helper::linkToRoute( "settings_personal" ).'#changePKPasswd' ?>
 
-		<?php p($l->t('Your private key is not valid! Maybe the your password was changed from outside.')); ?>
+		<?php p($_['message']); ?>
 		<br/>
-		<?php p($l->t('You can unlock your private key in your ')); ?> <a href="<?php echo $location?>"><?php p($l->t('personal settings')); ?>.</a>
+		<?php if($_['init']): ?>
+			<?php>p($l->t('Go directly to your ')); ?> <a href="<?php echo $location?>"><?php p($l->t('personal settings')); ?>.</a>
+		<?php endif; ?>
 		<br/>
 	</li>
 </ul>
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 38512453207..ff04556dd53 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -4,7 +4,7 @@
 			<?php p( $l->t( 'Encryption' ) ); ?>

 		</legend>

 

-		<?php if ( ! $_["privateKeySet"] ): ?>

+		<?php if ( ! $_["privateKeySet"] && $_["initialized"] ): ?>

 			<p>

 				<a name="changePKPasswd" />

 				<label for="changePrivateKeyPasswd">

@@ -39,22 +39,22 @@
 		<?php endif; ?>

 

 		<br />

-		

+

 		<?php if ( $_["recoveryEnabled"] && $_["privateKeySet"] ): ?>

 			<p>

 				<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>

 				<br />

 				<em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?></em>

 				<br />

-				<input 

+				<input

 				type='radio'

 				name='userEnableRecovery'

 				value='1'

 				<?php echo ( $_["recoveryEnabledForUser"] == 1 ? 'checked="checked"' : '' ); ?> />

 				<?php p( $l->t( "Enabled" ) ); ?>

 				<br />

-				

-				<input 

+

+				<input

 				type='radio'

 				name='userEnableRecovery'

 				value='0'