diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-08-12 17:25:27 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-08-12 17:25:27 +0200 |
| commit | 53bb89824deaf97095acf6bcc2997aa7141dd573 (patch) | |
| tree | 8d1ef8a3d2d71295480c1da221fdf514097e9f1e /apps | |
| parent | 0bab8935c95c249405f5b12f4724d189c4ec648b (diff) | |
| download | nextcloud-server-53bb89824deaf97095acf6bcc2997aa7141dd573.tar.gz nextcloud-server-53bb89824deaf97095acf6bcc2997aa7141dd573.zip | |
check if some encrypted files are left after the app was disabled and warn the user
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/index.php | 1 | ||||
| -rw-r--r-- | apps/files/js/files.js | 14 | ||||
| -rw-r--r-- | apps/files/templates/index.php | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/apps/files/index.php b/apps/files/index.php index 2f005391509..57171ac3b5a 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -143,5 +143,6 @@ if ($needUpgrade) { $tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']); $tmpl->assign('isPublic', false); $tmpl->assign('publicUploadEnabled', $publicUploadEnabled); + $tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles()); $tmpl->printPage(); } diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 98fc53b71a9..d6886fc17e4 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -81,9 +81,23 @@ Files={ if (usedSpacePercent > 90) { OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)', {usedSpacePercent: usedSpacePercent})); } + }, + + displayEncryptionWarning: function() { + + if (!OC.Notification.isHidden()) { + return; + } + + var encryptedFiles = $('#encryptedFiles').val(); + if (encryptedFiles === '1') { + OC.Notification.show(t('files_encryption', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.', "www.schiessle.org")); + return; + } } }; $(document).ready(function() { + Files.displayEncryptionWarning(); Files.bindKeyboardShortcuts(document, jQuery); $('#fileList tr').each(function(){ //little hack to set unescape filenames in attribute diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index e0731609368..72bc1e937cc 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -121,3 +121,4 @@ <!-- config hints for javascript --> <input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" /> <input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" /> +<input type="hidden" name="encryptedFiles" id="encryptedFiles" value="<?php $_['encryptedFiles'] ? p('1') : p('0'); ?>" /> |