diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2012-07-31 16:37:37 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2012-07-31 16:37:37 +0200 |
| commit | e4e6574e425b666170ac56238a3bb6c84a2d50e2 (patch) | |
| tree | be333169bee737b10ab6c01d046ed5a6e5dec73e | |
| parent | 9bab06537c8d455c1a93b167193ec7cdebe89ffe (diff) | |
| download | nextcloud-server-e4e6574e425b666170ac56238a3bb6c84a2d50e2.tar.gz nextcloud-server-e4e6574e425b666170ac56238a3bb6c84a2d50e2.zip | |
allow admin to choose between client and server side encryption
| -rw-r--r-- | apps/files_encryption/js/settings.js | 11 | ||||
| -rw-r--r-- | apps/files_encryption/templates/settings.php | 11 |
2 files changed, 21 insertions, 1 deletions
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js index 8cc433246cb..49dcf2bfca3 100644 --- a/apps/files_encryption/js/settings.js +++ b/apps/files_encryption/js/settings.js @@ -21,4 +21,15 @@ $(document).ready(function(){ var checked=$('#enable_encryption').is(':checked'); OC.AppConfig.setValue('files_encryption','enable_encryption',(checked)?'true':'false'); }) + $('input[name=encryption_mode]').change(function(){ + var client=$('input[value="client"]:checked').val() + ,server=$('input[value="server"]:checked').val() + ,none=$('input[value="none"]:checked').val() + if (client) + OC.AppConfig.setValue('files_encryption','mode','client'); + if (server) + OC.AppConfig.setValue('files_encryption','mode','server'); + if (none) + OC.AppConfig.setValue('files_encryption','mode','none'); + }) })
\ No newline at end of file diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php index 79780d694cf..80b3da84caa 100644 --- a/apps/files_encryption/templates/settings.php +++ b/apps/files_encryption/templates/settings.php @@ -1,5 +1,14 @@ <form id="calendar"> <fieldset class="personalblock"> + + <strong>Choose encryption mode:</strong> + + <p> + <input type="radio" name="encryption_mode" value="client" style="width:20px;" /> Client side encryption (most secure but makes it impossible to access your data from the web interface)<br /> + <input type="radio" name="encryption_mode" value="server" style="width:20px;" /> Server side encryption (allows you to access your files from the web interface and the desktop client)<br /> + <input type="radio" name="encryption_mode" value="none" style="width:20px; checked="checked" /> None (no encryption at all)<br/> + </p> + <p> <strong><?php echo $l->t('Encryption'); ?></strong> <?php echo $l->t("Exclude the following file types from encryption"); ?> <select id='encryption_blacklist' title="<?php echo $l->t('None')?>" multiple="multiple"> @@ -7,6 +16,6 @@ <option selected="selected" value="<?php echo $type;?>"><?php echo $type;?></option> <?php endforeach;?> </select> - <input type='checkbox' id='enable_encryption' <?php if($_['encryption_enabled']){echo 'checked="checked"';} ?>></input><label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label> + </p> </fieldset> </form> |