A few fixups for the registration content

include/client/login.inc.php

@@ -6,9 +6,18 @@ $passwd=Format::input($_POST['lpasswd']?:$_GET['t']);
 
 $content = Page::lookup(Page::getIdByType('banner-client'));
 
+if ($content) {
+    list($title, $body) = $ost->replaceTemplateVariables(
+        array($content->getName(), $content->getBody()));
+} else {
+    $title = 'Sign In';
+    $body = 'To better serve you, we encourage our clients to register for
+        an account and verify the email address we have on record.';
+}
+
 ?>
-<h1><?php echo Format::display($content->getName()); ?></h1>
-<p><?php echo Format::viewableImages($content->getBody()); ?></p>
+<h1><?php echo Format::display($title); ?></h1>
+<p><?php echo Format::display($body); ?></p>
 <form action="login.php" method="post" id="clientLogin">
     <?php csrf_token(); ?>
 <div style="display:table-row">

include/client/register.confirm.inc.php

-<?php if ($content) { ?>
-<h1><?php echo Format::display($content->getName()); ?></h1>
+<?php if ($content) {
+    list($title, $body) = $ost->replaceTemplateVariables(
+        array($content->getName(), $content->getBody())); ?>
+<h1><?php echo Format::display($title); ?></h1>
 <p><?php
-echo Format::display($content->getBody()); ?>
+echo Format::display($body); ?>
 </p>
 <?php } else { ?>
 <h1>Account Registration</h1>

include/client/register.confirmed.inc.php

-<?php if ($content) { ?>
-<h1><?php echo Format::display($content->getName()); ?></h1>
+<?php if ($content) {
+    list($title, $body) = $ost->replaceTemplateVariables(
+        array($content->getName(), $content->getBody())); ?>
+<h1><?php echo Format::display($title); ?></h1>
 <p><?php
-echo Format::display($content->getBody()); ?>
+echo Format::display($body); ?>
 </p>
 <?php } else { ?>
 <h1>Account Registration</h1>

include/i18n/en_US/templates/page/banner-client.yaml

@@ -7,8 +7,7 @@
 notes: >
     This forms the header on the staff login page. It can be useful to
     inform your clients about your login and registration policies.
-name: "Sign In"
+name: "Sign in to %{company.name}"
 body: >
-    This help desk is for registered customers only. Please contact our
-    support team directly to have an account created so you can access the
-    help desk to submit tickets.
+    To better serve you, we encourage our clients to register for an account
+    and verify the email address we have on record.

include/i18n/en_US/templates/page/pwreset-client.yaml

@@ -21,7 +21,7 @@ body: >
     Follow the link below to login to the help desk and change your
     password.<br />
     <br />
-    <a href="%{reset_link}">%{reset_link}</a><br />
+    <a href="%{link}">%{link}</a><br />
     <br />
     <em style="font-size: small">Your friendly Customer Support System
     <br />

include/i18n/en_US/templates/page/pwreset-staff.yaml

@@ -21,7 +21,7 @@ body: >
     Follow the link below to login to the help desk and change your
     password.<br />
     <br />
-    <a href="%{reset_link}">%{reset_link}</a><br />
+    <a href="%{link}">%{link}</a><br />
     <br />
     <em style="font-size: small">Your friendly Customer Support System</em>
     <br />

include/i18n/en_US/templates/page/registration-staff.yaml

@@ -16,7 +16,7 @@ body: >
     Please follow the link below to confirm your account and gain access to
     your tickets.<br />
     <br />
-    <a href="%{reset_link}">%{confirmation_link}</a><br />
+    <a href="%{link}">%{link}</a><br />
     <br />
     <em style="font-size: small">Your friendly Customer Support System
     <br />%{company.name}</em>

include/staff/login.tpl.php

@@ -5,7 +5,7 @@ $info = ($_POST && $errors)?Format::htmlchars($_POST):array();
 <div id="loginBox">
     <h1 id="logo"><a href="index.php">osTicket Staff Control Panel</a></h1>
     <h3><?php echo Format::htmlchars($msg); ?></h3>
-    <div><small><?php echo ($content) ? Format::viewableImages($content->getBody()) : ''; ?></small></div>
+    <div><small><?php echo ($content) ? Format::display($content->getBody()) : ''; ?></small></div>
     <form action="login.php" method="post">
         <?php csrf_token(); ?>
         <input type="hidden" name="do" value="scplogin">