From 138da5a2799646c3293e7336f1bb71a1ed26a2a3 Mon Sep 17 00:00:00 2001
From: vrana <jakubv@fb.com>
Date: Thu, 7 Feb 2013 15:57:37 -0800
Subject: [PATCH] Kill some PhutilSafeHTML

Summary: Also couple of unrelated Ponder changes.

Test Plan: /Q5

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D4858
---
 resources/sql/quickstart.sql                  |  2 +-
 .../config/view/PhabricatorSetupIssueView.php |  2 +-
 .../PhabricatorDirectoryMainController.php    |  5 +--
 .../PhabricatorApplicationPonder.php          |  7 ++--
 .../ponder/view/PonderCommentListView.php     | 34 +++++++------------
 5 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/resources/sql/quickstart.sql b/resources/sql/quickstart.sql
index afe0b33d01..3439af6d4e 100644
--- a/resources/sql/quickstart.sql
+++ b/resources/sql/quickstart.sql
@@ -1666,7 +1666,7 @@ CREATE TABLE `ponder_question` (
   UNIQUE KEY `phid` (`phid`),
   KEY `authorPHID` (`authorPHID`),
   KEY `heat` (`heat`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=11;
 
 
 CREATE DATABASE `{$NAMESPACE}_project` /*!40100 DEFAULT CHARACTER SET utf8 */;
diff --git a/src/applications/config/view/PhabricatorSetupIssueView.php b/src/applications/config/view/PhabricatorSetupIssueView.php
index a65dae3e63..203a62b81b 100644
--- a/src/applications/config/view/PhabricatorSetupIssueView.php
+++ b/src/applications/config/view/PhabricatorSetupIssueView.php
@@ -22,7 +22,7 @@ final class PhabricatorSetupIssueView extends AphrontView {
       array(
         'class' => 'setup-issue-instructions',
       ),
-      new PhutilSafeHTML(nl2br(phutil_escape_html($issue->getMessage()))));
+      phutil_escape_html_newlines($issue->getMessage()));
 
     $configs = $issue->getPHPConfig();
     if ($configs) {
diff --git a/src/applications/directory/controller/PhabricatorDirectoryMainController.php b/src/applications/directory/controller/PhabricatorDirectoryMainController.php
index 7e823ec8d3..fa4ee538bb 100644
--- a/src/applications/directory/controller/PhabricatorDirectoryMainController.php
+++ b/src/applications/directory/controller/PhabricatorDirectoryMainController.php
@@ -316,9 +316,10 @@ final class PhabricatorDirectoryMainController
       array(
         'class' => 'phabricator-jump-nav-caption',
       ),
-      new PhutilSafeHTML(
+      hsprintf(
         'Enter the name of an object like <tt>D123</tt> to quickly jump to '.
-        'it. See '.$doc_link.' or type <tt>help</tt>.'));
+          'it. See %s or type <tt>help</tt>.',
+        $doc_link));
 
     $panel = new AphrontPanelView();
     $panel->setHeader('Jump Nav');
diff --git a/src/applications/ponder/application/PhabricatorApplicationPonder.php b/src/applications/ponder/application/PhabricatorApplicationPonder.php
index e83b0fd89d..5fb8ff55aa 100644
--- a/src/applications/ponder/application/PhabricatorApplicationPonder.php
+++ b/src/applications/ponder/application/PhabricatorApplicationPonder.php
@@ -39,7 +39,7 @@ final class PhabricatorApplicationPonder extends PhabricatorApplication {
     return true;
   }
 
-  public function getroutes() {
+  public function getRoutes() {
     return array(
       '/Q(?P<id>[1-9]\d*)' => 'PonderQuestionViewController',
       '/ponder/' => array(
@@ -53,7 +53,8 @@ final class PhabricatorApplicationPonder extends PhabricatorApplication {
         'comment/add/' => 'PonderCommentSaveController',
         '(?P<kind>question)/vote/' => 'PonderVoteSaveController',
         '(?P<kind>answer)/vote/' => 'PonderVoteSaveController'
-      ));
+      ),
+    );
   }
-}
 
+}
diff --git a/src/applications/ponder/view/PonderCommentListView.php b/src/applications/ponder/view/PonderCommentListView.php
index bef9942aa5..fd08369f57 100644
--- a/src/applications/ponder/view/PonderCommentListView.php
+++ b/src/applications/ponder/view/PonderCommentListView.php
@@ -51,24 +51,20 @@ final class PonderCommentListView extends AphrontView {
         $comment->getMarkupField(),
         $this->user);
 
-      $comment_anchor = '<a name="comment-' . $comment->getID() . '" />';
-      $comment_markup[] =
+      $comment_anchor = '';
+      $comment_markup[] = hsprintf(
         '<tr>'.
-          '<th>'.
-            $comment_anchor.
-          '</th>'.
+          '<th><a name="comment-%s" /></th>'.
           '<td>'.
             '<div class="phabricator-remarkup ponder-comment-markup">'.
-              $body.
-              '&nbsp;&mdash;'.
-              $handle->renderLink().
-              '&nbsp;'.
-              '<span class="ponder-datestamp">'.
-                phabricator_datetime($comment->getDateCreated(), $user).
-              '</span>'.
+              '%s&nbsp;&mdash;%s&nbsp;<span class="ponder-datestamp">%s</span>'.
             '</div>'.
           '</td>'.
-        '</tr>';
+        '</tr>',
+        $comment->getID(),
+        $body,
+        $handle->renderLink(),
+        phabricator_datetime($comment->getDateCreated(), $user));
     }
 
     $addview = id(new PonderAddCommentView)
@@ -77,20 +73,16 @@ final class PonderCommentListView extends AphrontView {
       ->setQuestionID($this->questionID)
       ->setActionURI($this->actionURI);
 
-    $comment_markup[] =
-      '<tr>'.
-       '<th>&nbsp;</th>'.
-       '<td>'.$addview->render().'</td>'.
-      '</tr>';
+    $comment_markup[] = hsprintf(
+      '<tr><th>&nbsp;</th><td>%s</td></tr>',
+      $addview->render());
 
     $comment_markup = phutil_tag(
       'table',
       array(
         'class' => 'ponder-comments',
       ),
-      new PhutilSafeHTML(implode("\n", $comment_markup))
-    );
-
+      $comment_markup);
 
     return $comment_markup;
   }