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

Update ring_group_forward.php

Browse Source
This commit is contained in:
FusionPBX
2019-08-14 10:53:44 -06:00
committed by GitHub
parent 39047622ca
commit ea5977fd28
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/ring_groups/ring_group_forward.php
+11 -3
View File
@@ -100,7 +100,7 @@
} }
else { else {
//show only assigned ring groups //show only assigned ring groups
$sql = "select count(*) as num_rows from v_ring_groups as r, v_ring_group_users as u "; $sql = "select count(*) from v_ring_groups as r, v_ring_group_users as u ";
$sql .= "where r.ring_group_uuid = u.ring_group_uuid "; $sql .= "where r.ring_group_uuid = u.ring_group_uuid ";
$sql .= "and r.domain_uuid = :domain_uuid "; $sql .= "and r.domain_uuid = :domain_uuid ";
$sql .= "and u.user_uuid = :user_uuid "; $sql .= "and u.user_uuid = :user_uuid ";
@@ -109,6 +109,7 @@
} }
$database = new database; $database = new database;
$num_rows = $database->select($sql, $parameters, 'column'); $num_rows = $database->select($sql, $parameters, 'column');
unset($parameters);
//prepare to page the results //prepare to page the results
$rows_per_page = $is_included ? 10 : (is_numeric($_SESSION['domain']['paging']['numeric']) ? $_SESSION['domain']['paging']['numeric'] : 50); $rows_per_page = $is_included ? 10 : (is_numeric($_SESSION['domain']['paging']['numeric']) ? $_SESSION['domain']['paging']['numeric'] : 50);
@@ -121,11 +122,17 @@
//get the list //get the list
if (permission_exists('ring_group_add') || permission_exists('ring_group_edit')) { if (permission_exists('ring_group_add') || permission_exists('ring_group_edit')) {
//show all ring groups //show all ring groups
$sql .= str_replace('count(*)', '*', $sql); $sql = "select * from v_ring_groups ";
$sql .= "where domain_uuid = :domain_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
} }
else { else {
//show only assigned ring groups //show only assigned ring groups
$sql .= str_replace('count(*)', 'r.ring_group_name, r.ring_group_uuid, r.ring_group_extension, r.ring_group_forward_destination, r.ring_group_forward_enabled, r.ring_group_description', $sql); $sql = "select r.ring_group_name, r.ring_group_uuid, r.ring_group_extension, r.ring_group_forward_destination, r.ring_group_forward_enabled, r.ring_group_description from v_ring_groups as r, v_ring_group_users as u ";
$sql .= "where r.ring_group_uuid = u.ring_group_uuid ";
$sql .= "and r.domain_uuid = :domain_uuid ";
$sql .= "and u.user_uuid = :user_uuid ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
} }
$sql .= order_by($order_by, $order, 'ring_group_extension', 'asc'); $sql .= order_by($order_by, $order, 'ring_group_extension', 'asc');
$sql .= limit_offset($rows_per_page, $offset); $sql .= limit_offset($rows_per_page, $offset);
@@ -196,4 +203,5 @@
if (!$is_included) { if (!$is_included) {
require_once "resources/footer.php"; require_once "resources/footer.php";
} }
?> ?>