upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

adjust wording and add button to confirm encryption

Browse source
This commit is contained in:
Bjoern Schiessle 2015-05-05 10:38:09 +02:00
parent 6dc3682cc2
commit 8f1e504d79
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
settings/js/admin.js
View file

@ -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){

12
settings/templates/admin.php
View file

@ -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'); ?>">