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

Refactor cidr and number-alias

Browse Source
This commit is contained in:
FusionPBX
2023-03-31 18:29:23 -06:00
committed by GitHub
parent 7a26c271de
commit 3e0b41ef0f
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua
+5 -7
View File
@@ -42,8 +42,6 @@ continue = true;
--event_calling_function = params:getHeader("Event-Calling-Function"); --event_calling_function = params:getHeader("Event-Calling-Function");
--set the variables as a string --set the variables as a string
number_alias = "";
number_alias_string = "";
vm_mailto = ""; vm_mailto = "";
--include json library --include json library
@@ -305,11 +303,11 @@ continue = true;
extension = row.extension; extension = row.extension;
cidr = ""; cidr = "";
if (string.len(row.cidr) > 0) then if (string.len(row.cidr) > 0) then
cidr = [[ cidr="]] .. row.cidr .. [["]]; cidr = row.cidr;
end end
number_alias = ""
if (string.len(row.number_alias) > 0) then if (string.len(row.number_alias) > 0) then
number_alias = row.number_alias; number_alias = row.number_alias;
number_alias_string = [[ number-alias="]] .. row.number_alias .. [["]];
end end
--get the user_uuid --get the user_uuid
@@ -507,13 +505,13 @@ continue = true;
xml:append([[ <users>]]); xml:append([[ <users>]]);
if (number_alias) then if (number_alias) then
if (cidr) then if (cidr) then
xml:append([[ <user id="]] .. xml.sanitize(extension) .. [["]] .. xml.sanitize(cidr) .. xml.sanitize(number_alias_string) .. [[ type=>]]); xml:append([[ <user id="]] .. xml.sanitize(extension) .. [[" cidr="]] .. xml.sanitize(cidr) .. [[" number-alias="]] .. xml.sanitize(number_alias) .. [[" type="">]]);
else else
xml:append([[ <user id="]] .. xml.sanitize(extension) .. [["]] .. xml.sanitize(number_alias_string) .. [[>]]); xml:append([[ <user id="]] .. xml.sanitize(extension) .. [[" number-alias="]] .. xml.sanitize(number_alias) .. [[">]]);
end end
else else
if (cidr) then if (cidr) then
xml:append([[ <user id="]] .. xml.sanitize(extension) .. [["]] .. cidr .. [[>]]); xml:append([[ <user id="]] .. xml.sanitize(extension) .. [[" cidr="]] .. cidr .. [[">]]);
else else
xml:append([[ <user id="]] .. xml.sanitize(extension) .. [[">]]); xml:append([[ <user id="]] .. xml.sanitize(extension) .. [[">]]);
end end