(no commit message)

diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index a3ccea18f6599072b177185b3647f3333265a17e..63167d48624eb606c86e369dc1efe07718363918 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -22,6 +22,7 @@ class wsHTML5Link {
        public $inline;
        public $display_area;
        public $infobulle;
+       public $extra;
        public $id;
        public $rot;
 
@@ -135,6 +136,14 @@ class wsHTML5Link {
                foreach ($init as $k => $v) {
                        $this->$k = $v;
                }
+               if (!$this->video_width) {
+                       $this->video_width = $this->width;
+               }
+               if (!$this->video_height) {
+                       $this->video_height = $this->height;
+               }
+
+
                if ($this->target == '') {
                        $this->target = '_blank';
                }
@@ -577,6 +586,9 @@ class htmlMultimediaLink extends wsHTML5Link {
                        $h = $this->height * $this->getCssScale();
                        if ($this->_config['html']) {
                                $this->_url = $d['fdir'] . '/' . $this->_config['html'];
+                               if ($this->extra) {
+                                       $this->_url.='?' . $this->extra;
+                               }
 
                                $iw = $this->_config['width'];
                                $ih = $this->_config['height'];
@@ -644,6 +656,7 @@ class htmlMultimediaLink extends wsHTML5Link {
 
        public function getConfigZIP($d) {
 
+
                $res = array('width' => $this->video_width, 'height' => $this->video_height);
                if (file_exists($d . '/index.html')) {
                        $r = array('html' => 'index.html', 'inject' => array(), 'injectcss' => array(), 'injectjs' => array());