From ba328e8a7b981efd7ef00954896f82b118800d89 Mon Sep 17 00:00:00 2001
From: Stephen Cameron <stephen@cubedesigners.com>
Date: Mon, 27 Jul 2020 19:53:26 +0200
Subject: [PATCH] Wait #3445 @2

---
 wp-content/mu-plugins/cube/src/Forms/Base.php               | 6 ++----
 .../themes/CCV/resources/views/forms/consultation.blade.php | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/wp-content/mu-plugins/cube/src/Forms/Base.php b/wp-content/mu-plugins/cube/src/Forms/Base.php
index 69a13a4..5ce0cd1 100644
--- a/wp-content/mu-plugins/cube/src/Forms/Base.php
+++ b/wp-content/mu-plugins/cube/src/Forms/Base.php
@@ -236,14 +236,12 @@ class Base
         $data = [];
 
         $to           = $this->destination;
-        $from         = 'CCV <no-reply@ccv-montpellier.fr>';
+        $from         = 'CCV Montpellier <no-reply@ccv-montpellier.fr>';
         $subject      = $this->form_title;
         $content_type = 'text/html';
         $charset      = get_bloginfo('charset');
         $headers[]    = sprintf('Content-Type: %s; charset=%s', $content_type, $charset);
-
-        //TODO: Set up SMTP delivery via CCV's server if we want to change the from address. Attempting to set this results in messages never arriving (starting 30/04/20)
-        //$headers[]    = sprintf('From: %s', $from);
+        $headers[]    = sprintf('From: %s', $from);
 
         // Gather filled fields into label/value pairs
         foreach ($this->fields as $field_name => $field) {
diff --git a/wp-content/themes/CCV/resources/views/forms/consultation.blade.php b/wp-content/themes/CCV/resources/views/forms/consultation.blade.php
index 8051175..9e93cbe 100644
--- a/wp-content/themes/CCV/resources/views/forms/consultation.blade.php
+++ b/wp-content/themes/CCV/resources/views/forms/consultation.blade.php
@@ -162,7 +162,7 @@
           </p>
 
           <iframe class="block w-full overflow-hidden" height="320"
-                  src="https://uploader.purview.net/client/scmgeneste/" scrolling="no"
+                  src="https://purview.ccv-montpellier.fr/client/scmgeneste/" scrolling="no"
                   data-service="uploader.purview"></iframe>
 
           <p>
-- 
2.39.5