php 8.1 changes (#6747)

* Update ivr_menu_edit.php

* Update call_block.php
This commit is contained in:
Alex 2023-06-07 13:31:20 -06:00 committed by GitHub
parent 473033257a
commit 3b2964748a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View File

@ -98,7 +98,7 @@
//prepare to page the results
$sql = "select count(*) from view_call_block ";
$sql .= "where true ";
if (!empty($show) && $show == "all" && permission_exists('call_block_all')) {
if ($show == "all" && permission_exists('call_block_all')) {
//$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
}
@ -135,7 +135,7 @@
//prepare to page the results
$rows_per_page = (!empty($_SESSION['domain']['paging']['numeric'])) ? $_SESSION['domain']['paging']['numeric'] : 50;
$param = "&search=".$search;
if (!empty($_GET['show']) && $_GET['show'] == "all" && permission_exists('call_block_all')) {
if ($show == "all" && permission_exists('call_block_all')) {
$param .= "&show=all";
}
$page = $_GET['page'] ?? '';
@ -147,7 +147,7 @@
//get the list
$sql = "select * from view_call_block ";
$sql .= "where true ";
if (!empty($_GET['show']) == "all" && permission_exists('call_block_all')) {
if ($show == "all" && permission_exists('call_block_all')) {
//$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
}
@ -209,7 +209,7 @@
}
echo "<form id='form_search' class='inline' method='get'>\n";
if (permission_exists('call_block_all')) {
if (!empty($show) && $show == 'all') {
if ($show == 'all') {
echo " <input type='hidden' name='show' value='all'>";
}
else {
@ -251,7 +251,7 @@
echo " <input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".(!empty($result) ?: "style='visibility: hidden;'").">\n";
echo " </th>\n";
}
if (!empty($show) && $show == 'all' && permission_exists('domain_all')) {
if ($show == 'all' && permission_exists('domain_all')) {
echo th_order_by('domain_name', $text['label-domain'], $order_by, $order);
}
echo th_order_by('call_block_direction', $text['label-direction'], $order_by, $order, null, "style='width: 1%;' class='center'");

View File

@ -302,7 +302,7 @@
$array['ivr_menus'][0]["ivr_menu_description"] = $ivr_menu_description;
$y = 0;
foreach ($ivr_menu_options as $row) {
if (!empty($row['ivr_menu_option_digits'])) {
if (isset($row['ivr_menu_option_digits']) && $row['ivr_menu_option_digits'] != '') {
if (!empty($row['ivr_menu_option_uuid']) && is_uuid($row['ivr_menu_option_uuid'])) {
$ivr_menu_option_uuid = $row['ivr_menu_option_uuid'];
}