Skip to content

[BUGFIX] Ensure TYPO3 CMS v13 compatibility #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moritz-ngo wants to merge 3 commits into
base: release/v13
Choose a base branch
from
Open

[BUGFIX] Ensure TYPO3 CMS v13 compatibility #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9218770
[BUGFIX] Ensure TYPO3 CMS v13 compatibility
moritz-ngo May 12, 2025
28be722
Update Classes/Resource/Rendering/VideoTagRenderer.php
doemedia Jun 13, 2025
7718fab
Update Classes/Resource/Rendering/VideoTagRenderer.php
doemedia Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions Classes/Backend/Form/Container/FileReferenceContainer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Resource\Index\MetaDataRepository;
use TYPO3\CMS\Core\Resource\ResourceFactory;
use TYPO3\CMS\Core\Type\Bitmask\Permission;
use TYPO3\CMS\Core\Utility\GeneralUtility;
Expand All @@ -37,9 +36,15 @@ public function __construct(
private readonly ResourceFactory $resourceFactory,
private readonly ConnectionPool $connectionPool,
private readonly UriBuilder $uriBuilder,
private readonly MetaDataRepository $metaDataRepository,
) {
parent::__construct($iconFactory, $inlineStackProcessor, $eventDispatcher, $resourceFactory, $connectionPool, $uriBuilder, $metaDataRepository);
parent::__construct(
$iconFactory,
$inlineStackProcessor,
$eventDispatcher,
$resourceFactory,
$connectionPool,
$uriBuilder,
);
}

protected function renderFileReferenceHeaderControl(): string
Expand Down
152 changes: 91 additions & 61 deletions Classes/Resource/Rendering/VideoTagRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

namespace WapplerSystems\Videos\Resource\Rendering;

use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
use TYPO3\CMS\Core\Http\ApplicationType;
use TYPO3\CMS\Core\Resource\FileInterface;
Expand All @@ -28,6 +29,7 @@ class VideoTagRenderer extends \TYPO3\CMS\Core\Resource\Rendering\VideoTagRender
* Mime types that can be used in the HTML Video tag
*
* @var array
* @phpstan-var string[]
*/
protected $possibleMimeTypes = ['video/mp4', 'video/webm', 'video/ogg', 'application/ogg'];

Expand All @@ -40,21 +42,12 @@ class VideoTagRenderer extends \TYPO3\CMS\Core\Resource\Rendering\VideoTagRender
*
* @return int
*/
#[\Override]
public function getPriority()
{
return 100;
}

/**
* Check if given File(Reference) can be rendered
*
* @param FileInterface $file File or FileReference to render
* @return bool
*/
public function canRender(FileInterface $file)
{
return in_array($file->getMimeType(), $this->possibleMimeTypes, true);
}

