mirror of
https://github.com/fusionpbx/fusionpbx.git
synced 2026-01-06 11:43: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:
@@ -28,7 +28,7 @@ if ($domains_processed == 1) {
|
||||
|
||||
//create phrases folder and add include line in xml for each language found
|
||||
/*
|
||||
if (strlen($_SESSION['switch']['languages']['dir']) > 0) {
|
||||
if (!empty($_SESSION['switch']['languages']['dir'])) {
|
||||
if (is_readable($_SESSION['switch']['languages']['dir'])) {
|
||||
$conf_lang_folders = glob($_SESSION['switch']['languages']['dir']."/*");
|
||||
foreach ($conf_lang_folders as $conf_lang_folder) {
|
||||
|
||||
@@ -90,7 +90,7 @@
|
||||
}
|
||||
|
||||
//process the changes from the http post
|
||||
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
|
||||
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
|
||||
|
||||
//get the uuid
|
||||
if ($action == "update") {
|
||||
@@ -107,9 +107,9 @@
|
||||
|
||||
//check for all required data
|
||||
$msg = '';
|
||||
if (strlen($phrase_name) == 0) { $msg .= $text['message-required']." ".$text['label-name']."<br>\n"; }
|
||||
if (strlen($phrase_language) == 0) { $msg .= $text['message-required']." ".$text['label-language']."<br>\n"; }
|
||||
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
|
||||
if (empty($phrase_name)) { $msg .= $text['message-required']." ".$text['label-name']."<br>\n"; }
|
||||
if (empty($phrase_language)) { $msg .= $text['message-required']." ".$text['label-language']."<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";
|
||||
@@ -287,7 +287,7 @@
|
||||
}
|
||||
|
||||
//set the defaults
|
||||
if (strlen($phrase_enabled) == 0) { $phrase_enabled = 'true'; }
|
||||
if (empty($phrase_enabled)) { $phrase_enabled = 'true'; }
|
||||
|
||||
//get the phrase details
|
||||
if (is_uuid($phrase_uuid)) {
|
||||
@@ -366,7 +366,7 @@
|
||||
echo "var opt_group = document.createElement('optgroup');\n";
|
||||
echo "opt_group.label = \"".$text['label-sounds']."\";\n";
|
||||
foreach ($sound_files as $value) {
|
||||
if (strlen($value) > 0) {
|
||||
if (!empty($value)) {
|
||||
echo "opt_group.appendChild(new Option(\"".$value."\", \"".$value."\"));\n";
|
||||
}
|
||||
}
|
||||
@@ -585,7 +585,7 @@
|
||||
echo "</td>\n";
|
||||
echo "<td class='vtable'>\n";
|
||||
echo " <select name='domain_uuid' class='formfld'>\n";
|
||||
if (strlen($domain_uuid) == 0) {
|
||||
if (empty($domain_uuid)) {
|
||||
echo " <option value='' selected='selected'>".$text['label-global']."</option>\n";
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
|
||||
//add the search term
|
||||
$search = strtolower($_GET["search"]);
|
||||
if (strlen($search) > 0) {
|
||||
if (!empty($search)) {
|
||||
$sql_search = "and (";
|
||||
$sql_search .= "lower(phrase_name) like :search ";
|
||||
$sql_search .= "or lower(phrase_enabled) like :search ";
|
||||
@@ -219,7 +219,7 @@
|
||||
echo " </td>\n";
|
||||
}
|
||||
if ($_GET['show'] == "all" && permission_exists('phrase_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 {
|
||||
|
||||
Reference in New Issue
Block a user