diegods/homelabdspbx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Warnings for Recordings, Ring Group Edit and Operator Panel (#6739)

Browse Source 
* Update ring_group_edit.php

* Update recordings.php

* Update recording_edit.php

* Update content.php
This commit is contained in:
Anthony
2023-06-02 14:37:30 -06:00
committed by GitHub
parent 150735c810
commit fae05e5341
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/basic_operator_panel/resources/content.php
+1 -1
View File
@@ -111,7 +111,7 @@ if ($fp) {
}
//prevent warnings
if (!is_array($_SESSION['user']['extensions'])) {
if (empty($_SESSION['user']['extensions'])) {
$_SESSION['user']['extensions'] = array();
}
app/recordings/recording_edit.php
+1 -1
View File
@@ -150,7 +150,7 @@ if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
}
//pre-populate the form
if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
if (!empty($_GET) && empty($_POST["persistformvar"])) {
$recording_uuid = $_GET["id"];
$sql = "select recording_name, recording_filename, recording_description from v_recordings ";
$sql .= "where domain_uuid = :domain_uuid ";
app/recordings/recordings.php
+2 -2
View File
@@ -315,7 +315,7 @@
}
$sql .= $sql_search;
$database = new database;
$num_rows = $database->select($sql, $parameters, 'column');
$num_rows = $database->select($sql, $parameters ?? null, 'column');
//prepare to page the results
$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
@@ -340,7 +340,7 @@
$sql .= order_by($order_by, $order, 'recording_name', 'asc');
$sql .= limit_offset($rows_per_page, $offset);
$database = new database;
$recordings = $database->select($sql, $parameters, 'all');
$recordings = $database->select($sql, $parameters ?? null, 'all');
unset($sql, $parameters);
//get current recordings password
app/ring_groups/ring_group_edit.php
+7 -6
View File
@@ -60,6 +60,7 @@
$ring_group_forward_destination = '';
$ring_group_forward_toll_allow = '';
$ring_group_description = '';
$onkeyup = '';
//initialize the destinations object
$destination = new destinations;
@@ -78,7 +79,7 @@
//get the ring_group_uuid
$ring_group_uuid = $_REQUEST["id"];
if (is_uuid($_REQUEST["ring_group_uuid"])) {
if (!empty($_REQUEST["ring_group_uuid"])) {
$ring_group_uuid = $_REQUEST["ring_group_uuid"];
}
@@ -655,12 +656,12 @@
echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','link'=>'ring_groups.php']);
if ($action == 'update') {
$button_margin = 'margin-left: 15px;';
if (permission_exists('ring_group_add') && (!is_numeric($_SESSION['limit']['ring_groups']['numeric']) || ($total_ring_groups < $_SESSION['limit']['ring_groups']['numeric']))) {
if (permission_exists('ring_group_add') && (!isset($_SESSION['limit']['ring_groups']['numeric']) || ($total_ring_groups < $_SESSION['limit']['ring_groups']['numeric']))) {
echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','style'=>$button_margin,'onclick'=>"modal_open('modal-copy','btn_copy');"]);
unset($button_margin);
}
if (permission_exists('ring_group_delete') || permission_exists('ring_group_destination_delete')) {
echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','style'=>$button_margin,'onclick'=>"modal_open('modal-delete','btn_delete');"]);
echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','style'=>$button_margin ?? '','onclick'=>"modal_open('modal-delete','btn_delete');"]);
unset($button_margin);
}
}
@@ -670,7 +671,7 @@
echo "</div>\n";
if ($action == "update") {
if (permission_exists('ring_group_add') && (!is_numeric($_SESSION['limit']['ring_groups']['numeric']) || ($total_ring_groups < $_SESSION['limit']['ring_groups']['numeric']))) {
if (permission_exists('ring_group_add') && (!isset($_SESSION['limit']['ring_groups']['numeric']) || ($total_ring_groups < $_SESSION['limit']['ring_groups']['numeric']))) {
echo modal::create(['id'=>'modal-copy','type'=>'copy','actions'=>button::create(['type'=>'submit','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_copy','style'=>'float: right; margin-left: 15px;','collapse'=>'never','name'=>'action','value'=>'copy','onclick'=>"modal_close();"])]);
}
if (permission_exists('ring_group_delete') || permission_exists('ring_group_destination_delete')) {
@@ -782,7 +783,7 @@
if (empty($row['destination_delay'])) { $row['destination_delay'] = "0"; }
if (empty($row['destination_timeout'])) { $row['destination_timeout'] = "30"; }
if (!empty($row['ring_group_destination_uuid'])) {
if (!empty($row['ring_group_destination_uuid']) && is_uuid($row['ring_group_destination_uuid'])) {
echo " <input name='ring_group_destinations[".$x."][ring_group_destination_uuid]' type='hidden' value=\"".escape($row['ring_group_destination_uuid'])."\">\n";
}
@@ -853,7 +854,7 @@
}
echo " </td>\n";
if ($show_destination_delete && permission_exists('ring_group_destination_delete')) {
if (is_uuid($row['ring_group_destination_uuid'])) {
if (!empty($row['ring_group_destination_uuid']) && is_uuid($row['ring_group_destination_uuid'])) {
echo " <td class='vtable' style='text-align: center; padding-bottom: 3px;'>";
echo " <input type='checkbox' name='ring_group_destinations_delete[".$x."][checked]' value='true' class='chk_delete checkbox_destinations' onclick=\"edit_delete_action('destinations');\">\n";
echo " <input type='hidden' name='ring_group_destinations_delete[".$x."][uuid]' value='".escape($row['ring_group_destination_uuid'])."' />\n";