nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Additional work on caller id name and number.

Browse Source
This commit is contained in:
markjcrane
2016-05-11 18:37:01 -06:00
parent 63384b3aa1
commit dabdbbeb95
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/xml_cdr/resources/classes/xml_cdr.php
View File

@@ -218,10 +218,7 @@ if (!class_exists('xml_cdr')) {
//$this->log("\nfail loadxml: " . $e->getMessage() . "\n"); //$this->log("\nfail loadxml: " . $e->getMessage() . "\n");
} }
//misc //get the destination number
$uuid = check_str(urldecode($xml->variables->uuid));
$this->array[$row]['uuid'] = $uuid;
if ($xml->variables->current_application == "bridge") { if ($xml->variables->current_application == "bridge") {
$current_application_data = urldecode($xml->variables->current_application_data); $current_application_data = urldecode($xml->variables->current_application_data);
$bridge_array = explode("/", $current_application_data); $bridge_array = explode("/", $current_application_data);
@@ -234,12 +231,24 @@ if (!class_exists('xml_cdr')) {
else { else {
$destination_number = urldecode($xml->variables->sip_to_user); $destination_number = urldecode($xml->variables->sip_to_user);
} }
//get the caller id
$caller_id_name = urldecode($xml->variables->effective_caller_id_name);
$caller_id_number = urldecode($xml->variables->effective_caller_id_number);
if (strlen($caller_id_number) == 0) foreach ($xml->callflow as $row) {
$caller_id_name = urldecode($row->caller_profile->caller_id_name);
$caller_id_number = urldecode($row->caller_profile->caller_id_number);
}
//misc
$uuid = check_str(urldecode($xml->variables->uuid));
$this->array[$row]['uuid'] = $uuid;
$this->array[$row]['destination_number'] = check_str($destination_number); $this->array[$row]['destination_number'] = check_str($destination_number);
$this->array[$row]['source_number'] = check_str(urldecode($xml->variables->effective_caller_id_number)); $this->array[$row]['source_number'] = check_str(urldecode($xml->variables->effective_caller_id_number));
$this->array[$row]['user_context'] = check_str(urldecode($xml->variables->user_context)); $this->array[$row]['user_context'] = check_str(urldecode($xml->variables->user_context));
$this->array[$row]['network_addr'] = check_str(urldecode($xml->variables->sip_network_ip)); $this->array[$row]['network_addr'] = check_str(urldecode($xml->variables->sip_network_ip));
$this->array[$row]['caller_id_name'] = check_str(urldecode($xml->variables->effective_caller_id_number)); $this->array[$row]['caller_id_name'] = check_str($caller_id_name);
$this->array[$row]['caller_id_number'] = check_str(urldecode($xml->variables->effective_caller_id_number)); $this->array[$row]['caller_id_number'] = check_str($caller_id_number));
$this->array[$row]['accountcode'] = check_str(urldecode($xml->variables->accountcode)); $this->array[$row]['accountcode'] = check_str(urldecode($xml->variables->accountcode));
$this->array[$row]['default_language'] = check_str(urldecode($xml->variables->default_language)); $this->array[$row]['default_language'] = check_str(urldecode($xml->variables->default_language));