Fix external multimedia content in popup

Fix multimedia sizing in popup

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 73e9b9e6caacbee3bae8a69f483e8eb7ba78b709..167943ddf62e6a2c46609c1f365d1edf6739169e 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -14,7 +14,7 @@ class wsExporter {
        public $destinationFile;
        public $x;
 
-       const VINCENT = "montpellier.cubedesigners.com";
+       const VINCENT = "paris.cubedesigners.com";
 
        public function exportCollection($collectionId, $os) {
                global $core;

diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index 815f899a4c287c4f4f561044cb7ea20a7ba84619..0f41424041d4d29cd5fdaf94e97e639d3a611600 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -341,6 +341,8 @@ class htmlMultimediaPopupLink extends htmlMultimediaPopupImage {
        public function getAdditionnalContent() {
                $i = $this->_init;
                $i['inline'] = true;
+               $i['width'] = $i['video_width'];
+               $i['height'] = $i['video_height'];
 
                $l = wsHTML5Link::getMultimediaInstance($this->id . '_content', $i, $this->compiler);
                $markup = $l->getHTMLContainer();
@@ -688,7 +690,9 @@ class htmlMultimediaLink extends wsHTML5Link {
                                $res = '<iframe width="' . $iw . '" height="' . $ih . '" src="' . $this->_url . '" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" allowfullscreen mozallowfullscreen="true" webkitallowfullscreen="true" onmousewheel=""></iframe>';
                        }
                        if (isset($externalIframe)) {
-                               $res = '<iframe width="' . $w . '" height="' . $h . '" src="' . $externalIframe . '" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" allowfullscreen mozallowfullscreen="true" webkitallowfullscreen="true" onmousewheel=""></iframe>';
+                               $iw = $this->_config['width'];
+                               $ih = $this->_config['height'];
+                               $res = '<iframe width="' . $iw . '" height="' . $ih . '" src="' . $externalIframe . '" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" allowfullscreen mozallowfullscreen="true" webkitallowfullscreen="true" onmousewheel=""></iframe>';
                        }
 
                        foreach ($this->_config['inject'] as $i) {