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
+10
-10
@@ -90,13 +90,13 @@ class vcard {
|
||||
$this->card .= "N:";
|
||||
$this->card .= $this->data['last_name'].";";
|
||||
$this->card .= $this->data['first_name'];
|
||||
if (strlen($this->data['additional_name']) > 0) {
|
||||
if (!empty($this->data['additional_name'])) {
|
||||
$this->card .= ";".$this->data['additional_name'];
|
||||
}
|
||||
if (strlen($this->data['name_prefix']) > 0) {
|
||||
if (!empty($this->data['name_prefix'])) {
|
||||
$this->card .= ";".$this->data['name_prefix'];
|
||||
}
|
||||
if (strlen($this->data['name_suffix']) > 0) {
|
||||
if (!empty($this->data['name_suffix'])) {
|
||||
$this->card .= ";".$this->data['name_suffix'];
|
||||
}
|
||||
$this->card .= "\r\n";
|
||||
@@ -116,25 +116,25 @@ class vcard {
|
||||
|| $this->data[$vcard_address_type_value.'_postal_code']
|
||||
|| $this->data[$vcard_address_type_value.'_country']) {
|
||||
$this->card .= "ADR;TYPE=".$vcard_address_type_value.":";
|
||||
if (strlen($this->data[$vcard_address_type_value.'_po_box']) > 0) {
|
||||
if (!empty($this->data[$vcard_address_type_value.'_po_box'])) {
|
||||
$this->card .= $this->data[$vcard_address_type_value.'_po_box'].";";
|
||||
}
|
||||
if (strlen($this->data[$vcard_address_type_value.'_extended_address']) > 0) {
|
||||
if (!empty($this->data[$vcard_address_type_value.'_extended_address'])) {
|
||||
$this->card .= $this->data[$vcard_address_type_value.'_extended_address'].";";
|
||||
}
|
||||
if (strlen($this->data[$vcard_address_type_value.'_address']) > 0) {
|
||||
if (!empty($this->data[$vcard_address_type_value.'_address'])) {
|
||||
$this->card .= $this->data[$vcard_address_type_value.'_address'].";";
|
||||
}
|
||||
if (strlen($this->data[$vcard_address_type_value.'_city']) > 0) {
|
||||
if (!empty($this->data[$vcard_address_type_value.'_city'])) {
|
||||
$this->card .= $this->data[$vcard_address_type_value.'_city'].";";
|
||||
}
|
||||
if (strlen($this->data[$vcard_address_type_value.'_state']) > 0) {
|
||||
if (!empty($this->data[$vcard_address_type_value.'_state'])) {
|
||||
$this->card .= $this->data[$vcard_address_type_value.'_state'].";";
|
||||
}
|
||||
if (strlen($this->data[$vcard_address_type_value.'_postal_code']) > 0) {
|
||||
if (!empty($this->data[$vcard_address_type_value.'_postal_code'])) {
|
||||
$this->card .= $this->data[$vcard_address_type_value.'_postal_code'].";";
|
||||
}
|
||||
if (strlen($this->data[$vcard_address_type_value.'_country']) > 0) {
|
||||
if (!empty($this->data[$vcard_address_type_value.'_country'])) {
|
||||
$this->card .= $this->data[$vcard_address_type_value.'_country']."";
|
||||
}
|
||||
$this->card .= "\r\n";
|
||||
|
||||
Reference in New Issue
Block a user