From 3756c2cb652526e5646d66f1e5613be7d1490b36 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Sun, 17 Dec 2017 01:51:39 -0700
Subject: [PATCH] Update send_email.lua

---
 .../resources/functions/send_email.lua        | 58 ++++++++++++-------
 1 file changed, 36 insertions(+), 22 deletions(-)

diff --git a/resources/install/scripts/app/voicemail/resources/functions/send_email.lua b/resources/install/scripts/app/voicemail/resources/functions/send_email.lua
index 7e2d90f5ef..e5cc3d3847 100644
--- a/resources/install/scripts/app/voicemail/resources/functions/send_email.lua
+++ b/resources/install/scripts/app/voicemail/resources/functions/send_email.lua
@@ -114,20 +114,31 @@
 					if (debug["info"]) then
 						freeswitch.consoleLog("notice", "[voicemail] message length: " .. message_length .. "\n");
 					end
-					local message_date = os.date("%A, %d %b %Y %I:%M %p", created_epoch)
+					local message_date = os.date("%A, %d %b %Y %I:%M %p", created_epoch);
 
-				--prepare the files
-					if (transcription ~= nil) then
-						file_subject = scripts_dir.."/app/voicemail/resources/templates/"..default_language.."/"..default_dialect.."/email_subject.tpl";
-						file_body = scripts_dir.."/app/voicemail/resources/templates/"..default_language.."/"..default_dialect.."/email_body_transcription.tpl";					
+				--connect to the database
+					local dbh = Database.new('system');
+
+				--get the templates
+					local sql = "SELECT * FROM v_email_templates ";
+					sql = sql .. "WHERE (domain_uuid = :domain_uuid or domain_uuid is null) ";
+					sql = sql .. "AND template_language = :template_language ";
+					sql = sql .. "AND template_category = 'email' "
+					if (transcription == nil) then
+						sql = sql .. "AND template_subcategory = 'default' "
 					else
-						file_subject = scripts_dir.."/app/voicemail/resources/templates/"..default_language.."/"..default_dialect.."/email_subject.tpl";
-						file_body = scripts_dir.."/app/voicemail/resources/templates/"..default_language.."/"..default_dialect.."/email_body.tpl";
+						sql = sql .. "AND template_subcategory = 'transcription' "
 					end
-					if (not file_exists(file_subject)) then
-						file_subject = scripts_dir.."/app/voicemail/resources/templates/en/us/email_subject.tpl";
-						file_body = scripts_dir.."/app/voicemail/resources/templates/en/us/email_body.tpl";
+					sql = sql .. "AND template_enabled = 'true' "
+					sql = sql .. "ORDER BY domain_uuid DESC "
+					local params = {domain_uuid = domain_uuid, template_language = default_language.."-"..default_dialect};
+					if (debug["sql"]) then
+						freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
 					end
+					dbh:query(sql, params, function(row)
+						subject = row["template_subject"];
+						body = row["template_body"];
+					end);
 
 				--get the link_address
 					link_address = http_protocol.."://"..domain_name..project_path;
@@ -150,10 +161,11 @@
 					if (voicemail_description ~= nil and voicemail_description ~= "" and voicemail_description ~= id) then
 						voicemail_name_formatted = voicemail_name_formatted.." ("..voicemail_description..")";
 					end
+
 				--prepare the subject
-					local f = io.open(file_subject, "r");
-					local subject = f:read("*all");
-					f:close();
+					--local f = io.open(file_subject, "r");
+					--local subject = f:read("*all");
+					--f:close();
 					subject = subject:gsub("${caller_id_name}", caller_id_name);
 					subject = subject:gsub("${caller_id_number}", caller_id_number);
 					subject = subject:gsub("${message_date}", message_date);
@@ -167,9 +179,9 @@
 					subject = '=?utf-8?B?'..base64.encode(subject)..'?=';
 
 				--prepare the body
-					local f = io.open(file_body, "r");
-					body = f:read("*all");
-					f:close();
+					--local f = io.open(file_body, "r");
+					--body = f:read("*all");
+					--f:close();
 					body = body:gsub("${caller_id_name}", caller_id_name);
 					body = body:gsub("${caller_id_number}", caller_id_number);
 					body = body:gsub("${message_date}", message_date);
@@ -191,11 +203,13 @@
 					else
 						body = body:gsub("${message}", "<a href='"..link_address.."/app/voicemails/voicemail_messages.php?action=autoplay&id="..db_voicemail_uuid.."&uuid="..uuid.."'>"..text['label-listen'].."</a>");
 					end
-					body = body:gsub(" ", "&nbsp;");
-					body = body:gsub("%s+", "");
-					body = body:gsub("&nbsp;", " ");
-					body = body:gsub("\n", "");
-					body = body:gsub("\n", "");
+					--body = body:gsub("<", "");
+					--body = body:gsub(">", "");
+					--body = body:gsub(" ", "&nbsp;");
+					--body = body:gsub("%s+", "");
+					--body = body:gsub("&nbsp;", " ");
+					--body = body:gsub("\n", "");
+					--body = body:gsub("\n", "");
 					body = trim(body);
 
 				--prepare file
@@ -240,4 +254,4 @@
 
 			end
 
-	end
\ No newline at end of file
+	end