diff options
Diffstat (limited to 'modules/gallery')
| -rw-r--r-- | modules/gallery/models/item.php | 4 | ||||
| -rw-r--r-- | modules/gallery/tests/xss_data.txt | 14 | ||||
| -rw-r--r-- | modules/gallery/views/movieplayer-flash.html.php (renamed from modules/gallery/views/movieplayer.html.php) | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php index 43b9a292..01da010e 100644 --- a/modules/gallery/models/item.php +++ b/modules/gallery/models/item.php @@ -751,7 +751,7 @@ class Item_Model_Core extends ORM_MPTT { // Not set correctly, likely because ffmpeg isn't available. Making the window 0x0 causes the // video to be effectively unviewable. So, let's guess: set width to max_size and guess a // height (using 4:3 aspect ratio). Once the video metadata is loaded, js in - // movieplayer.html.php will correct these values. + // movieplayer-flash.html.php will correct these values. $width = $max_size; $height = ceil($width * 3/4); } @@ -784,7 +784,7 @@ class Item_Model_Core extends ORM_MPTT { if (in_array(strtolower(pathinfo($this->name, PATHINFO_EXTENSION)), array("flv", "mp4", "m4v", "mov", "f4v"))) { // Filetype supported by Flowplayer v3 - use it (default) - $view = new View("movieplayer.html"); + $view = new View("movieplayer-flash.html"); $view->max_size = $movie_img->max_size; $view->width = $movie_img->width; $view->height = $movie_img->height; diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt index daba878d..b365553a 100644 --- a/modules/gallery/tests/xss_data.txt +++ b/modules/gallery/tests/xss_data.txt @@ -223,13 +223,13 @@ modules/gallery/views/menu_dialog.html.php 5 DIRTY_JS $menu- modules/gallery/views/menu_link.html.php 3 DIRTY $menu->css_id?"id='{$menu->css_id}'":"" modules/gallery/views/menu_link.html.php 4 DIRTY_ATTR $menu->css_class modules/gallery/views/menu_link.html.php 5 DIRTY_JS $menu->url -modules/gallery/views/movieplayer.html.php 2 DIRTY html::anchor($url,"",$attrs) -modules/gallery/views/movieplayer.html.php 4 DIRTY_JS $attrs["id"] -modules/gallery/views/movieplayer.html.php 5 DIRTY_JS $max_size -modules/gallery/views/movieplayer.html.php 23 DIRTY_JS url::abs_file("lib/flowplayer.swf") -modules/gallery/views/movieplayer.html.php 30 DIRTY_JS url::abs_file("lib/flowplayer.pseudostreaming-byterange.swf") -modules/gallery/views/movieplayer.html.php 48 DIRTY_JS $width -modules/gallery/views/movieplayer.html.php 48 DIRTY_JS $height +modules/gallery/views/movieplayer-flash.html.php 2 DIRTY html::anchor($url,"",$attrs) +modules/gallery/views/movieplayer-flash.html.php 4 DIRTY_JS $attrs["id"] +modules/gallery/views/movieplayer-flash.html.php 5 DIRTY_JS $max_size +modules/gallery/views/movieplayer-flash.html.php 23 DIRTY_JS url::abs_file("lib/flowplayer-flash/flowplayer.swf") +modules/gallery/views/movieplayer-flash.html.php 30 DIRTY_JS url::abs_file("lib/flowplayer-flash/flowplayer.pseudostreaming-byterange.swf") +modules/gallery/views/movieplayer-flash.html.php 48 DIRTY_JS $width +modules/gallery/views/movieplayer-flash.html.php 48 DIRTY_JS $height modules/gallery/views/permissions_browse.html.php 3 DIRTY_JS url::site("permissions/form/__ITEM__") modules/gallery/views/permissions_browse.html.php 16 DIRTY_JS url::site("permissions/change/__CMD__/__GROUP__/__PERM__/__ITEM__?csrf=$csrf") modules/gallery/views/permissions_browse.html.php 43 DIRTY_ATTR $parent->id diff --git a/modules/gallery/views/movieplayer.html.php b/modules/gallery/views/movieplayer-flash.html.php index edb5184c..6d3cee2a 100644 --- a/modules/gallery/views/movieplayer.html.php +++ b/modules/gallery/views/movieplayer-flash.html.php @@ -20,14 +20,14 @@ // setup flowplayer flowplayer(id, $.extend(true, { - "src": "<?= url::abs_file("lib/flowplayer.swf") ?>", + "src": "<?= url::abs_file("lib/flowplayer-flash/flowplayer.swf") ?>", "wmode": "transparent", "provider": "pseudostreaming" }, <?= json_encode($fp_params) ?>), $.extend(true, { "plugins": { "pseudostreaming": { - "url": "<?= url::abs_file("lib/flowplayer.pseudostreaming-byterange.swf") ?>" + "url": "<?= url::abs_file("lib/flowplayer-flash/flowplayer.pseudostreaming-byterange.swf") ?>" }, "controls": { "autoHide": "always", |