forked from fusionpbx/fusionpbx
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add customization for email (fusionpbx#2968)
Add customization for email Add customization for smtp_from and smtp_from_name for voicemail to email Add customization for smtp_from and smtp_from_name for fax to email Fixed typo
- Loading branch information
1 parent
37eefcd
commit 380171d
Showing
2 changed files
with
26 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -375,15 +375,26 @@ function fax_split_dtmf(&$fax_number, &$fax_dtmf){ | |
| $smtp['auth'] = $_SESSION['email']['smtp_auth']['var']; | ||
| $smtp['username'] = $_SESSION['email']['smtp_username']['var']; | ||
| $smtp['password'] = $_SESSION['email']['smtp_password']['var']; | ||
| $smtp['from'] = (strlen($_SESSION['email']['smtp_from']['var'])?$_SESSION['email']['smtp_from']['var']:'[email protected]'); | ||
| $smtp['from_name'] = (strlen($_SESSION['email']['smtp_from_name']['var'])?$_SESSION['email']['smtp_from_name']['var']:'FusionPBX FAX'); | ||
|
|
||
| if (isset($_SESSION['voicemail']['smtp_from'])) { | ||
| $smtp['from'] = (strlen($_SESSION['fax']['smtp_from']['var'])?$_SESSION['fax']['smtp_from']['var']:'[email protected]'); | ||
| } else { | ||
| $smtp['from'] = (strlen($_SESSION['email']['smtp_from']['var'])?$_SESSION['email']['smtp_from']['var']:'[email protected]'); | ||
| } | ||
|
|
||
| if (isset($_SESSION['voicemail']['smtp_from_name'])) { | ||
| $smtp['from_name'] = (strlen($_SESSION['fax']['smtp_from_name']['var'])?$_SESSION['fax']['smtp_from_name']['var']:'FusionPBX Voicemail'); | ||
| } else { | ||
| $smtp['from_name'] = (strlen($_SESSION['email']['smtp_from_name']['var'])?$_SESSION['email']['smtp_from_name']['var']:'FusionPBX Voicemail'); | ||
| } | ||
|
|
||
| // overwrite with domain-specific smtp server settings, if any | ||
| if ($domain_uuid != '') { | ||
| $sql = "select domain_setting_subcategory, domain_setting_value "; | ||
| $sql .= "from v_domain_settings "; | ||
| $sql .= "where domain_uuid = '".$domain_uuid."' "; | ||
| $sql .= "and domain_setting_category = 'email' "; | ||
| $sql .= "or domain_setting_category = 'fax' "; | ||
| $sql .= "and domain_setting_name = 'var' "; | ||
| $sql .= "and domain_setting_enabled = 'true' "; | ||
| $prep_statement = $db->prepare($sql); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -146,15 +146,26 @@ function remove_tags($string) { | |
| $smtp['auth'] = $_SESSION['email']['smtp_auth']['var']; | ||
| $smtp['username'] = $_SESSION['email']['smtp_username']['var']; | ||
| $smtp['password'] = $_SESSION['email']['smtp_password']['var']; | ||
| $smtp['from'] = (strlen($_SESSION['email']['smtp_from']['var'])?$_SESSION['email']['smtp_from']['var']:'[email protected]'); | ||
| $smtp['from_name'] = (strlen($_SESSION['email']['smtp_from_name']['var'])?$_SESSION['email']['smtp_from_name']['var']:'FusionPBX Voicemail'); | ||
|
|
||
| if (isset($_SESSION['voicemail']['smtp_from'])) { | ||
| $smtp['from'] = (strlen($_SESSION['voicemail']['smtp_from']['var'])?$_SESSION['voicemail']['smtp_from']['var']:'[email protected]'); | ||
| } else { | ||
| $smtp['from'] = (strlen($_SESSION['email']['smtp_from']['var'])?$_SESSION['email']['smtp_from']['var']:'[email protected]'); | ||
| } | ||
|
|
||
| if (isset($_SESSION['voicemail']['smtp_from_name'])) { | ||
| $smtp['from_name'] = (strlen($_SESSION['voicemail']['smtp_from_name']['var'])?$_SESSION['voicemail']['smtp_from_name']['var']:'FusionPBX Voicemail'); | ||
| } else { | ||
| $smtp['from_name'] = (strlen($_SESSION['email']['smtp_from_name']['var'])?$_SESSION['email']['smtp_from_name']['var']:'FusionPBX Voicemail'); | ||
| } | ||
|
|
||
| // overwrite with domain-specific smtp server settings, if any | ||
| if ($headers["X-FusionPBX-Domain-UUID"] != '') { | ||
| $sql = "select domain_setting_subcategory, domain_setting_value "; | ||
| $sql .= "from v_domain_settings "; | ||
| $sql .= "where domain_uuid = '".$headers["X-FusionPBX-Domain-UUID"]."' "; | ||
| $sql .= "and domain_setting_category = 'email' "; | ||
| $sql .= "or domain_setting_category = 'voicemail' "; | ||
| $sql .= "and domain_setting_name = 'var' "; | ||
| $sql .= "and domain_setting_enabled = 'true' "; | ||
| $prep_statement = $db->prepare($sql); | ||
|
|
@@ -169,7 +180,6 @@ function remove_tags($string) { | |
| } | ||
| unset($sql, $prep_statement); | ||
| } | ||
|
|
||
| // value adjustments | ||
| $smtp['auth'] = ($smtp['auth'] == "true") ? true : false; | ||
| $smtp['password'] = ($smtp['password'] != '') ? $smtp['password'] : null; | ||
|
|
||