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";