diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-02-04 08:04:19 -0800 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-02-04 08:04:19 -0800 |
| commit | 0609f30d1c4ab01804d0ecf943c0d9146bb41cb7 (patch) | |
| tree | 28f39a748ad378c20fbc12e7398d0df932441d31 /apps/files_sharing | |
| parent | bd6734291cd56b4d3d494a6e4138435ecb49171e (diff) | |
| parent | 099b71c712c38de7dac7e386252da02bb0cadf12 (diff) | |
| download | nextcloud-server-0609f30d1c4ab01804d0ecf943c0d9146bb41cb7.tar.gz nextcloud-server-0609f30d1c4ab01804d0ecf943c0d9146bb41cb7.zip | |
Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg
Change misleading message when file size exceeds upload limit
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/public.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 0ca923fff08..b187da41324 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -143,6 +143,8 @@ if (isset($path)) { OCP\Util::addScript('files', 'jquery.iframe-transport'); OCP\Util::addScript('files', 'jquery.fileupload'); $maxUploadFilesize=OCP\Util::maxUploadFilesize($path); + $freeSpace=OCP\Util::freeSpace($dir); + $uploadLimit=OCP\Util::uploadLimit(); $tmpl = new OCP\Template('files_sharing', 'public', 'base'); $tmpl->assign('uidOwner', $shareOwner); $tmpl->assign('displayName', \OCP\User::getDisplayName($shareOwner)); @@ -162,6 +164,8 @@ if (isset($path)) { } $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize); $tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize)); + $tmpl->assign('freeSpace', $freeSpace); + $tmpl->assign('uploadLimit', $uploadLimit); // PHP upload limit $urlLinkIdentifiers= (isset($token)?'&t='.$token:'') .(isset($_GET['dir'])?'&dir='.$_GET['dir']:'') |