mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Fixes #5396 toVideo dimensions.

Browse Source
This commit is contained in:
camer0n
2025-01-16 11:23:25 -08:00
parent e8f5e804b2
commit cd30dfdc0d
3 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_handlers/e_parse_class.php
View File

@@ -5112,6 +5112,11 @@ class e_parse
$height = varset($parm['h'], 240);
$mime = varset($parm['mime'], 'video/mp4');
if($height === 0)
{
$height = 'auto';
}
return '
<div class="video-responsive">
<video width="' . $width . '" height="' . $height . '" controls>

3
e107_handlers/media_class.php
View File

@@ -1267,7 +1267,8 @@ class e_media
{
case "video":
$preview = $tp->toVideo($default, array('w'=>$width, 'h'=> ($height - 50)));
$h = (!is_numeric($height) || $height < 1) ? 0 : ($height - 50);
$preview = $tp->toVideo($default, array('w'=>$width, 'h'=>$h ));
break;
case "audio":

36
e107_tests/tests/unit/e_parseTest.php
View File

@@ -2680,11 +2680,43 @@ Your browser does not support the audio tag.
}
/*
public function testToVideo()
{
$tests = [
0 => [
'file' => '{e_MEDIA}myfile.mp4',
'parms' =>[],
'expected' => '<video width="320" height="240" controls>'
],
}*/
1 => [
'file' => '{e_MEDIA}myfile.mp4',
'parms' =>['w'=>500],
'expected' => '<video width="500" height="240" controls>'
],
2 => [
'file' => '{e_MEDIA}myfile.mp4',
'parms' =>['w'=>300, 'h'=>0],
'expected' => '<video width="300" height="auto" controls>'
],
3 => [
'file' => '{e_MEDIA}myfile.mp4',
'parms' =>['w'=>300, 'h'=>'auto'],
'expected' => '<video width="300" height="auto" controls>'
],
];
foreach ($tests as $index => $var)
{
$result = $this->tp->toVideo($var['file'], $var['parms']);
self::assertStringContainsString($var['expected'], $result, 'Failed on index #'.$index);
}
}
public function testMakeClickable()
{