nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-02-12 22:24:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Frytimo pr patches for php8.1 (#6630)

Browse Source 
* 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:
frytimo
2023-05-05 13:46:37 -03:00
committed by GitHub
parent ebbb2f1a72
commit fef8165be2
230 changed files with 1948 additions and 1937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
resources/classes/directory.php
View File

@@ -162,13 +162,13 @@
$array['extensions'][0]['auth_acl'] = $auth_acl;
$array['extensions'][0]['cidr'] = $cidr;
$array['extensions'][0]['sip_force_contact'] = $sip_force_contact;
if (strlen($sip_force_expires) > 0) {
if (!empty($sip_force_expires)) {
$array['extensions'][0]['sip_force_expires'] = $sip_force_expires;
}
if (strlen($nibble_account) > 0) {
if (!empty($nibble_account)) {
$array['extensions'][0]['nibble_account'] = $nibble_account;
}
if (strlen($mwi_account) > 0) {
if (!empty($mwi_account)) {
if (strpos($mwi_account, '@') === false) {
$mwi_account .= count($_SESSION["domains"]) > 1 ? "@".$domain_name : "@\$\${domain}";
}
@@ -234,13 +234,13 @@
//$user_list_array = explode("|", $user_list);
//foreach($user_list_array as $tmp_user){
// $user_password = generate_password();
// if (strlen($tmp_user) > 0) {
// if (!empty($tmp_user)) {
// user_add($tmp_user, $user_password, $user_email);
// }
//}
//unset($tmp_user);
if (strlen($password) == 0) {
if (empty($password)) {
$password = generate_password();
}
@@ -250,7 +250,7 @@
$array['extensions'][0]['number_alias'] = $number_alias;
$array['extensions'][0]['password'] = $password;
$array['extensions'][0]['provisioning_list'] = $provisioning_list;
$array['extensions'][0]['vm_password'] = strlen($vm_password) > 0 ? $vm_password : 'user-choose';
$array['extensions'][0]['vm_password'] = !empty($vm_password) ? $vm_password : 'user-choose';
$array['extensions'][0]['accountcode'] = $accountcode;
$array['extensions'][0]['effective_caller_id_name'] = $effective_caller_id_name;
$array['extensions'][0]['effective_caller_id_number'] = $effective_caller_id_number;
@@ -269,9 +269,9 @@
$array['extensions'][0]['auth_acl'] = $auth_acl;
$array['extensions'][0]['cidr'] = $cidr;
$array['extensions'][0]['sip_force_contact'] = $sip_force_contact;
$array['extensions'][0]['sip_force_expires'] = strlen($sip_force_expires) > 0 ? $sip_force_expires : null;
$array['extensions'][0]['nibble_account'] = strlen($nibble_account) > 0 ? $nibble_account : null;
if (strlen($mwi_account) > 0) {
$array['extensions'][0]['sip_force_expires'] = !empty($sip_force_expires) ? $sip_force_expires : null;
$array['extensions'][0]['nibble_account'] = !empty($nibble_account) ? $nibble_account : null;
if (!empty($mwi_account)) {
if (strpos($mwi_account, '@') === false) {
$mwi_account .= count($_SESSION["domains"]) > 1 ? "@".$domain_name : "@\$\${domain}";
}
@@ -508,8 +508,8 @@
$call_group = str_replace(";", ",", $call_group);
$tmp_array = explode(",", $call_group);
foreach ($tmp_array as &$tmp_call_group) {
if (strlen($tmp_call_group) > 0) {
if (strlen($call_group_array[$tmp_call_group]) == 0) {
if (!empty($tmp_call_group)) {
if (empty($call_group_array[$tmp_call_group])) {
$call_group_array[$tmp_call_group] = $row['extension'];
}
else {
@@ -599,7 +599,7 @@
foreach ($call_group_array as $key => $value) {
$call_group = $key;
$extension_list = $value;
if (strlen($call_group) > 0) {
if (!empty($call_group)) {
if ($previous_call_group != $call_group) {
$xml .= " <group name=\"$call_group\">\n";
$xml .= " <users>\n";