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:
@@ -71,7 +71,7 @@
|
||||
$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
|
||||
$sql .= "and permission_assigned = 'true' ";
|
||||
foreach ($_SESSION["groups"] as $field) {
|
||||
if (strlen($field['group_name']) > 0) {
|
||||
if (!empty($field['group_name'])) {
|
||||
$sql_where_or[] = "group_name = :group_name_".$x;
|
||||
$parameters['group_name_'.$x] = $field['group_name'];
|
||||
$x++;
|
||||
@@ -139,7 +139,7 @@
|
||||
$group_permissions = $database->select($sql, $parameters, 'all');
|
||||
|
||||
//process the user data and save it to the database
|
||||
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
|
||||
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
|
||||
$x = 0;
|
||||
if (is_array($_POST['group_permissions'])) {
|
||||
foreach($_POST['group_permissions'] as $row) {
|
||||
@@ -210,10 +210,10 @@
|
||||
|
||||
//build the array;
|
||||
if ($action == "save") {
|
||||
if (strlen($group_permission_uuid) == 0) {
|
||||
if (empty($group_permission_uuid)) {
|
||||
$group_permission_uuid = uuid();
|
||||
}
|
||||
if (isset($row['permission_name']) && strlen($row['permission_name']) > 0) {
|
||||
if (isset($row['permission_name']) && !empty($row['permission_name'])) {
|
||||
$array['save']['group_permissions'][$x]['group_permission_uuid'] = $group_permission_uuid;
|
||||
$array['save']['group_permissions'][$x]['permission_name'] = $row['permission_name'];
|
||||
$array['save']['group_permissions'][$x]['permission_protected'] = $row['permission_protected'] == 'true' ? "true" : 'false';
|
||||
@@ -225,7 +225,7 @@
|
||||
}
|
||||
|
||||
if ($action == "delete") {
|
||||
if (isset($row['permission_name']) && strlen($row['permission_name']) > 0) {
|
||||
if (isset($row['permission_name']) && !empty($row['permission_name'])) {
|
||||
$array['delete']['group_permissions'][$x]['permission_name'] = $row['permission_name'];
|
||||
$array['delete']['group_permissions'][$x]['group_uuid'] = $group_uuid;
|
||||
$array['delete']['group_permissions'][$x]['group_name'] = $group_name;
|
||||
|
||||
Reference in New Issue
Block a user