Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

php 8.1 changes #6741

Merged
merged 7 commits into from Jun 2, 2023
Merged

php 8.1 changes #6741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
292ef1f
Update dashboard_edit.php
alexdcrane Jun 2, 2023
66e427b
Update dashboard_edit.php
alexdcrane Jun 2, 2023
9b40b50
Update dialplan_inbound_add.php
alexdcrane Jun 2, 2023
311e303
Update dialplan_outbound_add.php
alexdcrane Jun 2, 2023
5272e88
Update dialplan_inbound_add.php
alexdcrane Jun 2, 2023
45a0ea0
Update modules.php
alexdcrane Jun 2, 2023
b5e28a2
Update sip_profile_edit.php
alexdcrane Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 9 additions & 4 deletions app/dialplan_inbound/dialplan_inbound_add.php
View file
Open in desktop
Expand Up @@ -48,10 +48,15 @@
$language = new text;
$text = $language->get();

//set the defaults
$dialplan_name = '';
$dialplan_description = '';
$limit = '';

//get the http get values and set them as php variables
$order_by = $_GET["order_by"];
$order = $_GET["order"];
$action = $_GET["action"];
$order_by = $_GET["order_by"] ?? '';
$order = $_GET["order"] ?? '';
$action = $_GET["action"] ?? '';

//initialize the destinations object
$destination = new destinations;
Expand Down Expand Up @@ -710,7 +715,7 @@ function Replace_condition_field_2(obj){
}
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo $destination->select('dialplan', 'action_1', $action_1);
echo $destination->select('dialplan', 'action_1', $action_1 ?? null);
echo "</td>\n";
echo "</tr>\n";

Expand Down
11 changes: 9 additions & 2 deletions app/dialplan_outbound/dialplan_outbound_add.php
View file
Open in desktop
Expand Up @@ -50,6 +50,13 @@
$language = new text;
$text = $language->get();

//set the defaults
$prefix_number = '';
$dialplan_description = '';
$limit = '';
$accountcode = '';
$toll_allow = '';

//get the http post values and set theme as php variables
if (!empty($_POST)) {
//set the variables
Expand Down Expand Up @@ -1270,7 +1277,7 @@ function type_onchange(dialplan_detail_type) {
echo " <option value='false' selected='true'>".$text['label-false']."</option>\n";
echo " </select>\n";
echo "<br />\n";
echo $text['description-enable-pin_numbers']."\n";
//echo $text['description-enable-pin_numbers']."\n";
echo "</td>\n";
echo "</tr>\n";
}
Expand Down Expand Up @@ -1337,7 +1344,7 @@ function type_onchange(dialplan_detail_type) {
echo "</table>";
echo "<br><br>";

if ($action == "update") {
if (!empty($action) && $action == "update") {
echo "<input type='hidden' name='dialplan_uuid' value='".escape($dialplan_uuid)."'>\n";
}
echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
Expand Down
2 changes: 1 addition & 1 deletion app/modules/modules.php
View file
Open in desktop
Expand Up @@ -244,7 +244,7 @@ function write_header($modifier) {
}
else {
echo " <td class='hide-xs'>\n";
echo $row['module_enabled'] == 'true' ? "<strong style='color: red;'>".$text['label-stopped']."</strong>" : $text['label-stopped']." ".escape($notice);
echo $row['module_enabled'] == 'true' ? "<strong style='color: red;'>".$text['label-stopped']."</strong>" : $text['label-stopped']." ".escape($notice ?? null);
echo " </td>\n";
if (permission_exists('module_edit')) {
echo " <td class='no-link center'>";
Expand Down
2 changes: 2 additions & 0 deletions app/sip_profiles/sip_profile_edit.php
View file
Open in desktop
Expand Up @@ -305,6 +305,7 @@
$parameters['sip_profile_uuid'] = $sip_profile_uuid;
$database = new database;
$sip_profile_settings = $database->select($sql, $parameters, 'all');
if (empty($sip_profile_settings)) { $sip_profile_settings = []; }
unset($sql, $parameters);

//add an empty row
Expand All @@ -324,6 +325,7 @@
$parameters['sip_profile_uuid'] = $sip_profile_uuid;
$database = new database;
$sip_profile_domains = $database->select($sql, $parameters, 'all');
if (empty($sip_profile_domains)) { $sip_profile_domains = []; }
unset($sql, $parameters);

//add an empty row
Expand Down
15 changes: 13 additions & 2 deletions core/dashboard/dashboard_edit.php
View file
Open in desktop
Expand Up @@ -43,6 +43,17 @@
$language = new text;
$text = $language->get();

//set the defaults
$dashboard_name = '';
$dashboard_path = '';
$dashboard_groups = [];
$dashboard_column_span = '';
$dashboard_details_state = '';
$dashboard_order = '';
$dashboard_enabled = 'false';
$dashboard_description = '';
$dashboard_uuid = '';

//action add or update
if (!empty($_REQUEST["id"]) && is_uuid($_REQUEST["id"])) {
$action = "update";
Expand Down Expand Up @@ -224,7 +235,7 @@
}

//get the child data
if (is_uuid($dashboard_uuid)) {
if (!empty($dashboard_uuid) && is_uuid($dashboard_uuid)) {
$sql = "select ";
$sql .= " dashboard_group_uuid, ";
$sql .= " group_uuid ";
Expand Down Expand Up @@ -264,7 +275,7 @@
$sql = "select * from v_dashboard_groups as x, v_groups as g ";
$sql .= "where x.dashboard_uuid = :dashboard_uuid ";
$sql .= "and x.group_uuid = g.group_uuid ";
$parameters['dashboard_uuid'] = $dashboard_uuid;
$parameters['dashboard_uuid'] = $dashboard_uuid ?? '';
$database = new database;
$dashboard_groups = $database->select($sql, $parameters, 'all');
unset ($sql, $parameters);
Expand Down