@@ -27,18 +27,18 @@ function multi_email(array $overrides = [], string $group = ''): Email
2727 throw new Exception ("Cannot send email from 'multi_email' helper. \n Undefined group name: $ group " );
2828 }
2929
30- $ defaultGroup = !empty ($ group ) ? $ group : setting ('MultiEmail.defaultGroup ' );
30+ $ defaultGroup = !empty ($ group ) ? strtolower ( $ group) : setting ('MultiEmail.defaultGroup ' );
3131
3232 $ config = [
33- 'fromEmail ' => setting ('MultiEmail. ' . $ defaultGroup )['fromEmail ' ],
34- 'fromName ' => setting ('MultiEmail. ' . $ defaultGroup )['fromName ' ],
33+ 'fromEmail ' => env ( " email. $ defaultGroup .fromEmail " , setting ('MultiEmail. ' . $ defaultGroup )['fromEmail ' ]) ,
34+ 'fromName ' => env ( " email. $ defaultGroup .fromName " , setting ('MultiEmail. ' . $ defaultGroup )['fromName ' ]) ,
3535 'userAgent ' => setting ('MultiEmail. ' . $ defaultGroup )['userAgent ' ],
36- 'protocol ' => setting ('MultiEmail. ' . $ defaultGroup )['protocol ' ],
36+ 'protocol ' => env ( " email. $ defaultGroup .protocol " , setting ('MultiEmail. ' . $ defaultGroup )['protocol ' ]) ,
3737 'mailPath ' => setting ('MultiEmail. ' . $ defaultGroup )['mailPath ' ],
38- 'SMTPHost ' => setting ('MultiEmail. ' . $ defaultGroup )['SMTPHost ' ],
39- 'SMTPUser ' => setting ('MultiEmail. ' . $ defaultGroup )['SMTPUser ' ],
40- 'SMTPPass ' => setting ('MultiEmail. ' . $ defaultGroup )['SMTPPass ' ],
41- 'SMTPPort ' => setting ('MultiEmail. ' . $ defaultGroup )['SMTPPort ' ],
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 ' ]) ,
4242 'SMTPTimeout ' => setting ('MultiEmail. ' . $ defaultGroup )['SMTPTimeout ' ],
4343 'SMTPKeepAlive ' => setting ('MultiEmail. ' . $ defaultGroup )['SMTPKeepAlive ' ],
4444 'SMTPCrypto ' => setting ('MultiEmail. ' . $ defaultGroup )['SMTPCrypto ' ],
0 commit comments