From 8ef94dd5a7cff05d23722917bf9f4dd8019897ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <bburnichon@alchemy.fr>
Date: Wed, 13 Jan 2016 13:23:14 +0100
Subject: [PATCH] Fixup datafile embed

---
 lib/Alchemy/Phrasea/Application.php              |  3 ++-
 .../Phrasea/Http/StaticFile/StaticMode.php       |  5 ++---
 templates/mobile/common/thumbnail.html.twig      | 16 ++++++++--------
 templates/web/common/thumbnail.html.twig         |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php
index e5ba94f2d6..40afdb6799 100644
--- a/lib/Alchemy/Phrasea/Application.php
+++ b/lib/Alchemy/Phrasea/Application.php
@@ -74,6 +74,7 @@ use Alchemy\Phrasea\Core\Provider\UnicodeServiceProvider;
 use Alchemy\Phrasea\Core\Provider\ZippyServiceProvider;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Alchemy\Phrasea\Form\Extension\HelpTypeExtension;
+use Alchemy\Phrasea\Media\DatafilesResolver;
 use Alchemy\Phrasea\Media\MediaAccessorResolver;
 use Alchemy\Phrasea\Media\PermalinkMediaResolver;
 use Alchemy\Phrasea\Model\Entities\User;
@@ -376,7 +377,7 @@ class Application extends SilexApplication
         }
 
         $resolvers = $this['alchemy_embed.resource_resolvers'];
-        $resolvers['datafiles'] = $resolvers->share(function () {
+        $resolvers['datafile'] = $resolvers->share(function () {
             return new DatafilesResolver($this->getApplicationBox(), $this['url_generator']);
         });
         $resolvers['permalinks_permalink'] = $resolvers->share(function () {
diff --git a/lib/Alchemy/Phrasea/Http/StaticFile/StaticMode.php b/lib/Alchemy/Phrasea/Http/StaticFile/StaticMode.php
index de5a1b4b7d..ca357da0a5 100644
--- a/lib/Alchemy/Phrasea/Http/StaticFile/StaticMode.php
+++ b/lib/Alchemy/Phrasea/Http/StaticFile/StaticMode.php
@@ -11,7 +11,6 @@
 
 namespace Alchemy\Phrasea\Http\StaticFile;
 
-use Alchemy\Phrasea\Http\AbstractServerMode;
 use Alchemy\Phrasea\Http\StaticFile\Symlink\SymLinker;
 use Guzzle\Http\Url;
 
@@ -26,10 +25,10 @@ class StaticMode
 
     /**
      * @param $pathFile
-     * @param null $etag
+     * @param null|string $etag
      * @return Url
      */
-    public function getUrl($pathFile, $etag=null)
+    public function getUrl($pathFile, $etag = null)
     {
         $this->ensureSymlink($pathFile);
 
diff --git a/templates/mobile/common/thumbnail.html.twig b/templates/mobile/common/thumbnail.html.twig
index 9a486a6fee..8a220c40e5 100644
--- a/templates/mobile/common/thumbnail.html.twig
+++ b/templates/mobile/common/thumbnail.html.twig
@@ -33,20 +33,20 @@
 
     {% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %}
     <iframe width="100%" height="100%"
-            src="{{ url('alchemy_embed_view', {url: url, autoplay: autoplay|default('false') }) }}"
+            src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}"
             frameborder="0" allowfullscreen></iframe>
     {% elseif record_type == 'FLEXPAPER' %}
     <iframe width="100%" height="100%"
-            src="{{ url('alchemy_embed_view', {url: url, autoplay: autoplay|default('false') }) }}"
+            src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}"
             frameborder="0" allowfullscreen></iframe>
     {% elseif record_type == 'AUDIO_MP3' %}
     <iframe width="100%" height="100%"
-            src="{{ url('alchemy_embed_view', {url: url, autoplay: autoplay|default('false') }) }}"
+            src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}"
             frameborder="0" allowfullscreen></iframe>
     {% else %}
       <img class="record record_image imgTips zoomable thumb" oncontextMenu="return(false);"
            style="width:{{d_width|round}}px;height:{{d_height|round}}px;top:{{top|round}}px;"
-           src="{{thumbnail.get_url()}}" ondragstart="return false;">
+           src="{{thumbnail.get_url()|trim}}" ondragstart="return false;">
       <input type="hidden" name="width" value="{{thumbnail_width}}"/>
       <input type="hidden" name="height" value="{{thumbnail_height}}"/>
     {% endif %}
@@ -58,18 +58,18 @@
     {% set record_type = thumbnail.get_type() %}
     {% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %}
         <iframe width="100%" height="100%"
-                src="{{ url('alchemy_embed_view', {url: url, autoplay: autoplay|default('false') }) }}"
+                src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}"
                 frameborder="0" allowfullscreen></iframe>
     {% elseif record_type == 'FLEXPAPER' %}
         <iframe width="100%" height="100%"
-                src="{{ url('alchemy_embed_view', {url: url, autoplay: autoplay|default('false') }) }}"
+                src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}"
                 frameborder="0" allowfullscreen></iframe>
     {% elseif record_type == 'AUDIO_MP3' %}
         <iframe width="100%" height="100%"
