Reverted the header change, added note in app/Config/email on how to enable it

- otherwise it might break custom e-mail configurations
pull/893/head
Iglocska 2016-01-28 13:13:15 +01:00
parent e12e0a018d
commit 7b3d2af8c4
2 changed files with 3 additions and 7 deletions

View File

@ -42,11 +42,11 @@
*/
class EmailConfig {
// to set the return-path header, simply uncomment the line below and change you@localhost to the desired e-mail address
public $default = array(
'transport' => 'Mail',
//'from' => 'you@localhost',
'charset' => 'utf-8',
//'headerCharset' => 'utf-8',
//'additionalParameters' => '-f you@localhost'
);
public $smtp = array(

View File

@ -572,11 +572,7 @@ class User extends AppModel {
}
$replyToLog = '';
if (!$failed) {
$Email = new CakeEmail(array(
'transport' => 'Mail',
'charset' => 'utf-8',
'additionalParameters' => '-f ' . Configure::read('MISP.email')
));
$Email = new CakeEmail();
// If the e-mail is sent on behalf of a user, then we want the target user to be able to respond to the sender
// For this reason we should also attach the public key of the sender along with the message (if applicable)