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

Merge branch 'ent-11648-envio-de-correos-falla-si-se-tiene-la-encriptacion-de-contrasenas-habilitadas-en-771-772' into 'develop'

Browse Source 
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:
Rafael Ameijeiras 2023-06-30 07:05:44 +00:00
commit 2092cfed71
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_config.php
View File

@ -2839,7 +2839,7 @@ function config_process_config()
} }
if (!isset($config['email_from_dir'])) { 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'])) { if (!isset($config['email_from_name'])) {

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

@ -776,7 +776,14 @@ sub pandora_sendmail {
} }
if ($pa_config->{"mta_user"} ne ""){ 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 { eval {