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:
frytimo
co-authored by
Tim Fry
FusionPBX
Tim Fry
FusionPBX
parent
ebbb2f1a72
commit
fef8165be2
@@ -87,7 +87,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") {
|
||||
@@ -104,12 +104,12 @@
|
||||
|
||||
//check for all required data
|
||||
$msg = '';
|
||||
//if (strlen($sip_profile_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-sip_profile_uuid']."<br>\n"; }
|
||||
if (strlen($sip_profile_name) == 0) { $msg .= $text['message-required']." ".$text['label-sip_profile_name']."<br>\n"; }
|
||||
//if (strlen($sip_profile_hostname) == 0) { $msg .= $text['message-required']." ".$text['label-sip_profile_hostname']."<br>\n"; }
|
||||
if (strlen($sip_profile_enabled) == 0) { $msg .= $text['message-required']." ".$text['label-sip_profile_enabled']."<br>\n"; }
|
||||
if (strlen($sip_profile_description) == 0) { $msg .= $text['message-required']." ".$text['label-sip_profile_description']."<br>\n"; }
|
||||
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
|
||||
//if (empty($sip_profile_uuid)) { $msg .= $text['message-required']." ".$text['label-sip_profile_uuid']."<br>\n"; }
|
||||
if (empty($sip_profile_name)) { $msg .= $text['message-required']." ".$text['label-sip_profile_name']."<br>\n"; }
|
||||
//if (empty($sip_profile_hostname)) { $msg .= $text['message-required']." ".$text['label-sip_profile_hostname']."<br>\n"; }
|
||||
if (empty($sip_profile_enabled)) { $msg .= $text['message-required']." ".$text['label-sip_profile_enabled']."<br>\n"; }
|
||||
if (empty($sip_profile_description)) { $msg .= $text['message-required']." ".$text['label-sip_profile_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";
|
||||
@@ -158,14 +158,14 @@
|
||||
$array['sip_profiles'][0]['sip_profile_description'] = $sip_profile_description;
|
||||
$y = 0;
|
||||
foreach ($sip_profile_domains as $row) {
|
||||
if (strlen($row['sip_profile_domain_uuid']) > 0) {
|
||||
if (!empty($row['sip_profile_domain_uuid'])) {
|
||||
if (is_uuid($row['sip_profile_domain_uuid'])) {
|
||||
$sip_profile_domain_uuid = $row['sip_profile_domain_uuid'];
|
||||
}
|
||||
else {
|
||||
$sip_profile_domain_uuid = uuid();
|
||||
}
|
||||
if (strlen($row["sip_profile_domain_alias"]) > 0) {
|
||||
if (!empty($row["sip_profile_domain_alias"])) {
|
||||
$array['sip_profiles'][0]['sip_profile_domains'][$y]["sip_profile_uuid"] = $sip_profile_uuid;
|
||||
$array['sip_profiles'][0]['sip_profile_domains'][$y]["sip_profile_domain_uuid"] = $sip_profile_domain_uuid;
|
||||
$array['sip_profiles'][0]['sip_profile_domains'][$y]["sip_profile_domain_name"] = $row["sip_profile_domain_name"];
|
||||
@@ -177,14 +177,14 @@
|
||||
}
|
||||
$y = 0;
|
||||
foreach ($sip_profile_settings as $row) {
|
||||
if (strlen($row['sip_profile_setting_uuid']) > 0) {
|
||||
if (!empty($row['sip_profile_setting_uuid'])) {
|
||||
if (is_uuid($row['sip_profile_setting_uuid'])) {
|
||||
$sip_profile_setting_uuid = $row['sip_profile_setting_uuid'];
|
||||
}
|
||||
else {
|
||||
$sip_profile_setting_uuid = uuid();
|
||||
}
|
||||
if (strlen($row["sip_profile_setting_name"]) > 0) {
|
||||
if (!empty($row["sip_profile_setting_name"])) {
|
||||
$array['sip_profiles'][0]['sip_profile_settings'][$y]["sip_profile_uuid"] = $sip_profile_uuid;
|
||||
$array['sip_profiles'][0]['sip_profile_settings'][$y]["sip_profile_setting_uuid"] = $sip_profile_setting_uuid;
|
||||
$array['sip_profiles'][0]['sip_profile_settings'][$y]["sip_profile_setting_name"] = $row["sip_profile_setting_name"];
|
||||
@@ -283,7 +283,7 @@
|
||||
}
|
||||
|
||||
//set the defaults
|
||||
if (strlen($sip_profile_enabled) == 0) { $sip_profile_enabled = 'true'; }
|
||||
if (empty($sip_profile_enabled)) { $sip_profile_enabled = 'true'; }
|
||||
|
||||
//get the child data
|
||||
$sql = "select * from v_sip_profile_settings ";
|
||||
@@ -560,7 +560,7 @@
|
||||
echo " <input id='sip_profile_setting_name_$x' class='formfld' style='display: none;' type='text' name='sip_profile_settings[$x][sip_profile_setting_name]' maxlength='255' value=\"".escape($row["sip_profile_setting_name"])."\">\n";
|
||||
echo " </td>\n";
|
||||
echo " <td class='vtablerow' style='".$bottom_border."' ".(permission_exists('sip_profile_setting_edit') ? "onclick=\"label_to_form('label_sip_profile_setting_value_$x','sip_profile_setting_value_$x');\"" : null)." nowrap='nowrap'>\n";
|
||||
echo " <label id='label_sip_profile_setting_value_$x'>".escape(substr($row["sip_profile_setting_value"],0,22))." </label>\n";
|
||||
echo " <label id='label_sip_profile_setting_value_$x'>".escape(substr($row["sip_profile_setting_value"] ?? '',0,22))." </label>\n";
|
||||
echo " <input id='sip_profile_setting_value_$x' class='formfld' style='display: none;' type='text' name='sip_profile_settings[$x][sip_profile_setting_value]' maxlength='255' value=\"".escape($row["sip_profile_setting_value"])."\">\n";
|
||||
echo " </td>\n";
|
||||
echo " <td class='vtablerow' style='".$bottom_border." text-align: center;' ".(permission_exists('sip_profile_setting_edit') ? "onclick=\"label_to_form('label_sip_profile_setting_enabled_$x','sip_profile_setting_enabled_$x');\"" : null)." nowrap='nowrap'>\n";
|
||||
|
||||
Reference in New Issue
Block a user