From 1c6ffe09dd3a4e7be120a3fd261a9c6c8f1dddf7 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 27 May 2019 20:00:19 -0600 Subject: [PATCH] Update access_controls.php --- app/access_controls/access_controls.php | 46 ++++++++++--------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/app/access_controls/access_controls.php b/app/access_controls/access_controls.php index 9de71000da..0a10177c2a 100644 --- a/app/access_controls/access_controls.php +++ b/app/access_controls/access_controls.php @@ -48,24 +48,24 @@ //validate the order switch ($order) { - case 'asc': - break; - case 'desc': - break; - default: - $order = ''; + case 'asc': + break; + case 'desc': + break; + default: + $order = ''; } //validate the order by switch ($order_by) { - case 'access_control_name': - break; - case 'access_control_default': - break; - case 'access_control_description': - break; - default: - $order_by = ''; + case 'access_control_name': + break; + case 'access_control_default': + break; + case 'access_control_description': + break; + default: + $order_by = ''; } //additional includes @@ -75,17 +75,9 @@ //prepare to page the results $sql = "select count(*) as num_rows from v_access_controls "; if (strlen($order_by) > 0) { $sql .= "order by $order_by $order "; } - $prep_statement = $db->prepare($sql); - if ($prep_statement) { - $prep_statement->execute(); - $row = $prep_statement->fetch(PDO::FETCH_ASSOC); - if ($row['num_rows'] > 0) { - $num_rows = $row['num_rows']; - } - else { - $num_rows = '0'; - } - } + $parameters = null; + $database = new database; + $num_rows = $database->select($sql, $parameters, 'column'); //prepare to page the results $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; @@ -99,10 +91,10 @@ $sql = "select * from v_access_controls "; if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } $sql .= "limit :rows_per_page offset :offset "; - $database = new database; $parameters['rows_per_page'] = $rows_per_page; $parameters['offset'] = $offset; - $access_controls = $database->execute($sql, $parameters); + $database = new database; + $access_controls = $database->select($sql, $parameters, 'all'); //alternate the row style $c = 0;