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

Convert some phutil_escape_html() to hsprintf()

Browse source 
Summary: Found by `sgrep_php -e '"...".phutil_escape_html(...)'`.

Test Plan:
/
/D1
/uiexample/
/countdown/1/
/herald/transcript/1/all/

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Maniphest Tasks: T2432

Differential Revision: https://secure.phabricator.com/D4869
This commit is contained in:
vrana 2013-02-08 12:07:44 -08:00
parent 138da5a279
commit d817dfa8fc
46 changed files with 299 additions and 325 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
View file

@ -182,10 +182,9 @@ class AphrontDefaultApplicationConfiguration
return $login_controller->processRequest();
}
$content =
'<div class="aphront-policy-exception">'.
phutil_escape_html($ex->getMessage()).
'</div>';
$content = hsprintf(
'<div class="aphront-policy-exception">%s</div>',
$ex->getMessage());
$dialog = new AphrontDialogView();
$dialog

4
src/applications/auth/controller/PhabricatorLoginValidateController.php
View file

@ -43,9 +43,9 @@ final class PhabricatorLoginValidateController
$list = array();
foreach ($failures as $failure) {
$list[] = '<li>'.phutil_escape_html($failure).'</li>';
$list[] = phutil_tag('li', array(), $failure);
}
$list = '<ul>'.implode("\n", $list).'</ul>';
$list = phutil_tag('ul', array(), $list);
$view = new AphrontRequestFailureView();
$view->setHeader(pht('Login Failed'));

2
src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
View file

@ -45,7 +45,7 @@ final class PhabricatorMustVerifyEmailController
'<p>'.
pht('You must verify your email address to login. You should have a new '.
'email message from Phabricator with verification instructions in your '.
'inbox (<strong>%s</strong>).', phutil_escape_html($email_address)).
'inbox (%s).', phutil_tag('strong', array(), $email_address)).
'</p>');
$error_view->appendChild(
'<p>'.

42
src/applications/auth/controller/PhabricatorOAuthLoginController.php
View file

@ -69,14 +69,16 @@ final class PhabricatorOAuthLoginController
$dialog = new AphrontDialogView();
$dialog->setUser($current_user);
$dialog->setTitle(pht('Already Linked to Another Account'));
$dialog->appendChild('<p>'.
$dialog->appendChild(phutil_tag(
'p',
array(),
pht(
'The %s account you just authorized is already linked to '.
'another Phabricator account. Before you can associate your %s '.
'account with this Phabriactor account, you must unlink it from '.
'the Phabricator account it is currently linked to.</p>',
phutil_escape_html($provider_name),
phutil_escape_html($provider_name))).'</p>';
'the Phabricator account it is currently linked to.',
$provider_name,
$provider_name)));
$dialog->addCancelButton($provider->getSettingsPanelURI());
return id(new AphrontDialogResponse())->setDialog($dialog);
@ -97,13 +99,15 @@ final class PhabricatorOAuthLoginController
$dialog->setUser($current_user);
$dialog->setTitle(
pht('Already Linked to an Account From This Provider'));
$dialog->appendChild('<p>'.
$dialog->appendChild(phutil_tag(
'p',
array(),
pht(
'The account you are logged in with is already linked to a %s '.
'account. Before you can link it to a different %s account, you '.
'must unlink the old account.</p>',
phutil_escape_html($provider_name),
phutil_escape_html($provider_name))).'</p>';
'must unlink the old account.',
$provider_name,
$provider_name)));
$dialog->addCancelButton($provider->getSettingsPanelURI());
return id(new AphrontDialogResponse())->setDialog($dialog);
}
@ -170,13 +174,15 @@ final class PhabricatorOAuthLoginController
$dialog = new AphrontDialogView();
$dialog->setUser($current_user);
$dialog->setTitle(pht('Already Linked to Another Account'));
$dialog->appendChild('<p>'.
$dialog->appendChild(phutil_tag(
'p',
array(),
pht(
'The %s account you just authorized has an email address which '.
'is already in use by another Phabricator account. To link the '.
'accounts, log in to your Phabricator account and then go to '.
'Settings.',
phutil_escape_html($provider_name))).'</p>';
$provider_name)));
$user = id(new PhabricatorUser())
->loadOneWhere('phid = %s', $known_email->getUserPHID());
@ -189,10 +195,12 @@ final class PhabricatorOAuthLoginController
$providers[] = PhabricatorOAuthProvider::newProvider($provider)
->getProviderName();
}
$dialog->appendChild(
$dialog->appendChild(phutil_tag(
'p',
array(),
pht(
'<p>The account is associated with: %s.</p>',
implode(', ', phutil_escape_html($providers))));
'The account is associated with: %s.',
implode(', ', $providers))));
}
$dialog->addCancelButton('/login/');
@ -205,13 +213,15 @@ final class PhabricatorOAuthLoginController
$dialog = new AphrontDialogView();
$dialog->setUser($current_user);
$dialog->setTitle(pht('No Account Registration with %s', $provider_name));
$dialog->appendChild('<p>'.
$dialog->appendChild(phutil_tag(
'p',
array(),
pht(
'You can not register a new account using %s; you can only use '.
'your %s account to log into an existing Phabricator account which '.
'you have registered through other means.',
phutil_escape_html($provider_name),
phutil_escape_html($provider_name))).'</p>';
$provider_name,
$provider_name)));
$dialog->addCancelButton('/login/');
return id(new AphrontDialogResponse())->setDialog($dialog);

6
src/applications/countdown/controller/PhabricatorCountdownDeleteController.php
View file

@ -33,9 +33,9 @@ final class PhabricatorCountdownDeleteController
$dialog = new AphrontDialogView();
$dialog->setUser($request->getUser());
$dialog->setTitle('Really delete this countdown?');
$dialog->appendChild(
'<p>Are you sure you want to delete the countdown "'.
phutil_escape_html($timer->getTitle()).'"?</p>');
$dialog->appendChild(hsprintf(
'<p>Are you sure you want to delete the countdown "%s"?</p>',
$timer->getTitle()));
$dialog->addSubmitButton('Delete');
$dialog->addCancelButton('/countdown/');
$dialog->setSubmitURI($request->getPath());

