Merge pull request #3886 from owncloud/disable-public-upload-if-encryption-enabled-master

for now we disable public upload in case encryption is enabled
This commit is contained in:
Thomas Müller 2013-06-28 13:59:33 -07:00
commit dfa6aa25c3
1 changed files with 5 additions and 1 deletions

View File

@ -147,7 +147,11 @@ if (isset($path)) {
$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
$tmpl->assign('fileTarget', basename($linkItem['file_target']));
$tmpl->assign('dirToken', $linkItem['token']);
$tmpl->assign('allowPublicUploadEnabled', (($linkItem['permissions'] & OCP\PERMISSION_CREATE) ? true : false ));
$allowPublicUploadEnabled = (($linkItem['permissions'] & OCP\PERMISSION_CREATE) ? true : false );
if (\OCP\App::isEnabled('files_encryption')) {
$allowPublicUploadEnabled = false;
}
$tmpl->assign('allowPublicUploadEnabled', $allowPublicUploadEnabled);
$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));