1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-19 03:50:54 +01:00

When marking up Phurl URLs for mail, use absolute URLs

Summary: Fixes T10625.

Test Plan: Faked this locallly and it looked OK, I'll check the mail in production. :3333

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10625

Differential Revision: https://secure.phabricator.com/D15497
This commit is contained in:
epriestley 2016-03-18 15:56:12 -07:00
parent 01885cad1c
commit 981f3a9068

View file

@ -18,7 +18,9 @@ final class PhabricatorPhurlLinkRemarkupRule extends PhutilRemarkupRule {
public function markupLink(array $matches) {
$engine = $this->getEngine();
$viewer = $engine->getConfig('viewer');
$text_mode = $engine->isTextMode();
$html_mode = $engine->isHTMLMailMode();
if (!$this->isFlatText($matches[0])) {
return $matches[0];
@ -28,46 +30,45 @@ final class PhabricatorPhurlLinkRemarkupRule extends PhutilRemarkupRule {
$monogram = null;
$is_monogram = '/^U(?P<id>[1-9]\d*)/';
$query = id(new PhabricatorPhurlURLQuery())
->setViewer($viewer);
if (preg_match($is_monogram, $ref, $monogram)) {
$phurls = id(new PhabricatorPhurlURLQuery())
->setViewer($viewer)
->withIDs(array($monogram[1]))
->execute();
$query->withIDs(array($monogram[1]));
} else if (ctype_digit($ref)) {
$phurls = id(new PhabricatorPhurlURLQuery())
->setViewer($viewer)
->withIDs(array($ref))
->execute();
$query->withIDs(array($ref));
} else {
$phurls = id(new PhabricatorPhurlURLQuery())
->setViewer($viewer)
->withAliases(array($ref))
->execute();
$query->withAliases(array($ref));
}
$phurl = head($phurls);
$phurl = $query->executeOne();
if (!$phurl) {
return $matches[0];
}
if ($phurl) {
if ($text_mode) {
return $phurl->getDisplayName().
' <'.
$phurl->getRedirectURI().
'>';
}
$uri = $phurl->getRedirectURI();
$name = $phurl->getDisplayName();
if ($text_mode || $html_mode) {
$uri = PhabricatorEnv::getProductionURI($uri);
}
if ($text_mode) {
return pht(
'%s <%s>',
$name,
$uri);
} else {
$link = phutil_tag(
'a',
array(
'href' => $phurl->getRedirectURI(),
'href' => $uri,
'target' => '_blank',
),
$phurl->getDisplayName());
return $this->getEngine()->storeText($link);
} else {
return $matches[0];
$name);
}
return $this->getEngine()->storeText($link);
}
}