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

Merge branch 'ent-7301-mejora-informacion-console-task' into 'develop'

Browse Source 
Ent 7301 mejora informacion console task

Closes pandora_enterprise#7301

See merge request artica/pandorafms!4667
This commit is contained in:
Daniel Rodriguez 2022-02-03 12:40:05 +00:00
commit 1ba89e521e
1 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
pandora_console/include/functions_cron.php
View File

@ -532,13 +532,20 @@ function cron_list_table()
continue; continue;
} }
$email = $args[1]; $email = ui_print_truncate_text($args[1], 120);
$report_type = $args[4]; $reportName = ui_print_truncate_text($report['name'], 120);
$data[2] .= '<br>- '.__('Report').": <a href='index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id=".$args[0]."'>"; $reportType = $args[4];
$data[2] .= $report['name'].'</a>'; $data[2] .= html_print_anchor(
$data[2] .= '<br>- '.__('Report type').': '.$report_type; [
$data[2] .= '<br>- '.__('Email').": <a href='mailto:".$email."'>"; 'href' => ui_get_full_url(
$data[2] .= ui_print_truncate_text($email, 60, false).'</a>'; 'index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id='.$args[0]
),
'content' => $reportName,
],
true
);
$data[2] .= '<br>- '.__('Report type').': '.$reportType;
$data[2] .= '<br>- '.__('Email').': '.$email;
break; break;
case 'cron_task_generate_report_by_template': case 'cron_task_generate_report_by_template':
@ -582,32 +589,48 @@ function cron_list_table()
} }
if (empty($args[1]) === false && (string) $args[1] !== '0') { if (empty($args[1]) === false && (string) $args[1] !== '0') {
$agents_id = $args[1]; if (is_metaconsole() === true) {
$tmpAgents = explode(',', $args[1]);
$agentsId = '';
foreach ($tmpAgents as $tmpAgent) {
$tmpAgentData = explode('|', $tmpAgent);
$agentsId .= (empty($agentsId) === false) ? ', '.$tmpAgentData[2] : $tmpAgentData[2];
}
}
} else { } else {
if (empty($args[2]) === false) { if (empty($args[2]) === false) {
$agents_id = sprintf( $agentsId = sprintf(
'(%s) %s', '<em>(%s)</em> %s',
__('regex'), __('regex'),
$args[2] $args[2]
); );
} else { } else {
$agents_id = __('None'); $agentsId = __('None');
} }
} }
$report_type = $args[8]; // Assignations.
$report_per_agent = $args[3]; $agentsId = ui_print_truncate_text($agentsId, 120);
$report_name = $args[4]; $reportPerAgent = ((string) $args[3] === '1') ? __('Yes') : __('No');
$email = $args[5]; $reportName = ui_print_truncate_text($args[4], 120);
$email = ui_print_truncate_text($args[5], 120);
$reportType = $args[8];
// Table row.
$data[2] .= '<br>- '.__('Template').': '; $data[2] .= '<br>- '.__('Template').': ';
$data[2] .= '<a href="'.ui_get_full_url('index.php?sec=reporting&sec2=enterprise/godmode/reporting/reporting_builder.template&action=edit&id_template='.$args[0]).'">'; $data[2] .= html_print_anchor(
$data[2] .= $template['name'].'</a>'; [
$data[2] .= '<br>- '.__('Agents').': '.ui_print_truncate_text($agents_id, 120).'</a>'; 'href' => ui_get_full_url(
$data[2] .= '<br>- '.__('Report per agent').': '.$report_per_agent.'</a>'; 'index.php?sec=reporting&sec2=enterprise/godmode/reporting/reporting_builder.template&action=edit&id_template='.$args[0]
$data[2] .= '<br>- '.__('Report name').': '.$report_name.'</a>'; ),
$data[2] .= '<br>- '.__('Email').": <a href='mailto:".$email."'>".$email.'</a>'; 'content' => $template['name'],
$data[2] .= '<br>- '.__('Report type').': '.$report_type; ],
true
);
$data[2] .= '<br>- '.__('Agents').': '.$agentsId;
$data[2] .= '<br>- '.__('Report per agent').': '.$reportPerAgent;
$data[2] .= '<br>- '.__('Report name').': '.$reportName;
$data[2] .= '<br>- '.__('Email').': '.$email;
$data[2] .= '<br>- '.__('Report type').': '.$reportType;
break; break;
case 'cron_task_execute_custom_script': case 'cron_task_execute_custom_script':