diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-03-28 18:39:12 +0100 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-03-28 18:39:12 +0100 |
| commit | ff6f52d5ec24a9c940f3e8b0dd2f731b1a42104e (patch) | |
| tree | dfe4d38b0df8c91b9fd9a5189098590d102d1557 /apps/files_encryption/js/settings-personal.js | |
| parent | 9ecfd07f23e7fe2924bee6103792c00c6ec3cb0a (diff) | |
| parent | df31ee5a903efb288dcb217dc13591a4efd46572 (diff) | |
| download | nextcloud-server-ff6f52d5ec24a9c940f3e8b0dd2f731b1a42104e.tar.gz nextcloud-server-ff6f52d5ec24a9c940f3e8b0dd2f731b1a42104e.zip | |
Merge branch 'master' into files_encryption
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/keymanager.php
Diffstat (limited to 'apps/files_encryption/js/settings-personal.js')
| -rw-r--r-- | apps/files_encryption/js/settings-personal.js | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js deleted file mode 100644 index 1a53e99d2b4..00000000000 --- a/apps/files_encryption/js/settings-personal.js +++ /dev/null @@ -1,38 +0,0 @@ -/** - * Copyright (c) 2012, Bjoern Schiessle <schiessle@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or later. - * See the COPYING-README file. - */ - -$(document).ready(function(){ - $('input[name=encryption_mode]').change(function(){ - var prevmode = document.getElementById('prev_encryption_mode').value - var client=$('input[value="client"]:checked').val() - ,server=$('input[value="server"]:checked').val() - ,user=$('input[value="user"]:checked').val() - ,none=$('input[value="none"]:checked').val() - if (client) { - $.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'client' }); - if (prevmode == 'server') { - OC.dialogs.info(t('encryption', 'Please switch to your ownCloud client and change your encryption password to complete the conversion.'), t('encryption', 'switched to client side encryption')); - } - } else if (server) { - if (prevmode == 'client') { - OC.dialogs.form([{text:'Login password', name:'newpasswd', type:'password'},{text:'Encryption password used on the client', name:'oldpasswd', type:'password'}],t('encryption', 'Change encryption password to login password'), function(data) { - $.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'server', newpasswd: data[0].value, oldpasswd: data[1].value }, function(result) { - if (result.status != 'success') { - document.getElementById(prevmode+'_encryption').checked = true; - OC.dialogs.alert(t('encryption', 'Please check your passwords and try again.'), t('encryption', 'Could not change your file encryption password to your login password')) - } else { - console.log("alles super"); - } - }, true); - }); - } else { - $.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'server' }); - } - } else { - $.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'none' }); - } - }) -})
\ No newline at end of file |