From 9999b5b9bb7fc575d665f2bb7c3999b9fc55bd0b Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Fri, 2 May 2014 09:01:24 +0000 Subject: [PATCH] Add search to accounts -> devices --- app/devices/devices.php | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/app/devices/devices.php b/app/devices/devices.php index c1229e75db..747406a7ab 100644 --- a/app/devices/devices.php +++ b/app/devices/devices.php @@ -39,9 +39,12 @@ else { $text[$key] = $value[$_SESSION['domain']['language']['code']]; } -//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"; @@ -53,7 +56,12 @@ else { echo "\n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo "
".$text['header-devices']." 
\n"; + echo " "; + echo " "; + echo "
\n"; @@ -65,6 +73,16 @@ else { //prepare to page the results $sql = "select count(*) as num_rows from v_devices "; $sql .= "where (domain_uuid = '$domain_uuid' or domain_uuid is null) "; + if (strlen($search) > 0) { + $sql .= "and ("; + $sql .= " device_mac_address like '%".$search."%' "; + $sql .= " or device_label like '%".$search."%' "; + $sql .= " or device_vendor like '%".$search."%' "; + $sql .= " or device_provision_enable like '%".$search."%' "; + $sql .= " or device_template like '%".$search."%' "; + $sql .= " or device_description like '%".$search."%' "; + $sql .= ") "; + } //if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } $prep_statement = $db->prepare($sql); if ($prep_statement) { @@ -89,6 +107,16 @@ else { //get the list $sql = "select * from v_devices "; $sql .= "where (domain_uuid = '$domain_uuid' or domain_uuid is null) "; + if (strlen($search) > 0) { + $sql .= "and ("; + $sql .= " device_mac_address like '%".$search."%' "; + $sql .= " or device_label like '%".$search."%' "; + $sql .= " or device_vendor like '%".$search."%' "; + $sql .= " or device_provision_enable like '%".$search."%' "; + $sql .= " or device_template like '%".$search."%' "; + $sql .= " or device_description like '%".$search."%' "; + $sql .= ") "; + } if (strlen($order_by) == 0) { $sql .= "order by device_mac_address asc "; }