Convert some phutil_escape_html() to hsprintf()

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

src/applications/auth/controller/PhabricatorLoginValidateController.php

@@ -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'));

src/applications/auth/controller/PhabricatorMustVerifyEmailController.php

@@ -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>'.

src/applications/auth/controller/PhabricatorOAuthLoginController.php

@@ -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);