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

More work on the search

This commit is contained in:
Mark Crane 2014-05-02 08:32:44 +00:00
parent 3ace825eb6
commit 0896efe4cf
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/destinations/destinations.php
View File

@ -79,13 +79,15 @@ require_once "resources/paging.php";
//prepare to page the results //prepare to page the results
$sql = " select count(*) as num_rows from v_destinations "; $sql = " select count(*) as num_rows from v_destinations ";
$sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "where domain_uuid = '$domain_uuid' ";
$sql .= "and ("; if (strlen($search) > 0) {
$sql .= " destination_type = '".$search."' "; $sql .= "and (";
$sql .= " or destination_number = '".$search."' "; $sql .= " destination_type = '".$search."' ";
$sql .= " or destination_context = '".$search."' "; $sql .= " or destination_number = '".$search."' ";
$sql .= " or destination_enabled = '".$search."' "; $sql .= " or destination_context = '".$search."' ";
$sql .= " or destination_description = '".$search."' "; $sql .= " or destination_enabled = '".$search."' ";
$sql .= ") "; $sql .= " or destination_description = '".$search."' ";
$sql .= ") ";
}
if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
$prep_statement = $db->prepare($sql); $prep_statement = $db->prepare($sql);
if ($prep_statement) { if ($prep_statement) {
@ -110,14 +112,16 @@ require_once "resources/paging.php";
//get the list //get the list
$sql = "select * from v_destinations "; $sql = "select * from v_destinations ";
$sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "where domain_uuid = '$domain_uuid' ";
$sql .= "and ("; if (strlen($search) > 0) {
$sql .= " destination_type = '".$search."' "; $sql .= "and (";
$sql .= " or destination_number = '".$search."' "; $sql .= " destination_type = '".$search."' ";
$sql .= " or destination_context = '".$search."' "; $sql .= " or destination_number = '".$search."' ";
$sql .= " or destination_enabled = '".$search."' "; $sql .= " or destination_context = '".$search."' ";
$sql .= " or destination_description = '".$search."' "; $sql .= " or destination_enabled = '".$search."' ";
$sql .= ") "; $sql .= " or destination_description = '".$search."' ";
if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } $sql .= ") ";
}
if (strlen($order_by) > 0) { $sql .= "order by $order_by $order "; }
$sql .= "limit $rows_per_page offset $offset "; $sql .= "limit $rows_per_page offset $offset ";
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();

29
app/extensions/extensions.php
View File

@ -78,12 +78,14 @@ require_once "resources/paging.php";
//get the number of extensions //get the number of extensions
$sql = "select count(*) as num_rows from v_extensions "; $sql = "select count(*) as num_rows from v_extensions ";
$sql .= "where domain_uuid = '".$domain_uuid."' "; $sql .= "where domain_uuid = '".$domain_uuid."' ";
$sql .= "and ("; if (strlen($search) > 0) {
$sql .= " extension = '".$search."' "; $sql .= "and (";
$sql .= " or call_group = '".$search."' "; $sql .= " extension = '".$search."' ";
$sql .= " or enabled = '".$search."' "; $sql .= " or call_group = '".$search."' ";
$sql .= " or description = '".$search."' "; $sql .= " or enabled = '".$search."' ";
$sql .= ") "; $sql .= " or description = '".$search."' ";
$sql .= ") ";
}
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
if ($prep_statement) { if ($prep_statement) {
$prep_statement->execute(); $prep_statement->execute();
@ -108,13 +110,14 @@ require_once "resources/paging.php";
//get the extensions //get the extensions
$sql = "select * from v_extensions "; $sql = "select * from v_extensions ";
$sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "where domain_uuid = '$domain_uuid' ";
$sql .= "and ("; if (strlen($search) > 0) {
$sql .= " extension = '".$search."' "; $sql .= "and (";
$sql .= " or call_group = '".$search."' "; $sql .= " extension = '".$search."' ";
$sql .= " or enabled = '".$search."' "; $sql .= " or call_group = '".$search."' ";
$sql .= " or description = '".$search."' "; $sql .= " or enabled = '".$search."' ";
$sql .= ") "; $sql .= " or description = '".$search."' ";
$sql .= "and (moderator_pin = '".$search."' or participant_pin = '".$search."') "; $sql .= ") ";
}
if (isset($order_by)) { if (isset($order_by)) {
$sql .= "order by $order_by $order "; $sql .= "order by $order_by $order ";
} }