Installer: Fix regression in SMTP test section (#7417)

2 files changed, 10 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 07e9c62d0..17672bf51 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Installer: Fix regression in SMTP test section (#7417)
+
 RELEASE 1.4.5
 -------------
 - Fix bug in extracting required plugins from composer.json that led to spurious error in log (#7364)
diff --git a/installer/test.php b/installer/test.php
index 2716f9aaa..bb4ea26d7 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -270,10 +270,16 @@ if ($user == '%u') {
     $user_field = new html_inputfield(array('name' => '_smtp_user', 'id' => 'smtp_user'));
     $user = $user_field->show($_POST['_smtp_user']);
 }
+else {
+    $user = html::quote($user);
+}
 if ($pass == '%p') {
     $pass_field = new html_passwordfield(array('name' => '_smtp_pass', 'id' => 'smtp_pass'));
     $pass = $pass_field->show();
 }
+else {
+    $pass = html::quote($pass);
+}
 
 ?>
 
@@ -292,11 +298,11 @@ if ($pass == '%p') {
   </tr>
   <tr>
     <td><label for="smtp_user">Username</label></td>
-    <td><?php echo rcube::Q($user); ?></td>
+    <td><?php echo $user; ?></td>
   </tr>
   <tr>
     <td><label for="smtp_pass">Password</label></td>
-    <td><?php echo rcube::Q($pass); ?></td>
+    <td><?php echo $pass; ?></td>
   </tr>
 </tbody>
 </table>