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:
+10
-10
@@ -66,13 +66,13 @@
|
||||
$var_description = trim($_POST["var_description"]);
|
||||
$var_description = str_replace("''", "'", $var_description);
|
||||
|
||||
if (strlen($_POST["var_category_other"]) > 0) {
|
||||
if (!empty($_POST["var_category_other"])) {
|
||||
$var_category = trim($_POST["var_category_other"]);
|
||||
}
|
||||
}
|
||||
|
||||
//process the post
|
||||
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
|
||||
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
|
||||
|
||||
//get the uuid
|
||||
if ($action == "update") {
|
||||
@@ -89,13 +89,13 @@
|
||||
|
||||
//check for all required data
|
||||
$msg = '';
|
||||
//if (strlen($var_category) == 0) { $msg .= $text['message-required'].$text['label-category']."<br>\n"; }
|
||||
if (strlen($var_name) == 0) { $msg .= $text['message-required'].$text['label-name']."<br>\n"; }
|
||||
//if (strlen($var_value) == 0) { $msg .= $text['message-required'].$text['label-value']."<br>\n"; }
|
||||
//if (strlen($var_command) == 0) { $msg .= $text['message-required'].$text['label-command']."<br>\n"; }
|
||||
if (strlen($var_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
|
||||
if (strlen($var_order) == 0) { $msg .= $text['message-required'].$text['label-order']."<br>\n"; }
|
||||
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
|
||||
//if (empty($var_category)) { $msg .= $text['message-required'].$text['label-category']."<br>\n"; }
|
||||
if (empty($var_name)) { $msg .= $text['message-required'].$text['label-name']."<br>\n"; }
|
||||
//if (empty($var_value)) { $msg .= $text['message-required'].$text['label-value']."<br>\n"; }
|
||||
//if (empty($var_command)) { $msg .= $text['message-required'].$text['label-command']."<br>\n"; }
|
||||
if (empty($var_enabled)) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
|
||||
if (empty($var_order)) { $msg .= $text['message-required'].$text['label-order']."<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";
|
||||
@@ -179,7 +179,7 @@
|
||||
}
|
||||
|
||||
//set the defaults
|
||||
if (strlen($var_enabled) == 0) { $var_enabled = 'true'; }
|
||||
if (empty($var_enabled)) { $var_enabled = 'true'; }
|
||||
|
||||
//create token
|
||||
$object = new token;
|
||||
|
||||
+2
-2
@@ -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(var_category) like :search ";
|
||||
$sql_search .= " or lower(var_name) like :search ";
|
||||
@@ -245,7 +245,7 @@
|
||||
echo $text['label-'.$row['var_enabled']];
|
||||
}
|
||||
echo " </td>\n";
|
||||
echo " <td class='description overflow hide-sm-dn'>".escape(base64_decode($row['var_description']))."</td>\n";
|
||||
echo " <td class='description overflow hide-sm-dn'>".escape(base64_decode($row['var_description'] ?? ''))."</td>\n";
|
||||
if (permission_exists('var_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
|
||||
echo " <td class='action-button'>\n";
|
||||
echo button::create(['type'=>'button','title'=>$text['button-edit'],'icon'=>$_SESSION['theme']['button_icon_edit'],'link'=>$list_row_url]);
|
||||
|
||||
Reference in New Issue
Block a user