34
src/applications/countdown/controller/PhabricatorCountdownViewController.php
View file

@ -32,12 +32,9 @@ final class PhabricatorCountdownViewController
$chrome_visible ? pht('Disable Chrome') : pht('Enable Chrome'));
$container = celerity_generate_unique_node_id();
$content =
'<div class="phabricator-timer" id="'.$container.'">
<h1 class="phabricator-timer-header">'.
phutil_escape_html($timer->getTitle()).' &middot; '.
phabricator_datetime($timer->getDatePoint(), $user).
'</h1>
$content = hsprintf(
'<div class="phabricator-timer" id="%s">
<h1 class="phabricator-timer-header">%s &middot; %s</h1>
<div class="phabricator-timer-pane">
<table class="phabricator-timer-table">
<tr>
@ -46,20 +43,19 @@ final class PhabricatorCountdownViewController
<th>Minutes</th>
<th>Seconds</th>
</tr>
<tr>'.
javelin_tag('td',
array('sigil' => 'phabricator-timer-days'), '').
javelin_tag('td',
array('sigil' => 'phabricator-timer-hours'), '').
javelin_tag('td',
array('sigil' => 'phabricator-timer-minutes'), '').
javelin_tag('td',
array('sigil' => 'phabricator-timer-seconds'), '').
'</tr>
<tr>%s%s%s%s</tr>
</table>
</div>'.
$chrome_link.
'</div>';
</div>
%s
</div>',
$container,
$timer->getTitle(),
phabricator_datetime($timer->getDatePoint(), $user),
javelin_tag('td', array('sigil' => 'phabricator-timer-days'), ''),
javelin_tag('td', array('sigil' => 'phabricator-timer-hours'), ''),
javelin_tag('td', array('sigil' => 'phabricator-timer-minutes'), ''),
javelin_tag('td', array('sigil' => 'phabricator-timer-seconds'), ''),
$chrome_link);
Javelin::initBehavior('countdown-timer', array(
'timestamp' => $timer->getDatepoint(),

2
src/applications/daemon/view/PhabricatorDaemonLogEventsView.php
View file

@ -63,7 +63,7 @@ final class PhabricatorDaemonLogEventsView extends AphrontView {
phutil_escape_html($event->getLogType()),
phabricator_date($event->getEpoch(), $this->user),
phabricator_time($event->getEpoch(), $this->user),
str_replace("\n", '<br />', phutil_escape_html($message.$more)),
phutil_escape_html_newlines($message.$more),
);
if ($this->combinedLog) {

2
src/applications/differential/controller/DifferentialCommentSaveController.php
View file

@ -56,7 +56,7 @@ final class DifferentialCommentSaveController extends DifferentialController {
$dialog->setTitle(pht('Action Has No Effect'));
$dialog->appendChild(
'<p>'.phutil_escape_html($no_effect->getMessage()).'</p>');
phutil_tag('p', array(), $no_effect->getMessage()));
if (strlen($comment) || $has_inlines) {
$dialog->addSubmitButton(pht('Post as Comment'));

55
src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
View file

@ -70,10 +70,7 @@ abstract class DifferentialChangesetHTMLRenderer
break;
case DifferentialChangeType::TYPE_MOVE_HERE:
$from =
"<strong>".
phutil_escape_html($changeset->getOldFile()).
"</strong>";
$from = phutil_tag('strong', array(), $changeset->getOldFile());
switch ($file) {
case DifferentialChangeType::FILE_TEXT:
$message = pht('This file was moved from %s.', $from);
@ -97,10 +94,7 @@ abstract class DifferentialChangesetHTMLRenderer
break;
case DifferentialChangeType::TYPE_COPY_HERE:
$from =
"<strong>".
phutil_escape_html($changeset->getOldFile()).
"</strong>";
$from = phutil_tag('strong', array(), $changeset->getOldFile());
switch ($file) {
case DifferentialChangeType::FILE_TEXT:
$message = pht('This file was copied from %s.', $from);
@ -124,10 +118,10 @@ abstract class DifferentialChangesetHTMLRenderer
break;
case DifferentialChangeType::TYPE_MOVE_AWAY:
$paths =
"<strong>".
phutil_escape_html(implode(', ', $changeset->getAwayPaths())).
"</strong>";
$paths = phutil_tag(
'strong',
array(),
implode(', ', $changeset->getAwayPaths()));
switch ($file) {
case DifferentialChangeType::FILE_TEXT:
$message = pht('This file was moved to %s.', $paths);
@ -151,10 +145,10 @@ abstract class DifferentialChangesetHTMLRenderer
break;
case DifferentialChangeType::TYPE_COPY_AWAY:
$paths =
"<strong>".
phutil_escape_html(implode(', ', $changeset->getAwayPaths())).
"</strong>";
$paths = phutil_tag(
'strong',
array(),
implode(', ', $changeset->getAwayPaths()));
switch ($file) {
case DifferentialChangeType::FILE_TEXT:
$message = pht('This file was copied to %s.', $paths);
@ -178,10 +172,10 @@ abstract class DifferentialChangesetHTMLRenderer
break;
case DifferentialChangeType::TYPE_MULTICOPY:
$paths =
"<strong>".
phutil_escape_html(implode(', ', $changeset->getAwayPaths())).
"</strong>";
$paths = phutil_tag(
'strong',
array(),
implode(', ', $changeset->getAwayPaths()));
switch ($file) {
case DifferentialChangeType::FILE_TEXT:
$message = pht(
@ -262,23 +256,26 @@ abstract class DifferentialChangesetHTMLRenderer
$nval = idx($new, $key);
if ($oval !== $nval) {
if ($oval === null) {
$oval = '<em>null</em>';
$oval = phutil_tag('em', array(), 'null');
} else {
$oval = nl2br(phutil_escape_html($oval));
$oval = phutil_escape_html_newlines($oval);
}
if ($nval === null) {
$nval = '<em>null</em>';
$nval = phutil_tag('em', array(), 'null');
} else {
$nval = nl2br(phutil_escape_html($nval));
$nval = phutil_escape_html_newlines($nval);
}
$rows[] =
$rows[] = hsprintf(
'<tr>'.
'<th>'.phutil_escape_html($key).'</th>'.
'<td class="oval">'.$oval.'</td>'.
'<td class="nval">'.$nval.'</td>'.
'</tr>';
'<th>%s</th>'.
'<td class="oval">%s</td>'.
'<td class="nval">%s</td>'.
'</tr>',
$key,
$oval,
$nval);
}
}

18
src/applications/differential/view/DifferentialLocalCommitsView.php
View file

@ -54,17 +54,17 @@ final class DifferentialLocalCommitsView extends AphrontView {
} else {
$commit_hash = null;
}
$row[] = '<td>'.phutil_escape_html($commit_hash).'</td>';
$row[] = phutil_tag('td', array(), $commit_hash);
if ($has_tree) {
$tree = idx($commit, 'tree');
$tree = substr($tree, 0, 16);
$row[] = '<td>'.phutil_escape_html($tree).'</td>';
$row[] = phutil_tag('td', array(), $tree);
}
if ($has_local) {
$local_rev = idx($commit, 'local', null);
$row[] = '<td>'.phutil_escape_html($local_rev).'</td>';
$row[] = phutil_tag('td', array(), $local_rev);
}
$parents = idx($commit, 'parents', array());
@ -72,15 +72,15 @@ final class DifferentialLocalCommitsView extends AphrontView {
if (is_array($parent)) {
$parent = idx($parent, 'rev');
}
$parents[$k] = phutil_escape_html(substr($parent, 0, 16));
$parents[$k] = substr($parent, 0, 16);
}
$parents = implode('<br />', $parents);
$row[] = '<td>'.$parents.'</td>';
$parents = array_interleave(phutil_tag('br'), $parents);
$row[] = phutil_tag('td', array(), $parents);
$author = nonempty(
idx($commit, 'user'),
idx($commit, 'author'));
$row[] = '<td>'.phutil_escape_html($author).'</td>';
$row[] = phutil_tag('td', array(), $author);
$message = idx($commit, 'message');
@ -107,9 +107,9 @@ final class DifferentialLocalCommitsView extends AphrontView {
if ($date) {
$date = phabricator_datetime($date, $user);
}
$row[] = '<td>'.$date.'</td>';
$row[] = phutil_tag('td', array(), $date);
$rows[] = '<tr class="'.$class.'">'.implode('', $row).'</tr>';
$rows[] = phutil_tag('tr', array('class' => $class), $row);
}

38
src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
View file

@ -119,24 +119,22 @@ final class DifferentialRevisionUpdateHistoryView extends AphrontView {
}
if (++$idx % 2) {
$class = ' class="alt"';
$class = 'alt';
} else {
$class = null;
}
$lint_attrs = array('class' => 'revhistory-star');
$unit_attrs = array('class' => 'revhistory-star');
if ($diff) {
$lint = self::renderDiffLintStar($row['obj']);
$unit = self::renderDiffUnitStar($row['obj']);
$lint_message = self::getDiffLintMessage($diff);
$unit_message = self::getDiffUnitMessage($diff);
$lint_title = ' title="'.phutil_escape_html($lint_message).'"';
$unit_title = ' title="'.phutil_escape_html($unit_message).'"';
$lint_attrs['title'] = self::getDiffLintMessage($diff);
$unit_attrs['title'] = self::getDiffUnitMessage($diff);
$base = $this->renderBaseRevision($diff);
} else {
$lint = null;
$unit = null;
$lint_title = null;
$unit_title = null;
$base = null;
}
@ -149,18 +147,20 @@ final class DifferentialRevisionUpdateHistoryView extends AphrontView {
'a',
array('href' => '/differential/diff/'.$id.'/'),
$id);
$rows[] =
'<tr'.$class.'>'.
'<td class="revhistory-name">'.phutil_escape_html($name).'</td>'.
'<td class="revhistory-id">'.$id_link.'</td>'.
'<td class="revhistory-base">'.phutil_escape_html($base).'</td>'.
'<td class="revhistory-desc">'.phutil_escape_html($desc).'</td>'.
'<td class="revhistory-age">'.$age.'</td>'.
'<td class="revhistory-star"'.$lint_title.'>'.$lint.'</td>'.
'<td class="revhistory-star"'.$unit_title.'>'.$unit.'</td>'.
'<td class="revhistory-old'.$old_class.'">'.$old.'</td>'.
'<td class="revhistory-new'.$new_class.'">'.$new.'</td>'.
'</tr>';
$rows[] = phutil_tag(
'tr',
array('class' => $class),
array(
phutil_tag('td', array('class' => 'revhistory-name'), $name),
phutil_tag('td', array('class' => 'revhistory-id'), $id_link),
phutil_tag('td', array('class' => 'revhistory-base'), $base),
phutil_tag('td', array('class' => 'revhistory-desc'), $desc),
phutil_tag('td', array('class' => 'revhistory-age'), $age),
phutil_tag('td', $lint_attrs, $lint),
phutil_tag('td', $unit_attrs, $unit),
phutil_tag('td', array('class' => 'revhistory-old'.$old_class), $old),
phutil_tag('td', array('class' => 'revhistory-new'.$new_class), $new),
));
}
Javelin::initBehavior(

10
src/applications/diviner/controller/DivinerListController.php
View file

@ -41,11 +41,13 @@ final class DivinerListController extends PhabricatorController {
),
$name);
$out[] =
$out[] = hsprintf(
'<div class="aphront-directory-item">'.
'<h1>'.$link.'</h1>'.
'<p>'.phutil_escape_html($flavor).'</p>'.
'</div>';
'<h1>%s</h1>'.
'<p>%s</p>'.
'</div>',
$link,
$flavor);
}
$out =

5
src/applications/feed/story/PhabricatorFeedStory.php
View file

@ -243,15 +243,14 @@ abstract class PhabricatorFeedStory implements PhabricatorPolicyInterface {
}
final protected function renderString($str) {
return '<strong>'.phutil_escape_html($str).'</strong>';
return phutil_tag('strong', array(), $str);
}
final protected function renderSummary($text, $len = 128) {
if ($len) {
$text = phutil_utf8_shorten($text, $len);
}
$text = phutil_escape_html($text);
$text = str_replace("\n", '<br />', $text);
$text = phutil_escape_html_newlines($text);
return $text;
}

6
src/applications/files/controller/PhabricatorFileDeleteController.php
View file

@ -33,9 +33,9 @@ final class PhabricatorFileDeleteController extends PhabricatorFileController {
$dialog = new AphrontDialogView();
$dialog->setUser($user);
$dialog->setTitle('Really delete file?');
$dialog->appendChild(
"<p>Permanently delete '".phutil_escape_html($file->getName())."'? This ".
"action can not be undone.");
$dialog->appendChild(hsprintf(
"<p>Permanently delete '%s'? This action can not be undone.</p>",
$file->getName()));
$dialog->addSubmitButton('Delete');
$dialog->addCancelButton($file->getInfoURI());

16
src/applications/help/controller/PhabricatorHelpKeyboardShortcutController.php
View file

@ -25,14 +25,16 @@ final class PhabricatorHelpKeyboardShortcutController
foreach ($keys as $shortcut) {
$keystrokes = array();
foreach ($shortcut['keys'] as $stroke) {
$keystrokes[] = '<kbd>'.phutil_escape_html($stroke).'</kbd>';
$keystrokes[] = phutil_tag('kbd', array(), $stroke);
}
$keystrokes = implode(' or ', $keystrokes);
$rows[] =
'<tr>'.
'<th>'.$keystrokes.'</th>'.
'<td>'.phutil_escape_html($shortcut['description']).'</td>'.
'</tr>';
$keystrokes = array_interleave(' or ', $keystrokes);
$rows[] = phutil_tag(
'tr',
array(),
array(
phutil_tag('th', array(), $keystrokes),
phutil_tag('td', array(), $shortcut['description']),
));
}
$table =

6
src/applications/herald/controller/HeraldDeleteController.php
View file

@ -43,9 +43,9 @@ final class HeraldDeleteController extends HeraldController {
$dialog = new AphrontDialogView();
$dialog->setUser($request->getUser());
$dialog->setTitle('Really delete this rule?');
$dialog->appendChild(
"Are you sure you want to delete the rule ".
"'<strong>".phutil_escape_html($rule->getName())."</strong>'?");
$dialog->appendChild(hsprintf(
"Are you sure you want to delete the rule '<strong>%s</strong>'?",
$rule->getName()));
$dialog->addSubmitButton('Delete');
$dialog->addCancelButton('/herald/');
$dialog->setSubmitURI($request->getPath());

79
src/applications/herald/controller/HeraldTranscriptController.php
View file

@ -108,10 +108,7 @@ final class HeraldTranscriptController extends HeraldController {
$value = implode(', ', $value);
}
return
'<span class="condition-test-value">'.
phutil_escape_html($value).
'</span>';
return hsprintf('<span class="condition-test-value">%s</span>', $value);
}
private function buildSideNav() {
@ -296,22 +293,22 @@ final class HeraldTranscriptController extends HeraldController {
}
break;
}
$target = phutil_escape_html($target);
if ($apply_xscript->getApplied()) {
$outcome = '<span class="outcome-success">SUCCESS</span>';
$outcome = hsprintf('<span class="outcome-success">SUCCESS</span>');
} else {
$outcome = '<span class="outcome-failure">FAILURE</span>';
$outcome = hsprintf('<span class="outcome-failure">FAILURE</span>');
}
$outcome .= ' '.phutil_escape_html($apply_xscript->getAppliedReason());
$rows[] = array(
phutil_escape_html($action_names[$apply_xscript->getAction()]),
$target,
'<strong>Taken because:</strong> '.
phutil_escape_html($apply_xscript->getReason()).
'<br />'.
'<strong>Outcome:</strong> '.$outcome,
phutil_escape_html($target),
hsprintf(
'<strong>Taken because:</strong> %s<br />'.
'<strong>Outcome:</strong> %s %s',
$apply_xscript->getReason(),
$outcome,
$apply_xscript->getAppliedReason()),
);
}
@ -351,48 +348,48 @@ final class HeraldTranscriptController extends HeraldController {
$cond_markup = array();
foreach ($xscript->getConditionTranscriptsForRule($rule_id) as $cond) {
if ($cond->getNote()) {
$note =
'<div class="herald-condition-note">'.
phutil_escape_html($cond->getNote()).
'</div>';
$note = hsprintf(
'<div class="herald-condition-note">%s</div>',
$cond->getNote());
} else {
$note = null;
}
if ($cond->getResult()) {
$result =
$result = hsprintf(
'<span class="herald-outcome condition-pass">'.
"\xE2\x9C\x93".
'</span>';
'</span>');
} else {
$result =
$result = hsprintf(
'<span class="herald-outcome condition-fail">'.
"\xE2\x9C\x98".
'</span>';
'</span>');
}
$cond_markup[] =
'<li>'.
$result.' Condition: '.
phutil_escape_html($field_names[$cond->getFieldName()]).
' '.
phutil_escape_html($condition_names[$cond->getCondition()]).
' '.
$this->renderConditionTestValue($cond, $handles).
$note.
'</li>';
$cond_markup[] = phutil_tag(
'li',
array(),
hsprintf(
'%s Condition: %s %s %s%s',
$result,
$field_names[$cond->getFieldName()],
$condition_names[$cond->getCondition()],
$this->renderConditionTestValue($cond, $handles),
$note));
}
if ($rule->getResult()) {
$result = '<span class="herald-outcome rule-pass">PASS</span>';
$result = hsprintf(
'<span class="herald-outcome rule-pass">PASS</span>');
$class = 'herald-rule-pass';
} else {
$result = '<span class="herald-outcome rule-fail">FAIL</span>';
$result = hsprintf(
'<span class="herald-outcome rule-fail">FAIL</span>');
$class = 'herald-rule-fail';
}
$cond_markup[] =
'<li>'.$result.' '.phutil_escape_html($rule->getReason()).'</li>';
$cond_markup[] = hsprintf('<li>%s %s</li>', $result, $rule->getReason());
/*
if ($rule->getResult()) {
@ -426,16 +423,16 @@ final class HeraldTranscriptController extends HeraldController {
}
$rule_markup[] =
phutil_render_tag(
phutil_tag(
'li',
array(
'class' => $class,
),
'<div class="rule-name">'.
'<strong>'.phutil_escape_html($name).'</strong> '.
phutil_escape_html($handles[$rule->getRuleOwner()]->getName()).
'</div>'.
'<ul>'.implode("\n", $cond_markup).'</ul>');
hsprintf(
'<div class="rule-name"><strong>%s</strong> %s</div>%s',
$name,
$handles[$rule->getRuleOwner()]->getName(),
phutil_tag('ul', array(), $cond_markup)));
}
$panel = new AphrontPanelView();

8
src/applications/maniphest/controller/ManiphestSavedQueryDeleteController.php
View file

@ -34,11 +34,9 @@ final class ManiphestSavedQueryDeleteController extends ManiphestController {
$dialog = id(new AphrontDialogView())
->setUser($user)
->setTitle('Really delete this query?')
->appendChild(
'<p>'.
'Really delete the query "'.phutil_escape_html($name).'"? '.
'It will be lost forever!'.
'</p>')
->appendChild(hsprintf(
'<p>Really delete the query "%s"? It will be lost forever!</p>',
$name))
->addCancelButton('/maniphest/custom/')
->addSubmitButton('Delete');

8
src/applications/owners/controller/PhabricatorOwnersDeleteController.php
View file

@ -27,10 +27,10 @@ final class PhabricatorOwnersDeleteController
$dialog = id(new AphrontDialogView())
->setUser($user)
->setTitle('Really delete this package?')
->appendChild(
'<p>Are you sure you want to delete the "'.
phutil_escape_html($package->getName()).'" package? This operation '.
'can not be undone.</p>')
->appendChild(hsprintf(
'<p>Are you sure you want to delete the "%s" package? This operation '.
'can not be undone.</p>',
$package->getName()))
->addSubmitButton('Delete')
->addCancelButton('/owners/package/'.$package->getID().'/')
->setSubmitURI($request->getRequestURI());

3
src/applications/owners/controller/PhabricatorOwnersDetailController.php
View file

@ -92,8 +92,7 @@ final class PhabricatorOwnersDetailController
'path' => $path->getPath(),
'action' => 'browse'
));
$repo_name = '<strong>'.phutil_escape_html($repo->getName()).
'</strong>';
$repo_name = phutil_tag('strong', array(), $repo->getName());
$path_link = phutil_tag(
'a',
array(

2
src/applications/owners/controller/PhabricatorOwnersListController.php
View file

@ -253,7 +253,7 @@ final class PhabricatorOwnersListController
));
$pkg_paths[$key] =
($path->getExcluded() ? '&ndash;' : '+').' '.
'<strong>'.phutil_escape_html($repo->getName()).'</strong> '.
phutil_tag('strong', array(), $repo->getName()).
phutil_tag(
'a',
array(

18
src/applications/people/controller/PhabricatorPeopleProfileController.php
View file

@ -182,36 +182,36 @@ final class PhabricatorPeopleProfileController
$viewer = $this->getRequest()->getUser();
$content =
$content = hsprintf(
'<div class="phabricator-profile-info-group">
<h1 class="phabricator-profile-info-header">Basic Information</h1>
<div class="phabricator-profile-info-pane">
<table class="phabricator-profile-info-table">
<tr>
<th>PHID</th>
<td>'.phutil_escape_html($user->getPHID()).'</td>
<td>%s</td>
</tr>
<tr>
<th>User Since</th>
<td>'.phabricator_datetime($user->getDateCreated(),
$viewer).
'</td>
<td>%s</td>
</tr>
</table>
</div>
</div>';
$content .=
</div>'.
'<div class="phabricator-profile-info-group">
<h1 class="phabricator-profile-info-header">Flavor Text</h1>
<div class="phabricator-profile-info-pane">
<table class="phabricator-profile-info-table">
<tr>
<th>Blurb</th>
<td>'.$blurb.'</td>
<td>%s</td>
</tr>
</table>
</div>
</div>';
</div>',
$user->getPHID(),
phabricator_datetime($user->getDateCreated(), $viewer),
$blurb);
return $content;
}

53
src/applications/phame/controller/blog/PhameBlogFeedController.php
View file

@ -35,20 +35,19 @@ final class PhameBlogFeedController extends PhameController {
->execute();
$content = array();
$content[] = '<feed xmlns="http://www.w3.org/2005/Atom">';
$content[] = '<title>'.phutil_escape_html($blog->getName()).'</title>';
$content[] = '<id>'.phutil_escape_html(PhabricatorEnv::getProductionURI(
'/phame/blog/view/'.$blog->getID().'/')).'</id>';
$content[] = phutil_tag('title', array(), $blog->getName());
$content[] = phutil_tag('id', array(), PhabricatorEnv::getProductionURI(
'/phame/blog/view/'.$blog->getID().'/'));
$updated = $blog->getDateModified();
if ($posts) {
$updated = max($updated, max(mpull($posts, 'getDateModified')));
}
$content[] = '<updated>'.date('c', $updated).'</updated>';
$content[] = phutil_tag('updated', array(), date('c', $updated));
$description = $blog->getDescription();
if ($description != '') {
$content[] = '<subtitle>'.phutil_escape_html($description).'</subtitle>';
$content[] = phutil_tag('subtitle', array(), $description);
}
$engine = id(new PhabricatorMarkupEngine())->setViewer($user);
@ -63,37 +62,39 @@ final class PhameBlogFeedController extends PhameController {
->loadHandles();
foreach ($posts as $post) {
$content[] = '<entry>';
$content[] = '<title>'.phutil_escape_html($post->getTitle()).'</title>';
$content[] = '<link href="'.phutil_escape_html($post->getViewURI()).'"/>';
$content[] = hsprintf('<entry>');
$content[] = phutil_tag('title', array(), $post->getTitle());
$content[] = phutil_tag('link', array('href' => $post->getViewURI()));
$content[] = '<id>'.phutil_escape_html(PhabricatorEnv::getProductionURI(
'/phame/post/view/'.$post->getID().'/')).'</id>';
$content[] = phutil_tag('id', array(), PhabricatorEnv::getProductionURI(
'/phame/post/view/'.$post->getID().'/'));
$content[] =
'<author>'.
'<name>'.
phutil_escape_html($bloggers[$post->getBloggerPHID()]->getFullName()).
'</name>'.
'</author>';
$content[] = hsprintf(
'<author><name>%s</name>%s</author>',
$bloggers[$post->getBloggerPHID()]->getFullName());
$content[] = '<updated>'.date('c', $post->getDateModified()).'</updated>';
$content[] = phutil_tag(
'updated',
array(),
date('c', $post->getDateModified()));
$content[] =
$content[] = hsprintf(
'<content type="xhtml">'.
'<div xmlns="http://www.w3.org/1999/xhtml">'.
$engine->getOutput($post, PhamePost::MARKUP_FIELD_BODY).
'</div>'.
'</content>';
'<div xmlns="http://www.w3.org/1999/xhtml">%s</div>'.
'</content>',
$engine->getOutput($post, PhamePost::MARKUP_FIELD_BODY));
$content[] = '</entry>';
$content[] = hsprintf('</entry>');
}
$content[] = '</feed>';
$content = phutil_tag(
'feed',
array('xmlns' => 'http://www.w3.org/2005/Atom'),
$content);
return id(new AphrontFileResponse())
->setMimeType('application/xml')
->setContent(implode('', $content));
->setContent($content);
}
}

27
src/applications/phriction/controller/PhrictionDocumentController.php
View file

@ -45,31 +45,16 @@ final class PhrictionDocumentController
}
}
$create_uri = '/phriction/edit/?slug='.$slug;
$create_sentence =
'You can <strong>'.
phutil_tag(
'a',
array(
'href' => $create_uri,
),
'create a new document').
'</strong>.';
$button = phutil_tag(
'a',
array(
'href' => $create_uri,
'class' => 'green button',
),
'Create Page');
$page_content =
$page_content = hsprintf(
'<div class="phriction-content">'.
'<em>No content here!</em><br />'.
'No document found at <tt>'.phutil_escape_html($slug).'</tt>. '.
$create_sentence.
'</div>';
'No document found at <tt>%s</tt>. '.
'You can <strong><a href="%s">create a new document</a></strong>.'.
'</div>',
$slug,
$create_uri);
$page_title = 'Page Not Found';
$buttons = $button;
} else {
$version = $request->getInt('v');
if ($version) {

23
src/applications/ponder/view/PonderQuestionSummaryView.php
View file

@ -25,26 +25,23 @@ final class PonderQuestionSummaryView extends AphrontView {
$authorlink = $handles[$author_phid]
->renderLink();
$votecount =
$votecount = hsprintf(
'<div class="ponder-summary-votes">'.
phutil_escape_html($question->getVoteCount()).
'<div class="ponder-question-label">'.
'votes'.
'</div>'.
'</div>';
'%s'.
'<div class="ponder-question-label">votes</div>'.
'</div>',
$question->getVoteCount());
$answerclass = "ponder-summary-answers";
if ($question->getAnswercount() == 0) {
$answerclass .= " ponder-not-answered";
}
$answercount =
$answercount = hsprintf(
'<div class="ponder-summary-answers">'.
phutil_escape_html($question->getAnswerCount()).
'<div class="ponder-question-label">'.
'answers'.
'</div>'.
'</div>';
'%s'.
'<div class="ponder-question-label">answers</div>'.
'</div>',
$question->getAnswerCount());
$title =
'<h2 class="ponder-question-title">'.

19
src/applications/project/controller/PhabricatorProjectProfileController.php
View file

@ -129,8 +129,7 @@ final class PhabricatorProjectProfileController
$viewer = $this->getRequest()->getUser();
$blurb = $profile->getBlurb();
$blurb = phutil_escape_html($blurb);
$blurb = str_replace("\n", '<br />', $blurb);
$blurb = phutil_escape_html_newlines($blurb);
$phids = array($project->getAuthorPHID());
$phids = array_unique($phids);
@ -138,30 +137,34 @@ final class PhabricatorProjectProfileController
$timestamp = phabricator_datetime($project->getDateCreated(), $viewer);
$about =
$about = hsprintf(
'<div class="phabricator-profile-info-group">
<h1 class="phabricator-profile-info-header">About</h1>
<div class="phabricator-profile-info-pane">
<table class="phabricator-profile-info-table">
<tr>
<th>Creator</th>
<td>'.$handles[$project->getAuthorPHID()]->renderLink().'</td>
<td>%s</td>
</tr>
<tr>
<th>Created</th>
<td>'.$timestamp.'</td>
<td>%s</td>
</tr>
<tr>
<th>PHID</th>
<td>'.phutil_escape_html($project->getPHID()).'</td>
<td>%s</td>
</tr>
<tr>
<th>Blurb</th>
<td>'.$blurb.'</td>
<td>%s</td>
</tr>
</table>
</div>
</div>';
</div>',
$handles[$project->getAuthorPHID()]->renderLink(),
$timestamp,
$project->getPHID(),
$blurb);
return $about;
}

8
src/applications/repository/controller/PhabricatorRepositoryArcanistProjectDeleteController.php
View file

@ -28,10 +28,10 @@ final class PhabricatorRepositoryArcanistProjectDeleteController
$dialog
->setUser($request->getUser())
->setTitle('Really delete this arcanist project?')
->appendChild(
'<p>Really delete the "'.phutil_escape_html($arc_project->getName()).
'" arcanist project? '.
'This operation can not be undone.</p>')
->appendChild(hsprintf(
'<p>Really delete the "%s" arcanist project? '.
'This operation can not be undone.</p>',
$arc_project->getName()))
->setSubmitURI('/repository/project/delete/'.$this->id.'/')
->addSubmitButton('Delete Arcanist Project')
->addCancelButton('/repository/');

3
src/applications/repository/controller/PhabricatorRepositoryDeleteController.php
View file

@ -24,8 +24,7 @@ final class PhabricatorRepositoryDeleteController
$dialog = new AphrontDialogView();
$text_1 = pht('If you really want to delete the repository, you must run:');
$command = 'bin/repository delete '.
phutil_escape_html($repository->getCallsign());
$command = 'bin/repository delete '.$repository->getCallsign();
$text_2 = pht('Repositories touch many objects and as such deletes are '.
'prohibitively expensive to run from the web UI.');
$body = phutil_tag(

11
src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php
View file

@ -301,9 +301,9 @@ final class PhabricatorSettingsPanelEmailAddresses
->setUser($user)
->addHiddenInput('verify', $email_id)
->setTitle("Send Another Verification Email?")
->appendChild(
'<p>Send another copy of the verification email to '.
phutil_escape_html($address).'?</p>')
->appendChild(hsprintf(
'<p>Send another copy of the verification email to %s?</p>',
$address))
->addSubmitButton('Send Email')
->addCancelButton($uri);
@ -342,9 +342,10 @@ final class PhabricatorSettingsPanelEmailAddresses
->setUser($user)
->addHiddenInput('primary', $email_id)
->setTitle("Change primary email address?")
->appendChild(
->appendChild(hsprintf(
'<p>If you change your primary address, Phabricator will send all '.
'email to '.phutil_escape_html($address).'.</p>')
'email to %s.</p>',
$address))
->addSubmitButton('Change Primary Address')
->addCancelButton($uri);

16
src/applications/uiexample/controller/PhabricatorUIExampleRenderController.php
View file

@ -43,16 +43,14 @@ final class PhabricatorUIExampleRenderController extends PhabricatorController {
require_celerity_resource('phabricator-ui-example-css');
$nav->appendChild(
$nav->appendChild(hsprintf(
'<div class="phabricator-ui-example-header">'.
'<h1 class="phabricator-ui-example-name">'.
phutil_escape_html($example->getName()).
' ('.get_class($example).')'.
'</h1>'.
'<p class="phabricator-ui-example-description">'
.$example->getDescription().
'</p>'.
'</div>');
'<h1 class="phabricator-ui-example-name">%s (%s)</h1>'.
'<p class="phabricator-ui-example-description">%s</p>'.
'</div>',
$example->getName(),
get_class($example),
$example->getDescription()));
$nav->appendChild($result);

3
src/applications/uiexample/examples/PhabricatorActionListExample.php
View file

@ -7,7 +7,8 @@ final class PhabricatorActionListExample extends PhabricatorUIExample {
}
public function getDescription() {
return 'Use <tt>PhabricatorActionListView</tt> to render object actions.';
return hsprintf(
'Use <tt>PhabricatorActionListView</tt> to render object actions.');
}
public function renderExample() {

2
src/applications/uiexample/examples/PhabricatorButtonsExample.php
View file

@ -7,7 +7,7 @@ final class PhabricatorButtonsExample extends PhabricatorUIExample {
}
public function getDescription() {
return 'Use <tt>&lt;button&gt;</tt> to render buttons.';
return hsprintf('Use <tt>&lt;button&gt;</tt> to render buttons.');
}
public function renderExample() {

4
src/applications/uiexample/examples/PhabricatorErrorExample.php
View file

@ -7,8 +7,8 @@ final class PhabricatorErrorExample extends PhabricatorUIExample {
}
public function getDescription() {
return 'Use <tt>AphrontErrorView</tt> to render errors, warnings and '.
'notices.';
return hsprintf(
'Use <tt>AphrontErrorView</tt> to render errors, warnings and notices.');
}
public function renderExample() {

2
src/applications/uiexample/examples/PhabricatorFormExample.php
View file

@ -7,7 +7,7 @@ final class PhabricatorFormExample extends PhabricatorUIExample {
}
public function getDescription() {
return 'Use <tt>AphrontFormView</tt> to render forms.';
return hsprintf('Use <tt>AphrontFormView</tt> to render forms.');
}
public function renderExample() {

4
src/applications/uiexample/examples/PhabricatorPropertyListExample.php
View file

@ -7,8 +7,8 @@ final class PhabricatorPropertyListExample extends PhabricatorUIExample {
}
public function getDescription() {
return 'Use <tt>PhabricatorPropertyListView</tt> to render object '.
'properties.';
return hsprintf(
'Use <tt>PhabricatorPropertyListView</tt> to render object properties.');
}
public function renderExample() {

2
src/applications/uiexample/examples/PhabricatorTagExample.php
View file

@ -7,7 +7,7 @@ final class PhabricatorTagExample extends PhabricatorUIExample {
}
public function getDescription() {
return 'Use <tt>PhabricatorTagView</tt> to render various tags.';
return hsprintf('Use <tt>PhabricatorTagView</tt> to render various tags.');
}
public function renderExample() {

3
src/applications/uiexample/examples/PhabricatorTimelineExample.php
View file

@ -7,7 +7,8 @@ final class PhabricatorTimelineExample extends PhabricatorUIExample {
}
public function getDescription() {
return 'Use <tt>PhabricatorTimelineView</tt> to comments and transactions.';
return hsprintf(
'Use <tt>PhabricatorTimelineView</tt> to comments and transactions.');
}
public function renderExample() {

5
src/applications/uiexample/examples/PhabricatorUIListFilterExample.php
View file

@ -7,8 +7,9 @@ final class PhabricatorUIListFilterExample extends PhabricatorUIExample {
}
public function getDescription() {
return 'Use <tt>AphrontListFilterView</tt> to layout controls for '.
'filtering and manipulating lists of objects.';
return hsprintf(
'Use <tt>AphrontListFilterView</tt> to layout controls for filtering '.
'and manipulating lists of objects.');
}
public function renderExample() {

2
src/applications/uiexample/examples/PhabricatorUINotificationExample.php
View file

@ -7,7 +7,7 @@ final class PhabricatorUINotificationExample extends PhabricatorUIExample {
}
public function getDescription() {
return 'Use <tt>JX.Notification</tt> to create notifications.';
return hsprintf('Use <tt>JX.Notification</tt> to create notifications.');
}
public function renderExample() {

5
src/applications/uiexample/examples/PhabricatorUIPagerExample.php
View file

@ -7,8 +7,9 @@ final class PhabricatorUIPagerExample extends PhabricatorUIExample {
}
public function getDescription() {
return 'Use <tt>AphrontPagerView</tt> to create a control which allows '.
'users to paginate through large amounts of content.';
return hsprintf(
'Use <tt>AphrontPagerView</tt> to create a control which allows '.
'users to paginate through large amounts of content.');
}
public function renderExample() {

2
src/applications/uiexample/examples/PhabricatorUITooltipExample.php
View file

@ -7,7 +7,7 @@ final class PhabricatorUITooltipExample extends PhabricatorUIExample {
}
public function getDescription() {
return 'Use <tt>JX.Tooltip</tt> to create tooltips.';
return hsprintf('Use <tt>JX.Tooltip</tt> to create tooltips.');
}
public function renderExample() {

13
src/infrastructure/diff/view/PhabricatorInlineSummaryView.php
View file

@ -39,12 +39,7 @@ final class PhabricatorInlineSummaryView extends AphrontView {
}
}
$rows[] =
'<tr>'.
'<th colspan="3">'.
phutil_escape_html($group).
'</th>'.
'</tr>';
$rows[] = hsprintf('<tr><th colspan="3">%s</th></tr>', $group);
foreach ($items as $item) {
@ -88,10 +83,8 @@ final class PhabricatorInlineSummaryView extends AphrontView {
$rows[] =
'<tr>'.
'<td class="inline-line-number">'.$lines.'</td>'.
($has_where ?
'<td class="inline-which-diff">'.
phutil_escape_html($where).
'</td>'
($has_where
? hsprintf('<td class="inline-which-diff">%s</td>', $where)
: null).
'<td class="inline-summary-content"'.$colspan.'>'.
'<div class="phabricator-remarkup">'.

4
src/view/AphrontDialogView.php
View file

@ -156,9 +156,7 @@ final class AphrontDialogView extends AphrontView {
}
$content =
'<div class="aphront-dialog-head">'.
phutil_escape_html($this->title).
'</div>'.
hsprintf('<div class="aphront-dialog-head">%s</div>', $this->title).
'<div class="aphront-dialog-body">'.
$this->renderChildren().
'</div>'.

6
src/view/control/PhabricatorObjectSelectorDialog.php
View file

@ -136,9 +136,9 @@ final class PhabricatorObjectSelectorDialog {
$attached_box =
'<div class="phabricator-object-selector-current">'.
'<div class="phabricator-object-selector-currently-attached">'.
'<div class="phabricator-object-selector-header">'.
phutil_escape_html($this->header).
'</div>'.
hsprintf(
'<div class="phabricator-object-selector-header">%s</div>',
$this->header).
'<div id="'.$current_id.'">'.
'</div>'.
$instructions.

34
src/view/layout/PhabricatorProfileHeaderView.php
View file

@ -47,33 +47,29 @@ final class PhabricatorProfileHeaderView extends AphrontView {
'');
}
$description = phutil_escape_html($this->profileDescription);
$description = $this->profileDescription;
if ($this->profileStatus != '') {
$description =
'<strong>'.phutil_escape_html($this->profileStatus).'</strong>'.
($description != '' ? ' &mdash; ' : '').
$description;
$description = hsprintf(
'<strong>%s</strong>%s',
$this->profileStatus,
($description != '' ? "\xE2\x80\x94".$description : ''));
}
return
return hsprintf(
'<table class="phabricator-profile-header">
<tr>
<td class="profile-header-name">'.
phutil_escape_html($this->profileName).
'</td>
<td class="profile-header-actions" rowspan="2">'.
self::renderSingleView($this->profileActions).
'</td>
<td class="profile-header-picture" rowspan="2">'.
$image.
'</td>
<td class="profile-header-name">%s</td>
<td class="profile-header-actions" rowspan="2">%s</td>
<td class="profile-header-picture" rowspan="2">%s</td>
</tr>
<tr>
<td class="profile-header-description">'.
$description.
'</td>
<td class="profile-header-description">%s</td>
</tr>
</table>'.
</table>',
$this->profileName,
phutil_safe_html(self::renderSingleView($this->profileActions)),
$image,
$description).
$this->renderChildren();
}
}

2
src/view/page/AphrontRequestFailureView.php
View file

@ -16,7 +16,7 @@ final class AphrontRequestFailureView extends AphrontView {
return
'<div class="aphront-request-failure-view">'.
'<div class="aphront-request-failure-head">'.
'<h1>'.phutil_escape_html($this->header).'</h1>'.
phutil_tag('h1', array(), $this->header).
'</div>'.
'<div class="aphront-request-failure-body">'.
$this->renderChildren().