nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +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

9
app/voicemails/resources/classes/voicemail.php
View File

@@ -38,6 +38,7 @@
public $order_by;
public $order;
public $type;
public $db;
/**
* declare private variables
@@ -64,7 +65,7 @@
$this->toggle_values = ['true','false'];
//set the domain_uuid if not provided
if (strlen($this->domain_uuid) == 0) {
if (strlen($this->domain_uuid ?? '') === 0) {
$this->domain_uuid = $_SESSION['domain_uuid'];
}
@@ -108,7 +109,7 @@
}
if (isset($_SESSION['user']['voicemail'])) {
foreach ($_SESSION['user']['voicemail'] as $row) {
if (strlen($row['voicemail_uuid']) > 0) {
if (!empty($row['voicemail_uuid'])) {
$voicemail_uuids[]['voicemail_uuid'] = $row['voicemail_uuid'];
}
}
@@ -221,7 +222,7 @@
$sql .= "and v.voicemail_id = :voicemail_id ";
$parameters['voicemail_id'] = $this->voicemail_id;
}
if (strlen($this->order_by) == 0) {
if (empty($this->order_by)) {
$sql .= "order by v.voicemail_id, m.created_epoch desc ";
}
else {
@@ -947,7 +948,7 @@ Array
)
foreach ($_SESSION['user']['extension'] as $value) {
if (strlen($value['user']) > 0) {
if (!empty($value['user'])) {
}
}

14
app/voicemails/voicemail_edit.php
View File

@@ -103,7 +103,7 @@
}
//process the data
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
$msg = '';
if ($action == "update") {
@@ -122,7 +122,7 @@
$msg = '';
if (!is_numeric($voicemail_id)) { $msg .= $text['message-required']." ".$text['label-voicemail_id']."<br>\n"; }
if (trim($voicemail_password) == '') { $msg .= $text['message-required']." ".$text['label-voicemail_password']."<br>\n"; }
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (!empty($msg) && empty($_POST["persistformvar"])) {
require_once "resources/header.php";
require_once "resources/persist_form_var.php";
echo "<div align='center'>\n";
@@ -320,10 +320,10 @@
$voicemail_mail_to = str_replace(" ", "", $voicemail_mail_to);
//set the defaults
if (strlen($voicemail_local_after_email) == 0) { $voicemail_local_after_email = 'true'; }
if (strlen($voicemail_enabled) == 0) { $voicemail_enabled = 'true'; }
if (strlen($voicemail_transcription_enabled) == 0) { $voicemail_transcription_enabled = $_SESSION['voicemail']['transcription_enabled_default']['boolean']; }
if (strlen($voicemail_tutorial) == 0) { $voicemail_tutorial = 'false'; }
if (empty($voicemail_local_after_email)) { $voicemail_local_after_email = 'true'; }
if (empty($voicemail_enabled)) { $voicemail_enabled = 'true'; }
if (empty($voicemail_transcription_enabled)) { $voicemail_transcription_enabled = $_SESSION['voicemail']['transcription_enabled_default']['boolean']; }
if (empty($voicemail_tutorial)) { $voicemail_tutorial = 'false'; }
//get the greetings list
$sql = "select * from v_voicemail_greetings ";
@@ -352,7 +352,7 @@
if (is_array($voicemail_options) && @sizeof($voicemail_options) != 0) {
foreach ($voicemail_options as $x => $field) {
$voicemail_option_param = $field['voicemail_option_param'];
if (strlen(trim($voicemail_option_param)) == 0) {
if (empty(trim($voicemail_option_param))) {
$voicemail_option_param = $field['voicemail_option_action'];
}
$voicemail_option_param = str_replace("menu-", "", $voicemail_option_param);

8
app/voicemails/voicemail_imports.php
View File

@@ -87,7 +87,7 @@
}
//get the schema
if (strlen($delimiter) > 0) {
if (!empty($delimiter)) {
//get the first line
$line = fgets(fopen($_SESSION['file'], 'r'));
$line_fields = explode($delimiter, $line);
@@ -135,7 +135,7 @@
}
//match the column names to the field names
if (strlen($delimiter) > 0 && file_exists($_SESSION['file']) && $action != 'import') {
if (!empty($delimiter) && file_exists($_SESSION['file']) && $action != 'import') {
//create token
$object = new token;
@@ -285,8 +285,8 @@
}
//build the data array
if (strlen($table_name) > 0) {
if (strlen($parent) == 0) {
if (!empty($table_name)) {
if (empty($parent)) {
$array[$table_name][$row_id]['domain_uuid'] = $domain_uuid;
$array[$table_name][$row_id][$field_name] = $result[$key];
}

6
app/voicemails/voicemails.php
View File

@@ -77,7 +77,7 @@
//set the voicemail uuid array
if (isset($_SESSION['user']['voicemail'])) {
foreach ($_SESSION['user']['voicemail'] as $row) {
if (strlen($row['voicemail_uuid']) > 0) {
if (!empty($row['voicemail_uuid'])) {
$voicemail_uuids[]['voicemail_uuid'] = $row['voicemail_uuid'];
}
}
@@ -99,7 +99,7 @@
//add the search string
$search = strtolower($_GET["search"]);
if (strlen($search) > 0) {
if (!empty($search)) {
$sql_search = "and (";
$sql_search .= " lower(cast(voicemail_id as text)) like :search ";
$sql_search .= " or lower(voicemail_mail_to) like :search ";
@@ -271,7 +271,7 @@
echo " </td>\n";
}
if ($_GET['show'] == "all" && permission_exists('voicemail_all')) {
if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) {
if (!empty($_SESSION['domains'][$row['domain_uuid']]['domain_name'])) {
$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
}
else {