diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php index 6e7dad1774..1e57575810 100644 --- a/app/xml_cdr/app_languages.php +++ b/app/xml_cdr/app_languages.php @@ -615,6 +615,17 @@ $text['label-network_addr']['uk'] = ""; $text['label-network_addr']['de-at'] = "Netzwerk Adresse"; $text['label-network_addr']['he'] = "כתובת רשת"; +$text['label-mos_score']['en-us'] = "MOS Score"; +$text['label-mos_score']['es-cl'] = ""; +$text['label-mos_score']['pt-pt'] = ""; +$text['label-mos_score']['fr-fr'] = ""; +$text['label-mos_score']['pt-br'] = ""; +$text['label-mos_score']['pl'] = ""; +$text['label-mos_score']['sv-se'] = ""; +$text['label-mos_score']['uk'] = ""; +$text['label-mos_score']['de-at'] = ""; +$text['label-mos_score']['he'] = ""; + $text['label-name']['en-us'] = "Name"; $text['label-name']['es-cl'] = "Nombre"; $text['label-name']['pt-pt'] = "Nome"; diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php index 911c94f92c..2fc5daf1f8 100644 --- a/app/xml_cdr/xml_cdr_inc.php +++ b/app/xml_cdr/xml_cdr_inc.php @@ -74,8 +74,36 @@ else { $bridge_uuid = check_str($_REQUEST["network_addr"]); $order_by = check_str($_REQUEST["order_by"]); $order = check_str($_REQUEST["order"]); + if (strlen(check_str($_REQUEST["mos_comparison"])) > 0) { + switch(check_str($_REQUEST["mos_comparison"])) { + case 'less': + $mos_comparison = "<"; + break; + case 'greater': + $mos_comparison = ">"; + break; + case 'lessorequal': + $mos_comparison = "<="; + break; + case 'greaterorequal': + $mos_comparison = ">="; + break; + case 'equal': + $mos_comparison = "<"; + break; + case 'notequal': + $mos_comparison = "<>"; + break; + } + } else { + $mos_comparison = ''; + } + //$mos_comparison = check_str($_REQUEST["mos_comparison"]); + $mos_score = check_str($_REQUEST["mos_score"]); } + + //build the sql where string if ($missed == true) { $sql_where_ands[] = "billsec = '0'"; @@ -126,6 +154,7 @@ else { if (strlen($write_codec) > 0) { $sql_where_ands[] = "write_codec like '%".$write_codec."%'"; } if (strlen($remote_media_ip) > 0) { $sql_where_ands[] = "remote_media_ip like '%".$remote_media_ip."%'"; } if (strlen($network_addr) > 0) { $sql_where_ands[] = "network_addr like '%".$network_addr."%'"; } + if (strlen($mos_comparison) > 0 && strlen($mos_score) > 0 ) { $sql_where_ands[] = "rtp_audio_in_mos " . $mos_comparison . " ".$mos_score.""; } //if not admin or superadmin, only show own calls if (!permission_exists('xml_cdr_domain')) { @@ -201,6 +230,9 @@ else { $param .= "&remote_media_ip=".$remote_media_ip; $param .= "&network_addr=".$network_addr; $param .= "&bridge_uuid=".$bridge_uuid; + $param .= "&mos_comparison=".$mos_comparison; + $param .= "&mos_score=".$mos_score; + if ($_GET['showall'] && permission_exists('xml_cdr_all')) { $param .= "&showall=" . $_GET['showall']; } @@ -297,6 +329,7 @@ else { else { $sql .= " limit ".$rows_per_page." offset ".$offset." "; } + $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); $result = $prep_statement->fetchAll(PDO::FETCH_ASSOC); diff --git a/app/xml_cdr/xml_cdr_search.php b/app/xml_cdr/xml_cdr_search.php index e61e247ed8..50c6e809f8 100644 --- a/app/xml_cdr/xml_cdr_search.php +++ b/app/xml_cdr/xml_cdr_search.php @@ -53,7 +53,7 @@ echo " if ($('#caller_id_number').is(':visible')) { $('#caller_id_number').foc echo " }"; echo " }"; echo ""; - + echo "
\n"; echo "\n"; @@ -203,6 +203,20 @@ echo " "; echo " "; echo " "; echo " "; +echo " "; +echo " "; +echo " "; +echo " "; echo " "; echo " "; echo "
".$text['label-network_addr']."
".$text['label-mos_score'].""; +echo " \n"; +echo "

"; diff --git a/app/xml_cdr/xml_cdr_statistics.php b/app/xml_cdr/xml_cdr_statistics.php index c274f921ab..a68fab51af 100644 --- a/app/xml_cdr/xml_cdr_statistics.php +++ b/app/xml_cdr/xml_cdr_statistics.php @@ -43,6 +43,11 @@ else { require_once "resources/header.php"; //page title and description + + echo ""; + echo " "; + echo " "; + echo " "; echo "\n"; echo "\n"; echo " \n"; @@ -65,6 +70,26 @@ else { echo " \n"; echo "\n"; echo "
".$text['label-call-statistics']."
\n"; +#CJB +/* echo "\n"; + echo "\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo ""; + echo " \n"; + echo "
\n"; + echo " ".$text['label-start_range']."\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " "; + echo "\n"; + echo "\n"; + echo "
\n"; + echo "
"; +*/ +#CJB //set the style $c = 0; diff --git a/app/xml_cdr/xml_cdr_statistics_inc.php b/app/xml_cdr/xml_cdr_statistics_inc.php index 7dfc6fc2b2..dab016fe17 100644 --- a/app/xml_cdr/xml_cdr_statistics_inc.php +++ b/app/xml_cdr/xml_cdr_statistics_inc.php @@ -141,9 +141,15 @@ else { //$call_seconds_1st_hour = get_call_seconds_between(3600, 0); //if (strlen($call_seconds_1st_hour) == 0) { $call_seconds_1st_hour = 0; } -//round down to the nearest hour - $time = time() - time() % 3600; - +// if (strlen(check_str($_GET['start_stamp_begin'])) > 0 && strlen(check_str($_GET['start_stamp_end'])) > 0 ) { +// $start_date = new DateTime(check_str($_GET['start_stamp_begin'])); +// $end_date = new DateTime(check_str($_GET['start_stamp_end'])); +// $time = $start_date->getTimestamp(); +// } else { + //round down to the nearest hour + $time = time() - time() % 3600; +// } + //call info hour by hour for ($i = 0; $i <= 23; $i++) { $start_epoch = $time - 3600*$i;