From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri, 12 Jul 2013 15:05:58 +0000 (+0200)
Subject: in case the encryption app is enabled we cannot yet allow anonymous upload
X-Git-Tag: v6.0.0alpha2~424^2~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5f5700e3538932b9688d9120adfe7f21db98f28a;p=nextcloud-server.git

in case the encryption app is enabled we cannot yet allow anonymous upload
---

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();
 }