/**
* Render for given File(Reference) HTML output
Expand All @@ -63,18 +56,19 @@ public function canRender(FileInterface $file)
* @param int|string $width TYPO3 known format; examples: 220, 200m or 200c
* @param int|string $height TYPO3 known format; examples: 220, 200m or 200c
* @param array $options controls = TRUE/FALSE (default TRUE), autoplay = TRUE/FALSE (default FALSE), loop = TRUE/FALSE (default FALSE)
* @param bool $usedPathsRelativeToCurrentScript See $file->getPublicUrl()
* @return string
*/
public function render(FileInterface $file, $width, $height, array $options = [], $usedPathsRelativeToCurrentScript = false)
#[\Override]
public function render(FileInterface $file, $width, $height, array $options = [])
{
if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend()) {
return parent::render($file, $width, $height, $options, $usedPathsRelativeToCurrentScript);
if (
($request = $GLOBALS['TYPO3_REQUEST'] ?? null) instanceof ServerRequestInterface
&& ApplicationType::fromRequest($request)->isBackend()
) {
return parent::render($file, $width, $height, $options);
}
$attributes = [];

$showControlsGlobal = GeneralUtility::makeInstance(ExtensionConfiguration::class)
->get('videos', 'controls');
$attributes = [];

// If autoplay isn't set manually check if $file is a FileReference take autoplay from there
if ($file instanceof FileReference) {
Expand All @@ -83,10 +77,12 @@ public function render(FileInterface $file, $width, $height, array $options = []
$attributes['autoplay'] = 'autoplay';
$attributes['playsinline'] = 'playsinline';
}

$muted = $file->getProperty('muted');
if ($muted) {
$attributes['muted'] = 'muted';
}

$loop = $file->getProperty('loop');
if ($loop) {
$attributes['loop'] = 'loop';
Expand All @@ -100,100 +96,134 @@ public function render(FileInterface $file, $width, $height, array $options = []
if ((int)$height > 0) {
$attributes[] = 'height="' . (int)$height . '"';
}

$showControlsGlobal = GeneralUtility::makeInstance(ExtensionConfiguration::class)
->get('videos', 'controls');

$showControls = ($showControlsGlobal === '1');
if (isset($options['controls']) && (int)$options['controls'] === 0) {
$showControls = false;
}
if (isset($options['controls']) && (int)$options['controls'] === 1) {
$showControls = true;
if (isset($options['controls'])) {
$showControls = (int)$options['controls'] === 1;
}
if ($showControls) {
$attributes['controls'] = 'controls';
}

if ($options['autoplay'] ?? false) {
$attributes['autoplay'] = 'autoplay';
$attributes['playsinline'] = 'playsinline';
}

if (($options['muted'] ?? false) || (($attributes['autoplay'] ?? '') === 'autoplay')) {
$attributes['muted'] = 'muted';
}

if ($options['loop'] ?? false) {
$attributes['loop'] = 'loop';
}

if ($options['playsinline'] ?? false) {
$attributes['playsinline'] = 'playsinline';
}
if ($options['poster'] ?? false) {
$attributes['poster'] = 'poster="'.$options['poster'].'"';
}

if ($file instanceof FileReference) {
$file = $file->getOriginalFile();
}
if ($file->getProperty('poster')) {
/** @var FileRepository $fileRepository */
$fileRepository = GeneralUtility::makeInstance(FileRepository::class);

$fileObjects = $fileRepository->findByRelation('sys_file_metadata', 'poster', $file->getMetaData()['uid']);

if (isset($fileObjects[0])) {
/** @var FileReference $posterFile */
$posterFile = $fileObjects[0];
$attributes['poster'] = 'poster="' . $posterFile->getPublicUrl() . '"';
$poster = $options['poster'] ?? false;
if (! is_string($poster)
&& $file instanceof FileReference
&& $file->getOriginalFile()->getProperty('poster')
) {
$fileMetadata = $file->getOriginalFile()->getMetaData();
$fileObjects = $this->getFileRepository()->findByRelation(
'sys_file_metadata',
'poster',
(int)$fileMetadata['uid']
);

$posterFile = $fileObjects[0] ?? null;
if ($posterFile instanceof FileReference) {
$poster = $posterFile->getPublicUrl();
}
}

if (is_string($poster) && ! empty($poster)) {
$attributes['poster'] = 'poster="'. $poster .'"';
}

/* TODO: make it configurable */
$attributes[] = 'oncontextmenu="return false;"';

$tracks = '';
if ($file->getProperty('tracks')) {

/** @var FileRepository $fileRepository */
$fileRepository = GeneralUtility::makeInstance(FileRepository::class);

$fileObjects = $fileRepository->findByRelation('sys_file_metadata', 'tracks', $file->getMetaData()['uid']);

/** @var FileReference $fileObject */
foreach ($fileObjects as $key => $fileObject) {

$trackLanguage = $fileObject->getProperty('track_language');
$trackType = $fileObject->getProperty('track_type');
if (
$file instanceof FileReference
&& $file->getOriginalFile()->getProperty('tracks')
) {
$site = $this->getSiteFinder()->getSiteByPageId($file->getProperty('pid') ?: $GLOBALS['TSFE']->id);
$defaultLanguage = $site->getDefaultLanguage();

$fileMetadata = $file->getOriginalFile()->getMetaData();
$fileObjects = $this->getFileRepository()->findByRelation(
'sys_file_metadata',
'tracks',
(int)$fileMetadata['uid']
);

foreach ($fileObjects as $fileObject) {
$trackLanguage = (int)$fileObject->getProperty('track_language');
$trackType = (string)$fileObject->getProperty('track_type') ?: 'subtitles';
$languageTitle = LocalizationUtility::translate('language.default', 'videos');

$defaultLanguage = GeneralUtility::makeInstance(SiteFinder::class)->getSiteByPageId($GLOBALS['TSFE']->id)->getDefaultLanguage();

$isoCode = $defaultLanguage->getTwoLetterIsoCode();
$isoCode = $defaultLanguage->getLocale()->getLanguageCode();

if ($trackLanguage > -1) {
$language = GeneralUtility::makeInstance(SiteFinder::class)->getSiteByPageId($GLOBALS['TSFE']->id)->getLanguageById($trackLanguage);
if ($language) {
try {
$language = $site->getLanguageById($trackLanguage);
$languageTitle = $language->getTitle();
$isoCode = $language->getTwoLetterIsoCode();
$isoCode = $language->getLocale()->getLanguageCode();
} catch (\InvalidArgumentException) {
// silent fail
}
}

$tracks .= '<track label="'.$languageTitle.'" kind="'.($trackType ?: 'subtitles').'" srclang="'.$isoCode.'" src="' . $fileObject->getPublicUrl() . '">';
if (! empty($fileObject->getPublicUrl())) {
$tracks .= sprintf(
'<track label="%s" kind="%s" srclang="%s" src="%s">',
$languageTitle,
$trackType,
$isoCode,
(string)$fileObject->getPublicUrl()
);
}
}
}

/* TODO: make it configurable */
$attributes[] = 'oncontextmenu="return false;"';

foreach (['class', 'dir', 'id', 'lang', 'style', 'title', 'accesskey', 'tabindex', 'onclick'] as $key) {
foreach (['class', 'dir', 'id', 'lang', 'style', 'title', 'accesskey', 'tabindex', 'onclick', 'controlsList', 'preload'] as $key) {
if (!empty($options[$key])) {
$attributes[] = $key . '="' . htmlspecialchars($options[$key]) . '"';
}
}

if (strpos($options['class'] ?? '', 'no-videojs') === false) {
$attributes[] = 'data-setup="{}"';
}

// Clean up duplicate attributes
$attributes = array_unique($attributes);

return sprintf(
'<video%s><source src="%s" type="%s">%s</video>',
empty($attributes) ? '' : ' ' . implode(' ', $attributes),
htmlspecialchars($file->getPublicUrl($usedPathsRelativeToCurrentScript)),
htmlspecialchars((string)$file->getPublicUrl()),
$file->getMimeType(),
$tracks
);
}

protected function getFileRepository(): FileRepository
{
return GeneralUtility::makeInstance(FileRepository::class);
}

protected function getSiteFinder(): SiteFinder
{
return GeneralUtility::makeInstance(SiteFinder::class);
}
}