summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/lib
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2015-01-17 12:11:52 +0100
committerGeorg Ehrke <developer@georgehrke.com>2015-01-19 16:20:06 +0100
commit374ddbff55719ee42986383e6700e01370d68627 (patch)
tree4e8b0a4272cd64137ff006e7691e7d1b9b962a42 /apps/files_sharing/lib
parent60c4cb1dd669a0c40abcff50a636d7b4cb6469e0 (diff)
downloadnextcloud-server-374ddbff55719ee42986383e6700e01370d68627.tar.gz
nextcloud-server-374ddbff55719ee42986383e6700e01370d68627.zip
show animated gifs on public sharing page
Diffstat (limited to 'apps/files_sharing/lib')
-rw-r--r--apps/files_sharing/lib/controllers/sharecontroller.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index 69de717611c..1d8eabc1984 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -176,7 +176,9 @@ class ShareController extends Controller {
$shareTmpl['server2serversharing'] = Helper::isOutgoingServer2serverShareEnabled();
$shareTmpl['protected'] = isset($linkItem['share_with']) ? 'true' : 'false';
$shareTmpl['dir'] = '';
- $shareTmpl['fileSize'] = \OCP\Util::humanFileSize(\OC\Files\Filesystem::filesize($originalSharePath));
+ $nonHumanFileSize = \OC\Files\Filesystem::filesize($originalSharePath);
+ $shareTmpl['nonHumanFileSize'] = $nonHumanFileSize;
+ $shareTmpl['fileSize'] = \OCP\Util::humanFileSize($nonHumanFileSize);
// Show file list
if (Filesystem::is_dir($originalSharePath)) {
@@ -202,6 +204,7 @@ class ShareController extends Controller {
}
$shareTmpl['downloadURL'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.downloadShare', array('token' => $token));
+ $shareTmpl['maxSizeAnimateGif'] = $this->config->getSystemValue('max_filesize_animated_gifs_public_sharing', 10);
return new TemplateResponse($this->appName, 'public', $shareTmpl, 'base');
}