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:
co-authored by
Tim Fry
FusionPBX
parent
ebbb2f1a72
commit
fef8165be2
@@ -84,7 +84,7 @@
|
||||
$array['follow_me'][0]['follow_me_uuid'] = $this->follow_me_uuid;
|
||||
$array['follow_me'][0]['domain_uuid'] = $this->domain_uuid;
|
||||
$array['follow_me'][0]['cid_name_prefix'] = $this->cid_name_prefix;
|
||||
if (strlen($this->cid_number_prefix) > 0) {
|
||||
if (!empty($this->cid_number_prefix)) {
|
||||
$array['follow_me'][0]['cid_number_prefix'] = $this->cid_number_prefix;
|
||||
}
|
||||
|
||||
@@ -148,7 +148,7 @@
|
||||
|
||||
//build follow me destinations insert array
|
||||
$x = 0;
|
||||
if (strlen($this->destination_data_1) > 0) {
|
||||
if (!empty($this->destination_data_1)) {
|
||||
$array['follow_me_destinations'][$x]['follow_me_destination_uuid'] = uuid();
|
||||
$array['follow_me_destinations'][$x]['domain_uuid'] = $this->domain_uuid;
|
||||
$array['follow_me_destinations'][$x]['follow_me_uuid'] = $this->follow_me_uuid;
|
||||
@@ -160,7 +160,7 @@
|
||||
$this->destination_order++;
|
||||
$x++;
|
||||
}
|
||||
if (strlen($this->destination_data_2) > 0) {
|
||||
if (!empty($this->destination_data_2)) {
|
||||
$array['follow_me_destinations'][$x]['follow_me_destination_uuid'] = uuid();
|
||||
$array['follow_me_destinations'][$x]['domain_uuid'] = $this->domain_uuid;
|
||||
$array['follow_me_destinations'][$x]['follow_me_uuid'] = $this->follow_me_uuid;
|
||||
@@ -172,7 +172,7 @@
|
||||
$this->destination_order++;
|
||||
$x++;
|
||||
}
|
||||
if (strlen($this->destination_data_3) > 0) {
|
||||
if (!empty($this->destination_data_3)) {
|
||||
$array['follow_me_destinations'][$x]['follow_me_destination_uuid'] = uuid();
|
||||
$array['follow_me_destinations'][$x]['domain_uuid'] = $this->domain_uuid;
|
||||
$array['follow_me_destinations'][$x]['follow_me_uuid'] = $this->follow_me_uuid;
|
||||
@@ -184,7 +184,7 @@
|
||||
$this->destination_order++;
|
||||
$x++;
|
||||
}
|
||||
if (strlen($this->destination_data_4) > 0) {
|
||||
if (!empty($this->destination_data_4)) {
|
||||
$array['follow_me_destinations'][$x]['follow_me_destination_uuid'] = uuid();
|
||||
$array['follow_me_destinations'][$x]['domain_uuid'] = $this->domain_uuid;
|
||||
$array['follow_me_destinations'][$x]['follow_me_uuid'] = $this->follow_me_uuid;
|
||||
@@ -196,7 +196,7 @@
|
||||
$this->destination_order++;
|
||||
$x++;
|
||||
}
|
||||
if (strlen($this->destination_data_5) > 0) {
|
||||
if (!empty($this->destination_data_5)) {
|
||||
$array['follow_me_destinations'][$x]['follow_me_destination_uuid'] = uuid();
|
||||
$array['follow_me_destinations'][$x]['domain_uuid'] = $this->domain_uuid;
|
||||
$array['follow_me_destinations'][$x]['follow_me_uuid'] = $this->follow_me_uuid;
|
||||
|
||||
Reference in New Issue
Block a user