revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-22 23:02:42 +01:00
Code Issues Releases Wiki Activity

Fix message IDs and Herald URIs.

Browse source
This commit is contained in:
epriestley 2011-04-10 08:46:17 -07:00
parent 17ea3cfab5
commit fa38b70ba6
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
conf/default.conf.php
View file

@ -124,6 +124,9 @@ return array(
// Default address to send mail "From". // Default address to send mail "From".
'metamta.default-address' => 'noreply@example.com', 'metamta.default-address' => 'noreply@example.com',
// Domain used to generate Message-IDs.
'metamta.domain' => 'example.com',
// When a user takes an action which generates an email notification (like // When a user takes an action which generates an email notification (like
// commenting on a Differential revision), Phabricator can either send that // commenting on a Differential revision), Phabricator can either send that
// mail "From" the user's email address (like "alincoln@logcabin.com") or // mail "From" the user's email address (like "alincoln@logcabin.com") or

9
src/applications/differential/mail/base/DifferentialMail.php
View file

@ -133,10 +133,13 @@ EOTEXT;
*/ */
if ($this->getHeraldTranscriptURI() && $this->isFirstMailToRecipients()) { if ($this->getHeraldTranscriptURI() && $this->isFirstMailToRecipients()) {
$manage_uri = PhabricatorEnv::getProductionURI(
'/herald/view/differential/');
$xscript_uri = $this->getHeraldTranscriptURI(); $xscript_uri = $this->getHeraldTranscriptURI();
$body .= <<<EOTEXT $body .= <<<EOTEXT
MANAGE HERALD RULES MANAGE HERALD DIFFERENTIAL RULES
http://todo.com/herald/ http://todo.com/herald/
WHY DID I GET THIS EMAIL? WHY DID I GET THIS EMAIL?
@ -217,8 +220,8 @@ EOTEXT;
protected function getMessageID() { protected function getMessageID() {
$phid = $this->getRevision()->getPHID(); $phid = $this->getRevision()->getPHID();
// TODO $domain = PhabricatorEnv::getEnvConfig('metamta.domain');
return "<differential-rev-{$phid}-req@TODO.com>"; return "<differential-rev-{$phid}-req@{$domain}>";
} }
public function setComment($comment) { public function setComment($comment) {

2
src/applications/repository/worker/herald/PhabricatorRepositoryCommitHeraldWorker.php
View file

@ -112,7 +112,7 @@ DIFFERENTIAL REVISION
AFFECTED FILES AFFECTED FILES
{$files} {$files}
MANAGE HERALD RULES MANAGE HERALD COMMIT RULES
{$manage_uri} {$manage_uri}
WHY DID I GET THIS EMAIL? WHY DID I GET THIS EMAIL?