summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-07-12 17:05:58 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2013-07-12 17:05:58 +0200
commit5f5700e3538932b9688d9120adfe7f21db98f28a (patch)
tree33062dcc6ae268da066dfe44fa3d62cdd6323810 /apps/files
parentfc2d5383119f548f58b5000ebb94422b7feb08a7 (diff)
downloadnextcloud-server-5f5700e3538932b9688d9120adfe7f21db98f28a.tar.gz
nextcloud-server-5f5700e3538932b9688d9120adfe7f21db98f28a.zip
in case the encryption app is enabled we cannot yet allow anonymous upload
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/index.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/files/index.php b/apps/files/index.php
index 892f75a3513..2f005391509 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -121,6 +121,10 @@ if ($needUpgrade) {
// information about storage capacities
$storageInfo=OC_Helper::getStorageInfo();
$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
+ $publicUploadEnabled = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes');
+ if (OC_App::isEnabled('files_encryption')) {
+ $publicUploadEnabled = 'no';
+ }
OCP\Util::addscript('files', 'fileactions');
OCP\Util::addscript('files', 'files');
@@ -138,6 +142,6 @@ if ($needUpgrade) {
$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
$tmpl->assign('isPublic', false);
- $tmpl->assign('publicUploadEnabled', \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'));
+ $tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
$tmpl->printPage();
}