diff options
| -rw-r--r-- | settings/js/admin.js | 18 | ||||
| -rw-r--r-- | settings/templates/admin.php | 12 |
2 files changed, 15 insertions, 15 deletions
diff --git a/settings/js/admin.js b/settings/js/admin.js index e10e1f915cb..8f705b9048d 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -54,21 +54,15 @@ $(document).ready(function(){ $('#shareAPI p:not(#enable)').toggleClass('hidden', !this.checked); }); - $('#encryptionEnabled').change(function() { + $('#enableEncryption').change(function() { $('#encryptionAPI div#EncryptionWarning').toggleClass('hidden'); - $('#encryptionAPI div#EncryptionSettingsArea').toggleClass('hidden'); }); - $('#encryptionAPI input').change(function() { - var value = $(this).val(); - if ($(this).attr('type') === 'checkbox') { - if (this.checked) { - value = 'yes'; - } else { - value = 'no'; - } - } - OC.AppConfig.setValue('core', $(this).attr('name'), value); + $('#reallyEnableEncryption').click(function() { + $('#encryptionAPI div#EncryptionWarning').toggleClass('hidden'); + $('#encryptionAPI div#EncryptionSettingsArea').toggleClass('hidden'); + OC.AppConfig.setValue('core', 'encryption_enabled', 'yes'); + $('#enableEncryption').attr('disabled', 'disabled'); }); $('#startmigration').click(function(event){ diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 9938b6d01f0..7904c1de41b 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -319,15 +319,21 @@ if ($_['cronErrors']) { href="<?php p(link_to_docs('admin-encryption')); ?>"></a> <p id="enable"> - <input type="checkbox" name="encryption_enabled" - id="encryptionEnabled" + <input type="checkbox" + id="enableEncryption" value="1" <?php if ($_['encryptionEnabled']) print_unescaped('checked="checked" disabled="disabled"'); ?> /> <label for="encryptionEnabled"><?php p($l->t('Enable server-side encryption')); ?> <span id="startmigration_msg" class="msg"></span> </label><br/> </p> <div id="EncryptionWarning" class="warning hidden"> - <?php p($l->t('Once encryption is enabled there is no way to disable it again. This is your last chance to disable it again.')) ?> + <?php p($l->t('Encryption is a one way process. Once encryption is enabled, + all files from that point forward will be encrypted on the server and it + will not be possible to disable encryption at a later date. This is the final warning: + Do you really want to enable encryption?')) ?> + <input type="button" + id="reallyEnableEncryption" + value="<?php p($l->t("Enable encryption")); ?>" /> </div> <div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) p('hidden'); ?>"> |