From 37fd55484278db2d34946bf44f8e8261cba4576b Mon Sep 17 00:00:00 2001 From: fusionate Date: Fri, 2 Jun 2023 20:00:19 +0000 Subject: [PATCH] Conference Profiles: Updates for PHP 8.1 --- .../conference_profile_edit.php | 26 ++++++++++- .../conference_profile_param_edit.php | 28 +++++++++++- .../conference_profile_params.php | 24 ++++++++++ .../conference_profiles.php | 2 +- .../resources/classes/conference_profiles.php | 44 ++++++++++--------- 5 files changed, 99 insertions(+), 25 deletions(-) diff --git a/app/conference_profiles/conference_profile_edit.php b/app/conference_profiles/conference_profile_edit.php index d5ad33c5cd..55a3ef41c3 100644 --- a/app/conference_profiles/conference_profile_edit.php +++ b/app/conference_profiles/conference_profile_edit.php @@ -1,4 +1,28 @@ + Portions created by the Initial Developer are Copyright (C) 2018-2023 + the Initial Developer. All Rights Reserved. + + Contributor(s): + Mark J Crane +*/ //set the include path $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); @@ -37,7 +61,7 @@ //get http post variables and set them to php variables if (!empty($_POST)) { $profile_name = $_POST["profile_name"]; - $profile_enabled = $_POST["profile_enabled"] ?: 'false'; + $profile_enabled = $_POST["profile_enabled"] ?? 'false'; $profile_description = $_POST["profile_description"]; } //check to see if the http post exists diff --git a/app/conference_profiles/conference_profile_param_edit.php b/app/conference_profiles/conference_profile_param_edit.php index 5fd69f7cb2..15b1edb51e 100644 --- a/app/conference_profiles/conference_profile_param_edit.php +++ b/app/conference_profiles/conference_profile_param_edit.php @@ -1,4 +1,28 @@ + Portions created by the Initial Developer are Copyright (C) 2018-2023 + the Initial Developer. All Rights Reserved. + + Contributor(s): + Mark J Crane +*/ //set the include path $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); @@ -44,7 +68,7 @@ if (!empty($_POST)) { $profile_param_name = $_POST["profile_param_name"]; $profile_param_value = $_POST["profile_param_value"]; - $profile_param_enabled = $_POST["profile_param_enabled"] ?: 'false'; + $profile_param_enabled = $_POST["profile_param_enabled"] ?? 'false'; $profile_param_description = $_POST["profile_param_description"]; } @@ -84,7 +108,7 @@ } //add or update the database - if (!empty($_POST["persistformvar"])) { + if (empty($_POST["persistformvar"])) { $array['conference_profile_params'][0]['conference_profile_uuid'] = $conference_profile_uuid; $array['conference_profile_params'][0]['profile_param_name'] = $profile_param_name; diff --git a/app/conference_profiles/conference_profile_params.php b/app/conference_profiles/conference_profile_params.php index d00605a474..02af38d136 100644 --- a/app/conference_profiles/conference_profile_params.php +++ b/app/conference_profiles/conference_profile_params.php @@ -1,4 +1,28 @@ + Portions created by the Initial Developer are Copyright (C) 2018-2023 + the Initial Developer. All Rights Reserved. + + Contributor(s): + Mark J Crane +*/ //set the include path $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); diff --git a/app/conference_profiles/conference_profiles.php b/app/conference_profiles/conference_profiles.php index 2fe5c18400..38d3637bb1 100644 --- a/app/conference_profiles/conference_profiles.php +++ b/app/conference_profiles/conference_profiles.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2018-2020 + Portions created by the Initial Developer are Copyright (C) 2018-2023 the Initial Developer. All Rights Reserved. Contributor(s): diff --git a/app/conference_profiles/resources/classes/conference_profiles.php b/app/conference_profiles/resources/classes/conference_profiles.php index 8ca0d283bc..831dcaa0e7 100644 --- a/app/conference_profiles/resources/classes/conference_profiles.php +++ b/app/conference_profiles/resources/classes/conference_profiles.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2019 + Portions created by the Initial Developer are Copyright (C) 2019-2023 the Initial Developer. All Rights Reserved. Contributor(s): @@ -90,7 +90,7 @@ if (!class_exists('conference_profiles')) { $x = 0; foreach ($records as $record) { //add to the array - if ($record['checked'] == 'true' && is_uuid($record['uuid'])) { + if (!empty($record['checked']) && $record['checked'] == 'true' && is_uuid($record['uuid'])) { $array[$this->table][$x][$this->name.'_uuid'] = $record['uuid']; $array['conference_profile_params'][$x][$this->name.'_uuid'] = $record['uuid']; } @@ -146,12 +146,12 @@ if (!class_exists('conference_profiles')) { } //delete multiple records - if (is_array($records) && @sizeof($records) != 0) { + if (!empty($records) && is_array($records) && @sizeof($records) != 0) { //build the delete array $x = 0; foreach ($records as $record) { //add to the array - if ($record['checked'] == 'true' && is_uuid($record['uuid'])) { + if (!empty($record['checked']) && $record['checked'] == 'true' && is_uuid($record['uuid'])) { $array[$this->table][$x][$this->name.'_uuid'] = $record['uuid']; } @@ -160,7 +160,7 @@ if (!class_exists('conference_profiles')) { } //delete the checked rows - if (is_array($array) && @sizeof($array) != 0) { + if (!empty($array) && is_array($array) && @sizeof($array) != 0) { //execute delete $database = new database; $database->app_name = $this->app_name; @@ -206,7 +206,7 @@ if (!class_exists('conference_profiles')) { if (is_array($records) && @sizeof($records) != 0) { //get current toggle state foreach($records as $record) { - if ($record['checked'] == 'true' && is_uuid($record['uuid'])) { + if (!empty($record['checked']) && $record['checked'] == 'true' && is_uuid($record['uuid'])) { $uuids[] = "'".$record['uuid']."'"; } } @@ -214,7 +214,7 @@ if (!class_exists('conference_profiles')) { $sql = "select ".$this->name."_uuid as uuid, ".$this->toggle_field." as toggle from v_".$this->table." "; $sql .= "where ".$this->name."_uuid in (".implode(', ', $uuids).") "; $database = new database; - $rows = $database->select($sql, $parameters, 'all'); + $rows = $database->select($sql, $parameters ?? null, 'all'); if (is_array($rows) && @sizeof($rows) != 0) { foreach ($rows as $row) { $states[$row['uuid']] = $row['toggle']; @@ -275,18 +275,18 @@ if (!class_exists('conference_profiles')) { } //toggle the checked records - if (is_array($records) && @sizeof($records) != 0) { + if (!empty($records) && is_array($records) && @sizeof($records) != 0) { //get current toggle state foreach ($records as $record) { - if ($record['checked'] == 'true' && is_uuid($record['uuid'])) { + if (!empty($record['checked']) && $record['checked'] == 'true' && is_uuid($record['uuid'])) { $uuids[] = "'".$record['uuid']."'"; } } - if (is_array($uuids) && @sizeof($uuids) != 0) { + if (!empty($uuids) && is_array($uuids) && @sizeof($uuids) != 0) { $sql = "select ".$this->name."_uuid as uuid, ".$this->toggle_field." as toggle from v_".$this->table." "; $sql .= "where ".$this->name."_uuid in (".implode(', ', $uuids).") "; $database = new database; - $rows = $database->select($sql, $parameters, 'all'); + $rows = $database->select($sql, $parameters ?? null, 'all'); if (is_array($rows) && @sizeof($rows) != 0) { foreach ($rows as $row) { $states[$row['uuid']] = $row['toggle']; @@ -297,17 +297,19 @@ if (!class_exists('conference_profiles')) { //build update array $x = 0; - foreach ($states as $uuid => $state) { - //create the array - $array[$this->table][$x][$this->name.'_uuid'] = $uuid; - $array[$this->table][$x][$this->toggle_field] = $state == $this->toggle_values[0] ? $this->toggle_values[1] : $this->toggle_values[0]; + if (!empty($states) && is_array($states) && @sizeof($states) != 0) { + foreach ($states as $uuid => $state) { + //create the array + $array[$this->table][$x][$this->name.'_uuid'] = $uuid; + $array[$this->table][$x][$this->toggle_field] = $state == $this->toggle_values[0] ? $this->toggle_values[1] : $this->toggle_values[0]; - //increment the id - $x++; + //increment the id + $x++; + } } //save the changes - if (is_array($array) && @sizeof($array) != 0) { + if (!empty($array) && is_array($array) && @sizeof($array) != 0) { //save the array $database = new database; $database->app_name = $this->app_name; @@ -353,7 +355,7 @@ if (!class_exists('conference_profiles')) { //get checked records foreach($records as $record) { - if ($record['checked'] == 'true' && is_uuid($record['uuid'])) { + if (!empty($record['checked']) && $record['checked'] == 'true' && is_uuid($record['uuid'])) { $uuids[] = "'".$record['uuid']."'"; } } @@ -365,7 +367,7 @@ if (!class_exists('conference_profiles')) { $sql = "select * from v_".$this->table." "; $sql .= "where ".$this->name."_uuid in (".implode(', ', $uuids).") "; $database = new database; - $rows = $database->select($sql, $parameters, 'all'); + $rows = $database->select($sql, $parameters ?? null, 'all'); if (is_array($rows) && @sizeof($rows) != 0) { $y = 0; foreach ($rows as $x => $row) { @@ -376,7 +378,7 @@ if (!class_exists('conference_profiles')) { //add copy to the description $array[$this->table][$x][$this->name.'_uuid'] = $primary_uuid; - $array[$this->table][$x][$this->description_field] = trim($row[$this->description_field]).' ('.$text['label-copy'].')'; + $array[$this->table][$x][$this->description_field] = trim($row[$this->description_field] ?? '').' ('.$text['label-copy'].')'; //params sub table $sql_2 = "select * from v_conference_profile_params where conference_profile_uuid = :conference_profile_uuid";