tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-13598-item-grouped-end-of-life-al-crear-un-template-no-tiene-opciones-para-seleccionar-so-y-grupo' into 'develop'

Browse Source 
Ent 13598 item grouped end of life al crear un template no tiene opciones para seleccionar so y grupo

See merge request artica/pandorafms!7336
This commit is contained in:
Matias Didier 2024-05-09 15:56:49 +00:00
commit 13321fe29b
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -2757,14 +2757,16 @@ if (is_metaconsole() === true) {
<td class="bolder"><?php echo __('Date'); ?></td>
<td class="mx180px">
<?php
$dates = enterprise_hook(
'inventory_get_dates',
[
$idAgentModule,
$idAgent,
$group,
]
);
if (isset($idAgent) === true) {
$dates = enterprise_hook(
'inventory_get_dates',
[
$idAgentModule,
$idAgent,
$group,
]
);
}
if ($dates === ENTERPRISE_NOT_HOOK) {
$dates = [];

23
pandora_console/include/functions_reporting.php
View File

@ -3817,10 +3817,18 @@ function reporting_end_of_life($report, $content)
$return['data'] = [];
$external_source = json_decode(
$content['external_source'],
true
);
if (isset($content['external_source']) === true && $content['external_source'] !== 'null') {
$external_source = json_decode(
$content['external_source'],
true
);
} else {
$external_source = [
'end_of_life_date' => $content['end_of_life_date'],
'os_selector' => $content['os_selector'],
'os_version' => $content['os_version'],
];
}
$servers_ids = [0];
@ -3861,6 +3869,7 @@ function reporting_end_of_life($report, $content)
$es_limit_eol_datetime = DateTime::createFromFormat('Y/m/d', $external_source['end_of_life_date']);
// Post-process returned agents to filter agents using correctly formatted fields.
$agents_tmp = [];
foreach ($agents as $idx => $agent) {
if (empty($agent['os_version']) === true) {
$agent['os_version'] = '.*';
@ -3877,14 +3886,16 @@ function reporting_end_of_life($report, $content)
) {
// Agent matches an existing OS version.
$agents[$idx]['end_of_life'] = $result_end_of_life;
$agents_tmp[] = $agents[$idx];
} else {
// Set agent to be filtered out.
$agents[$idx] = null;
}
}
if ($agents !== false) {
$agents = array_filter($agents);
// TODO:
if ($agents_tmp !== false) {
$agents = $agents_tmp;
}
if (is_metaconsole() === true) {