add a hint that the admin can recover your files; Don't let the user change the recov...

diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 8dab48828a7c48e0f06905d436f25489082b9525..38512453207a0af2ab836589d427f1abc394ef16 100644 (file)
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -7,9 +7,15 @@
                <?php if ( ! $_["privateKeySet"] ): ?>\r
                        <p>\r
                                <a name="changePKPasswd" />\r
-                               <label for="changePrivateKeyPasswd"><?php p( $l->t( "Your private key password no longer match your log-in password:" ) ); ?></label>\r
+                               <label for="changePrivateKeyPasswd">\r
+                                       <?php p( $l->t( "Your private key password no longer match your log-in password:" ) ); ?>\r
+                               </label>\r
                                <br />\r
-                               <em><?php p( $l->t( "Set your old private key password to your current log-in password." ) ); ?></em>\r
+                               <em><?php p( $l->t( "Set your old private key password to your current log-in password." ) ); ?>\r
+                               <?php if (  $_["recoveryEnabledForUser"] ):\r
+                                               p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );\r
+                               endif; ?>\r
+                               </em>\r
                                <br />\r
                                <input\r
                                        type="password"\r
@@ -34,7 +40,7 @@
 \r
                <br />\r
                \r
-               <?php if ( $_["recoveryEnabled"] ): ?>\r
+               <?php if ( $_["recoveryEnabled"] && $_["privateKeySet"] ): ?>\r
                        <p>\r
                                <label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>\r
                                <br />\r