diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php index 4accc15726..6512eca4e0 100644 --- a/app/xml_cdr/app_languages.php +++ b/app/xml_cdr/app_languages.php @@ -25,6 +25,11 @@ $text['description-4']['pt-pt'] = "Veja as chamadas na lista ou descarregue-as como arquivo, separadas por vírgulas, usando o botão 'csv'."; $text['description-4']['fr-fr'] = "Ensuite visualisez les informations dans la liste ci-dessous, ou téléchargez les sous forme d'un fichier CSV."; + $text['description_search']['en-us'] = "Note: Source, Destination and Caller ID (CID) Name fields support the use of an asterisk (\"*\") as a wildcard character."; + $text['description_search']['es-cl'] = "Atención: Origen, Destino y el identificador de llamadas (CID) campos Nombre apoyan el uso de un asterisco (\"*\") como carácter comodín."; + $text['description_search']['pt-pt'] = "Atenção: origem, destino e identificação do chamador (CID) campos Nome apoiar o uso de um asterisco (\"*\") como um caractere curinga."; + $text['description_search']['fr-fr'] = "Attention: Source, Destination et identification de l'appelant (CID) champs Nom appuient l'utilisation de l'astérisque (\"*\") comme un caractère générique."; + $text['label-direction']['en-us'] = "Direction"; $text['label-direction']['es-cl'] = "Dirección"; $text['label-direction']['pt-pt'] = "Direção"; diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php index 5c193dae22..57351b4251 100644 --- a/app/xml_cdr/xml_cdr.php +++ b/app/xml_cdr/xml_cdr.php @@ -263,7 +263,10 @@ else { echo ""; echo ""; echo ""; - echo ""; + echo ""; + echo $text['description_search']; + echo ""; + echo ""; echo "\n"; echo "\n"; diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php index b23ef1b711..bc8ef7a6ef 100644 --- a/app/xml_cdr/xml_cdr_inc.php +++ b/app/xml_cdr/xml_cdr_inc.php @@ -80,9 +80,18 @@ else { } if (strlen($cdr_id) > 0) { $sql_where_ands[] = "cdr_id like '%".$cdr_id."%'"; } if (strlen($direction) > 0) { $sql_where_ands[] = "direction = '".$direction."'"; } - if (strlen($caller_id_name) > 0) { $sql_where_ands[] = "caller_id_name like '".$caller_id_name."'"; } - if (strlen($caller_id_number) > 0) { $sql_where_ands[] = "caller_id_number like '".$caller_id_number."'"; } - if (strlen($destination_number) > 0) { $sql_where_ands[] = "destination_number like '".$destination_number."'"; } + if (strlen($caller_id_name) > 0) { + $mod_caller_id_name = str_replace("*", "%", $caller_id_name); + $sql_where_ands[] = "caller_id_name like '".$mod_caller_id_name."'"; + } + if (strlen($caller_id_number) > 0) { + $mod_caller_id_number = str_replace("*", "%", $caller_id_number); + $sql_where_ands[] = "caller_id_number like '".$mod_caller_id_number."'"; + } + if (strlen($destination_number) > 0) { + $mod_destination_number = str_replace("*", "%", $destination_number); + $sql_where_ands[] = "destination_number like '".$mod_destination_number."'"; + } if (strlen($context) > 0) { $sql_where_ands[] = "context like '%".$context."%'"; } if ($db_type == "sqlite") { if (strlen($start_stamp) > 0) { $sql_where_ands[] = "start_stamp like '%".$start_stamp."%'"; }