diff --git a/app/xml_cdr/v_xml_cdr_import.php b/app/xml_cdr/v_xml_cdr_import.php index 6e0a663c01..8903dbfdc8 100644 --- a/app/xml_cdr/v_xml_cdr_import.php +++ b/app/xml_cdr/v_xml_cdr_import.php @@ -80,10 +80,10 @@ global $debug; //fix the xml by escaping the contents of - $xml_string = preg_replace_callback("/<([^><]+)>(.*?[><].*?)<\/\g1>/", + $xml_string = preg_replace_callback("/<([^><]+)>(.*?[><].*?)<\/\g1>/", function ($matches) { return '<' . $matches[1] . '>' . - str_replace(">", ">", + str_replace(">", ">", str_replace("<", "<", $matches[2]) ) . ''; diff --git a/app/xml_cdr/xml_cdr_import_update.php b/app/xml_cdr/xml_cdr_import_update.php index 13b896a441..03c25b0f49 100644 --- a/app/xml_cdr/xml_cdr_import_update.php +++ b/app/xml_cdr/xml_cdr_import_update.php @@ -82,7 +82,7 @@ $db->beginTransaction(); //reset the count $x = 0; - } + } //parse the xml to get the call detail record info try { $xml = simplexml_load_string($xml_string); @@ -101,14 +101,14 @@ echo $sql."\n"; $db->exec($sql); $x++; - } + } } //save the transaction $db->commit(); //echo finished echo "completed\n"; } - if ($xml_cdr_archive == "dir") { + if ($xml_cdr_archive == "dir") { $xml_cdr_list = glob($_SESSION['switch']['log']['dir']."/xml_cdr/archive/*/*/*/*.xml"); echo "count: ".count($xml_cdr_list)."\n"; //print_r($xml_cdr_list); diff --git a/app/xml_cdr/xml_cdr_statistics_inc.php b/app/xml_cdr/xml_cdr_statistics_inc.php index c6d48c64a2..a5f4869b35 100644 --- a/app/xml_cdr/xml_cdr_statistics_inc.php +++ b/app/xml_cdr/xml_cdr_statistics_inc.php @@ -125,7 +125,7 @@ else { } else { $mos_comparison = ''; } - //$mos_comparison = check_str($_REQUEST["mos_comparison"]); + //$mos_comparison = check_str($_REQUEST["mos_comparison"]); $mos_score = check_str($_REQUEST["mos_score"]); }