Adding default bccs, adding commented out test email config #116
|
|
@ -56,11 +56,20 @@ $host = $_SERVER['HTTP_HOST'];
|
||||||
));
|
));
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
Configure::write('smtp_settings', array(
|
Configure::write('smtp_settings', array(
|
||||||
'port' => '25',
|
'port' => '25',
|
||||||
'timeout' => '30',
|
'timeout' => '30',
|
||||||
'host' => '172.17.0.1'));
|
'host' => '172.17.0.1'));
|
||||||
|
|
||||||
|
|
||||||
|
// Mailhog SMTP settings for local development
|
||||||
|
// Configure::write('smtp_settings', array(
|
||||||
|
// 'port' => '1025',
|
||||||
|
// 'timeout' => '30',
|
||||||
|
// 'host' => 'host.docker.internal'
|
||||||
|
// ));
|
||||||
|
|
||||||
//Production/Staging Config
|
//Production/Staging Config
|
||||||
|
|
||||||
$production_hosts = array('cmc.lan', '192.168.0.7', 'cmcbeta.lan', 'office.cmctechnologies.com.au:5000');
|
$production_hosts = array('cmc.lan', '192.168.0.7', 'cmcbeta.lan', 'office.cmctechnologies.com.au:5000');
|
||||||
|
|
|
||||||
|
|
@ -1333,6 +1333,12 @@ function email_pdf_with_custom_recipients($id = null, $to = null, $cc = null, $b
|
||||||
$this->Email->cc = $ccArray;
|
$this->Email->cc = $ccArray;
|
||||||
}
|
}
|
||||||
$bccArray = $this->parse_email_to_array($bcc);
|
$bccArray = $this->parse_email_to_array($bcc);
|
||||||
|
$defaultBccs = array('<carpis@cmctechnologies.com.au>', '<mcarpis@cmctechnologies.com.au>');
|
||||||
|
foreach ($defaultBccs as $defaultBcc) {
|
||||||
|
if (!in_array($defaultBcc, $bccArray)) {
|
||||||
|
$bccArray[] = $defaultBcc;
|
||||||
|
}
|
||||||
|
}
|
||||||
if (!empty($bccArray)) {
|
if (!empty($bccArray)) {
|
||||||
$this->Email->bcc = $bccArray;
|
$this->Email->bcc = $bccArray;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue