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

Add source_number and change the destination_number to the number sent to the carrier.

This commit is contained in:
markjcrane 2016-05-11 16:23:42 -06:00
parent b27b11fe40
commit e1f0c205c7
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/xml_cdr/app_config.php
View File

@ -142,6 +142,10 @@
$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'] = ""; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
$z++; $z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = "source_number";
$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = "destination_number"; $apps[$x]['db'][$y]['fields'][$z]['name'] = "destination_number";
$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'] = ""; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";

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

@ -94,6 +94,7 @@ if (!class_exists('xml_cdr')) {
$this->fields[] = "caller_id_name"; $this->fields[] = "caller_id_name";
$this->fields[] = "caller_id_number"; $this->fields[] = "caller_id_number";
$this->fields[] = "destination_number"; $this->fields[] = "destination_number";
$this->fields[] = "source_number";
$this->fields[] = "start_epoch"; $this->fields[] = "start_epoch";
$this->fields[] = "start_stamp"; $this->fields[] = "start_stamp";
$this->fields[] = "answer_stamp"; $this->fields[] = "answer_stamp";
@ -220,6 +221,22 @@ if (!class_exists('xml_cdr')) {
//misc //misc
$uuid = check_str(urldecode($xml->variables->uuid)); $uuid = check_str(urldecode($xml->variables->uuid));
$this->array[$row]['uuid'] = $uuid; $this->array[$row]['uuid'] = $uuid;
if ($xml->variables->current_application == "bridge") {
$current_application_data = urldecode($xml->variables->current_application_data);
$bridge_array = explode("/", current_application_data);
$destination_number = end($bridge_array);
}
else {
$destination_number = urldecode($xml->variables->callee_id_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]['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]['caller_id_name'] = check_str(urldecode($xml->variables->effective_caller_id_number));
$this->array[$row]['caller_id_number'] = check_str(urldecode($xml->variables->effective_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));
$this->array[$row]['bridge_uuid'] = check_str(urldecode($xml->variables->bridge_uuid)); $this->array[$row]['bridge_uuid'] = check_str(urldecode($xml->variables->bridge_uuid));
@ -268,21 +285,6 @@ if (!class_exists('xml_cdr')) {
$this->array[$row]['rtp_audio_in_mos'] = $rtp_audio_in_mos; $this->array[$row]['rtp_audio_in_mos'] = $rtp_audio_in_mos;
} }
//get the values from the callflow.
$x = 0;
if (isset($xml->callflow)) foreach ($xml->callflow as $callflow) {
if ($x == 0) {
$context = check_str(urldecode($callflow->caller_profile->context));
$this->array[$row]['destination_number'] = check_str(urldecode($callflow->caller_profile->destination_number));
$this->array[$row]['context'] = $context;
$this->array[$row]['network_addr'] = check_str(urldecode($callflow->caller_profile->network_addr));
}
$this->array[$row]['caller_id_name'] = check_str(urldecode($callflow->caller_profile->caller_id_name));
$this->array[$row]['caller_id_number'] = check_str(urldecode($callflow->caller_profile->caller_id_number));
$x++;
}
unset($x);
//store the call leg //store the call leg
$this->array[$row]['leg'] = $leg; $this->array[$row]['leg'] = $leg;