mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-30 01:05:39 +02:00
Merge branch 'ent-7038-regex-agent-filter-generacion-informe-tasks' into 'develop'
Added agent regex to console task template send email Closes pandora_enterprise#7038 See merge request artica/pandorafms!4135
This commit is contained in:
commit
6f98ae05a1
@ -552,11 +552,25 @@ function cron_list_table()
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$agents_id = $args[1];
|
hd($args, true);
|
||||||
$id_group = $args[2];
|
hd('cron', true);
|
||||||
$report_per_agent = $args[0];
|
if (empty($args[1]) === false && (string) $args[1] !== '0') {
|
||||||
$report_name = $args[3];
|
$agents_id = $args[1];
|
||||||
$email = $args[4];
|
} else {
|
||||||
|
if (empty($args[2]) === false) {
|
||||||
|
$agents_id = sprintf(
|
||||||
|
'(%s) %s',
|
||||||
|
__('regex'),
|
||||||
|
$args[2]
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
$agents_id = __('None');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$report_per_agent = $args[3];
|
||||||
|
$report_name = $args[4];
|
||||||
|
$email = $args[5];
|
||||||
$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] .= '<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] .= $template['name'].'</a>';
|
$data[2] .= $template['name'].'</a>';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user