tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#9771 change json format in summary

This commit is contained in:
Daniel Cebrian 2023-04-28 11:33:33 +02:00
parent 58a52ff450
commit 8c479a88a3
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
View File

@ -1456,7 +1456,7 @@ class DiscoveryTaskList extends HTML
} else if ((int) $task['type'] === DISCOVERY_EXTENSION) {
// Content.
$countSummary = 1;
if (is_array($task['stats']) === true && array_key_first($task['stats']) === 0) {
if (is_array($task['stats']) === true && count(array_filter(array_keys($task['stats']), 'is_numeric')) === count($task['stats'])) {
foreach ($task['stats'] as $key => $summary) {
$table->data[$i][0] = '<b>'.__('Summary').' '.$countSummary.'</b>';
$table->data[$i][1] = '';
@ -1470,7 +1470,7 @@ class DiscoveryTaskList extends HTML
continue;
}
$unknownJson = [];
$unknownJson = $summary;
foreach ($summary as $k2 => $v) {
if (is_array($v) === true) {
if ($k2 === 'summary') {
@ -1479,39 +1479,31 @@ class DiscoveryTaskList extends HTML
$table->data[$i][1] = $v2;
$i++;
}
} else {
$table->data[$i][0] = json_encode([$k2 => $v], JSON_PRETTY_PRINT);
$table->data[$i][1] = '';
$i++;
unset($unknownJson[$k2]);
}
} else {
if ($k2 === 'info') {
$table->data[$i][0] = $v;
$table->data[$i][1] = '';
$i++;
} else if ($k2 !== array_key_last($summary)) {
$unknownJson = array_merge($unknownJson, [$k2 => $v]);
} else {
$unknownJson = array_merge($unknownJson, [$k2 => $v]);
unset($unknownJson[$k2]);
}
}
}
if (empty($unknownJson) === false) {
$table->data[$i][0] = json_encode($unknownJson, JSON_PRETTY_PRINT);
$table->data[$i][1] = '';
$i++;
}
}
}
} else {
$table->data[$i][0] = $summary;
$table->data[$i][1] = '';
$i++;
}
}
} else {
$table->data[$i][0] = '<b>'.__('Summary').'</b>';
$table->data[$i][1] = '';
$i++;
$table->data[$i][0] = $task['summary'];
$table->data[$i][1] = '';
$i++;
}
} else {
// Content.