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

24
core/default_settings/default_setting_edit.php
View File

@@ -81,7 +81,7 @@
}
//process the http post
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
//set the default_setting_uuid
if ($action == "update") {
@@ -101,14 +101,14 @@
//check for all required data
$msg = '';
if (strlen($default_setting_category) == 0) { $msg .= $text['message-required'].$text['label-category']."<br>\n"; }
if (strlen($default_setting_subcategory) == 0) { $msg .= $text['message-required'].$text['label-subcategory']."<br>\n"; }
if (strlen($default_setting_name) == 0) { $msg .= $text['message-required'].$text['label-type']."<br>\n"; }
//if (strlen($default_setting_value) == 0) { $msg .= $text['message-required'].$text['label-value']."<br>\n"; }
if (strlen($default_setting_order) == 0) { $msg .= $text['message-required'].$text['label-order']."<br>\n"; }
if (strlen($default_setting_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
//if (strlen($default_setting_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (empty($default_setting_category)) { $msg .= $text['message-required'].$text['label-category']."<br>\n"; }
if (empty($default_setting_subcategory)) { $msg .= $text['message-required'].$text['label-subcategory']."<br>\n"; }
if (empty($default_setting_name)) { $msg .= $text['message-required'].$text['label-type']."<br>\n"; }
//if (empty($default_setting_value)) { $msg .= $text['message-required'].$text['label-value']."<br>\n"; }
if (empty($default_setting_order)) { $msg .= $text['message-required'].$text['label-order']."<br>\n"; }
if (empty($default_setting_enabled)) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
//if (empty($default_setting_description)) { $msg .= $text['message-required'].$text['label-description']."<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";
@@ -223,7 +223,7 @@
return;
}
} //if ($_POST["persistformvar"] != "true")
} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
} //(count($_POST)>0 && empty($_POST["persistformvar"]))
//pre-populate the form
if (count($_GET) > 0 && $_POST["persistformvar"] != "true") {
@@ -247,7 +247,7 @@
}
//set the defaults
if (strlen($default_setting_enabled) == 0) { $default_setting_enabled = 'true'; }
if (empty($default_setting_enabled)) { $default_setting_enabled = 'true'; }
//create token
$object = new token;
@@ -473,7 +473,7 @@
}
echo " <optgroup label='".$category."'>\n";
}
if (strlen($val) > 0) {
if (!empty($val)) {
$time_zone_offset = get_time_zone_offset($val)/3600;
$time_zone_offset_hours = floor($time_zone_offset);
$time_zone_offset_minutes = ($time_zone_offset - $time_zone_offset_hours) * 60;

24
core/default_settings/default_settings.php
View File

@@ -46,12 +46,16 @@
$text = $language->get();
//get the http post data
$search = $_REQUEST['search'];
$default_setting_category = $_REQUEST['default_setting_category'];
$search = $_REQUEST['search'] ?? '';
$default_setting_category = $_REQUEST['default_setting_category'] ?? '';
if (is_array($_POST['default_settings'])) {
$action = $_POST['action'];
$domain_uuid = $_POST['domain_uuid'];
$default_settings = $_POST['default_settings'];
} else {
$action = '';
$domain_uuid = '';
$default_settings = '';
}
//sanitize the variables
@@ -102,7 +106,7 @@
//get the count
$sql = "select count(default_setting_uuid) from v_default_settings ";
if (isset($search) && strlen($search) > 0) {
if (isset($search) && !empty($search)) {
$sql .= "where (";
$sql .= " lower(default_setting_category) like :search ";
$sql .= " or lower(default_setting_subcategory) like :search ";
@@ -112,7 +116,7 @@
$sql .= ") ";
$parameters['search'] = '%'.$search.'%';
}
if (isset($default_setting_category) && strlen($default_setting_category) > 0) {
if (isset($default_setting_category) && !empty($default_setting_category)) {
$sql .= (stripos($sql,'WHERE') === false) ? 'where ' : 'and ';
$sql .= "lower(default_setting_category) = :default_setting_category ";
$parameters['default_setting_category'] = strtolower($default_setting_category);
@@ -124,7 +128,7 @@
$sql = "select default_setting_uuid, default_setting_category, default_setting_subcategory, default_setting_name, ";
$sql .= "default_setting_value, cast(default_setting_enabled as text), default_setting_description ";
$sql .= "from v_default_settings ";
if (isset($search) && strlen($search) > 0) {
if (isset($search) && !empty($search)) {
$sql .= "where (";
$sql .= " lower(default_setting_category) like :search ";
$sql .= " or lower(default_setting_subcategory) like :search ";
@@ -134,13 +138,13 @@
$sql .= ") ";
$parameters['search'] = '%'.$search.'%';
}
if (isset($default_setting_category) && strlen($default_setting_category) > 0) {
if (isset($default_setting_category) && !empty($default_setting_category)) {
$sql .= (stripos($sql,'WHERE') === false) ? 'where ' : 'and ';
$sql .= "lower(default_setting_category) = :default_setting_category ";
$parameters['default_setting_category'] = strtolower($default_setting_category);
}
$sql .= order_by($order_by, $order, 'default_setting_category, default_setting_subcategory, default_setting_order', 'asc');
$sql .= limit_offset($rows_per_page, $offset);
//$sql .= limit_offset($rows_per_page, $offset ?? ''); //$offset is always null
$database = new database;
$default_settings = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);
@@ -153,7 +157,7 @@
$sql .= " count(d2.default_setting_category) ";
$sql .= " from v_default_settings as d2 ";
$sql .= " where d2.default_setting_category = d1.default_setting_category ";
if (isset($search) && strlen($search) > 0) {
if (!empty($search)) {
$sql .= " and (";
$sql .= " lower(d2.default_setting_category) like :search ";
$sql .= " or lower(d2.default_setting_subcategory) like :search ";
@@ -345,7 +349,7 @@
if ($row['default_setting_value'] !== $field['default_setting_value']) {
$setting_bold = 'font-weight:bold;';
}
if (strlen($field['default_setting_value']) > 0) {
if (!empty($field['default_setting_value'])) {
$default_value = 'Default: '.$field['default_setting_value'];
}
else {
@@ -465,7 +469,7 @@
echo " [...]\n";
}
else if ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text" || substr_count($subcategory, '_secret') > 0) {
echo " ".str_repeat('*', strlen($row['default_setting_value']));
echo " ".str_repeat('*', strlen($row['default_setting_value'] ?? ''));
}
else if ($category == 'theme' && $subcategory == 'button_icons' && $name == 'text') {
echo " ".$text['option-button_icons_'.$row['default_setting_value']]."\n";

3
core/default_settings/default_settings_reload.php
View File

@@ -46,13 +46,12 @@ $language = new text;
$text = $language->get();
//set the variables
$search = $_REQUEST['search'];
$search = $_REQUEST['search'] ?? '';
$domain_uuid = $_GET['id'];
//reload default settings
require "resources/classes/domains.php";
$domain = new domains();
$domain->db = $db;
$domain->set();
//add a message