REFACTORING #1880 @4h30m: another ugly refactoring commit

This commit is contained in:
Michal Kváček
2016-10-25 16:50:04 +02:00
parent 28f67ffe3c
commit cc999dd24e
71 changed files with 827 additions and 608 deletions
@@ -21,22 +21,22 @@ class CreateNewMessage extends Controller
public function postMessage(SendNewEmailRequest $request, $formId)
{
// load form settings
$form = Content::where('module_handler', config('contactform.handler'))
$form = Content::where('moduleHandler', config('contactform.handler'))
->findOrFail($formId);
$form->module_settings = json_decode($form->module_settings);
$form->moduleSettings = json_decode($form->moduleSettings);
// select template
$template = isset($form->module_settings->emailTemplate) ? $form->module_settings->emailTemplate : 'contactform::emails.default';
$template = isset($form->moduleSettings->emailTemplate) ? $form->moduleSettings->emailTemplate : 'contactform::emails.default';
// send email
$status = Mail::send(Template::name($template), ['data' => $request], function (Message $message) use ($request, $form) {
$message->from($request->email, $request->name);
// get message subject
$subject = isset($form->module_settings->subject) ? $form->module_settings->subject : trans('contactform::admin/contents.defaultSubject');
$subject = isset($form->moduleSettings->subject) ? $form->moduleSettings->subject : trans('contactform::admin/contents.defaultSubject');
$message->to($form->module_settings->email)
$message->to($form->moduleSettings->email)
->subject($subject);
});