diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 18ddd0ffb0..f860d642a5 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -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'])) { diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm index fb4b551a3a..56f9f8dfa1 100755 --- a/pandora_server/lib/PandoraFMS/Tools.pm +++ b/pandora_server/lib/PandoraFMS/Tools.pm @@ -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 {