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

BugFix - LUA send_mail() (#2975) 

take call_uuid from the correct header
use smtp_from_name as part of the from address
This commit is contained in:
Mafoo 2018-02-03 02:33:43 +00:00 committed by FusionPBX
parent d6b70b688b
commit 2471fa7844
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,7 @@ if freeswitch then
local domain_uuid = headers["X-FusionPBX-Domain-UUID"] local domain_uuid = headers["X-FusionPBX-Domain-UUID"]
local domain_name = headers["X-FusionPBX-Domain-Name"] local domain_name = headers["X-FusionPBX-Domain-Name"]
local email_type = headers["X-FusionPBX-Email-Type"] or 'info' local email_type = headers["X-FusionPBX-Email-Type"] or 'info'
local call_uuid = headers["X-FusionPBX-Email-Type"] local call_uuid = headers["X-FusionPBX-Email-Call-UUID"]
local db = dbh or Database.new('system') local db = dbh or Database.new('system')
local settings = Settings.new(db, domain_name, domain_uuid) local settings = Settings.new(db, domain_name, domain_uuid)
local xheaders = "{" local xheaders = "{"
@ -92,19 +92,21 @@ if freeswitch then
xheaders = xheaders:sub(1,-2) .. '}' xheaders = xheaders:sub(1,-2) .. '}'
local from = settins:get('email', 'smtp_from', 'var') local from = settins:get('email', 'smtp_from', 'var')
local from_name = settins:get('email', 'smtp_from_name', 'var')
local from_address = from_name .. "<" .. from .. ">"
local subject = message[1] local subject = message[1]
local body = message[2] or '' local body = message[2] or ''
local mail_headers = local mail_headers =
"To: ".. address .. "\n" .. "To: ".. address .. "\n" ..
"From: " .. from .. "\n" .. "From: " .. from_address "\n" ..
"Subject: " .. subject .. "\n" .. "Subject: " .. subject .. "\n" ..
"X-Headers: " .. xheaders "X-Headers: " .. xheaders
if file then if file then
freeswitch.email(address, from, mail_headers, body, file) freeswitch.email(address, from_address, mail_headers, body, file)
else else
freeswitch.email(address, from, mail_headers, body) freeswitch.email(address, from_address, mail_headers, body)
end end
end end
end end