From 3d9246dd1f56cd153ae60d7b8bcf28f0247eaa58 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 22 Feb 2018 20:14:58 -0700 Subject: [PATCH] Update v_mailto.php --- secure/v_mailto.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/secure/v_mailto.php b/secure/v_mailto.php index 3b8cfa289b..681c5e9e49 100755 --- a/secure/v_mailto.php +++ b/secure/v_mailto.php @@ -145,17 +145,14 @@ $smtp['auth'] = $_SESSION['email']['smtp_auth']['text']; $smtp['username'] = $_SESSION['email']['smtp_username']['text']; $smtp['password'] = $_SESSION['email']['smtp_password']['text']; + $smtp['from'] = $_SESSION['email']['smtp_from']['text']; + $smtp['from_name'] = $_SESSION['email']['smtp_from_name']['text']; - if (isset($_SESSION['voicemail']['smtp_from'])) { + if (isset($_SESSION['voicemail']['smtp_from']) && strlen($_SESSION['voicemail']['smtp_from']['text']) > 0) { $smtp['from'] = $_SESSION['voicemail']['smtp_from']['text']; - } else { - $smtp['from'] = $_SESSION['email']['smtp_from']['text']; } - - if (isset($_SESSION['voicemail']['smtp_from_name'])) { - $smtp['from_name'] = $_SESSION['voicemail']['smtp_from_name']['text']; - } else { - $smtp['from_name'] = $_SESSION['email']['smtp_from_name']['text']; + if (isset($_SESSION['voicemail']['smtp_from_name']) && strlen($_SESSION['voicemail']['smtp_from_name']['text']) > 0) { + $smtp['from_name'] = $_SESSION['voicemail']['smtp_from_name']['text']; } // overwrite with domain-specific smtp server settings, if any