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

change email alert templates

This commit is contained in:
alejandro.campos@artica.es 2022-04-07 17:24:06 +02:00
parent 8a5875f987
commit 6b708777f6
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/include/javascript/pandora.js
View File

@ -1361,7 +1361,8 @@ function defineTinyMCE(added_config) {
element_format: "html", element_format: "html",
object_resizing: true, object_resizing: true,
autoresize_bottom_margin: 50, autoresize_bottom_margin: 50,
autoresize_on_init: true autoresize_on_init: true,
extended_valid_elements: "img[*]"
}); });
if (!isEmptyObject(added_config)) { if (!isEmptyObject(added_config)) {

6
pandora_console/pandoradb_data.sql
View File

File diff suppressed because one or more lines are too long

13
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -1367,6 +1367,7 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
_modulegroup_ => undef, _modulegroup_ => undef,
_moduledescription_ => (defined ($module)) ? $module->{'descripcion'} : '', _moduledescription_ => (defined ($module)) ? $module->{'descripcion'} : '',
_modulestatus_ => undef, _modulestatus_ => undef,
_statusimage_ => undef,
_moduletags_ => undef, _moduletags_ => undef,
'_moduledata_\S+_' => undef, '_moduledata_\S+_' => undef,
_id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '', _id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '',
@ -4560,6 +4561,18 @@ sub on_demand_macro($$$$$$;$) {
return (defined ($module)) ? (get_module_group_name ($dbh, $module->{'id_module_group'}) || '') : ''; return (defined ($module)) ? (get_module_group_name ($dbh, $module->{'id_module_group'}) || '') : '';
} elsif ($macro eq '_modulestatus_') { } elsif ($macro eq '_modulestatus_') {
return (defined ($module)) ? get_agentmodule_status_str($pa_config, $dbh, $module->{'id_agente_modulo'}) : ''; return (defined ($module)) ? get_agentmodule_status_str($pa_config, $dbh, $module->{'id_agente_modulo'}) : '';
} elsif ($macro eq '_statusimage_') {
my $status = (defined ($module)) ? get_agentmodule_status($pa_config, $dbh, $module->{'id_agente_modulo'}) : -1;
if ($status == MODULE_CRITICAL) {
return 'https://pandorafms.com/wp-content/uploads/2022/03/System-email-Bad-news.png';
} elsif ($status == MODULE_NORMAL) {
return 'https://pandorafms.com/wp-content/uploads/2022/03/System-email-Good-news.png';
} elsif ($status == MODULE_WARNING) {
return 'https://pandorafms.com/wp-content/uploads/2022/03/Warning-news.png';
}
return '';
} elsif ($macro eq '_moduletags_') { } elsif ($macro eq '_moduletags_') {
return (defined ($module)) ? pandora_get_module_url_tags ($pa_config, $dbh, $module->{'id_agente_modulo'}) : ''; return (defined ($module)) ? pandora_get_module_url_tags ($pa_config, $dbh, $module->{'id_agente_modulo'}) : '';
} elsif ($macro eq '_policy_') { } elsif ($macro eq '_policy_') {