fix lost password page, don't show checkbox is encryption is not enabled

diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index 9377de5d39abc33d9df18ef5b2cb5266047db28b..2f9963652190b2f457f912a85c65c017b2b7d5cf 100644 (file)
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -8,11 +8,11 @@
 
 class OC_Core_LostPassword_Controller {
        protected static function displayLostPasswordPage($error, $requested) {
-               $encrypted = OC_App::isEnabled('files_encryption');
+               $isEncrypted = OC_App::isEnabled('files_encryption');
                OC_Template::printGuestPage('core/lostpassword', 'lostpassword',
                        array('error' => $error,
                                'requested' => $requested,
-                               'encrypted' => $encrypted));
+                               'isEncrypted' => $isEncrypted));
        }
        
        protected static function displayResetPasswordPage($success, $args) {
@@ -33,7 +33,9 @@ class OC_Core_LostPassword_Controller {
 
        public static function sendEmail($args) {
 
-               if(isset($_POST['noEncryption']) || isset($_POST['continue'])) {
+               $isEncrypted = OC_App::isEnabled('files_encryption');
+
+               if(!$isEncrypted || isset($_POST['continue'])) {
                        $continue = true;
                } else {
                        $continue = false;

diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index c082ee977da03f708e1dba7ac2fc5a643e641193..432216490437af75bc034a5fb8596ce533f2f768 100644 (file)
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -17,13 +17,11 @@
                                <input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus />
                                <label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label>
                                <img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
-                               <?php if ($_['encrypted']): ?>
+                               <?php if ($_['isEncrypted']): ?>
                                <br /><br />
                                <?php print_unescaped($l->t('Your files seems to be encrypted. If you didn\'t have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?')); ?><br />
                                <input type="checkbox" name="continue" value="Yes" />
                                        <?php print_unescaped($l->t('Yes, I really want to reset my password now')); ?><br/><br/>
-                               <?php else: ?>
-                               <input type="checkbox" name="noEncryption" value="Yes" checked />
                                <?php endif; ?>
                        </p>
                        <input type="submit" id="submit" value="<?php print_unescaped($l->t('Request reset')); ?>" />