dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix all PHP 8.1 messages for upgrade.php

Browse Source
This commit is contained in:
markjcrane
2023-05-17 10:07:49 -06:00
parent 6816921f47
commit 6d7e125743
22 changed files with 215 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/classes/database.php
+27 -15
View File
@@ -1299,7 +1299,9 @@
$transaction_type = 'delete';
//get the UUIDs
$user_uuid = $_SESSION['user_uuid'];
if (!empty($_SESSION['user_uuid'])) {
$user_uuid = $_SESSION['user_uuid'];
}
//log the transaction results
if (file_exists($_SERVER["PROJECT_ROOT"]."/app/database_transactions/app_config.php")) {
@@ -2131,7 +2133,7 @@
}
elseif ($array_value === "user_uuid()") {
$sql .= ':'.$array_key.", ";
$params[$array_key] = $_SESSION['user_uuid'];
$params[$array_key] = $_SESSION['user_uuid'] ?? null;
}
elseif ($array_value === "remote_address()") {
$sql .= ':'.$array_key.", ";
@@ -2151,7 +2153,9 @@
$sql .= ");";
//add insert user parameter
$params['insert_user'] = $_SESSION['user_uuid'];
if (!empty($_SESSION['user_uuid'])) {
$params['insert_user'] = $_SESSION['uer_uuid'];
}
//set the error mode
$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -2230,7 +2234,7 @@
}
elseif ($array_value === "user_uuid()") {
$sql .= $array_key." = :".$array_key.", ";
$params[$array_key] = $_SESSION['user_uuid'];
$params[$array_key] = $_SESSION['user_uuid'] ?? null;
}
elseif ($array_value === "remote_address()") {
$sql .= $array_key." = :".$array_key.", ";
@@ -2245,16 +2249,20 @@
}
//add the modified date and user
$sql .= "update_date = now(), ";
$sql .= "update_user = :update_user ";
$params['update_user'] = $_SESSION['user_uuid'];
if (!empty($_SESSION['user_uuid'])) {
$sql .= "update_date = now(), ";
$sql .= "update_user = :update_user ";
$params['update_user'] = $_SESSION['user_uuid'];
}
//add the where with the parent name and value
$sql .= "WHERE ".$parent_key_name." = '".$parent_key_value."'; ";
$sql = str_replace(", WHERE", " WHERE", $sql);
//add update user parameter
$params['update_user'] = $_SESSION['user_uuid'];
if (!empty($_SESSION['user_uuid'])) {
$params['update_user'] = $_SESSION['user_uuid'];
}
//set the error mode
$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -2277,7 +2285,7 @@
$message["details"][$m]["code"] = "200";
$message["details"][$m]["uuid"] = $parent_key_value;
$message["details"][$m]["sql"] = $sql;
if (is_array($params)) {
if (!empty($params)) {
$message["details"][$m]["params"] = $params;
}
unset($params);
@@ -2293,7 +2301,7 @@
$message["details"][$m]["message"] = $e->getMessage();
$message["details"][$m]["code"] = "400";
$message["details"][$m]["sql"] = $sql;
if (is_array($params)) {
if (!empty($params)) {
$message["details"][$m]["params"] = $params;
}
unset($params);
@@ -2416,7 +2424,7 @@
}
elseif ($v === "user_uuid()") {
$sql .= $k." = :".$k.", ";
$params[$k] = $_SESSION['user_uuid'];
$params[$k] = $_SESSION['user_uuid'] ?? null;
}
elseif ($v === "remote_address()") {
$sql .= $k." = :".$k.", ";
@@ -2433,7 +2441,7 @@
//add the modified date and user
$sql .= "update_date = now(), ";
$sql .= "update_user = :update_user ";
$params['update_user'] = $_SESSION['user_uuid'];
$params['update_user'] = $_SESSION['user_uuid'] ?? null;
//add the where with the parent name and value
$sql .= "WHERE ".$parent_key_name." = '".$parent_key_value."' ";
@@ -2564,7 +2572,7 @@
}
elseif ($v === "user_uuid()") {
$sql .= ':'.$k.", ";
$params[$k] = $_SESSION['user_uuid'];
$params[$k] = $_SESSION['user_uuid'] ?? null;
}
elseif ($v === "remote_address()") {
$sql .= ':'.$k.", ";
@@ -2589,7 +2597,9 @@
$sql .= ");";
//add insert user parameter
$params['insert_user'] = $_SESSION['user_uuid'];
if (!empty($_SESSION['user_uuid'])) {
$params['insert_user'] = $_SESSION['user_uuid'];
}
//set the error mode
$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -2675,7 +2685,9 @@
}
//get the UUIDs
$user_uuid = $_SESSION['user_uuid'];
if (!empty($_SESSION['user_uuid'])) {
$user_uuid = $_SESSION['user_uuid'];
}
//log the transaction results
if ($transaction_save && file_exists($_SERVER["PROJECT_ROOT"]."/app/database_transactions/app_config.php")) {
resources/classes/switch_settings.php
+12
View File
@@ -66,6 +66,18 @@ if (!class_exists('switch_settings')) {
}
}
//set defaults
$vars['base_dir'] = empty($vars['base_dir']) ?? '';
$vars['conf_dir'] = empty($vars['conf_dir']) ?? '';
$vars['db_dir'] = empty($vars['db_dir']) ?? '';
$vars['recordings_dir'] = empty($vars['recordings_dir']) ?? '';
$vars['script_dir'] = empty($vars['script_dir']) ?? '';
$vars['sounds_dir'] = empty($vars['sounds_dir']) ?? '';
$vars['storage_dir'] = empty($vars['storage_dir']) ?? '';
$vars['grammar_dir'] = empty($vars['grammar_dir']) ?? '';
$vars['log_dir'] = empty($vars['log_dir']) ?? '';
$vars['mod_dir'] = empty($vars['mod_dir']) ?? '';
//set the bin directory
if ($vars['base_dir'] == "/usr/local/freeswitch") {
$bin = "/usr/local/freeswitch/bin";
resources/switch.php
+15 -15
View File
@@ -39,7 +39,7 @@
$sql = "select * from v_settings ";
$database = new database;
$row = $database->select($sql, null, 'row');
if (is_array($row) && @sizeof($row) != 0) {
if (!empty($row)) {
$_SESSION['event_socket_ip_address'] = $row["event_socket_ip_address"];
$_SESSION['event_socket_port'] = $row["event_socket_port"];
$_SESSION['event_socket_password'] = $row["event_socket_password"];
@@ -74,7 +74,7 @@ function event_socket_request_cmd($cmd) {
$sql = "select * from v_settings ";
$database = new database;
$row = $database->select($sql, null, 'row');
if (is_array($row) && @sizeof($row) != 0) {
if (!empty($row)) {
$event_socket_ip_address = $row["event_socket_ip_address"];
$event_socket_port = $row["event_socket_port"];
$event_socket_password = $row["event_socket_password"];
@@ -127,7 +127,7 @@ function save_setting_xml() {
$sql = "select * from v_settings ";
$database = new database;
$row = $database->select($sql, null, 'row');
if (is_array($row) && @sizeof($row) != 0) {
if (!empty($row)) {
$fout = fopen($_SESSION['switch']['conf']['dir']."/directory/default/default.xml","w");
$xml = "<include>\n";
$xml .= " <user id=\"default\"> <!--if id is numeric mailbox param is not necessary-->\n";
@@ -248,7 +248,7 @@ function save_gateway_xml() {
$parameters['domain_uuid'] = $domain_uuid;
$database = new database;
$result = $database->select($sql, $parameters, 'all');
if (is_array($result) && @sizeof($result) != 0) {
if (!empty($result)) {
foreach ($result as &$row) {
if ($row['enabled'] != "false") {
//set the default profile as external
@@ -382,10 +382,10 @@ function save_var_xml() {
$sql .= "where var_enabled = 'true' ";
$sql .= "order by var_category, var_order asc ";
$database = new database;
$variables = $database->select($sql, $parameters, 'all');
$variables = $database->select($sql, null, 'all');
$prev_var_category = '';
$xml = '';
if (is_array($variables) && @sizeof($variables) != 0) {
if (!empty($variables)) {
foreach ($variables as &$row) {
if ($row['var_category'] != 'Provision') {
if ($prev_var_category != $row['var_category']) {
@@ -463,7 +463,7 @@ function outbound_route_to_bridge($domain_uuid, $destination_number, array $chan
$result = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);
if (is_array($result) && @sizeof($result) != 0) {
if (!empty($result)) {
foreach ($result as &$row) {
$dialplan_uuid = $row["dialplan_uuid"];
$dialplan_detail_uuid = $row["dialplan_detail_uuid"];
@@ -474,7 +474,7 @@ function outbound_route_to_bridge($domain_uuid, $destination_number, array $chan
}
}
if (is_array($outbound_routes) && @sizeof($outbound_routes) != 0) {
if (!empty($outbound_routes)) {
$x = 0;
foreach ($outbound_routes as &$dialplan) {
$condition_match = false;
@@ -568,7 +568,7 @@ function extension_presence_id($extension, $number_alias = false) {
$parameters['extension'] = $extension;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (is_array($row) && @sizeof($row) != 0) {
if (!empty($row)) {
$extension = $row['extension'];
$number_alias = $row['number_alias'];
}
@@ -596,7 +596,7 @@ function get_recording_filename($id) {
$parameters['domain_uuid'] = $domain_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (is_array($row) && @sizeof($row) != 0) {
if (!empty($row)) {
//$filename = $row["filename"];
//$recording_name = $row["recording_name"];
//$recording_uuid = $row["recording_uuid"];
@@ -656,7 +656,7 @@ if (!function_exists('save_call_center_xml')) {
$call_center_queues = $database->select($sql, null, 'all');
unset($sql);
if (is_array($call_center_queues) && @sizeof($call_center_queues) != 0) {
if (!empty($call_center_queues)) {
//prepare Queue XML string
$x=0;
@@ -729,7 +729,7 @@ if (!function_exists('save_call_center_xml')) {
unset($sql);
$x=0;
if (is_array($result) && @sizeof($result) != 0) {
if (!empty($result)) {
foreach ($result as &$row) {
//get the values from the db and set as php variables
$agent_name = $row["agent_name"];
@@ -819,7 +819,7 @@ if (!function_exists('save_call_center_xml')) {
unset($sql);
$x=0;
if (is_array($result) && @sizeof($result) != 0) {
if (!empty($result)) {
foreach ($result as &$row) {
$agent_name = $row["agent_name"];
$queue_name = $row["queue_name"];
@@ -980,7 +980,7 @@ if (!function_exists('save_sip_profile_xml')) {
$result = $database->select($sql, null, 'all');
unset($sql);
if (is_array($result) && @sizeof($result) != 0) {
if (!empty($result)) {
foreach($result as $row) {
$sip_profile_uuid = $row['sip_profile_uuid'];
$sip_profile_name = $row['sip_profile_name'];
@@ -1009,7 +1009,7 @@ if (!function_exists('save_sip_profile_xml')) {
$parameters['sip_profile_uuid'] = $sip_profile_uuid;
$database = new database;
$result_2 = $database->select($sql, $parameters, 'all');
if (is_array($result_2) && @sizeof($result_2) != 0) {
if (!empty($result_2)) {
$sip_profile_settings = '';
foreach ($result_2 as &$row_2) {
$sip_profile_settings .= " <param name=\"".$row_2["sip_profile_setting_name"]."\" value=\"".$row_2["sip_profile_setting_value"]."\"/>\n";