nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53: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

2
app/conference_controls/app_defaults.php
View File

@@ -93,7 +93,7 @@
$array['conference_control_details'][0]['conference_control_detail_uuid'] = $conference_control_detail_uuid;
$array['conference_control_details'][0]['control_digits'] = $control_digits;
$array['conference_control_details'][0]['control_action'] = $control_action;
if (strlen($control_data) > 0) {
if (!empty($control_data)) {
$array['conference_control_details'][0]['control_data'] = $control_data;
}
$array['conference_control_details'][0]['control_enabled'] = $control_enabled;

14
app/conference_controls/conference_control_detail_edit.php
View File

@@ -44,7 +44,7 @@
}
//process the http post
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
//get the uuid
if ($action == "update") {
@@ -61,11 +61,11 @@
//check for all required data
$msg = '';
//if (strlen($control_digits) == 0) { $msg .= $text['message-required']." ".$text['label-control_digits']."<br>\n"; }
if (strlen($control_action) == 0) { $msg .= $text['message-required']." ".$text['label-control_action']."<br>\n"; }
//if (strlen($control_data) == 0) { $msg .= $text['message-required']." ".$text['label-control_data']."<br>\n"; }
if (strlen($control_enabled) == 0) { $msg .= $text['message-required']." ".$text['label-control_enabled']."<br>\n"; }
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
//if (empty($control_digits)) { $msg .= $text['message-required']." ".$text['label-control_digits']."<br>\n"; }
if (empty($control_action)) { $msg .= $text['message-required']." ".$text['label-control_action']."<br>\n"; }
//if (empty($control_data)) { $msg .= $text['message-required']." ".$text['label-control_data']."<br>\n"; }
if (empty($control_enabled)) { $msg .= $text['message-required']." ".$text['label-control_enabled']."<br>\n"; }
if (!empty($msg) && empty($_POST["persistformvar"])) {
require_once "resources/header.php";
require_once "resources/persist_form_var.php";
echo "<div align='center'>\n";
@@ -131,7 +131,7 @@
}
//set the defaults
if (strlen($control_enabled) == 0) { $control_enabled = 'true'; }
if (empty($control_enabled)) { $control_enabled = 'true'; }
//create token
$object = new token;

2
app/conference_controls/conference_control_details.php
View File

@@ -82,7 +82,7 @@
//add the search term
$search = $_GET["search"];
if (strlen($search) > 0) {
if (!empty($search)) {
$sql_search = "and (";
$sql_search .= "control_digits like :search";
$sql_search .= "or control_action like :search";

16
app/conference_controls/conference_control_edit.php
View File

@@ -38,7 +38,7 @@
}
//process the user data and save it to the database
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
//get the uuid from the POST
if ($action == "update") {
@@ -55,10 +55,10 @@
//check for all required data
$msg = '';
if (strlen($control_name) == 0) { $msg .= $text['message-required']." ".$text['label-control_name']."<br>\n"; }
if (strlen($control_enabled) == 0) { $msg .= $text['message-required']." ".$text['label-control_enabled']."<br>\n"; }
//if (strlen($control_description) == 0) { $msg .= $text['message-required']." ".$text['label-control_description']."<br>\n"; }
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (empty($control_name)) { $msg .= $text['message-required']." ".$text['label-control_name']."<br>\n"; }
if (empty($control_enabled)) { $msg .= $text['message-required']." ".$text['label-control_enabled']."<br>\n"; }
//if (empty($control_description)) { $msg .= $text['message-required']." ".$text['label-control_description']."<br>\n"; }
if (!empty($msg) && empty($_POST["persistformvar"])) {
$document['title'] = $text['title-conference_control'];
require_once "resources/header.php";
require_once "resources/persist_form_var.php";
@@ -87,7 +87,7 @@
$database = new database;
$database->app_name = 'conference_controls';
$database->app_uuid = 'e1ad84a2-79e1-450c-a5b1-7507a043e048';
if (strlen($conference_control_uuid) > 0) {
if (!empty($conference_control_uuid)) {
$database->uuid($conference_control_uuid);
}
$database->save($array);
@@ -104,7 +104,7 @@
header("Location: conference_controls.php");
return;
}
} //(is_array($_POST) && strlen($_POST["persistformvar"]) == 0)
} //(is_array($_POST) && empty($_POST["persistformvar"]))
//pre-populate the form
if (is_array($_GET) && $_POST["persistformvar"] != "true") {
@@ -124,7 +124,7 @@
}
//set the defaults
if (strlen($control_enabled) == 0) { $control_enabled = 'true'; }
if (empty($control_enabled)) { $control_enabled = 'true'; }
//create token
$object = new token;

2
app/conference_controls/conference_controls.php
View File

@@ -86,7 +86,7 @@
//add the search string
$search = strtolower($_GET["search"]);
if (strlen($search) > 0) {
if (!empty($search)) {
$sql_search = "where (";
$sql_search .= " lower(control_name) like :search ";
$sql_search .= " or lower(control_description) like :search ";