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

release-1.3
Aleksander Machniak 5 years ago
parent 7a792f8a90
commit 2bf097dcdb

@ -1,6 +1,8 @@
CHANGELOG Roundcube Webmail CHANGELOG Roundcube Webmail
=========================== ===========================
- Installer: Fix regression in SMTP test section (#7417)
RELEASE 1.3.12 RELEASE 1.3.12
-------------- --------------
- Security: Better fix for CVE-2020-12641 - Security: Better fix for CVE-2020-12641

@ -247,10 +247,16 @@ if ($user == '%u') {
$user_field = new html_inputfield(array('name' => '_smtp_user', 'id' => 'smtp_user')); $user_field = new html_inputfield(array('name' => '_smtp_user', 'id' => 'smtp_user'));
$user = $user_field->show($_POST['_smtp_user']); $user = $user_field->show($_POST['_smtp_user']);
} }
else {
$user = html::quote($user);
}
if ($pass == '%p') { if ($pass == '%p') {
$pass_field = new html_passwordfield(array('name' => '_smtp_pass', 'id' => 'smtp_pass')); $pass_field = new html_passwordfield(array('name' => '_smtp_pass', 'id' => 'smtp_pass'));
$pass = $pass_field->show(); $pass = $pass_field->show();
} }
else {
$pass = html::quote($pass);
}
?> ?>
@ -269,11 +275,11 @@ if ($pass == '%p') {
</tr> </tr>
<tr> <tr>
<td><label for="smtp_user">Username</label></td> <td><label for="smtp_user">Username</label></td>
<td><?php echo rcube::Q($user); ?></td> <td><?php echo $user; ?></td>
</tr> </tr>
<tr> <tr>
<td><label for="smtp_pass">Password</label></td> <td><label for="smtp_pass">Password</label></td>
<td><?php echo rcube::Q($pass); ?></td> <td><?php echo $pass; ?></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

Loading…
Cancel
Save