wait #5276 @0:20

diff --git a/inc/commons/class.common.ajax.php b/inc/commons/class.common.ajax.php
index a29acc49e799715e4b8ba661ce5a569dca207391..cfade69b1e697bd89987b4d3246f98dd48cceb20 100644 (file)
--- a/inc/commons/class.common.ajax.php
+++ b/inc/commons/class.common.ajax.php
@@ -144,7 +144,7 @@ class commonAjax
                 if (THEME === 'ysl') {
                     $mail->send();
                 } else {
-                    $mail->send(new CubeIT_Mail_Transport_Mailjet('ca110b35f8735c223d69c9987c2ac47d', 'b289d0acb08e0fe56ce98ccf0dd1ed8b', 'in-v3.mailjet.com'));
+                    $mail->send(self::getMailTransport());
                 }
                 $m = '';
                 $ok = true;
@@ -554,10 +554,19 @@ Mot de passe : $password";
         }
         $mail->setSubject($_POST['subject']);
         $mail->setBodyHtmlFromZip($_FILES['src']['tmp_name'], '/mailer/' . time());
-        $transport = new CubeIT_Mail_Transport_Mailjet("ca110b35f8735c223d69c9987c2ac47d", 'b289d0acb08e0fe56ce98ccf0dd1ed8b');
-        $mail->send($transport);
+       // $transport = new CubeIT_Mail_Transport_Mailjet("ca110b35f8735c223d69c9987c2ac47d", 'b289d0acb08e0fe56ce98ccf0dd1ed8b');
+        $mail->send(self::getMailTransport());
     }
 
+    public static function getMailTransport(){
+        return new Zend_Mail_Transport_Smtp('mail2.cubedesigners.com',['ssl' => 'ssl',
+            'port' => 465,
+            'auth' => 'login',
+            'username' => 'workshop@cubedesigners.com',
+            'password' =>'4zrmk4Hu9HH97n7UiW5']);
+    }
+
+
     public static function formVerificationCode($args, &$x)
     {
         $x->addContent('result', mb_strtoupper(md5($_POST['recipient'] . '+' . $_POST['form_id'] . '+n0_$PAM_please!')));

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index e8d21c35bf637aa10eae8a4316a627dd8a516ebd..30b5a7eb5216492fc371cc52d2ce331168202602 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1027,7 +1027,7 @@ class wsHTML5Compiler
                 $id .= '/uat';
             }
 
-            $default = ['page_name' => '', 'page_cat1_name' => '', 'page_cat2_name' => '', 'page_cat3_name' => ''];
+            $default = ['page_name' => ''];
             $this->config->tagcommander_default_vars = array_merge($default, $this->parseVariables($this->book->parametres->tagcommander_default_vars));
             $this->config->tagcommander_default_vars['env_work'] = $this->book->parametres->tagcommander_prod ? 'prod' : 'pre-prod';
 
@@ -2079,6 +2079,9 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
                 $dupData['image'] = '';
                 $dupData['animation'] = '';
                 $dupData['to'] = $linkData['image'];
+                if ($dupData['image_rollover'] != 'none' && !stristr($dupData['image_rollover'], '=')) {
+                    $dupData['rollover'] = $dupData['image_rollover'];
+                }
                 $dupData['image_rollover'] = '';
                 $dupData['type'] = 15;
                 $dupData['uid'] = 'i_' . $linkData['uid'];

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 ccfb40e9064bc3e557986a03d1a52938b9e2d9ee..a99e6fc750eb1197d00633f7977ea0632571cdc9 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -615,10 +615,6 @@ class wsHTML5Link
     {
         $res = '';
 
-//        if ($this->uid == '831d0b8600') {
-//            die($this->allowsAnimation . '/' . $this->image_rollover . '/' . $this->extraraw);
-//        }
-
         if ($this->allowsAnimation) {
             if ($this instanceof contentLink && stristr($this->image_rollover, 'type=')) {
                 $animations = self::parseAnimations($this->image_rollover);
@@ -720,7 +716,7 @@ class wsHTML5Link
     {
 
         $res = array();
-        if (isset($this->image_rollover) && $this->image_rollover != 'none') {
+        if (isset($this->image_rollover) && $this->image_rollover != 'none' && !stristr($this->image_rollover, 'type=')) {
             $res[] = 'image_rollover';
         }
         return $res;