dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Email [Class]: Remove redundant if statements, simplify logic.

This commit is contained in:
fusionate 2023-12-29 18:19:59 +00:00
parent d0c3840a18
commit f4d8ec9182
No known key found for this signature in database
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/classes/email.php
View File

@ -415,18 +415,11 @@ if (!class_exists('email')) {
$smtp['auth'] = $setting->get('email','smtp_auth');
$smtp['username'] = $setting->get('email','smtp_username');
$smtp['password'] = $setting->get('email','smtp_password');
$smtp['from'] = $setting->get('email','smtp_from');
$smtp['from_name'] = $setting->get('email','smtp_from_name');
$smtp['from'] = $setting->get('voicemail','smtp_from') ?? $setting->get('email','smtp_from');
$smtp['from_name'] = $setting->get('voicemail','smtp_from_name') ?? $setting->get('email','smtp_from_name');
$smtp['validate_certificate'] = $setting->get('email','smtp_validate_certificate');
$smtp['crypto_method'] = $setting->get('email','smtp_crypto_method') ?? null;
if (!empty($setting->get('voicemail','smtp_from')) && !empty($setting->get('voicemail','smtp_from'))) {
$smtp['from'] = $setting->get('voicemail','smtp_from');
}
if (!empty($setting->get('voicemail','smtp_from_name')) && !empty($setting->get('voicemail','smtp_from_name'))) {
$smtp['from_name'] = $setting->get('voicemail','smtp_from_name');
}
//override the domain-specific smtp server settings, if any
$sql = "select domain_setting_subcategory, domain_setting_value ";
$sql .= "from v_domain_settings ";