From d00128e9131b50d25eea19a9981ad7c4b6716b51 Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Sat, 5 Nov 2016 12:22:42 +1100 Subject: [PATCH 1/2] Trying quick fix for gsuite enquiry sending --- app/controllers/enquiries_controller.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/enquiries_controller.php b/app/controllers/enquiries_controller.php index 1327c841..b6290c4a 100755 --- a/app/controllers/enquiries_controller.php +++ b/app/controllers/enquiries_controller.php @@ -303,6 +303,10 @@ class EnquiriesController extends AppController { } + function email_format($a) { + return "<".$a.">"; + } + /* Moving this to the new Enquiry email sender. */ function __sendNewEnquiryEmail($id) { @@ -313,9 +317,9 @@ class EnquiriesController extends AppController { $this->Email->delivery = 'smtp'; $enquiry = $this->Enquiry->read(null, $id); - $this->Email->to = $enquiry['Contact']['email']; - $this->Email->cc = array($enquiry['User']['email']); - $this->Email->bcc = array('carpis@cmctechnologies.com.au'); + $this->Email->to = $this->email_format($enquiry['Contact']['email']); + $this->Email->cc = array($this->email_format($enquiry['User']['email'])); + $this->Email->bcc = array($this->email_format('carpis@cmctechnologies.com.au')); $this->Email->subject = $enquiry['Enquiry']['title'].' - Your Enquiry has been Entered in our System - CMC Technologies'; $this->Email->replyTo = $enquiry['User']['email']; From 912f04cddd07ba8765de9998e3d257b5a2945b7c Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Sat, 5 Nov 2016 14:10:55 +1100 Subject: [PATCH 2/2] Quick hack to make gsuite work with document emailer --- app/controllers/documents_controller.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/controllers/documents_controller.php b/app/controllers/documents_controller.php index a5387d7c..9bfe19e9 100755 --- a/app/controllers/documents_controller.php +++ b/app/controllers/documents_controller.php @@ -811,7 +811,11 @@ ENDINSTRUCTIONS; $enquiry = $this->Document->Quote->Enquiry->read(null, $document['Quote']['enquiry_id']); $this->set('enquiry', $enquiry); } - + + + function email_format($a) { + return "<".$a.">"; + } /** * Email the PDF(document + attachments) for this Document to a Recipient (Customer or Principle). @@ -844,11 +848,13 @@ ENDINSTRUCTIONS; } $enquiry = $this->Document->getEnquiry($document); - $this->Email->to = $enquiry['Contact']['email']; + $this->Email->to = $this->email_format($enquiry['Contact']['email']); + + //Uncomment this when going live - $this->Email->cc = array($enquiry['User']['email']); - $this->Email->bcc = array('carpis@cmctechnologies.com.au'); + $this->Email->cc = array($this->email_format($enquiry['User']['email'])); + $this->Email->bcc = array($this->email_format('carpis@cmctechnologies.com.au')); $this->Email->replyTo = $enquiry['User']['email']; $this->Email->from = 'CMC Technologies - Sales ';