Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
47af5331
Commit
47af5331
authored
Mar 16, 2015
by
Joas Schilling
Browse files
Move mimetype check from template to controller
parent
8ed27d2c
Changes
2
Hide whitespace changes
Inline
Side-by-side
apps/files_sharing/lib/controllers/sharecontroller.php
View file @
47af5331
...
...
@@ -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
();
...
...
apps/files_sharing/templates/public.php
View file @
47af5331
...
...
@@ -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"
>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment