From c16dbb5f6c46a615b28f8de3be70f75aae401a82 Mon Sep 17 00:00:00 2001 From: AlexanderDCrane <40072887+AlexanderDCrane@users.noreply.github.com> Date: Tue, 28 May 2019 15:08:33 -0600 Subject: [PATCH 1/2] Update call_center_queue.php --- app/call_center_active/call_center_queue.php | 41 +++++++++++++------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/app/call_center_active/call_center_queue.php b/app/call_center_active/call_center_queue.php index 2c8ee41822..c94e09e53b 100644 --- a/app/call_center_active/call_center_queue.php +++ b/app/call_center_active/call_center_queue.php @@ -50,6 +50,21 @@ $order_by = $_GET["order_by"]; $order = $_GET["order"]; +//validate order by + if (strlen($order_by) > 0) { + $order_by = preg_replace('#[^a-zA-Z0-9_\-]#', '', $order_by); + } + +//validate the order + switch ($order) { + case 'asc': + break; + case 'desc': + break; + default: + $order = ''; + } + //show the content echo "\n"; echo "\n"; @@ -66,13 +81,12 @@ //get the call center queue count $sql = "select * from v_call_center_queues "; - $sql .= "where domain_uuid = '$domain_uuid' "; + $sql .= "where domain_uuid = :domain_uuid "; if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } - $prep_statement = $db->prepare(check_sql($sql)); - $prep_statement->execute(); - $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); - $num_rows = count($result); - unset ($prep_statement, $result, $sql); + $database = new database; + $parameters['domain_uuid'] = $domain_uuid; + $result = $database->select($sql, $parameters, 'all'); + $num_rows = $database->select($sql, $parameters, 'column'); $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; @@ -82,14 +96,15 @@ //get the call center queues $sql = "select * from v_call_center_queues "; - $sql .= "where domain_uuid = '$domain_uuid' "; + $sql .= "where domain_uuid = :domain_uuid "; if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } - $sql .= " limit $rows_per_page offset $offset "; - $prep_statement = $db->prepare(check_sql($sql)); - $prep_statement->execute(); - $call_center_queues = $prep_statement->fetchAll(PDO::FETCH_NAMED); - $num_rows = count($call_center_queues); - unset ($prep_statement, $sql); + $sql .= " limit :rows_per_page offset :offset "; + $database = new database; + $parameters['domain_uuid'] = $domain_uuid; + $parameters['rows_per_page'] = $rows_per_page; + $parameters['offset'] = $offset; + $call_center_queues = $database->select($sql, $parameters, 'all'); + $num_rows = $database->select($sql, $parameters, 'column'); $c = 0; $row_style["0"] = "row_style0"; From e63a6c3878bb1972ca229abf1a52e6d7998fbc38 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 28 May 2019 15:14:22 -0600 Subject: [PATCH 2/2] Update call_center_queue.php --- app/call_center_active/call_center_queue.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/call_center_active/call_center_queue.php b/app/call_center_active/call_center_queue.php index c94e09e53b..07505073a9 100644 --- a/app/call_center_active/call_center_queue.php +++ b/app/call_center_active/call_center_queue.php @@ -63,7 +63,7 @@ break; default: $order = ''; - } + } //show the content echo "
\n"; @@ -80,13 +80,14 @@ echo "
\n"; //get the call center queue count - $sql = "select * from v_call_center_queues "; + $sql = "select count(*) from v_call_center_queues "; $sql .= "where domain_uuid = :domain_uuid "; if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } $database = new database; $parameters['domain_uuid'] = $domain_uuid; - $result = $database->select($sql, $parameters, 'all'); $num_rows = $database->select($sql, $parameters, 'column'); + + //paging the records $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page'];