revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-09 16:32:39 +01:00
Code Issues Releases Wiki Activity

Make some email stuff work better.

Browse source 
Summary:

Test Plan:

Reviewers:

CC:
This commit is contained in:
epriestley 2011-02-06 14:22:09 -08:00
parent df49a6c721
commit f07e4f2c16
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
conf/default.conf.php
View file

@ -40,6 +40,9 @@ return array(
// terrible. If you disable this option, you must run the 'metamta_mta.php' // terrible. If you disable this option, you must run the 'metamta_mta.php'
// daemon or mail won't be handed off to the MTA. // daemon or mail won't be handed off to the MTA.
'metamta.send-immediately' => true, 'metamta.send-immediately' => true,
// "Reply-To" email address to use for no-reply emails.
'metamta.noreply' => 'noreply@example.com',
// -- Access Control -------------------------------------------------------- // // -- Access Control -------------------------------------------------------- //

6
src/applications/auth/controller/email/PhabricatorEmailLoginController.php
View file

@ -63,11 +63,13 @@ class PhabricatorEmailLoginController extends PhabricatorAuthController {
$etoken = $target_user->generateEmailToken(); $etoken = $target_user->generateEmailToken();
$mail = new PhabricatorMetaMTAMail(); $mail = new PhabricatorMetaMTAMail();
$mail->setSubject('Phabricator Email Authentication'); $mail->setSubject('[Phabricator] Password Reset');
$mail->setFrom($target_user->getPHID());
$mail->addTos( $mail->addTos(
array( array(
$target_user->getEmail(), $target_user->getPHID(),
)); ));
$mail->setReplyTo(PhabricatorEnv::getEnvConfig('metamta.noreply'));
$mail->setBody( $mail->setBody(
"blah blah blah ". "blah blah blah ".
PhabricatorEnv::getURI('/login/etoken/'.$etoken.'/').'?email='.phutil_escape_uri($target_user->getEmail())); PhabricatorEnv::getURI('/login/etoken/'.$etoken.'/').'?email='.phutil_escape_uri($target_user->getEmail()));