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

Use caceh set only if dialplan_mode has a value.

Browse Source
This commit is contained in:
FusionPBX
2020-08-27 21:48:04 -06:00
committed by GitHub
parent 6691e9d791
commit 1fcc06e622
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/scripts/resources/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
+7 -3
View File
@@ -1,6 +1,6 @@
-- xml_handler.lua -- xml_handler.lua
-- Part of FusionPBX -- Part of FusionPBX
-- Copyright (C) 2013-2018 Mark J Crane <markjcrane@fusionpbx.com> -- Copyright (C) 2013-2020 Mark J Crane <markjcrane@fusionpbx.com>
-- All rights reserved. -- All rights reserved.
-- --
-- Redistribution and use in source and binary forms, with or without -- Redistribution and use in source and binary forms, with or without
@@ -47,8 +47,10 @@
sql = "select default_setting_value from v_default_settings " sql = "select default_setting_value from v_default_settings "
sql = sql .. "where default_setting_category = 'destinations' "; sql = sql .. "where default_setting_category = 'destinations' ";
sql = sql .. "and default_setting_subcategory = 'dialplan_mode' "; sql = sql .. "and default_setting_subcategory = 'dialplan_mode' ";
local dialplan_mode = dbh:first_value(sql, nil); dialplan_mode = dbh:first_value(sql, nil);
local ok, err = cache.set(dialplan_mode_key, dialplan_mode, expire["dialplan"]); if (dialplan_mode) then
local ok, err = cache.set(dialplan_mode_key, dialplan_mode, expire["dialplan"]);
end
--send a message to the log --send a message to the log
if (debug['cache']) then if (debug['cache']) then
@@ -122,6 +124,8 @@
sql = sql .. " destination_prefix || destination_area_code || destination_number = :destination_number "; sql = sql .. " destination_prefix || destination_area_code || destination_number = :destination_number ";
sql = sql .. " OR destination_trunk_prefix || destination_area_code || destination_number = :destination_number "; sql = sql .. " OR destination_trunk_prefix || destination_area_code || destination_number = :destination_number ";
sql = sql .. " OR destination_prefix || destination_number = :destination_number "; sql = sql .. " OR destination_prefix || destination_number = :destination_number ";
sql = sql .. " OR '+' || destination_prefix || destination_number = :destination_number ";
sql = sql .. " OR '+' || destination_prefix || destination_area_code || destination_number = :destination_number ";
sql = sql .. " OR destination_area_code || destination_number = :destination_number "; sql = sql .. " OR destination_area_code || destination_number = :destination_number ";
sql = sql .. " OR destination_number = :destination_number "; sql = sql .. " OR destination_number = :destination_number ";
sql = sql .. " ) "; sql = sql .. " ) ";