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

Add emergency caller id name to the extension xml and to xml handler.

This commit is contained in:
Mark Crane 2014-05-01 04:59:33 +00:00
parent c56a551d35
commit 5e0eb315f8
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/extensions/resources/classes/extension.php
View File

@ -42,6 +42,7 @@
public $effective_caller_id_number; public $effective_caller_id_number;
public $outbound_caller_id_name; public $outbound_caller_id_name;
public $outbound_caller_id_number; public $outbound_caller_id_number;
public $emergency_caller_id_name;
public $emergency_caller_id_number; public $emergency_caller_id_number;
public $directory_full_name; public $directory_full_name;
public $directory_visible; public $directory_visible;
@ -311,6 +312,9 @@
if (strlen($row['outbound_caller_id_number']) > 0) { if (strlen($row['outbound_caller_id_number']) > 0) {
$xml .= " <variable name=\"outbound_caller_id_number\" value=\"" . $row['outbound_caller_id_number'] . "\"/>\n"; $xml .= " <variable name=\"outbound_caller_id_number\" value=\"" . $row['outbound_caller_id_number'] . "\"/>\n";
} }
if (strlen($row['emergency_caller_id_name']) > 0) {
$xml .= " <variable name=\"emergency_caller_id_name\" value=\"" . $row['emergency_caller_id_name'] . "\"/>\n";
}
if (strlen($row['emergency_caller_id_number']) > 0) { if (strlen($row['emergency_caller_id_number']) > 0) {
$xml .= " <variable name=\"emergency_caller_id_number\" value=\"" . $row['emergency_caller_id_number'] . "\"/>\n"; $xml .= " <variable name=\"emergency_caller_id_number\" value=\"" . $row['emergency_caller_id_number'] . "\"/>\n";
} }

5
resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua
View File

@ -232,6 +232,7 @@
effective_caller_id_number = row.effective_caller_id_number; effective_caller_id_number = row.effective_caller_id_number;
outbound_caller_id_name = row.outbound_caller_id_name; outbound_caller_id_name = row.outbound_caller_id_name;
outbound_caller_id_number = row.outbound_caller_id_number; outbound_caller_id_number = row.outbound_caller_id_number;
emergency_caller_id_name = row.emergency_caller_id_name;
emergency_caller_id_number = row.emergency_caller_id_number; emergency_caller_id_number = row.emergency_caller_id_number;
directory_full_name = row.directory_full_name; directory_full_name = row.directory_full_name;
directory_visible = row.directory_visible; directory_visible = row.directory_visible;
@ -300,6 +301,7 @@
effective_caller_id_number = row.effective_caller_id_number; effective_caller_id_number = row.effective_caller_id_number;
outbound_caller_id_name = row.outbound_caller_id_name; outbound_caller_id_name = row.outbound_caller_id_name;
outbound_caller_id_number = row.outbound_caller_id_number; outbound_caller_id_number = row.outbound_caller_id_number;
emergency_caller_id_name = row.emergency_caller_id_name;
emergency_caller_id_number = row.emergency_caller_id_number; emergency_caller_id_number = row.emergency_caller_id_number;
directory_full_name = row.directory_full_name; directory_full_name = row.directory_full_name;
directory_visible = row.directory_visible; directory_visible = row.directory_visible;
@ -389,6 +391,9 @@
if (string.len(outbound_caller_id_number) > 0) then if (string.len(outbound_caller_id_number) > 0) then
table.insert(xml, [[ <variable name="outbound_caller_id_number" value="]] .. outbound_caller_id_number .. [["/>]]); table.insert(xml, [[ <variable name="outbound_caller_id_number" value="]] .. outbound_caller_id_number .. [["/>]]);
end end
if (string.len(emergency_caller_id_name) > 0) then
table.insert(xml, [[ <variable name="emergency_caller_id_name" value="]] .. emergency_caller_id_name .. [["/>]]);
end
if (string.len(emergency_caller_id_number) > 0) then if (string.len(emergency_caller_id_number) > 0) then
table.insert(xml, [[ <variable name="emergency_caller_id_number" value="]] .. emergency_caller_id_number .. [["/>]]); table.insert(xml, [[ <variable name="emergency_caller_id_number" value="]] .. emergency_caller_id_number .. [["/>]]);
end end