diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-22 13:08:59 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-22 13:08:59 +0200 |
| commit | 14daec98be5220a2371e7eeca9a31c3d3115f64c (patch) | |
| tree | 476593a04707720cd89aa1b43d01734a3fd08182 /apps/files | |
| parent | 57d94580e911e31a92bdbbf1196873e5d19eb211 (diff) | |
| download | nextcloud-server-14daec98be5220a2371e7eeca9a31c3d3115f64c.tar.gz nextcloud-server-14daec98be5220a2371e7eeca9a31c3d3115f64c.zip | |
Squashed commit of the following:
commit 7e875ff47ae1a3e546c74fb12895b2bfbeedabdf
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Sun Jul 14 21:58:08 2013 +0200
No admin option to enable public upload in case encryption is enabled
No upload on pubic page if public upload is disabled
commit 4939d9a668c13cdd74e8bb8e305bdd7a59661c4d
Author: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri Jul 12 21:34:38 2013 +0200
change anonymous to public
commit c3bda8654d911383ae0acf9e41adda7117cb79f8
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri Jul 12 17:51:01 2013 +0200
fixing Undefined index: publicUploadEnabled
commit 98861afde443c12a2ef5290c83c63fd12b7b196d
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri Jul 12 17:05:58 2013 +0200
in case the encryption app is enabled we cannot yet allow anonymous upload
commit 974f09629d0e8bf5d90cf8546fa4a82738ebdebe
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri Jul 12 17:03:51 2013 +0200
new admin setting added which allows to turn off anonymous uploads
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/index.php | 5 | ||||
| -rw-r--r-- | apps/files/templates/index.php | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/files/index.php b/apps/files/index.php index 2338cf439e4..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,5 +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', $publicUploadEnabled); $tmpl->printPage(); } diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index b9a420887ed..e3d4115413d 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -59,7 +59,7 @@ <div id="emptyfolder"><?php p($l->t('Nothing in here. Upload something!'))?></div> <?php endif; ?> -<table id="filestable"> +<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>"> <thead> <tr> <th id='headerName'> |