Move mimetype check from template to controller

diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index ebc54265bf0c35e7ec4d2153d35709cdb11b89d2..b0d7781515f70c9c9919d3dcfccf9bd600a9358c 100644 (file)
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -170,6 +170,7 @@ class ShareController extends Controller {
                $shareTmpl['filename'] = $file;
                $shareTmpl['directory_path'] = $linkItem['file_target'];
                $shareTmpl['mimetype'] = Filesystem::getMimeType($originalSharePath);
+               $shareTmpl['previewSupported'] = \OC::$server->getPreviewManager()->isMimeSupported($shareTmpl['mimetype']);
                $shareTmpl['dirToken'] = $linkItem['token'];
                $shareTmpl['sharingToken'] = $token;
                $shareTmpl['server2serversharing'] = Helper::isOutgoingServer2serverShareEnabled();

diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 26fee0b869490e155e4fc33e4cf49980a58be9a6..fa349f298117ca5d15b500d7fc87392501395400 100644 (file)
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -19,11 +19,10 @@ OCP\Util::addScript('files', 'files');
 OCP\Util::addScript('files', 'filelist');
 OCP\Util::addscript('files', 'keyboardshortcuts');
 
-$thumbSize=1024;
-$previewSupported = \OC::$server->getPreviewManager()->isMimeSupported($_['mimetype']) ? 'true' : 'false';
+$thumbSize = 1024;
 ?>
 
-<?php if ($previewSupported === 'true'): /* This enables preview images for links (e.g. on Facebook, Google+, ...)*/?>
+<?php if ($_['previewSupported']): /* This enables preview images for links (e.g. on Facebook, Google+, ...)*/?>
        <link rel="image_src" href="<?php p(OCP\Util::linkToRoute( 'core_ajax_public_preview', array('x' => $thumbSize, 'y' => $thumbSize, 'file' => $_['directory_path'], 't' => $_['dirToken']))); ?>" />
 <?php endif; ?>
 
@@ -38,7 +37,7 @@ $previewSupported = \OC::$server->getPreviewManager()->isMimeSupported($_['mimet
 <input type="hidden" name="sharingToken" value="<?php p($_['sharingToken']) ?>" id="sharingToken">
 <input type="hidden" name="filename" value="<?php p($_['filename']) ?>" id="filename">
 <input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype">
-<input type="hidden" name="previewSupported" value="<?php p($previewSupported); ?>" id="previewSupported">
+<input type="hidden" name="previewSupported" value="<?php p($_['previewSupported'] ? 'true' : 'false'); ?>" id="previewSupported">
 <input type="hidden" name="mimetypeIcon" value="<?php p(OC_Helper::mimetypeIcon($_['mimetype'])); ?>" id="mimetypeIcon">
 <input type="hidden" name="filesize" value="<?php p($_['nonHumanFileSize']); ?>" id="filesize">
 <input type="hidden" name="maxSizeAnimateGif" value="<?php p($_['maxSizeAnimateGif']); ?>" id="maxSizeAnimateGif">