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

Fix the column sorting on the fax list.

This commit is contained in:
Mark Crane 2014-02-06 05:45:36 +00:00
parent 542bf10bb0
commit d81f46b9db
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/fax/fax.php
View File

@ -77,7 +77,6 @@ require_once "resources/paging.php";
$sql .= "and f.domain_uuid = '".$_SESSION['domain_uuid']."' "; $sql .= "and f.domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and u.user_uuid = '".$_SESSION['user_uuid']."' "; $sql .= "and u.user_uuid = '".$_SESSION['user_uuid']."' ";
} }
$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();
@ -101,8 +100,8 @@ require_once "resources/paging.php";
if (if_group("superadmin") || if_group("admin")) { if (if_group("superadmin") || if_group("admin")) {
//show all fax extensions //show all fax extensions
$sql = "select * from v_fax "; $sql = "select * from v_fax ";
$sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "order by fax_name asc "; if (strlen($order_by) == 0) { $sql .= "order by fax_name asc "; }
} }
else { else {
//show only assigned fax extensions //show only assigned fax extensions
@ -110,9 +109,11 @@ require_once "resources/paging.php";
$sql .= "where f.fax_uuid = u.fax_uuid "; $sql .= "where f.fax_uuid = u.fax_uuid ";
$sql .= "and f.domain_uuid = '".$_SESSION['domain_uuid']."' "; $sql .= "and f.domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and u.user_uuid = '".$_SESSION['user_uuid']."' "; $sql .= "and u.user_uuid = '".$_SESSION['user_uuid']."' ";
$sql .= "order by f.fax_name asc "; if (strlen($order_by) == 0) { $sql .= "order by f.fax_name asc "; }
}
if (strlen($order_by) > 0) {
$sql .= "order by $order_by $order ";
} }
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();