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

Extensions - List: Minor adjustment to order by, remove deprecated method of natural_sort() integration.

This commit is contained in:
fusionate 2023-10-19 18:55:19 +00:00
parent 1b2bcf2719
commit 0e9fd9aaa6
No known key found for this signature in database
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/extensions/extensions.php
View File

@ -76,8 +76,9 @@
} }
//get order and order by //get order and order by
$order_by = $_GET["order_by"] ?? ''; $order_by = $_GET["order_by"] ?? 'extension';
$order = $_GET["order"] ?? ''; $order = $_GET["order"] ?? 'asc';
$sort = $order_by == 'extension' ? 'natural' : null;
//get total extension count for domain //get total extension count for domain
if (isset($_SESSION['limit']['extensions']['numeric'])) { if (isset($_SESSION['limit']['extensions']['numeric'])) {
@ -136,17 +137,7 @@
//get the extensions //get the extensions
$sql = str_replace('count(*)', '*', $sql); $sql = str_replace('count(*)', '*', $sql);
if ($order_by == '' || $order_by == 'extension') { $sql .= order_by($order_by, $order, null, null, $sort);
if ($db_type == 'pgsql') {
$sql .= 'order by natural_sort(extension) '.$order; //function in app_defaults.php
}
else {
$sql .= 'order by extension '.$order;
}
}
else {
$sql .= order_by($order_by, $order);
}
$sql .= limit_offset($rows_per_page, $offset); $sql .= limit_offset($rows_per_page, $offset);
$database = new database; $database = new database;
$extensions = $database->select($sql, $parameters ?? null, 'all'); $extensions = $database->select($sql, $parameters ?? null, 'all');