diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-31 11:50:53 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 13:30:29 +0200 |
| commit | bf809ac85aa6739010463235fe8f7878993c39ee (patch) | |
| tree | 5fb347cb7e502f5622d7327c46cd69f1ec68efbc /apps/files | |
| parent | 6ccd3ffa23882b7d5018d707d2563a12c418fc09 (diff) | |
| download | nextcloud-server-bf809ac85aa6739010463235fe8f7878993c39ee.tar.gz nextcloud-server-bf809ac85aa6739010463235fe8f7878993c39ee.zip | |
Removing left overs from old encryption app
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/index.php | 1 | ||||
| -rw-r--r-- | apps/files/js/files.js | 6 | ||||
| -rw-r--r-- | apps/files/templates/index.php | 1 |
3 files changed, 0 insertions, 8 deletions
diff --git a/apps/files/index.php b/apps/files/index.php index 3f932859029..23830da695d 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -142,7 +142,6 @@ OCP\Util::addscript('files', 'keyboardshortcuts'); $tmpl = new OCP\Template('files', 'index', 'user'); $tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']); $tmpl->assign('isPublic', false); -$tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles()); $tmpl->assign("mailNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_mail_notification', 'no')); $tmpl->assign("mailPublicNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_public_notification', 'no')); $tmpl->assign("allowShareWithLink", $config->getAppValue('core', 'shareapi_allow_links', 'yes')); diff --git a/apps/files/js/files.js b/apps/files/js/files.js index e63c3cad52e..9d2d563984e 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -126,7 +126,6 @@ return; } - var encryptedFiles = $('#encryptedFiles').val(); var initStatus = $('#encryptionInitStatus').val(); if (initStatus === '0') { // enc not initialized, but should be OC.Notification.show(t('files', 'Encryption App is enabled but your keys are not initialized, please log-out and log-in again')); @@ -134,11 +133,6 @@ } if (initStatus === '1') { // encryption tried to init but failed OC.Notification.show(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.')); - return; - } - if (encryptedFiles === '1') { - OC.Notification.show(t('files', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.')); - return; } }, diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 222a996aae3..84f3033ba9e 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -12,7 +12,6 @@ <input type="hidden" name="filesApp" id="filesApp" value="1" /> <input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" /> <?php if (!$_['isPublic']) :?> -<input type="hidden" name="encryptedFiles" id="encryptedFiles" value="<?php $_['encryptedFiles'] ? p('1') : p('0'); ?>" /> <input type="hidden" name="encryptedInitStatus" id="encryptionInitStatus" value="<?php p($_['encryptionInitStatus']) ?>" /> <input type="hidden" name="mailNotificationEnabled" id="mailNotificationEnabled" value="<?php p($_['mailNotificationEnabled']) ?>" /> <input type="hidden" name="mailPublicNotificationEnabled" id="mailPublicNotificationEnabled" value="<?php p($_['mailPublicNotificationEnabled']) ?>" /> |