From 3ef67a1119cecb517e8512c9c591fee51cfd2a4e Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 2 Oct 2020 11:55:01 +0200
Subject: [PATCH] Bug 22343: Correctly handle password on editing

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 admin/smtp_servers.pl                                       | 1 +
 .../intranet-tmpl/prog/en/modules/admin/smtp_servers.tt     | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/admin/smtp_servers.pl b/admin/smtp_servers.pl
index f5d7b083e5..da2acee874 100755
--- a/admin/smtp_servers.pl
+++ b/admin/smtp_servers.pl
@@ -138,6 +138,7 @@ elsif ( $op eq 'edit_save' ) {
                     timeout   => $timeout,
                     ssl_mode  => $ssl_mode,
                     user_name => $user_name,
+                    password  => $password,
                     debug     => $debug
                 }
             )->store;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
index 4b6dfc9661..ce3e58d2a6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
@@ -172,7 +172,11 @@ SMTP servers
                 </li>
                 <li>
                     <label for="smtp_password">Password: </label>
-                    <input type="password" name="smtp_password" id="smtp_password" size="60"  value="****"/>
+                    [% IF smtp_server.password %]
+                        <input type="password" name="smtp_password" id="smtp_password" size="60"  value="****"/>
+                    [% ELSE %]
+                        <input type="password" name="smtp_password" id="smtp_password" size="60"  value=""/>
+                    [% END %]
                 </li>
                 <li>
                     <label for="smtp_debug_mode">Debug mode: </label>
-- 
2.39.5