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

[4.5] Fix CDR Details (#4052)

Browse Source 
Same as 4.4
This commit is contained in:
Luis Daniel Lucio Quiroz
2019-04-18 11:58:34 -06:00
committed by FusionPBX
parent 266d53ddb5
commit f3b67dcee2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/xml_cdr/xml_cdr_details.php
+5 -1
View File
@@ -69,7 +69,7 @@
} }
//get cdr from the file system //get cdr from the file system
if ($format != "xml" || $format != "json") { if ($format != "xml" && $format != "json") {
$tmp_time = strtotime($start_stamp); $tmp_time = strtotime($start_stamp);
$tmp_year = date("Y", $tmp_time); $tmp_year = date("Y", $tmp_time);
$tmp_month = date("M", $tmp_time); $tmp_month = date("M", $tmp_time);
@@ -89,6 +89,10 @@
try { try {
if ($format == 'json') { if ($format == 'json') {
$array = json_decode($json_string,true); $array = json_decode($json_string,true);
if (is_null($array)){
$j = stripslashes($json_string);
$array = json_decode($j,true);
}
} }
if ($format == 'xml') { if ($format == 'xml') {
$array = json_decode(json_encode((array)simplexml_load_string($xml_string)),true); $array = json_decode(json_encode((array)simplexml_load_string($xml_string)),true);