Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 06:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update AppController.php

Browse Source 
Add quotes to MAIL_FROM_NAME when needed
This commit is contained in:
vincentdh 2016-03-26 12:34:39 -04:00
parent aae4f57c09
commit 2c6e9aced3
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/AppController.php
View File

@ -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);
}
}
}