better config setup
This commit is contained in:
@@ -47,14 +47,28 @@ class ContactUsFormSubmissionsMailer extends Mailer
|
||||
$subject = __d('cake_contact_us', 'Contact Us Form Submitted');
|
||||
$name = isset($contactUsFormSubmission['name']) ? ' by ' . $contactUsFormSubmission['name'] : '';
|
||||
|
||||
$to = Configure::readOrFail('ContactUs.email.backend.to');
|
||||
$cc = Configure::read('ContactUs.email.backend.cc', []);
|
||||
$bcc = Configure::read('ContactUs.email.backend.bcc', []);
|
||||
$to = !is_array($to) ? [$to] : $to;
|
||||
|
||||
$this
|
||||
->setTo(Configure::readOrFail('ContactUs.fields.email.backend.to'))
|
||||
->setTo($to)
|
||||
->setSubject($subject . $name)
|
||||
->setEmailFormat(Message::MESSAGE_BOTH)
|
||||
->setViewVars([
|
||||
'contactUsFormSubmission' => $contactUsFormSubmission,
|
||||
]);
|
||||
|
||||
if ($cc) {
|
||||
$cc = !is_array($cc) ? [$cc] : $cc;
|
||||
$this->setCc($to);
|
||||
}
|
||||
if ($bcc) {
|
||||
$bcc = !is_array($bcc) ? [$bcc] : $bcc;
|
||||
$this->setBcc($bcc);
|
||||
}
|
||||
|
||||
$this->viewBuilder()
|
||||
->setTemplate('CakeContactUs.backend');
|
||||
}
|
||||
|
||||
@@ -128,7 +128,7 @@ class ContactUsFormSubmissionsTable extends Table
|
||||
}
|
||||
$now = DateTime::now()->format(CakeContactUsPlugin::CAKE_CONTACT_US_MYSQL_DATETIME);
|
||||
$updateData = [];
|
||||
if (Configure::read('ContactUs.fields.email.confirmation') && isset($contactUsFormSubmission->email)) {
|
||||
if (Configure::read('ContactUs.email.confirmation', false) && isset($contactUsFormSubmission->email)) {
|
||||
$mailer = Configure::read('ContactUs.email.mailerClass', 'CakeContactUs.ContactUsFormSubmissions');
|
||||
try {
|
||||
$this->getMailer($mailer)->send('confirmation', [$contactUsFormSubmission]);
|
||||
@@ -137,7 +137,7 @@ class ContactUsFormSubmissionsTable extends Table
|
||||
}
|
||||
}
|
||||
|
||||
if (Configure::readOrFail('ContactUs.fields.email.backend')) {
|
||||
if (Configure::read('ContactUs.email.backend.enabled', false)) {
|
||||
$mailer = Configure::read('ContactUs.email.mailerClass', 'CakeContactUs.ContactUsFormSubmissions');
|
||||
try {
|
||||
$this->getMailer($mailer)->send('backend', [$contactUsFormSubmission]);
|
||||
|
||||
Reference in New Issue
Block a user