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

Enhance - send_mail.lua (#2978) 

use the to address when email:smtp_from:var is empty
don't use email:smtp_from_name:var when empty
This commit is contained in:
Mafoo 2018-02-07 00:45:53 +00:00 committed by FusionPBX
parent 1c580ce7a1
commit cdd7c2bd97
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
resources/install/scripts/resources/functions/send_mail.lua
View File

@ -1,4 +1,3 @@
local Settings = require "resources.functions.lazy_settings"
local Database = require "resources.functions.database"
@ -91,6 +90,12 @@ if freeswitch then
xheaders = xheaders:sub(1,-2) .. '}'
local from = settings:get('email', 'smtp_from', 'var')
local from_name = settings:get('email', 'smtp_from_name', 'var')
if from == nil or from == "" then
from = address
elseif from_name ~= nil and from_name ~= "" then
from = from_name .. "<" .. from .. ">"
end
local subject = message[1]
local body = message[2] or ''