wait #3909 @2

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 82689448501f841582deb59058be9b947e0ad40e..0f4f4e37d2ad327fc31c3a1e38256616d8d12b6c 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -974,33 +974,44 @@ class wsAjax extends cubeAjax
             if ($item['asset_type'] === '3') {
                 // link
                 $type = 2;
-                $target = '_popupiframe';
+                $target = '_blank';
                 $to = $item['asset_content'];
+                $to = str_replace('.html ?', '.html?', $to);
+
                 $webvideo = new CubeIT_Filter_WebVideo();
                 $f = $webvideo->filter($to);
-                if ($f !== $to) {
-                    $e = explode(':', $f);
-                    $type = 10;
-                    $video_service = $e[0];
-                    $to = $e[1];
+
+                $infobulle = 'Voir le produit';
+                if ($f !== $to || stripos($item['asset_name'], 'video') !== false) {
+                    if ($f !== $to) {
+                        $e = explode(':', $f);
+                        $type = 10;
+                        $video_service = $e[0];
+                        $to = $e[1];
+                    } else {
+                        $type = 4;
+                    }
+                    $infobulle = 'Voir la vidéo';
                 }
             } else if ($item['asset_type'] === '5') {
                 // video
                 $type = 4;
                 $e = explode('-', $item['asset_name'], 2);
                 $to = trim($e[1]) . '.mp4';
+                $infobulle = 'Voir la vidéo';
             } else if ($item['asset_type'] === '7') {
                 // Wishlist
                 $type = 12;
                 $e = explode('#', $item['asset_name']);
                 $to = $e[1];
+                $infobulle = 'Ajouter à ma liste de cadeaux';
             }
 
             $link = array(
                 'page' => $page, 'image' => $images[$type],
                 'left' => $item['x'] * $ratio, 'top' => $item['y'] * $ratio, 'width' => $item['width'] * $ratio, 'height' => $item['height'] * $ratio, 'rot' => '',
                 'type' => $type, 'to' => $to, 'target' => $target, 'video_width' => 1920, 'video_height' => 1080,
-                'infobulle' => '', 'numerotation' => 'virtual', 'display_area' => '1', 'inline' => $inline,
+                'infobulle' => $infobulle, 'numerotation' => 'virtual', 'display_area' => false, 'inline' => $inline,
                 'video_service' => $video_service);
             $links[] = $link;
         }

diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php
index 70f2221c5a62b8530d1befeda5c41ad9d2fdf908..4c624e3b8b400e871be5a6d2cc906dc2de720aca 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -1760,7 +1760,7 @@ class JoueclubWishlistLink extends normalLink
 
     public function getURL()
     {
-        return 'https://joueclub.dev.amazing.cat/scan?deviceId=$uuid&ean=' . $this->to;
+        return 'https://listedecadeau.joueclub.fr/scan?deviceId=$uuid&ean=' . $this->to;
     }
 
     public function getTarget()