|
21 | 21 | * |
22 | 22 | * @internal |
23 | 23 | */ |
24 | | - function multi_email(array $overrides = [], string $group = ''): Email |
| 24 | + function multi_email(array $overrides = [], string $group = 'default'): Email |
25 | 25 | { |
26 | 26 | if (!setting('MultiEmail.' . $group)) { |
27 | 27 | throw new Exception("Cannot send email from 'multi_email' helper.\n Undefined group name: $group"); |
28 | 28 | } |
29 | 29 |
|
30 | | - $defaultGroup = !empty($group) ? strtolower($group) : setting('MultiEmail.defaultGroup'); |
31 | | - |
32 | 30 | $config = [ |
33 | | - 'fromEmail' => env("email.$defaultGroup.fromEmail", setting('MultiEmail.' . $defaultGroup)['fromEmail']), |
34 | | - 'fromName' => env("email.$defaultGroup.fromName", setting('MultiEmail.' . $defaultGroup)['fromName']), |
35 | | - 'userAgent' => setting('MultiEmail.' . $defaultGroup)['userAgent'], |
36 | | - 'protocol' => env("email.$defaultGroup.protocol", setting('MultiEmail.' . $defaultGroup)['protocol']), |
37 | | - 'mailPath' => setting('MultiEmail.' . $defaultGroup)['mailPath'], |
38 | | - 'SMTPHost' => env("email.$defaultGroup.SMTPHost", setting('MultiEmail.' . $defaultGroup)['SMTPHost']), |
39 | | - 'SMTPUser' => env("email.$defaultGroup.SMTPUser", setting('MultiEmail.' . $defaultGroup)['SMTPUser']), |
40 | | - 'SMTPPass' => env("email.$defaultGroup.SMTPPass", setting('MultiEmail.' . $defaultGroup)['SMTPPass']), |
41 | | - 'SMTPPort' => (int) env("email.$defaultGroup.SMTPPort", setting('MultiEmail.' . $defaultGroup)['SMTPPort']), |
42 | | - 'SMTPTimeout' => setting('MultiEmail.' . $defaultGroup)['SMTPTimeout'], |
43 | | - 'SMTPKeepAlive' => setting('MultiEmail.' . $defaultGroup)['SMTPKeepAlive'], |
44 | | - 'SMTPCrypto' => setting('MultiEmail.' . $defaultGroup)['SMTPCrypto'], |
45 | | - 'wordWrap' => setting('MultiEmail.' . $defaultGroup)['wordWrap'], |
46 | | - 'wrapChars' => setting('MultiEmail.' . $defaultGroup)['wrapChars'], |
47 | | - 'mailType' => setting('MultiEmail.' . $defaultGroup)['mailType'], |
48 | | - 'charset' => setting('MultiEmail.' . $defaultGroup)['charset'], |
49 | | - 'validate' => setting('MultiEmail.' . $defaultGroup)['validate'], |
50 | | - 'priority' => setting('MultiEmail.' . $defaultGroup)['priority'], |
51 | | - 'CRLF' => setting('MultiEmail.' . $defaultGroup)['CRLF'], |
52 | | - 'newline' => setting('MultiEmail.' . $defaultGroup)['newline'], |
53 | | - 'BCCBatchMode' => setting('MultiEmail.' . $defaultGroup)['BCCBatchMode'], |
54 | | - 'BCCBatchSize' => setting('MultiEmail.' . $defaultGroup)['BCCBatchSize'], |
55 | | - 'DSN' => setting('MultiEmail.' . $defaultGroup)['DSN'], |
| 31 | + 'fromEmail' => env("email.$group.fromEmail", setting('MultiEmail.' . $group)['fromEmail']), |
| 32 | + 'fromName' => env("email.$group.fromName", setting('MultiEmail.' . $group)['fromName']), |
| 33 | + 'userAgent' => setting('MultiEmail.' . $group)['userAgent'], |
| 34 | + 'protocol' => env("email.$group.protocol", setting('MultiEmail.' . $group)['protocol']), |
| 35 | + 'mailPath' => setting('MultiEmail.' . $group)['mailPath'], |
| 36 | + 'SMTPHost' => env("email.$group.SMTPHost", setting('MultiEmail.' . $group)['SMTPHost']), |
| 37 | + 'SMTPUser' => env("email.$group.SMTPUser", setting('MultiEmail.' . $group)['SMTPUser']), |
| 38 | + 'SMTPPass' => env("email.$group.SMTPPass", setting('MultiEmail.' . $group)['SMTPPass']), |
| 39 | + 'SMTPPort' => (int) env("email.$group.SMTPPort", setting('MultiEmail.' . $group)['SMTPPort']), |
| 40 | + 'SMTPTimeout' => setting('MultiEmail.' . $group)['SMTPTimeout'], |
| 41 | + 'SMTPKeepAlive' => setting('MultiEmail.' . $group)['SMTPKeepAlive'], |
| 42 | + 'SMTPCrypto' => setting('MultiEmail.' . $group)['SMTPCrypto'], |
| 43 | + 'wordWrap' => setting('MultiEmail.' . $group)['wordWrap'], |
| 44 | + 'wrapChars' => setting('MultiEmail.' . $group)['wrapChars'], |
| 45 | + 'mailType' => setting('MultiEmail.' . $group)['mailType'], |
| 46 | + 'charset' => setting('MultiEmail.' . $group)['charset'], |
| 47 | + 'validate' => setting('MultiEmail.' . $group)['validate'], |
| 48 | + 'priority' => setting('MultiEmail.' . $group)['priority'], |
| 49 | + 'CRLF' => setting('MultiEmail.' . $group)['CRLF'], |
| 50 | + 'newline' => setting('MultiEmail.' . $group)['newline'], |
| 51 | + 'BCCBatchMode' => setting('MultiEmail.' . $group)['BCCBatchMode'], |
| 52 | + 'BCCBatchSize' => setting('MultiEmail.' . $group)['BCCBatchSize'], |
| 53 | + 'DSN' => setting('MultiEmail.' . $group)['DSN'], |
56 | 54 | ]; |
57 | 55 |
|
58 | 56 | if ($overrides !== []) { |
|
0 commit comments