From 960efb69c88be5e4716409bb1cd41c7f7b6b90a9 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 20 Sep 2025 17:52:20 -0600 Subject: [PATCH] Update feature_event_notify.lua boolean --- .../functions/feature_event_notify.lua | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/switch/resources/scripts/app/feature_event/resources/functions/feature_event_notify.lua b/app/switch/resources/scripts/app/feature_event/resources/functions/feature_event_notify.lua index 44b630451c..ee60e1354b 100644 --- a/app/switch/resources/scripts/app/feature_event/resources/functions/feature_event_notify.lua +++ b/app/switch/resources/scripts/app/feature_event/resources/functions/feature_event_notify.lua @@ -14,11 +14,12 @@ function feature_event_notify.get_db_values(user, domain_name) dbh:query(sql, params, function(row) domain_uuid = row.domain_uuid; end); - + --get extension information local sql = "select * from v_extensions "; sql = sql .. "where domain_uuid = :domain_uuid "; sql = sql .. "and (extension = :extension or number_alias = :extension) "; + sql = sql .. "and enabled true "; local params = {domain_uuid = domain_uuid, extension = user}; -- if (debug["sql"]) then -- freeswitch.consoleLog("notice", "[feature_event] " .. sql .. "; params:" .. json.encode(params) .. "\n"); @@ -44,15 +45,16 @@ function feature_event_notify.get_db_values(user, domain_name) --freeswitch.consoleLog("NOTICE", "[feature_event] extension "..row.extension.."\n"); --freeswitch.consoleLog("NOTICE", "[feature_event] accountcode "..row.accountcode.."\n"); end); - + --set some defaults if values in database are NULL - if (forward_all_enabled == "") then forward_all_enabled = "false"; end - --if (forward_all_destination == "") then forward_all_destination = nil; end - if (forward_busy_enabled == "") then forward_busy_enabled = "false"; end - if (forward_no_answer_enabled == "") then forward_no_answer_enabled = "false"; end - if (do_not_disturb == "") then do_not_disturb = "false"; end + forward_all_enabled = forward_all_enabled and "true" or "false"; + forward_busy_enabled = forward_busy_enabled and "true" or "false"; + forward_no_answer_enabled = forward_no_answer_enabled and "true" or "false"; + forward_user_not_registered_enabled = forward_user_not_registered_enabled and "true" or "false"; + follow_me_enabled = follow_me_enabled and "true" or "false"; + do_not_disturb = do_not_disturb and "true" or "false"; if (call_timeout == "") then call_timeout = "30"; end - + return do_not_disturb, forward_all_enabled, forward_all_destination, forward_busy_enabled, forward_busy_destination, forward_no_answer_enabled, forward_no_answer_destination, call_timeout end @@ -159,7 +161,7 @@ function feature_event_notify.init(user, host, sip_profiles, forward_immediate_e event:addHeader("device", "") event:addHeader("Feature-Event", "init") event:addHeader("forward_immediate_enabled", forward_immediate_enabled) - event:addHeader("forward_immediate", forward_immediate_destination); + event:addHeader("forward_immediate", forward_immediate_destination); event:addHeader("forward_busy", forward_busy_destination) event:addHeader("forward_busy_enabled", forward_busy_enabled) event:addHeader("Feature-Event", "ForwardingEvent")