From 2c6e9aced3787ec54064aedca9c60efcf389c325 Mon Sep 17 00:00:00 2001 From: vincentdh Date: Sat, 26 Mar 2016 12:34:39 -0400 Subject: [PATCH] Update AppController.php Add quotes to MAIL_FROM_NAME when needed --- app/Http/Controllers/AppController.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/AppController.php b/app/Http/Controllers/AppController.php index 394323d7420a..05d24828cdd5 100644 --- a/app/Http/Controllers/AppController.php +++ b/app/Http/Controllers/AppController.php @@ -96,9 +96,15 @@ class AppController extends BaseController "MAIL_PORT={$mail['port']}\n". "MAIL_ENCRYPTION={$mail['encryption']}\n". "MAIL_HOST={$mail['host']}\n". - "MAIL_USERNAME={$mail['username']}\n". - "MAIL_FROM_NAME={$mail['from']['name']}\n". - "MAIL_PASSWORD={$mail['password']}\n\n". + "MAIL_USERNAME={$mail['username']}\n"; + + if (preg_match('/\s/',$mail['from']['name'])) { + $config .= "MAIL_FROM_NAME='{$mail['from']['name']}'\n". + } else { + $config .= "MAIL_FROM_NAME={$mail['from']['name']}\n". + } + + $config .= "MAIL_PASSWORD={$mail['password']}\n\n". "PHANTOMJS_CLOUD_KEY='a-demo-key-with-low-quota-per-ip-address'"; // Write Config Settings @@ -166,6 +172,9 @@ class AppController extends BaseController $config = ''; foreach ($_ENV as $key => $val) { + if (preg_match('/\s/',$val)) { + $val = "'{$val}'"; + } $config .= "{$key}={$val}\n"; } @@ -311,4 +320,4 @@ class AppController extends BaseController return json_encode($data); } -} \ No newline at end of file +}