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

Add ring group cid number prefix to the database and to the ring group lua script

This commit is contained in:
Mark Crane 2014-09-06 07:45:17 +00:00
parent 29fb8dd6bd
commit f4ae26f6d5
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/ring_groups/app_config.php
View File

@ -140,7 +140,11 @@
$z++; $z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_cid_name_prefix"; $apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_cid_name_prefix";
$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the caller ID prefix."; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the caller ID name prefix.";
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_cid_number_prefix";
$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the caller ID number prefix.";
$z++; $z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_strategy"; $apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_strategy";
$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text";

7
resources/install/scripts/app/ring_groups/index.lua
View File

@ -102,6 +102,7 @@
ring_group_forward_enabled = row["ring_group_forward_enabled"]; ring_group_forward_enabled = row["ring_group_forward_enabled"];
ring_group_forward_destination = row["ring_group_forward_destination"]; ring_group_forward_destination = row["ring_group_forward_destination"];
ring_group_cid_name_prefix = row["ring_group_cid_name_prefix"]; ring_group_cid_name_prefix = row["ring_group_cid_name_prefix"];
ring_group_cid_number_prefix = row["ring_group_cid_number_prefix"];
end); end);
--set the caller id --set the caller id
@ -109,6 +110,9 @@
if (string.len(ring_group_cid_name_prefix) > 0) then if (string.len(ring_group_cid_name_prefix) > 0) then
session:execute("set", "effective_caller_id_name="..ring_group_cid_name_prefix.."#"..caller_id_name); session:execute("set", "effective_caller_id_name="..ring_group_cid_name_prefix.."#"..caller_id_name);
end end
if (string.len(ring_group_cid_number_prefix) > 0) then
session:execute("set", "effective_caller_id_number="..ring_group_cid_number_prefix..caller_id_number);
end
end end
--process the ring group --process the ring group
@ -118,7 +122,7 @@
else else
--get the ring group destinations --get the ring group destinations
sql = sql =
[[ SELECT r.ring_group_strategy, r.ring_group_timeout_app, d.destination_number, d.destination_delay, d.destination_timeout, d.destination_prompt, r.ring_group_timeout_data, r.ring_group_cid_name_prefix, r.ring_group_ringback, r.ring_group_skip_active [[ SELECT r.ring_group_strategy, r.ring_group_timeout_app, d.destination_number, d.destination_delay, d.destination_timeout, d.destination_prompt, r.ring_group_timeout_data, r.ring_group_cid_name_prefix, r.ring_group_cid_number_prefix, r.ring_group_ringback, r.ring_group_skip_active
FROM v_ring_groups as r, v_ring_group_destinations as d FROM v_ring_groups as r, v_ring_group_destinations as d
where d.ring_group_uuid = r.ring_group_uuid where d.ring_group_uuid = r.ring_group_uuid
and d.ring_group_uuid = ']]..ring_group_uuid..[[' and d.ring_group_uuid = ']]..ring_group_uuid..[['
@ -189,6 +193,7 @@
ring_group_timeout_app = row.ring_group_timeout_app; ring_group_timeout_app = row.ring_group_timeout_app;
ring_group_timeout_data = row.ring_group_timeout_data; ring_group_timeout_data = row.ring_group_timeout_data;
ring_group_cid_name_prefix = row.ring_group_cid_name_prefix; ring_group_cid_name_prefix = row.ring_group_cid_name_prefix;
ring_group_cid_number_prefix = row.ring_group_cid_number_prefix;
ring_group_ringback = row.ring_group_ringback; ring_group_ringback = row.ring_group_ringback;
ring_group_skip_active = row.ring_group_skip_active; ring_group_skip_active = row.ring_group_skip_active;
destination_number = row.destination_number; destination_number = row.destination_number;