From d648674f65ca5200ed78145974b756b801169ea9 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Fri, 2 May 2014 09:11:52 +0000 Subject: [PATCH] Add a search for app -> voicemails --- app/voicemails/app_languages.php | 5 +++++ app/voicemails/voicemails.php | 36 ++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/app/voicemails/app_languages.php b/app/voicemails/app_languages.php index 839bd688d6..3d01ffafc4 100644 --- a/app/voicemails/app_languages.php +++ b/app/voicemails/app_languages.php @@ -191,6 +191,11 @@ $text['button-back']['pt-pt'] = "Voltar"; $text['button-back']['fr-fr'] = "Retour"; + $text['button-search']['en-us'] = "Search"; + $text['button-search']['es-cl'] = "Buscar"; + $text['button-search']['pt-pt'] = "Pesquisar"; + $text['button-search']['fr-fr'] = "Chercher"; + $text['confirm-delete']['en-us'] = "Do you really want to delete this?"; $text['confirm-delete']['es-cl'] = "¿Realmente desea eliminar esto?"; $text['confirm-delete']['pt-pt'] = "Tem a certeza que pretende remover isto?"; diff --git a/app/voicemails/voicemails.php b/app/voicemails/voicemails.php index 84537f7f1c..2e3e88ce19 100644 --- a/app/voicemails/voicemails.php +++ b/app/voicemails/voicemails.php @@ -44,9 +44,12 @@ else { $voicemail_ids[]['voicemail_id'] = $value['user']; } -//get variables used to control the order - $order_by = $_GET["order_by"]; - $order = $_GET["order"]; +//get the http values and set them as variables + $search = check_str($_GET["search"]); + if (isset($_GET["order_by"])) { + $order_by = check_str($_GET["order_by"]); + $order = check_str($_GET["order"]); + } //additional includes require_once "resources/header.php"; @@ -62,7 +65,12 @@ else { echo "\n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo "
".$text['title-voicemails']." 
\n"; + echo " "; + echo " "; + echo "
\n"; @@ -74,6 +82,16 @@ else { //prepare to page the results $sql = "select count(*) as num_rows from v_voicemails "; $sql .= "where domain_uuid = '$domain_uuid' "; + if (strlen($search) > 0) { + $sql .= "and ("; + $sql .= " voicemail_id like '%".$search."%' "; + $sql .= " or voicemail_mail_to like '%".$search."%' "; + $sql .= " or voicemail_attach_file like '%".$search."%' "; + $sql .= " or voicemail_local_after_email like '%".$search."%' "; + $sql .= " or voicemail_enabled like '%".$search."%' "; + $sql .= " or voicemail_description like '%".$search."%' "; + $sql .= ") "; + } if (!permission_exists('voicemail_delete')) { $x = 0; if (count($voicemail_ids) > 0) { @@ -114,6 +132,16 @@ else { //get the list $sql = "select * from v_voicemails "; $sql .= "where domain_uuid = '$domain_uuid' "; + if (strlen($search) > 0) { + $sql .= "and ("; + $sql .= " voicemail_id like '%".$search."%' "; + $sql .= " or voicemail_mail_to like '%".$search."%' "; + $sql .= " or voicemail_attach_file like '%".$search."%' "; + $sql .= " or voicemail_local_after_email like '%".$search."%' "; + $sql .= " or voicemail_enabled like '%".$search."%' "; + $sql .= " or voicemail_description like '%".$search."%' "; + $sql .= ") "; + } if (!permission_exists('voicemail_delete')) { $x = 0; if (count($voicemail_ids) > 0) {