mirror of
https://github.com/fusionpbx/fusionpbx.git
synced 2025-12-30 00:53:50 +00:00
Frytimo pr patches for php8.1 (#6630)
* Passing null to parameter #2 ($string) of type string is deprecated * Passing null to parameter #1 ($string) of type string is deprecated * php 8.1 fixes * php 8.1 fixes - replace strlen($var) > 0 with !empty($var) * php 8.1 fixes - replace ${var} with {$var} * php 8.1 fixes - replace ${var} with {$var} * php 8.1 fixes - replace ${var} with {$var} * php 8.1 fixes - replace ${var} with {$var} * php 8.1 fixes - strlower with null * php 8.1 fixes - strreplace with null * php 8.1 fixes - passing null to base64_decode * php 8.1 fixes - check for false and check for null on $this->dir * php 8.1 fixes - remove assignment of $db variable to modules object * php 8.1 fixes - avoid sending null to substr * php 8.1 fixes - change ${var} to {$var} * php 8.1 fixes - check for null before preg_replace * php 8.1 fixes - remove setting db variable on domains object * php 8.1 fixes - set empty string if $row['domain_setting_subcategory'] is null * php 8.1 fixes - set empty string if $_REQUEST['show'] is not available * php 8.1 fixes * php 8.1 fixes - correct $_POST checking syntax * php 8.1 fixes - correct $_POST variables * php 8.1 fixes * Use brackets consistently * Update user_setting_edit.php * Change to not empty * Update device.php * Update text.php --------- Co-authored-by: Tim Fry <tim@voipstratus.com> Co-authored-by: FusionPBX <markjcrane@gmail.com>
This commit is contained in:
@@ -41,18 +41,18 @@ function paging($num_rows, $param, $rows_per_page, $mini = false, $result_count
|
||||
|
||||
//sanitize the parameters
|
||||
$sanitized_parameters = '';
|
||||
if (isset($param) && strlen($param) > 0) {
|
||||
if (isset($param) && !empty($param)) {
|
||||
$param_array = explode("&", $param);
|
||||
if (is_array($param_array)) {
|
||||
foreach($param_array as $row) {
|
||||
$param_sub_array = explode("=", $row);
|
||||
$key = preg_replace('#[^a-zA-Z0-9_\-]#', '', $param_sub_array['0']);
|
||||
$value = urldecode($param_sub_array['1']);
|
||||
if ($key == 'order_by' && strlen($value) > 0) {
|
||||
$value = urldecode($param_sub_array['1'] ?? '');
|
||||
if ($key === 'order_by' && !empty($value)) {
|
||||
//validate order by
|
||||
$sanitized_parameters .= "&order_by=". preg_replace('#[^a-zA-Z0-9_\-]#', '', $value);
|
||||
}
|
||||
else if ($key == 'order' && strlen($value) > 0) {
|
||||
else if ($key == 'order' && !empty($value)) {
|
||||
//validate order
|
||||
switch ($value) {
|
||||
case 'asc':
|
||||
@@ -63,11 +63,11 @@ function paging($num_rows, $param, $rows_per_page, $mini = false, $result_count
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if (strlen($value) > 0 && is_numeric($value)) {
|
||||
else if (!empty($value) && is_numeric($value)) {
|
||||
$sanitized_parameters .= "&".$key."=".$value;
|
||||
}
|
||||
else {
|
||||
$sanitized_parameters .= "&".$key."=".urlencode($value);
|
||||
$sanitized_parameters .= "&".$key."=".urlencode($value ?? '');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user