nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add customization for email (#2968)

Browse Source 
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
This commit is contained in:
ewyand
2018-02-02 00:21:04 -05:00
committed by FusionPBX
parent c661f8471d
commit 9a75dc9401
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
secure/fax_to_email.php
View File

@@ -375,8 +375,18 @@ if(!function_exists('fax_split_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']:'fusionpbx@example.com');
$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']:'fusionpbx@example.com');
} else {
$smtp['from'] = (strlen($_SESSION['email']['smtp_from']['var'])?$_SESSION['email']['smtp_from']['var']:'fusionpbx@example.com');
}
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 != '') {
@@ -384,6 +394,7 @@ if(!function_exists('fax_split_dtmf')) {
$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);

16
secure/v_mailto.php
View File

@@ -146,8 +146,18 @@
$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']:'fusionpbx@example.com');
$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']:'fusionpbx@example.com');
} else {
$smtp['from'] = (strlen($_SESSION['email']['smtp_from']['var'])?$_SESSION['email']['smtp_from']['var']:'fusionpbx@example.com');
}
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"] != '') {
@@ -155,6 +165,7 @@
$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 @@
}
unset($sql, $prep_statement);
}
// value adjustments
$smtp['auth'] = ($smtp['auth'] == "true") ? true : false;
$smtp['password'] = ($smtp['password'] != '') ? $smtp['password'] : null;