From 9d7d6c50bb7713038231232f433ae28f6f117b95 Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Sun, 3 Mar 2013 00:45:03 +0100
Subject: Follow-on to #2033 - Rename movieplayer.html.php to
 movieplayer-flash.html.php - renamed file with "-flash" to make room for
 html5 player - updated item model and xss_data.txt to reflect changes

--HG--
rename : modules/gallery/views/movieplayer.html.php => modules/gallery/views/movieplayer-flash.html.php
---
 modules/gallery/models/item.php                  |  4 +-
 modules/gallery/tests/xss_data.txt               | 14 +++----
 modules/gallery/views/movieplayer-flash.html.php | 49 ++++++++++++++++++++++++
 modules/gallery/views/movieplayer.html.php       | 49 ------------------------
 4 files changed, 58 insertions(+), 58 deletions(-)
 create mode 100644 modules/gallery/views/movieplayer-flash.html.php
 delete mode 100644 modules/gallery/views/movieplayer.html.php

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-flash.html.php b/modules/gallery/views/movieplayer-flash.html.php
new file mode 100644
index 00000000..6d3cee2a
--- /dev/null
+++ b/modules/gallery/views/movieplayer-flash.html.php
@@ -0,0 +1,49 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<?= html::anchor($url, "", $attrs) ?>
+<script type="text/javascript">
+  var id = "<?= $attrs["id"] ?>";
+  var max_size = <?= $max_size ?>;
+  // set the size of the movie html anchor, taking into account max_size and height of control bar
+  function set_movie_size(width, height) {
+    if((width > max_size) || (height > max_size)) {
+      if (width > height) {
+        height = Math.ceil(height * max_size / width);
+        width = max_size;
+      } else {
+        width = Math.ceil(width * max_size / height);
+        height = max_size;
+      }
+    }
+    height += flowplayer(id).getConfig().plugins.controls.height;
+    $("#" + id).css({width: width, height: height});
+  };
+  // setup flowplayer
+  flowplayer(id,
+    $.extend(true, {
+      "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-flash/flowplayer.pseudostreaming-byterange.swf") ?>"
+        },
+        "controls": {
+          "autoHide": "always",
+          "hideDelay": 2000,
+          "height": 24
+        }
+      },
+      "clip": {
+        "scaling": "fit",
+        "onMetaData": function(clip) {
+          // set movie size a second time using actual size from metadata
+          set_movie_size(parseInt(clip.metaData.width), parseInt(clip.metaData.height));
+        }
+      }
+    }, <?= json_encode($fp_config) ?>)
+  ).ipad();
+  // set movie size using width and height passed from movie_img function
+  $("document").ready(set_movie_size(<?= $width ?>, <?= $height ?>));
+</script>
diff --git a/modules/gallery/views/movieplayer.html.php b/modules/gallery/views/movieplayer.html.php
deleted file mode 100644
index 6d3cee2a..00000000
--- a/modules/gallery/views/movieplayer.html.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= html::anchor($url, "", $attrs) ?>
-<script type="text/javascript">
-  var id = "<?= $attrs["id"] ?>";
-  var max_size = <?= $max_size ?>;
-  // set the size of the movie html anchor, taking into account max_size and height of control bar
-  function set_movie_size(width, height) {
-    if((width > max_size) || (height > max_size)) {
-      if (width > height) {
-        height = Math.ceil(height * max_size / width);
-        width = max_size;
-      } else {
-        width = Math.ceil(width * max_size / height);
-        height = max_size;
-      }
-    }
-    height += flowplayer(id).getConfig().plugins.controls.height;
-    $("#" + id).css({width: width, height: height});
-  };
-  // setup flowplayer
-  flowplayer(id,
-    $.extend(true, {
-      "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-flash/flowplayer.pseudostreaming-byterange.swf") ?>"
-        },
-        "controls": {
-          "autoHide": "always",
-          "hideDelay": 2000,
-          "height": 24
-        }
-      },
-      "clip": {
-        "scaling": "fit",
-        "onMetaData": function(clip) {
-          // set movie size a second time using actual size from metadata
-          set_movie_size(parseInt(clip.metaData.width), parseInt(clip.metaData.height));
-        }
-      }
-    }, <?= json_encode($fp_config) ?>)
-  ).ipad();
-  // set movie size using width and height passed from movie_img function
-  $("document").ready(set_movie_size(<?= $width ?>, <?= $height ?>));
-</script>
-- 
cgit v1.2.3