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

Few more adjustments for PHP 8.1

This commit is contained in:
markjcrane 2023-06-02 17:52:38 -06:00
parent 190e13628d
commit 79df700a81
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/database_transactions/database_transaction_edit.php
View File

@ -244,20 +244,24 @@
//this adds old and new values to the array //this adds old and new values to the array
function array_difference($array1, $array2) { function array_difference($array1, $array2) {
$array = array(); $array = array();
if (!empty($array1)) { if (is_array($array1)) {
foreach ($array1 as $key => $value) { foreach ($array1 as $key => $value) {
if (!empty($array2[$key])) { if (is_array($array2[$key])) {
$array[$key] = array_difference($array1[$key], $array2[$key]); if (isset($array1[$key]) && isset($array2[$key])) {
$array[$key] = array_difference($array1[$key], $array2[$key]);
}
} }
else { else {
$array[$key]['old'] = $value; $array[$key]['old'] = $value;
} }
} }
} }
if (!empty($array2)) { if (is_array($array2)) {
foreach ($array2 as $key => $value) { foreach ($array2 as $key => $value) {
if (!empty($value)) { if (is_array($value)) {
$array[$key] = array_difference($array1[$key], $array2[$key]); if (isset($array1[$key]) && isset($array2[$key])) {
$array[$key] = array_difference($array1[$key], $array2[$key]);
}
} }
else { else {
$array[$key]['new'] = $value; $array[$key]['new'] = $value;
@ -285,10 +289,8 @@
} }
else { else {
//set the variables //set the variables
$old = $value['old']; $old = $value['old'] ?? '';
$new = $value['new']; $new = $value['new'] ?? '';
if (is_null($old)) { $old = ''; }
if (is_null($new)) { $new = ''; }
//determine if the value has changed //determine if the value has changed
if (strval($old) == strval($new) && isset($old)) { if (strval($old) == strval($new) && isset($old)) {
$color = "#000000"; $color = "#000000";
@ -316,8 +318,8 @@
} }
//decode the json to arrays //decode the json to arrays
$before = json_decode($transaction_old, true); $before = json_decode($transaction_old ?? '', true);
$after = json_decode($transaction_new, true); $after = json_decode($transaction_new ?? '', true);
//unset the sessions //unset the sessions
unset($_SESSION['previous_name']); unset($_SESSION['previous_name']);
@ -334,16 +336,18 @@
foreach ($value as $row) { foreach ($value as $row) {
$sub_id = 0; $sub_id = 0;
foreach ($row as $sub_key => $val) { foreach ($row as $sub_key => $val) {
if (!empty($val)) { if (!empty($val) && is_array($val)) {
foreach ($val as $sub_row) { foreach ($val as $sub_row) {
foreach ($sub_row as $k => $v) { if (!empty($sub_row) && is_array($sub_row)) {
$array[$x]['schema'] = $sub_key; foreach ($sub_row as $k => $v) {
$array[$x]['row'] = $sub_id; $array[$x]['schema'] = $sub_key;
$array[$x]['name'] = $k; $array[$x]['row'] = $sub_id;
$array[$x]['value'] = htmlentities($v); $array[$x]['name'] = $k;
$x++; $array[$x]['value'] = htmlentities($v ?? '');
$x++;
}
$sub_id++;
} }
$sub_id++;
} }
} }
else { else {
@ -361,6 +365,7 @@
echo "<br />\n"; echo "<br />\n";
echo "<table width='100%'>\n"; echo "<table width='100%'>\n";
if (!empty($array)) { if (!empty($array)) {
$previous_schema = null;
foreach ($array as $row) { foreach ($array as $row) {
if ($row['schema'] !== $previous_schema || $row['row'] !== $previous_row) { if ($row['schema'] !== $previous_schema || $row['row'] !== $previous_row) {
echo "<tr><td colspan='4'>&nbsp;</td></tr>\n"; echo "<tr><td colspan='4'>&nbsp;</td></tr>\n";