Merge branch 'ent-11648-envio-de-correos-falla-si-se-tiene-la-encriptacion-de-contrasenas-habilitadas-en-771-772' into 'develop'
Draft: Ent 11648 Envío de correos falla si se tiene la encriptación de contraseñas habilitadas en 771-772. See merge request artica/pandorafms!6177
This commit is contained in:
commit
2092cfed71
|
@ -2839,7 +2839,7 @@ function config_process_config()
|
|||
}
|
||||
|
||||
if (!isset($config['email_from_dir'])) {
|
||||
config_update_value('email_from_dir', 'pandora@pandorafms.com/community/');
|
||||
config_update_value('email_from_dir', 'pandora@pandorafms.com');
|
||||
}
|
||||
|
||||
if (!isset($config['email_from_name'])) {
|
||||
|
|
|
@ -774,9 +774,16 @@ sub pandora_sendmail {
|
|||
$mail{Message} = encode("UTF-8", $mail{Message});
|
||||
$mail{'Content-Type'} = 'text/plain; charset="UTF-8"';
|
||||
}
|
||||
|
||||
|
||||
if ($pa_config->{"mta_user"} ne ""){
|
||||
$mail{auth} = {user=>$pa_config->{"mta_user"}, password=>$pa_config->{"mta_pass"}, method=>$pa_config->{"mta_auth"}, required=>1 };
|
||||
$mail{auth} = {
|
||||
user=>$pa_config->{"mta_user"},
|
||||
password=>PandoraFMS::Core::pandora_output_password(
|
||||
$pa_config,
|
||||
safe_output($pa_config->{"mta_pass"})
|
||||
),
|
||||
method=>$pa_config->{"mta_auth"}, required=>1
|
||||
};
|
||||
}
|
||||
|
||||
eval {
|
||||
|
|
Loading…
Reference in New Issue