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

Merge branch 'ent-12063-16194-compilador-perl-packer-tiene-mal-encoding-en-japones' into 'develop' 

Ent-12063-16194-compilador-perl-packer-tiene-mal-encoding-en-japones

Closes pandora_enterprise#12063

See merge request artica/pandorafms!6844
This commit is contained in:
Daniel Rodriguez 2024-01-24 15:20:50 +00:00
parent 077252d9cb 5cf9d70c6f
commit 3300ab0870
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_server/conf/pandora_server.conf.new
View File

@ -816,3 +816,5 @@ madeserver_autofit 7d
# Model sensitivity. A lower value triggers less anomalies (PANDORA FMS ENTERPRISE ONLY). # Model sensitivity. A lower value triggers less anomalies (PANDORA FMS ENTERPRISE ONLY).
madeserver_sensitivity 0.1 madeserver_sensitivity 0.1
# Encoding to use on mail subject (MIME-Header by default)
# mail_subject_encoding MIME-Header-ISO_2022_JP

5
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -589,6 +589,8 @@ sub pandora_load_config {
$pa_config->{"madeserver"} = 0; # 774. $pa_config->{"madeserver"} = 0; # 774.
$pa_config->{"mail_subject_encoding"} = 'MIME-Header'; # 776.
# Check for UID0 # Check for UID0
if ($pa_config->{"quiet"} != 0){ if ($pa_config->{"quiet"} != 0){
if ($> == 0){ if ($> == 0){
@ -691,6 +693,9 @@ sub pandora_load_config {
elsif ($parametro =~ m/^mail_in_separate\s+([0-9]*)/i) { elsif ($parametro =~ m/^mail_in_separate\s+([0-9]*)/i) {
$pa_config->{'mail_in_separate'}= clean_blank($1); $pa_config->{'mail_in_separate'}= clean_blank($1);
} }
elsif ($parametro =~ m/^mail_subject_encoding\s(.*)/i) {
$pa_config->{'mail_subject_encoding'}= clean_blank($1);
}
elsif ($parametro =~ m/^snmp_logfile\s(.*)/i) { elsif ($parametro =~ m/^snmp_logfile\s(.*)/i) {
$pa_config->{'snmp_logfile'}= clean_blank($1); $pa_config->{'snmp_logfile'}= clean_blank($1);
} }

3
pandora_server/lib/PandoraFMS/Tools.pm
View File

@ -748,6 +748,7 @@ sub pandora_sendmail {
my $subject = $_[2]; my $subject = $_[2];
my $message = $_[3]; my $message = $_[3];
my $content_type = $_[4]; my $content_type = $_[4];
my $encoding = $pa_config->{"mail_subject_encoding"} || 'MIME-Header';
$subject = decode_entities ($subject); $subject = decode_entities ($subject);
@ -758,7 +759,7 @@ sub pandora_sendmail {
my %mail = ( To => $to_address, my %mail = ( To => $to_address,
Message => $message, Message => $message,
Subject => encode('MIME-Header', $subject), Subject => encode($encoding, $subject),
'X-Mailer' => $pa_config->{"rb_product_name"}, 'X-Mailer' => $pa_config->{"rb_product_name"},
Smtp => $pa_config->{"mta_address"}, Smtp => $pa_config->{"mta_address"},
Port => $pa_config->{"mta_port"}, Port => $pa_config->{"mta_port"},