wait #5945 @0.25

diff --git a/inc/commons/class.common.ajax.php b/inc/commons/class.common.ajax.php
index 0fedfff9f6e9ba25935b353d9b7badc44702c09f..a531fdf7a605e1666a6d8a785b0bad0a8c3c511b 100644 (file)
--- a/inc/commons/class.common.ajax.php
+++ b/inc/commons/class.common.ajax.php
@@ -141,7 +141,12 @@ class commonAjax
             $body .= TEAM_NAME;
             $mail->setBodyText($body);
             try {
-                $mail->send(self::getMailTransport());
+                if (!stristr(FROM_EMAIL, 'fluidbook')) {
+                    $transport = new CubeIT_Mail_Transport_Mailjet();
+                } else {
+                    $transport = self::getMailTransport();
+                }
+                $mail->send($transport);
                 $m = '';
                 $ok = true;
             } catch (Error $e) {
@@ -466,8 +471,13 @@ class commonAjax
         }
         $mail->setSubject($_POST['subject']);
         $mail->setBodyHtmlFromZip($_FILES['src']['tmp_name'], '/mailer/' . time());
-        // $transport = new CubeIT_Mail_Transport_Mailjet("ca110b35f8735c223d69c9987c2ac47d", 'b289d0acb08e0fe56ce98ccf0dd1ed8b');
-        $mail->send(self::getMailTransport());
+
+        if (!stristr($_POST['from'], 'fluidbook')) {
+            $transport = new CubeIT_Mail_Transport_Mailjet("ca110b35f8735c223d69c9987c2ac47d", 'b289d0acb08e0fe56ce98ccf0dd1ed8b');
+        } else {
+            $transport = self::getMailTransport();
+        }
+        $mail->send($transport);
     }
 
     public static function getMailTransport()
@@ -479,7 +489,6 @@ class commonAjax
             'password' => '4zrmk4Hu9HH97n7UiW5']);
     }
 
-
     public static function formVerificationCode($args, &$x)
     {
         $x->addContent('result', mb_strtoupper(md5($_POST['recipient'] . '+' . $_POST['form_id'] . '+n0_$PAM_please!')));