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

Add. Use params in vm/choose_greeting.lua (#2140)

Browse Source
This commit is contained in:
Alexey Melnichuk
2016-11-22 11:13:03 -07:00
committed by FusionPBX
parent 79dd1faaea
commit a7d54f03fe
1 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/install/scripts/app/voicemail/resources/functions/choose_greeting.lua
+28 -18
View File
@@ -40,11 +40,13 @@
--check to see if the greeting file exists --check to see if the greeting file exists
if (storage_type == "base64" or storage_type == "http_cache") then if (storage_type == "base64" or storage_type == "http_cache") then
greeting_invalid = true; greeting_invalid = true;
sql = [[SELECT * FROM v_voicemail_greetings local sql = [[SELECT * FROM v_voicemail_greetings
WHERE domain_uuid = ']] .. domain_uuid ..[[' WHERE domain_uuid = :domain_uuid
AND voicemail_id = ']].. voicemail_id.. [[' AND voicemail_id = :voicemail_id
AND greeting_id = ']].. greeting_id.. [[' ]]; AND greeting_id = :greeting_id]];
status = dbh:query(sql, function(row) local params = {domain_uuid = domain_uuid, voicemail_id = voicemail_id,
greeting_id = greeting_id};
dbh:query(sql, params, function(row)
--greeting found --greeting found
greeting_invalid = false; greeting_invalid = false;
end); end);
@@ -74,31 +76,39 @@
--valid greeting_id update the database --valid greeting_id update the database
if (session:ready()) then if (session:ready()) then
local params = {domain_uuid = domain_uuid, voicemail_uuid = voicemail_uuid};
local sql = "UPDATE v_voicemails SET "
if (greeting_id == "0") then if (greeting_id == "0") then
sql = [[UPDATE v_voicemails SET greeting_id = null ]]; sql = sql .. "greeting_id = null ";
else else
sql = [[UPDATE v_voicemails SET greeting_id = ']]..greeting_id..[[' ]]; sql = sql .. "greeting_id = :greeting_id ";
params.greeting_id = greeting_id;
end end
sql = sql ..[[WHERE domain_uuid = ']] .. domain_uuid ..[[' ]] sql = sql .. "WHERE domain_uuid = :domain_uuid ";
sql = sql ..[[AND voicemail_uuid = ']] .. voicemail_uuid ..[[' ]]; sql = sql .. "AND voicemail_uuid = :voicemail_uuid ";
if (debug["sql"]) then if (debug["sql"]) then
freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "\n"); freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
end end
dbh:query(sql); dbh:query(sql, params);
end end
--get the greeting from the database --get the greeting from the database
if (storage_type == "base64") then if (storage_type == "base64") then
local dbh = Database.new('system', 'base64/read') local dbh = Database.new('system', 'base64/read')
local sql = [[SELECT greeting_base64
sql = [[SELECT * FROM v_voicemail_greetings FROM v_voicemail_greetings
WHERE domain_uuid = ']] .. domain_uuid ..[[' WHERE domain_uuid = :domain_uuid
AND voicemail_id = ']].. voicemail_id.. [[' AND voicemail_id = :voicemail_id
AND greeting_id = ']].. greeting_id.. [[' ]]; AND greeting_id = :greeting_id]];
local params = {
domain_uuid = domain_uuid;
voicemail_id = voicemail_id;
greeting_id = greeting_id;
};
if (debug["sql"]) then if (debug["sql"]) then
freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "\n"); freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
end end
status = dbh:query(sql, function(row) dbh:query(sql, params, function(row)
--set the voicemail message path --set the voicemail message path
greeting_location = voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav"; --vm_message_ext; greeting_location = voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav"; --vm_message_ext;