-                src="{{ url('alchemy_embed_view', {url: url, autoplay: autoplay|default('false') }) }}"
+                src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}"
                 frameborder="0" allowfullscreen></iframe>
     {% else %}
           <img style="max-height: 100%;max-width:100%" class="record record_image imgTips zoomable thumb" oncontextMenu="return(false);"
-               src="{{thumbnail.get_url()}}" ondragstart="return false;" />
+               src="{{thumbnail.get_url()|trim}}" ondragstart="return false;" />
         {% endif %}
 {% endmacro %}
diff --git a/templates/web/common/thumbnail.html.twig b/templates/web/common/thumbnail.html.twig
index 99dfa2bce9..c662e37955 100644
--- a/templates/web/common/thumbnail.html.twig
+++ b/templates/web/common/thumbnail.html.twig
@@ -13,16 +13,16 @@
         <div style="width:{{original_w}}px;height: {{ original_h }}px" class="videoTips">
 
         <iframe width="100%" height="100%"
-                src="{{ url('alchemy_embed_view', {url: url, autoplay: autoplay|default('false') }) }}"
+                src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}"
                 frameborder="0" allowfullscreen></iframe>
         </div>
     {% elseif record_type == 'FLEXPAPER' %}
         <iframe width="100%" height="100%"
-                src="{{ url('alchemy_embed_view', {url: url, autoplay: autoplay|default('false') }) }}"
+                src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}"
                 frameborder="0" allowfullscreen></iframe>
     {% elseif record_type == 'AUDIO_MP3' %}
         <iframe width="100%" height="100%"
-                src="{{ url('alchemy_embed_view', {url: url, autoplay: autoplay|default('false') }) }}"
+                src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}"
                 frameborder="0" allowfullscreen></iframe>
     {% else %}
         {% set fit_size = fitIn(
@@ -32,7 +32,7 @@
 
         <img class="{% if lazyload %}lazyload{% endif %} record record_image imgTips zoomable thumb" oncontextMenu="return(false);"
              style="width:{{fit_size.width}}px;height:{{fit_size.height}}px;top:{{fit_size.top}}px;"
-             src="{% if lazyload %}/assets/common/images/grey.gif{% else %}{{ url }}{% endif %}" data-original="{{ url }}" ondragstart="return false;">
+             src="{% if lazyload %}/assets/common/images/grey.gif{% else %}{{ url|trim }}{% endif %}" data-original="{{ url|trim }}" ondragstart="return false;">
         <input type="hidden" name="width" value="{{original_w}}"/>
         <input type="hidden" name="height" value="{{original_h}}"/>