From 380171da0600a54933e5571246f32613eb2882de Mon Sep 17 00:00:00 2001
From: ewyand <erikwyand@priserv.com>
Date: Fri, 2 Feb 2018 00:21:04 -0500
Subject: [PATCH] Add customization for email (#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
---
 secure/fax_to_email.php | 15 +++++++++++++--
 secure/v_mailto.php     | 16 +++++++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/secure/fax_to_email.php b/secure/fax_to_email.php
index 9a75fb535d..62e48e72f5 100755
--- a/secure/fax_to_email.php
+++ b/secure/fax_to_email.php
@@ -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);
diff --git a/secure/v_mailto.php b/secure/v_mailto.php
index 71c5204f4d..3e00a7c457 100755
--- a/secure/v_mailto.php
+++ b/secure/v_mailto.php
@@ -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;