remove encryption specific code from files app
This commit is contained in:
parent
9d8c07850d
commit
ee53ba5ed6
|
@ -84,8 +84,6 @@ $config = \OC::$server->getConfig();
|
||||||
// mostly for the home storage's free space
|
// mostly for the home storage's free space
|
||||||
$dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
|
$dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
|
||||||
$storageInfo=OC_Helper::getStorageInfo('/', $dirInfo);
|
$storageInfo=OC_Helper::getStorageInfo('/', $dirInfo);
|
||||||
// if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code)
|
|
||||||
$encryptionInitStatus = 2;
|
|
||||||
|
|
||||||
$nav = new OCP\Template('files', 'appnavigation', '');
|
$nav = new OCP\Template('files', 'appnavigation', '');
|
||||||
|
|
||||||
|
@ -145,7 +143,6 @@ $tmpl->assign('isPublic', false);
|
||||||
$tmpl->assign("mailNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_mail_notification', 'no'));
|
$tmpl->assign("mailNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_mail_notification', 'no'));
|
||||||
$tmpl->assign("mailPublicNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_public_notification', 'no'));
|
$tmpl->assign("mailPublicNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_public_notification', 'no'));
|
||||||
$tmpl->assign("allowShareWithLink", $config->getAppValue('core', 'shareapi_allow_links', 'yes'));
|
$tmpl->assign("allowShareWithLink", $config->getAppValue('core', 'shareapi_allow_links', 'yes'));
|
||||||
$tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
|
|
||||||
$tmpl->assign('appNavigation', $nav);
|
$tmpl->assign('appNavigation', $nav);
|
||||||
$tmpl->assign('appContents', $contentItems);
|
$tmpl->assign('appContents', $contentItems);
|
||||||
|
|
||||||
|
|
|
@ -120,22 +120,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
displayEncryptionWarning: function() {
|
|
||||||
|
|
||||||
if (!OC.Notification.isHidden()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
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'));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
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.'));
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the download URL of the given file(s)
|
* Returns the download URL of the given file(s)
|
||||||
* @param filename string or array of file names to download
|
* @param filename string or array of file names to download
|
||||||
|
@ -214,7 +198,6 @@
|
||||||
*/
|
*/
|
||||||
initialize: function() {
|
initialize: function() {
|
||||||
Files.getMimeIcon.cache = {};
|
Files.getMimeIcon.cache = {};
|
||||||
Files.displayEncryptionWarning();
|
|
||||||
Files.bindKeyboardShortcuts(document, $);
|
Files.bindKeyboardShortcuts(document, $);
|
||||||
|
|
||||||
// TODO: move file list related code (upload) to OCA.Files.FileList
|
// TODO: move file list related code (upload) to OCA.Files.FileList
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
<input type="hidden" name="filesApp" id="filesApp" value="1" />
|
<input type="hidden" name="filesApp" id="filesApp" value="1" />
|
||||||
<input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />
|
<input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />
|
||||||
<?php if (!$_['isPublic']) :?>
|
<?php if (!$_['isPublic']) :?>
|
||||||
<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="mailNotificationEnabled" id="mailNotificationEnabled" value="<?php p($_['mailNotificationEnabled']) ?>" />
|
||||||
<input type="hidden" name="mailPublicNotificationEnabled" id="mailPublicNotificationEnabled" value="<?php p($_['mailPublicNotificationEnabled']) ?>" />
|
<input type="hidden" name="mailPublicNotificationEnabled" id="mailPublicNotificationEnabled" value="<?php p($_['mailPublicNotificationEnabled']) ?>" />
|
||||||
<input type="hidden" name="allowShareWithLink" id="allowShareWithLink" value="<?php p($_['allowShareWithLink']) ?>" />
|
<input type="hidden" name="allowShareWithLink" id="allowShareWithLink" value="<?php p($_['allowShareWithLink']) ?>" />
|
||||||
|
|
Loading…
Reference in New Issue