nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-25 18:19:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update index.lua

Browse Source 
Add call_block_country_code and handle e.164 automatically when the country code has been provided.
This commit is contained in:
FusionPBX
2020-11-02 11:10:45 -07:00
committed by GitHub
parent f748a754ad
commit 991fffa4ed
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/scripts/resources/scripts/app/call_block/index.lua
View File

@@ -90,14 +90,28 @@
assert(dbh:connected());
--check to see if the call should be blocked
sql = "select * from v_call_block ";
sql = sql .. "where domain_uuid = :domain_uuid ";
sql = sql .. "and call_block_enabled = 'true' ";
sql = sql .. "and ( ";
sql = sql .. " (call_block_name = :call_block_name and call_block_number = :call_block_number) ";
sql = sql .. " or (call_block_name is null and call_block_number = :call_block_number) ";
sql = sql .. " or (call_block_name = :call_block_name and call_block_number is null) ";
sql = sql .. ") ";
sql = "select * from v_call_block\n";
sql = sql .. "where domain_uuid = :domain_uuid \n";
sql = sql .. "and call_block_enabled = 'true' \n";
sql = sql .. "and ( \n";
sql = sql .. " (\n";
sql = sql .. " call_block_name = :call_block_name \n";
sql = sql .. " and ( \n";
sql = sql .. " '+' || call_block_country_code || call_block_number = :call_block_number \n";
sql = sql .. " or call_block_country_code || call_block_number = :call_block_number \n";
sql = sql .. " or call_block_number = :call_block_number \n";
sql = sql .. " ) \n";
sql = sql .. " ) \n";
sql = sql .. " or (\n";
sql = sql .. " call_block_name is null \n";
sql = sql .. " and ( \n";
sql = sql .. " '+' || call_block_country_code || call_block_number = :call_block_number \n";
sql = sql .. " or call_block_country_code || call_block_number = :call_block_number \n";
sql = sql .. " or call_block_number = :call_block_number \n";
sql = sql .. " ) \n";
sql = sql .. " ) \n";
sql = sql .. " or (call_block_name = :call_block_name and call_block_number is null) \n";
sql = sql .. ") \n";
if (extension_uuid == nil) then
sql = sql .. "and extension_uuid is null ";
else