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

Order By [Function]: Only use natural sort function for PostgreSQL databases.

This commit is contained in:
fusionate 2023-10-19 18:45:42 +00:00
parent f1ab4c365e
commit 4fcd98638b
No known key found for this signature in database
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/functions.php
View File

@ -2004,11 +2004,12 @@ function number_pad($number,$n) {
//validate and format order by clause of select statement //validate and format order by clause of select statement
if (!function_exists('order_by')) { if (!function_exists('order_by')) {
function order_by($col, $dir, $col_default = '', $dir_default = 'asc', $sort = '') { function order_by($col, $dir, $col_default = '', $dir_default = 'asc', $sort = '') {
global $db_type;
$order_by = ' order by '; $order_by = ' order by ';
$col = preg_replace('#[^a-zA-Z0-9-_.]#', '', $col ?? ''); $col = preg_replace('#[^a-zA-Z0-9-_.]#', '', $col ?? '');
$dir = !empty($dir) && strtolower($dir) == 'desc' ? 'desc' : 'asc'; $dir = !empty($dir) && strtolower($dir) == 'desc' ? 'desc' : 'asc';
if (!empty($col)) { if (!empty($col)) {
if ($sort == 'natural') { if ($sort == 'natural' && $db_type == "pgsql") {
return $order_by.'natural_sort('.$col.') '.$dir.' '; return $order_by.'natural_sort('.$col.') '.$dir.' ';
} }
else { else {
@ -2026,7 +2027,7 @@ function number_pad($number,$n) {
} }
} }
else { else {
if ($sort == 'natural') { if ($sort == 'natural' && $db_type == "pgsql") {
return $order_by.'natural_sort('.$col_default.') '.$dir_default.' '; return $order_by.'natural_sort('.$col_default.') '.$dir_default.' ';
} }
else { else {