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:
@@ -162,7 +162,7 @@ if (!class_exists('email')) {
|
||||
$body_part = $parts_array["BodyPart"];
|
||||
$body_length = $parts_array["BodyLength"];
|
||||
|
||||
if (strlen($file) > 0) {
|
||||
if (!empty($file)) {
|
||||
//get the file information
|
||||
$file_ext = pathinfo($file, PATHINFO_EXTENSION);
|
||||
$file_name = substr($file, 0, (strlen($file) - strlen($file_ext))-1 );
|
||||
@@ -417,10 +417,10 @@ if (!class_exists('email')) {
|
||||
$smtp['validate_certificate'] = $_SESSION['email']['smtp_validate_certificate']['boolean'];
|
||||
$smtp['crypto_method'] = $_SESSION['email']['smtp_crypto_method']['text'];
|
||||
|
||||
if (isset($_SESSION['voicemail']['smtp_from']) && strlen($_SESSION['voicemail']['smtp_from']['text']) > 0) {
|
||||
if (isset($_SESSION['voicemail']['smtp_from']) && !empty($_SESSION['voicemail']['smtp_from']['text'])) {
|
||||
$smtp['from'] = $_SESSION['voicemail']['smtp_from']['text'];
|
||||
}
|
||||
if (isset($_SESSION['voicemail']['smtp_from_name']) && strlen($_SESSION['voicemail']['smtp_from_name']['text']) > 0) {
|
||||
if (isset($_SESSION['voicemail']['smtp_from_name']) && !empty($_SESSION['voicemail']['smtp_from_name']['text'])) {
|
||||
$smtp['from_name'] = $_SESSION['voicemail']['smtp_from_name']['text'];
|
||||
}
|
||||
|
||||
@@ -580,7 +580,7 @@ if (!class_exists('email')) {
|
||||
|
||||
//send the email
|
||||
if (!$mail_status) {
|
||||
if (isset($mail->ErrorInfo) && strlen($mail->ErrorInfo) > 0) {
|
||||
if (isset($mail->ErrorInfo) && !empty($mail->ErrorInfo)) {
|
||||
$this->error = $mail->ErrorInfo;
|
||||
}
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user