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

20
app/modules/module_edit.php
View File

@@ -66,7 +66,7 @@
}
//process the data
if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
if (count($_POST)>0 && empty($_POST["persistformvar"])) {
//get the uuid
if ($action == "update") {
@@ -83,13 +83,13 @@
//check for all required data
$msg = '';
if (strlen($module_label) == 0) { $msg .= $text['message-required'].$text['label-label']."<br>\n"; }
if (strlen($module_name) == 0) { $msg .= $text['message-required'].$text['label-module_name']."<br>\n"; }
//if (strlen($module_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
if (strlen($module_category) == 0) { $msg .= $text['message-required'].$text['label-module_category']."<br>\n"; }
if (strlen($module_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
if (strlen($module_default_enabled) == 0) { $msg .= $text['message-required'].$text['label-default_enabled']."<br>\n"; }
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (empty($module_label)) { $msg .= $text['message-required'].$text['label-label']."<br>\n"; }
if (empty($module_name)) { $msg .= $text['message-required'].$text['label-module_name']."<br>\n"; }
//if (empty($module_description)) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
if (empty($module_category)) { $msg .= $text['message-required'].$text['label-module_category']."<br>\n"; }
if (empty($module_enabled)) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
if (empty($module_default_enabled)) { $msg .= $text['message-required'].$text['label-default_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";
@@ -164,8 +164,8 @@
}
//set the defaults
if (strlen($module_enabled) == 0) { $module_enabled = 'true'; }
if (strlen($module_default_enabled) == 0) { $module_default_enabled = 'true'; }
if (empty($module_enabled)) { $module_enabled = 'true'; }
if (empty($module_default_enabled)) { $module_default_enabled = 'true'; }
//create token
$object = new token;

1
app/modules/modules.php
View File

@@ -99,7 +99,6 @@
//use the module class to get the list of modules from the db and add any missing modules
$module = new modules;
$module->db = $db;
$module->dir = $_SESSION['switch']['mod']['dir'];
$module->get_modules();
$modules = $module->modules;

2
app/modules/resources/classes/modules.php
View File

@@ -705,7 +705,7 @@ if (!class_exists('modules')) {
//add missing modules for more module info see http://wiki.freeswitch.com/wiki/Modules
public function synch() {
if ($handle = opendir($this->dir)) {
if (false !== ($handle = opendir($this->dir ?? ''))) {
$modules_new = '';
$module_found = false;
$x = 0;