From 641e026474008081ce10533b5fd2ff6603831cd8 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 27 Jan 2017 12:22:12 -0700 Subject: [PATCH] Update index.lua Prevent an error when the voicemail_uuid is empty when the voicemail box is disabled. --- .../install/scripts/app/voicemail/index.lua | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/resources/install/scripts/app/voicemail/index.lua b/resources/install/scripts/app/voicemail/index.lua index 1bd08d2034..097c1cd007 100644 --- a/resources/install/scripts/app/voicemail/index.lua +++ b/resources/install/scripts/app/voicemail/index.lua @@ -320,30 +320,30 @@ --leave a message if (voicemail_action == "save") then - --check the voicemail quota - if (vm_disk_quota) then - --get voicemail message seconds - local sql = [[SELECT coalesce(sum(message_length), 0) as message_sum FROM v_voicemail_messages - WHERE domain_uuid = :domain_uuid - AND voicemail_uuid = :voicemail_uuid]] - local params = {domain_uuid = domain_uuid, voicemail_uuid = voicemail_uuid}; - if (debug["sql"]) then - freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n"); - end - dbh:query(sql, params, function(row) - message_sum = row["message_sum"]; - end); - if (tonumber(vm_disk_quota) <= tonumber(message_sum)) then - --play message mailbox full - session:execute("playback", sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/voicemail/vm-mailbox_full.wav") - --set the voicemail_uuid to nil to prevent saving the voicemail - voicemail_uuid = nil; - end - end - --valid voicemail if (voicemail_uuid ~= nil) then + --check the voicemail quota + if (vm_disk_quota) then + --get voicemail message seconds + local sql = [[SELECT coalesce(sum(message_length), 0) as message_sum FROM v_voicemail_messages + WHERE domain_uuid = :domain_uuid + AND voicemail_uuid = :voicemail_uuid]] + local params = {domain_uuid = domain_uuid, voicemail_uuid = voicemail_uuid}; + if (debug["sql"]) then + freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n"); + end + dbh:query(sql, params, function(row) + message_sum = row["message_sum"]; + end); + if (tonumber(vm_disk_quota) <= tonumber(message_sum)) then + --play message mailbox full + session:execute("playback", sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/voicemail/vm-mailbox_full.wav") + --set the voicemail_uuid to nil to prevent saving the voicemail + voicemail_uuid = nil; + end + end + --play the greeting timeouts = 0; play_greeting();